commit: 8403a23f55f68430c75bd3d988a3f6f2d9edbc17 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Mon Jan 4 20:30:45 2016 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Mon Jan 4 20:30:45 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8403a23f
dev-lang/lua: import Prefix changes Package-Manager: portage-2.2.26 dev-lang/lua/lua-5.1.4-r8.ebuild | 12 +++++++++--- dev-lang/lua/lua-5.1.5-r100.ebuild | 8 +++++++- dev-lang/lua/lua-5.1.5-r3.ebuild | 8 +++++++- dev-lang/lua/lua-5.2.3-r1.ebuild | 8 +++++++- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dev-lang/lua/lua-5.1.4-r8.ebuild b/dev-lang/lua/lua-5.1.4-r8.ebuild index b2f0b68..3a4bbf1 100644 --- a/dev-lang/lua/lua-5.1.4-r8.ebuild +++ b/dev-lang/lua/lua-5.1.4-r8.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"; LICENSE="MIT" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-aix ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-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 )" @@ -26,6 +26,12 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch + # use glibtool on Darwin (versus Apple libtool) + if [[ ${CHOST} == *-darwin* ]] ; then + sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \ + Makefile src/Makefile || die + fi + EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch # correct lua versioning @@ -54,9 +60,9 @@ src_prepare() { # We want packages to find our things... sed -i \ - -e 's:/usr/local:/usr:' \ + -e "s:/usr/local:${EPREFIX}/usr:" \ -e "s:/\<lib\>:/$(get_libdir):g" \ - etc/lua.pc + etc/lua.pc src/luaconf.h } # no need for a configure phase diff --git a/dev-lang/lua/lua-5.1.5-r100.ebuild b/dev-lang/lua/lua-5.1.5-r100.ebuild index a02c3a3..88cc870 100644 --- a/dev-lang/lua/lua-5.1.5-r100.ebuild +++ b/dev-lang/lua/lua-5.1.5-r100.ebuild @@ -12,7 +12,7 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-aix ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-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-6.2_p5-r1[${MULTILIB_USEDEP}] ) @@ -34,6 +34,12 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r2.patch epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch + # use glibtool on Darwin (versus Apple libtool) + if [[ ${CHOST} == *-darwin* ]] ; then + sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \ + Makefile src/Makefile || die + fi + #EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch # correct lua versioning diff --git a/dev-lang/lua/lua-5.1.5-r3.ebuild b/dev-lang/lua/lua-5.1.5-r3.ebuild index 49edd5e..ab76592 100644 --- a/dev-lang/lua/lua-5.1.5-r3.ebuild +++ b/dev-lang/lua/lua-5.1.5-r3.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"; LICENSE="MIT" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-aix ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-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-6.2_p5-r1[${MULTILIB_USEDEP}] )" @@ -30,6 +30,12 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch + # use glibtool on Darwin (versus Apple libtool) + if [[ ${CHOST} == *-darwin* ]] ; then + sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \ + Makefile src/Makefile || die + fi + #EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch # correct lua versioning diff --git a/dev-lang/lua/lua-5.2.3-r1.ebuild b/dev-lang/lua/lua-5.2.3-r1.ebuild index 01c8f60..16d253d 100644 --- a/dev-lang/lua/lua-5.2.3-r1.ebuild +++ b/dev-lang/lua/lua-5.2.3-r1.ebuild @@ -12,7 +12,7 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-aix ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-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 ) @@ -31,6 +31,12 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch + # use glibtool on Darwin (versus Apple libtool) + if [[ ${CHOST} == *-darwin* ]] ; then + sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \ + Makefile src/Makefile || die + fi + [ -d "${FILESDIR}/${PV}" ] && \ EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
