rev bump, cleanup

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.23-gentoo-r3-20080120 ppc

4 files changed, 32 insertions, 122 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index 0b2b96673a87..ba254b423773 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,13 @@
 # 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.117 2008/09/13 20:24:39 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.118 2008/09/28 10:00:26 mabi Exp $
+
+*lua-5.1.4 (28 Sep 2008)
+
+  28 Sep 2008; Matti Bickel <mabi@gentoo.org> -lua-5.1.3-r1.ebuild,
+  -lua-5.1.3-r2.ebuild, +lua-5.1.4.ebuild:
+  rev bump, this is a bugfix release including all fixes from lua-5.1.3-r*,
+  removed old versions
 
   13 Sep 2008; <solar@gentoo.org> lua-5.1.3-r4.ebuild:
   - make lua partially cross compile aware. More work might be needed
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index e7a1da845549..615a77d39021 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 5.1.3/01_all_LUAI_MAXCSTACK.upstream.patch 685 RMD160 5e82432ff598210a1c3bbda5d60c46622fe4254c SHA1 7c40bb5f0aa73f93d4e58ec061fd9b41df63b6f9 SHA256 e99f4e7c481d4ab3b6773f7255e55da3fb6e37f0da51f00db93dd0cd8d10e47a
 AUX 5.1.3/02_all_coroutine.resume.upstream.patch 531 RMD160 1acef8e4257bf1cb96844fc210d3cd9ffab03fd6 SHA1 f70429a1b517c3f9b132b428abacf51a2a02d9e4 SHA256 ede1d6684c29b5710881def9c4edb429434321085c0478db7a1e5faaf4054c5c
 AUX 5.1.3/03_all_lua_checkstack.upstream.patch 668 RMD160 b22b556f656cdd20743821d59f73b0e0f2f42167 SHA1 a13e42918f25f3c595a41a1eac6716e943fad00c SHA256 89c8aa6e4e65f1c7dfd2be7992ce9d6df27ead7dc661bddf94d3049b8bf714df
@@ -18,10 +21,17 @@ AUX lua-5.1.3-deprecated.patch 1417 RMD160 c2f51932850ca7deb6a0df41e4fe67764e486
 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.3.tar.gz 215817 RMD160 1c5979dd4986057fef325aa2af0c872bbecab92e SHA1 89bc9f5a351402565b8077e8123327e7cd15f004 SHA256 6b5df2edaa5e02bf1a2d85e1442b2e329493b30b0c0780f77199d24f087d296d
+DIST lua-5.1.4.tar.gz 216679 RMD160 c867c8364295d3e4fb4e4d8ebb27fa2b2312cdef SHA1 2b11c8e60306efb7f0734b747588f57995493db7 SHA256 b038e225eaf2a5b57c9bcc35cd13aa8c6c8288ef493d52970c9545074098af3a
 EBUILD lua-5.1.1-r2.ebuild 2710 RMD160 7bbb61441726d96daef4137a756c9b03464a16ae SHA1 47c1f20bad74033c278e1e7573354fe0940526e4 SHA256 9aa83b2dc6c1c7e881868820496deeef4e130190c23a61479d26e38e85ffdb39
-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-r3.ebuild 2967 RMD160 95ab467a4d7d2b1f62e7d38692c8f7458531c3af SHA1 9d642b6f8dc06eca11394ba6b93301e46bee9538 SHA256 c65f906c5055f9ab5808f849ab7a296174fd493908356e7544d262b3707372ec
 EBUILD lua-5.1.3-r4.ebuild 3041 RMD160 6081734baf13ff575aa5fa9cabf8ecf98968938b SHA1 449192cef6d30eaf81b4a1e007d7da03a362f14b SHA256 da399b248158b060e937e48b32e1bd63404ad765dc2173fde87e133b5b98f768
-MISC ChangeLog 17281 RMD160 a0be8cb0dae43ce415b3edd01e33f212481d9706 SHA1 c7a12873ec7903a3cd319a4c039c941863a47a52 SHA256 33014535eeb70b756405854f7230f5ead5dda48a1a39d2cb7cf66224a5640b43
+EBUILD lua-5.1.4.ebuild 3039 RMD160 fdd4af40ae9254c9cb2c14c11eb3542d2fb52701 SHA1 48f745d33d1906b709e64499d1f750fbf8b560d9 SHA256 60590e52bdb00047a56b551367844fa9c9ddbb5a1e4283b9d490afdb2fcdc932
+MISC ChangeLog 17517 RMD160 c24aded8cb9c1f315b37872ee5a2d450c992ee22 SHA1 498836eed1f988149ca37424c8d413a2cb05a51d SHA256 cf634059a5335985c3c1f20ca087c283c0cfe3ac83eeda3d94e3480022092b71
 MISC metadata.xml 339 RMD160 0d536a77658ffb6d8bccff7183a5bf4722d0a82d SHA1 f5bd1085f69b6e9d81e42cd711a7846ccb267e31 SHA256 6b3bedf093395def984b71f7c74ce59742c5df6592ad50f1b96c8a2499f27c8b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjfVbcACgkQfNMcoUhJ7GwEPACglK+d8NjDQRvKJZH7jsieCcE8
+leEAn3ROjS7n7fE2O0a188wSNZup5jMj
+=jLR7
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/lua/lua-5.1.3-r2.ebuild b/dev-lang/lua/lua-5.1.3-r2.ebuild
deleted file mode 100644
index 3bd8b735c07e..000000000000
--- a/dev-lang/lua/lua-5.1.3-r2.ebuild
+++ /dev/null
@@ -1,110 +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.3-r2.ebuild,v 1.4 2008/05/18 15:09:33 armin76 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="deprecated 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
-
-	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
-
-	# 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
-	# 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
-
-	# 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 || die "test $test failed"
-	done
-
-	for test in ${negative}; do
-		test/lua.static test/${test}.lua && die "test $test failed"
-	done
-}
diff --git a/dev-lang/lua/lua-5.1.3-r1.ebuild b/dev-lang/lua/lua-5.1.4.ebuild
index 3e13c3d719e8..b75d588af811 100644
--- a/dev-lang/lua/lua-5.1.3-r1.ebuild
+++ b/dev-lang/lua/lua-5.1.4.ebuild
@@ -1,8 +1,10 @@
 # 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-r1.ebuild,v 1.9 2008/05/18 16:27:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.4.ebuild,v 1.1 2008/09/28 10:00:26 mabi Exp $
 
-inherit eutils portability versionator
+EAPI="1"
+
+inherit eutils portability versionator toolchain-funcs
 
 DESCRIPTION="A powerful light-weight programming language designed for extending applications"
 HOMEPAGE="http://www.lua.org/"
@@ -10,8 +12,8 @@ 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="deprecated readline static"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+deprecated readline static"
 
 DEPEND="readline? ( sys-libs/readline )"
 
@@ -23,10 +25,10 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make.patch
 	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
 
-	EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
+	# 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/\(LIB_VERSION = \)6:1:1/\16:4:1/' src/Makefile
 
 	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
 
@@ -54,6 +56,7 @@ src_unpack() {
 }
 
 src_compile() {
+	tc-export CC
 	myflags=
 	# what to link to liblua
 	liblibs="-lm"
@@ -67,8 +70,8 @@ src_compile() {
 	fi
 
 	cd src
-	emake CFLAGS="${mycflags} ${CFLAGS}" \
-			RPATH="/usr/$(get_libdir)/" \
+	emake CC="${CC}" CFLAGS="${mycflags} ${CFLAGS}" \
+			RPATH="${ROOT}/usr/$(get_libdir)/" \
 			LUA_LIBS="${mylibs}" \
 			LIB_LIBS="${liblibs}" \
 			V=${PV} \