gentoo resync : 08.01.2021

6 files changed, 24 insertions, 20 deletions

diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index 14f5c92bbc5a..4dd82a8b3d16 100644
--- a/dev-util/pkgconfig/Manifest
+++ b/dev-util/pkgconfig/Manifest
@@ -3,9 +3,9 @@ AUX pkgconfig-0.28-strip_system_library_dirs_reliably.patch 777 BLAKE2B fab15ae7
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
 DIST pkg-config-0.29.1.tar.gz 2013454 BLAKE2B 5f33022b2df83de1c9202e090ea9be926d1f2b796152969d46ad45772ceb792c3f2bb95714cf1def28393b32db1b4052c3fdfe9f71076d130a57172987c04d0e SHA512 d2963355929d7aae0fbadad445d67b5c6762934fc4963a10a4b72ae90f7f6df4e6a38694884b924ff37eedaf636b49f3f521fe4eb3009e0322a402f330f1b4c2
 DIST pkg-config-0.29.2.tar.gz 2016830 BLAKE2B e8f0420033524ad768cac3c82138546e4cd76c47f5835b7b98662ab01eaf3feef08f495a69c04980d51b57935567ab1d465ef4e1d0529735ad0031c828585324 SHA512 4861ec6428fead416f5cbbbb0bbad10b9152967e481d4b0ff2eb396a9f297f552984c9bb72f6864a37dcd8fca1d9ccceda3ef18d8f121938dbe4fdf2b870fe75
-EBUILD pkgconfig-0.28-r2.ebuild 2826 BLAKE2B a528c2e684e201095a65c7077369699a961d48f2641175afd7a50abde25545b1be411a3652c8099581e85d355ad388670868163d443c9bccc2563626d0be5fe3 SHA512 7ae3e8a075fe81539a83b34aa86061d9e0d0fdd0d255da4c91385a57681f66415f4a266a4f6df059d97cd2647889e54a5eef1a92c728a3606463ed45412c0a7f
-EBUILD pkgconfig-0.28-r3.ebuild 3344 BLAKE2B c9552c71be357c50e4bbff61ad2b22cc60e5a1429362bea7a98ad1bac7b73c501877fd3dd45a963e59006efd2d72fecfc6ded5917f2dbab0209dcb4749291bb7 SHA512 b7795cd7d187a47ef6bbf1cb8ef0ca6220e4d6e8879f51a1cd936e5034407b214859d90c5ea5bc82d9507760b02c67ab5bd82658f1961412c3f0985bfccf9786
-EBUILD pkgconfig-0.29.1.ebuild 3708 BLAKE2B 3e31330703992283ba1879ee4b0d207e9c7ef959bba3c5f8f8d1e45ad333d3095f3125e82eb08a0697de4e3e7b8d3127507d58c79d28e88d8ef5b0321a7fc443 SHA512 649113e5a3b4b655465ec16bb3ca936ceb6198a3c9ff8441f2b38ab94b85f7161f4a18969b919475a86cd21e8948a25bfcda657dd9344411b02bcf021267963d
-EBUILD pkgconfig-0.29.2.ebuild 3707 BLAKE2B ac6551f444ca512f175b7f99929c9d1a66ff315b1f407907b13ef7558b2e57060448891bcf09f6ffe9c70caff1df0c1de42f673d135d283d7d68c3c1bea48483 SHA512 b1376c30c4219f9a2d304a23ec2cc159102510fdd856ad733324b0fe1d07aa3f399af2c7556d1d9b5f1c82fec3c8c95db52b593a7995d755e8cbc6f60cec03d7
-EBUILD pkgconfig-9999.ebuild 3708 BLAKE2B 3e31330703992283ba1879ee4b0d207e9c7ef959bba3c5f8f8d1e45ad333d3095f3125e82eb08a0697de4e3e7b8d3127507d58c79d28e88d8ef5b0321a7fc443 SHA512 649113e5a3b4b655465ec16bb3ca936ceb6198a3c9ff8441f2b38ab94b85f7161f4a18969b919475a86cd21e8948a25bfcda657dd9344411b02bcf021267963d
+EBUILD pkgconfig-0.28-r2.ebuild 2815 BLAKE2B 9a80ea89ad2f9dda87d22d830f4a6e1f94c40a15b763a8f3f758a2fbaa5ad2cb39b5a91aeb99b78092a1d374be3b2ad7dad63eec1282510976743212fe581120 SHA512 6e415f2372763b6762c249edcc14068d2d10c3beeec6755d0c774046bda59221991a5103dda6216f0bee62d86175a73cf5377c145822c375025de2a909febe96
+EBUILD pkgconfig-0.28-r3.ebuild 3333 BLAKE2B 7b6edbc90056a77bd995e0280d5c00e6994b46e4d0523b6a184e58af41a88d8b85af58e64fd5002442b88c818714416ecd97ffcda2c79cdf4cb5320916ae1f63 SHA512 3b1ab604f69525894c0e1deb99afc3fb9158c1a5cf8f3b678acd17444a525f9b88a6ceb1bb53728e36ab736a4b2d14bf4a5699344fee64543a56c51732a737bd
+EBUILD pkgconfig-0.29.1.ebuild 3697 BLAKE2B 22e3607d803206ca94d05973ee9e1cd6b0899080918a5a2e1f3c72f987ff8aca10ed117fc6d924ecbc7dc9da27ceedbe41299c8e7363f5876ce6af4e7cd82fa8 SHA512 7b1aaa6608f13b7587d63e1db9dc1654bfffadacc46334e7cea67f8cedec453d83663f6ed1dbebed497e1383497bde1c1d306dac953e6c0060a49b405bb166c0
+EBUILD pkgconfig-0.29.2.ebuild 3814 BLAKE2B c1544c3ae3be916bc68808acf9e99ec6d0deb93354b51aa4ff2b4ebd5c433660d989c262ed1e97da6eba8395f48ffe40e3c6aa3ed817e7218bfaf711d19540a3 SHA512 d21b19b3f9b97987c2b74bea9fee6b743a4c174d81a72e80f64ca5721dfbe6ee9eb2a1b46b90e3ff8cf480df85e0fbaeb66572e0657f1eed2ce4095c47b7f7d0
+EBUILD pkgconfig-9999.ebuild 3697 BLAKE2B 22e3607d803206ca94d05973ee9e1cd6b0899080918a5a2e1f3c72f987ff8aca10ed117fc6d924ecbc7dc9da27ceedbe41299c8e7363f5876ce6af4e7cd82fa8 SHA512 7b1aaa6608f13b7587d63e1db9dc1654bfffadacc46334e7cea67f8cedec453d83663f6ed1dbebed497e1383497bde1c1d306dac953e6c0060a49b405bb166c0
 MISC metadata.xml 325 BLAKE2B af0abf473903faa5ce1e6d1918fa87b558b99b82d95c7f95ecb596684f7f55ee365a10e943752d1f3c8b6b1684ac4e0985329b89a6f19de2c926bcc0c3127382 SHA512 0db9510bbe132efa03acbbb4fb31407188edd83a6ac5c1d84316fa682db9399879957e8cd4447c1cbde01638f6d220f9a30a17611cd31e35769e71e5d38287a4
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
index 78438930632a..73edc7072dd3 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git"
 	inherit autotools git-2
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
index 1befce397d23..6267da5f5304 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
index f5fbed01dd0e..d2554a4effda 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
index 980d368b7395..4b4e246111c5 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
@@ -50,11 +50,15 @@ src_prepare() {
 	fi
 
 	if [[ ${CHOST} == *-solaris* ]] ; then
-		# fix standards conflicts
-		sed -i -e 's/\(_XOPEN_SOURCE\(_EXTENDED\)\?\|__EXTENSIONS__\)/  \1_DISABLED/' \
-			glib/configure || die
-		sed -i -e '/#define\s\+_POSIX_SOURCE/d' \
-			glib/glib/giounix.c || die
+		# fix standards conflict, since gcc-4.5 default is gnu90
+		if tc-is-gcc && [[ $(gcc-major-version) -gt 4 || \
+			( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -ge 5 ) ]] ;
+		then
+			sed -i \
+				-e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/\1_DISABLED/' \
+				-e '/\<_XOPEN_SOURCE\>/s/2/600/' \
+				glib/configure || die
+		fi
 	fi
 }
 
diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild
index f5fbed01dd0e..d2554a4effda 100644
--- a/dev-util/pkgconfig/pkgconfig-9999.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi