Version bump luaexpat to 1.2.0.

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

4 files changed, 87 insertions, 3 deletions

diff --git a/dev-lua/luaexpat/ChangeLog b/dev-lua/luaexpat/ChangeLog
index 2a5d3c02c489..cdd2661241d0 100644
--- a/dev-lua/luaexpat/ChangeLog
+++ b/dev-lua/luaexpat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lua/luaexpat
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/luaexpat/ChangeLog,v 1.2 2010/11/05 20:51:36 rafaelmartins Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luaexpat/ChangeLog,v 1.3 2011/06/06 11:34:21 djc Exp $
+
+*luaexpat-1.2.0 (06 Jun 2011)
+
+  06 Jun 2011; Dirkjan Ochtman <djc@gentoo.org> +luaexpat-1.2.0.ebuild,
+  +files/luaexpat-1.2.0-makefile.patch:
+  Version bump to 1.2.0.
 
   05 Nov 2010; Rafael G. Martins <rafaelmartins@gentoo.org>
   +files/luaexpat-1.1-makefile.patch:
diff --git a/dev-lua/luaexpat/Manifest b/dev-lua/luaexpat/Manifest
index 41644c968681..11069e8cdada 100644
--- a/dev-lua/luaexpat/Manifest
+++ b/dev-lua/luaexpat/Manifest
@@ -1,5 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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.1.tar.gz 27907 RMD160 f661c0e7f22363f51862187e96306498addea9d9 SHA1 ea359bdbd346ee378c47179a17ac3ee410be5c9d SHA256 9d709ddc606630f9b9dc3f3aafcb2a7c1fcb2675000c09978d8a37974e74effd
+DIST luaexpat-1.2.0.tar.gz 28621 RMD160 e92fb3447b3cd17bdd03ebfdaf000a1f001c59f2 SHA1 76f036e6fb928a3e5f3c3ba1b854e5fef8e1b28f SHA256 2a7140e9c1923510639e87b60e85d7ddd0cd4e27561663bd9d4031ef90bae5ef
 EBUILD luaexpat-1.1.ebuild 1377 RMD160 fb0eb52cc4463d47abf80531c25493b377954297 SHA1 7ae0be90df230d866dc5950caf4a4c18168a67c3 SHA256 ec06dc4018771890886c3daa52334e2a0513931ed8c834a500bcaf0d6e68f89f
-MISC ChangeLog 863 RMD160 1410b058f37b9b06aa0fcb6f5a68d21e6f1179bd SHA1 a5268cc7af87e77f8c257a072c50f09216e192ec SHA256 c9abb4de4ca9c21ca3072375f9c112fa1bca6d7671eea886b55e5c9f792e680e
+EBUILD luaexpat-1.2.0.ebuild 1367 RMD160 95a7bc2f9f0cb4754237d2e8df242c12cdb8cdc3 SHA1 0d9a03d1f1df610bd7770b585736150a62e5a7e5 SHA256 ab98f0525cf24654a5693935e6c6ad99932f5534fcf918b8bb1bc05cd70873df
+MISC ChangeLog 1022 RMD160 74a1bee080917a5ee63ead4d0112f3131544bfd4 SHA1 c109b84ef54a5c1244b8886b8114e776fd60cd46 SHA256 d1f611bd1f82e86654b6ef5f8df4b64991268dcb0c31bc10f64b369f65a812f7
 MISC metadata.xml 335 RMD160 ee6550a1602f99eaadbad62db6fc7a701ac719a8 SHA1 4e2ad7f3f6d0c0f13dd2d1912444b2f351ee940b SHA256 20266c203fddddb7747729b946548712e351614bdb943113181fbf225869365f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3su0oACgkQxeMuLWsGW/t8PQCcDhWKheoBa5dGTVAhigrEPCZB
+uNgAoKeeBYBPz+bj0j7/KI4z8ot08vn5
+=ecvB
+-----END PGP SIGNATURE-----
diff --git a/dev-lua/luaexpat/files/luaexpat-1.2.0-makefile.patch b/dev-lua/luaexpat/files/luaexpat-1.2.0-makefile.patch
new file mode 100644
index 000000000000..b503a4e032d9
--- /dev/null
+++ b/dev-lua/luaexpat/files/luaexpat-1.2.0-makefile.patch
@@ -0,0 +1,19 @@
+--- makefile.old	2006-06-08 20:41:48.000000000 +0000
++++ makefile	2009-10-26 14:19:08.000000000 +0000
+@@ -18,11 +18,11 @@
+ 	$(CC) -c $(CFLAGS) -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.ebuild b/dev-lua/luaexpat/luaexpat-1.2.0.ebuild
new file mode 100644
index 000000000000..6759d45ed83b
--- /dev/null
+++ b/dev-lua/luaexpat/luaexpat-1.2.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2011 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.ebuild,v 1.1 2011/06/06 11:34:21 djc Exp $
+
+EAPI=2
+
+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}/${P}-makefile.patch"
+}
+
+src_compile() {
+	append-flags -fPIC
+	emake \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC) -shared" \
+		|| die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Install failed"
+	dodoc README || die
+	dohtml -r doc/* || die
+}