Strip system library directories reliably wrt #512336 by Mike Frysinger

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 149 insertions, 12 deletions

diff --git a/dev-util/pkgconfig/ChangeLog b/dev-util/pkgconfig/ChangeLog
index 7720a6d3de25..e7a240b6c0a8 100644
--- a/dev-util/pkgconfig/ChangeLog
+++ b/dev-util/pkgconfig/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/pkgconfig
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.156 2014/07/22 12:41:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.157 2014/07/29 07:58:43 ssuominen Exp $
+
+*pkgconfig-0.28-r2 (29 Jul 2014)
+
+  29 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/pkgconfig-0.28-strip_system_library_dirs_reliably.patch,
+  +pkgconfig-0.28-r2.ebuild, pkgconfig-9999.ebuild:
+  Strip system library directories reliably wrt #512336 by Mike Frysinger
 
   22 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> -pkgconfig-0.28.ebuild:
   old
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index 61136696b39f..04063d61c153 100644
--- a/dev-util/pkgconfig/Manifest
+++ b/dev-util/pkgconfig/Manifest
@@ -1,19 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX pkgconfig-0.28-strip_system_library_dirs_reliably.patch 777 SHA256 9b58db9533d9b219a2cf19be296e977b2ee45cdae16a88533a30d7978d3ca3e7 SHA512 9511c0f966b4acc90d0421906ef0937edeae6901fa267a282d878e1d4a1ef84ee12f89b8feafe7172cecbde98e6d106fc446ac98780efd41b036c1f7a2f97d87 WHIRLPOOL 0140f86ffcfaa55ada6579136aa8e09fd22d6348c5b9d805d879064b77f193d9fc296eca71306d5f66003d27b1fd42e3e5e3e4ebf1147170fc1469556587e151
 DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
 EBUILD pkgconfig-0.28-r1.ebuild 3007 SHA256 112b62f9c4a6a2b202f1be4662f84ea97df45745f5ef312ebfed9695e8648573 SHA512 2fcbebd02de791f36198235bab0710d4e4d11772f195f7b86fe12fe9cac1feae81bc8feddf8a67092eb623ed47c783fc4a1fcf46eca73d71cb8eb3cfdb62f405 WHIRLPOOL 38f3a41e9b1f3e6f8ab4a067233da849192a80d1fc565b099ffd72b900927740faedcb4306786264eccc35d92b8188393f345b0d01b0d3abfb0b918e9eb2d5f8
-EBUILD pkgconfig-9999.ebuild 3017 SHA256 e789bd0ae185df0a3553b1874eeeef3e50ce331ca59e84b4ab9685a2b08e65a6 SHA512 226fc7ca5d53f572b07e84c2eb80438c4642f4fc6390a123a4e0b662d4b7e1c670f3b0c259dfa88415e2284778d2377d0085c6069b6050e9ee6aa2c7c98b6f2c WHIRLPOOL 8f936f5bdba5c78748fc898dcebd7d0fb994ba08ccef1d18153ca65c159c63517c340207b271ec23eae649e791bbbe7e5ca9a7c4f816a49ecb801677593b4844
-MISC ChangeLog 18793 SHA256 32888114939596e3cad51cc442f888c80e3f842343d9dab36a1ddedef453df23 SHA512 c9ecfa311691db54fdd9d30594c84b9698ff0dbf7858025e942b6c84b806a87e0b0c6bf61aef8769e7bb692b3a19e7fd224cc4eb6f9f51403fd14910cece5e6e WHIRLPOOL 501c81b06f3770fb9549cf2fd2e93506656ae5d85bbec60c5d948625a29857ea1f5b9bd3b0016e3cac9f3843dcac295c30de01c66efdae48882369399d436d4d
+EBUILD pkgconfig-0.28-r2.ebuild 3112 SHA256 c289a323df259cbd18849ae5451ada1b7e718f595514083c5990bf4c5357392c SHA512 f5678ad18c9be68bafce1d12cdff8eac01ebe3047be1778b08fe50b7082bb404a4aa602c8f098e7bc42c6f6509242228db847ad057e3329d4f75cb5f5f970d02 WHIRLPOOL 784dfaecde038affa88001fd34b0ac285a417c479489bb4b8e08045e680a44551e9c9e0c26e33e08eed90916bebff9beef5ce79214ad55c4ea6361443c9d398d
+EBUILD pkgconfig-9999.ebuild 3041 SHA256 26ea9b923949ab9b0286fbb750644898afdeb7b92bc84e977e1f7e27378d9851 SHA512 c14d2ff432483eb7c35345899b6b7ffad2c699af96e8c8cf8a609021b1fdc2e9fb36e48b5e90b56fb6fca2c9c0417485b27cc0c88c96d134062f95b44e43be2c WHIRLPOOL 194a21d1a197bd24a540a1a21d7baea06abb35b8379c1f3325ae72fb084641052c74f132758c46069a8ed6b9bf5f83c2809e0d7fd383cd499794acd06186c889
+MISC ChangeLog 19074 SHA256 0e57596875e3b7e609f9f648d450bffaf3368acd41da5be3c938591b157be131 SHA512 93747191f7bdd1d6bd1e691775012a57ca52726d35dbfb6122f574dcbdc6aefa6fa664c065f844ccd478a2dc3b25a34aefcdcab3507e30d441213d33f01af88a WHIRLPOOL b51462956f5c138520931c468ba2353269d191a3b860d6e8bf90434b8ec44ee8c8edf553b8939d0ff086070e6d77c60e9595ed7652fd13a4bcacacef6d908f34
 MISC metadata.xml 336 SHA256 d206684f8bec51574f6ef890d1acecb52e346d9f6b42ae9bd6840cfde824a482 SHA512 f3303bb88b079db3d71b86aad10691cdb5bf4aa5435fcf0d4855e4e4faa669cc549b3c9834254788d8392b507e69c98452cbbf3e38d214eabe6795d9dbc1b9f6 WHIRLPOOL 98bb894da84dabb20ac0f4f065005ab2b8e52690198ee9ff753167cdd802ab1510019ea51b9f28b3d15092bcd5e6c0650858065cbdf1cb6d4d78295c17124110
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTzlrTAAoJEEdUh39IaPFNdtIH/jLQJFssLIsHWcGq5hxBAet0
-beSom77ITyB4rq0Drl2e0LYxh+MOmAYW9VJXCc70nWCtHYFWo79AXRBWeWHt/Mkw
-UcPmWQ2YHvQs7awyHRqQX+QCP5KAcxrmqaYv4qjb1XsQZG2WzUtK9adx0/o5gA+y
-BuGdD5L9h3SPvfyfeF43KEcivhynzcwKPEaQMv0lAGp4volYL7s0csEuV7kAobM0
-JU5sYV6oR0l0svgp+YpUitoaf5kcpjSNOPZyhP+1geJEDeSSS8OHkkkvY+YbFZsA
-bBXkNtiGRPGfxmY3TurhtF6RjPhGr94cnaDAD+mq+lA1M+u8eSqyK+nXE2HZCP8=
-=sZLg
+iQEcBAEBCAAGBQJT11QfAAoJEEdUh39IaPFNV+cH+gKaAElBLs5x8mmM5XTkibZg
+8gqmaf/8Oiys0uH5oB3G/VdLT9CkpBDEuwVEs8639MzKDAYKSyBIGg8mEsnpkKFH
+yVge/KlLj0Si5Kocxbwr5E0HBXtPNj+xAVChP0XwzzXArE4E6d2dNDBfyFGiJkC1
+vK5Zx/iCMFA6VkObJ2sWG+jBQBb+bcU7u0G1G8MqC5ac1IYJUYUTdXSfTJijLpSk
+Elj4h0QuMkU+weWVDjDmLUHyiIKAYLKWwL/ZFr43O1hxX1QTtpD0IENnoLrz2uxK
+3Vh+Rxa1gU4Se05kMTkVHsjSK0DtGlHjpVK0Ywdv8ayN5I8FpvfdDZL284G82ok=
+=MTiq
 -----END PGP SIGNATURE-----
diff --git a/dev-util/pkgconfig/files/pkgconfig-0.28-strip_system_library_dirs_reliably.patch b/dev-util/pkgconfig/files/pkgconfig-0.28-strip_system_library_dirs_reliably.patch
new file mode 100644
index 000000000000..e1a2bb534a37
--- /dev/null
+++ b/dev-util/pkgconfig/files/pkgconfig-0.28-strip_system_library_dirs_reliably.patch
@@ -0,0 +1,30 @@
+http://bugs.gentoo.org/512336
+http://bugs.freedesktop.org/show_bug.cgi?id=78077
+
+From 8691b580ab3f7ac36182060e2253307fbd0aba75 Mon Sep 17 00:00:00 2001
+From: Andrew Oakley <aoakley@espial.com>
+Date: Tue, 29 Apr 2014 13:14:35 +0100
+Subject: [PATCH 1/1] Strip system library directories reliably
+
+This loop was changed from a while loop to a for loop in commit
+9bf6277b, but the iterator is now advanced twice each time round the
+loop.
+---
+ pkg.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/pkg.c b/pkg.c
+index 3697fec..c847c95 100644
+--- a/pkg.c
++++ b/pkg.c
+@@ -917,7 +917,6 @@ verify_package (Package *pkg)
+             }
+           system_dir_iter = system_dir_iter->next;
+         }
+-      iter = iter->next;
+     }
+   g_list_free (system_directories);
+ 
+-- 
+1.8.3.2
+
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
new file mode 100644
index 000000000000..90ce7e50479f
--- /dev/null
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild,v 1.1 2014/07/29 07:58:43 ssuominen Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic libtool multilib multilib-minimal
+
+MY_P=pkg-config-${PV}
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config"
+	inherit autotools git-2
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI="http://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
+fi
+
+DESCRIPTION="Package config system that manages compile/link flags"
+HOMEPAGE="http://pkgconfig.freedesktop.org/wiki/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
+
+RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
+	!dev-util/pkgconf[pkg-config]
+	!dev-util/pkg-config-lite
+	!dev-util/pkgconfig-openbsd[pkg-config]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-strip_system_library_dirs_reliably.patch
+
+	sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320
+
+	epatch_user
+
+	if [[ ${PV} == *9999* ]]; then
+		eautoreconf
+	else
+		elibtoolize # Required for FreeMiNT wrt #333429
+	fi
+}
+
+multilib_src_configure() {
+	local myconf
+
+	if use internal-glib; then
+		myconf+=' --with-internal-glib'
+		# non-glibc platforms use GNU libiconv, but configure needs to
+		# know about that not to get confused when it finds something
+		# outside the prefix too
+		if use prefix && use !elibc_glibc ; then
+			myconf+=" --with-libiconv=gnu"
+			# add the libdir for libtool, otherwise it'll make love with system
+			# installed libiconv
+			append-ldflags "-L${EPREFIX}/usr/$(get_libdir)"
+		fi
+	else
+		if ! has_version dev-util/pkgconfig; then
+			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
+	fi
+
+	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
+	use elibc_FreeBSD && myconf+=' --enable-indirect-deps'
+
+	[[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode'
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--with-system-include-path="${EPREFIX}"/usr/include \
+		--with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	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/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN}
+		doenvd "${T}"/99${PN}
+	fi
+}
diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild
index f3ac8f514948..4b8fda17a171 100644
--- a/dev-util/pkgconfig/pkgconfig-9999.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v 1.13 2014/06/24 21:56:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v 1.14 2014/07/29 07:58:43 ssuominen Exp $
 
 EAPI=5
 
-inherit flag-o-matic libtool multilib multilib-minimal
+inherit eutils flag-o-matic libtool multilib multilib-minimal
 
 MY_P=pkg-config-${PV}
 
@@ -36,6 +36,8 @@ DOCS=( AUTHORS NEWS README )
 src_prepare() {
 	sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320
 
+	epatch_user
+
 	if [[ ${PV} == *9999* ]]; then
 		eautoreconf
 	else