Add prefix support; move prefix keywords from overlay

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

diff --git a/dev-util/pkgconfig/ChangeLog b/dev-util/pkgconfig/ChangeLog
index ebbc7f2f4000e7af1ab7b9538d3f480ea952d090..0da78a74a4274efb5580eea4733597996f9708b2 100644 (file)
--- a/dev-util/pkgconfig/ChangeLog
+++ b/dev-util/pkgconfig/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/pkgconfig
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.101 2011/10/13 20:00:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.102 2011/10/24 00:16:57 abcd Exp $
+
+  24 Oct 2011; Jonathan Callen <abcd@gentoo.org> pkgconfig-0.26.ebuild:
+  Add prefix support; move prefix keywords from overlay
 
   13 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
   -pkgconfig-0.25-r2.ebuild, -files/pkgconfig-0.25-dnl.patch:

diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index 9834f0ac747404025d76adc4a143628f707d8b36..ee463848a86f6bafb408aa03d749fa408a9e0476 100644 (file)
--- a/dev-util/pkgconfig/Manifest
+++ b/dev-util/pkgconfig/Manifest
@@ -1,18 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52d0 SHA1 fd71a70b023b9087c8a7bb76a0dc135a61059652 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af
-EBUILD pkgconfig-0.26.ebuild 1254 RMD160 b2f8e34ee71610a8db07ef7a77f56e70f0a2c418 SHA1 8630255ae6b92b37dc37d8fd5113372b87cd8952 SHA256 2ec0039292426fc831d9e230760f7a4576f056a910bdd2bc8f3e791eb618aa4c
-MISC ChangeLog 11911 RMD160 a1739075eac11db781afa1dc1c2664085b0608ae SHA1 598c6c210369043b0d1e8386db906338849fad3d SHA256 755828c69fe9b2dfcc60273759cb53e0ad1f9b8e06822b71f22b5b78d5beb688
+EBUILD pkgconfig-0.26.ebuild 1847 RMD160 9b64ef5277dd8d7f3502ab32cdc2f999e3c3446d SHA1 3064b8b17fbc8abbd65e971b930e2697ed71faed SHA256 4921644e1de00b32273649e52841bd12782af394e40cb580d575cd6b9f3a5d57
+MISC ChangeLog 12035 RMD160 488d26c93e91e591c7256e57382df58abb250166 SHA1 065da09b1329e8ea8d9ea446482994038c34d96c SHA256 658624ef11a7dedc07cb59d216d70a7111c17a5e470ff2e918d3891fb5384e55
 MISC metadata.xml 235 RMD160 2b622eaee2f1b2f24614266e8e78bfb92a73b7bd SHA1 e0b0a496d62ad809efd1eb23df0a12e30e5598f0 SHA256 90059f50c905d3fedb940d40badfa498daf5ea7af7f9586df10cd00c59c71678
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOl0NwAAoJEEdUh39IaPFN+QoH/Rk18rhrPiY506Xo80PFBGj6
-VSuv+Dc+YT4OP3j0aCNTyB6sVWhQeH03iedAx4FPKHQwzRIfJSMwimoeYMZsvbb6
-XnfiCYSzxl5p8nprM92sIxfuXe30sVbUR7N3Sm04EghsYohRwKBOhwU9OKMdjstW
-OrKQHNrI1ZeqNlgDgUDuCHmfzxSjfd/Ui3397mmiWwU1XpNPG+TUBwqJ4KYeJYYf
-anQBx/78KVLus6SIg7ovWIgx9kkWLMDwu79axQQnmjOMgfy7wF9Kq8IekPGuxtm7
-aBjYhJ1okepAi7COSnpbhMfCYXgE8MPkawFX31un4XzGBEYx42BEBkUeqmbJJpE=
-=JxqV
+iQIcBAEBCgAGBQJOpK5+AAoJELHSF2kinlg4qDEQAKYsJmP/U+bkyJ9wU0oCOzUC
+A24YopbfwjxD2alM2Wa+1DYA6RFWbQoKtl3wYFVnKJJacIZdrO9fj5Gck1s19iBE
+h9lEN9InkR0FLhOna0sU4vJWUecatkqXrt7MN/Zurr/TIYROgOYq3jJxFVMfETmn
+wncxLviCZBjY6OVg82a9BjUW9A/zKhSNXa7J68+rLN2kcuDOgDpFN7w8DA7++kkM
+4w0kNs2wIO4mc9Hk4KBLB/byVbiSH/PG28tNnZuSljVaI9UPYElw5Bqs/cTI2P6B
+p+e5Q1Lv3cLmxf42YBx0tbAcs7VCm3a/PgN+62hQXxE9g1g3XXrhvpFwJa5vN44W
+siii89PXjRl0hFSc4Bh8JRvLgMcYc9KzMrTfdo5lsaUnkk0zesoOOubHLzkuDkmA
+v6lvWrS0Qu9Lbje/dxP0asz0ohCsWJPjxQiMxcvuPTQ0zVIPIQaO6ytnVssBSimD
+R1H/rTuFzNhRdnozaV8LBfbUzOGNoX8D7Bkwmz7kGo00r9qNTVw35lcLiJ0B7csv
+lwacRFZyeynbcVMT+oCEyEu8X843tqxCmaCnjxyNIYVvfm2YzxGuuA/cpR5uTZpY
+ED0RKI4p/TMi3hl7wav7tgRJcO/i3V70QoBDKNGlWEehIlun3psZujizbqeOaQu5
+gMeHpJZ2fOJqWGQDQ7e+
+=kQhg
 -----END PGP SIGNATURE-----

diff --git a/dev-util/pkgconfig/pkgconfig-0.26.ebuild b/dev-util/pkgconfig/pkgconfig-0.26.ebuild
index a774ddfe69ca585957d053b7336be164a7bad803..c53e3749e14a3c667908537907c0b414bc8a1b8e 100644 (file)
--- a/dev-util/pkgconfig/pkgconfig-0.26.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.26.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.26.ebuild,v 1.7 2011/07/31 19:27:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.26.ebuild,v 1.8 2011/10/24 00:16:57 abcd Exp $
 
 EAPI=4
-inherit flag-o-matic multilib
+inherit flag-o-matic multilib libtool
 
 MY_P=pkg-config-${PV}
 
@@ -13,7 +13,7 @@ SRC_URI="http://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="elibc_FreeBSD hardened"
 
 RDEPEND="dev-libs/glib:2
@@ -24,9 +24,13 @@ S=${WORKDIR}/${MY_P}
 
 DOCS=( AUTHORS NEWS README )
 
+src_prepare() {
+       elibtoolize # for FreeMiNT, bug #333429
+}
+
 src_configure() {
        if ! has_version dev-util/pkgconfig; then
-               export GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/$(get_libdir)/glib-2.0/include"
+               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
 
@@ -38,7 +42,18 @@ src_configure() {
        use elibc_FreeBSD && myconf="--enable-indirect-deps"
 
        econf \
-               --docdir=/usr/share/doc/${PF}/html \
+               --docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
                --with-installed-popt \
                ${myconf}
 }
+
+src_install() {
+       default
+
+       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/$(libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN}
+               doenvd "${T}"/99${PN}
+       fi
+}