Respect LDFLAGS (bug 336770), bumped EAPI.

(Portage version: 2.1.10.49/cvs/Linux x86_64)

3 files changed, 80 insertions, 2 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/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/*
+}