From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1432073-garchives=archives.gentoo.org@lists.gentoo.org>
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 CF123158094
for <garchives@archives.gentoo.org>; Tue, 30 Aug 2022 17:55:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D5D49E0878;
Tue, 30 Aug 2022 17:55:49 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 B3B33E0878
for <gentoo-commits@lists.gentoo.org>; Tue, 30 Aug 2022 17:55:49 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 smtp.gentoo.org (Postfix) with ESMTPS id A7F9134111B
for <gentoo-commits@lists.gentoo.org>; Tue, 30 Aug 2022 17:55:48 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 265C757D
for <gentoo-commits@lists.gentoo.org>; Tue, 30 Aug 2022 17:55:47 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1661882133.3c6c88c3400f1da7df3f8d21a9f99181988099c8.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-r108.ebuild dev-lang/lua/lua-5.1.5-r109.ebuild dev-lang/lua/lua-5.3.6-r4.ebuild dev-lang/lua/lua-5.3.6-r5.ebuild dev-lang/lua/lua-5.4.4-r1.ebuild dev-lang/lua/lua-5.4.4-r2.ebuild
X-VCS-Directories: dev-lang/lua/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 3c6c88c3400f1da7df3f8d21a9f99181988099c8
X-VCS-Branch: master
Date: Tue, 30 Aug 2022 17:55:47 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 28d3e41c-d48b-43cf-9698-6ed1cf478320
X-Archives-Hash: 372b54bddf0b884cc761c9c93cedee32
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