Build eg. i686-pc-linux-gnu-pkg-config with ABI_X86="32" to support searching from /usr/lib32 without passing anything to the environment wrt #494748 by "kramlat"

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 119 insertions, 13 deletions

diff --git a/dev-util/pkgconfig/ChangeLog b/dev-util/pkgconfig/ChangeLog
index a3c8102470c1..135a658beba7 100644
--- a/dev-util/pkgconfig/ChangeLog
+++ b/dev-util/pkgconfig/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/pkgconfig
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.142 2014/02/01 16:18:05 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.143 2014/03/27 06:57:57 ssuominen Exp $
+
+*pkgconfig-0.28-r1 (27 Mar 2014)
+
+  27 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> +pkgconfig-0.28-r1.ebuild,
+  pkgconfig-9999.ebuild:
+  Build eg. i686-pc-linux-gnu-pkg-config with ABI_X86="32" to support searching
+  from /usr/lib32 without passing anything to the environment wrt #494748 by
+  "kramlat"
 
   01 Feb 2014; Fabian Groffen <grobian@gentoo.org> pkgconfig-0.28.ebuild,
   pkgconfig-9999.ebuild:
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index 5f60b888d682..69bd3dd12e25 100644
--- a/dev-util/pkgconfig/Manifest
+++ b/dev-util/pkgconfig/Manifest
@@ -2,14 +2,19 @@
 Hash: SHA256
 
 DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
+EBUILD pkgconfig-0.28-r1.ebuild 3020 SHA256 ab6ac2f1da1af1482832b2e774dd95d06b170fe6a74e5d5e79db2a06b6d90a90 SHA512 7eb2c6782bf668220745dcc914ba55ca31b5c8c2dd1404806500d15f8d8fd7f5db61ec632303a571e8ae73fc0540c199fc686fa0d050e3dc93daa7fed3c5cd91 WHIRLPOOL 7f7433dd64b4716c3aacc04c67973da365cebb50f85d140b655e20f4c5032c764acf911b1e4dc24313e3e0d5f8bd9623923e18bdf83e4a6fbbc94a8466876213
 EBUILD pkgconfig-0.28.ebuild 2907 SHA256 847e6573cc36655ede61c287b7d6b9c796e00f2e19224f25caf9470ee22a026f SHA512 869e8c255f433d5016231cb16c0bfd6eda9bd833d1ce90e4c21930c43440a3efaeff6eedd7d6363b1aab6f93488174aab8673fe43fc37caf3115b312a698a852 WHIRLPOOL b37eb3ca28f22356ac50e6df5880a293d76d3de55c33caa4e76e1e69066e4d1850dc19317e786f0ff68fb93f23563b8521ef6f8c323c96fb458d7b29e16164a3
-EBUILD pkgconfig-9999.ebuild 2919 SHA256 e245d45ac3c66167b4f57d9db381e094dbd828996cda997a22e7c3be04fcaa4f SHA512 1c21317ab1fd8ef47f30ef1c204e231e8efe479886378a5ca1dd26273c6e24e705ebfe7f80df5aa0fe42674fc52a7e5108035c350a062d466060e0cea04c6f05 WHIRLPOOL 08132b9417e0ee8cd50fb0756900c2baefe7353ca4cfe59e1443e628ff2baed86e7f78ee64cc901cd435d9fba5b6d2f3a36cb9995ed962178b3e956aac4109d9
-MISC ChangeLog 16967 SHA256 c5782bb1a6c520343918ed762a2bf3f39dc46f44c7aae1109cc868cc6a08dc25 SHA512 aa25244fa8474740f39dc31706c4f5be801115f157dd668b59ab93ae6060c3c986064ca371a1f2aec27d6daa758fa5c703f30df82b53bb83abee1cbba9c792e7 WHIRLPOOL c9bc4827ef90c0a28ba244cb58211c00e15b2293a4d385cf375334159e82df8e10357add00f94556f0c650b93c13f257bcb11fce5af466f2d3e2d9acd675c689
+EBUILD pkgconfig-9999.ebuild 3018 SHA256 4c21b3ac0b1f0d4e3a99d4cce195911e5a898acfb279d4351014a21fb6087847 SHA512 5492af6318757b3c8f6303403cff6231b9da2140b8b90c3eb9cee30b0f210bc7ce840ff8ebde6fcbe6a7cc6eee64d7c921640af7dcb7bf66684d6d98c4aaa4e0 WHIRLPOOL ffc48b8d854327cedc0f31f978c0bd34476a2306dbd21f45e48c5f74ec9bbf7c2b7fd4e32f715ee503deba333f0a26e794c9bb3e256a454ab706ce2b9a5f7e74
+MISC ChangeLog 17279 SHA256 acb2dc62d41a49b684dc5a325bf9959cdf4d2bd5e22428577546b7b576150a27 SHA512 24de42446a0018f371a2e121d0bacd32bcad800d4765d780a2bcabff6fd1f53f2579904d8f737672698d343fa476e10ed780797784cc71317c65adbf70b7d81d WHIRLPOOL dec72477f6d2b80ed454e9c1d60c5cf36a090acb20138eca42e6de9feef186096927e075954714e7732b815fc730167d81419e9dba73073892394f64eab96312
 MISC metadata.xml 336 SHA256 d206684f8bec51574f6ef890d1acecb52e346d9f6b42ae9bd6840cfde824a482 SHA512 f3303bb88b079db3d71b86aad10691cdb5bf4aa5435fcf0d4855e4e4faa669cc549b3c9834254788d8392b507e69c98452cbbf3e38d214eabe6795d9dbc1b9f6 WHIRLPOOL 98bb894da84dabb20ac0f4f065005ab2b8e52690198ee9ff753167cdd802ab1510019ea51b9f28b3d15092bcd5e6c0650858065cbdf1cb6d4d78295c17124110
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (SunOS)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLtHj4ACgkQX3X2B8XHTomjXACdHxb+dgNMvPFea+cDKSWx9yGw
-3W4AniWnObc0fFyJ+Ih1Rx1mEyFUfBH9
-=VgTk
+iQEcBAEBCAAGBQJTM8rNAAoJEEdUh39IaPFNUy0H/3wwlKxjp0gH7QDAcZTtLEqL
+yhjJgY0I01o+BXzRFe2wdxGBvURpIOn2MeLdF1Safbo1N9AINE3TFFEzRy25igYH
+rXLv+siMntkVoJ4au7JU0ZoP5OW5zvWtYwR/y/MrlCTCf9f50FTs/X+QHsDqLjhD
+sIE0nV3pO153iWnFDEH8+NFd/uu8+u3eAW/TJXrrvN6dhKYXd7q0iCqy02ZuJd29
+pgBOr7FBYT6fRN1EKkHTuTAn8JD+kHhywhEX7bIcix6eem/T7cj1Wu7YpxElbXNJ
+slBo6cPa9g9blm7CzQiVCPk6xR7T5pvslD4PGJ5R6A2Rmqx3WgI02vRxhzBIEpo=
+=DM9z
 -----END PGP SIGNATURE-----
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r1.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r1.ebuild
new file mode 100644
index 000000000000..9014c8fc658c
--- /dev/null
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r1.ebuild,v 1.1 2014/03/27 06:57:57 ssuominen Exp $
+
+EAPI=5
+
+inherit flag-o-matic libtool multilib multilib-minimal
+
+MY_P=pkg-config-${PV}
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config"
+	inherit autotools git-2
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI="http://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
+fi
+
+DESCRIPTION="Package config system that manages compile/link flags"
+HOMEPAGE="http://pkgconfig.freedesktop.org/wiki/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
+
+RDEPEND="!internal-glib? ( >=dev-libs/glib-2.30[${MULTILIB_USEDEP}] )
+	!dev-util/pkgconf[pkg-config]
+	!dev-util/pkg-config-lite
+	!dev-util/pkgconfig-openbsd[pkg-config]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+	sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320
+
+	if [[ ${PV} == *9999* ]]; then
+		eautoreconf
+	else
+		elibtoolize # Required for FreeMiNT wrt #333429
+	fi
+}
+
+multilib_src_configure() {
+	local myconf
+
+	if use internal-glib; then
+		myconf+=' --with-internal-glib'
+		# non-glibc platforms use GNU libiconv, but configure needs to
+		# know about that not to get confused when it finds something
+		# outside the prefix too
+		if use prefix && use !elibc_glibc ; then
+			myconf+=" --with-libiconv=gnu"
+			# add the libdir for libtool, otherwise it'll make love with system
+			# installed libiconv
+			append-ldflags "-L${EPREFIX}/usr/$(get_libdir)"
+		fi
+	else
+		if ! has_version dev-util/pkgconfig; then
+			export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
+			export GLIB_LIBS="-lglib-2.0"
+		fi
+	fi
+
+	use ppc64 && use hardened && replace-flags -O[2-3] -O1
+
+	# Force using all the requirements when linking, so that needed -pthread
+	# lines are inherited between libraries
+	use elibc_FreeBSD && myconf+=' --enable-indirect-deps'
+
+	[[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode'
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--with-system-include-path="${EPREFIX}"/usr/include \
+		--with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if use prefix; then
+		# Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to
+		# simplify cross-prefix builds
+		echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN}
+		doenvd "${T}"/99${PN}
+	fi
+}
diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild
index 66fe041389b4..0d212f3faa74 100644
--- a/dev-util/pkgconfig/pkgconfig-9999.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v 1.10 2014/02/01 16:18:05 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v 1.11 2014/03/27 06:57:57 ssuominen Exp $
 
 EAPI=5
 
-inherit flag-o-matic libtool multilib
+inherit flag-o-matic libtool multilib multilib-minimal
 
 MY_P=pkg-config-${PV}
 
@@ -23,7 +23,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
 
-RDEPEND="!internal-glib? ( >=dev-libs/glib-2.30 )
+RDEPEND="!internal-glib? ( >=dev-libs/glib-2.30[${MULTILIB_USEDEP}] )
 	!dev-util/pkgconf[pkg-config]
 	!dev-util/pkg-config-lite
 	!dev-util/pkgconfig-openbsd[pkg-config]"
@@ -43,7 +43,7 @@ src_prepare() {
 	fi
 }
 
-src_configure() {
+multilib_src_configure() {
 	local myconf
 
 	if use internal-glib; then
@@ -72,6 +72,7 @@ src_configure() {
 
 	[[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode'
 
+	ECONF_SOURCE=${S} \
 	econf \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		--with-system-include-path="${EPREFIX}"/usr/include \
@@ -79,8 +80,8 @@ src_configure() {
 		${myconf}
 }
 
-src_install() {
-	default
+multilib_src_install() {
+	emake DESTDIR="${D}" install
 
 	if use prefix; then
 		# Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to