fix broken patches, cleanup

Package-Manager: portage-2.1.6.11/cvs/Linux ppc

5 files changed, 25 insertions, 127 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index 729bb0c1b15e..edac63b313a3 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/lua
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.130 2009/04/04 16:43:55 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.131 2009/04/05 23:23:41 mabi Exp $
+
+  05 Apr 2009; Matti Bickel <mabi@gentoo.org> files/lua-5.1-make-r1.patch,
+  files/lua-5.1-make_static-r1.patch, -lua-5.1.3-r4.ebuild:
+  fix broken patches, cleanup
 
   04 Apr 2009; Matti Bickel <mabi@gentoo.org> lua-5.1.4.ebuild:
   ppc stable (bug #255191)
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 5014e1152af3..c11614c7cfed 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -13,9 +13,11 @@ AUX 5.1.3/09_all_string_byte_fix_upstream.patch 405 RMD160 7de6450892cceb335c91b
 AUX 5.1.3/10_all_gc_loop_fix.upstream.patch 629 RMD160 1fc17a81408ca90bf95b6e8bb729e84786b9f669 SHA1 c43c02e9b435a9fe1ec4f58bde0b153c79551eb1 SHA256 133f62d35a0c31f01b44633d9901fc5a2677e5ccfd90f548f2cae7470dae9436
 AUX 5.1.3/11_all_module.upstream.patch 575 RMD160 cff7cdb7790fc9c78221181564b50911f3a39109 SHA1 618f6bf2388cbdffd8784bfdf455e30bc659aef5 SHA256 bc870719345818f881740a4dcdc3683294cf33e5619895a71e24e290007a177e
 AUX 5.1.3/12_all_svalue.upstream.patch 303 RMD160 383d68a00fc2d3f451def70f4629dfed5d691014 SHA1 e09c0442eba74c7acd8e08167bcc8b91c248f5eb SHA256 d5fabc1c89ef473d141a6663f6adeb25579102a975dbbd5ce57a8ac883cc48ec
-AUX lua-5.1-make-r1.patch 2075 RMD160 57f56d3cc4c2e4a514b4bef7e2c504362cf809e2 SHA1 ace3ffa41519da4739c54a10087f9658d6e2b3b1 SHA256 5876fedbb330133f1b5acc207c64bfad8939d91edf817831a6dd6313e9a19313
+AUX lua-5.1-make-r1.patch 2229 RMD160 9dfd3494f93a673e724e642f10543b80466dd547 SHA1 0896a440ad823c55f0a7a3354a09f4e29bceccf7 SHA256 bf691afd2480a496bfa9b2c46fcbb396e7034ea58e94399788e05ab7872ae46f
 AUX lua-5.1-make.patch 2209 RMD160 03d6ff5c31aa2ea8cb4dec871ae4ba4d711d2240 SHA1 103efb333cef67ab3f521e49bda56f647c633f7a SHA256 3ffa297c79ad7ba378eba3de2b730670e60c7ea28181fcca4e0d0e25612997c4
-AUX lua-5.1-make_static-r1.patch 598 RMD160 f5ca300b63dbb631a3af4f51195cca013f546b14 SHA1 cdba927578cfff3f29af24f80759d001e25bf949 SHA256 3db0dea9d8b5b7bb9cdce48e4068130b90d4920ce8337fc28249745849279059
+AUX lua-5.1-make_static-r1.patch 644 RMD160 e8406f9750d2cb5a1a1ab501a1553a7f7e45a92d SHA1 18608b5344938fb6d10eaf81d82a46a295fde49b SHA256 586e812160ee164b9b3ffba455632322a4e690ec1084412a6e0cafc836fe197d
+AUX lua-5.1-make_static-r1.patch.orig 620 RMD160 800c0fd4592becd3b4dc36b0727de5949ac66f81 SHA1 217b5f84f8a5aa0a4ff20ba0d7264e19982b6639 SHA256 fdefd254723e3fb4b769f15d9385709cfbec6315a0fdc683660b3e43aa98b4a0
+AUX lua-5.1-make_static-r1.patch.rej 1328 RMD160 2e5889b593986a4864755ccf3352da1d9a82c0df SHA1 f129646256f97d7f1f4e454881a09703767358e0 SHA256 6e076c5aa7936b0a641cb7e77c82a50a603118eb2103c42645f768e66ab83b34
 AUX lua-5.1-make_static.patch 574 RMD160 6ea966acababd4f0f94f12e50b4ff0bc92e59235 SHA1 023133efea0bea0660c80dd4b811b1499b611e69 SHA256 6b62728ebf86a01d917a662aa265ba1bc9ccdb4599a36f1d2e15cfd06080bbd7
 AUX lua-5.1-module_paths.patch 1078 RMD160 31a3f13af427bdcae784e21a9456f9197c59379e SHA1 50cb1438b7c50536ebf712d16d153eac40599562 SHA256 1115b6aa00eb4e918156ae70c763534bd2f603ba888da75e4908c19c2ac3e5f7
 AUX lua-5.1-readline.patch 360 RMD160 29e6f8193592ec6e551e46f953563113a72d2de2 SHA1 25baabcb1d3449c3c38726fc7de6c4abb34667a6 SHA256 1f0f90eb8103e338f1188cc884c0c59cc6afd023828c11d86b8145b2a8d1efc2
@@ -28,15 +30,14 @@ DIST lua-5.1.3.tar.gz 215817 RMD160 1c5979dd4986057fef325aa2af0c872bbecab92e SHA
 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-r3.ebuild 2967 RMD160 2853f527bc2f6ecd7ccf5b910ed045d5462d11f6 SHA1 20b3f6be6e3030123ce123e9952ed96a878a4840 SHA256 4863ee049f2b57be5c9e43f00cc08a73278917a9a57f9bdd65133000fc3b35c5
-EBUILD lua-5.1.3-r4.ebuild 3041 RMD160 6081734baf13ff575aa5fa9cabf8ecf98968938b SHA1 449192cef6d30eaf81b4a1e007d7da03a362f14b SHA256 da399b248158b060e937e48b32e1bd63404ad765dc2173fde87e133b5b98f768
 EBUILD lua-5.1.4-r1.ebuild 3012 RMD160 e1c82ed3d00d328d252d69e3f8cd2cf87be4deba SHA1 e7a456257f6d8da43cc9df3add3b7cf43558d9db SHA256 e8459fb17fa2dace1e7e06ee730638615e25f952bb7f106ac9605502df5596d5
 EBUILD lua-5.1.4.ebuild 2993 RMD160 0f241d783504fe738388c84657bb193e219bab0a SHA1 2d120a4c12ab1bd39f261ff1b7559daf548b3f0e SHA256 7a908c36915520c98dcb7bf936142157f0983239fe059f86fd8bb132ef2698b3
-MISC ChangeLog 19222 RMD160 10968f626e632ca90514c3eca0cee551e8ea2bec SHA1 fb702cf3762fa2cdd25c9969a8e821a5aed733a4 SHA256 3131cbfe308e6d5f77d6a8907dc7eaff987821f07dc941e39c5c4ada905b42f1
+MISC ChangeLog 19388 RMD160 dff65bf1016709cf7061ba69176ea76e6f74aa27 SHA1 5336376ac0a6cf80e8c76a08a281c2b442d182a5 SHA256 0070d056a58a2d0d5e8ada4b0a2ab5bcd1dd8b19c2f69b354c117ca75e195212
 MISC metadata.xml 339 RMD160 0d536a77658ffb6d8bccff7183a5bf4722d0a82d SHA1 f5bd1085f69b6e9d81e42cd711a7846ccb267e31 SHA256 6b3bedf093395def984b71f7c74ce59742c5df6592ad50f1b96c8a2499f27c8b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAknXjg8ACgkQfNMcoUhJ7GztVQCgpwFAIlV1yGNp0yEfFPHLuwZ4
-vRMAn3FLq1mH3ARuyZsXWF1kSFRaGd00
-=UQUp
+iEYEARECAAYFAknZPTQACgkQfNMcoUhJ7GwBFACfWIBcbmhNv03fiIGYZybInWTq
+UjMAnRsiGed8xFW9MhbtfM+jbY9NseRd
+=ulFA
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/lua/files/lua-5.1-make-r1.patch b/dev-lang/lua/files/lua-5.1-make-r1.patch
index b50620099564..8eecbdd40268 100644
--- a/dev-lang/lua/files/lua-5.1-make-r1.patch
+++ b/dev-lang/lua/files/lua-5.1-make-r1.patch
@@ -24,6 +24,12 @@
 +	cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.la $(INSTALL_LIB)
 --- lua-5.1.1.orig/src/Makefile	2006-03-22 01:41:49.000000000 +0100
 +++ lua-5.1.1/src/Makefile	2006-11-16 02:10:27.000000000 +0100
+@@ -54,1 +54,1 @@
+-$(LUA_T): $(LUA_O) $(LUA_A)
++origin$(LUA_T): $(LUA_O) $(LUA_A)
+@@ -57,1 +57,1 @@
+-$(LUAC_T): $(LUAC_O) $(LUA_A)
++origin$(LUAC_T): $(LUAC_O) $(LUA_A)
 @@ -176,3 +176,33 @@
    ltm.h lzio.h lmem.h lopcodes.h lundump.h
  
@@ -46,7 +52,7 @@
 +            -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
 +
 +$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
-+	$(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ $(LUA_O::.o=.lo) $(LUA_LIBS) -llua
++	$(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
 +
 +lua_test: $(LUA_O:.o=.lo) $(LIB_NAME)
 +	$(LIBTOOL) --mode=link $(CC) -static -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
@@ -57,4 +63,4 @@
 +gentoo_clean:
 +	$(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua luac
 +
-+gentoo_all: $(LIB_NAME) $(LIB_NAME:.la=.a) $(LUA_T) lua_test $(LUAC_T)
++gentoo_all: $(LIB_NAME) $(LUA_T) lua_test $(LUAC_T)
diff --git a/dev-lang/lua/files/lua-5.1-make_static-r1.patch b/dev-lang/lua/files/lua-5.1-make_static-r1.patch
index 2d3d1d31d6c4..a82e1c3baac5 100644
--- a/dev-lang/lua/files/lua-5.1-make_static-r1.patch
+++ b/dev-lang/lua/files/lua-5.1-make_static-r1.patch
@@ -2,11 +2,11 @@ diff -ru lua-5.1.1.orig/src/Makefile lua-5.1.1/src/Makefile
 --- lua-5.1.1.orig/src/Makefile	2006-11-21 07:19:31 +0000
 +++ lua-5.1.1/src/Makefile	2006-11-21 07:19:52 +0000
 @@ -196,7 +196,7 @@
-             -rpath $(RPATH) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
+             -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
  
- $(LUA_T): $(LUA_O) $(LIB_NAME)
--	$(LIBTOOL) --mode=link $(CC) -export-dynamic -o $@ $(LUA_O:.o=.lo) $(LUA_LIBS) -llua
-+	$(LIBTOOL) --mode=link $(CC) -static -export-dynamic -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
+ $(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
+-	$(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LUA_LIBS) $(LUA_LIBS)
++	$(LIBTOOL) --mode=link $(CC) -static -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
  
  $(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME)
  	$(LIBTOOL) --mode=link $(CC) -static -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME)
diff --git a/dev-lang/lua/lua-5.1.3-r4.ebuild b/dev-lang/lua/lua-5.1.3-r4.ebuild
deleted file mode 100644
index 0249148bab2a..000000000000
--- a/dev-lang/lua/lua-5.1.3-r4.ebuild
+++ /dev/null
@@ -1,113 +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-r4.ebuild,v 1.4 2008/09/13 20:24:39 solar Exp $
-
-EAPI="1"
-
-inherit eutils portability versionator toolchain-funcs
-
-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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-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() {
-	tc-export CC
-	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 CC="${CC}" CFLAGS="${mycflags} ${CFLAGS}" \
-			RPATH="${ROOT}/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
-}