Enable multilib support, bug #506062.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 99 insertions, 23 deletions

diff --git a/dev-util/pkgconf/ChangeLog b/dev-util/pkgconf/ChangeLog
index 9f523b610a52..b508c955b0da 100644
--- a/dev-util/pkgconf/ChangeLog
+++ b/dev-util/pkgconf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/pkgconf
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconf/ChangeLog,v 1.82 2014/02/13 19:20:29 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconf/ChangeLog,v 1.83 2014/03/30 09:16:07 mgorny Exp $
+
+*pkgconf-0.9.3-r1 (30 Mar 2014)
+
+  30 Mar 2014; Michał Górny <mgorny@gentoo.org> +pkgconf-0.9.3-r1.ebuild,
+  pkgconf-9999.ebuild:
+  Enable multilib support, bug #506062.
 
   13 Feb 2014; Richard Yao <ryao@gentoo.org> pkgconf-0.9.3.ebuild:
   keyword on ~x64-solaris
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index d79ff6f0b20a..21fb76322fca 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -7,24 +7,27 @@ DIST pkgconf-0.9.2.tar.bz2 82140 SHA256 e8c7ea4f12823383d2c95580d4497bd085aa10ce
 DIST pkgconf-0.9.3.tar.bz2 82334 SHA256 00033a1080a81dfff7cd7ef98d2b054e4cf627376df92a67b98f2e0c243e7f11 SHA512 5b57dcb78f1e5d5bec2db9456b1e784057d6faeb24a5599c29c439672545dcea01b19b8388952c4259f4028a4e6e70b049c1736532d4d7b2239d450698cbc24a WHIRLPOOL 96a07c04a4785fe62bff16cda8aaf8025afe8c3db0e41863af34c42593fe39f0d42b67b60858d9536d5fcde8bb018f61949c364c1651ff50edf145ffef64918f
 EBUILD pkgconf-0.8.9.ebuild 1219 SHA256 f9204eb80207ea6a5951060e3da33e65aa1fa0b7f36d039f4dbda053da2a80b6 SHA512 2dad70938b8f835befe791bb887d424fd157e1a8d582713cf5f5d728c315c3b1e1e309d4df0a7dc422cb5b836cd4ee5ae2dff11782628b31cb176874705a85be WHIRLPOOL 4f28f3c5e55e1b18512c0930b837159d157e065d219d069d6608db02511d15e39a9ed326d437d4de7ad04f6ebc2924e376cb2674bed784e303a15618c09d1b20
 EBUILD pkgconf-0.9.2.ebuild 1195 SHA256 a055ae0dab6b54720510a1e319ec14b5a062ed335613e89e96e123428193bf51 SHA512 b07ccd7cb411977c4b24ebef6dca9e90b0f213d9af05477969af6b1499306cec7cb986b5d4907628fcc0ffec013e2df4daabb7bc314dd66bd1814976ffcedbe9 WHIRLPOOL 0224dfb3430b9f5a699649376775c89c5f1edd157bd5bdc8e4dd2b114e2973e434a006e8beb8bdb56f767bfd378357c46a0bed960bda5cc10dc974a3fccb0941
+EBUILD pkgconf-0.9.3-r1.ebuild 1422 SHA256 f0b0491bef119c653c06267d540852987e44a19456d6a0f85caa417a085174d0 SHA512 b2aa27d58cb6c8ffb2f0cc4fd9010b7dd1496dcc00554c249fd8aee7c404e2dfd80e3ef44a409d8ab4b9fba6e7bdbbe0bcb80b16fcd20e4d8255efbb68bdac7d WHIRLPOOL 3b15a94492bb72ad49f2e1654fea64713e60d9922dab544c10265cfab02c3b6ef706862d105853beace52f90637f818fb4f87e3c9e41c0e80d88867d7f627816
 EBUILD pkgconf-0.9.3.ebuild 1219 SHA256 3ac94bd8a7a5442a4c34b1efef7449fb08f4407935cdd2e0cf7df2f7f7d2ca6a SHA512 dac204ec181ef46a6fdf65f659e62f50060c02fe18677ad8961f75e97ae7bbdc361b21a5aa9e38a7bac3dbb2a4e56af2527a929a9a9b24791bc3b32fe9505dec WHIRLPOOL 0e2738e68a7942ba09d61bd9e4cd5e7d7b86352277181502c7e8c9a201b09a3cce4f13a836de1b26dc778be9a0019c76183b8f74344c408e0212b4cf820eb5a5
-EBUILD pkgconf-9999.ebuild 1125 SHA256 124d16b520577531d1f2591769f6b2448e02e7e05032edb04ade8e5f65fa1145 SHA512 0b88150446af04756f26faa44c4701cf0241278b3ff47751cccd9a61ad30ee96a8a0f703ab229c6a43ac8f832e69cc708cb8f692ef459a25e9e4dfd2b801770d WHIRLPOOL 3c1df8635da1644c513287a0d7da73d080377c7062e8e68443d2416c9bb3a949fdfaab9427fdde6e0a483aa2c3273757d5e7357e17c6949ade2b1532373401d7
-MISC ChangeLog 10374 SHA256 e6477e6c57d042ac0ced9fb8aa95cc849eb5b5236c8c457abff0aea909dd879b SHA512 f5b6821a8afcc7faa9e207f13877e7b36e8d56dfc4091e4869577b3f305d8e967ba2540cd6dd6c61319697706d165937be8b99bdfe27b1e25af8adf12eaca05a WHIRLPOOL 849b10a09122eccd69060017e0a3364cd587d46bacf67fdae4edb1f20f8233766f1705e6baae36dd605e74f16b2abb11ae5c473b398d21b92daaaee7dc331403
+EBUILD pkgconf-9999.ebuild 1325 SHA256 e6819a4aae895b4f6069805c2f6adab6dfd46217bc0eb4be466942ef662d3929 SHA512 efefc9921a18d7e69dc2b562f639b1e2a683f8e374194c0b2a1c446dc66df905577477f25fb63ce6c54b29d83b7f49ea39f1c72f2b97b0d2c11b92eb54106d42 WHIRLPOOL d369bbc924b5fc4f58a93ce1064cfaa9ef03873aa17635c3c1fc66786d4e40d457fe69a37cf177bb0082d03358600045eeb451bde1729577ada6d0df78cc3a9c
+MISC ChangeLog 10549 SHA256 a4c6139f8a3e3f5f55c449b0f7f566a508ffb9963864d0d40bb72586aea48a54 SHA512 a56d637325bc39b41e45275901b97fb13d3a6efc3fe9ca8ee66ba48ba7559f67fbfcad124a32b5cdf30b31ce5d2eb8a9c7f587b6c9cdd5f87fd6f5cd3e59b3cb WHIRLPOOL b37c1504672d7ec7d4affd2e7c5ee8ac5e20505fd4d32e6d6f6a2b3e4627d544d4ed1ee6a07012dfadf148e6552508bea20983d8758082cd2f1b9b8e2b02b189
 MISC metadata.xml 477 SHA256 7f04218ff94e57a595f500a74957cb9a92736ff848ab729ce3f9465b6e39579a SHA512 c2a067b69911c13f787f17e491d6f435a80eb58e6f78263ff031482d359061dcbc80bfaba68ec8cfb14135ebadd29fe8959e401dffbae28e4541c700e197aacf WHIRLPOOL ef82031a1e242236df0698831bb33c913fd8aba8a570cbb650f3bafc32d60099388518864752c678452115d80e3998406198e511c00b168aa79e5240ce6aa170
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS/RsFAAoJECDuEZm+6ExkGzIP/in2TQSzNZLk06VwBcvU3Gp2
-i+CBswqE72jHHGe+gz0ycr5UGRNEcM9hcd8rXu1Odt8mM7i47Ao7jD273BYn9hj0
-hlQF3UuQZ+QceC8879JL8e+rlNTcRkuAHoidSvcM33HuQ3Pq7NF/Dd4m8F5H+IkY
-ICt5sgy3/4sRHNfDbAjFNcAiUeX8YYB9JGqAz9WWh6RbMG54qPJD3NXu6/OcI9q9
-cPenzwMIzGYXdIHr7VSnsQGV8rjcyKprST+1bt2qxvMgE7dOgs1wyFgD1yLVt7Ef
-xt+n1SaoGV+A5McLtKcrvYraARa+jqxmCSTdziDIxqjJChnhheLjGWrtjL9u6u+W
-AnsBqkhNiL9zqbnZvYz9t+j8/PS8S7ecsb3kU3Gg/oUMAEuLNBJWcyRoO32Gsg5u
-Q1DpPTA4K0UHpDmAHFMgXdNDdChLZTwrf4XYIv7aJhygTY5ox75V+NnwkfceJSGY
-zHX4JlHE2gwrlDrnwbWnL67UNTEcE2N06vG3O/aBppXQ4WAoP8kgP+VYHx0JtjZU
-bBqAK+5v85NA2MIOpafNHOif/fKPqN7QuDBw9KuZgqI2zZEdrXmoGOD2BXFPXhkT
-+d7BH3V9ga5BSox71mbF/dxMa9wSs7PaAG8QrkxMfQWdxPPb7NtzA5uFF4SYYC0M
-uLahwX2i2emEetneQrta
-=a3Mb
+iQJ8BAEBCABmBQJTN+DZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOHPkP/31V8xT8M6yW5v1YZWd54dkt
+oay8BSpatKjY4Y/ESdFDPqOsRU9e7x4DWBHwmn4etiXu87Q5nfRpTB1ovN6mFtJa
+wf15/rme/FetmRjeNGOzcrDpUOds4aBWF3XuaEzRkKN8/vt+kcLiFNTELMLJs5J1
+sUFtfa9rv1xySWiuRo3dbC0wESLEoeDQvMt2GElDovcz/zhA6g8INArkz0XXFgMZ
+GVfir9Botr6NhgSgBNqyAz6izIJv2NTFlEw2d4BWDSV/xAEReuev9OHEBYw7J+VD
+hTb52+gzMH4CGCYFfHgPpK7Q6xm1ZCfC/RP2mUnms9n/lbkvAEkMSX5+nZv3nZeq
+QtawiwyFj0i1aSXxMkzU2m5Oya3fA2VhovPAiFkhfX+VrYy+fMK6rbDOjRPqA8uq
+HkjU8uiE6J27V1nKEDLc6Lrbu6d3Jr/LnfoKKt6/Q841MrgdTR46WgWhnKU0MspA
+jNp75/BnKKG35khTvLc+B8fYeaJlDEsUrkdw6E6ah9LMeiJjxTr6IKz2MkdxehQQ
+3I73wy4ZK+TBIoKZ0bXUzyeMo4g2BnK2rFOH+OVoVdNiBomU7ElQYffgh5zQ4pVV
+JoznCS06HtAyzvreJNuKz3ZJ8NCZ+jG5RW6IwmtKblcAn6sVQ2RV2KjW8Evfk9rG
+4W10x/16IaZABMlBgVAS
+=650V
 -----END PGP SIGNATURE-----
diff --git a/dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild b/dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..0003b0bf2488
--- /dev/null
+++ b/dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild,v 1.1 2014/03/30 09:16:07 mgorny Exp $
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/pkgconf/pkgconf.git"
+	inherit autotools git-2 multilib-minimal
+else
+	inherit eutils multilib-minimal
+	SRC_URI="http://tortois.es/~nenolod/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+fi
+
+DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
+HOMEPAGE="https://github.com/pkgconf/pkgconf"
+
+LICENSE="BSD-1"
+SLOT="0"
+IUSE="+pkg-config strict"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	pkg-config? (
+		!dev-util/pkgconfig
+		!dev-util/pkg-config-lite
+		!dev-util/pkgconfig-openbsd[pkg-config]
+	)"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pkgconf
+)
+
+src_prepare() {
+	[[ -e configure ]] || eautoreconf
+
+	if use pkg-config; then
+		MULTILIB_CHOST_TOOLS+=(
+			/usr/bin/pkg-config
+		)
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf $(use_enable strict)
+}
+
+multilib_src_install() {
+	default
+	use pkg-config \
+		&& dosym pkgconf /usr/bin/pkg-config \
+		|| rm "${ED}"/usr/share/aclocal/pkg.m4 \
+		|| die
+}
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index b8dc762127c8..c8d57c60a959 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconf/pkgconf-9999.ebuild,v 1.12 2012/10/17 15:51:49 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconf/pkgconf-9999.ebuild,v 1.13 2014/03/30 09:16:07 mgorny Exp $
 
-EAPI="4"
+EAPI=5
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://github.com/pkgconf/pkgconf.git"
-	inherit autotools git-2
+	inherit autotools git-2 multilib-minimal
 else
-	inherit autotools vcs-snapshot
+	inherit autotools multilib-minimal vcs-snapshot
 	SRC_URI="https://github.com/pkgconf/pkgconf/tarball/${P} -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
 fi
@@ -28,15 +28,26 @@ RDEPEND="${DEPEND}
 		!dev-util/pkgconfig-openbsd[pkg-config]
 	)"
 
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pkgconf
+)
+
 src_prepare() {
 	[[ -e configure ]] || eautoreconf
+
+	if use pkg-config; then
+		MULTILIB_CHOST_TOOLS+=(
+			/usr/bin/pkg-config
+		)
+	fi
 }
 
-src_configure() {
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
 	econf $(use_enable strict)
 }
 
-src_install() {
+multilib_src_install() {
 	default
 	use pkg-config \
 		&& dosym pkgconf /usr/bin/pkg-config \