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

["Sam James" <sam@gentoo.org>]

commit:     3c6c88c3400f1da7df3f8d21a9f99181988099c8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 17:55:33 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 17:55:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c6c88c3

dev-lang/lua: drop multilib remnants

Fixes: 0a342ee2536a73c3c45f6bebf0cb0e0692a637c8
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-lang/lua/{lua-5.1.5-r108.ebuild => lua-5.1.5-r109.ebuild} | 6 ------
 dev-lang/lua/{lua-5.3.6-r4.ebuild => lua-5.3.6-r5.ebuild}     | 6 ------
 dev-lang/lua/{lua-5.4.4-r1.ebuild => lua-5.4.4-r2.ebuild}     | 8 +-------
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/dev-lang/lua/lua-5.1.5-r108.ebuild b/dev-lang/lua/lua-5.1.5-r109.ebuild
similarity index 98%
rename from dev-lang/lua/lua-5.1.5-r108.ebuild
rename to dev-lang/lua/lua-5.1.5-r109.ebuild
index fc8eeb20db3d..d8435479911b 100644
--- a/dev-lang/lua/lua-5.1.5-r108.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r109.ebuild
@@ -27,10 +27,6 @@ DEPEND="
 	sys-devel/libtool"
 RDEPEND="${COMMON_DEPEND}"
 
-WRAPPED_HEADERS=(
-	/usr/include/lua${SLOT}/luaconf.h
-)
-
 src_prepare() {
 	PATCHES=(
 		"${FILESDIR}/lua-5.1.5-make.patch"
@@ -119,9 +115,7 @@ src_install() {
 
 	insinto /usr/$(get_libdir)/pkgconfig
 	newins etc/lua.pc lua${SLOT}.pc
-}
 
-src_install_all() {
 	DOCS="HISTORY README"
 	HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
 	einstalldocs

diff --git a/dev-lang/lua/lua-5.3.6-r4.ebuild b/dev-lang/lua/lua-5.3.6-r5.ebuild
similarity index 98%
rename from dev-lang/lua/lua-5.3.6-r4.ebuild
rename to dev-lang/lua/lua-5.3.6-r5.ebuild
index c343a24eb1df..b74e72009aa8 100644
--- a/dev-lang/lua/lua-5.3.6-r4.ebuild
+++ b/dev-lang/lua/lua-5.3.6-r5.ebuild
@@ -33,10 +33,6 @@ RDEPEND="${COMMON_DEPEND}"
 
 RESTRICT="!test? ( test )"
 
-WRAPPED_HEADERS=(
-	/usr/include/lua${SLOT}/luaconf.h
-)
-
 PATCHES=(
 	"${FILESDIR}/lua-5.3.6-make.patch"
 )
@@ -150,9 +146,7 @@ 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"
-}
 
-src_install_all() {
 	DOCS="README"
 	HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
 	einstalldocs

diff --git a/dev-lang/lua/lua-5.4.4-r1.ebuild b/dev-lang/lua/lua-5.4.4-r2.ebuild
similarity index 98%
rename from dev-lang/lua/lua-5.4.4-r1.ebuild
rename to dev-lang/lua/lua-5.4.4-r2.ebuild
index 72fddc869232..6cffda8c5a43 100644
--- a/dev-lang/lua/lua-5.4.4-r1.ebuild
+++ b/dev-lang/lua/lua-5.4.4-r2.ebuild
@@ -33,10 +33,6 @@ RDEPEND="${COMMON_DEPEND}"
 
 RESTRICT="!test? ( test )"
 
-WRAPPED_HEADERS=(
-	/usr/include/lua${SLOT}/luaconf.h
-)
-
 PATCHES=(
 	"${FILESDIR}"/lua-5.4.2-r2-make.patch
 )
@@ -114,7 +110,7 @@ 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 +143,7 @@ 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"
-}
 
-src_install_all() {
 	DOCS="README"
 	HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
 	einstalldocs