From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1CFEB158094 for ; Tue, 30 Aug 2022 17:50:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56FF2E0950; Tue, 30 Aug 2022 17:50:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3C818E0950 for ; Tue, 30 Aug 2022 17:50:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5A8B4340E8A for ; Tue, 30 Aug 2022 17:50:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E428557D for ; Tue, 30 Aug 2022 17:50:54 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1661881845.0a342ee2536a73c3c45f6bebf0cb0e0692a637c8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/lua/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/lua/lua-5.1.5-r107.ebuild dev-lang/lua/lua-5.1.5-r108.ebuild dev-lang/lua/lua-5.3.6-r3.ebuild dev-lang/lua/lua-5.3.6-r4.ebuild dev-lang/lua/lua-5.4.4-r1.ebuild dev-lang/lua/lua-5.4.4.ebuild X-VCS-Directories: dev-lang/lua/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0a342ee2536a73c3c45f6bebf0cb0e0692a637c8 X-VCS-Branch: master Date: Tue, 30 Aug 2022 17:50:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e303fc76-67aa-41af-a6a6-ae8869d831cd X-Archives-Hash: 4b12b4d217103e20a8d2ba104af8b03c commit: 0a342ee2536a73c3c45f6bebf0cb0e0692a637c8 Author: Sam James gentoo org> AuthorDate: Tue Aug 30 16:53:48 2022 +0000 Commit: Sam James gentoo 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 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}"