Fix for prefix and add ~arm-linux + ~x86-linux keywords.

Package-Manager: portage-2.2.0_alpha163_p9/cvs/Linux i686
Manifest-Sign-Key: 0xFDE8EF85AE5719A3

4 files changed, 21 insertions, 17 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/Manifest b/dev-lang/lua/Manifest
index fa89b944fe44..9eabc7829f5b 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -29,16 +29,16 @@ DIST lua-5.2.0.tar.gz 246377 SHA256 cabe379465aa8e388988073d59b69e76ba0025429d2c
 DIST lua-5.2.1.tar.gz 249882 SHA256 64304da87976133196f9e4c15250b70f444467b6ed80d7cfd7b3b982b5177be5 SHA512 d0548d2cc2aa4fb4b5ae19d0ff675027370e3ee22d6e1ba448651c6f1f6f5e6b6214c81b760a23954f1e270936248bc021b9594a75191de4c1921e73d1ae48fb WHIRLPOOL 2a8d3d3c6ae37307bd667ab0619f7992f12ad4fb6c2709c2b4ee797b33d6eebee2d0298b7cb1b1a62d6140d3f9563ed7479c508da55234148981e57fe159e842
 EBUILD lua-5.1.4-r4.ebuild 3113 SHA256 68893db7b4094dfc78a480b86b4dc26d37bca61f4f2931aff43703bf69f0835d SHA512 f5f5c7ba6c5e65e2fac43eb3e0595863783699ad9c0c780c45d7da36095d9c7b4b99c727964b70b72428d37abbb5974f7e0e545e6a4d1f1df1d044d7d7097e2c WHIRLPOOL 93bbe3e475c0aba54e16e6ed24d5d664021ec352531a829307a2f525119f98dc880f56fb1cfca1eb0f79c61da7978d2edd86a17c81ca59f0c76fa5737a0e9f59
 EBUILD lua-5.1.4-r8.ebuild 3164 SHA256 0e408cc508160c80c10165b9d029063700a5aa21092cc0d1cc21fb126c52d840 SHA512 e29d6b1684d4acbcc6cf9a14b4958461f03d8b39ac3d462db2b9733335a8c775f3f0a25b830b6268b6f126096f6743a0676f94fcccd5e499e134a9300ec9d75c WHIRLPOOL 6b00772cbd20cdbe10c4dfcfd948626160c238b08aaef49f400d8d28b928e29f309adcb5b59b46a6cef17e465c2e9cebbfff9f3fa2d0f5960682acd7e377b912
-EBUILD lua-5.1.5.ebuild 3231 SHA256 6519bc24d94be6fb8be0df05dbd98e15dbf75d20c167318b1b1c7886db1289fa SHA512 808e76552cd2c6b68f031fadbc3ec7e635e8474888d2fc685789fb1cb8fe34f0234b0c6b38d897c2d40ba959d092afbbbe7d17d61d69abd7ceaae5c1162bdce8 WHIRLPOOL e320ad881c5dc160a199d1de1223a8ca757dfc03c62655964f9c780997b847b7a5adfd697304b5af2555b0ec2c7cc5d7f87b1137bbef7e89f226e5f70b2db45e
+EBUILD lua-5.1.5.ebuild 3289 SHA256 79d7830cb8b80bacc1107782545031d1ce0305ed5cee4907c991ce1443681ebf SHA512 73582eea9a04e08ed894224db2e9a21d8b608afafc2150218e85cdda1598a464f74fec8bf4e48881a626cb1a45e2237a4a8ba8e3b0598e19ad7a1f78c1b7779b WHIRLPOOL 55bf5bff8ea6ab35089cfcd0bcb9681005178bc63fddfe1c3e8665fb94cef8daf8bf6f9c04b3d035ccb3cfd47ef54b09ca1538fc713b4df7392486219d858841
 EBUILD lua-5.2.0-r1.ebuild 3026 SHA256 09a25322e66963d135bad400ebca3863bf5ca6b10ab4b4dbee6f965593299d62 SHA512 25875efda333992ee940f749c4aa24034321267d26f328a476dd6331816a2b777789277c942bd8e4e2c98fa0756427a1d9cc78faf16f118b8868b99608f60742 WHIRLPOOL d8c8d9069b22bca5efeac6f267132c3c8a495af491fbb07549696db27fd0ee130f284a067199f786810a7a68d4d5ca1de1896ef30d48da804ac758a5d7b5d454
 EBUILD lua-5.2.0.ebuild 2949 SHA256 ff6d72650e730be5a8850208762e0246293ce7f06d70f3e5b42b6c3a1bb468e5 SHA512 864fc6e2da4c649d6e80289485581e89318b750b6ed7c139b7f4b13adf471976bb92c671339ba7b0bb55232f55b1ca25622015d0efaf92bd97e65420e200169d WHIRLPOOL 10fb2a7019df3274af6a8618c1ead587993dee27785d6876b52f04481d770a722771490e29bcdd0c938c88f1c6dd4d0e31ef70c654d916d9b27818135b18f3d6
-EBUILD lua-5.2.1.ebuild 3053 SHA256 40d12f61ba8ec02f9e24f7fc580bfbc7e8c9d2bb4cecf3ea0bc07c7c0691ec8d SHA512 6fb46ccba52879a639de73ce27744005083e38dab044558af69ea77274dc9114a5d45dcfb3ccfd6feefeb567bc89a113638c7c8b6f3f6655fb1c9c8f9a71982f WHIRLPOOL 484389f7bbfceed5230fab70e8c5df5c21745c2c23ce93d655c3b54d545337ac11da234e65c7c393adc1d9b8ac06d527787dfe86440c82225cf7d746c0f7e36b
-MISC ChangeLog 25895 SHA256 d7bb9e877072ba574eed5f68225666e4eb3786a3948ea5b87ebd3a3e273a91bc SHA512 7fff74edfcaa46cffc7f94f34e5abbafcfd8a9c866e591d025bd724626353984b4b8d072ac84e9f0cac733ba62e70f719610dce9cb9c2fa40a44d388598d4301 WHIRLPOOL 6fdd3729721d4fcc96d10e6931e0c98839885a30eb3f26d18dafb627da83c1b3dccb0151752d75cf7392f7a04a52715f663c48f67dc3a8536cd46eeddc7ae118
+EBUILD lua-5.2.1.ebuild 3090 SHA256 9f07ea37c6565020c9354cd0ea3f5289d383407ea577764745bda7c7001e4023 SHA512 eea0552d6eff43bf6ef515eace165dfe127006b12f697983628ce526fad7b27a99f0e5b9a0777bf3e5f9f1ca821d38a132864f6da37276054968a047d5c9dea2 WHIRLPOOL fc481088fd4681de8d9e132dea9c46f96b56e5e38938e18f0fdcfdb33ebb7ecccd1b813a84c951b26cf1dbb4e54987912b56c36777728a265439c5b073574f1f
+MISC ChangeLog 26040 SHA256 0f290b03040f2c68fd15d6cce08739eaa0451e8b537dc63a4a356510d2437c80 SHA512 e68b394b699b24b77c83deed002d06e8dc0d45504a0425a2cc35a4f2163aebe990ddfec55b1a331176e8e615e99f3b225f68caff3764c1659ffacd521fe9ae6f WHIRLPOOL 449b1bf9a4d136f5b7c263768cd4624d04dc8f9acb244817c341d48fc6547ebdb892a05be464e5bfe431c8983759c78388a41d809144541d0e256c40ba3d5b70
 MISC metadata.xml 418 SHA256 ecdbace4d7d07830cc308755b909384644dc449cf7a3f32faefeecf6d3752b55 SHA512 f545c84ef7c020511117e59ee232984409ebe2dd418c2a3e61adb8fa33649d435df86dcb70391d48ed7e2be9b04575757bf2c2e5347114f5c38a9c9335352490 WHIRLPOOL e9e84ca81f1e173e723e07bed3fc954b3d39fd288b47792c1cb61fd7e493eafe6401247a5e35ac7bc4845b21ea40d64aa1f2f643df2942491f6815a9fe7ecb2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBMrqwACgkQuQc30/atMkABIgCgwIHeZwa6WdTDrCPQB+b6+F5M
-iRsAn3cNTFjNlOunUtxNiQt80E0D+VEg
-=mU2f
+iEYEAREIAAYFAlElW80ACgkQ/ejvha5XGaNoAACgytmVV4eCHjcrIY8G3a2xfSJZ
+cskAoI9CcA3Gw1p4Eihu1r+jsfNtx1x+
+=aorN
 -----END PGP SIGNATURE-----
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"