diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2013-02-20 23:27:06 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2013-02-20 23:27:06 +0000 |
| commit | 44cc4c1008267f1969aa09c09f3afd9e09f2a360 (patch) | |
| tree | 3e88de6c6679daa425474a6b46483ebb6456683a /dev-lang | |
| parent | Export path to current AR executable, wrt bug #448904 (diff) | |
| download | gentoo-2-44cc4c1008267f1969aa09c09f3afd9e09f2a360.tar.gz gentoo-2-44cc4c1008267f1969aa09c09f3afd9e09f2a360.tar.bz2 gentoo-2-44cc4c1008267f1969aa09c09f3afd9e09f2a360.zip | |
Fix for prefix and add ~arm-linux + ~x86-linux keywords.
(Portage version: 2.2.0_alpha163_p9/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/lua/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-lang/lua/lua-5.1.5.ebuild | 10 | ||||
| -rw-r--r-- | dev-lang/lua/lua-5.2.1.ebuild | 8 |
3 files changed, 15 insertions, 11 deletions
diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog index 1c2e1cd29ddf..410147c40682 100644 --- a/dev-lang/lua/ChangeLog +++ b/dev-lang/lua/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/lua -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.170 2012/09/09 14:58:48 armin76 Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.171 2013/02/20 23:27:06 zmedico Exp $ + + 20 Feb 2013; Zac Medico <zmedico@gentoo.org> lua-5.1.5.ebuild, + lua-5.2.1.ebuild: + Fix for prefix and add ~arm-linux + ~x86-linux keywords. 09 Sep 2012; Raúl Porcel <armin76@gentoo.org> lua-5.1.4-r8.ebuild: alpha/ia64/s390/sh/sparc stable wrt #430752 diff --git a/dev-lang/lua/lua-5.1.5.ebuild b/dev-lang/lua/lua-5.1.5.ebuild index 724f71d5b3aa..b6d50abac92b 100644 --- a/dev-lang/lua/lua-5.1.5.ebuild +++ b/dev-lang/lua/lua-5.1.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.5.ebuild,v 1.4 2012/09/05 09:28:49 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.5.ebuild,v 1.5 2013/02/20 23:27:06 zmedico Exp $ EAPI=4 @@ -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" +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" RDEPEND="readline? ( sys-libs/readline )" @@ -55,9 +55,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 || die } # no need for a configure phase diff --git a/dev-lang/lua/lua-5.2.1.ebuild b/dev-lang/lua/lua-5.2.1.ebuild index 50023d1c0eaa..9d6cde3671d2 100644 --- a/dev-lang/lua/lua-5.2.1.ebuild +++ b/dev-lang/lua/lua-5.2.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.2.1.ebuild,v 1.1 2012/07/04 19:34:20 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.2.1.ebuild,v 1.2 2013/02/20 23:27:06 zmedico Exp $ EAPI=4 @@ -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" +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" RDEPEND="readline? ( sys-libs/readline )" @@ -29,7 +29,7 @@ src_prepare() { EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch sed -i \ - -e 's:\(LUA_ROOT\s*\).*:\1"/usr/":' \ + -e 's:\(LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \ -e "s:\(LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \ src/luaconf.h \ || die "failed patching luaconf.h" |