Install expatu.pc and expatw.pc pkg-config files with USE="unicode"

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

3 files changed, 109 insertions, 6 deletions

diff --git a/dev-libs/expat/ChangeLog b/dev-libs/expat/ChangeLog
index df6ed1d1493c..406c33cca4dc 100644
--- a/dev-libs/expat/ChangeLog
+++ b/dev-libs/expat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/expat
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.133 2012/04/16 02:29:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.134 2012/04/18 20:08:44 ssuominen Exp $
+
+*expat-2.1.0-r1 (18 Apr 2012)
+
+  18 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> +expat-2.1.0-r1.ebuild:
+  Install expatu.pc and expatw.pc pkg-config files with USE="unicode"
 
   16 Apr 2012; Jeroen Roovers <jer@gentoo.org> expat-2.1.0.ebuild:
   Stable for HPPA (bug #412089).
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 2dea295a286e..99a0dcca5ff1 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -8,14 +8,19 @@ DIST expat-2.0.1.tar.gz 446456 RMD160 d31bcb152adaff9e358968be1ea901e1b4ed3b2f S
 DIST expat-2.1.0-beta3.tar.gz 562612 RMD160 2a03f16494c61fe7eb0e5e3081a4f68f78f3610d SHA1 956e05916d4840c46ca9f5377a01b13cafc4b510 SHA256 69d2ec90d46b1308ffd2f4e8f2f269124951f9c12314d422df8f47fe315f2aa6
 DIST expat-2.1.0.tar.gz 562616 RMD160 bffca083d29fe7688f106a902ef9b909c3321c5d SHA1 b08197d146930a5543a7b99e871cba3da614f6f0 SHA256 823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86
 EBUILD expat-2.0.1-r6.ebuild 2271 RMD160 3328a7a2af7d28e4dd4b96094fa1be55744e2a4f SHA1 163b37b7b83fb32f64a347f6a94828c90e3cf4fa SHA256 0c477a2016491abf555c9cd64c5da42a7f3350abbf6dd5180ae7e65c36530a7f
+EBUILD expat-2.1.0-r1.ebuild 2344 RMD160 eab09773a1e3bbf317b0004106242bb6db4517c2 SHA1 ccea982e63a3ddd833cca0f622107482b661cf01 SHA256 34db1a5a759718db15e4beee7221499f0a7ba57703d71823cad0119a83cc7070
 EBUILD expat-2.1.0.ebuild 2095 RMD160 e3cb3123f3e0a0f7875fd40575f5d54ae38b8c88 SHA1 637e3d67697f4c1e4bca044fd444fa4ea6504eed SHA256 cedf3690d118ea7ffd1f9c14999949a36fbb2835ff4a971a7acb8fcbeb8f305c
 EBUILD expat-2.1.0_beta3.ebuild 2206 RMD160 36659c30a6b065893c12e6edf5970f820464fd81 SHA1 ab8105587274d0dc87c0a373ff5b8d641e8dac20 SHA256 aee818e8aac73a92e29bf332247049debeec7f7219b69cf1dbc91e14493f8646
-MISC ChangeLog 17449 RMD160 811d26d31349a0cd71c1000b7f8d971f6be4bee6 SHA1 ab55020f1fc0e9cd94b9d921bcbd682fc42b8caf SHA256 e3a1af13719b7173993f47476f49144ec582e13be3fa88e4d172f9ad6228c515
+MISC ChangeLog 17635 RMD160 b75458867f4ad4bcce7fd3b039f75cfbf1b145d1 SHA1 3aa4560c4d8d4f6c611ca3408b4c900b5c959fae SHA256 19025bce566d381030df938764e0de33ef075402d29dd473b9bf438ba1794ef2
 MISC metadata.xml 166 RMD160 70f6dcdab1516411ac581b270671fb776401f7b3 SHA1 79f7c7e01fdc4b59d924371b4ec75b000948fecc SHA256 a4f7a9f8f89d2da4f8d0c2d6acdacc96c38d4c076d23d8b2081f2a149ff15a56
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+LhCgACgkQVWmRsqeSphOBLQCfdx/bOGFREwIwH7NXtR9RUuXR
-JrIAnjuqMdHPoDy3lvEPy5T6o7UedOpD
-=lAy9
+iQEcBAEBAgAGBQJPjx73AAoJEEdUh39IaPFNo2EH/1Epp0E+yOx+1Y98DMOVwQmJ
+4zHJFQyFMafVE1wvFxzlBrQTVpC8B7jYDCE42qO6X2Wx99AVHs4ho0V9pzM0GQSe
+xhLigNqzPk08GdBH1A9jN5GZ4e0+/Ikw0lHsjtjtuj2XIC3SXnLZCPs6pHva1OTP
+6keMpCItMe2zSuz9OTJ9t6BgO4vtp5B1ziToyYCq7q+5DCaRlHuhdMcdcAri5KJt
+K/+mXBVq1Z8GGGfLpqZBxNRDY6peTVLPJjJfx+sejWQzlu9+Yof0C/NCAvY1Jdsr
+8hK5zL1she0twEAYUeJ3hN4FNCtl4pMrgbfuf6AuUA/3+j3OGCLcp4R3Bz2WySs=
+=enBk
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/expat/expat-2.1.0-r1.ebuild b/dev-libs/expat/expat-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..0cffa347034c
--- /dev/null
+++ b/dev-libs/expat/expat-2.1.0-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0-r1.ebuild,v 1.1 2012/04/18 20:08:44 ssuominen Exp $
+
+EAPI=4
+inherit eutils libtool multilib toolchain-funcs
+
+DESCRIPTION="XML parsing libraries"
+HOMEPAGE="http://expat.sourceforge.net/"
+SRC_URI="mirror://sourceforge/expat/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="elibc_FreeBSD examples static-libs unicode"
+
+src_prepare() {
+	elibtoolize
+	epunt_cxx
+
+	mkdir "${S}"-build{,u,w} || die
+}
+
+src_configure() {
+	local myconf="$(use_enable static-libs static)"
+
+	pushd "${S}"-build >/dev/null
+	ECONF_SOURCE="${S}" econf ${myconf}
+	popd >/dev/null
+
+	if use unicode; then
+		pushd "${S}"-buildu >/dev/null
+		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf}
+		popd >/dev/null
+
+		pushd "${S}"-buildw >/dev/null
+		CFLAGS="${CFLAGS} -fshort-wchar" CPPFLAGS="${CPPFLAGS} -DXML_UNICODE_WCHAR_T" ECONF_SOURCE="${S}" econf ${myconf}
+		popd >/dev/null
+	fi
+}
+
+src_compile() {
+	pushd "${S}"-build >/dev/null
+	emake
+	popd >/dev/null
+
+	if use unicode; then
+		pushd "${S}"-buildu >/dev/null
+		emake buildlib LIBRARY=libexpatu.la
+		popd >/dev/null
+
+		pushd "${S}"-buildw >/dev/null
+		emake buildlib LIBRARY=libexpatw.la
+		popd >/dev/null
+	fi
+}
+
+src_install() {
+	dodoc Changes README
+	dohtml doc/*
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.c
+	fi
+
+	pushd "${S}"-build >/dev/null
+	emake install DESTDIR="${D}"
+	popd >/dev/null
+
+	if use unicode; then
+		pushd "${S}"-buildu >/dev/null
+		emake installlib DESTDIR="${D}" LIBRARY=libexpatu.la
+		popd >/dev/null
+
+		pushd "${S}"-buildw >/dev/null
+		emake installlib DESTDIR="${D}" LIBRARY=libexpatw.la
+		popd >/dev/null
+
+		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
+		cp expat.pc expatu.pc
+		sed -i -e '/^Libs/s:-lexpat:&u:' expatu.pc || die
+		cp expat.pc expatw.pc
+		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
+		popd >/dev/null
+	fi
+
+	rm -f "${ED}"usr/lib*/libexpat{,u,w}.la
+
+	# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
+	# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
+	use elibc_FreeBSD && gen_usr_ldscript -a expat
+}