From 20cc7239c72a34b8df0d5076cc304e383f5a20a1 Mon Sep 17 00:00:00 2001
From: Stuart Shelton <stuart@shelton.me>
Date: Wed, 15 Nov 2017 19:36:50 +0000
Subject: Update dev-util/pkgconfig-0.29.1

---
 dev-util/pkgconfig/Manifest                |  2 +-
 dev-util/pkgconfig/pkgconfig-0.29.1.ebuild | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'dev-util')

diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index c5518c94..83a0df99 100644
--- a/dev-util/pkgconfig/Manifest
+++ b/dev-util/pkgconfig/Manifest
@@ -1,4 +1,4 @@
 AUX pkgconfig-0.29-vasnprintf.patch 478 SHA256 dddd1c513f455023433ddb1f5c6a529365d2bab510c0f75216435d4048e6e5a5 SHA512 aeb40856a76bd439d1678ca614b1ad58dcbc31ed82b69d30cd0ac19865982bc9edbfeb7557aff3adab868a9c720f98ce71cdf0c849d1d67e25953f138fb22c86 WHIRLPOOL 959eb1d79190acf12952b2bb96d52ceb6ebda320b0b5c26cf415f5fe88933770e0830ee09dd92803c6b15ac1b16269d97682a03973a27f1dea0df64f313e8962
 DIST pkg-config-0.29.1.tar.gz 2013454 SHA256 beb43c9e064555469bd4390dcfd8030b1536e0aa103f08d7abf7ae8cac0cb001 SHA512 d2963355929d7aae0fbadad445d67b5c6762934fc4963a10a4b72ae90f7f6df4e6a38694884b924ff37eedaf636b49f3f521fe4eb3009e0322a402f330f1b4c2 WHIRLPOOL 6e7ff88253a4ff2e5b8c7e07bd9b5ab9b78b7f13dfe3af0a8607a8a20205a2340d02a400857d43aca5265ddb299c889b4a71c0c840c2d1b0e956434eb1980341
 DIST pkgconfig-glib-cygwin-patches-2.38.2.zip 7057 SHA256 08a006bc73175cb942179be3cfc38656e855c71c012aaf284271237a4803db13 SHA512 a9b8c0bfec83b022cfb74a4a4b53b17f29ea3b3b0cb12fed8e34a27258b5524c87ddbae1e2d88e452408948795a09506e6782dc87916cb4748a455261f583b62 WHIRLPOOL 390b040d9d1f16a427ffa04a8820cd7de9a756ba9c1f32cbe22d560b385f9eb38441569b68ec1ac38319123bd585f82dd52d19764e6a2520b74bbc9dcd37c631
-EBUILD pkgconfig-0.29.1.ebuild 4221 SHA256 e0d6e5096735acb8e4613c7052a8e26dfb4d0001c2c4e09b8f823c195d5e0f0a SHA512 9a3de79ab2b7ea3e6b9a581295cb0cc27ba4359b2d9d3aeaa3940ad0af4d628ca069dbd4da7a135daf9945d6c94244ad8b27155d52cdf80ddfed396e0f5a3310 WHIRLPOOL 23d04ea11b1a56de7dee1c4b6de2aa34a7a4371d18816dac7deeab93a818a4ab79e8e37c6b94d7dd6a430af634f41d4cc9a15bdd7c60a8781608734f4d890eae
+EBUILD pkgconfig-0.29.1.ebuild 4461 SHA256 003d77970fe0b8ab8b23202ea37369191b80b3623b97af52ecdf0b1253a3aab6 SHA512 39f7f2b09a1fa7bf1b22ab9f839733ff5d3c7c4b74c541e060c42dd5cf53efd8e287d5697b25ed244515a818c410caab520f3fb6948981072d82b28ecde3119a WHIRLPOOL ec127e924379ae479aaecbac8d255a82a0f7d0739ba9c0c3b21ccb84ff88f44b03ef2708fb5662e025e072f6713ab1d307f0e3ea63221c26c9b0a5c76b876d96
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
index bcac8d5f..d955c076 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
@@ -13,11 +12,12 @@ if [[ ${PV} == *9999* ]]; then
 	# 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER
 	# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
 	WANT_AUTOMAKE=1.12
-	EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config"
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git"
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS+="~x64-cygwin"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 	INTERNAL_GLIB_CYGWIN_PATCHES=2.38.2
 fi
@@ -67,9 +67,11 @@ src_prepare() {
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		# fix standards conflicts
 		sed -i \
-			-e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/\1_DISABLED/' \
+			-e 's/\(_XOPEN_SOURCE\(_EXTENDED\)\?\|__EXTENSIONS__\)/  \1_DISABLED/' \
 			-e '/\<_XOPEN_SOURCE\>/s/2/600/' \
 			glib/configure || die
+		sed -i -e '/#define\s\+_POSIX_SOURCE/d' \
+			glib/glib/giounix.c || die
 	fi
 }
 
@@ -98,7 +100,7 @@ multilib_src_configure() {
 			fi
 		fi
 	else
-		if ! has_version dev-util/pkgconfig; then
+		if ! has_version --host-root 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
-- 
cgit v1.2.3-65-gdbad