[gentoo-commits] repo/gentoo:master commit in: dev-lua/readline/

[Conrad Kostecki]

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