Convert to the new multilib format wrt #478468 by Julian Ospald

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 106 insertions, 16 deletions

diff --git a/dev-libs/expat/ChangeLog b/dev-libs/expat/ChangeLog
index c41e96f5d274..b92a3e979ed1 100644
--- a/dev-libs/expat/ChangeLog
+++ b/dev-libs/expat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/expat
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.148 2013/06/05 00:16:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.149 2013/08/02 00:19:12 ssuominen Exp $
+
+*expat-2.1.0-r3 (02 Aug 2013)
+
+  02 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> +expat-2.1.0-r3.ebuild:
+  Convert to the new multilib format wrt #478468 by Julian Ospald
 
   05 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Add upstream CPE tag (security info) from ChromiumOS.
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 52dc6a2a59f9..4c7b9403ef4e 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -3,22 +3,17 @@ Hash: SHA256
 
 DIST expat-2.1.0.tar.gz 562616 SHA256 823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86 SHA512 2a9ad2b44b87b84087979fe4114d661838df3b03dbdcb74d590cb74096bf35ce9d5a86617b0941a2655ea441a94537bcbcd78252da92342238823be36de2d09d WHIRLPOOL 147eb383fdb79116e2215982e9741939f80249a0bb690e93b00218fa335d483d88f82d9256632b458b13592252aeb100ec4ef830c72bb8eb5df7675cd15f41e1
 EBUILD expat-2.1.0-r2.ebuild 2322 SHA256 cf8865566582aabced12c76802dab72396ab1192a7bbba288c072d5afcd80259 SHA512 14cdcfd29d89db43d28e258f8048888f7cbe2cdf37a219421dee7d28f331a79815c78591d3635b2d7e169a9762c7b51a7c0db044b291f2cbee198e4831cb24fd WHIRLPOOL a6e8ecdd76d01121ac3545e5e8dc1a0a82aac89bdda77ccbe2d94f8188c59e9244f76f4c966240bfd4fbaf82e102e6ac59eb10681580a28fa4629754c1b270ca
-MISC ChangeLog 19491 SHA256 186feae5f50ec15efae46cf8419cdbda09831084f0e28241913f43842e8bf5ad SHA512 ccf23b5e4d3bcd9ef0c95a7b09e6dd7376f6d154a7c5235a7e5b708503753538ad7acf4bf8dbdd94f27b4280b507c42881971a65dcf5472e672e02541301a4e0 WHIRLPOOL 66c9e36be5556fee2c0d859fcad4e98d91e1011334c7548e0cf269aea77f42fcc1e25f93111b067595d8781f0689979ebc12716d7142a3f93aaaa1125434fd66
+EBUILD expat-2.1.0-r3.ebuild 2310 SHA256 8e8f64d49eff17d9d098a7bbad02760257d0fbc6e9ac9b12cd878a326c25632e SHA512 c12c12a82be19dae0b5448a9802956ba15fdde19b8093fa9e05b17236d97764e34c142b152317652862c9c84b5f06ec915eee8a34b40ec65d93b850e5cdc3d7c WHIRLPOOL f404e857bd46f7237fc047729da594d285d16f3e873e3d4fbfbfb78f3a5de5ba33754ee13ecdeef7bc0fb882e48c3e3c6d931695f3dbd5935cd2c2cffd2514d0
+MISC ChangeLog 19670 SHA256 f5cbb513f8af875d3b278b608ff4edc95bbdb8204d25d79b3855a3f4a430b220 SHA512 b88597cf1aedfffdbc647c9cd0df15ac98da3b721ea7c6be21d84407f3f444932639f0575bb0caf572631e316256dfff561a735b6c5e6ae39231e94af8bb9c2f WHIRLPOOL a5c2e0ac03479125a4e870b54656a3f1c0d0ae0438242de3ee2a58040341e6cb8e976f786eb9d47bc5f9009bcf31a2512eb88014d99fc5f01c2485f73bd8f23f
 MISC metadata.xml 253 SHA256 100ff5eae8571b7fa427f25400fba2ba79683860ec39467180bc8c9a7c73420f SHA512 549874f0fc26095c2d80c34bd0cae74b75ffdd4a9c19c52931047857f51f7461e7b51495cbb7575a19537ddfb4d2762c1fa4b36cafe47ca8057a6bbf6e6778e5 WHIRLPOOL 7c080dd571730c2c8aea4a19fcddc9f6fb947a8b2534d44bff5aa02d85a9ca1e24de2444ed42f326f13de4b082845e68aec41397c0424ca15b6020c0f5ae704f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRroNfAAoJELEHsLL7fEFWXrsQALWG5G3SLLjON35OqBSCunaQ
-Q2lGbx0VJQXo9sn8+SNW9S/YF8C6nwp9A63d76q5f+j+cFPdzjns+6H80Uf27fK6
-gF55vVO1L90FDKKv3LthOF9ppvQqUcHlg+abGDTvfMcTrxjvNRQLDJhMqYxVW4kn
-ryofUDCH/W3GRIV/YRHAYUVBO3quAb345Gcq8JStkSdiLh2VroYv+/zcQabBFF1n
-biztGuzxw0DzhcH3m3sYP69JqKU+Oz0I7nqO6/BGaAn+RM9tbh+82agbvCZLXLc1
-6467saRuTxDupqB9MHH7MFp4qf/iEnoF1QTrJIuAm8ER1S5/iZJiVy1zHHOFjcOc
-F8a9JWBfi+bMxtYJcCvhlpQdkw0MS5L+5VQGJcjiFay9s5N6iJWhiq7rWWFsbI1m
-IiBrIZtIvHbYZv45uwowmYS2VzmzjbpzmwyQQepAofPfdDMEfBtPvuzhOawHxNTW
-rXzNvmXrx6tkxQOEt7gtoLwxrYr50gUgm7H4VIQrANyt4W+Ses+o2gmthTrkC8AU
-uwDII/9pcqQI8GKer3gBLiT5V6ycQrAUr9sEsQH8QjqyKg2Hlt0M9sXUB+wGyVMM
-HNWxrBM63Z9KXGSCI+UJ7g/EMckqB3VBNL2kcBKaUrhZNwLyyk4OmOAhMb9mry9m
-dOmtQqt3fZ2grScRsorT
-=vE4f
+iQEcBAEBCAAGBQJR+vqoAAoJEEdUh39IaPFN6fAH/ipzMxyYPlcGC10pbQ8aMeoc
+qH2gVN1saIX4MSjpI3kvxO2Y8LqSsuX+lrnuy2K7sCMmXv2+DxfT3Vvt7u0TF1GH
+tJBynyKfd5WgmnaAMUve9yulOTgdMMMellkqwpuJEToxx0vOsO8YAlDCRNUvbjMm
+gKvykrjG+pbCyn6NWjzRmCl/AnYX3S4cnGXFURF9NNsdkpJ28a1DpAHAsRB9ah59
+ky5HE/YGNygxGHxrXIeazMErQodB87U+e8ofb/2AHApfl5R7oL7Bs92Xw5jhFSei
+QYM1Xck4+DAuDRoPro1svEdy2hO7b6w4sU2hz3S2LS0fHyW90zIVMYKYIrX9Zj8=
+=xSN0
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/expat/expat-2.1.0-r3.ebuild b/dev-libs/expat/expat-2.1.0-r3.ebuild
new file mode 100644
index 000000000000..dab5302a4b76
--- /dev/null
+++ b/dev-libs/expat/expat-2.1.0-r3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2013 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-r3.ebuild,v 1.1 2013/08/02 00:19:12 ssuominen Exp $
+
+EAPI=5
+inherit eutils libtool multilib toolchain-funcs multilib-minimal
+
+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 ~arm-linux ~x86-linux"
+IUSE="elibc_FreeBSD examples static-libs unicode"
+
+src_prepare() {
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myconf="$(use_enable static-libs static)"
+
+	mkdir -p "${BUILD_DIR}"{u,w} || die
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"u >/dev/null
+		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf}
+		popd >/dev/null
+
+		pushd "${BUILD_DIR}"w >/dev/null
+		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE_WCHAR_T" ECONF_SOURCE="${S}" econf ${myconf}
+		popd >/dev/null
+	fi
+}
+
+multilib_src_compile() {
+	emake
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"u >/dev/null
+		emake buildlib LIBRARY=libexpatu.la
+		popd >/dev/null
+
+		pushd "${BUILD_DIR}"w >/dev/null
+		emake buildlib LIBRARY=libexpatw.la
+		popd >/dev/null
+	fi
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"u >/dev/null
+		emake installlib DESTDIR="${D}" LIBRARY=libexpatu.la
+		popd >/dev/null
+
+		pushd "${BUILD_DIR}"w >/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
+
+	if [[ ${ABI} == ${DEFAULT_ABI} ]] ; then
+		# 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
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changes README
+	dohtml doc/*
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.c
+	fi
+
+	prune_libtool_files
+}