| 1 |
commit: 0a342ee2536a73c3c45f6bebf0cb0e0692a637c8 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 30 16:53:48 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 30 17:50:45 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a342ee2 |
| 7 |
|
| 8 |
dev-lang/lua: drop multilib |
| 9 |
|
| 10 |
Nothing in Gentoo needs this and it's a waste of resources. |
| 11 |
|
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
.../{lua-5.1.5-r107.ebuild => lua-5.1.5-r108.ebuild} | 18 +++++++++--------- |
| 15 |
.../lua/{lua-5.3.6-r3.ebuild => lua-5.3.6-r4.ebuild} | 16 ++++++++-------- |
| 16 |
dev-lang/lua/{lua-5.4.4.ebuild => lua-5.4.4-r1.ebuild} | 16 ++++++++-------- |
| 17 |
3 files changed, 25 insertions(+), 25 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-lang/lua/lua-5.1.5-r107.ebuild b/dev-lang/lua/lua-5.1.5-r108.ebuild |
| 20 |
similarity index 92% |
| 21 |
rename from dev-lang/lua/lua-5.1.5-r107.ebuild |
| 22 |
rename to dev-lang/lua/lua-5.1.5-r108.ebuild |
| 23 |
index ac331a705a8d..fc8eeb20db3d 100644 |
| 24 |
--- a/dev-lang/lua/lua-5.1.5-r107.ebuild |
| 25 |
+++ b/dev-lang/lua/lua-5.1.5-r108.ebuild |
| 26 |
@@ -3,7 +3,7 @@ |
| 27 |
|
| 28 |
EAPI=7 |
| 29 |
|
| 30 |
-inherit multilib-minimal portability toolchain-funcs |
| 31 |
+inherit portability toolchain-funcs |
| 32 |
|
| 33 |
DESCRIPTION="A powerful light-weight programming language designed for extending applications" |
| 34 |
HOMEPAGE="https://www.lua.org/" |
| 35 |
@@ -16,7 +16,7 @@ IUSE="+deprecated readline" |
| 36 |
|
| 37 |
COMMON_DEPEND=" |
| 38 |
>=app-eselect/eselect-lua-3 |
| 39 |
- readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] ) |
| 40 |
+ readline? ( >=sys-libs/readline-6.2_p5-r1:0= ) |
| 41 |
!dev-lang/lua:0" |
| 42 |
# Cross-compiling note: |
| 43 |
# Must use libtool from the target system (DEPEND) because |
| 44 |
@@ -27,7 +27,7 @@ DEPEND=" |
| 45 |
sys-devel/libtool" |
| 46 |
RDEPEND="${COMMON_DEPEND}" |
| 47 |
|
| 48 |
-MULTILIB_WRAPPED_HEADERS=( |
| 49 |
+WRAPPED_HEADERS=( |
| 50 |
/usr/include/lua${SLOT}/luaconf.h |
| 51 |
) |
| 52 |
|
| 53 |
@@ -77,10 +77,10 @@ src_prepare() { |
| 54 |
"${S}"/etc/lua.pc |
| 55 |
|
| 56 |
# custom Makefiles |
| 57 |
- multilib_copy_sources |
| 58 |
+ copy_sources |
| 59 |
} |
| 60 |
|
| 61 |
-multilib_src_configure() { |
| 62 |
+src_configure() { |
| 63 |
# We want packages to find our things... |
| 64 |
sed -i \ |
| 65 |
-e 's:/usr/local:'${EPREFIX}'/usr:' \ |
| 66 |
@@ -88,7 +88,7 @@ multilib_src_configure() { |
| 67 |
etc/lua.pc src/luaconf.h || die |
| 68 |
} |
| 69 |
|
| 70 |
-multilib_src_compile() { |
| 71 |
+src_compile() { |
| 72 |
tc-export CC |
| 73 |
myflags= |
| 74 |
# what to link to liblua |
| 75 |
@@ -113,7 +113,7 @@ multilib_src_compile() { |
| 76 |
mv lua_test ../test/lua.static |
| 77 |
} |
| 78 |
|
| 79 |
-multilib_src_install() { |
| 80 |
+src_install() { |
| 81 |
emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \ |
| 82 |
V=${SLOT} gentoo_install |
| 83 |
|
| 84 |
@@ -121,7 +121,7 @@ multilib_src_install() { |
| 85 |
newins etc/lua.pc lua${SLOT}.pc |
| 86 |
} |
| 87 |
|
| 88 |
-multilib_src_install_all() { |
| 89 |
+src_install_all() { |
| 90 |
DOCS="HISTORY README" |
| 91 |
HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif" |
| 92 |
einstalldocs |
| 93 |
@@ -131,7 +131,7 @@ multilib_src_install_all() { |
| 94 |
find "${ED}" -name 'liblua*.a' -delete || die |
| 95 |
} |
| 96 |
|
| 97 |
-multilib_src_test() { |
| 98 |
+src_test() { |
| 99 |
local positive="bisect cf echo env factorial fib fibfor hello printf sieve |
| 100 |
sort trace-calls trace-globals" |
| 101 |
local negative="readonly" |
| 102 |
|
| 103 |
diff --git a/dev-lang/lua/lua-5.3.6-r3.ebuild b/dev-lang/lua/lua-5.3.6-r4.ebuild |
| 104 |
similarity index 95% |
| 105 |
rename from dev-lang/lua/lua-5.3.6-r3.ebuild |
| 106 |
rename to dev-lang/lua/lua-5.3.6-r4.ebuild |
| 107 |
index 75ad75f26338..c343a24eb1df 100644 |
| 108 |
--- a/dev-lang/lua/lua-5.3.6-r3.ebuild |
| 109 |
+++ b/dev-lang/lua/lua-5.3.6-r4.ebuild |
| 110 |
@@ -3,7 +3,7 @@ |
| 111 |
|
| 112 |
EAPI=7 |
| 113 |
|
| 114 |
-inherit autotools multilib-minimal portability toolchain-funcs |
| 115 |
+inherit autotools portability toolchain-funcs |
| 116 |
|
| 117 |
DESCRIPTION="A powerful light-weight programming language designed for extending applications" |
| 118 |
HOMEPAGE="https://www.lua.org/" |
| 119 |
@@ -33,7 +33,7 @@ RDEPEND="${COMMON_DEPEND}" |
| 120 |
|
| 121 |
RESTRICT="!test? ( test )" |
| 122 |
|
| 123 |
-MULTILIB_WRAPPED_HEADERS=( |
| 124 |
+WRAPPED_HEADERS=( |
| 125 |
/usr/include/lua${SLOT}/luaconf.h |
| 126 |
) |
| 127 |
|
| 128 |
@@ -69,10 +69,10 @@ src_prepare() { |
| 129 |
eautoreconf |
| 130 |
|
| 131 |
# custom Makefiles |
| 132 |
- multilib_copy_sources |
| 133 |
+ copy_sources |
| 134 |
} |
| 135 |
|
| 136 |
-multilib_src_configure() { |
| 137 |
+src_configure() { |
| 138 |
sed -i \ |
| 139 |
-e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \ |
| 140 |
-e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \ |
| 141 |
@@ -82,7 +82,7 @@ multilib_src_configure() { |
| 142 |
econf |
| 143 |
} |
| 144 |
|
| 145 |
-multilib_src_compile() { |
| 146 |
+src_compile() { |
| 147 |
tc-export CC |
| 148 |
|
| 149 |
# what to link to liblua |
| 150 |
@@ -113,7 +113,7 @@ multilib_src_compile() { |
| 151 |
gentoo_all |
| 152 |
} |
| 153 |
|
| 154 |
-multilib_src_install() { |
| 155 |
+src_install() { |
| 156 |
emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \ |
| 157 |
V=${SLOT} gentoo_install |
| 158 |
|
| 159 |
@@ -152,7 +152,7 @@ multilib_src_install() { |
| 160 |
dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc" |
| 161 |
} |
| 162 |
|
| 163 |
-multilib_src_install_all() { |
| 164 |
+src_install_all() { |
| 165 |
DOCS="README" |
| 166 |
HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif" |
| 167 |
einstalldocs |
| 168 |
@@ -188,7 +188,7 @@ src_test() { |
| 169 |
return 0 |
| 170 |
} |
| 171 |
|
| 172 |
- multilib_foreach_abi abi_src_test |
| 173 |
+ foreach_abi abi_src_test |
| 174 |
|
| 175 |
if [ -e "${TEST_MARKER}" ]; then |
| 176 |
cat "${TEST_MARKER}" |
| 177 |
|
| 178 |
diff --git a/dev-lang/lua/lua-5.4.4.ebuild b/dev-lang/lua/lua-5.4.4-r1.ebuild |
| 179 |
similarity index 95% |
| 180 |
rename from dev-lang/lua/lua-5.4.4.ebuild |
| 181 |
rename to dev-lang/lua/lua-5.4.4-r1.ebuild |
| 182 |
index 4d4cae364438..72fddc869232 100644 |
| 183 |
--- a/dev-lang/lua/lua-5.4.4.ebuild |
| 184 |
+++ b/dev-lang/lua/lua-5.4.4-r1.ebuild |
| 185 |
@@ -3,7 +3,7 @@ |
| 186 |
|
| 187 |
EAPI=7 |
| 188 |
|
| 189 |
-inherit autotools multilib-minimal portability toolchain-funcs |
| 190 |
+inherit autotools portability toolchain-funcs |
| 191 |
|
| 192 |
DESCRIPTION="A powerful light-weight programming language designed for extending applications" |
| 193 |
HOMEPAGE="https://www.lua.org/" |
| 194 |
@@ -33,7 +33,7 @@ RDEPEND="${COMMON_DEPEND}" |
| 195 |
|
| 196 |
RESTRICT="!test? ( test )" |
| 197 |
|
| 198 |
-MULTILIB_WRAPPED_HEADERS=( |
| 199 |
+WRAPPED_HEADERS=( |
| 200 |
/usr/include/lua${SLOT}/luaconf.h |
| 201 |
) |
| 202 |
|
| 203 |
@@ -65,10 +65,10 @@ src_prepare() { |
| 204 |
eautoreconf |
| 205 |
|
| 206 |
# custom Makefiles |
| 207 |
- multilib_copy_sources |
| 208 |
+ copy_sources |
| 209 |
} |
| 210 |
|
| 211 |
-multilib_src_configure() { |
| 212 |
+src_configure() { |
| 213 |
sed -i \ |
| 214 |
-e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \ |
| 215 |
-e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \ |
| 216 |
@@ -78,7 +78,7 @@ multilib_src_configure() { |
| 217 |
econf |
| 218 |
} |
| 219 |
|
| 220 |
-multilib_src_compile() { |
| 221 |
+src_compile() { |
| 222 |
tc-export CC |
| 223 |
|
| 224 |
# what to link to liblua |
| 225 |
@@ -110,7 +110,7 @@ multilib_src_compile() { |
| 226 |
gentoo_all |
| 227 |
} |
| 228 |
|
| 229 |
-multilib_src_install() { |
| 230 |
+src_install() { |
| 231 |
emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \ |
| 232 |
V=${SLOT} gentoo_install |
| 233 |
|
| 234 |
@@ -149,7 +149,7 @@ multilib_src_install() { |
| 235 |
dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc" |
| 236 |
} |
| 237 |
|
| 238 |
-multilib_src_install_all() { |
| 239 |
+src_install_all() { |
| 240 |
DOCS="README" |
| 241 |
HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif" |
| 242 |
einstalldocs |
| 243 |
@@ -185,7 +185,7 @@ src_test() { |
| 244 |
return 0 |
| 245 |
} |
| 246 |
|
| 247 |
- multilib_foreach_abi abi_src_test |
| 248 |
+ foreach_abi abi_src_test |
| 249 |
|
| 250 |
if [ -e "${TEST_MARKER}" ]; then |
| 251 |
cat "${TEST_MARKER}" |
Archives