summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2020-11-16 09:04:52 -0600
committerWilliam Hubbs <williamh@gentoo.org>2020-11-16 09:06:22 -0600
commit45d981ed13785da38b1eb1788137fd9ea1165593 (patch)
tree555510ca4dbd554aa68d4968523a7f4a67091832 /dev-lang
parentdev-lua/luv-1.32.0.0-r101: support lua5-4 (diff)
downloadgentoo-45d981ed13785da38b1eb1788137fd9ea1165593.tar.gz
gentoo-45d981ed13785da38b1eb1788137fd9ea1165593.tar.bz2
gentoo-45d981ed13785da38b1eb1788137fd9ea1165593.zip
dev-lang/lua: 5.4.1 eapi 7 fixes
Signed-off-by: William Hubbs <williamh@gentoo.org>
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/lua/files/lua-5.4-makefiles.patch4
-rw-r--r--dev-lang/lua/lua-5.4.1.ebuild6
2 files changed, 5 insertions, 5 deletions
diff --git a/dev-lang/lua/files/lua-5.4-makefiles.patch b/dev-lang/lua/files/lua-5.4-makefiles.patch
index 461abb9b0d9d..87e3a276897f 100644
--- a/dev-lang/lua/files/lua-5.4-makefiles.patch
+++ b/dev-lang/lua/files/lua-5.4-makefiles.patch
@@ -25,7 +25,7 @@ index 1797df9..90284d8 100644
+# Use libtool for binary installs, etc.
+
+export V
-+export LIBTOOL = $(EROOT)/usr/bin/libtool --quiet --tag=CC
++export LIBTOOL = $(ROOT)/usr/bin/libtool --quiet --tag=CC
+# See libtool manual about how to set this
+
+gentoo_clean:
@@ -71,7 +71,7 @@ index 514593d..8af8f99 100644
# (end of Makefile)
+
-+export LIBTOOL = $(EROOT)/usr/bin/libtool --quiet --tag=CC
++export LIBTOOL = $(ROOT)/usr/bin/libtool --quiet --tag=CC
+export LIB_VERSION = 6:1:1
+
+# The following rules use libtool for compiling and linking in order to
diff --git a/dev-lang/lua/lua-5.4.1.ebuild b/dev-lang/lua/lua-5.4.1.ebuild
index 97b958f75f9b..d20880d9c820 100644
--- a/dev-lang/lua/lua-5.4.1.ebuild
+++ b/dev-lang/lua/lua-5.4.1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit eutils autotools multilib multilib-minimal portability toolchain-funcs
+inherit autotools multilib multilib-minimal portability toolchain-funcs
DESCRIPTION="A powerful light-weight programming language designed for extending applications"
HOMEPAGE="http://www.lua.org/"
@@ -21,9 +21,9 @@ COMMON_DEPEND="
app-eselect/eselect-lua
readline? ( sys-libs/readline:0= )
!dev-lang/lua:0"
-DEPEND="${COMMON_DEPEND}
- sys-devel/libtool"
+DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}"
+BDEPEND="sys-devel/libtool"
RESTRICT="!test? ( test )"