public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lua/readline/
Date: Sun, 20 Mar 2022 01:47:57 +0000 (UTC)	[thread overview]
Message-ID: <1647740846.d6ff6b9279b37148535c2f843c88ed0bcbdfe96a.conikost@gentoo> (raw)

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() {


             reply	other threads:[~2022-03-20  1:48 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-20  1:47 Conrad Kostecki [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-08-05 22:41 [gentoo-commits] repo/gentoo:master commit in: dev-lua/readline/ Conrad Kostecki
2023-05-18 17:37 Conrad Kostecki
2023-05-18 17:37 Conrad Kostecki
2023-05-18 17:37 Conrad Kostecki
2023-04-10 18:38 Conrad Kostecki
2022-11-01  1:04 Conrad Kostecki
2022-11-01  1:04 Conrad Kostecki
2022-11-01  1:04 Conrad Kostecki
2022-10-01 23:33 Conrad Kostecki
2022-05-21 22:49 Conrad Kostecki
2022-05-21 22:49 Conrad Kostecki
2022-05-21 22:49 Conrad Kostecki
2022-04-21 21:26 Conrad Kostecki
2022-04-17 15:07 Conrad Kostecki
2022-04-17 15:07 Conrad Kostecki
2022-03-19 15:21 Conrad Kostecki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1647740846.d6ff6b9279b37148535c2f843c88ed0bcbdfe96a.conikost@gentoo \
    --to=conikost@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox