Drop -fshort-wchar when building wchar_t expat since we're not building for WINE-compatibility and need expatw with full wchar_t for amara.

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

3 files changed, 105 insertions, 5 deletions

diff --git a/dev-libs/expat/ChangeLog b/dev-libs/expat/ChangeLog
index 2a6ba1c48413..58a2f5f887af 100644
--- a/dev-libs/expat/ChangeLog
+++ b/dev-libs/expat/ChangeLog
@@ -1,6 +1,12 @@
 # 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.136 2012/04/26 12:16:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.137 2012/05/16 09:18:07 dev-zero Exp $
+
+*expat-2.1.0-r2 (16 May 2012)
+
+  16 May 2012; Tiziano Müller <dev-zero@gentoo.org> +expat-2.1.0-r2.ebuild:
+  Drop -fshort-wchar when building wchar_t expat since we're not building for
+  WINE-compatibility and need expatw with full wchar_t for amara.
 
   26 Apr 2012; Alexis Ballier <aballier@gentoo.org> expat-2.1.0-r1.ebuild:
   keyword ~amd64-fbsd
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 0e6656f764ec..a51860af4eb7 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -9,14 +9,15 @@ DIST expat-2.1.0-beta3.tar.gz 562612 RMD160 2a03f16494c61fe7eb0e5e3081a4f68f78f3
 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 2355 RMD160 88ee5d953233fbf10d1b86d47f7f76fe66c7da56 SHA1 874523eefc69b0c5c4eb753e89575fe4dab6d64b SHA256 a3b9080b910d9dfca493654c238e8fdd4c8f12bb1154d9eb0321a5f50ad67345
+EBUILD expat-2.1.0-r2.ebuild 2322 RMD160 b6ab3d7ab27ca83a89833e1866fcea329d593424 SHA1 6c1fea1fb1a136345553f41bce5ad8409f9147a1 SHA256 92ceefbab3de48c050635e797c6cde487fdd2f700d198e54be7096f0cd989c0b
 EBUILD expat-2.1.0.ebuild 2097 RMD160 63fd22909c5e1466ac5cf9279f03eb19265383e3 SHA1 a991a64a531de56ad16ee125ca131bdf1197aaa5 SHA256 c1a15f79bfe36d4821bdb47399fd0b808822f7a46c46d435d999d3e9d31a4def
 EBUILD expat-2.1.0_beta3.ebuild 2206 RMD160 36659c30a6b065893c12e6edf5970f820464fd81 SHA1 ab8105587274d0dc87c0a373ff5b8d641e8dac20 SHA256 aee818e8aac73a92e29bf332247049debeec7f7219b69cf1dbc91e14493f8646
-MISC ChangeLog 17827 RMD160 3cb4a9f4e543429f2c3e743de7aeb8bcf27312bb SHA1 c73e735f97e7bfb0d8939a9bdadd33eb29913b4e SHA256 86f34854d52d17fe063ddd31cd7ebec9281721a66aa6d9b0bc5f1f0a7a01baff
+MISC ChangeLog 18080 RMD160 017ecf0721aa5b5ed44c6f64ce5970823818ddf1 SHA1 66e70082ec52069c935fbfe1f304c29307eeae88 SHA256 d6172256fdec6c56d27785a22211e7a884e34646291881233eee792d616ba506
 MISC metadata.xml 166 RMD160 70f6dcdab1516411ac581b270671fb776401f7b3 SHA1 79f7c7e01fdc4b59d924371b4ec75b000948fecc SHA256 a4f7a9f8f89d2da4f8d0c2d6acdacc96c38d4c076d23d8b2081f2a149ff15a56
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+ZPIkACgkQvFcC4BYPU0oDTgCgniU4ajnTw7z6wrS3YeQaEoGR
-qBYAn3FSxFMeyvSTCZ3VGW+ZkKwPmg6y
-=OsEL
+iEYEARECAAYFAk+zcNUACgkQGwVqY66cHjChOQCfQddMbxz4hIeXhiAKYF9Bh2Rl
+ydgAnjVTpD1+tT8+XaeHVOL6ylDQldUO
+=Hb+F
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/expat/expat-2.1.0-r2.ebuild b/dev-libs/expat/expat-2.1.0-r2.ebuild
new file mode 100644
index 000000000000..fdda9f534e67
--- /dev/null
+++ b/dev-libs/expat/expat-2.1.0-r2.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-r2.ebuild,v 1.1 2012/05/16 09:18:07 dev-zero 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 ~amd64-fbsd ~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
+		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
+}