USE=unicode to control building libexpatu and libexpatw. Use correct CFLAGS and CPPFLAGS in the src_configure() phase for configuring unicode libraries.

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

3 files changed, 109 insertions, 10 deletions

diff --git a/dev-libs/expat/ChangeLog b/dev-libs/expat/ChangeLog
index 23b3c1ee22f3..3b36b96b9ce3 100644
--- a/dev-libs/expat/ChangeLog
+++ b/dev-libs/expat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/expat
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.108 2011/12/22 16:44:36 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.109 2012/02/25 11:34:44 ssuominen Exp $
+
+*expat-2.0.1-r6 (25 Feb 2012)
+
+  25 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> +expat-2.0.1-r6.ebuild:
+  USE="unicode" to control building libexpatu and libexpatw. Use correct CFLAGS
+  and CPPFLAGS in the src_configure() phase for configuring the unicode
+  libraries.
 
   22 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> -expat-2.0.1-r3.ebuild,
   -expat-2.0.1-r4.ebuild:
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 17b663494b85..3313a4876e3a 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -6,16 +6,17 @@ AUX expat-2.0.1-check_stopped_parser.patch 410 RMD160 10fa46c2844aeffd31c43f23ba
 AUX expat-2.0.1-fix_bug_1990430.patch 428 RMD160 7b566a7db9036238a7e781a20157f9b4c13fa0d9 SHA1 5d1c09acaa7d73cae98cda327d79a2d64f3b6926 SHA256 1e491172e983878ca7974c1a40a7327a630b728cc33eb9183f8050b536dcb692
 DIST expat-2.0.1.tar.gz 446456 RMD160 d31bcb152adaff9e358968be1ea901e1b4ed3b2f SHA1 663548c37b996082db1f2f2c32af060d7aa15c2d SHA256 847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93
 EBUILD expat-2.0.1-r5.ebuild 1910 RMD160 99d50a6e17a445d8c67c2f0f9cc33b45b9404c58 SHA1 6a94f680f79235cb0a7889059f769df9e717f3f2 SHA256 d17970310caa1566be1f560e855f6ef88a0ee332c5ecc5609cfc44196d87cfd2
-MISC ChangeLog 13993 RMD160 f8b0f6f635906a3ad2bb7993ba8b8b79f2eabe83 SHA1 dd7eb13f580c12f5beb4d62b298ad458c6052294 SHA256 95e4d8bbbe5709f016823726c05da525dbff0461380de7486852975b9193b42e
+EBUILD expat-2.0.1-r6.ebuild 2255 RMD160 f28f3f332e9f66394111cb2c8d756972bd086148 SHA1 8c5fc7ddf678800143aaa736c578bab409d638ea SHA256 f972befd8d903fbd37b75c4541e37d213c9752e40f0c438a4906a31fe5e364eb
+MISC ChangeLog 14268 RMD160 89c0df509c4bc331563f981b96fc2c56cee29ac6 SHA1 e1178fe0a2ee9cf419521fcb63ee3329f30c3db1 SHA256 264cf0ab4314ec3e2cf53c13d87febf9e6b75ec23d723cf693bb9ab4f06efb65
 MISC metadata.xml 166 RMD160 70f6dcdab1516411ac581b270671fb776401f7b3 SHA1 79f7c7e01fdc4b59d924371b4ec75b000948fecc SHA256 a4f7a9f8f89d2da4f8d0c2d6acdacc96c38d4c076d23d8b2081f2a149ff15a56
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO815BAAoJEEdUh39IaPFNvsMIAJTfWPtu5/7fHYGwJ7jJWRMt
-0UW//S2kNxwVk0dbA72ylBpmURhcvW6+VUvmq7C0ncTxq39x4M/ettuv8qXf3g6W
-t2lxNi1mhwaQLPEDEgYUXg4kLaWFmJWRYikTPAkl3m3gHF6fWOAz+z2tQJ4Ccwza
-jlrwWLMchPPNRH4pLajf1vlgKAijWE7XWAjt5YhUH2SmvW6WG29C43kfo0kFTkA/
-zGyCGWtXFioA5MRTZkXLWjYwz1XVTmU6P1lKxoR5sFV9GB5NGfAhMaKoBZBxtqoV
-9IuenTuK16yKEHyF/MXfV2hEqt2Xn0QDGFopX8GBXO86HoBO4Sq67ZvwOA6/7uQ=
-=N6X/
+iQEcBAEBAgAGBQJPSMdEAAoJEEdUh39IaPFNxiAH/ixbl7t+oGQuFsyoX/eEvF7+
+uuPM2bfXDzzM6xZ7STDxffqMQi8Jc8Iwoxpywgr9ni6oEYLWYT0PUkXG/z5zLCBn
+jhfOSKSBmGcmK9QHSM0dqevmcOet9Hx1G5tNLMj80IoLorHQGx3jktxGWoEPUQNK
+OLAuUuTJ+c/22tAUmqhowmCbt+qg4/uzLJZbGY6Cw1SRiiysd3fAlT/xbEwskvbg
+ePNGpXLCgcmf708hWVerhCrY6G8q0SMZu6ujCdXbhbWuzpIEbfhb75EjGLMtFPCK
+ND40lrgjoFjcHlmTZzmV3vutbeuPe32vRdnRrW0bfMP1yOkNSUf5+qFGrZgdnSM=
+=aKrn
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/expat/expat-2.0.1-r6.ebuild b/dev-libs/expat/expat-2.0.1-r6.ebuild
new file mode 100644
index 000000000000..2723bdd7efdf
--- /dev/null
+++ b/dev-libs/expat/expat-2.0.1-r6.ebuild
@@ -0,0 +1,91 @@
+# 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.0.1-r6.ebuild,v 1.1 2012/02/25 11:34:44 ssuominen Exp $
+
+EAPI=4
+inherit eutils libtool 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() {
+	epatch \
+		"${FILESDIR}"/${P}-check_stopped_parser.patch \
+		"${FILESDIR}"/${P}-fix_bug_1990430.patch \
+		"${FILESDIR}"/${P}-CVE-2009-3560-revised.patch
+
+	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+=" -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf}
+		popd >/dev/null
+
+		pushd "${S}"-buildw >/dev/null
+		CFLAGS+=" -fshort-wchar" 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
+	fi
+
+	use static-libs || rm -f "${ED}"usr/lib*/libexpat{,u,w}.la
+
+	# libgeom in /lib and ifconfig in /sbin require it on FreeBSD since we
+	# stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
+	use elibc_FreeBSD && gen_usr_ldscript -a expat{,u,w}
+}