clean old versions, add EAPI 1 ebuild with default for deprecated USE

Package-Manager: portage-2.1.5.2

4 files changed, 30 insertions, 120 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index 0a1b5a86ebce..d827de629dce 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/lua
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.106 2008/05/18 16:27:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.107 2008/05/27 22:11:43 mabi Exp $
+
+*lua-5.1.3-r3 (27 May 2008)
+
+  27 May 2008; Matti Bickel <mabi@gentoo.org> -lua-5.1.2-r2.ebuild,
+  -lua-5.1.3.ebuild, +lua-5.1.3-r3.ebuild:
+  clean old versions, add EAPI 1 ebuild with default for deprecated USE
 
   18 May 2008; Markus Meier <maekke@gentoo.org> lua-5.1.3-r1.ebuild:
   amd64/x86 stable, bug #210517
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 6113676a988e..1b7080e12153 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -16,19 +16,17 @@ AUX lua-5.1-readline.patch 360 RMD160 29e6f8193592ec6e551e46f953563113a72d2de2 S
 AUX lua-5.1.3-deprecated.patch 1417 RMD160 c2f51932850ca7deb6a0df41e4fe67764e48608c SHA1 f003694a532f6cb4bb629918d8c2db8c52696723 SHA256 8d4d3c35d9cfb65f6caa360c09d1fa0c5dc1ee0de3389c1e73602fef86cd0e9f
 AUX lua-5.1.3-test.patch 340 RMD160 5ab1fdfaf1c18d26c66096ade8944223c21ce9ca SHA1 9e1fc7b770f2586dd386bea60717962f650a1923 SHA256 cdbb06f6fc5e75512c912360e1efc12e1e62ac7079972ff1c9c9273898bf9e31
 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
 DIST lua-5.1.3.tar.gz 215817 RMD160 1c5979dd4986057fef325aa2af0c872bbecab92e SHA1 89bc9f5a351402565b8077e8123327e7cd15f004 SHA256 6b5df2edaa5e02bf1a2d85e1442b2e329493b30b0c0780f77199d24f087d296d
 EBUILD lua-5.1.1-r2.ebuild 2710 RMD160 7bbb61441726d96daef4137a756c9b03464a16ae SHA1 47c1f20bad74033c278e1e7573354fe0940526e4 SHA256 9aa83b2dc6c1c7e881868820496deeef4e130190c23a61479d26e38e85ffdb39
-EBUILD lua-5.1.2-r2.ebuild 2836 RMD160 60e58213c93f4ba8e8fb6c7eee940cd707da7ab7 SHA1 d3482902c29d56853157bcef6f981f0dbf6b3241 SHA256 0fbdf5bac259359c42a031dbd14a2c564fb5d1583ec8b1cebb86d9dc62d89cd7
 EBUILD lua-5.1.3-r1.ebuild 2961 RMD160 2157b3d1088a03129756d862b1cf34a48710578c SHA1 e6ec23232939f96bfc9140d2e123be02e8eeb845 SHA256 d495da4e23353b780e09efaf81f8868e1a00cd986b19be959f42ece6170b7539
 EBUILD lua-5.1.3-r2.ebuild 2966 RMD160 e149acb2799984e8c920c79e637bf5a9df4484dd SHA1 d690d00f4d2df6ea6c5697faa435de77417ee06d SHA256 e91afda6897061cc6f8ee71aa9e31f88a864eedaa6b4ef784ce0a02540f19780
-EBUILD lua-5.1.3.ebuild 2687 RMD160 64d582b7bdce73475522a2b3f89e6cd5cd143928 SHA1 3118f33c2b02ab8f793fd49cf871e1a0150a4cff SHA256 064fcb32f083e9563f62b3f351c2e78356e6db93f69122b0cd26697c1f435e0f
-MISC ChangeLog 15740 RMD160 6225943067428f2be307fc89ecbf62ac536bbcdf SHA1 b23fa5d8cbfc6d803deae6d6b89f78b5772df32d SHA256 2df4a4269dc757e7e337d86a4e1c6d715e642ae82bc687b25132bafb5c417fab
+EBUILD lua-5.1.3-r3.ebuild 2976 RMD160 d1c42b603750f0504e6bfb312b014f918e9f3534 SHA1 8c5e47472da9350ef839b93cc25f050c4673996a SHA256 92784c1dceb7af6f4eda19717e3d8573f865c747a26095233dfcdc1da8290149
+MISC ChangeLog 15951 RMD160 db019611406caa24e938d768075c66bce3f438ab SHA1 d1cf6dd076339826749f1973940c733f430fb5fd SHA256 43bc878a9d0c6829f19ee6414325ea873ae578eea10a18e30a9b1187a082f4cc
 MISC metadata.xml 246 RMD160 d8be15833db0ddabf74171f9e87a2a930ad6bcd2 SHA1 76fdc0af8e2d1dbb1214b95c49f8cd2da3d3832a SHA256 6a089a75a70b3b69d4cae78762fdc69afa25678c5b8692c61245f50bc49ab531
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgwWT0ACgkQkKaRLQcq0GK6ZwCfcZCG3ObO1hMeOVhfLgt01lH6
-3AYAoK/UgKx/t5tK/Ky69EBvIHwauJwr
-=knTe
+iEYEARECAAYFAkg8h2MACgkQfNMcoUhJ7GzVMQCfWPSjc3QWW0Ks2MOntRQMH5+q
+oGMAn2FREUbYPSwfyB48u6dwovmo5Ou9
+=gIf8
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/lua/lua-5.1.2-r2.ebuild b/dev-lang/lua/lua-5.1.2-r2.ebuild
deleted file mode 100644
index 437bd5635339..000000000000
--- a/dev-lang/lua/lua-5.1.2-r2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.2-r2.ebuild,v 1.9 2008/02/21 20:38:22 jer Exp $
-
-inherit eutils portability versionator
-
-DESCRIPTION="A powerful light-weight programming language designed for extending applications"
-HOMEPAGE="http://www.lua.org/"
-SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-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}"/${PN}-${PATCH_PV}-make.patch
-	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
-
-	# extra patching not required in lua-5.1.3
-	sed -i -e 's:\(INSTALL_.*\= \$(CP)\):#\1:g' Makefile
-	sed -i -e 's:#\(INSTALL_.*\= \$(INSTALL)\):\1:g' Makefile
-
-	# correct lua versioning (bug #173611)
-	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:2:1/' src/Makefile
-
-	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
-
-	if ! use readline ; then
-		epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch
-	fi
-
-	# Using dynamic linked lua is not recommended upstream for performance
-	# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
-	# 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}"/${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() {
-	myflags=
-	# what to link to liblua
-	liblibs="-lm"
-	mycflags="${mycflags} -DLUA_USE_LINUX"
-	liblibs="${liblibs} $(dlopen_lib)"
-
-	# what to link to the executables
-	mylibs=
-	if use readline; then
-		mylibs="-lreadline"
-	fi
-
-	cd src
-	emake CFLAGS="${mycflags} ${CFLAGS}" \
-			RPATH="/usr/$(get_libdir)/" \
-			LUA_LIBS="${mylibs}" \
-			LIB_LIBS="${liblibs}" \
-			V=${PV} \
-			gentoo_all || die "emake failed"
-
-	mv lua_test ../test/lua.static
-}
-
-src_install() {
-	emake INSTALL_TOP="${D}/usr/" INSTALL_LIB="${D}/usr/$(get_libdir)/" \
-			V=${PV} gentoo_install \
-	|| die "emake install gentoo_install failed"
-
-	dodoc HISTORY README
-	dohtml doc/*.html doc/*.gif
-
-	insinto /usr/share/pixmaps
-	doins etc/lua.ico
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins etc/lua.pc
-
-	doman doc/lua.1 doc/luac.1
-}
-
-src_test() {
-	local positive="bisect cf echo env factorial fib fibfor hello printf sieve
-	sort trace-calls trace-globals"
-	local negative="readonly"
-	local test
-
-	cd "${S}"
-	for test in ${positive}; do
-		test/lua.static test/${test}.lua &> /dev/null || die "test $test failed"
-	done
-
-	for test in ${negative}; do
-		test/lua.static test/${test}.lua &> /dev/null && die "test $test failed"
-	done
-}
diff --git a/dev-lang/lua/lua-5.1.3.ebuild b/dev-lang/lua/lua-5.1.3-r3.ebuild
index d3082afb0e76..feb9661cca24 100644
--- a/dev-lang/lua/lua-5.1.3.ebuild
+++ b/dev-lang/lua/lua-5.1.3-r3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.3.ebuild,v 1.2 2008/02/13 22:15:05 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.3-r3.ebuild,v 1.1 2008/05/27 22:11:43 mabi Exp $
+
+EAPI="1"
 
 inherit eutils portability versionator
 
@@ -11,7 +13,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="readline static"
+IUSE="+deprecated readline static"
 
 DEPEND="readline? ( sys-libs/readline )"
 
@@ -23,11 +25,18 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make.patch
 	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
 
-	# correct lua versioning (bug #173611)
-	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:2:1/' src/Makefile
+	EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
+
+	# correct lua versioning
+	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:3:1/' src/Makefile
 
 	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
 
+	if ! use deprecated ; then
+		epatch "${FILESDIR}"/${P}-deprecated.patch
+		epatch "${FILESDIR}"/${P}-test.patch
+	fi
+
 	if ! use readline ; then
 		epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch
 	fi
@@ -35,7 +44,9 @@ src_unpack() {
 	# Using dynamic linked lua is not recommended upstream for performance
 	# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
 	# Mainly, this is of concern if your arch is poor with GPRs, like x86
-	# Note that the lua compiler is build statically anyway
+	# Not that this only affects the interpreter binary (named lua), not the lua
+	# compiler (built statically) nor the lua libraries (both shared and static
+	# are installed)
 	if use static ; then
 		epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static.patch
 	fi
@@ -92,10 +103,10 @@ src_test() {
 
 	cd "${S}"
 	for test in ${positive}; do
-		test/lua.static test/${test}.lua &> /dev/null || die "test $test failed"
+		test/lua.static test/${test}.lua || die "test $test failed"
 	done
 
 	for test in ${negative}; do
-		test/lua.static test/${test}.lua &> /dev/null && die "test $test failed"
+		test/lua.static test/${test}.lua && die "test $test failed"
 	done
 }