Fix for sys-devel/autoconf >= 2.66 compability wrt #326939.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 9 insertions, 20 deletions

diff --git a/dev-util/pkgconfig/ChangeLog b/dev-util/pkgconfig/ChangeLog
index 9d81d6ed8a05..0485f416ddb2 100644
--- a/dev-util/pkgconfig/ChangeLog
+++ b/dev-util/pkgconfig/ChangeLog
@@ -1,13 +1,12 @@
 # ChangeLog for dev-util/pkgconfig
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.82 2010/07/11 12:28:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.83 2010/07/15 08:07:11 ssuominen Exp $
 
 *pkgconfig-0.25-r2 (11 Jul 2010)
 
   11 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
   +pkgconfig-0.25-r2.ebuild, +files/pkgconfig-0.25-dnl.patch:
-  Fix for sys-devel/autoconf-2.66 compat (but commit unkeyworded until it's
-  sorted out).
+  Fix for sys-devel/autoconf >= 2.66 compability wrt #326939.
 
 *pkgconfig-0.25-r1 (17 Jun 2010)
 
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index 1768d6524716..b9bd647e871d 100644
--- a/dev-util/pkgconfig/Manifest
+++ b/dev-util/pkgconfig/Manifest
@@ -1,8 +1,8 @@
-AUX pkgconfig-0.25-dnl.patch 516 RMD160 1e6cab13b623c70e643935db7c5b1603f5b7ab25 SHA1 57c3ebd34c7a523c91e5800822b9d076747b01d4 SHA256 b105e2d3d604ba593a9b6475617d6488a8bdbab7bcc25782947a3ff9aef87012
+AUX pkgconfig-0.25-dnl.patch 379 RMD160 51440ba744e72eca6cc5dddbc2deca255c876457 SHA1 07a82828607d18b17f8727dab43ea93048577f8d SHA256 dbcf523e428b7513d3fe894a5366abd93d2b05a93e1614bf2d87734839fa48e6
 DIST pkg-config-0.23.tar.gz 1032839 RMD160 0aa5565430d609319917ac2c8ffeaa5e4a509489 SHA1 b59dddd6b5320bd74c0f74b3339618a327096b2a SHA256 08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53
 DIST pkg-config-0.25.tar.gz 988899 RMD160 835509d01f68c45823ee89c718776eb66f61316b SHA1 8922aeb4edeff7ed554cc1969cbb4ad5a4e6b26e SHA256 3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e
 EBUILD pkgconfig-0.23.ebuild 1120 RMD160 f19eac1ea6a8c50438e9cf2ee16c6064f7e8cf4d SHA1 e3731bfa2df9e1e80c9dca1647d1e205b8adca76 SHA256 986905b55c0b359a469d97e927e6787821ba55955ca89150725846344ceb01c5
 EBUILD pkgconfig-0.25-r1.ebuild 1126 RMD160 d91c4d937fdd4cbe0288a003399ac0f4dc5ef492 SHA1 692f04d5ea4dd4279b3f90bdc2296d5ae1bddcca SHA256 a18c673c05bd30b5b0e50df10b5780d653d65245cb02a94cbcb4c1fbd690c09f
-EBUILD pkgconfig-0.25-r2.ebuild 1247 RMD160 f5d20ebb7a7b628342f13d8f7c2cfdfdce42dbd7 SHA1 8fb5219fd32a63273e6f386bdedec973fc5b1a17 SHA256 d4cb537157e0c2a6124dec4c77fc82443cc773bc6f5c380730c5f35998e63027
-MISC ChangeLog 10112 RMD160 6d0f7a98eb3ca2687e9648a5a91df606f0438b2e SHA1 68eb6121ca8af4fcfb816b909f17e3a29f996c93 SHA256 03d3876e97e63881c854377ca65a0ec772adf1024c686bfb122809a9022fc8a4
+EBUILD pkgconfig-0.25-r2.ebuild 1189 RMD160 b85bfc0f2de04b7a5fb950c38a2f0ff79a52943d SHA1 a13402d27a6d205d00a7961bf5e27eb4c0c08f67 SHA256 7d9d25e51a17033ca42ff4f0336b21aebbb4515a93398d44aef40258df12c3d3
+MISC ChangeLog 10083 RMD160 2ddd72f7bf36092410438a76fed52f60e9aa6c1f SHA1 4f1a2a2ef0e472281cf9eea8e6d31d10e2a3773c SHA256 b8877c39714ce9dae6dbb14c6a7a0024cfeed0849b5f1e3494fb07b6d19503a2
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/dev-util/pkgconfig/files/pkgconfig-0.25-dnl.patch b/dev-util/pkgconfig/files/pkgconfig-0.25-dnl.patch
index 3dc6b6e22a5c..00e450e777b4 100644
--- a/dev-util/pkgconfig/files/pkgconfig-0.25-dnl.patch
+++ b/dev-util/pkgconfig/files/pkgconfig-0.25-dnl.patch
@@ -1,4 +1,5 @@
 http://bugs.gentoo.org/326939
+http://repos.archlinux.org/wsvn/packages/pkg-config/trunk/autoconf-2.66.patch
 
 --- pkg.m4
 +++ pkg.m4
@@ -7,16 +8,7 @@ http://bugs.gentoo.org/326939
  installed software in a non-standard prefix.
  
 -_PKG_TEXT])dnl
-+_PKG_TEXT])
++_PKG_TEXT])[]dnl
          ])
  elif test $pkg_failed = untried; then
       	AC_MSG_RESULT([no])
-@@ -146,7 +146,7 @@
- 
- _PKG_TEXT
- 
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
-         ])
- else
- 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
diff --git a/dev-util/pkgconfig/pkgconfig-0.25-r2.ebuild b/dev-util/pkgconfig/pkgconfig-0.25-r2.ebuild
index 7978378de8fc..f997526916a1 100644
--- a/dev-util/pkgconfig/pkgconfig-0.25-r2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.25-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.25-r2.ebuild,v 1.1 2010/07/11 12:28:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.25-r2.ebuild,v 1.2 2010/07/15 08:07:11 ssuominen Exp $
 
 EAPI=2
 inherit eutils flag-o-matic
@@ -13,8 +13,7 @@ SRC_URI="http://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="elibc_FreeBSD hardened"
 
 DEPEND=">=dev-libs/popt-1.15"
@@ -22,7 +21,6 @@ DEPEND=">=dev-libs/popt-1.15"
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	# XXX: Bug in autoconf 2.66, or pkg-config?
 	epatch "${FILESDIR}"/${P}-dnl.patch
 }