commit: 0a342ee2536a73c3c45f6bebf0cb0e0692a637c8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 16:53:48 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 17:50:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a342ee2
dev-lang/lua: drop multilib
Nothing in Gentoo needs this and it's a waste of resources.
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{lua-5.1.5-r107.ebuild => lua-5.1.5-r108.ebuild} | 18 +++++++++---------
.../lua/{lua-5.3.6-r3.ebuild => lua-5.3.6-r4.ebuild} | 16 ++++++++--------
dev-lang/lua/{lua-5.4.4.ebuild => lua-5.4.4-r1.ebuild} | 16 ++++++++--------
3 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/dev-lang/lua/lua-5.1.5-r107.ebuild
b/dev-lang/lua/lua-5.1.5-r108.ebuild
similarity index 92%
rename from dev-lang/lua/lua-5.1.5-r107.ebuild
rename to dev-lang/lua/lua-5.1.5-r108.ebuild
index ac331a705a8d..fc8eeb20db3d 100644
--- a/dev-lang/lua/lua-5.1.5-r107.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r108.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,7 +27,7 @@ DEPEND="
sys-devel/libtool"
RDEPEND="${COMMON_DEPEND}"
-MULTILIB_WRAPPED_HEADERS=(
+WRAPPED_HEADERS=(
/usr/include/lua${SLOT}/luaconf.h
)
@@ -77,10 +77,10 @@ src_prepare() {
"${S}"/etc/lua.pc
# custom Makefiles
- multilib_copy_sources
+ copy_sources
}
-multilib_src_configure() {
+src_configure() {
# We want packages to find our things...
sed -i \
-e 's:/usr/local:'${EPREFIX}'/usr:' \
@@ -88,7 +88,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,7 +113,7 @@ 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
@@ -121,7 +121,7 @@ multilib_src_install() {
newins etc/lua.pc lua${SLOT}.pc
}
-multilib_src_install_all() {
+src_install_all() {
DOCS="HISTORY README"
HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
einstalldocs
@@ -131,7 +131,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-r4.ebuild
similarity index 95%
rename from dev-lang/lua/lua-5.3.6-r3.ebuild
rename to dev-lang/lua/lua-5.3.6-r4.ebuild
index 75ad75f26338..c343a24eb1df 100644
--- a/dev-lang/lua/lua-5.3.6-r3.ebuild
+++ b/dev-lang/lua/lua-5.3.6-r4.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,7 +33,7 @@ RDEPEND="${COMMON_DEPEND}"
RESTRICT="!test? ( test )"
-MULTILIB_WRAPPED_HEADERS=(
+WRAPPED_HEADERS=(
/usr/include/lua${SLOT}/luaconf.h
)
@@ -69,10 +69,10 @@ src_prepare() {
eautoreconf
# custom Makefiles
- multilib_copy_sources
+ 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 +82,7 @@ multilib_src_configure() {
econf
}
-multilib_src_compile() {
+src_compile() {
tc-export CC
# what to link to liblua
@@ -113,7 +113,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
@@ -152,7 +152,7 @@ multilib_src_install() {
dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc"
}
-multilib_src_install_all() {
+src_install_all() {
DOCS="README"
HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
einstalldocs
@@ -188,7 +188,7 @@ src_test() {
return 0
}
- multilib_foreach_abi abi_src_test
+ foreach_abi abi_src_test
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-r1.ebuild
similarity index 95%
rename from dev-lang/lua/lua-5.4.4.ebuild
rename to dev-lang/lua/lua-5.4.4-r1.ebuild
index 4d4cae364438..72fddc869232 100644
--- a/dev-lang/lua/lua-5.4.4.ebuild
+++ b/dev-lang/lua/lua-5.4.4-r1.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,7 +33,7 @@ RDEPEND="${COMMON_DEPEND}"
RESTRICT="!test? ( test )"
-MULTILIB_WRAPPED_HEADERS=(
+WRAPPED_HEADERS=(
/usr/include/lua${SLOT}/luaconf.h
)
@@ -65,10 +65,10 @@ src_prepare() {
eautoreconf
# custom Makefiles
- multilib_copy_sources
+ 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 +78,7 @@ multilib_src_configure() {
econf
}
-multilib_src_compile() {
+src_compile() {
tc-export CC
# what to link to liblua
@@ -110,7 +110,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
@@ -149,7 +149,7 @@ multilib_src_install() {
dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc"
}
-multilib_src_install_all() {
+src_install_all() {
DOCS="README"
HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
einstalldocs
@@ -185,7 +185,7 @@ src_test() {
return 0
}
- multilib_foreach_abi abi_src_test
+ foreach_abi abi_src_test
if [ -e "${TEST_MARKER}" ]; then
cat "${TEST_MARKER}"
