From: Nathan Phillip Brink <binki@gentoo.org>
Date: Wed, 7 Dec 2011 22:01:17 +0000 (+0000)
Subject: Force hwloc's ./configure to respect PKG_CONFIG, fixes bug #393467 and some portage... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=01de4f3b1570cc770a211ab7f7d29c7ca19caf72;p=gentoo.git

Force hwloc's ./configure to respect PKG_CONFIG, fixes bug #393467 and some portage-multilib compat.

Package-Manager: portage-2.2.0_alpha78-r1/cvs/Linux x86_64
---

diff --git a/sys-apps/hwloc/ChangeLog b/sys-apps/hwloc/ChangeLog
index a432071dba47..4a8d520a5d46 100644
--- a/sys-apps/hwloc/ChangeLog
+++ b/sys-apps/hwloc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/hwloc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/ChangeLog,v 1.16 2011/11/20 14:13:21 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/ChangeLog,v 1.17 2011/12/07 22:01:17 binki Exp $
+
+  07 Dec 2011; Nathan Phillip Brink <binki@gentoo.org> hwloc-1.2.1.ebuild,
+  hwloc-1.3.ebuild:
+  Force hwloc's ./configure to respect PKG_CONFIG, fixes bug #393467 and some
+  portage-multilib compat.
 
 *hwloc-1.3 (20 Nov 2011)
 
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 6be893536f1b..6dac760f2364 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -3,24 +3,24 @@ Hash: SHA256
 
 DIST hwloc-1.2.1.tar.bz2 2351494 RMD160 bf023e1d059914bdcae1d080d142224934f422d9 SHA1 fe52a6c68fea5af762e6d6767c6952736a9db858 SHA256 893f4662ab670baf73d514d387770231d4c2fcba7b8ed34d36a5675c1ffe3a2b
 DIST hwloc-1.3.tar.bz2 2591703 RMD160 9a6f87c3de4a6470a0d42bd16f7e3f770b8324b3 SHA1 4d4de0f48f8b9a1eaf75d55bc93e0e624f6194eb SHA256 be23f811db317f3dcb2449c20e976c45bdf546a74e22db43974c9f6721f8f483
-EBUILD hwloc-1.2.1.ebuild 1153 RMD160 5e9f26e6304f0ae08d5845a16bb54b88f86aac97 SHA1 beb2269734533147826067fe82b635b3ccdca2d2 SHA256 21eeb6a8d1b50b5c21f625597fcbc914d6493fa8cef150a18a087a885872434f
-EBUILD hwloc-1.3.ebuild 1232 RMD160 48581edadaab98e0d9fde3769c5e49e3e131fa30 SHA1 640d7a0f30fafb774b2db1772768a4304e7c9bfb SHA256 a8afd327f843059c48a9745774c913f0906ff14057b5254cc65e2014d2ec4ca5
-MISC ChangeLog 2418 RMD160 0bf0882907ad5527d7016778468b073770156aba SHA1 68a792c538c53ca40f690da9e63b571d58b39b94 SHA256 a3c43d6c16f35693d40bbbd1eff7ed92b8e0a1d2c4bf975d11ebb34e28314f7b
+EBUILD hwloc-1.2.1.ebuild 1301 RMD160 b55eef762e63a694f85a681768adc5faa6293bc2 SHA1 fdf1bfe9a8df2b9a8b665f62f9635608206c2433 SHA256 3cf7a49765dbed22d2c0f4e04c0dea9ae0a8497fdaadd83abeb994c051df7fdf
+EBUILD hwloc-1.3.ebuild 1373 RMD160 c818e37e4d9fa3d19ac5c8077731cd97abcdbc2c SHA1 d2d9e0f001e5306bcbd025fe57db76e4446ff344 SHA256 e9603e6b795225314468ab91bd8d28675b63fdef7fc76360c6de157e25779a0f
+MISC ChangeLog 2614 RMD160 6f9158da012ba08fbc665a05a217635056482428 SHA1 b64eaeaec9f6adecaad3f8c081e574d666328a08 SHA256 2e6686f61559501a4860e5a2a7f7b283a553ae4a7eb008b895dca270001367e4
 MISC metadata.xml 967 RMD160 24dc640c66a73de1f81c2114a7e53a96adf7d491 SHA1 9fe284174ae1f6b66ebe5a3a20788ff1928185a7 SHA256 af5f3e83297199a3b9439c9ee12d82ebfe791725bbd49c8011100a468f1ebcb9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOyQsPAAoJEF0huFKJUZL54ksP/iAaPeWwTJRIw7U8C1S4bjXT
-SSCYGFfUesQgNkUpeE9tMeb1goknkKrJsW4zbxi8AmBqVYKWp2aEOjDxM8NQbH3d
-9Hj6uz7/p2XK/VJami0zkeLl1cpwz8J1trlMWRXZPVvF2EiCdGr5XylkOCwqAwQl
-zOignAvc4pks3hi4WIgmqrSYzuS7jatP1jo3D4YFv4QwsD+pIc4eXPnemDqC9cc3
-5R/f4kM/OSv3isqR8bfLPLbaULvsTvBiRLqhdB6R95dNNNNDIvDE7LIv/gwOJDhl
-J6RZlPnxuJ9k/KttioITY7vsvKes8SX59KsScmZ3kbfenujG54a/HAXG2Yc3iiob
-qBM9YwQhYC0a5oFKD0OWufMCIpkPzeLBQR9JdmJdgryQMLDfRaLNZi80THYc0xYC
-Vdqc/Zxw7OAYRPi+//hLIINEXsF42Htkvq8ECRu2Oum4nYc07iUImMl9iyv5+twL
-jVsXvawaKane08p3Tg1kdFPOmgVnXZZ32NCRYNrg4E3aVauVlmX15rJGmNNJSKwH
-gucI/JQgiUN37Tk3U+VeCOaZfAk352ThGyPA6BHEmH5W8pDmU7fghsmbK+nsgntq
-iEBC7NBxwM4V2qfX/dYHjI2P4Wv7r7Wbq2KrzTBQGJWuTqQHYcVK1imiiaHGy/7t
-wfWYY7mxNWUoVN/DChVH
-=BVJv
+iQIcBAEBCAAGBQJO3+EPAAoJEHQ6UuhrqBBQJX8P+wZtJXltoN885BkdQhO7ABoc
+Jn29g6Rj5jd15aN+VJLqKenzFkhFebPNXT+fGgTOGdMIekKKd90yrjbVIIOtvc4e
+kuAwfgtZDJ1EQfLhBrOu95V1BQpGMd6iZdcmVbaG/dZK17h8hr66lnMvPt8izLHd
+QDBKgyqGzMyjWw7VCTyA53abRdBXEHEy1VAO9G9TnTF49D0r3IXkXKXAbqmd+a0O
+r7Ol9KESlpx06Hev2n7jZluA16CYVF/ZJ4ZJhJfYyYEMXVSrnd1nqqUGX6vi5QMq
+RX32dkmxAhJJewCVyHzKUkwaHGjL8ylzmgDNmr5jNGYIsRvZuSB+iQNK02QdN2wH
+rIhGjm+x9l+Lazmu8zxYTjVmPN+1isIyMyrLfaWMes4Ww+rf5ZU/mVuH+cHHpPfA
+DEVF0WcEZK5+8WKXvD5NSx2O13eoHSCEHDm8kcN97dql9YX4cTrviOMTK9ylodoh
+7ei7DTJjYhwkCBKzy+y6+EGvqr6yb2VXUG6ZMA+9NcIps7YxGXtbhG4O9P8EKCvO
+cKZ51iYGpCp6ZeUkwWgwboHCrenuEEnTu6UqGbWlduDxVW9gcyqvgMS+A7R0vMxI
++VF/Oo/vklProvnujbgspbBZi34SgDNVSbOS3zqTnWO8ZXdO7OrorTbTan2/4tIM
+tru08Sx6gTa9mSQcXyiL
+=Mqsd
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hwloc/hwloc-1.2.1.ebuild b/sys-apps/hwloc/hwloc-1.2.1.ebuild
index f9c5135c3b15..662743d86b54 100644
--- a/sys-apps/hwloc/hwloc-1.2.1.ebuild
+++ b/sys-apps/hwloc/hwloc-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.2.1.ebuild,v 1.2 2011/09/01 16:20:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.2.1.ebuild,v 1.3 2011/12/07 22:01:17 binki Exp $
 
 EAPI="4"
 
@@ -24,6 +24,11 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	numa? ( sys-process/numactl )"
 
+pkg_setup() {
+	# Fix bug #393467, hwloc ignores PKG_CONFIG environment variable.
+	[[ ${PKG_CONFIG} ]] && export HWLOC_PKG_CONFIG=${PKG_CONFIG}
+}
+
 src_configure() {
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${P}" \
diff --git a/sys-apps/hwloc/hwloc-1.3.ebuild b/sys-apps/hwloc/hwloc-1.3.ebuild
index 740f9ec67400..e8b4eaabc753 100644
--- a/sys-apps/hwloc/hwloc-1.3.ebuild
+++ b/sys-apps/hwloc/hwloc-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.3.ebuild,v 1.1 2011/11/20 14:13:21 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.3.ebuild,v 1.2 2011/12/07 22:01:17 binki Exp $
 
 EAPI=4
 
@@ -27,6 +27,11 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS NEWS README VERSION )
 
+pkg_setup() {
+	# Fix bug #393467, hwloc ignores PKG_CONFIG environment variable.
+	[[ ${PKG_CONFIG} ]] && export HWLOC_PKG_CONFIG=${PKG_CONFIG}
+}
+
 src_configure() {
 	econf \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \