Respect LDFLAGS (bug 336770), bumped EAPI.

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 88 insertions, 10 deletions

diff --git a/dev-lua/luaexpat/ChangeLog b/dev-lua/luaexpat/ChangeLog
index f716573f251e..5572841c720a 100644
--- a/dev-lua/luaexpat/ChangeLog
+++ b/dev-lua/luaexpat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lua/luaexpat
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/luaexpat/ChangeLog,v 1.4 2011/06/24 20:12:18 djc Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luaexpat/ChangeLog,v 1.5 2012/03/01 12:51:19 djc Exp $
+
+*luaexpat-1.2.0-r1 (01 Mar 2012)
+
+  01 Mar 2012; Dirkjan Ochtman <djc@gentoo.org>
+  +files/1.2.0-destdir-ldflags.patch, +luaexpat-1.2.0-r1.ebuild:
+  Respect LDFLAGS (bug 336770), bumped EAPI.
 
   24 Jun 2011; Dirkjan Ochtman <djc@gentoo.org> -luaexpat-1.1.ebuild:
   Remove vulnerable old version.
diff --git a/dev-lua/luaexpat/Manifest b/dev-lua/luaexpat/Manifest
index 8055a50fc24f..0d06d8492571 100644
--- a/dev-lua/luaexpat/Manifest
+++ b/dev-lua/luaexpat/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX 1.2.0-destdir-ldflags.patch 982 RMD160 9ffc4d739f120134ba721bde57d76e7b26891285 SHA1 d48c6f261a180490d0cb15122e8008c8edfc0bb9 SHA256 3afc9b4bbb9c2d5137a8b44f21d6b2bb57759674a05e861985850cc61c3b0d77
 AUX luaexpat-1.1-makefile.patch 607 RMD160 ea658a7f7c487a4a119bc9760a334c197ab1b80f SHA1 db44cfedc90c9a6ffe9d86ee03ec1e7d56566c49 SHA256 606a86314e3fdfe4a1ea63a1587629e1e3b1e867d98f6739a8f5bbf5431297ef
 AUX luaexpat-1.2.0-makefile.patch 607 RMD160 ea658a7f7c487a4a119bc9760a334c197ab1b80f SHA1 db44cfedc90c9a6ffe9d86ee03ec1e7d56566c49 SHA256 606a86314e3fdfe4a1ea63a1587629e1e3b1e867d98f6739a8f5bbf5431297ef
 DIST luaexpat-1.2.0.tar.gz 28621 RMD160 e92fb3447b3cd17bdd03ebfdaf000a1f001c59f2 SHA1 76f036e6fb928a3e5f3c3ba1b854e5fef8e1b28f SHA256 2a7140e9c1923510639e87b60e85d7ddd0cd4e27561663bd9d4031ef90bae5ef
+EBUILD luaexpat-1.2.0-r1.ebuild 1329 RMD160 6b34c1dd3364b3b89c0eb6b6d9c06abc720859e1 SHA1 099eb65ab7c50c44a42fdf2569e448a01cc22c2f SHA256 7126686772245a4be40fd813172b161cea84cd56cce455ecea7753cf8e70fc89
 EBUILD luaexpat-1.2.0.ebuild 1367 RMD160 95a7bc2f9f0cb4754237d2e8df242c12cdb8cdc3 SHA1 0d9a03d1f1df610bd7770b585736150a62e5a7e5 SHA256 ab98f0525cf24654a5693935e6c6ad99932f5534fcf918b8bb1bc05cd70873df
-MISC ChangeLog 1126 RMD160 e809a4c922f1dfad9ee95f78e9e5b9ca72cfa8ce SHA1 cf0b76fa0613a38054c03b7cff9fe1c66b6087c3 SHA256 4ab315b4342f6b11d749ae2469392166653cee10c1ffd7a764664b895a352b60
+MISC ChangeLog 1319 RMD160 96b808a6b16a4150d3d2c6efcd079c11106db4a9 SHA1 81be884a154048c81774d21c57cce4d59ad2ae1c SHA256 4c4e1482364680606ccf82c6d3755fe8856b705128983e4da2613cb6be031620
 MISC metadata.xml 312 RMD160 9d6a4de2ad4c058f1a76bb0f40edc863b8bdd353 SHA1 2d84b49cbfcb98923440d3731f9aeae1ad775d28 SHA256 30a2b0c1eaee45f4f21aef60fd327a220df7ecb90c506642c701eb9e73f2cfda
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59DAEACgkQfXuS5UK5QB3mqwP+O7h9aCgbXssRsgjRDggCTMtq
-wHdCZ8cjj3/x/x2ez9o/VFtHlOf4IjwBWZdozKHVFXF+vpLEf5pste2WGFw8gqkd
-vGSN94Ml5/0l+5gSy6CeV8loZszyH6ypcolgJXdj4exgMedpEBtNDOyGZh0X5mE3
-Fdpm9WX2RH9h7j/MgK8=
-=mDXO
+iEYEAREKAAYFAk9PcNAACgkQxeMuLWsGW/s5tgCghGCJyRNrTlWm2LN6NYgSXZts
+KGAAn2G3q0UNt/tnk3jWR1o4EqnmwXqe
+=qiOB
 -----END PGP SIGNATURE-----
diff --git a/dev-lua/luaexpat/files/1.2.0-destdir-ldflags.patch b/dev-lua/luaexpat/files/1.2.0-destdir-ldflags.patch
new file mode 100644
index 000000000000..754fe27c8419
--- /dev/null
+++ b/dev-lua/luaexpat/files/1.2.0-destdir-ldflags.patch
@@ -0,0 +1,27 @@
+--- makefile.bak	2012-03-01 13:44:47.000000000 +0100
++++ makefile	2012-03-01 13:45:50.000000000 +0100
+@@ -12,17 +12,17 @@
+ lib: src/$(LIBNAME)
+ 
+ src/$(LIBNAME) : $(OBJS)
+-	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) -o src/$(LIBNAME) $(LIB_OPTION) $(OBJS) -lexpat
++	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) -o src/$(LIBNAME) $(LIB_OPTION) $(LDFLAGS) $(OBJS) -lexpat
+ 
+ $(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c
+-	$(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
++	$(CC) -c $(CFLAGS) $(LDFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
+ 
+ install:
+-	mkdir -p $(LUA_LIBDIR)
+-	cp src/$(LIBNAME) $(LUA_LIBDIR)
+-	cd $(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
+-	mkdir -p $(LUA_DIR)/$T
+-	cp src/$T/lom.lua $(LUA_DIR)/$T
++	mkdir -p $(DESTDIR)$(LUA_LIBDIR)
++	cp src/$(LIBNAME) $(DESTDIR)$(LUA_LIBDIR)
++	cd $(DESTDIR)$(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
++	mkdir -p $(DESTDIR)$(LUA_DIR)/$T
++	cp src/$T/lom.lua $(DESTDIR)$(LUA_DIR)/$T
+ 
+ clean:
+ 	rm -f src/$(LIBNAME) $(OBJS)
diff --git a/dev-lua/luaexpat/luaexpat-1.2.0-r1.ebuild b/dev-lua/luaexpat/luaexpat-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..361db69e4d67
--- /dev/null
+++ b/dev-lua/luaexpat/luaexpat-1.2.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luaexpat/luaexpat-1.2.0-r1.ebuild,v 1.1 2012/03/01 12:51:18 djc Exp $
+
+EAPI=4
+
+inherit multilib toolchain-funcs flag-o-matic eutils
+
+DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library."
+HOMEPAGE="http://www.keplerproject.org/luaexpat/"
+SRC_URI="http://matthewwild.co.uk/projects/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/lua-5.1[deprecated]
+	dev-libs/expat"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	sed -i -e "s#^LUA_LIBDIR=.*#LUA_LIBDIR=$(pkg-config --variable INSTALL_CMOD lua)#" "${S}/config"
+	sed -i -e "s#^LUA_DIR=.*#LUA_DIR=$(pkg-config --variable INSTALL_LMOD lua)#" "${S}/config"
+	sed -i -e "s#^LUA_INC=.*#LUA_INC=$(pkg-config --variable INSTALL_INC lua)#" "${S}/config"
+	sed -i -e "s#^EXPAT_INC=.*#EXPAT_INC=/usr/include#" "${S}/config"
+	sed -i -e "s#^LUA_VERSION_NUM=.*#LUA_VERSION_NUM=501#" "${S}/config"
+	epatch "${FILESDIR}/${PV}-destdir-ldflags.patch"
+}
+
+src_compile() {
+	append-flags -fPIC
+	emake \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC) -shared"
+}
+
+src_install() {
+	make DESTDIR="${D}" install
+	dodoc README
+	dohtml -r doc/*
+}