Build libexpatu (unicode) and libexpatw (unicode wchar_t) libraries wrt #306655 by Gilles Dartiguelongue and Tiziano Müller

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

3 files changed, 82 insertions, 5 deletions

diff --git a/dev-libs/expat/ChangeLog b/dev-libs/expat/ChangeLog
index 5b85cb99773c..39033ad6fd3b 100644
--- a/dev-libs/expat/ChangeLog
+++ b/dev-libs/expat/ChangeLog
@@ -1,6 +1,10 @@
 # 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.99 2011/07/29 16:33:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.100 2011/08/01 10:14:26 ssuominen Exp $
+
+  01 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> +expat-2.0.1-r5.ebuild:
+  Build libexpatu (unicode) and libexpatw (unicode wchar_t) libraries wrt
+  #306655 by Gilles Dartiguelongue and Tiziano Müller
 
 *expat-2.0.1-r4 (29 Jul 2011)
 
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 91e0e4fad7fa..4cfdc980828f 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -7,12 +7,13 @@ AUX expat-2.0.1-fix_bug_1990430.patch 428 RMD160 7b566a7db9036238a7e781a20157f9b
 DIST expat-2.0.1.tar.gz 446456 RMD160 d31bcb152adaff9e358968be1ea901e1b4ed3b2f SHA1 663548c37b996082db1f2f2c32af060d7aa15c2d SHA256 847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93
 EBUILD expat-2.0.1-r3.ebuild 1099 RMD160 5377bc4c699c9eb5a963a16c787ff8f4733937b1 SHA1 99571030403f0b7db0b023cf2b58cca5774fedf2 SHA256 5ace74818ec453da4d6ffde940fae6b021c9936157563f023008cf7e14104e41
 EBUILD expat-2.0.1-r4.ebuild 1167 RMD160 aa550cc241974d9fd8fbf66f71a51e4e414d64d9 SHA1 b1d6415bbaa74914032582bb62bbf953893fa9ee SHA256 f1f793798ac2547fa3af1094bd2b2a0235f8df65013cffe6b1c9749614dec15d
-MISC ChangeLog 12981 RMD160 663477634dae685999deaa8af0a2c0930f069d82 SHA1 cd74383f52daaa47eb650265152ede049c0ce4e4 SHA256 7d4a5cdf6db4487e0d487a63c26b594bc8e461f29e589415c00475efa1475fb3
+EBUILD expat-2.0.1-r5.ebuild 1922 RMD160 ffb51de636331ba977c18d41eb385aa8d52401dd SHA1 a181018b4739e74f9e203d08ae7f993c25614e1f SHA256 1862c586a24b219443ea39b2a10c3d7125675898dc98c9db1573297fe15c17fb
+MISC ChangeLog 13190 RMD160 92d4ddb7e7b5586eaf73458e959b64daa1f0aa66 SHA1 3b93f1501f23f9b0c292092af88bef493cfd1a02 SHA256 6245a7f788bb864511d70898907364b08e31c48c1f1dce6e5899b84a3b1a32a4
 MISC metadata.xml 166 RMD160 70f6dcdab1516411ac581b270671fb776401f7b3 SHA1 79f7c7e01fdc4b59d924371b4ec75b000948fecc SHA256 a4f7a9f8f89d2da4f8d0c2d6acdacc96c38d4c076d23d8b2081f2a149ff15a56
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4y4EgACgkQXkR9YqOcLPGKjAEAmebhbbhwXLXkGem1FmMoy5RP
-0dAN7+jdPNKKqP0Tkq8A/0g4w5luPPd5ifX2Pu1yYJvoiNunj+YBHy4BNuMtaUP2
-=MAfD
+iF4EAREIAAYFAk42e+sACgkQXkR9YqOcLPEvjAD/RAu+oZ3EtqisCbW12ECqANHs
+8OjVrmbO5mbjd8pz5zYA/iaNUTVd7ih17K2rc6pslrIx7waKeC2IllpsOKcyTLDZ
+=xULD
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/expat/expat-2.0.1-r5.ebuild b/dev-libs/expat/expat-2.0.1-r5.ebuild
new file mode 100644
index 000000000000..ba4d8d99b597
--- /dev/null
+++ b/dev-libs/expat/expat-2.0.1-r5.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2011 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-r5.ebuild,v 1.1 2011/08/01 10:14:26 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"
+
+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)"
+
+	local d
+	for d in build buildu buildw; do
+		pushd "${S}"-${d}
+		[[ ${d} == buildu ]] && export GENTOO_CPPFLAGS="-UXML_UNICODE"
+		[[ ${d} == buildw ]] && export GENTOO_CPPFLAGS="-UXML_UNICODE -DXML_UNICODE_WCHAR_T"
+		CPPFLAGS="${CPPFLAGS} ${GENTOO_CPPFLAGS}" ECONF_SOURCE="${S}" econf ${myconf}
+		popd
+	done
+}
+
+src_compile() {
+	cd "${S}-build"
+	emake
+	cd "${S}-buildu"
+	emake buildlib LIBRARY=libexpatu.la
+	cd "${S}-buildw"
+	emake buildlib LIBRARY=libexpatw.la
+}
+
+src_install() {
+	dodoc Changes README
+	dohtml doc/*
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.c
+	fi
+
+	cd "${S}-build"
+	emake DESTDIR="${D}" install
+	cd "${S}-buildu"
+	emake installlib DESTDIR="${D}" LIBRARY=libexpatu.la
+	cd "${S}-buildw"
+	emake installlib DESTDIR="${D}" LIBRARY=libexpatw.la
+
+	use static-libs || rm -f "${D}"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}
+}