gentoo resync : 25.08.2020

5 files changed, 24 insertions, 6 deletions

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index a4a5de87e51c..c2d4321324d1 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -9,12 +9,13 @@ AUX xscreensaver-5.35-offensive.patch 1678 BLAKE2B 6479ad1d5f081d3ae0ab7e9f08edf
 AUX xscreensaver-5.43-gentoo.patch 1340 BLAKE2B 177631b961b97d339149fd969d68ebbab5bd6444aea4f1379c199efbcbe5924106890578a5210bae5c55249ea1883af437e7edebb32fbccd35022acc3d7c29de SHA512 53ec2d02e20139389f832750ecee92e634ec8ecea5bfd5ef27a58ab0e6f3cbde299263bd92006581a4076f4b0721c036c1ac28cac50b1a2bf47c24df08347d04
 AUX xscreensaver-5.43-offensive.patch 1799 BLAKE2B f85d26a07ba2712855567a0779eaff7dba7e9a7350f320f78db5b1280890925cd82694ec3fa9c47c173ada2a1979a21b707dacb05c46c8721516687d52fcc8b7 SHA512 041105a4c96a197506c596d4793f7200f52e496f13d41209daa7eb05d5433280ede45411ee3f60679a1030c1edc4009383d6d50a97dff1af7e65a63a217b25d3
 AUX xscreensaver-5.44-blurb-hndl-test-passwd.patch 247 BLAKE2B fb88708de900b90fdb846608cc0a08706c339792e10099e7873aef00b7c66a408dba71489d0938b59e619345c739e4f6a35a9c97b1ae83cfa040035df3499434 SHA512 bd7f0e3f670e99ad1297306c88e30ac9cc381adf2a54cfd52192c1f562293ebdfcf3e956990cd2f3d877a2ca0d2f5b13332de726304ef93510c5bd08ae39a819
+AUX xscreensaver-5.44-gcc.patch 549 BLAKE2B 9e8b626fd7a9f3778c1bc62a3f161cd2d94b70769fc4adc06c64dd2c7515fbc5054257560326a7d15c124fa90e93b907bb5f3c5954bbe11c123540625b0f2e57 SHA512 d55908911b738e3fc5245627ca79f9c2880402921d38f80247e2143422543396399f5529fd70f4f473935d2606f10dbe3501d2e64af158b38fc03d995345ff10
 AUX xscreensaver-5.44-gentoo.patch 1368 BLAKE2B d74cbe8effe8feb4c682f8df537a2a1897defa31c0838bfb34967642ab2e66e8058b3306c98e360e3c5f81ff4649b759d5386e6e2613c59fb945f439c3b0cc02 SHA512 bba16c093a2a16e57e3bbe77ed7a54201e7e9e1c9a3c5a65065f275a4faa6898327865b62a56be0c538dabde1fb4571ccfd567035911b85688f31ac1cba128b1
 AUX xscreensaver-remove-libXxf86misc-dep.patch 1879 BLAKE2B fa3f562edf921dded7a1b3e9644d79d10a768baea64fbbed6301dba0fdaa1d575b85b2e8322eda251030a79835f7476020680a8b5a05354d279db8aa06943475 SHA512 6e55932f6be85042eb6f88a79d32b90fe51734b90f9e15aeebfefcdfe087af85b6cf5bed8c3c4212c1e8a91a77dda49eb6fbb64b829dcd02230710b803863a7d
 DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
 DIST xscreensaver-5.43-r1.tar.gz 26973508 BLAKE2B 67b57214e8a41ba895df6e9efcac3e712f24be06ee7914b38d3a8e639d4945c927c4ac28469d2180bc4a3999a4b89d2a60e633799ac5204c42fa17ad76dd21fc SHA512 7ccaf30fb05ae2110f742f1a5c99f83cd4c8e6749124066b5a418cf3e0ba1b8ff09858eeec29c11b0c8ea428b95b2916481c50cee6a5d952ec941b3ad1b6adcd
 DIST xscreensaver-5.44.tar.gz 27001826 BLAKE2B 102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3 SHA512 9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae
-EBUILD xscreensaver-5.38-r1.ebuild 3437 BLAKE2B f8fbcb02b9f5927e395a13b438235cc4b4d5b8f0660253085d890326151dbebdc826ba89b401c855a86a7f037828527408cf44484478d72e2722fdd0048d7dfa SHA512 2237ff0d15867e50b564c8889d251afc7e2a08431701f9a8a36e9120ca47c6665b03be86eec4ec2f6fc1a38352dca5297fcd60d813d1b73856707447a2e14f87
-EBUILD xscreensaver-5.43-r3.ebuild 3476 BLAKE2B 573c05f1255f99c769b96c605952a525ace1ee8782e6c5408fd4a02501e584654478fededc8396d3eb0fa69b1096ebf2b9d87390a2f5b79264e61f2ad67b7c54 SHA512 525acd033e5cabd0cc7d0a03f72f7e86bcbe229c11aaa2de78a2639dc20657258416782003adbc528ae610af694429236c6f5381aec7e135b6f8a16b17726bb8
-EBUILD xscreensaver-5.44-r2.ebuild 3755 BLAKE2B 5de38bbcf33fd443e012f136b7e437d96a56f688853664bc1ea64467c88b2892c4e90a91646884094cbc9abdbc51dd1524ade3b210719b029ac5d06284c8ff3d SHA512 3f9b8926051b8363e5b6d7062dec240f9502a395d9521fbde525c0a6aa37f6073858f6d67b5b0e81e51c1ef7d22c4912500c920f613a44bfdb29ad133841d487
+EBUILD xscreensaver-5.38-r1.ebuild 3411 BLAKE2B b2a0f44c61b5397a19afb5539be1130b2c00121ea72b08e775a0328f288c867d6276426df2240b16fe230d7429b88513454d47c26908b9f67de0395cf024fe42 SHA512 496b148d95873263871033308b7d49e182181b99147f922fad25ca56b6cec2c966df7ae0dd91d1b2ca6f72797dcd066e54b92e95c35b747005688d6ed161e44c
+EBUILD xscreensaver-5.43-r3.ebuild 3450 BLAKE2B aac754505d1e6ef9c4b2f080f5d90fb25f73054a18f4e8ea0244be228aed39420932bbc28d2caebdaab6e49ee0e8d01cfd8c8cb9888e3d530498e552855c7d66 SHA512 de444867d7b46d83db7b18e49886b2f8e09009ab338a82f171a69662524e88507f689adb29d1d895467e8ee9767a186cbf0ead2dc3e8a3c7f423cc55aaac17dd
+EBUILD xscreensaver-5.44-r2.ebuild 3765 BLAKE2B a4d43d5920409a70f53faf88c60545f2bc440aadfdc023abbcc26b581d9c6599373a57ae43e6cc0c16a9b5754e39a885f98004b6b4f13920d8a4d2400c11a2ef SHA512 65235c68d63fbc731656f76e9a4a3fb4aa339b1e58b2428e9d5c1b14950bdcf73154d9c580b56bbe08ba0adf7bb06397a059e6fef382e5741ff734d75c3de8f7
 MISC metadata.xml 870 BLAKE2B 222f0b24d94c2d9884848813bc9927312e23c670cb03d6427af4018c469b7ca81ab5d0887fa469ad60d05aff97f3b8b2df88158638213fbce24ea6d90c7d9f1a SHA512 0743dbc932e97530aede3f34519e1785bd186662619f46d212f4b4ae0b53bfa01875a3a58d2a30e7f7e6d93f1723211e5cf95018b86dd8e5ede5a37e4c238592
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch
new file mode 100644
index 000000000000..16493e1fd1dc
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch
@@ -0,0 +1,16 @@
+--- a/configure.in
++++ b/configure.in
+@@ -468,11 +468,11 @@
+ 
+ AC_DEFUN([AC_CHECK_GCC_ARG],
+  [if test -n "$GCC"; then
+-   AC_CACHE_CHECK([whether gcc accepts [$2]],
++   AC_CACHE_CHECK([whether [$CC] accepts [$2]],
+      ac_cv_gcc_accepts_[$1],
+     [rm -rf conftest.$ac_ext
+      touch conftest.$ac_ext
+-     if ( ( gcc -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \
++     if ( ( $CC -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \
+           grep unrecognized >/dev/null ); then
+        ac_cv_gcc_accepts_[$1]=no
+      else
diff --git a/x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild
index 9ffa8e21aea5..315cf9b7a9ce 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r3.ebuild
index 5a18a2279341..a111f518d22a 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
index 49a04e5dd618..3d15c7f3a86f 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid xinerama"
 REQUIRED_USE="
 	gdk-pixbuf? ( gtk )
@@ -71,6 +71,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.31-pragma.patch
 	"${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
 	"${FILESDIR}"/${PN}-5.44-gentoo.patch
+	"${FILESDIR}"/${PN}-5.44-gcc.patch
 )
 
 src_prepare() {