gentoo resync : 10.09.2021

9 files changed, 2 insertions, 503 deletions

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 21d9ca96b910..51e2b67db74e 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,11 +1,5 @@
 AUX xscreensaver-5.31-pragma.patch 442 BLAKE2B 375199197c7e3eaf5028099f0fc8b754b7e5dca4911a76de46372751c82a060ae9c0ee5ed35d1efb33f02d6ffbfbd5903ba5f823e1db5ba9d2762a8841cefacf SHA512 9aecda422bc0f22bab5eb0de22f1c861b9ed1a2ff4fff2327bec134fafc5e3116156d80a70e81b67e9ce7ce05eb6f842614b2e939cb91a618dd0b10e1d443557
-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-5.45-configure.ac-sandbox.patch 4763 BLAKE2B ce28548f02c5e8c769d1c02329a15422bf172b8a4feaff09c2c36e706139949c1f9e21b797378bc492226d077e8f2679b8afb32c0e078c0a6acf98ca01d36cd4 SHA512 18bde1dd95775d8afbc6636900844cfd5b317e1e56aa42014c9a988815c1b544458d88e27018d53abfa9354ca816fc7b3a086a59ad61bf561a35fc2605ace109
-AUX xscreensaver-5.45-cve-2021-34557.patch 1567 BLAKE2B 1ee8105b3f4d9f1772b29138ccdd915d4ae7c9def97d773b7369bc7aa01ffc12b0718815e151ee2ae2893ae240193e111f743368a156d53d7af4def15b7d4b95 SHA512 f6db9516a56c0fa65a7fff558c6db11e632d095c5cd505df231c54211d7fa85ddec30a3d809555cbe0910b589eaec9f70771546a0d188e9ce56716dfcb949aa1
 AUX xscreensaver-5.45-gcc.patch 549 BLAKE2B c762b7792d2e597893b7156e1b12e52a03c84a40344b408d3261b60a9b6f4357070644ae5c2d6cf1f4f93229cbf5e66d0f893d71e5c6baa13d77b96d17d09d33 SHA512 6549885e1bf7515845c1e2f47ec211e2c948b22531e14a5cab0cf700863450d6bfff8b1cd385a8a083771c73591a5f65fbd9f1b4d0280cb08edeea31236aeca6
-AUX xscreensaver-5.45-interix.patch 950 BLAKE2B 6bbebbc4ff8eb2dc0a3179441c2813559bfb2ad1727db1295fb847dff0b4510a31b32b7982fa83f059e99f1c58f5cd12f84600e2183273417cb1e0e17843929a SHA512 94937b43f1f0ea1b72fa0ae95b967481702362b2b6f9aa4acbc7dfd2919c69d1cc302cbb9bb8a953da22b7eb29b3874a160cf741c7ff8f4c9b9942b8af7ba6d4
-AUX xscreensaver-5.45-remove-libXxf86misc-dep.patch 1879 BLAKE2B 2e4f8e39b557cf32302bef97f846edf1585659340d1212710654dc1162d3be0e2ecfc8846a04732976c40b0167630fca0d12f64a6cc0d04fabbe0b323dabae83 SHA512 552a9674d2954168af666a0e61bbe8b7302fab8630116196482507c595b3a9a902eceb58387973a23ad931e54c8f3f35953dd86357e25492f03a552a168ef88f
 AUX xscreensaver-6.01-configure-install_sh.patch 307 BLAKE2B 23448fd5be2ea322bd5696026d175ca9f167835e9badd3cd9f2069187571d7d2a45e6d5a73596d3291bf7739f8288c2becda5d7a8c9c95c78c74a70bea63422d SHA512 4d4169546f316902846921c05d733d2a956eaf53b700ecdd6127825576d0e6be6ec0eeb51f49a3a80bd14e7753328783448d33f1ffb1a67fca0c39c676ff9ec4
 AUX xscreensaver-6.01-configure.ac-sandbox.patch 4010 BLAKE2B 8df5adba88e04594b18e12080be0624daccdfd6e101a762e6b3ce42f8fd8405c1c02f7beaf07405f979c959d79e804daade57cd1e087cc9adb4e96aca851ca4b SHA512 2c033fed2a48a8dae46a394624f4174ebfc33ed944ad568327823290b803a2d8812767654d7bec084bf861b731dc56840fe74286473d364ee580b48708e40549
 AUX xscreensaver-6.01-gentoo.patch 1303 BLAKE2B 8ae9f4e545eed146c08f34fe9c56a9e73721c6cbcc361792c1b3b1c529da409e6f75b8727049d83a34be40747e516ab4e86efaf15bd027651dcdbdd64fe25ef5 SHA512 60f0f841e77c42f8b8afe3c94c6ec86c72e80bc2fb771979b798e7bc8428cb1d903c72a6176f60a3c5b98e850f4bb82cec01bae87eddeb42e99ba8099a1223aa
@@ -13,8 +7,6 @@ AUX xscreensaver-6.01-gtk-detection.patch 792 BLAKE2B c941ea71b795af827034196150
 AUX xscreensaver-6.01-interix.patch 946 BLAKE2B e5a61a4de1373195747abb8f6e6580278bb9418bc17943422969f6571d4913f27347b088aa9404b11c14662de5b6144ef555521b1cb506b4ba8cde440aa63e78 SHA512 491e2861f2fb59b9c60f2321fd7e47f8cccaa8b2e69b5e9bb56ddb7893a6304983cefbed6ac6baf984f31ddf3b85e7354fc68ecac88058bfac79c9fac16deb44
 AUX xscreensaver-6.01-non-gtk-install.patch 1780 BLAKE2B 38d2a71fb9d35d1694fac4d92b60860e9a4e53b48cbb80d22981d4cf1d76b838538e19fb390a30fb5783023c66e5aa14b03e7f9ab3ca857c1fe29c7709afb6e1 SHA512 d949fe410df79833b112f1cd7442a1ab11d68f10b2415a39feb51229b0b067612d6970e6909cafd89b28081959754c98c35f0776be2e6069771bdb9f2310bdfd
 AUX xscreensaver-6.01-without-gl-makefile.patch 862 BLAKE2B 9762e84d535b4e913c0e4da6818605d8ff6fc0c9d184ff2cdc60969fab977b603bc18b16dfab7b1124948e814d230a50cd384bfabe785ad1e38e735a5e063d0c SHA512 8b445ca766d24b23904423c8d3a561a0558eca6d4b70b242d05df4949c371e455251be5a473b07fa837505550e00ea13c3154e2efda239468bf7a2a73a063c1f
-DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B 132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880 SHA512 1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14
 DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
-EBUILD xscreensaver-5.45-r4.ebuild 4160 BLAKE2B fdcff85c0e4754ca0363275cf395c132f612b1e7372ae88d21474d077c5c94c9e6aadcd6f214f3d1bb4f8f544a801c96f2d555c9eabc79b5adf925f9743d60f3 SHA512 4f2a0a833641abc2546088d87fcb6094b6d19b5857b840fdb07301135f45b856e95ead0dd466cfc12f9e84197ddfaae6e76b406dada3328a225432d376bffe79
-EBUILD xscreensaver-6.01-r3.ebuild 5841 BLAKE2B 913b699a5f2c79b1edde4d780806e06ca2f572a3e303aa36158ff1fb963dad30248c6686031f6a83d4c7732cf389a385829d41d05d195091d2f0c6920d0d5a4e SHA512 fe261eadaa3ecd72ab7399fa9dd1319ba265142555b8a45af87cb1ced088bb062214afa5ef8eb41bed3fd64cf304648a2529fb7b502c6b93c379ebb66adb62d1
+EBUILD xscreensaver-6.01-r3.ebuild 5840 BLAKE2B feb6e43e155f8a2e3e19bee7ee6dc329ac4ecfbf49c0fc36cbdf2cfb3cd3c4a56edaa251ccd7ba1bc02dfb08045ccc4802ea0c4147dd251b93a0d0c174f4f05c SHA512 84a7b5cb1fa5d8f72889e177e8dcc72397e91e86e26aa9043cc74c61aa5fbfd66244eedd906565e75acd980ff5b04f9e8dd27878fa6efa6464d033f47195746c
 MISC metadata.xml 887 BLAKE2B c24cdade56b44dad279fd6353c3e42f5c9992d2328a3aa29e003eee4d4051fc2505b35c01031041cc87cd033a93796e05aec9bf9379329f5c1a315b2702d295c SHA512 5b62ff9b4fae658f906a040ccea03f9df0fca1b5b6b5a5c5a47c7649de814f0ec443c81baa80d7d089b295ffb9bf15665ff47374e2be166d02fbbee57dba55b1
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch
deleted file mode 100644
index cf95cf105b01..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/driver/test-passwd.c
-+++ b/driver/test-passwd.c
-@@ -69,6 +69,7 @@
- char *timestring (time_t when) { return ""; }
- 
- const char *blurb(void) { return progname; }
-+Bool in_signal_handler_p = 0;
- Atom XA_SCREENSAVER, XA_DEMO, XA_PREFS;
- 
- void
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch
deleted file mode 100644
index 279a19cf6386..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/driver/XScreenSaver.ad.in
-+++ b/driver/XScreenSaver.ad.in
-@@ -31,21 +31,21 @@
- *mode:			random
- *timeout:		0:10:00
- *cycle:			0:10:00
--*lockTimeout:		0:00:00
-+*lockTimeout:		0:30:00
- *passwdTimeout:		0:00:30
--*dpmsEnabled:		False
-+*dpmsEnabled:		True
- *dpmsQuickoffEnabled:	False
- *dpmsStandby:		2:00:00
- *dpmsSuspend:		2:00:00
- *dpmsOff:		4:00:00
--*grabDesktopImages:	True
-+*grabDesktopImages:	False
- *grabVideoFrames:	False
- *chooseRandomImages:	@DEFAULT_IMAGES_P@
- ! This can be a local directory name, or the URL of an RSS or Atom feed.
- *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@
- *nice:			10
- *memoryLimit:		0
--*lock:			False
-+*lock:			True
- *verbose:		False
- *timestamp:		True
- *fade:			True
-@@ -63,7 +63,7 @@
- *textLiteral:		XScreenSaver
- *textFile:		@DEFAULT_TEXT_FILE@
- *textProgram:		fortune
--*textURL:		https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
-+*textURL:		https://planet.gentoo.org/rss20.xml
- 
- ! When a saver writes an error message to stdout/stderr, it can be printed
- ! on the screen.
-@@ -124,7 +124,8 @@
- 
- ! The format used for printing the date and time in the password dialog box
- ! (see the strftime(3) manual page for details.)
--*dateFormat:		%d-%b-%y (%a); %I:%M %p
-+!*dateFormat:		%d-%b-%y (%a); %I:%M %p
-+*dateFormat:		%x %X
- ! For day month date:
- ! *dateFormat:		%a %b %d, %I:%M %p
- ! To show the time only:
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch
deleted file mode 100644
index cee3a30897f6..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 6e4e7c657f6628109c9809561f2c5d7bf51c8c8e Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Tue, 16 Mar 2021 00:55:54 +0100
-Subject: [PATCH] configure.ac: Stop asking rpm and dpkg things, we're on
- Gentoo
-
----
- configure.ac | 115 ---------------------------------------------------
- 1 file changed, 115 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 603b993..6ef2631 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3917,25 +3917,6 @@ for d in /usr/share/fonts/X11 \
- done
- AC_MSG_RESULT($have_bitmap_fonts)
- 
--# In case we didn't guess the font directory properly, check RPMs and DEBs too.
--if test $have_bitmap_fonts != yes ; then
--  for r in 100dpi 75dpi ; do
--    for f in xfonts-$r \
--             xorg-x11-fonts-$r \
--             xorg-x11-fonts-ISO8859-1-$r \
--      ; do
--      if test $have_bitmap_fonts != yes ; then
--        AC_MSG_CHECKING(for $f)
--        if ( rpm -q "$f"  2>&- >&- ) ||
--           ( dpkg -s "$f" 2>&- | grep -q '^Status:.*installed' ) ; then
--          have_bitmap_fonts=yes
--        fi
--        AC_MSG_RESULT($have_bitmap_fonts)
--      fi
--    done
--  done
--fi
--
- 
- ###############################################################################
- #
-@@ -4876,102 +4857,6 @@ for bad_choice in xscreensaver xscreensaver-demo xscreensaver-command ; do
-   fi
- done
- 
--
--# Now let's warn if there's a previous RPM version already installed.
--# But don't bother with this test if we are currently *building* an RPM.
--
--if test -z "$RPM_PACKAGE_VERSION" ; then
--
--  rpmnames="xscreensaver xscreensaver-base xscreensaver-extras"
--
--  # M4 sucks!!
--  changequote(X,Y)
--  rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \
--        sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \
--        head -1`
--  changequote([,])
--
--  if test \! -z "$rpmv" ; then
--
--    # M4 sucks!!
--    changequote(A,B)
--    rpmbdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'`
--    rpmhdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares$@\1@p'`
--    rpmcdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
--    rpmadir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)XScreenSaver$@\1@p'`
--    changequote([,])
--
--    err=" (DIFFERS)"
--    if test -z "$rpmbdir" ; then rpmbdir='???'
--    elif test "$rpmbdir" != "${bindir}/"       ; then rpmbdir="$rpmbdir$err";fi
--
--    if test -z "$rpmhdir" ; then rpmhdir='???'
--    elif test "$rpmhdir" != "${HACKDIR}/"      ; then rpmhdir="$rpmhdir$err";fi
--
--    if test -z "$rpmcdir" ; then rpmcdir='???'
--    elif test "$rpmcdir" != "${HACK_CONF_DIR}/"; then rpmcdir="$rpmcdir$err";fi
--
--    if test -z "$rpmadir" ; then rpmadir='???'
--    elif test "$rpmadir" != "${APPDEFAULTS}/"  ; then rpmadir="$rpmadir$err";fi
--
--    warning=no
--    warnL "There is already an installed RPM of xscreensaver"
--    warn2 "version \"$rpmv\" on this system."
--    echo ""
--    warn2 "It is currently installed in these directories:"
--    echo ""
--    warn2 "User programs: $rpmbdir$berr"
--    warn2 "Screen savers: $rpmhdir$herr"
--    warn2 "Configuration: $rpmcdir$cerr"
--    warn2 "App Defaults:  $rpmadir$aerr"
--  fi
--fi
--
--# Also warn if there's a Debian package installed.
--#
--debnames="xscreensaver xscreensaver-data xscreensaver-data-extra"
--debv=''
--for dpkg in $debnames ; do
--  if test -z "$debv"; then
--    debv=`dpkg -s $dpkg 2>/dev/null | sed -n 's/^Version: \(.*\)$/\1/p'`
--  fi
--done
--
--if test \! -z "$debv" ; then
--
--  # M4 sucks!!
--  changequote(A,B)
--  debbdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/bin/\)xscreensaver$@\1@p'`
--  debhdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares$@\1@p'`
--  debcdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
--  debadir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)XScreenSaver[^/]*$@\1@p'`
--  changequote([,])
--
--  err=" (DIFFERS)"
--  if test -z "$debbdir" ; then debbdir='???'
--  elif test "$debbdir" != "${bindir}/"        ; then debbdir="$debbdir$err"; fi
--
--  if test -z "$debhdir" ; then debhdir='???'
--  elif test "$debhdir" != "${HACKDIR}/"       ; then debhdir="$debhdir$err"; fi
--
--  if test -z "$debcdir" ; then debcdir='???'
--  elif test "$debcdir" != "${HACK_CONF_DIR}/" ; then debcdir="$debcdir$err"; fi
--
--  if test -z "$debadir" ; then debadir='???'
--  elif test "$debadir" != "${APPDEFAULTS}/"   ; then debadir="$debadir$err"; fi
--
--  warning=no
--  warnL "There is already an installed dpkg of xscreensaver"
--  warn2 "version \"$debv\" on this system."
--  echo ""
--  warn2 "It is currently installed in these directories:"
--  echo ""
--  warn2 "User programs: $debbdir$berr"
--  warn2 "Screen savers: $debhdir$herr"
--  warn2 "Configuration: $debcdir$cerr"
--  warn2 "App Defaults:  $debadir$aerr"
--fi
--
- echo ""
- echo "$warnsep"
- echo ""
--- 
-2.30.2
-
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-cve-2021-34557.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-cve-2021-34557.patch
deleted file mode 100644
index 3d002b40877a..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.45-cve-2021-34557.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c1e43f7fa01b7536bc90ad5a9b61c568f4db4dd1 Mon Sep 17 00:00:00 2001
-From: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
-Date: Tue, 18 May 2021 15:41:55 +0200
-Subject: [PATCH] Fix updating outputs info
-
-When an output is disconnected, update_screen_layout() will try to unset
-a property on window assigned to that output. It does that by iterating
-si->screens up to 'count', while 'good_count' signifies how many outputs
-are currently connected (good_count <= count). si->screens has few more
-entries allocated (at start 10), but if there are more disconnected
-outputs, the iteration will go beyond si->screens array.
-The only out of bound access there is reading window ID to delete
-property from, which in most cases will be a bogus number -> crashing
-xscreensaver with BadWindow error.
-
-Fix this by allocating array up to full 'count' entries, even if much
-fewer outputs are connected at the moment.
----
- driver/screens.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/driver/screens.c b/driver/screens.c
-index 5aeb55d..16d6ec3 100644
---- a/driver/screens.c
-+++ b/driver/screens.c
-@@ -1020,9 +1020,9 @@ update_screen_layout (saver_info *si)
-         calloc (sizeof(*si->screens), si->ssi_count);
-     }
- 
--  if (si->ssi_count <= good_count)
-+  if (si->ssi_count <= count)
-     {
--      si->ssi_count = good_count + 10;
-+      si->ssi_count = count;
-       si->screens = (saver_screen_info *)
-         realloc (si->screens, sizeof(*si->screens) * si->ssi_count);
-       memset (si->screens + si->nscreens, 0, 
--- 
-2.31.1
-
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-interix.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-interix.patch
deleted file mode 100644
index f9841a49b74a..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.45-interix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/driver/prefs.c b/driver/prefs.c
-index ab97ffa..cc04cc9 100644
---- a/driver/prefs.c
-+++ b/driver/prefs.c
-@@ -969,7 +969,10 @@ write_init_file (Display *dpy,
- 	     sure that the bits actually land on the disk right away. */
-           /* Update 2020: Apparently here in the future, this sometimes takes
-              3+ seconds, so let's not. */
-+/* Interix has no sync() or alike. */
-+#ifndef __INTERIX
- 	  /* sync(); */
-+#endif
- 
-           status = 0;    /* wrote and renamed successfully! */
- 	}
-diff --git a/driver/setuid.c b/driver/setuid.c
-index 3ac78e4..a2b9e15 100644
---- a/driver/setuid.c
-+++ b/driver/setuid.c
-@@ -136,9 +136,12 @@ set_ids_by_number (uid_t uid, gid_t gid, char **message_ret)
-   if (uid == (uid_t) -1) uid = (uid_t) -2;
- 
-   errno = 0;
-+
-+#ifndef __INTERIX
-   if (setgroups_needed_p (gid) &&
-       setgroups (1, &gid) < 0)
-     sgs_errno = errno ? errno : -1;
-+#endif
- 
-   errno = 0;
-   if (setgid (gid) != 0)
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-remove-libXxf86misc-dep.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-remove-libXxf86misc-dep.patch
deleted file mode 100644
index 9a2ac62036a9..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.45-remove-libXxf86misc-dep.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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.ac xscreensaver/configure.ac
---- xscreensaver.orig/configure.ac	2020-05-02 18:09:23.169324761 -0700
-+++ xscreensaver/configure.ac	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.45-r4.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r4.ebuild
deleted file mode 100644
index 2b7ec1057034..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.45-r4.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic multilib optfeature pam strip-linguas
-
-DESCRIPTION="modular screen saver and locker for the X Window System"
-HOMEPAGE="https://www.jwz.org/xscreensaver/"
-SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-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 systemd xinerama"
-REQUIRED_USE="
-	gdk-pixbuf? ( gtk )
-"
-
-COMMON_DEPEND="
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	media-libs/netpbm
-	virtual/libcrypt:=
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86vm
-	caps? ( sys-libs/libcap )
-	gdk-pixbuf? (
-		x11-libs/gdk-pixbuf-xlib
-		>=x11-libs/gdk-pixbuf-2.42.0:2
-	)
-	gtk? ( x11-libs/gtk+:2 )
-	jpeg? ( virtual/jpeg:0 )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
-		)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pam? ( sys-libs/pam )
-	systemd? ( >=sys-apps/systemd-221 )
-	xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		dev-lang/perl
-		dev-perl/libwww-perl
-		virtual/perl-Digest-MD5
-	)
-	selinux? ( sec-policy/selinux-xscreensaver )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/bc
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.45-remove-libXxf86misc-dep.patch
-	"${FILESDIR}"/${PN}-5.45-interix.patch
-	"${FILESDIR}"/${PN}-5.31-pragma.patch
-	"${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
-	"${FILESDIR}"/${PN}-5.44-gentoo.patch
-	"${FILESDIR}"/${PN}-5.45-gcc.patch
-	"${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch
-	"${FILESDIR}"/${P}-cve-2021-34557.patch  # bug 794475
-)
-
-src_prepare() {
-	sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
-	strip-linguas -i po/
-	export ALL_LINGUAS="${LINGUAS}"
-
-	if use new-login && ! use gdm; then #392967
-		sed -i \
-			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
-			configure{,.ac} || die
-	fi
-
-	default
-
-	if ! use offensive; then
-		sed -i \
-			-e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
-			hacks/barcode.c || die
-		sed -i \
-			-e 's|erect penis|shuffle board|g' \
-			-e 's|flaccid penis|flaccid anchor|g' \
-			-e 's|vagina|engagement ring|g' \
-			-e 's|Penis|Shuttle|g' \
-			hacks/glx/glsnake.c || break
-	fi
-
-	eapply_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		$(use_enable locking) \
-		$(use_with caps setcap-hacks) \
-		$(use_with gdk-pixbuf pixbuf) \
-		$(use_with gtk) \
-		$(use_with jpeg) \
-		$(use_with new-login login-manager) \
-		$(use_with opengl gl) \
-		$(use_with pam) \
-		$(use_with suid setuid-hacks) \
-		$(use_with systemd) \
-		$(use_with xinerama xinerama-ext) \
-		--with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-dpms-ext \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-proc-interrupts \
-		--with-randr-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		--with-xdbe-ext \
-		--with-xf86gamma-ext \
-		--with-xf86vmode-ext \
-		--with-xinput-ext \
-		--with-xshm-ext \
-		--without-gle \
-		--without-kerberos \
-		--without-motif \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-
-	dodoc README{,.hacking}
-
-	if use pam; then
-		fperms 755 /usr/bin/${PN}
-		pamd_mimic_system ${PN} auth
-	fi
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}
-
-pkg_postinst() {
-	optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
-	optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
index fe0306db9654..8c8130dd18d0 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
 #   SpecialElite.ttf -- Apache-2.0
 LICENSE="BSD fonts? ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama"
 REQUIRED_USE="
 	gdk-pixbuf? ( gtk )