gentoo resync : 25.03.2022

5 files changed, 13 insertions, 12 deletions

diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index af39c7a34adf..7d08a28b30f1 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/lualdap/Manifest b/dev-lua/lualdap/Manifest
index f674e1eb8acc..7ce399571778 100644
--- a/dev-lua/lualdap/Manifest
+++ b/dev-lua/lualdap/Manifest
@@ -1,4 +1,4 @@
 AUX lualdap-1.3.0-lua5-4.patch 552 BLAKE2B d685838d05b9c2e4354abf436837940725f80fd8d81d806a383c0975bfb67ff8b679bd668bfbc524129a4e62cb0f4b5f77e070b1afeec85809a6533114fb1442 SHA512 fb1f7eea88afae2e854f0cabf115739ab4900247483f9d1d8f15f0c5dcaa85ee2c6e16414bce300450b1531a5c76516f8260000c54707d85547236a7185d65e8
 DIST lualdap-1.3.0.tar.gz 81987 BLAKE2B cd25cada91a3c330fb72ee1106298442c64b1bcae4a57f48937efb4311f70b53c5a0e96587caab4b1950b16d9957bb8c25b2b9e0d3753089f06fbae64180ff04 SHA512 dea4282928c5138a327cd97d3d8049341fac17b5e853440f5b0a6e115e3400bac908f24827d48e36bfe81720c7d2bacdc50ae189953ecbcdfb27cb23b78d0de8
-EBUILD lualdap-1.3.0-r1.ebuild 1559 BLAKE2B 179c8c48848d637bf8546ef68128e683eb4e6b711b823a710782c102da3b28a2f7b188324393dc3fabd09a567746e457891c6ba60f793110b4c7cf4f89a35d5f SHA512 b1dc07936b3cdb529f8102f89eb585a09fed83a0603ddeff878d7bb81122b1d4fb6b86e281f1835c5ec017929f7853425bc23f08225944ab543bd482601b4d73
+EBUILD lualdap-1.3.0-r2.ebuild 1586 BLAKE2B c24269e2f4e7623337edb0f334902ca4d358c3633beebada8725b320f17b06224ac6a567d3990be863f919156a50aeca509838237e2b0e8f5885efef03a5239f SHA512 e00a635f10909ce3f90931cb0a4ecf4ea033c2586a09c84af75b9ea9e95476929da219645e3a2b5940b0da94acfe88b7600deddb0b34420bb0d31d09bac28abe
 MISC metadata.xml 442 BLAKE2B 7e232b04c35cca3befb630d268e162bc7bb095f9802d6aa01b15a78f0ac276d8de41cb02e1f6a94f16f79d7afcbd99bce981ff3f6e04459b71a846378e4d2911 SHA512 c94b931cf34eabb0efc127029419aafa87491a3453ccf3f0045e19b8d23893b9192bbdc22eaf654d2250955f0dd90a217b7118e89664b2572258044ad40e265e
diff --git a/dev-lua/lualdap/lualdap-1.3.0-r1.ebuild b/dev-lua/lualdap/lualdap-1.3.0-r2.ebuild
index f19c6eb05579..1abb207ea041 100644
--- a/dev-lua/lualdap/lualdap-1.3.0-r1.ebuild
+++ b/dev-lua/lualdap/lualdap-1.3.0-r2.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="test"
 
 RDEPEND="
-	net-nds/openldap
+	net-nds/openldap:=
 	${LUA_DEPS}
 "
 DEPEND="${RDEPEND}"
@@ -50,7 +50,7 @@ lua_src_compile() {
 
 	emake "${myemakeargs[@]}"
 
-	popd
+	popd || die
 }
 
 src_compile() {
@@ -59,11 +59,11 @@ src_compile() {
 
 lua_src_test() {
 	pushd "${BUILD_DIR}" || die
-	LUA_CPATH="./src/?.so" ${ELUA} tests/test.lua
-	popd
+	LUA_CPATH="./src/?.so" ${ELUA} tests/test.lua || die
+	popd || die
 }
 
-src_install() {
+src_test() {
 	lua_foreach_impl lua_src_test
 }
 
@@ -80,7 +80,7 @@ lua_src_install() {
 
 	emake "${myemakeargs[@]}" install
 
-	popd
+	popd || die
 }
 
 src_install() {
diff --git a/dev-lua/readline/Manifest b/dev-lua/readline/Manifest
index 5979bbb25916..fcc102a65228 100644
--- a/dev-lua/readline/Manifest
+++ b/dev-lua/readline/Manifest
@@ -1,3 +1,3 @@
 DIST lua-readline-3.0.tar.gz 15675 BLAKE2B 877b50cdf05610eb54fcec6063368206d68b0571e70c28abd6bdf20e0533ae76809a18f3b7cbefc79185544966e2838c8ea95b30bc5821c31547026ee621d1f0 SHA512 7fc9b1b2b03909cd8ebccc539fa8c37a823c70728671dc09c7cec0641625a59ed3c8b7045635e53719d32046437e638193cb1055a94a3d635fb50efb199d213a
-EBUILD readline-3.0.ebuild 1566 BLAKE2B f0f46fc4e58f78db1b96a2776f2065bbc93937963a79733b809871c7ac4a8ac25a209d0db0a49afdb385acbfda77032fe407b0f5ac87d0cc5425501cfc57d028 SHA512 b126866992c907cde4b57d2ffa22e1117654a5c923f45cb0adda78c2b158b136123603bcf4fbe526738ab4abd4ead154b4dcba39b54e644be9e651a4d36032e4
+EBUILD readline-3.0-r1.ebuild 1620 BLAKE2B c010b63f5c37b7864b60870170bca89d3ef52290ac9f21c2874642da0e563d2898dc2eec5253692be0b2c116f97e8a1d64940b003c61c93c274f9c20e590d7c9 SHA512 d6f18c32943bf9828d604d941648d08b7b22f865948a055350008f96e275bf69292ba34c592f5fae969d4882d223a0c2830fd70830a3226dc0feca47ad03c364
 MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/dev-lua/readline/readline-3.0.ebuild b/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() {