Adding patch to fix search path

Package-Manager: portage-2.0.51.22-r1

4 files changed, 33 insertions, 6 deletions

diff --git a/dev-util/pkgconfig/ChangeLog b/dev-util/pkgconfig/ChangeLog
index a6c2fed7db9c..63faabb5daf2 100644
--- a/dev-util/pkgconfig/ChangeLog
+++ b/dev-util/pkgconfig/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/pkgconfig
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.29 2005/07/05 18:58:58 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.30 2005/07/05 20:48:03 leonardop Exp $
+
+  05 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> pkgconfig-0.18.1.ebuild,
+  files/pkg-config-0.18.1-pc_path.patch:
+  Added patch from https://bugs.freedesktop.org/show_bug.cgi?id=3662 to set
+  the default search path correctly.
 
 *pkgconfig-0.18.1 (05 Jul 2005)
 
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index 131b41590d5d..7aa4ae64d800 100644
--- a/dev-util/pkgconfig/Manifest
+++ b/dev-util/pkgconfig/Manifest
@@ -1,9 +1,10 @@
-MD5 36cdb1ae4a26bb10b7ee7796cd0f7677 ChangeLog 3291
+MD5 7bc469e6e8c428123a75b44c53f3ea68 ChangeLog 3526
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 1f3220508ea6b52648ef5737e464fa5a pkgconfig-0.18.1.ebuild 915
+MD5 77de54018449c3ba7cde20cf5de873cf pkgconfig-0.18.1.ebuild 1091
 MD5 db26f55dac9089cbd4028c35b460b732 pkgconfig-0.15.0.ebuild 829
 MD5 9db1dc5963688422750247f3d13b16ae pkgconfig-0.17.2-r1.ebuild 856
 MD5 3d89019ad5123335a09ba5c223f7045b files/digest-pkgconfig-0.18.1 69
 MD5 bdbcd3d1ac04770d48111cc96734d0c7 files/digest-pkgconfig-0.17.2-r1 69
 MD5 488ceb4d90374d8efcb7f13d9ae6aaa6 files/digest-pkgconfig-0.15.0 68
 MD5 9226b9f59a714f3ee771a2b2eaaaf98d files/pkgconfig-0.15.0-m4.patch 301
+MD5 45c7356402deab91048e08244f98ce09 files/pkg-config-0.18.1-pc_path.patch 585
diff --git a/dev-util/pkgconfig/files/pkg-config-0.18.1-pc_path.patch b/dev-util/pkgconfig/files/pkg-config-0.18.1-pc_path.patch
new file mode 100644
index 000000000000..f584af8529f2
--- /dev/null
+++ b/dev-util/pkgconfig/files/pkg-config-0.18.1-pc_path.patch
@@ -0,0 +1,12 @@
+diff -NurdB pkg-config-0.18.1/configure.in pkg-config-0.18.1-patched/configure.in
+--- pkg-config-0.18.1/configure.in	2005-06-29 06:07:14.000000000 -0500
++++ pkg-config-0.18.1-patched/configure.in	2005-07-05 14:57:01.000000000 -0500
+@@ -16,7 +16,7 @@
+  [ pc_path="$withval"
+    AC_MSG_CHECKING([for default search path for .pc files])
+    AC_MSG_RESULT([$pc_path])],
+- [pc_path="$libdir/$PACKAGE:$datadir/$PACKAGE"])
++ [pc_path="$libdir/pkgconfig:$datadir/pkgconfig"])
+  AC_SUBST([pc_path])
+ dnl AC_DEFINE_UNQUOTED(PKG_CONFIG_PC_PATH,["$pc_path"],[Default search path for .pc files])
+ 
diff --git a/dev-util/pkgconfig/pkgconfig-0.18.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.18.1.ebuild
index 844f668c4237..cb62c252e7fc 100644
--- a/dev-util/pkgconfig/pkgconfig-0.18.1.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.18.1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.18.1.ebuild,v 1.1 2005/07/05 18:58:58 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.18.1.ebuild,v 1.2 2005/07/05 20:48:03 leonardop Exp $
 
-inherit flag-o-matic gnome.org
+inherit eutils flag-o-matic gnome.org
 
 MY_PN="pkg-config"
+MY_P=${MY_PN}-${PV}
 DESCRIPTION="Package config system that manages compile/link flags for libraries"
 HOMEPAGE="http://pkgconfig.freedesktop.org/wiki/"
 
@@ -15,11 +16,19 @@ IUSE="hardened"
 
 DEPEND=""
 
-S=${WORKDIR}/${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
+	cd ${S}
+
 	use ppc64 && use hardened && replace-flags -O[2-3] -O1
+
+	# Set the default search path correctly
+	epatch ${FILESDIR}/${MY_P}-pc_path.patch
+
+	einfo "Running autoconf"
+	autoconf || die "Autoconf failed"
 }
 
 src_compile() {