gentoo auto-resync : 30:08:2022 - 22:49:20

4 files changed, 24 insertions, 65 deletions

diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 6c24804a946d..bf3871007f9a 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-r107.ebuild 4229 BLAKE2B de634ec37a5c960cc9a179f6dd74dff771d41e59f417da9576b4a643ae3987de2b67e5a318c10fedc0e59ae1d1420060c9f79472cbd04916445d71bca7490cdb SHA512 936d8ee0b7ca8d90ede57a8d8425e2c8fea635817a936865cc504e50d6c616a3d569c15a32dba3884dc9b9de48a2dcd722eadd117cebb09e211744d2ac0885f0
-EBUILD lua-5.3.6-r3.ebuild 5947 BLAKE2B 6a8fbe4b1bc089b182980cd93a649ada7409508dcf938d4849125b141295ed5b4a25d74c0159dede2c4f98f001a31a9c78adada30440b0f60f6a83b3aaba7a2f SHA512 efca3e1c8e79e1c2ca1c9b544bb34e1d3bb96acd7db61ca1a2e390e220129db9b77bfb1cb5bde09a90f1c5690a41a47faa6305168b1e8b8addfb4c64aa299b00
-EBUILD lua-5.4.4.ebuild 5896 BLAKE2B cb16d7a7c476e828f19e394ff07ae072a11a829171e743f597c62df501ca070d2c3b2f47c0f18b6221e5982b0f11a07d9f24a017858130812672aa4418cd2ce5 SHA512 5e4b151a76a08413f106c7602052d4675df523f40b311e86394e08570f155b5a8734c6b5c8aff1bffeb81a5678d19a5188e94b2531d9363616698d38c237f563
+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
 MISC metadata.xml 525 BLAKE2B cd450b981b7ae039f32a0c6484548c59eff8d9c032975c84ef9b5530219413f7ff7a95d66593da6252c08808189cc61f02fbef88efe36f71dc64d9aec3c0e90e SHA512 4f127caf48df93a75b562f516e3a522ae3edcc601f434b2d034d76b106cbfd96848e6898bdc850acf757101843696e44da9ab1f42292e96bd294c30b631ccaa8
diff --git a/dev-lang/lua/lua-5.1.5-r107.ebuild b/dev-lang/lua/lua-5.1.5-r109.ebuild
index ac331a705a8d..624a4798c45a 100644
--- a/dev-lang/lua/lua-5.1.5-r107.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r109.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib-minimal portability toolchain-funcs
+inherit portability toolchain-funcs
 
 DESCRIPTION="A powerful light-weight programming language designed for extending applications"
 HOMEPAGE="https://www.lua.org/"
@@ -16,7 +16,7 @@ IUSE="+deprecated readline"
 
 COMMON_DEPEND="
 	>=app-eselect/eselect-lua-3
-	readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
+	readline? ( >=sys-libs/readline-6.2_p5-r1:0= )
 	!dev-lang/lua:0"
 # Cross-compiling note:
 # Must use libtool from the target system (DEPEND) because
@@ -27,10 +27,6 @@ DEPEND="
 	sys-devel/libtool"
 RDEPEND="${COMMON_DEPEND}"
 
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/lua${SLOT}/luaconf.h
-)
-
 src_prepare() {
 	PATCHES=(
 		"${FILESDIR}/lua-5.1.5-make.patch"
@@ -75,12 +71,9 @@ src_prepare() {
 		-e "/^includedir=/s,(/include)$,\1/lua${SLOT}," \
 		-e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \
 		"${S}"/etc/lua.pc
-
-	# custom Makefiles
-	multilib_copy_sources
 }
 
-multilib_src_configure() {
+src_configure() {
 	# We want packages to find our things...
 	sed -i \
 		-e 's:/usr/local:'${EPREFIX}'/usr:' \
@@ -88,7 +81,7 @@ multilib_src_configure() {
 		etc/lua.pc src/luaconf.h || die
 }
 
-multilib_src_compile() {
+src_compile() {
 	tc-export CC
 	myflags=
 	# what to link to liblua
@@ -113,15 +106,13 @@ multilib_src_compile() {
 	mv lua_test ../test/lua.static
 }
 
-multilib_src_install() {
+src_install() {
 	emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
 			V=${SLOT} gentoo_install
 
 	insinto /usr/$(get_libdir)/pkgconfig
 	newins etc/lua.pc lua${SLOT}.pc
-}
 
-multilib_src_install_all() {
 	DOCS="HISTORY README"
 	HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
 	einstalldocs
@@ -131,7 +122,7 @@ multilib_src_install_all() {
 	find "${ED}" -name 'liblua*.a' -delete || die
 }
 
-multilib_src_test() {
+src_test() {
 	local positive="bisect cf echo env factorial fib fibfor hello printf sieve
 	sort trace-calls trace-globals"
 	local negative="readonly"
diff --git a/dev-lang/lua/lua-5.3.6-r3.ebuild b/dev-lang/lua/lua-5.3.6-r5.ebuild
index 75ad75f26338..81af6e5ff3d3 100644
--- a/dev-lang/lua/lua-5.3.6-r3.ebuild
+++ b/dev-lang/lua/lua-5.3.6-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools multilib-minimal portability toolchain-funcs
+inherit autotools portability toolchain-funcs
 
 DESCRIPTION="A powerful light-weight programming language designed for extending applications"
 HOMEPAGE="https://www.lua.org/"
@@ -33,10 +33,6 @@ RDEPEND="${COMMON_DEPEND}"
 
 RESTRICT="!test? ( test )"
 
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/lua${SLOT}/luaconf.h
-)
-
 PATCHES=(
 	"${FILESDIR}/lua-5.3.6-make.patch"
 )
@@ -67,12 +63,9 @@ src_prepare() {
 	# upstream does not use libtool, but we do (see bug #336167)
 	cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
 	eautoreconf
-
-	# custom Makefiles
-	multilib_copy_sources
 }
 
-multilib_src_configure() {
+src_configure() {
 	sed -i \
 		-e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
 		-e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
@@ -82,7 +75,7 @@ multilib_src_configure() {
 	econf
 }
 
-multilib_src_compile() {
+src_compile() {
 	tc-export CC
 
 	# what to link to liblua
@@ -113,7 +106,7 @@ multilib_src_compile() {
 			gentoo_all
 }
 
-multilib_src_install() {
+src_install() {
 	emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
 			V=${SLOT} gentoo_install
 
@@ -150,9 +143,7 @@ multilib_src_install() {
 	# Older systems called it 'lua53.pc'
 	dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua-${SLOT}.pc"
 	dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc"
-}
 
-multilib_src_install_all() {
 	DOCS="README"
 	HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
 	einstalldocs
@@ -179,16 +170,9 @@ src_test() {
 	TEST_MARKER="${T}/test.failed"
 	rm -f "${TEST_MARKER}"
 
-	# If we are failing, set the marker file, and only check it after done all ABIs
-	abi_src_test() {
-		debug-print-function ${FUNCNAME} "$@"
-		TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
-		eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
-		grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
-		return 0
-	}
-
-	multilib_foreach_abi abi_src_test
+	TEST_LOG="${T}/test.log"
+	eval "${BUILD_DIR}"/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
 		cat "${TEST_MARKER}"
diff --git a/dev-lang/lua/lua-5.4.4.ebuild b/dev-lang/lua/lua-5.4.4-r2.ebuild
index 4d4cae364438..07805db95066 100644
--- a/dev-lang/lua/lua-5.4.4.ebuild
+++ b/dev-lang/lua/lua-5.4.4-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools multilib-minimal portability toolchain-funcs
+inherit autotools portability toolchain-funcs
 
 DESCRIPTION="A powerful light-weight programming language designed for extending applications"
 HOMEPAGE="https://www.lua.org/"
@@ -33,10 +33,6 @@ RDEPEND="${COMMON_DEPEND}"
 
 RESTRICT="!test? ( test )"
 
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/lua${SLOT}/luaconf.h
-)
-
 PATCHES=(
 	"${FILESDIR}"/lua-5.4.2-r2-make.patch
 )
@@ -63,12 +59,9 @@ src_prepare() {
 	# upstream does not use libtool, but we do (see bug #336167)
 	cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
 	eautoreconf
-
-	# custom Makefiles
-	multilib_copy_sources
 }
 
-multilib_src_configure() {
+src_configure() {
 	sed -i \
 		-e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
 		-e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
@@ -78,7 +71,7 @@ multilib_src_configure() {
 	econf
 }
 
-multilib_src_compile() {
+src_compile() {
 	tc-export CC
 
 	# what to link to liblua
@@ -110,11 +103,11 @@ multilib_src_compile() {
 			gentoo_all
 }
 
-multilib_src_install() {
+src_install() {
 	emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
 			V=${SLOT} gentoo_install
 
-	case $SLOT in
+	case ${SLOT} in
 		0)
 			LIBNAME="lua"
 			INCLUDEDIR_SUFFIX=''
@@ -147,9 +140,7 @@ multilib_src_install() {
 	# Older systems called it 'lua53.pc'
 	dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua-${SLOT}.pc"
 	dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc"
-}
 
-multilib_src_install_all() {
 	DOCS="README"
 	HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
 	einstalldocs
@@ -176,16 +167,9 @@ src_test() {
 	TEST_MARKER="${T}/test.failed"
 	rm -f "${TEST_MARKER}"
 
-	# If we are failing, set the marker file, and only check it after done all ABIs
-	abi_src_test() {
-		debug-print-function ${FUNCNAME} "$@"
-		TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
-		eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
-		grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
-		return 0
-	}
-
-	multilib_foreach_abi abi_src_test
+	TEST_LOG="${T}/test.log"
+	eval "${BUILD_DIR}"/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
 		cat "${TEST_MARKER}"