gentoo auto-resync : 01:09:2022 - 19:24:10

4 files changed, 12 insertions, 24 deletions

diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index bf3871007f9a..fe8395aa1256 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -13,7 +13,7 @@ DIST lua-5.3.4-tests.tar.gz 103438 BLAKE2B ac82708022e7729039111c3df4fe24302c8d0
 DIST lua-5.3.6.tar.gz 303770 BLAKE2B 07c37c56f43095a4f6ca8eb8b3adf19afd53107c02b62b2bcb3619565cb2100d5f823493eef93092d5e312b30fc28885a6d9e8f0ba5a23b5bed86dc4515a5d61 SHA512 ccc380d5e114d54504de0bfb0321ca25ec325d6ff1bfee44b11870b660762d1a9bf120490c027a0088128b58bb6b5271bbc648400cab84d2dc22b512c4841681
 DIST lua-5.4.4-tests.tar.gz 134094 BLAKE2B 63f5888a506f504f849fb2000cf551960df8eca3107601dcc8243e8ea5a1b13a70bff7dea4aebe3ab35b7e9df58c2ca44a7a27aa4de82240877eb8d7a017642e SHA512 08b3d764b3f362a2cddf5a23e71b16eea96a234a970fa0048bab358ebbd77f99d9bd132af12254383c5bb5426516e1ce2107e529e88d3963869255f5a41198ef
 DIST lua-5.4.4.tar.gz 360876 BLAKE2B 8747ef5c83bd4c54b73eeaad6991ab5fccc54ee000973afd9cf3367b8945f03c54e843ec88c48043003cd9d3b42281c593cb485b7165add2744cfea06d8b7668 SHA512 af0c35d5ba00fecbb2dd617bd7b825edf7418a16a73076e04f2a0df58cdbf098dc3ff4402e974afd789eb5d86d2e12ec6df9c84b99b23656ea694a85f83bcd21
-EBUILD lua-5.1.5-r109.ebuild 4016 BLAKE2B 5081210d101038c35a72e393e2ca79ab45266f09d237acba089cb431d9be5d57bd7329092e8b2c56c7613694701fbd2dcb1411cd18221d58cccba62b57a8db63 SHA512 a7488b385cd0d03b9cfe8e99f2175b4f938016688dd19dcefd0170e41b7e45e7d9fa0f80006a6976295abfe815fcb50a56fc466816af41ea7344f3ae5416bcb0
-EBUILD lua-5.3.6-r5.ebuild 5537 BLAKE2B 02e021c7a27b1616c3a84de7ca39eada6c463e48e2c9ac7246733de9e4ecd66007fb6c72b90b88309314b6d14457b0049fa645f489cc6f110cb0cd4e6a8ea78e SHA512 722e64c66b814e4ce0aa18c00413bb27c4df033119bcadd11bb238ff860e3b8537e9493b986b08a8f4635f7fa431a8be7a855277df18e1da9ff927eb19f01180
-EBUILD lua-5.4.4-r2.ebuild 5488 BLAKE2B 78ce8cd18d4b563542f703760cb602ee98a7b9fd5e39ff1eb1b5320fef20b0e04b9d2e15f8661960d3dca32cfba168a15810a9c9c943d40f1b64f20e3e5119e8 SHA512 9ec27b2a01f1649ca44107451da01460d0a8ab16be66b83e16bb4d5f5e2eea04dc605de105617d2cbe61bc007d7cff021081e7b9ddf028587d46c6492ab2f7b7
+EBUILD lua-5.1.5-r109.ebuild 3914 BLAKE2B 383d47a68be976dc6f8209ac97950121e6addba34fab4963bfd19524e23f492e8f9603b515e45361c30d38c1ec283ed694959a126dc4d0e072d982cdf13e644b SHA512 3792e38944c5c43f7113bb0e45886a3bef01dfedd3a42c0fd513e5069a707d480922a110945d932d9978ddb7d8e0d5afd13c499e400a7542199c96ba601d105a
+EBUILD lua-5.3.6-r5.ebuild 5435 BLAKE2B 676951874703c07a081e7051dc0b5b8b9474005546a94793bacfbe35d7fdaea1a19d00cae1e857704c587c295454e87708c0651200b14ce6b10f30d7bc84265f SHA512 058413e7b87c0b3c20c80f4e843430b50a8534352969eaa0612e7b8c2e90529967fe6991a57f7016d42aae72f887e30b8ec3e9a183c16c5cff3f3eae55c03596
+EBUILD lua-5.4.4-r2.ebuild 5386 BLAKE2B 59e698059fc1fa98e74d9b1d01b6f14ad109725ff361d06a2215905c2030f7326bfa8c1aeb84af384377127bd04b1e05c4e8ae4eefaa319f997850b2c5f82ef5 SHA512 aad663628355e4911fbfd5a7db367e69d6d7529c5c70832e6f666dc3a361e3536a930b74cc36c5796444265412b694d8610b8f9a2a876dfd4dbf637fe865ae3d
 MISC metadata.xml 525 BLAKE2B cd450b981b7ae039f32a0c6484548c59eff8d9c032975c84ef9b5530219413f7ff7a95d66593da6252c08808189cc61f02fbef88efe36f71dc64d9aec3c0e90e SHA512 4f127caf48df93a75b562f516e3a522ae3edcc601f434b2d034d76b106cbfd96848e6898bdc850acf757101843696e44da9ab1f42292e96bd294c30b631ccaa8
diff --git a/dev-lang/lua/lua-5.1.5-r109.ebuild b/dev-lang/lua/lua-5.1.5-r109.ebuild
index 624a4798c45a..2ea70e4d13bf 100644
--- a/dev-lang/lua/lua-5.1.5-r109.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r109.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit portability toolchain-funcs
+inherit optfeature portability toolchain-funcs
 
 DESCRIPTION="A powerful light-weight programming language designed for extending applications"
 HOMEPAGE="https://www.lua.org/"
@@ -128,7 +128,7 @@ src_test() {
 	local negative="readonly"
 	local test
 
-	cd "${BUILD_DIR}" || die
+	cd "${S}" || die
 	for test in ${positive}; do
 		test/lua.static test/${test}.lua || die "test $test failed"
 	done
@@ -141,9 +141,5 @@ src_test() {
 pkg_postinst() {
 	eselect lua set --if-unset "${PN}${SLOT}"
 
-	if has_version "app-editor/emacs"; then
-		if ! has_version "app-emacs/lua-mode"; then
-			einfo "Install app-emacs/lua-mode for lua support for emacs"
-		fi
-	fi
+	optfeature "Lua support for Emacs" app-emacs/lua-mode
 }
diff --git a/dev-lang/lua/lua-5.3.6-r5.ebuild b/dev-lang/lua/lua-5.3.6-r5.ebuild
index 81af6e5ff3d3..184897a102ea 100644
--- a/dev-lang/lua/lua-5.3.6-r5.ebuild
+++ b/dev-lang/lua/lua-5.3.6-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools portability toolchain-funcs
+inherit autotools optfeature portability toolchain-funcs
 
 DESCRIPTION="A powerful light-weight programming language designed for extending applications"
 HOMEPAGE="https://www.lua.org/"
@@ -171,7 +171,7 @@ src_test() {
 	rm -f "${TEST_MARKER}"
 
 	TEST_LOG="${T}/test.log"
-	eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
+	eval "${S}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
 	grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL" >>"${TEST_MARKER}"
 
 	if [ -e "${TEST_MARKER}" ]; then
@@ -183,9 +183,5 @@ src_test() {
 pkg_postinst() {
 	eselect lua set --if-unset "${PN}${SLOT}"
 
-	if has_version "app-editor/emacs"; then
-		if ! has_version "app-emacs/lua-mode"; then
-			einfo "Install app-emacs/lua-mode for lua support for emacs"
-		fi
-	fi
+	optfeature "Lua support for Emacs" app-emacs/lua-mode
 }
diff --git a/dev-lang/lua/lua-5.4.4-r2.ebuild b/dev-lang/lua/lua-5.4.4-r2.ebuild
index 07805db95066..1a424fc27bb1 100644
--- a/dev-lang/lua/lua-5.4.4-r2.ebuild
+++ b/dev-lang/lua/lua-5.4.4-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools portability toolchain-funcs
+inherit autotools optfeature portability toolchain-funcs
 
 DESCRIPTION="A powerful light-weight programming language designed for extending applications"
 HOMEPAGE="https://www.lua.org/"
@@ -168,7 +168,7 @@ src_test() {
 	rm -f "${TEST_MARKER}"
 
 	TEST_LOG="${T}/test.log"
-	eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
+	eval "${S}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
 	grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL" >>"${TEST_MARKER}"
 
 	if [ -e "${TEST_MARKER}" ]; then
@@ -180,9 +180,5 @@ src_test() {
 pkg_postinst() {
 	eselect lua set --if-unset "${PN}${SLOT}"
 
-	if has_version "app-editor/emacs"; then
-		if ! has_version "app-emacs/lua-mode"; then
-			einfo "Install app-emacs/lua-mode for lua support for emacs"
-		fi
-	fi
+	optfeature "Lua support for Emacs" app-emacs/lua-mode
 }