gentoo resync : 15.01.2020

6 files changed, 29 insertions, 19 deletions

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 33ad5a41a80c..dd3cd4c9d8c2 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -16,11 +16,11 @@ DIST gimp-2.10.14.tar.bz2 32786424 BLAKE2B f1254ab0742cf0190f4e50f001d8120fe655b
 DIST gimp-2.10.8.tar.bz2 31954568 BLAKE2B 11f88b1068fa1fe216a54bed27b26b94c3fdb2cbc67e1e444df74a080d00b678f8c81897a6c5fb5956fa107842b0a853ada44d15d51c2e58db7435ddd0f8e999 SHA512 b458dd710b786152f95a8e48a0727b71cac549fccb31ac9e1e6ac3c617652079773ce7076401f8ade750ed38bdc78dfdec3317423f4c4e9c931f78002bd7454e
 DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
-EBUILD gimp-2.10.10-r1.ebuild 5721 BLAKE2B d1f1001c4e61a2662f01e78dd51d3cfd257ac7998839ab1d373fd4865cd5c8ea0f2b01a607ed265279712886932c03cf0bb453c29e8cef7b8b31d146617c0b1d SHA512 4d8d2a2f1b417534fa1783a8a137a8b53c1acb64d0e72c1a0659199d8d6050661784d4c611d908ed83d00fb0cb269e251d5b69223707e4ac5d61842f941a06ab
-EBUILD gimp-2.10.12.ebuild 5721 BLAKE2B 1e46bca7e17c7ad3281ceed4ed6e9696d37b68c115b3dd22af7b8b06b34562b48bdaa18718b32f39dcf1f36348cc734c72c0e32af1495fb7c5eae6957951d05f SHA512 9c8886d90acc7ae3bf4f3e70bf27d30485fdf38a90e611e56e925bd1850784c802250bc9b5575ba0a182ead869656e45086672202ebaa6c069b445d3947ecb31
-EBUILD gimp-2.10.14.ebuild 5719 BLAKE2B 16acdf866f51f88dd9cfffb03aea7e6a4af4b91aee2f98333a17ffd0eff30d99a25e8a0c2b94b15721ec408015f6b3c6f7b11b714ed31a2356ad398e13e7a3c2 SHA512 2e73e99e77cb7a2dcd5a403294a84f142e93f5f500191aa843cbfafe5de4a98a8d78170ba4281768e21f70d70ded4b955460c55c453b739947516cd13a2d109d
+EBUILD gimp-2.10.10-r1.ebuild 6074 BLAKE2B 75682eecedbf6211a78718f5c5856b09c783d28c151e00d82ef328365eb3585109af7b08629a11612e9d56630f8008a08ecf8b09a9c721ea0669fd4a46f9a068 SHA512 d453c6937229ab503c753cadbfc96f8d895f9ddfa8a7facb80d06d2c217a448d21595bc06369b174da2cc7a2c22cf75430e12d2196b4a2aa05a9cb7e58a6bbb7
+EBUILD gimp-2.10.12.ebuild 6074 BLAKE2B df3879b253aa768e86be41bcedafa185d52e25f74cfe6534b3d67670f479062cd0ba101573a0005d6201be0d3190019e74be11beb92753bd82bbd8e0fb5eac8c SHA512 c82794178786e30b3b2a6ad08c4705e9be546885ab00df5b3e218cccca16f3cc7e4a01d722bc0b79f9d6d0217841e1c3a49a54ff77aab9faf926f8a1fab6ff2a
+EBUILD gimp-2.10.14.ebuild 6079 BLAKE2B 9c91ee0cf92a3ed1be7626c12d6be81a7f1b3f4ebb3174cb26d6cbff627e28c7be34d8315357fd9f3b03f618e3019fd1f8c5e8be3b3a86a89cc48ff1218e0fd8 SHA512 2a52f0a331da2073dff070ab0367758f5787cf8d9a7ea3b267bea3c95ba4d4d4ac1635f592efd128db56daadd0eb625548ea951d8cff49cbc6945a2dcacc3701
 EBUILD gimp-2.10.8-r1.ebuild 6104 BLAKE2B bec6521e91558be2f2282baf131598c519f92c93267f687dedcac78fe70d27851c09307eb438009d35f9307c2ae78a77411cb6238cdde84b0ace9165399308cd SHA512 20f59e5aa3a8d5424b65ed9f947123feee6723dd16f946991022b17ac964be37c6aa0a71022928293fc51c542f3a3ad24ad3432fc6680d7214393d87d5159db2
 EBUILD gimp-2.8.22-r1.ebuild 5124 BLAKE2B b2fb64d49da0796f6eb2245eceade1ea5b5e2c5da2af918dba9c87a0fa4cb7f4c6dbe7688a6d7fe08b085c569413c06ffd4d22bf1cfa3a9f8c00277f634a11ac SHA512 e8cec3990a151e13c606498f5ebc4e685a28d5fb10919ec6bbb71b1f60d814b13722530f8737aff9e18065093800b8ebbe56d5f3844555accc475d2b74acf18d
-EBUILD gimp-2.9.8-r1.ebuild 5661 BLAKE2B 0617f1c469d09aa5df2884bf54db4338a2ff851a301a3ee7b2daf229c1308aa4818b9693b3f757f23052a857eb6a584d37fbe98e4b2390687dbfb83740c2bb95 SHA512 a10f751e97fd8a1b8e3fb1cc8d4fda72f040aa6631ed22f72c10c29b3b57954fc062518572715643fb7da61bfd501bf0dc6226db49130e3efdb8cb4afe610eed
-EBUILD gimp-9999.ebuild 6548 BLAKE2B b53fac4d6a5228fa21d39a2af406ec66dea3c0cde5dbb82a98bf7a6d189e7544700aeddfa4e27a2bd9a35c021e12650675e6d0f7c47dc747315d52f94b488da4 SHA512 e0405c9423550f387f0b3494ab3a1324a548406be8e633c03b45066902aeabb22869d89d6cb349c27031ff6ddf7ccd55d756c43f6e4a3204a0734b863d571e56
+EBUILD gimp-2.9.8-r1.ebuild 6042 BLAKE2B 0190f744da671d8b8d89e2596100c2ac2268adb1d278ef3106d89863c6d501c60c1e6a5cc7cb6c831aff43224e23c1c0a818cf5102afc28da637262e51798e44 SHA512 0a5a0aa970e83d5603223e7dd6a989098a150807183626bd45f03a68eb553fe3cb85a999262adfb60ea417a43e7b45f2f2379f746b019216347b52a9497f2a07
+EBUILD gimp-9999.ebuild 6084 BLAKE2B dbcbaa20a582a88853ecc3cd568aa02b61cd452fece8253e49864a274ba0186ba8496eae39135b28837cb39901d086688e0f769bfb31e236853b01e3584bffe7 SHA512 fbcd4aae7506bf712fcc48cc4496ebd48422af4908eddb128c334edf93480f22ecd5400a2cc0990532c9472f2de162b251854165f92ea1aa0839fdc189ec6a59
 MISC metadata.xml 628 BLAKE2B f1326f51db692d6e64d1bb7b44dfada65799d7ab94279771e6bd729189145a8a4bbe7a83c776bfc46acf682ad9f34c84598d25fb0a3606aabfa30383b35a9694 SHA512 cec60cde9763bdb9012fec754b95018f09da5cf7ff2f577206417651df5c18251dd5c58b1e32fb45e7c2121e06c0a5b7dc86d08b9511da4cf103bcf2fa1b6e52
diff --git a/media-gfx/gimp/gimp-2.10.10-r1.ebuild b/media-gfx/gimp/gimp-2.10.10-r1.ebuild
index ff1bb96d42f1..f3976c3f12b0 100644
--- a/media-gfx/gimp/gimp-2.10.10-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -101,6 +101,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
+	sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
+		-e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
+
 	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
 	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
 
diff --git a/media-gfx/gimp/gimp-2.10.12.ebuild b/media-gfx/gimp/gimp-2.10.12.ebuild
index b3c8a9550e9a..3b13abe136af 100644
--- a/media-gfx/gimp/gimp-2.10.12.ebuild
+++ b/media-gfx/gimp/gimp-2.10.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -101,6 +101,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
+	sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
+		-e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
+
 	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
 	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
 
diff --git a/media-gfx/gimp/gimp-2.10.14.ebuild b/media-gfx/gimp/gimp-2.10.14.ebuild
index 0217d66c15c3..59020299a272 100644
--- a/media-gfx/gimp/gimp-2.10.14.ebuild
+++ b/media-gfx/gimp/gimp-2.10.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 IUSE="aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -101,6 +101,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
+	sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
+		-e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
+
 	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
 	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
 
diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
index 162fd88fc46e..fc0e9d31d199 100644
--- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
 IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND=">=dev-libs/glib-2.40.0:2
 	>=dev-libs/atk-2.2.0
 	>=x11-libs/gtk+-2.24.10:2
@@ -94,6 +96,10 @@ PATCHES=(
 )
 
 src_prepare() {
+	# Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
+	sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
+		-e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
+
 	gnome2_src_prepare
 
 	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index fb68f61b9b4d..6155d061b952 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -2,15 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PLOCALES="am ar ast az be bg br bs ca ca@valencia cs csb da de dz el en_CA en_GB eo
-	es et eu fa fi fr ga gd gl gu he hi hr hu id is it ja ka kk km kn ko ky
-	lt lv mk ml mr ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl
-	sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
 
 PYTHON_COMPAT=( python3_{6,7} )
 GNOME2_EAUTORECONF=yes
 
-inherit autotools git-r3 gnome2 l10n python-single-r1 virtualx
+inherit autotools git-r3 gnome2 python-single-r1 virtualx
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
@@ -124,10 +120,6 @@ src_prepare() {
 		echo "EXTRA_DIST = missing-gtk-doc" > gtk-doc.make
 	fi
 
-	# Remove disabled locales
-	_rm_locale() { sed -i -e "/${1}/d" po/LINGUAS || die "Failed to remove disabled locales"; }
-	l10n_for_each_disabled_locale_do _rm_locale
-
 	gnome2_src_prepare  # calls eautoreconf
 
 	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144