Fix for sys-devel/autoconf-2.66 compat (but commit unkeyworded until it's sorted out).

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

4 files changed, 79 insertions, 2 deletions

diff --git a/dev-util/pkgconfig/ChangeLog b/dev-util/pkgconfig/ChangeLog
index cc09dce36bc7..9d81d6ed8a05 100644
--- a/dev-util/pkgconfig/ChangeLog
+++ b/dev-util/pkgconfig/ChangeLog
@@ -1,6 +1,13 @@
 # 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.81 2010/06/17 12:49:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.82 2010/07/11 12:28:28 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).
 
 *pkgconfig-0.25-r1 (17 Jun 2010)
 
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index b2cd7b9d7db4..1768d6524716 100644
--- a/dev-util/pkgconfig/Manifest
+++ b/dev-util/pkgconfig/Manifest
@@ -1,6 +1,8 @@
+AUX pkgconfig-0.25-dnl.patch 516 RMD160 1e6cab13b623c70e643935db7c5b1603f5b7ab25 SHA1 57c3ebd34c7a523c91e5800822b9d076747b01d4 SHA256 b105e2d3d604ba593a9b6475617d6488a8bdbab7bcc25782947a3ff9aef87012
 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
-MISC ChangeLog 9870 RMD160 9cb0ee1eca928514274735b85d1ae68bfcf8fcf4 SHA1 4050bbc2b1fc0e2bd22e388704c9024ba319a4fe SHA256 8ace16169125cd6946572827dde2602c22121b460850596277d0b46f9c7d1c55
+EBUILD pkgconfig-0.25-r2.ebuild 1247 RMD160 f5d20ebb7a7b628342f13d8f7c2cfdfdce42dbd7 SHA1 8fb5219fd32a63273e6f386bdedec973fc5b1a17 SHA256 d4cb537157e0c2a6124dec4c77fc82443cc773bc6f5c380730c5f35998e63027
+MISC ChangeLog 10112 RMD160 6d0f7a98eb3ca2687e9648a5a91df606f0438b2e SHA1 68eb6121ca8af4fcfb816b909f17e3a29f996c93 SHA256 03d3876e97e63881c854377ca65a0ec772adf1024c686bfb122809a9022fc8a4
 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
new file mode 100644
index 000000000000..3dc6b6e22a5c
--- /dev/null
+++ b/dev-util/pkgconfig/files/pkgconfig-0.25-dnl.patch
@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/326939
+
+--- pkg.m4
++++ pkg.m4
+@@ -135,7 +135,7 @@
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+ 
+-_PKG_TEXT])dnl
++_PKG_TEXT])
+         ])
+ 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
new file mode 100644
index 000000000000..7978378de8fc
--- /dev/null
+++ b/dev-util/pkgconfig/pkgconfig-0.25-r2.ebuild
@@ -0,0 +1,46 @@
+# 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 $
+
+EAPI=2
+inherit eutils flag-o-matic
+
+MY_P=pkg-config-${PV}
+
+DESCRIPTION="Package config system that manages compile/link flags"
+HOMEPAGE="http://pkgconfig.freedesktop.org/wiki/"
+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"
+IUSE="elibc_FreeBSD hardened"
+
+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
+}
+
+src_configure() {
+	use ppc64 && use hardened && replace-flags -O[2-3] -O1
+
+	# Force using all the requirements when linking, so that needed -pthread
+	# lines are inherited between libraries
+	local myconf
+	use elibc_FreeBSD && myconf="--enable-indirect-deps"
+
+	econf \
+		--docdir=/usr/share/doc/${PF}/html \
+		--with-installed-popt \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README
+}