From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 13 Jan 2012 17:18:05 +0000 (+0000)
Subject: Use common tc-getPKG_CONFIG helper.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=853ede49e7802314fdebb6b51885be57d258790c;p=gentoo.git

Use common tc-getPKG_CONFIG helper.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
---

diff --git a/sys-apps/hwloc/ChangeLog b/sys-apps/hwloc/ChangeLog
index 9346678cb8af..b4848e7d6f88 100644
--- a/sys-apps/hwloc/ChangeLog
+++ b/sys-apps/hwloc/ChangeLog
@@ -1,6 +1,9 @@
 # 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.18 2011/12/21 11:14:15 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/ChangeLog,v 1.19 2012/01/13 17:18:05 vapier Exp $
+
+  13 Jan 2012; Mike Frysinger <vapier@gentoo.org> hwloc-1.3.1.ebuild:
+  Use common tc-getPKG_CONFIG helper.
 
 *hwloc-1.3.1 (21 Dec 2011)
 
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index f346e6103494..054ec9f240df 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST hwloc-1.3.1.tar.bz2 2616262 RMD160 0b72991f0ffac0c6f409d8a6e7d7f6cc49fe83ed SHA1 1051c937c3d2a4c98922903f313a1fa021bb35ba SHA256 a38ab3f60995d8f511129499b558a22c3e8907b0a08ef02bb664ee9fc269cc70
-EBUILD hwloc-1.3.1.ebuild 1380 RMD160 48297bb12c68d442e51defc191fef69cc9826aa2 SHA1 b8ff68274f168fdc00aea1ad5d842877d7137736 SHA256 c9a495909fd9aa582a3d0f01fef671ae23b57bcf15951ec17608de4814486b3c
-MISC ChangeLog 2790 RMD160 a0bbd4632660de617aac727bcb2ff7f8ae2b0664 SHA1 0d93ee84ef1c3c68692323efe7db9d10622c698c SHA256 427f9394a44bf9f1a6f282c084f0ecb17b81d8969f81426e2a536c08c49621e3
+EBUILD hwloc-1.3.1.ebuild 1283 RMD160 82d3cb1f3dc4229e944018d12d800f30e306e481 SHA1 4e79159adc835dbeae75ee77b85858e5c2e21f6d SHA256 50029399a9c013f15c1ebf9feedf2855816220173147b4703742af5038213efa
+MISC ChangeLog 2895 RMD160 eba739aaa4a4849bd0be2be03bf9149530a62216 SHA1 aca79522af0298f6d69cb64e3218bda0d26dc211 SHA256 9acc4b03da2dc627718b3d49171cea956c32f6d49d3352432d80d3a9bc316fb4
 MISC metadata.xml 967 RMD160 24dc640c66a73de1f81c2114a7e53a96adf7d491 SHA1 9fe284174ae1f6b66ebe5a3a20788ff1928185a7 SHA256 af5f3e83297199a3b9439c9ee12d82ebfe791725bbd49c8011100a468f1ebcb9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJO8b+TAAoJEF0huFKJUZL5nikP/2F0ImkkONZWugZ+RLL+2D8/
-LGNs9GGN8fmK+7AqgtGcEpFhGY6NeIxWZGTV7Brc7Ipxa4For0Z+XgYQgqigjiBD
-L+ISHvQG7foxq3EP/j+NyGdNbgbeOZFKppgW1uzBSzL42ywDKDVfZ35QmXcOfrQA
-3+NmxoQ+5qSdOvu0OR70dtMRX+yJuBtBzZWkxTD5f6sCaWvaDYVPvFve5DC4Q5Ux
-wdTHX08BbmBcy/BlGWcq79fUyMuxYYeFkuxAkLkN1MOZa8kb0biZ8dsm0+3BQ8qn
-qbQh7lm7Iz+Mul9be2cgrPVKfPbQc47m3eU9mxEkzx2nUfhz0C29gSjwUTvB5uMt
-lyjMRYN9WQiSrdKvLRfjzajSukesxsg9HTrTZ548d0FkGn7L9aGebaMD6S+uoxr7
-7FX7ZD5tGXz9zf+qgTG43Cg9Qgo7aMUTu4BqRN+d69OzmhKfz9/wwK36P2c8IFHP
-TgDndz66+qG+52Knz0r7Bsl63cXVLIill0St4ya8Q3vrsueQNsfeNUuNsUU+9z7C
-mjkr0gPiBgsIrhIxU9lBgXnlEU9tEy+75N0WiKLwCUXwm1wV94vsjhIsSPffo1y5
-bTJAWsuNwAm0PVHYpRwo2MzxvISCqbNnOJpMAZKZcZFz1CFKrR3Li9oucfoSZPj7
-3sZtMXqfcxn5wDF+XNKB
-=2EBJ
+iQIcBAEBAgAGBQJPEGdTAAoJELEHsLL7fEFWBJ0QAInP0iL/oOJg8ECmPyX/L54q
+3FZYxVCx9hkhsbzvxikqNZIAoeX0QusC5gYj7Y2Sw6YUBIULz3vyE7t3dstv984I
+rlanUHstwaSghsgoTYxe7KHBX3Uaw6/Mf7ZiWe6xyV6Lo/Yuh5Nlq7AcH9nWjzSB
+59DPu3Y/uNQUrqxA7tsZ7lC6XcLlrI4mH3IbGDC8GW0IOKSkCWM0QrLBkaP5iVBT
+fEzfsXiOIhD62UQJ9WrfLmYa7x+GK6dA4o83HUUR3IJw06ySSaWuZItM+KGRS7sN
+HHJL4AJlMoz7iVuPVAiCII1OnW1O9EukWZPRHHEFpA7RojIIJ3yN+v75L/ncG7Gz
+9KabwgrCJSa6w3R/Q6kvmzZjHwvO4XAusrMZFrwz87lOdi8GQuMJ32ePItt3lwU8
+DH+a7CESvPoNBAFsS2chWU40/cRCwPQ0ATqCTQhJXex/5Qk3F9chR0VsmNN93UxM
+GEpvTJbsPsnvXwSV7/QcsOYAesMl1qU+8+Ul0r/DLeqnCzHCFzPVoPnkxrzi6zkL
+pBwKvHOT9euQxvb2fMpCYBzGsOMws69sS0q2j4SgiGIJVkvFbq9fcrr2woO6BIQV
+cH617BlTqpDyn61V0lFefgIkSli4pRRQIl/n5APyFdDc3cOPhPajCPMlTYzz9Vfl
+T/K9bGwFaK9psiNGjasg
+=AXny
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hwloc/hwloc-1.3.1.ebuild b/sys-apps/hwloc/hwloc-1.3.1.ebuild
index 0cc06a4f9383..d1be0dfe8181 100644
--- a/sys-apps/hwloc/hwloc-1.3.1.ebuild
+++ b/sys-apps/hwloc/hwloc-1.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.3.1.ebuild,v 1.1 2011/12/21 11:14:15 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.3.1.ebuild,v 1.2 2012/01/13 17:18:05 vapier Exp $
 
 EAPI=4
 
@@ -12,10 +12,10 @@ DESCRIPTION="displays the hardware topology in convenient formats"
 HOMEPAGE="http://www.open-mpi.org/projects/hwloc/"
 SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
 
+LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
 IUSE="cairo debug +numa +pci svg static-libs xml X"
-SLOT="0"
-LICENSE="BSD"
 
 RDEPEND="sys-libs/ncurses
 	cairo? ( x11-libs/cairo[X?,svg?] )
@@ -27,12 +27,8 @@ 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() {
+	export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467
 	econf \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		$(use_enable cairo) \