From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1377711-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 7541F15808B
for <garchives@archives.gentoo.org>; Sun, 20 Mar 2022 01:48:02 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9C4A7E085E;
Sun, 20 Mar 2022 01:48:01 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id CD9ECE085E
for <gentoo-commits@lists.gentoo.org>; Sun, 20 Mar 2022 01:48:00 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 5D137343191
for <gentoo-commits@lists.gentoo.org>; Sun, 20 Mar 2022 01:47:59 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9CA82D0
for <gentoo-commits@lists.gentoo.org>; Sun, 20 Mar 2022 01:47:57 +0000 (UTC)
From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" <conikost@gentoo.org>
Message-ID: <1647740846.d6ff6b9279b37148535c2f843c88ed0bcbdfe96a.conikost@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lua/readline/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-lua/readline/readline-3.0-r1.ebuild dev-lua/readline/readline-3.0.ebuild
X-VCS-Directories: dev-lua/readline/
X-VCS-Committer: conikost
X-VCS-Committer-Name: Conrad Kostecki
X-VCS-Revision: d6ff6b9279b37148535c2f843c88ed0bcbdfe96a
X-VCS-Branch: master
Date: Sun, 20 Mar 2022 01:47:57 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: fd4873e3-e6dc-49f7-ac55-0974e7cbc70d
X-Archives-Hash: 4d5b9eb4f0c0fc195c87d7eda3f04e76
commit: d6ff6b9279b37148535c2f843c88ed0bcbdfe96a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 01:04:56 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 01:47:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6ff6b92
dev-lua/readline: misc fixups
- BDEPEND on virtual/pkgconfig as we call it in the ebuild
- := on sys-libs/readline as it exposes a subslot for its ABI and we link
against it
- Add missing || dies
- Don't use ${EROOT} (forbidden in src_test), instead use ${ESYSROOT}
which should have what we need installed there.
Closes: https://github.com/gentoo/gentoo/pull/24676
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-lua/readline/{readline-3.0.ebuild => readline-3.0-r1.ebuild} | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/dev-lua/readline/readline-3.0.ebuild b/dev-lua/readline/readline-3.0-r1.ebuild
similarity index 87%
rename from dev-lua/readline/readline-3.0.ebuild
rename to dev-lua/readline/readline-3.0-r1.ebuild
index 6eb54114feba..813f6f10ba3e 100644
--- a/dev-lua/readline/readline-3.0.ebuild
+++ b/dev-lua/readline/readline-3.0-r1.ebuild
@@ -21,9 +21,10 @@ RESTRICT="test"
RDEPEND="
dev-lua/luaposix
- sys-libs/readline
+ sys-libs/readline:=
"
DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
src_prepare() {
default
@@ -65,8 +66,8 @@ src_compile() {
lua_src_test() {
pushd "${BUILD_DIR}" || die
- LUA_CPATH="./?.so;${EROOT}/usr/$(get_libdir)/lua/$(ver_cut 1-2 $(lua_get_version))/?.so" ${ELUA} test/test_rl.lua
- popd
+ LUA_CPATH="./?.so;${ESYSROOT}/usr/$(get_libdir)/lua/$(ver_cut 1-2 $(lua_get_version))/?.so" ${ELUA} test/test_rl.lua || die
+ popd || die
}
src_test() {
@@ -82,7 +83,7 @@ lua_src_install() {
insinto "$(lua_get_lmod_dir)"
doins readline.lua
- popd
+ popd || die
}
src_install() {