Version bump, cleanup, patch naming change

Package-Manager: portage-2.1.2.3

10 files changed, 75 insertions, 49 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index 19ec1e069d90..8a6782dc52c3 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-lang/lua
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.78 2007/04/05 09:32:39 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.79 2007/04/05 10:17:20 mabi Exp $
+
+*lua-5.1.2 (05 Apr 2007)
+
+  05 Apr 2007; Matti Bickel <mabi@gentoo.org> -files/lua-5.1.1-make.patch,
+  -files/lua-5.1.1-make_static.patch, -files/lua-5.1.1-module_paths.patch,
+  -files/lua-5.1.1-readline.patch, +files/lua-5.1-make.patch,
+  +files/lua-5.1-make_static.patch, +files/lua-5.1-module_paths.patch,
+  +files/lua-5.1-readline.patch, -lua-5.1.1.ebuild, lua-5.1.1-r2.ebuild,
+  +lua-5.1.2.ebuild:
+  Version bump. Changed patching to use same patches across minor versions.
+  Cleanup.
 
   05 Apr 2007; Markus Rothe <corsair@gentoo.org> lua-5.1.1-r2.ebuild:
   Stable on ppc64
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 3ee82ae12bbf..41d667c6e097 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX lua-5.0.2-LDFLAGS_and_as-needed.patch 1837 RMD160 2dd54660c8646e9eaf206c96bad9adee326fb567 SHA1 f9f50ab6df8cd946daa8c108a3a48168b2c75f65 SHA256 3bf1a4ef14e02ca8203b3d4eaeab44e2455ec8f186f58f1e5674ab5d9a28689c
 MD5 d2ccba11aed9263920a7fd316d528f00 files/lua-5.0.2-LDFLAGS_and_as-needed.patch 1837
 RMD160 2dd54660c8646e9eaf206c96bad9adee326fb567 files/lua-5.0.2-LDFLAGS_and_as-needed.patch 1837
@@ -26,22 +29,22 @@ AUX lua-5.0.3-shared.patch 1360 RMD160 2f98bb90e4100bd7673d0f52a3720c9181bde987
 MD5 17d4d55107af46b9d72581c953f5a06e files/lua-5.0.3-shared.patch 1360
 RMD160 2f98bb90e4100bd7673d0f52a3720c9181bde987 files/lua-5.0.3-shared.patch 1360
 SHA256 c9ba1d3258ded3da1ca48210faf67b699ee80b115fec5fb4e9319cf7755dfc55 files/lua-5.0.3-shared.patch 1360
-AUX lua-5.1.1-make.patch 2596 RMD160 2d905d74c96f83acd5c27e884942a5068ff1b655 SHA1 ac2ad37086676a0dee9d231dfe1af6787973b3ed SHA256 5413decb6d74e5803c2e9b80c32b8add5559d05ba4da9b0d60f1a6e221df3125
-MD5 a84c15c14a2c232e48e2668487df4f30 files/lua-5.1.1-make.patch 2596
-RMD160 2d905d74c96f83acd5c27e884942a5068ff1b655 files/lua-5.1.1-make.patch 2596
-SHA256 5413decb6d74e5803c2e9b80c32b8add5559d05ba4da9b0d60f1a6e221df3125 files/lua-5.1.1-make.patch 2596
-AUX lua-5.1.1-make_static.patch 552 RMD160 1ca1c74daee2845369f13a80773755301b1d5184 SHA1 2d49989dbfd730edafac1444fd09a824a8f649b5 SHA256 dac0400c15e5ad9b77ade7e981acde3c111b51e834427280e9fdcdbbcef05812
-MD5 33ce8e585ae99d47f49b66ef26db434b files/lua-5.1.1-make_static.patch 552
-RMD160 1ca1c74daee2845369f13a80773755301b1d5184 files/lua-5.1.1-make_static.patch 552
-SHA256 dac0400c15e5ad9b77ade7e981acde3c111b51e834427280e9fdcdbbcef05812 files/lua-5.1.1-make_static.patch 552
-AUX lua-5.1.1-module_paths.patch 1078 RMD160 31a3f13af427bdcae784e21a9456f9197c59379e SHA1 50cb1438b7c50536ebf712d16d153eac40599562 SHA256 1115b6aa00eb4e918156ae70c763534bd2f603ba888da75e4908c19c2ac3e5f7
-MD5 e60ef15deefb72a5930c498f1184aced files/lua-5.1.1-module_paths.patch 1078
-RMD160 31a3f13af427bdcae784e21a9456f9197c59379e files/lua-5.1.1-module_paths.patch 1078
-SHA256 1115b6aa00eb4e918156ae70c763534bd2f603ba888da75e4908c19c2ac3e5f7 files/lua-5.1.1-module_paths.patch 1078
-AUX lua-5.1.1-readline.patch 360 RMD160 29e6f8193592ec6e551e46f953563113a72d2de2 SHA1 25baabcb1d3449c3c38726fc7de6c4abb34667a6 SHA256 1f0f90eb8103e338f1188cc884c0c59cc6afd023828c11d86b8145b2a8d1efc2
-MD5 f2205b897edb31292a1f597a7fd638cb files/lua-5.1.1-readline.patch 360
-RMD160 29e6f8193592ec6e551e46f953563113a72d2de2 files/lua-5.1.1-readline.patch 360
-SHA256 1f0f90eb8103e338f1188cc884c0c59cc6afd023828c11d86b8145b2a8d1efc2 files/lua-5.1.1-readline.patch 360
+AUX lua-5.1-make.patch 2596 RMD160 2d905d74c96f83acd5c27e884942a5068ff1b655 SHA1 ac2ad37086676a0dee9d231dfe1af6787973b3ed SHA256 5413decb6d74e5803c2e9b80c32b8add5559d05ba4da9b0d60f1a6e221df3125
+MD5 a84c15c14a2c232e48e2668487df4f30 files/lua-5.1-make.patch 2596
+RMD160 2d905d74c96f83acd5c27e884942a5068ff1b655 files/lua-5.1-make.patch 2596
+SHA256 5413decb6d74e5803c2e9b80c32b8add5559d05ba4da9b0d60f1a6e221df3125 files/lua-5.1-make.patch 2596
+AUX lua-5.1-make_static.patch 552 RMD160 1ca1c74daee2845369f13a80773755301b1d5184 SHA1 2d49989dbfd730edafac1444fd09a824a8f649b5 SHA256 dac0400c15e5ad9b77ade7e981acde3c111b51e834427280e9fdcdbbcef05812
+MD5 33ce8e585ae99d47f49b66ef26db434b files/lua-5.1-make_static.patch 552
+RMD160 1ca1c74daee2845369f13a80773755301b1d5184 files/lua-5.1-make_static.patch 552
+SHA256 dac0400c15e5ad9b77ade7e981acde3c111b51e834427280e9fdcdbbcef05812 files/lua-5.1-make_static.patch 552
+AUX lua-5.1-module_paths.patch 1078 RMD160 31a3f13af427bdcae784e21a9456f9197c59379e SHA1 50cb1438b7c50536ebf712d16d153eac40599562 SHA256 1115b6aa00eb4e918156ae70c763534bd2f603ba888da75e4908c19c2ac3e5f7
+MD5 e60ef15deefb72a5930c498f1184aced files/lua-5.1-module_paths.patch 1078
+RMD160 31a3f13af427bdcae784e21a9456f9197c59379e files/lua-5.1-module_paths.patch 1078
+SHA256 1115b6aa00eb4e918156ae70c763534bd2f603ba888da75e4908c19c2ac3e5f7 files/lua-5.1-module_paths.patch 1078
+AUX lua-5.1-readline.patch 360 RMD160 29e6f8193592ec6e551e46f953563113a72d2de2 SHA1 25baabcb1d3449c3c38726fc7de6c4abb34667a6 SHA256 1f0f90eb8103e338f1188cc884c0c59cc6afd023828c11d86b8145b2a8d1efc2
+MD5 f2205b897edb31292a1f597a7fd638cb files/lua-5.1-readline.patch 360
+RMD160 29e6f8193592ec6e551e46f953563113a72d2de2 files/lua-5.1-readline.patch 360
+SHA256 1f0f90eb8103e338f1188cc884c0c59cc6afd023828c11d86b8145b2a8d1efc2 files/lua-5.1-readline.patch 360
 AUX lua-ppc-macos-Makefile.patch 2681 RMD160 96be558e865831b2298eddadd3b251f46846a37b SHA1 8fd652137350c6112dbfa553768e56080eeadb15 SHA256 ee61106a273935047fe1557c5af86f7b743427e38c4f552fab3841a199f48f8b
 MD5 710b33a666e65c67841362970d8afb83 files/lua-ppc-macos-Makefile.patch 2681
 RMD160 96be558e865831b2298eddadd3b251f46846a37b files/lua-ppc-macos-Makefile.patch 2681
@@ -49,6 +52,7 @@ SHA256 ee61106a273935047fe1557c5af86f7b743427e38c4f552fab3841a199f48f8b files/lu
 DIST lua-5.0.2.tar.gz 190442 RMD160 5f1a1cf5802e38b3c4dcfc9f3cd0dc33bfdc0a30 SHA1 a200cfd20a9a4c7da1206ae45dddf26186a9e0e7 SHA256 a6c85d85f912e1c321723084389d63dee7660b81b8292452b190ea7190dd73bc
 DIST lua-5.0.3.tar.gz 191384 RMD160 cb3ed4320b438d73c8ff6c93a02275c9fb461883 SHA1 e7e91f78b8a8deb09b13436829bed557a46af8ae SHA256 1193a61b0e08acaa6eee0eecf29709179ee49c71baebc59b682a25c3b5a45671
 DIST lua-5.1.1.tar.gz 207810 RMD160 0b9cc31cca1a0f4c2ebb62f177dc157677953a4c SHA1 be13878ceef8e1ee7a4201261f0adf09f89f1005 SHA256 c5daeed0a75d8e4dd2328b7c7a69888247868154acbda69110e97d4a6e17d1f0
+DIST lua-5.1.2.tar.gz 214134 RMD160 01350549b3a05838925dae1a666700bb9f1bc01a SHA1 8a460d2d7e70e93cb72bf3d584405464763cb5f0 SHA256 5cf098c6fe68d3d2d9221904f1017ff0286e4a9cc166a1452a456df9b88b3d9e
 EBUILD lua-5.0.2.ebuild 3012 RMD160 bf25678de10aed9dbdd21d0ab9d950a64cd89970 SHA1 a144b3ade4da03e0fe0ca971036fc87165c61d36 SHA256 9000dfa9cf0d73b7237e627d987e0ac8705632aa60c994d324bc2cd9ad9e2065
 MD5 d9458dcb2f5a2c128541ea8d405e1443 lua-5.0.2.ebuild 3012
 RMD160 bf25678de10aed9dbdd21d0ab9d950a64cd89970 lua-5.0.2.ebuild 3012
@@ -57,18 +61,18 @@ EBUILD lua-5.0.3.ebuild 3081 RMD160 8ee395f7eb18073d7ed67089e32d93dfd315d7fe SHA
 MD5 66a630518f24ea10d8629e74044a77d4 lua-5.0.3.ebuild 3081
 RMD160 8ee395f7eb18073d7ed67089e32d93dfd315d7fe lua-5.0.3.ebuild 3081
 SHA256 6704da89015a67bc0e6f5664a9438f0b7a82eb2e102ce6da973194c0e626eea2 lua-5.0.3.ebuild 3081
-EBUILD lua-5.1.1-r2.ebuild 2545 RMD160 8ffb3919edef450b3922b0629395151dd8754f4f SHA1 6c2192bfb5597f8ab1cd778646fc1f9ee20eef06 SHA256 ed24051a9dac3d602be729262ee63967798f3da1d89ed078022611bf15085666
-MD5 b9717d33eec6f20f5674d8d75e3f20ae lua-5.1.1-r2.ebuild 2545
-RMD160 8ffb3919edef450b3922b0629395151dd8754f4f lua-5.1.1-r2.ebuild 2545
-SHA256 ed24051a9dac3d602be729262ee63967798f3da1d89ed078022611bf15085666 lua-5.1.1-r2.ebuild 2545
-EBUILD lua-5.1.1.ebuild 2464 RMD160 6923c977896a7cac319ad3e003f7817a35ee487c SHA1 ee6714bf11044b69d63a01d43cbcea28dc0b2963 SHA256 03836be38d695d065463e3467b329fc72236c63f9441956f4cf884cd8ebb9bc4
-MD5 74d28a11bd8377b4562c1199930eae41 lua-5.1.1.ebuild 2464
-RMD160 6923c977896a7cac319ad3e003f7817a35ee487c lua-5.1.1.ebuild 2464
-SHA256 03836be38d695d065463e3467b329fc72236c63f9441956f4cf884cd8ebb9bc4 lua-5.1.1.ebuild 2464
-MISC ChangeLog 10715 RMD160 e76d0e233bcf95b03111aa77825d64a4aa4d0dd4 SHA1 b32807d27a7d3e57c150ee87df862b9913ef73bc SHA256 2b1c0b4a36fbef13890942a29dcdc4e677ce638c269628ce9c7b634d0e5182c6
-MD5 d1f3503466458595f11eb187dcda23fb ChangeLog 10715
-RMD160 e76d0e233bcf95b03111aa77825d64a4aa4d0dd4 ChangeLog 10715
-SHA256 2b1c0b4a36fbef13890942a29dcdc4e677ce638c269628ce9c7b634d0e5182c6 ChangeLog 10715
+EBUILD lua-5.1.1-r2.ebuild 2646 RMD160 bdc2ed3150727b488a54fdaac7e963da55fc759c SHA1 6b2317c8bf3c30f555f2af8e4332b40996a35ad3 SHA256 2b1172de1c37ea7206cadf6bb78baebc4e5b293caff439ffeefe568dce20d044
+MD5 b3250b82dcc5cf8963bcc8a10e75cd5c lua-5.1.1-r2.ebuild 2646
+RMD160 bdc2ed3150727b488a54fdaac7e963da55fc759c lua-5.1.1-r2.ebuild 2646
+SHA256 2b1172de1c37ea7206cadf6bb78baebc4e5b293caff439ffeefe568dce20d044 lua-5.1.1-r2.ebuild 2646
+EBUILD lua-5.1.2.ebuild 2660 RMD160 ab82b85a2cb81c7839f6dddeb329dafa1d574ae0 SHA1 e13706a741e42099018909f94766d9deb2d89baa SHA256 d2552d7ebde034b1632d2729b74e40a02a359f40205352105d1741609576a75a
+MD5 cb0e79d9191035489ca5385edb98b547 lua-5.1.2.ebuild 2660
+RMD160 ab82b85a2cb81c7839f6dddeb329dafa1d574ae0 lua-5.1.2.ebuild 2660
+SHA256 d2552d7ebde034b1632d2729b74e40a02a359f40205352105d1741609576a75a lua-5.1.2.ebuild 2660
+MISC ChangeLog 11203 RMD160 6e1eb83e2fe84c68a0984d114c8a58baa4b4e10a SHA1 9a520712008c5bdb26a794cc12d0489161729e02 SHA256 53e05758efafc578ba3c4587106a2e49e9cf7843da81113cea4f2bcee2c516cf
+MD5 955c2ce7517707b42fccd1c0139d9e97 ChangeLog 11203
+RMD160 6e1eb83e2fe84c68a0984d114c8a58baa4b4e10a ChangeLog 11203
+SHA256 53e05758efafc578ba3c4587106a2e49e9cf7843da81113cea4f2bcee2c516cf ChangeLog 11203
 MISC metadata.xml 246 RMD160 d8be15833db0ddabf74171f9e87a2a930ad6bcd2 SHA1 76fdc0af8e2d1dbb1214b95c49f8cd2da3d3832a SHA256 6a089a75a70b3b69d4cae78762fdc69afa25678c5b8692c61245f50bc49ab531
 MD5 ae5edc540c3c3ae7307d2ac4c0e16773 metadata.xml 246
 RMD160 d8be15833db0ddabf74171f9e87a2a930ad6bcd2 metadata.xml 246
@@ -79,9 +83,16 @@ SHA256 dd85bd3af3bdca85924820c75cd663147dcd19c6b89c64161e406ee39e0fdf96 files/di
 MD5 23154e6d41fb3e070a7c9390e991e13c files/digest-lua-5.0.3 229
 RMD160 13f30c4580ef37b67160942adc5497820c09d556 files/digest-lua-5.0.3 229
 SHA256 4a4b5a506f9226dc2e8bb8d52129a6c4b66f27b7d9d0a91c81b0379605c34d0f files/digest-lua-5.0.3 229
-MD5 541613cc1c7f33c6ab0e8858d2812bc2 files/digest-lua-5.1.1 229
-RMD160 8dbfca4720b6ff909dc6f2fa3496373083970771 files/digest-lua-5.1.1 229
-SHA256 5a9bfa07cd7871412eacd8a0285b69aaac0d01b635406b2d2c24569cb0c7042c files/digest-lua-5.1.1 229
 MD5 541613cc1c7f33c6ab0e8858d2812bc2 files/digest-lua-5.1.1-r2 229
 RMD160 8dbfca4720b6ff909dc6f2fa3496373083970771 files/digest-lua-5.1.1-r2 229
 SHA256 5a9bfa07cd7871412eacd8a0285b69aaac0d01b635406b2d2c24569cb0c7042c files/digest-lua-5.1.1-r2 229
+MD5 411ef3a8eed2840f03241c25edbc471f files/digest-lua-5.1.2 229
+RMD160 c622458ea1263dc0c6158b7701668fa6bd71ebcf files/digest-lua-5.1.2 229
+SHA256 9c320952dfd8e2f85aad70564711e3dba88b05d32b6f983b5bc14ae05d026ad0 files/digest-lua-5.1.2 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFGFMxbfNMcoUhJ7GwRApxvAJ95eoqTud188BUIHhHvNNmxb0sbsQCfaSOd
+aNg51FfGPW3y7VYTmc3WdZ0=
+=+4x4
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/lua/files/digest-lua-5.1.1 b/dev-lang/lua/files/digest-lua-5.1.1
deleted file mode 100644
index 5a0845c161bb..000000000000
--- a/dev-lang/lua/files/digest-lua-5.1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 22f4f912f20802c11006fe9b84d5c461 lua-5.1.1.tar.gz 207810
-RMD160 0b9cc31cca1a0f4c2ebb62f177dc157677953a4c lua-5.1.1.tar.gz 207810
-SHA256 c5daeed0a75d8e4dd2328b7c7a69888247868154acbda69110e97d4a6e17d1f0 lua-5.1.1.tar.gz 207810
diff --git a/dev-lang/lua/files/digest-lua-5.1.2 b/dev-lang/lua/files/digest-lua-5.1.2
new file mode 100644
index 000000000000..0847c24c6a15
--- /dev/null
+++ b/dev-lang/lua/files/digest-lua-5.1.2
@@ -0,0 +1,3 @@
+MD5 687ce4c2a1ddff18f1008490fdc4e5e0 lua-5.1.2.tar.gz 214134
+RMD160 01350549b3a05838925dae1a666700bb9f1bc01a lua-5.1.2.tar.gz 214134
+SHA256 5cf098c6fe68d3d2d9221904f1017ff0286e4a9cc166a1452a456df9b88b3d9e lua-5.1.2.tar.gz 214134
diff --git a/dev-lang/lua/files/lua-5.1.1-make.patch b/dev-lang/lua/files/lua-5.1-make.patch
index fb95d253422d..fb95d253422d 100644
--- a/dev-lang/lua/files/lua-5.1.1-make.patch
+++ b/dev-lang/lua/files/lua-5.1-make.patch
diff --git a/dev-lang/lua/files/lua-5.1.1-make_static.patch b/dev-lang/lua/files/lua-5.1-make_static.patch
index 502109d1708d..502109d1708d 100644
--- a/dev-lang/lua/files/lua-5.1.1-make_static.patch
+++ b/dev-lang/lua/files/lua-5.1-make_static.patch
diff --git a/dev-lang/lua/files/lua-5.1.1-module_paths.patch b/dev-lang/lua/files/lua-5.1-module_paths.patch
index 29ac4c3bf4bd..29ac4c3bf4bd 100644
--- a/dev-lang/lua/files/lua-5.1.1-module_paths.patch
+++ b/dev-lang/lua/files/lua-5.1-module_paths.patch
diff --git a/dev-lang/lua/files/lua-5.1.1-readline.patch b/dev-lang/lua/files/lua-5.1-readline.patch
index f144861efb6b..f144861efb6b 100644
--- a/dev-lang/lua/files/lua-5.1.1-readline.patch
+++ b/dev-lang/lua/files/lua-5.1-readline.patch
diff --git a/dev-lang/lua/lua-5.1.1-r2.ebuild b/dev-lang/lua/lua-5.1.1-r2.ebuild
index 812c3225bbd4..5d034f6dd45d 100644
--- a/dev-lang/lua/lua-5.1.1-r2.ebuild
+++ b/dev-lang/lua/lua-5.1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.1-r2.ebuild,v 1.9 2007/04/05 09:32:39 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.1-r2.ebuild,v 1.10 2007/04/05 10:17:20 mabi Exp $
 
 inherit eutils portability
 
@@ -16,16 +16,17 @@ IUSE="readline static"
 DEPEND="readline? ( sys-libs/readline )"
 
 src_unpack() {
+	local PATCH_PV=$(get_version_component_range 1-2)
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-make.patch
-	epatch "${FILESDIR}"/${P}-module_paths.patch
+	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make.patch
+	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
 
 	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
 
 	if ! use readline ; then
-		epatch "${FILESDIR}"/${P}-readline.patch
+		epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch
 	fi
 
 	# Using dynamic linked lua is not recommended upstream for performance
@@ -33,7 +34,7 @@ src_unpack() {
 	# Mainly, this is of concern if your arch is poor with GPRs, like x86
 	# Note that the lua compiler is build statically anyway
 	if use static ; then
-		epatch "${FILESDIR}"/${P}-make_static.patch
+		epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static.patch
 	fi
 
 	# We want packages to find our things...
diff --git a/dev-lang/lua/lua-5.1.1.ebuild b/dev-lang/lua/lua-5.1.2.ebuild
index 5111613962b4..059213e47326 100644
--- a/dev-lang/lua/lua-5.1.1.ebuild
+++ b/dev-lang/lua/lua-5.1.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.1.ebuild,v 1.13 2007/03/15 22:24:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.2.ebuild,v 1.1 2007/04/05 10:17:20 mabi Exp $
 
-inherit eutils portability
+inherit eutils portability versionator
 
 DESCRIPTION="A powerful light-weight programming language designed for extending applications"
 HOMEPAGE="http://www.lua.org/"
@@ -10,23 +10,23 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 hppa ~ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="readline static"
 
-RDEPEND="readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}"
+DEPEND="readline? ( sys-libs/readline )"
 
 src_unpack() {
+	local PATCH_PV=$(get_version_component_range 1-2)
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-make.patch
-	epatch "${FILESDIR}"/${P}-module_paths.patch
+	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make.patch
+	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
 
 	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
 
 	if ! use readline ; then
-		epatch "${FILESDIR}"/${P}-readline.patch
+		epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch
 	fi
 
 	# Using dynamic linked lua is not recommended upstream for performance
@@ -34,8 +34,11 @@ src_unpack() {
 	# Mainly, this is of concern if your arch is poor with GPRs, like x86
 	# Note that the lua compiler is build statically anyway
 	if use static ; then
-		epatch "${FILESDIR}"/${P}-make_static.patch
+		epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static.patch
 	fi
+
+	# We want packages to find our things...
+	sed -i -e 's:/usr/local:/usr:' etc/lua.pc
 }
 
 src_compile() {