Fix LFS support on 32-bit (bug #550508, thanks to Zac Medico and vapier). Update to git-r3.eclass.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

5 files changed, 162 insertions, 10 deletions

diff --git a/dev-util/pkgconfig/ChangeLog b/dev-util/pkgconfig/ChangeLog
index 027156984d50..ef9d8e432582 100644
--- a/dev-util/pkgconfig/ChangeLog
+++ b/dev-util/pkgconfig/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/pkgconfig
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.166 2015/04/30 04:41:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.167 2015/05/27 04:35:41 tetromino Exp $
+
+*pkgconfig-0.28-r3 (27 May 2015)
+
+  27 May 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +pkgconfig-0.28-r3.ebuild, pkgconfig-9999.ebuild,
+  +files/pkgconfig-0.28-lfs.patch:
+  Fix LFS support on 32-bit (bug #550508, thanks to Zac Medico and vapier).
+  Update to git-r3.eclass.
 
   30 Apr 2015; Jeroen Roovers <jer@gentoo.org> pkgconfig-0.28-r2.ebuild:
   Stable for PPC64 (bug #545848).
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index ff4cac04e054..6b61e447da7b 100644
--- a/dev-util/pkgconfig/Manifest
+++ b/dev-util/pkgconfig/Manifest
@@ -1,17 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX pkgconfig-0.28-lfs.patch 761 SHA256 4f5f8ef252051da55ae3b7cf6101ce17f8ba45fbe66d6384670794bc67cd4fc2 SHA512 cfda19f64cb99a7e28d91547192848cc307906c3d5876ca4e9a825866e8278359f4de3292a0870f53b7ec584a4445a76bdd9148a48461280a8e3cbc0ca269d74 WHIRLPOOL 9590d8c24bcf6e45664e50ac8461a507b0adc2582e5c0527c6951852e663c0908560d525c97f12c85d9be2964f026dcff4c3e05f2547adc02a8dac19a10a224e
 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-0.28-r2.ebuild 3098 SHA256 b74995c98442e48b0eeba66099821a4d5c277fc756c0d979af98e8dabff1fb43 SHA512 496db46c124c3f8e887f6d3eaf877982773fb7c58efc7325f946c67ce05c6622cbcf5e07c093b3115b4ea3f2f6ea895be73b07ff864dff350849681b27139b84 WHIRLPOOL 2b9e96fb6129b1a47f257eaafa225cc6f9bb299c36b5d24a76818e531d76e6ca6e63fe6617212aaa43d32ea3450566e3f5e07c632d1ac5eea0fedf1680fcfd17
-EBUILD pkgconfig-9999.ebuild 3041 SHA256 26ea9b923949ab9b0286fbb750644898afdeb7b92bc84e977e1f7e27378d9851 SHA512 c14d2ff432483eb7c35345899b6b7ffad2c699af96e8c8cf8a609021b1fdc2e9fb36e48b5e90b56fb6fca2c9c0417485b27cc0c88c96d134062f95b44e43be2c WHIRLPOOL 194a21d1a197bd24a540a1a21d7baea06abb35b8379c1f3325ae72fb084641052c74f132758c46069a8ed6b9bf5f83c2809e0d7fd383cd499794acd06186c889
-MISC ChangeLog 19971 SHA256 f6d1d25a9e5d64d4bb697ac2a46adfdc82273fa99856fd5af6856984c540c65d SHA512 703e8e10b517fa4a65f23e4b7566cb8963e0b42865752b3550b42d591b6cb27b23457aa705af1eeedab45349e8e4808fa8fbfdb8f1de10e76ff94eaa241b2f2f WHIRLPOOL bb3c2a88df4c325571e255c30de2b788ebbe6e63fe3dd7cda410fabf90c76e5469ebd8ac9b7d57235b26299bb0cafb778e37fe0dcef60c5e10c28b0dcfe21732
+EBUILD pkgconfig-0.28-r3.ebuild 3274 SHA256 c6c4000a34394550a8e1e6be2a3484fd3d6a110165ffad555fcd60a9e52c24de SHA512 c689bee1b72a78c6902db55b6b7be7667efddbf779bc2d19ad08caffc861fb387cd05662e3fea40096d96eaf8dd394c7ff52b937a11207eaeb9f91e65ce1c333 WHIRLPOOL ac71e0d11adac8f6b57d3672ec72a27e8fecd19709bf7735b33d2d5c4bd3b85894639dbab41dc4bd260e80184a79f9149ead312c6b4ec53a7b488577607c8bff
+EBUILD pkgconfig-9999.ebuild 3080 SHA256 6c8fcda66c0400d3b87e321c631344f6d11701d554a1f4926197c7369c2df206 SHA512 448acc2e08a100d6239d455d9a94c823d2571f7481826f8ca77cec0516ad5be308bc673015508c7bb87b44a27b81a9cfc00175593b7e62627ea8ade276a2d325 WHIRLPOOL 3797ad1e309d15b6a581b1a21976cb263acf32e384d6a2e6f331f560f21dcbc4207c7cd1b3e1fae2126bf4938300d3af64b1486e0ce8bc899692d06d6bfe6ddc
+MISC ChangeLog 20261 SHA256 f5be47935d2855779a8980504563dfbe7691d711307294b4148510da9156e247 SHA512 eb7c0344f13591dccaf4523c0efb85b948b51c59e30d8c4a5e876bd41bc548f819d0c6a24e0fbcc63a6faa602600a77713f1af749ea885e4ed96c943cacc9d6a WHIRLPOOL 4fbea46ad09912564003530ccd1bdf417eccbf7d1214ead82e2d131f81e87f3e7ad65d9b9908aaeac1766958c7ae964b5178344ed99f6935689dceb4fdb5dbcc
 MISC metadata.xml 336 SHA256 d206684f8bec51574f6ef890d1acecb52e346d9f6b42ae9bd6840cfde824a482 SHA512 f3303bb88b079db3d71b86aad10691cdb5bf4aa5435fcf0d4855e4e4faa669cc549b3c9834254788d8392b507e69c98452cbbf3e38d214eabe6795d9dbc1b9f6 WHIRLPOOL 98bb894da84dabb20ac0f4f065005ab2b8e52690198ee9ff753167cdd802ab1510019ea51b9f28b3d15092bcd5e6c0650858065cbdf1cb6d4d78295c17124110
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVBsmAACgkQVWmRsqeSphOn7gCfVwW5IkpUzUDMiG6j1Wy5iSBF
-heYAn28U4YWenfWxLtVg15fpxjSlEaKf
-=OYWx
+iQJ8BAEBCABmBQJVZUmeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNd/MQAJxBgeJl2ydM0eWMhnRlU4bG
+XEYmTKKDsRyAvYkOd6QAp0+z6hxlTerZ9LghyCWeDmHX7LHhhGkmzYANFW1Q1LYt
+fvzubaelHuYMgNwmeiZtHIyAmGNugWJGNtFGFbwx9NcMvpTjD9b+uEt17OzEYSyi
+C5PRmuKVufWFNPTuDqNaGGU/DP5SALW2+rC1Jar5v5GbecProo2XuZ4957lvxRqM
+OCsvYE1xtQNG8WVFnpM+ugw4CrrbkU4SmancMpzJi7md8n6ePqnuQm7EhGoQ4nuz
+hyse8IQ1E4nGf3MdOg5nO7R76Wr+s/+J0qWQbgs2yHBezEA/NN4milxHUdHmBuCG
+VAvKKWvt9SIrtL5pqwQlcUd5ev1rZBo6PPmCtFTHdF7GEGQeQsulOUtSELUEM8WY
+eCp9jyOeyqZgw/V8nhymBAsAPn6aexZzPoc/xvrYYO2iUbg/pP/PA0kt9+xYDSUn
+NRaiTZ1NZwYCStZ35IQXJOdhZRe2+8IR2tGdKmvx9CvpAUxHQQUgBCdNCq/qLQCW
+A/1s5MZN2v0IN2O2/sjPdsvVcIDnG/jMJ6YxvlHdocm+NDDnLRX+Ssdlq1/mRsB1
+azoCb40TnnoG0gHpEgmZoe9Yd2WdEoJTVgU4oSW+FvIDiWUIgLsDlVrWYk0o/a35
+CDRutK432+XZkjiOxdqB
+=BX84
 -----END PGP SIGNATURE-----
diff --git a/dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch b/dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch
new file mode 100644
index 000000000000..0741ec85178a
--- /dev/null
+++ b/dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch
@@ -0,0 +1,29 @@
+From 40342dd0ead05d457a2a4e692cf865f50033a709 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Wed, 15 Apr 2015 12:25:29 -0400
+Subject: [PATCH] Enable large file support
+
+https://bugs.freedesktop.org/show_bug.cgi?id=90078
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index b807251..388c013 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,6 +29,9 @@ dnl by either passing --disable-silent-rules to configure or passing V=1
+ dnl to make
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
++dnl Enable large file support
++AC_SYS_LARGEFILE
++
+ dnl Check for programs
+ AC_PROG_CC
+ AC_CHECK_PROG([LN], [ln], [ln], [cp -Rp])
+-- 
+2.4.1
+
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
new file mode 100644
index 000000000000..3a34face18a8
--- /dev/null
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild,v 1.1 2015/05/27 04:35:41 tetromino Exp $
+
+EAPI=5
+
+inherit autotools 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"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
+	inherit autotools git-r3
+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
+
+	# Large file support, fixed in git; requires eautoreconf; bug #550508
+	epatch "${FILESDIR}"/${P}-lfs.patch
+
+	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 4b8fda17a171..f70a1a0ebc3b 100644
--- a/dev-util/pkgconfig/pkgconfig-9999.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.14 2014/07/29 07:58:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v 1.15 2015/05/27 04:35:41 tetromino Exp $
 
 EAPI=5
 
@@ -10,7 +10,8 @@ MY_P=pkg-config-${PV}
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config"
-	inherit autotools git-2
+	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
+	inherit autotools git-r3
 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"