diff options
author | 2017-11-02 13:24:39 +0700 | |
---|---|---|
committer | 2017-11-02 13:24:39 +0700 | |
commit | a50ea72816faadd68763c8f8df9e46b2b5d8bef2 (patch) | |
tree | 6b9bbb73cea80105597a6b629a08797656d72828 | |
parent | eselect-luajit: some prefix-related fixes (diff) | |
download | lua-a50ea72816faadd68763c8f8df9e46b2b5d8bef2.tar.gz lua-a50ea72816faadd68763c8f8df9e46b2b5d8bef2.tar.bz2 lua-a50ea72816faadd68763c8f8df9e46b2b5d8bef2.zip |
lua: porting to patch eclass, sync with tree
-rw-r--r-- | dev-lang/lua/Manifest | 2 | ||||
-rw-r--r-- | dev-lang/lua/files/configure.ac (renamed from dev-lang/lua/files/configure.in) | 0 | ||||
-rw-r--r-- | dev-lang/lua/files/patches/5.1.5/0001_make.patch (renamed from dev-lang/lua/files/lua-5.1-make-r2.patch) | 12 | ||||
-rw-r--r-- | dev-lang/lua/files/patches/5.1.5/0002_module_paths.patch (renamed from dev-lang/lua/files/lua-5.1-module_paths.patch) | 6 | ||||
-rw-r--r-- | dev-lang/lua/files/patches/5.1.5/conditional/no-deprecated/0001_no-deprecated.patch (renamed from dev-lang/lua/files/lua-5.1.4-deprecated.patch) | 6 | ||||
-rw-r--r-- | dev-lang/lua/files/patches/5.1.5/conditional/no-deprecated/0002_tests.patch (renamed from dev-lang/lua/files/lua-5.1.4-test.patch) | 4 | ||||
-rw-r--r-- | dev-lang/lua/files/patches/5.1.5/conditional/no-readline/0001_no-readline.patch (renamed from dev-lang/lua/files/lua-5.1-readline.patch) | 4 | ||||
-rw-r--r-- | dev-lang/lua/files/patches/5.1.5/conditional/static/0001_make-static.patch (renamed from dev-lang/lua/files/lua-5.1-make_static-r1.patch) | 6 | ||||
-rw-r--r-- | dev-lang/lua/files/patches/5.2.4/0001_make.patch (renamed from dev-lang/lua/files/lua-5.2-make-r1.patch) | 0 | ||||
-rw-r--r-- | dev-lang/lua/files/patches/5.3.4/0001_make.patch (renamed from dev-lang/lua/files/lua-5.3-make.patch) | 32 | ||||
-rw-r--r-- | dev-lang/lua/lua-5.1.5-r101.ebuild | 68 | ||||
-rw-r--r-- | dev-lang/lua/lua-5.2.4.ebuild | 54 | ||||
-rw-r--r-- | dev-lang/lua/lua-5.3.4.ebuild (renamed from dev-lang/lua/lua-5.3.3.ebuild) | 58 |
13 files changed, 130 insertions, 122 deletions
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest index 6b3273b..08f1547 100644 --- a/dev-lang/lua/Manifest +++ b/dev-lang/lua/Manifest @@ -1,3 +1,3 @@ DIST lua-5.1.5.tar.gz 221213 SHA256 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333 SHA512 0142fefcbd13afcd9b201403592aa60620011cc8e8559d4d2db2f92739d18186860989f48caa45830ff4f99bfc7483287fd3ff3a16d4dec928e2767ce4d542a9 WHIRLPOOL 9dac93b73b9ad1ef6c69e0aa11fb53d5efe89274b65c55a1ac30bab23e8a255851b0e44306db54212b1d481e658cecd38e5ff22a25e1fa974858b7b03fb45b75 DIST lua-5.2.4.tar.gz 252651 SHA256 b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b SHA512 cd77148aba4b707b6c159758b5e8444e04f968092eb98f6b4c405b2fb647e709370d5a8dcf604176101d3407e196a7433b5dcdce4fe9605c76191d3649d61a8c WHIRLPOOL 4ddd1aefa63ea2df5d7e2a774aa89a427fa6753c11db26c70ebf82eece7b05807b7ada2c0966057fe2ddebf8ab792c0060aa51b0d29cd58572b2a0ba9dbabfdc -DIST lua-5.3.3.tar.gz 294290 SHA256 5113c06884f7de453ce57702abaac1d618307f33f6789fa870e87a59d772aca2 SHA512 7b8122ed48ea2a9faa47d1b69b4a5b1523bb7be67e78f252bb4339bf75e957a88c5405156e22b4b63ccf607a5407bf017a4cee1ce12b1aa5262047655960a3cc WHIRLPOOL e9d58093327e3c67e167dad9952796f1f2f0dbfa4f165c0ec5a8808a6a73d3b25e564797a2804d408bdaeb7229e7684f907491137d4521119ba918ce87c781bc +DIST lua-5.3.4.tar.gz 303586 SHA256 f681aa518233bc407e23acf0f5887c884f17436f000d453b2491a9f11a52400c SHA512 739e31f82e6a60fa99910c2005e991b3a1e21339af52847f653cb190b30842054d189ca116ffcfdf9b36e07888c9ce5642b1dd2988cc7eff9f8789f9a2e34997 WHIRLPOOL d7d05431f8740c18bea29068f7e82132055d6b236592a5153f2f45043394ac7d6f18982ca62388428e5f57b299351ecf1fe1d675da6e6e9117d3549bb9daf382 diff --git a/dev-lang/lua/files/configure.in b/dev-lang/lua/files/configure.ac index e4ba816..e4ba816 100644 --- a/dev-lang/lua/files/configure.in +++ b/dev-lang/lua/files/configure.ac diff --git a/dev-lang/lua/files/lua-5.1-make-r2.patch b/dev-lang/lua/files/patches/5.1.5/0001_make.patch index 2905a62..bcce5b2 100644 --- a/dev-lang/lua/files/lua-5.1-make-r2.patch +++ b/dev-lang/lua/files/patches/5.1.5/0001_make.patch @@ -1,6 +1,6 @@ -diff -ru lua-5.1.5.orig/Makefile lua-5.1.5/Makefile ---- lua-5.1.5.orig/Makefile 2014-04-15 17:43:34.845435031 +0200 -+++ lua-5.1.5/Makefile 2014-04-15 19:05:08.669304987 +0200 +diff -ru a/Makefile b/Makefile +--- a/Makefile 2014-04-15 17:43:34.845435031 +0200 ++++ b/Makefile 2014-04-15 19:05:08.669304987 +0200 @@ -11,7 +11,7 @@ # so take care if INSTALL_TOP is not an absolute path. INSTALL_TOP= /usr/local @@ -32,9 +32,9 @@ diff -ru lua-5.1.5.orig/Makefile lua-5.1.5/Makefile + cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua$V luac$V $(INSTALL_BIN) + cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) + cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua$V.la $(INSTALL_LIB) -diff -ru lua-5.1.5.orig/src/Makefile lua-5.1.5/src/Makefile ---- lua-5.1.5.orig/src/Makefile 2014-04-15 17:43:34.844435031 +0200 -+++ lua-5.1.5/src/Makefile 2014-04-15 18:07:21.427397122 +0200 +diff -ru a/src/Makefile b/src/Makefile +--- a/src/Makefile 2014-04-15 17:43:34.844435031 +0200 ++++ b/src/Makefile 2014-04-15 18:07:21.427397122 +0200 @@ -29,10 +29,10 @@ LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \ lstrlib.o loadlib.o linit.o diff --git a/dev-lang/lua/files/lua-5.1-module_paths.patch b/dev-lang/lua/files/patches/5.1.5/0002_module_paths.patch index 29ac4c3..5b765c6 100644 --- a/dev-lang/lua/files/lua-5.1-module_paths.patch +++ b/dev-lang/lua/files/patches/5.1.5/0002_module_paths.patch @@ -5,9 +5,9 @@ ## DP: Set Lua's default PATH and CPATH. @DPATCH@ -diff -urNad trunk~/src/luaconf.h trunk/src/luaconf.h ---- trunk~/src/luaconf.h 2006-02-10 12:44:06.000000000 -0500 -+++ trunk/src/luaconf.h 2006-02-17 21:32:55.000000000 -0500 +diff -urNad a/src/luaconf.h b/src/luaconf.h +--- a/src/luaconf.h 2006-02-10 12:44:06.000000000 -0500 ++++ b/src/luaconf.h 2006-02-17 21:32:55.000000000 -0500 @@ -83,13 +83,17 @@ #else diff --git a/dev-lang/lua/files/lua-5.1.4-deprecated.patch b/dev-lang/lua/files/patches/5.1.5/conditional/no-deprecated/0001_no-deprecated.patch index a88a991..8e5296a 100644 --- a/dev-lang/lua/files/lua-5.1.4-deprecated.patch +++ b/dev-lang/lua/files/patches/5.1.5/conditional/no-deprecated/0001_no-deprecated.patch @@ -1,6 +1,6 @@ -diff -rdu lua-5.1.3.orig/src/luaconf.h lua-5.1.3/src/luaconf.h ---- lua-5.1.3.orig/src/luaconf.h 2008-02-12 17:00:03.000000000 +0000 -+++ lua-5.1.3/src/luaconf.h 2008-02-12 17:07:55.000000000 +0000 +diff -rdu a/src/luaconf.h b/src/luaconf.h +--- a/src/luaconf.h 2008-02-12 17:00:03.000000000 +0000 ++++ b/src/luaconf.h 2008-02-12 17:07:55.000000000 +0000 @@ -340,14 +340,14 @@ ** CHANGE it to undefined as soon as your programs use only '...' to ** access vararg parameters (instead of the old 'arg' table). diff --git a/dev-lang/lua/files/lua-5.1.4-test.patch b/dev-lang/lua/files/patches/5.1.5/conditional/no-deprecated/0002_tests.patch index 99b4ad6..7ba4495 100644 --- a/dev-lang/lua/files/lua-5.1.4-test.patch +++ b/dev-lang/lua/files/patches/5.1.5/conditional/no-deprecated/0002_tests.patch @@ -1,5 +1,5 @@ ---- test/sieve.lua~ 2002-10-31 03:52:58.000000000 +0100 -+++ test/sieve.lua 2008-02-20 17:44:22.468281121 +0100 +--- a/test/sieve.lua 2002-10-31 03:52:58.000000000 +0100 ++++ b/test/sieve.lua 2008-02-20 17:44:22.468281121 +0100 @@ -14,7 +14,7 @@ while 1 do local n = g() diff --git a/dev-lang/lua/files/lua-5.1-readline.patch b/dev-lang/lua/files/patches/5.1.5/conditional/no-readline/0001_no-readline.patch index f144861..1ddeffd 100644 --- a/dev-lang/lua/files/lua-5.1-readline.patch +++ b/dev-lang/lua/files/patches/5.1.5/conditional/no-readline/0001_no-readline.patch @@ -1,5 +1,5 @@ ---- lua-5.1.1.orig/src/luaconf.h 2006-04-10 20:27:23.000000000 +0200 -+++ lua-5.1.1/src/luaconf.h 2006-11-15 14:53:07.000000000 +0100 +--- a/src/luaconf.h 2006-04-10 20:27:23.000000000 +0200 ++++ b/src/luaconf.h 2006-11-15 14:53:07.000000000 +0100 @@ -36,7 +36,6 @@ #if defined(LUA_USE_LINUX) #define LUA_USE_POSIX diff --git a/dev-lang/lua/files/lua-5.1-make_static-r1.patch b/dev-lang/lua/files/patches/5.1.5/conditional/static/0001_make-static.patch index e5fdc3a..2efb414 100644 --- a/dev-lang/lua/files/lua-5.1-make_static-r1.patch +++ b/dev-lang/lua/files/patches/5.1.5/conditional/static/0001_make-static.patch @@ -1,6 +1,6 @@ -diff -ru lua-5.1.1.orig/src/Makefile lua-5.1.1/src/Makefile ---- lua-5.1.1.orig/src/Makefile 2006-11-21 07:19:31 +0000 -+++ lua-5.1.1/src/Makefile 2006-11-21 07:19:52 +0000 +diff -ru a/src/Makefile b/src/Makefile +--- a/src/Makefile 2006-11-21 07:19:31 +0000 ++++ b/src/Makefile 2006-11-21 07:19:52 +0000 @@ -196,7 +196,7 @@ -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS) diff --git a/dev-lang/lua/files/lua-5.2-make-r1.patch b/dev-lang/lua/files/patches/5.2.4/0001_make.patch index a0624af..a0624af 100644 --- a/dev-lang/lua/files/lua-5.2-make-r1.patch +++ b/dev-lang/lua/files/patches/5.2.4/0001_make.patch diff --git a/dev-lang/lua/files/lua-5.3-make.patch b/dev-lang/lua/files/patches/5.3.4/0001_make.patch index ed22597..b9e9051 100644 --- a/dev-lang/lua/files/lua-5.3-make.patch +++ b/dev-lang/lua/files/patches/5.3.4/0001_make.patch @@ -1,5 +1,6 @@ ---- lua-5.1.1.orig/Makefile 2006-06-02 12:53:38.000000000 +0200 -+++ lua-5.1.1/Makefile 2006-11-16 02:16:53.000000000 +0100 +diff -uNr lua-5.3.3.orig/Makefile lua-5.3.3/Makefile +--- lua-5.3.3.orig/Makefile 2016-12-04 22:29:54.839135901 +0100 ++++ lua-5.3.3/Makefile 2016-12-04 22:31:14.235851109 +0100 @@ -12,7 +12,7 @@ # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h. INSTALL_TOP= /usr/local @@ -28,20 +29,35 @@ + cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua$V luac$V $(INSTALL_BIN) + cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) + cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua$V.la $(INSTALL_LIB) ---- lua-5.1.1.orig/src/Makefile 2006-03-22 01:41:49.000000000 +0100 -+++ lua-5.1.1/src/Makefile 2006-11-16 02:10:27.000000000 +0100 -@@ -39,1 +39,1 @@ +diff -uNr lua-5.3.3.orig/src/Makefile lua-5.3.3/src/Makefile +--- lua-5.3.3.orig/src/Makefile 2016-12-04 22:29:54.840135910 +0100 ++++ lua-5.3.3/src/Makefile 2016-12-04 22:34:55.980848068 +0100 +@@ -36,10 +36,10 @@ + lmathlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o loadlib.o linit.o + BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) + -LUA_T= lua +LUA_T= lua$V -@@ -42,1 +42,1 @@ + LUA_O= lua.o + -LUAC_T= luac +LUAC_T= luac$V -@@ -62,1 +62,1 @@ + LUAC_O= luac.o + + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) +@@ -59,10 +59,10 @@ + $(AR) $@ $(BASE_O) + $(RANLIB) $@ + -$(LUA_T): $(LUA_O) $(LUA_A) +origin$(LUA_T): $(LUA_O) $(LUA_A) -@@ -65,1 +65,1 @@ + $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + -$(LUAC_T): $(LUAC_O) $(LUA_A) +origin$(LUAC_T): $(LUAC_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) + + clean: @@ -195,3 +195,30 @@ lobject.h ltm.h lzio.h diff --git a/dev-lang/lua/lua-5.1.5-r101.ebuild b/dev-lang/lua/lua-5.1.5-r101.ebuild index 11b0934..d4c6967 100644 --- a/dev-lang/lua/lua-5.1.5-r101.ebuild +++ b/dev-lang/lua/lua-5.1.5-r101.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit eutils multilib multilib-minimal portability toolchain-funcs versionator +inherit eutils multilib multilib-minimal portability toolchain-funcs versionator patches DESCRIPTION="A powerful light-weight programming language designed for extending applications" HOMEPAGE="http://www.lua.org/" @@ -12,11 +12,13 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz" LICENSE="MIT" SLOT="5.1" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" -IUSE="+deprecated emacs readline static" +IUSE="+deprecated emacs readline +static" -RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}] ) +RDEPEND=" + readline? ( >=sys-libs/readline-6.3:0[${MULTILIB_USEDEP}] ) app-eselect/eselect-lua - !!dev-lang/lua:0" + !dev-lang/lua:0 +" DEPEND="${RDEPEND} sys-devel/libtool" PDEPEND="emacs? ( app-emacs/lua-mode )" @@ -24,45 +26,29 @@ PDEPEND="emacs? ( app-emacs/lua-mode )" SAN_SLOT="${SLOT//.}" MULTILIB_WRAPPED_HEADERS=( - /usr/include/lua${SLOT}/luaconf.h + "/usr/include/lua${SLOT}/luaconf.h" ) src_prepare() { - local PATCH_PV=${SLOT} - - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r2.patch - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch - - [ -d "${FILESDIR}/${PV}" ] && \ - EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch + patches_src_prepare # correct lua versioning sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:5:1/' src/Makefile sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html - if ! use deprecated ; then - # patches from 5.1.4 still apply - epatch "${FILESDIR}"/${PN}-5.1.4-deprecated.patch - epatch "${FILESDIR}"/${PN}-5.1.4-test.patch - fi - - if ! use readline ; then - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch - fi - - # Using dynamic linked lua is not recommended for performance - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519 - # Mainly, this is of concern if your arch is poor with GPRs, like x86 - # Note that this only affects the interpreter binary (named lua), not the lua - # compiler (built statically) nor the lua libraries (both shared and static - # are installed) - if use static ; then - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch - fi - # custom Makefiles multilib_copy_sources + + cp "${FILESDIR}/lua.pc" "${S}" + # A slotted Lua uses different directories for headers & names for + # libraries, and pkgconfig should reflect that. + sed -r -i \ + -e "s:^V=.*:V= ${SLOT}:" \ + -e "s:^R=.*:R= ${PV}:" \ + -e "s:/,lib,:/$(get_libdir):g" \ + -e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \ + "${S}"/lua.pc } multilib_src_configure() { @@ -101,20 +87,14 @@ multilib_src_install() { emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \ V=${SLOT} gentoo_install - cp "${FILESDIR}/lua.pc" "${WORKDIR}" - sed \ - -e "s:^V=.*:V= ${SLOT}:" \ - -e "s:^R=.*:R= ${PV}:" \ - -e "s:/,lib,:/$(get_libdir):g" \ - -i "${WORKDIR}/lua.pc" - insinto "/usr/$(get_libdir)/pkgconfig" - newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc" + newins "${S}/lua.pc" "lua${SLOT}.pc" } multilib_src_install_all() { - dodoc HISTORY README - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif + DOCS=(HISTORY README) + HTML_DOCS=(doc/*.html doc/*.png doc/*.css doc/*.gif) + einstalldocs doicon etc/lua.ico diff --git a/dev-lang/lua/lua-5.2.4.ebuild b/dev-lang/lua/lua-5.2.4.ebuild index f93da1d..d355aff 100644 --- a/dev-lang/lua/lua-5.2.4.ebuild +++ b/dev-lang/lua/lua-5.2.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit eutils autotools multilib multilib-minimal portability toolchain-funcs +inherit eutils autotools multilib multilib-minimal portability toolchain-funcs patches DESCRIPTION="A powerful light-weight programming language designed for extending applications" HOMEPAGE="http://www.lua.org/" @@ -12,26 +12,29 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz" LICENSE="MIT" SLOT="5.2" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" -IUSE="+deprecated emacs readline static" +IUSE="+deprecated emacs readline +static" -RDEPEND="readline? ( sys-libs/readline ) +RDEPEND=" + readline? ( >=sys-libs/readline-6.3:0[${MULTILIB_USEDEP}] ) app-eselect/eselect-lua - !dev-lang/lua:0" + !dev-lang/lua:0 +" DEPEND="${RDEPEND} sys-devel/libtool" PDEPEND="emacs? ( app-emacs/lua-mode )" MULTILIB_WRAPPED_HEADERS=( - /usr/include/lua${SLOT}/luaconf.h + "/usr/include/lua${SLOT}/luaconf.h" ) src_prepare() { - local PATCH_PV=${SLOT} + patches_src_prepare - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch - - [ -d "${FILESDIR}/${PV}" ] && \ - EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch + # use glibtool on Darwin (versus Apple libtool) + if [[ ${CHOST} == *-darwin* ]] ; then + sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \ + Makefile src/Makefile || die + fi # correct lua versioning sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die @@ -53,11 +56,21 @@ src_prepare() { fi # upstream does not use libtool, but we do (see bug #336167) - cp "${FILESDIR}/configure.in" "${S}"/ || die + cp "${FILESDIR}/configure.ac" "${S}"/ || die eautoreconf # custom Makefiles multilib_copy_sources + + cp "${FILESDIR}/lua.pc" "${S}" + # A slotted Lua uses different directories for headers & names for + # libraries, and pkgconfig should reflect that. + sed -r -i \ + -e "s:^V=.*:V= ${SLOT}:" \ + -e "s:^R=.*:R= ${PV}:" \ + -e "s:/,lib,:/$(get_libdir):g" \ + -e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \ + "${S}"/lua.pc } multilib_src_configure() { @@ -104,21 +117,14 @@ multilib_src_install() { emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \ V=${SLOT} gentoo_install - # We want packages to find our things... - cp "${FILESDIR}/lua.pc" "${WORKDIR}" - sed \ - -e "s:^V=.*:V= ${SLOT}:" \ - -e "s:^R=.*:R= ${PV}:" \ - -e "s:/,lib,:/$(get_libdir):g" \ - -i "${WORKDIR}/lua.pc" - insinto "/usr/$(get_libdir)/pkgconfig" - newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc" + newins "${S}/lua.pc" "lua${SLOT}.pc" } multilib_src_install_all() { - dodoc README - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif + DOCS=(README) + HTML_DOCS=(doc/*.html doc/*.png doc/*.css doc/*.gif) + einstalldocs newman doc/lua.1 lua${SLOT}.1 newman doc/luac.1 luac${SLOT}.1 diff --git a/dev-lang/lua/lua-5.3.3.ebuild b/dev-lang/lua/lua-5.3.4.ebuild index e2fe750..060ee45 100644 --- a/dev-lang/lua/lua-5.3.3.ebuild +++ b/dev-lang/lua/lua-5.3.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit eutils autotools multilib multilib-minimal portability toolchain-funcs +inherit eutils autotools multilib multilib-minimal portability toolchain-funcs patches DESCRIPTION="A powerful light-weight programming language designed for extending applications" HOMEPAGE="http://www.lua.org/" @@ -11,27 +11,30 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz" LICENSE="MIT" SLOT="5.3" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" -IUSE="+deprecated emacs readline static" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+deprecated emacs readline +static" -RDEPEND="readline? ( sys-libs/readline ) +RDEPEND=" + readline? ( >=sys-libs/readline-6.3:0[${MULTILIB_USEDEP}] ) app-eselect/eselect-lua - !dev-lang/lua:0" + !dev-lang/lua:0 +" DEPEND="${RDEPEND} sys-devel/libtool" PDEPEND="emacs? ( app-emacs/lua-mode )" MULTILIB_WRAPPED_HEADERS=( - /usr/include/lua${SLOT}/luaconf.h + "/usr/include/lua${SLOT}/luaconf.h" ) src_prepare() { - local PATCH_PV=${SLOT} + patches_src_prepare - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make.patch - - [ -d "${FILESDIR}/${PV}" ] && \ - EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch + # use glibtool on Darwin (versus Apple libtool) + if [[ ${CHOST} == *-darwin* ]] ; then + sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \ + Makefile src/Makefile || die + fi sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die @@ -52,11 +55,21 @@ src_prepare() { fi # upstream does not use libtool, but we do (see bug #336167) - cp "${FILESDIR}/configure.in" "${S}"/ || die + cp "${FILESDIR}/configure.ac" "${S}"/ || die eautoreconf # custom Makefiles multilib_copy_sources + + cp "${FILESDIR}/lua.pc" "${S}" + # A slotted Lua uses different directories for headers & names for + # libraries, and pkgconfig should reflect that. + sed -r -i \ + -e "s:^V=.*:V= ${SLOT}:" \ + -e "s:^R=.*:R= ${PV}:" \ + -e "s:/,lib,:/$(get_libdir):g" \ + -e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \ + "${S}"/lua.pc } multilib_src_configure() { @@ -83,7 +96,7 @@ multilib_src_compile() { cd src local myCFLAGS; - use deprecated && myCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" + use deprecated && myCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1 -DLUA_COMPAT_ALL" # -DLUA_COMPAT_FLOATSTRING" case "${CHOST}" in @@ -104,21 +117,14 @@ multilib_src_install() { emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \ V=${SLOT} gentoo_install - # We want packages to find our things... - cp "${FILESDIR}/lua.pc" "${WORKDIR}" - sed \ - -e "s:^V=.*:V= ${SLOT}:" \ - -e "s:^R=.*:R= ${PV}:" \ - -e "s:/,lib,:/$(get_libdir):g" \ - -i "${WORKDIR}/lua.pc" - insinto "/usr/$(get_libdir)/pkgconfig" - newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc" + newins "${S}/lua.pc" "lua${SLOT}.pc" } multilib_src_install_all() { - dodoc README - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif + DOCS=(README) + HTML_DOCS=(doc/*.html doc/*.png doc/*.css doc/*.gif) + einstalldocs newman doc/lua.1 lua${SLOT}.1 newman doc/luac.1 luac${SLOT}.1 |