gentoo resync : 14.05.2020

5 files changed, 56 insertions, 6 deletions

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 9ee478003b22..a1c5d8f71207 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -10,10 +10,11 @@ AUX xscreensaver-5.43-gentoo.patch 1340 BLAKE2B 177631b961b97d339149fd969d68ebba
 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-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.ebuild 3406 BLAKE2B d29eb0895c856865d735036c064fec9a920a9dc0253cffb9ccd07bafad75b06f341bfdc2902062c0e7935c2158d60c9400c5dcde748080ee59d4aa8049bd073c SHA512 9e87ee8b23a113934dc061cb5e6dac0d2c2536bbae0e93530a23ff6fc29fb161165cbee59f002433c894cd6d7c92ce49577b6358c0c7246b4014cff47cc955dd
-EBUILD xscreensaver-5.43-r2.ebuild 3448 BLAKE2B 953d1dfd697904e3d8c137099398fac3998c3f22ac185a0ccebf7b59c03f341a8807b2ec7d4aa4441b5c5c5d5642ad852205cb5e4a317af72ce03f9becbca827 SHA512 9b900c2ed638ddaa42fd368832e9aa7fe6d516515cd83988ee0f6104919d33355cd78f6c24b7b8e35523620db889cff50100893fb38f33727ca3e9aaea197484
-EBUILD xscreensaver-5.44-r1.ebuild 3594 BLAKE2B 95ceb762c631c6150e92b5d412b24affc64a4ea2383a014d9b8c014a89fe013720e340948929a4bc6e35654d9168a777538cd50196ba3333e5194a3abf49f151 SHA512 5c0026dd8121c7b8dfac7b21809bb7baa293e3859e9c43cba969787828cd1357413a37402972608934a731b47082e954f1dfd08c5802d304c95b5e55eeee8e44
+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 3622 BLAKE2B 29bb402356942a6ac6addd0fd125c83ca16d4c80b92d19478604ed64fa3799d9917070f68abc825b3d023c16c6f8df2ddbbb76f7eabe96c779edac6e1598752c SHA512 7a2c229aa36829fd7fc70d42c534d63014899a2ea707cd8e0252d60e0585000e6038bfd4fe0db0b416c4cc860a9c2846350035b4033b8872c0be21ff0e32ab24
 MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
diff --git a/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch b/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch
new file mode 100644
index 000000000000..79ffcd7098cf
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch
@@ -0,0 +1,49 @@
+libXxf86misc is the client-side code of an X extension that has not been
+supported by the Xserver in more than 10 years. Since xscreensaver's dependency
+on it is automagic, we have to patch configure.in to safely remove it.
+
+https://bugs.gentoo.org/720158
+
+diff -ruN xscreensaver.orig/configure.in xscreensaver/configure.in
+--- xscreensaver.orig/configure.in	2020-05-02 18:09:23.169324761 -0700
++++ xscreensaver/configure.in	2020-05-02 18:09:52.578233240 -0700
+@@ -104,12 +104,6 @@
+ 	    (It's available if the file /usr/include/X11/extensions/XInput.h
+ 	    exists.)])
+ 
+-AH_TEMPLATE([HAVE_XF86MISCSETGRABKEYSSTATE],
+-	    [Define this if you have the XF86MiscSetGrabKeysState function
+-	    (which allows the Ctrl-Alt-KP_star and Ctrl-Alt-KP_slash key
+-	    sequences to be temporarily disabled.  Sadly, it doesn't affect
+-	    Ctrl-Alt-BS or Ctrl-Alt-F1.)])
+-
+ AH_TEMPLATE([HAVE_RANDR],
+ 	    [Define this if you have the Resize and Rotate extension.
+ 	    This is standard on sufficiently-recent XFree86 systems, and
+@@ -1888,25 +1882,6 @@
+ fi
+ 
+ 
+-###############################################################################
+-#
+-#       Check for XF86MiscSetGrabKeysState (but only bother if we are already
+-#	using other XF86 stuff.)
+-#
+-###############################################################################
+-
+-have_xf86miscsetgrabkeysstate=no
+-if test "$have_xf86gamma" = yes -o "$have_xf86vmode" = yes; then
+-  AC_CHECK_X_LIB(Xxf86misc, XF86MiscSetGrabKeysState,
+-                [have_xf86miscsetgrabkeysstate=yes],
+-                [true], -lXext -lX11)
+-  if test "$have_xf86miscsetgrabkeysstate" = yes ; then
+-    SAVER_LIBS="$SAVER_LIBS -lXxf86misc"
+-    AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE)
+-  fi
+-fi
+-
+-
+ ###############################################################################
+ #
+ #       Check for HP XHPDisableReset and XHPEnableReset.
+
diff --git a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild
index 655aea06e054..9ffa8e21aea5 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild
@@ -30,7 +30,6 @@ COMMON_DEPEND="
 	x11-libs/libXmu
 	x11-libs/libXrandr
 	x11-libs/libXt
-	x11-libs/libXxf86misc
 	x11-libs/libXxf86vm
 	jpeg? ( virtual/jpeg:0 )
 	new-login? (
@@ -75,6 +74,7 @@ src_prepare() {
 	fi
 
 	eapply \
+		"${FILESDIR}"/${PN}-remove-libXxf86misc-dep.patch \
 		"${FILESDIR}"/${PN}-5.05-interix.patch \
 		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
 		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r3.ebuild
index 3f0ba54893e3..5a18a2279341 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r3.ebuild
@@ -30,7 +30,6 @@ COMMON_DEPEND="
 	x11-libs/libXmu
 	x11-libs/libXrandr
 	x11-libs/libXt
-	x11-libs/libXxf86misc
 	x11-libs/libXxf86vm
 	caps? ( sys-libs/libcap )
 	jpeg? ( virtual/jpeg:0 )
@@ -64,6 +63,7 @@ DEPEND="
 	x11-base/xorg-proto
 "
 PATCHES=(
+	"${FILESDIR}"/${PN}-remove-libXxf86misc-dep.patch
 	"${FILESDIR}"/${PN}-5.05-interix.patch
 	"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch
 	"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch
diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
index 94909200656d..5a2b2cd498bf 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
@@ -30,7 +30,6 @@ COMMON_DEPEND="
 	x11-libs/libXmu
 	x11-libs/libXrandr
 	x11-libs/libXt
-	x11-libs/libXxf86misc
 	x11-libs/libXxf86vm
 	caps? ( sys-libs/libcap )
 	jpeg? ( virtual/jpeg:0 )
@@ -64,6 +63,7 @@ DEPEND="
 	x11-base/xorg-proto
 "
 PATCHES=(
+	"${FILESDIR}"/${PN}-remove-libXxf86misc-dep.patch
 	"${FILESDIR}"/${PN}-5.05-interix.patch
 	"${FILESDIR}"/${PN}-5.31-pragma.patch
 	"${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch