Version bump, cleanup, patch naming change

(Portage version: 2.1.2.3)

9 files changed, 33 insertions, 18 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/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() {