| 1 |
commit: 3c6c88c3400f1da7df3f8d21a9f99181988099c8 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 30 17:55:33 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 30 17:55:33 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c6c88c3 |
| 7 |
|
| 8 |
dev-lang/lua: drop multilib remnants |
| 9 |
|
| 10 |
Fixes: 0a342ee2536a73c3c45f6bebf0cb0e0692a637c8 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-lang/lua/{lua-5.1.5-r108.ebuild => lua-5.1.5-r109.ebuild} | 6 ------ |
| 14 |
dev-lang/lua/{lua-5.3.6-r4.ebuild => lua-5.3.6-r5.ebuild} | 6 ------ |
| 15 |
dev-lang/lua/{lua-5.4.4-r1.ebuild => lua-5.4.4-r2.ebuild} | 8 +------- |
| 16 |
3 files changed, 1 insertion(+), 19 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-lang/lua/lua-5.1.5-r108.ebuild b/dev-lang/lua/lua-5.1.5-r109.ebuild |
| 19 |
similarity index 98% |
| 20 |
rename from dev-lang/lua/lua-5.1.5-r108.ebuild |
| 21 |
rename to dev-lang/lua/lua-5.1.5-r109.ebuild |
| 22 |
index fc8eeb20db3d..d8435479911b 100644 |
| 23 |
--- a/dev-lang/lua/lua-5.1.5-r108.ebuild |
| 24 |
+++ b/dev-lang/lua/lua-5.1.5-r109.ebuild |
| 25 |
@@ -27,10 +27,6 @@ DEPEND=" |
| 26 |
sys-devel/libtool" |
| 27 |
RDEPEND="${COMMON_DEPEND}" |
| 28 |
|
| 29 |
-WRAPPED_HEADERS=( |
| 30 |
- /usr/include/lua${SLOT}/luaconf.h |
| 31 |
-) |
| 32 |
- |
| 33 |
src_prepare() { |
| 34 |
PATCHES=( |
| 35 |
"${FILESDIR}/lua-5.1.5-make.patch" |
| 36 |
@@ -119,9 +115,7 @@ src_install() { |
| 37 |
|
| 38 |
insinto /usr/$(get_libdir)/pkgconfig |
| 39 |
newins etc/lua.pc lua${SLOT}.pc |
| 40 |
-} |
| 41 |
|
| 42 |
-src_install_all() { |
| 43 |
DOCS="HISTORY README" |
| 44 |
HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif" |
| 45 |
einstalldocs |
| 46 |
|
| 47 |
diff --git a/dev-lang/lua/lua-5.3.6-r4.ebuild b/dev-lang/lua/lua-5.3.6-r5.ebuild |
| 48 |
similarity index 98% |
| 49 |
rename from dev-lang/lua/lua-5.3.6-r4.ebuild |
| 50 |
rename to dev-lang/lua/lua-5.3.6-r5.ebuild |
| 51 |
index c343a24eb1df..b74e72009aa8 100644 |
| 52 |
--- a/dev-lang/lua/lua-5.3.6-r4.ebuild |
| 53 |
+++ b/dev-lang/lua/lua-5.3.6-r5.ebuild |
| 54 |
@@ -33,10 +33,6 @@ RDEPEND="${COMMON_DEPEND}" |
| 55 |
|
| 56 |
RESTRICT="!test? ( test )" |
| 57 |
|
| 58 |
-WRAPPED_HEADERS=( |
| 59 |
- /usr/include/lua${SLOT}/luaconf.h |
| 60 |
-) |
| 61 |
- |
| 62 |
PATCHES=( |
| 63 |
"${FILESDIR}/lua-5.3.6-make.patch" |
| 64 |
) |
| 65 |
@@ -150,9 +146,7 @@ src_install() { |
| 66 |
# Older systems called it 'lua53.pc' |
| 67 |
dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua-${SLOT}.pc" |
| 68 |
dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc" |
| 69 |
-} |
| 70 |
|
| 71 |
-src_install_all() { |
| 72 |
DOCS="README" |
| 73 |
HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif" |
| 74 |
einstalldocs |
| 75 |
|
| 76 |
diff --git a/dev-lang/lua/lua-5.4.4-r1.ebuild b/dev-lang/lua/lua-5.4.4-r2.ebuild |
| 77 |
similarity index 98% |
| 78 |
rename from dev-lang/lua/lua-5.4.4-r1.ebuild |
| 79 |
rename to dev-lang/lua/lua-5.4.4-r2.ebuild |
| 80 |
index 72fddc869232..6cffda8c5a43 100644 |
| 81 |
--- a/dev-lang/lua/lua-5.4.4-r1.ebuild |
| 82 |
+++ b/dev-lang/lua/lua-5.4.4-r2.ebuild |
| 83 |
@@ -33,10 +33,6 @@ RDEPEND="${COMMON_DEPEND}" |
| 84 |
|
| 85 |
RESTRICT="!test? ( test )" |
| 86 |
|
| 87 |
-WRAPPED_HEADERS=( |
| 88 |
- /usr/include/lua${SLOT}/luaconf.h |
| 89 |
-) |
| 90 |
- |
| 91 |
PATCHES=( |
| 92 |
"${FILESDIR}"/lua-5.4.2-r2-make.patch |
| 93 |
) |
| 94 |
@@ -114,7 +110,7 @@ src_install() { |
| 95 |
emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \ |
| 96 |
V=${SLOT} gentoo_install |
| 97 |
|
| 98 |
- case $SLOT in |
| 99 |
+ case ${SLOT} in |
| 100 |
0) |
| 101 |
LIBNAME="lua" |
| 102 |
INCLUDEDIR_SUFFIX='' |
| 103 |
@@ -147,9 +143,7 @@ src_install() { |
| 104 |
# Older systems called it 'lua53.pc' |
| 105 |
dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua-${SLOT}.pc" |
| 106 |
dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc" |
| 107 |
-} |
| 108 |
|
| 109 |
-src_install_all() { |
| 110 |
DOCS="README" |
| 111 |
HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif" |
| 112 |
einstalldocs |
Archives