gentoo resync : 15.06.2021

14 files changed, 673 insertions, 123 deletions

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index a6d6ecbd35a7..1ae3fcbf0abf 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,15 +1,19 @@
-AUX xscreensaver-5.05-interix.patch 1033 BLAKE2B 0267bae00b42dfb6ee8a5be2001c5fa2a66efddf43d2d0477d017196a99f64cf38a6430f2576bcefe6d3ffe4df487ba12e940d3122f51ab974d4d80e9fb3edc0 SHA512 61201dba2e4a1332db179f619452dedd67a6576f6002184d35109d25079c7a9b8a71267a0713c1c2d32a59c08867d2642edd9a1c22a39dd324b0be3fa3d13dd0
 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-gcc.patch 549 BLAKE2B 9e8b626fd7a9f3778c1bc62a3f161cd2d94b70769fc4adc06c64dd2c7515fbc5054257560326a7d15c124fa90e93b907bb5f3c5954bbe11c123540625b0f2e57 SHA512 d55908911b738e3fc5245627ca79f9c2880402921d38f80247e2143422543396399f5529fd70f4f473935d2606f10dbe3501d2e64af158b38fc03d995345ff10
 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-remove-libXxf86misc-dep.patch 1879 BLAKE2B fa3f562edf921dded7a1b3e9644d79d10a768baea64fbbed6301dba0fdaa1d575b85b2e8322eda251030a79835f7476020680a8b5a05354d279db8aa06943475 SHA512 6e55932f6be85042eb6f88a79d32b90fe51734b90f9e15aeebfefcdfe087af85b6cf5bed8c3c4212c1e8a91a77dda49eb6fbb64b829dcd02230710b803863a7d
-DIST xscreensaver-5.44.tar.gz 27001826 BLAKE2B 102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3 SHA512 9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae
+AUX xscreensaver-6.01-configure.ac-sandbox.patch 4010 BLAKE2B 8df5adba88e04594b18e12080be0624daccdfd6e101a762e6b3ce42f8fd8405c1c02f7beaf07405f979c959d79e804daade57cd1e087cc9adb4e96aca851ca4b SHA512 2c033fed2a48a8dae46a394624f4174ebfc33ed944ad568327823290b803a2d8812767654d7bec084bf861b731dc56840fe74286473d364ee580b48708e40549
+AUX xscreensaver-6.01-gentoo.patch 1303 BLAKE2B 8ae9f4e545eed146c08f34fe9c56a9e73721c6cbcc361792c1b3b1c529da409e6f75b8727049d83a34be40747e516ab4e86efaf15bd027651dcdbdd64fe25ef5 SHA512 60f0f841e77c42f8b8afe3c94c6ec86c72e80bc2fb771979b798e7bc8428cb1d903c72a6176f60a3c5b98e850f4bb82cec01bae87eddeb42e99ba8099a1223aa
+AUX xscreensaver-6.01-interix.patch 946 BLAKE2B e5a61a4de1373195747abb8f6e6580278bb9418bc17943422969f6571d4913f27347b088aa9404b11c14662de5b6144ef555521b1cb506b4ba8cde440aa63e78 SHA512 491e2861f2fb59b9c60f2321fd7e47f8cccaa8b2e69b5e9bb56ddb7893a6304983cefbed6ac6baf984f31ddf3b85e7354fc68ecac88058bfac79c9fac16deb44
+AUX xscreensaver-6.01-without-gl-makefile.patch 862 BLAKE2B 9762e84d535b4e913c0e4da6818605d8ff6fc0c9d184ff2cdc60969fab977b603bc18b16dfab7b1124948e814d230a50cd384bfabe785ad1e38e735a5e063d0c SHA512 8b445ca766d24b23904423c8d3a561a0558eca6d4b70b242d05df4949c371e455251be5a473b07fa837505550e00ea13c3154e2efda239468bf7a2a73a063c1f
 DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B 132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880 SHA512 1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14
-EBUILD xscreensaver-5.44-r4.ebuild 3809 BLAKE2B 92f6ea9bc641d75c47dab18a4e0339f68f8ae9c3f621efb306a874155b5aefdd7a08f09edcd4c047972ed982df6ca432647c934d9ae2baf3d488e1c678c9cbd6 SHA512 c076b5263170f3ce709971a1a65468a475d9b5d511c28e41ec47c7b3fe8cec179cc4c0ed8f78a132ade7e23afcd08d685220adf78a3abc2321e4209f0de5a9c0
-EBUILD xscreensaver-5.45.ebuild 4091 BLAKE2B 3d6281d6a5b320a10d2496e009a6742b07938c04555754203f42ae7366aa759132c723078df5739542a8111b2a85a6d3de2ef2bbdacca263ab37f219f7689229 SHA512 b3e2d732f8cae62065f13a54f76eee810ac09efa90a334e4d291747b447588b7c47e6bb1a7041df1dbd59496945e35bc3069c88d5d99c3f97e54a5acdbc03dfa
-MISC metadata.xml 789 BLAKE2B 9f4d6ec06c763d685b8c6006747fd6482ae5199c4eeeac8ba1bc13f34eaeb8d1dfd67ee0762edd0d4d0199759b26bddd077c07bafa7373f4e6c4069c893757ed SHA512 5f839da92e2f2564d22a93d14ae62b0fecb70be706b89ba2829196859cebd11cfe2d4745e34a33a767d5efe92135fc0fc9686c175dc2774278a3dc944ffa515a
+DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
+EBUILD xscreensaver-5.45-r1.ebuild 4131 BLAKE2B 0fa4330d7c2acb39688420e83f3abdf6069186cd99053c868536177f4d0c58a725dfdf0f7b08d067c6946334103c07908b87e1c392f58a1a4ee8812d721cc4bf SHA512 3234a48dbd91cfac9cc4cee61ec7dafe64cc20a8256922466cf79772f3c54a516bd8b6933ca4dc66c75b1cb04bf1391beb3d22a1ea454d889b490fc7507120aa
+EBUILD xscreensaver-5.45-r2.ebuild 4124 BLAKE2B 26fc34c31d5554b0b4e7d70f8808f3718ed35fdf033d707f72e8ece210f0455d224727c3b6de81254d87755e18a1e3c1958b246abfd0d0893c18bdacd0680606 SHA512 bbb6e4157485bee126775f8f72b0fe54f88da06dadbefd33d2591754b5814e1a9a2addecd7f52448ff4478fa03c4b9d61007e9b25a75cff35d11e790d95ea445
+EBUILD xscreensaver-5.45-r3.ebuild 4229 BLAKE2B 48001622291dac1d5fb4016a8edcf35f0e88042f810d939c558b1cc0e5fd50bac6a975b5be353101322b802326bf02f63f7052775b09d5ba1dbce97759e36a9a SHA512 7c95bb90ecca5a45d53d471bddbd9f1256d97ce767b4a7c8969e4e878da880dd6f25cb2cf71900fcc17f50e4d2b44386b082fe66182cca5db70a3c32cce719f2
+EBUILD xscreensaver-6.01.ebuild 5058 BLAKE2B 370ccbde16ad859690b1482539809c27c922568b52a87e81e71e048a6a25018cc6ea6912800602edf545a18dd9daa45f333de6dc8f3cd540236298f1ab0dc892 SHA512 8e90f353d68ea66667f6e319279e2b53659a129da37b2f181344a5ef0e5a5b1e4f16fc45806b1a052a31ae543529307b05df4835b117d4c78855db1697eaf50b
+MISC metadata.xml 887 BLAKE2B c24cdade56b44dad279fd6353c3e42f5c9992d2328a3aa29e003eee4d4051fc2505b35c01031041cc87cd033a93796e05aec9bf9379329f5c1a315b2702d295c SHA512 5b62ff9b4fae658f906a040ccea03f9df0fca1b5b6b5a5c5a47c7649de814f0ec443c81baa80d7d089b295ffb9bf15665ff47374e2be166d02fbbee57dba55b1
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch b/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch
deleted file mode 100644
index 2a5eead4879f..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ru xscreensaver-5.05.orig/driver/prefs.c xscreensaver-5.05/driver/prefs.c
---- xscreensaver-5.05.orig/driver/prefs.c	2006-05-24 00:03:47 +0200
-+++ xscreensaver-5.05/driver/prefs.c	2008-03-11 09:20:58 +0100
-@@ -951,9 +951,12 @@
- 	{
- 	  p->init_file_date = write_date;
- 
-+/* Interix has no sync() or alike. */
-+#ifndef __INTERIX
- 	  /* Since the .xscreensaver file is used for IPC, let's try and make
- 	     sure that the bits actually land on the disk right away. */
- 	  sync ();
-+#endif
- 
-           status = 0;    /* wrote and renamed successfully! */
- 	}
-diff -ru xscreensaver-5.05.orig/driver/setuid.c xscreensaver-5.05/driver/setuid.c
---- xscreensaver-5.05.orig/driver/setuid.c	2006-02-09 03:33:29 +0100
-+++ xscreensaver-5.05/driver/setuid.c	2008-03-11 09:22:59 +0100
-@@ -136,9 +136,12 @@
-   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.44-gcc.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch
deleted file mode 100644
index 16493e1fd1dc..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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/files/xscreensaver-5.45-cve-2021-34557.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-cve-2021-34557.patch
new file mode 100644
index 000000000000..3d002b40877a
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.45-cve-2021-34557.patch
@@ -0,0 +1,40 @@
+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-6.01-configure.ac-sandbox.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-configure.ac-sandbox.patch
new file mode 100644
index 000000000000..fe56f927e208
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-configure.ac-sandbox.patch
@@ -0,0 +1,120 @@
+From 0f4d029102c651ccbc69860bf222126d2c58e36e Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 13 Jun 2021 23:41:42 +0200
+Subject: [PATCH] configure.ac: Stop asking rpm and dpkg things, we're on
+ Gentoo
+
+---
+ configure.ac | 96 ----------------------------------------------------
+ 1 file changed, 96 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9b8641e..2eaea28 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4833,102 +4833,6 @@ for bad_choice in xscreensaver xscreensaver-settings xscreensaver-command ; do
+ done
+ 
+ 
+-# Warn if there's a previous RPM package installed.
+-
+-rpm_vers=
+-if test -z "$RPM_PACKAGE_VERSION" ; then
+-  # Don't bother with this test if we are currently *building* an RPM.
+-  rpmnames="xscreensaver xscreensaver-base xscreensaver-extras
+-            xscreensaver-data xscreensaver-data-extra"
+-
+-  # M4 sucks!!
+-  changequote(X,Y)
+-  pkg_vers=`(rpm -qv $rpmnames) 2>&- | \
+-        sed -n 's/^[-a-z]*-\([0-9][0-9]*[.].*\)/\1/p' | head -1`
+-  rpm_vers="$pkg_vers"
+-  changequote([,])
+-fi
+-
+-if test \! -z "$rpm_vers" ; then
+-
+-  # M4 sucks!!
+-  changequote(A,B)
+-  pkg_bindir=`rpm  -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-settings$@\1@p'`
+-  pkg_bindir2=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'`
+-  pkg_hackdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares$@\1@p'`
+-  pkg_confdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
+-  pkg_fontdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\).*\.ttf$@\1@p' | head -1`
+-  pkg_addir=`rpm   -ql $rpmnames | sed -n 's@^\(.*/\)XScreenSaver$@\1@p'`
+-
+-  if test -z "$pkg_bindir" ; then pkg_bindir="$pkg_bindir2" ; fi
+-  changequote([,])
+-fi
+-
+-
+-# Warn if there's a previous Debian package installed.
+-#
+-deb_vers=
+-if test -z "$pkg_vers" ; then
+-  debnames="xscreensaver xscreensaver-data xscreensaver-data-extra"
+-  pkg_vers=''
+-  for dpkg in $debnames ; do
+-    if test -z "$pkg_vers"; then
+-      pkg_vers=`dpkg -s $dpkg 2>/dev/null | sed -n 's/^Version: \(.*\)$/\1/p'`
+-      deb_vers="$pkg_vers"
+-    fi
+-  done
+-fi
+-
+-if test \! -z "$deb_vers" ; then
+-
+-  # M4 sucks!!
+-  changequote(A,B)
+-  pkg_bindir=`dpkg  -L $debnames 2>&- | sed -n 's@^\(.*/\)xscreensaver-settings$@\1@p'`
+-  pkg_bindir2=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'`
+-  pkg_hackdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares$@\1@p'`
+-  pkg_confdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
+-  pkg_fontdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\).*\.ttf$@\1@p' | head -1`
+-  pkg_addir=`dpkg   -L $debnames 2>&- | sed -n 's@^\(.*/\)XScreenSaver[^/]*$@\1@p'`
+-  changequote([,])
+-
+-  if test -z "$pkg_bindir" ; then pkg_bindir="$pkg_bindir2" ; fi
+-fi
+-
+-bindir_err=
+-hackdir_err=
+-confdir_err=
+-fontdir_err=
+-addir_err=
+-if ! test -z "$pkg_vers" ; then
+-
+-  err=" (DIFFERS)"
+-
+-  if test -z "$pkg_bindir"  ; then pkg_bindir='???'
+-  elif test "$pkg_bindir"  != "${bindir}/"        ; then bindir_err="$err" ; fi
+-
+-  if test -z "$pkg_hackdir" ; then pkg_hackdir='???'
+-  elif test "$pkg_hackdir" != "${HACKDIR}/"       ; then hackdir_err="$err"; fi
+-
+-  if test -z "$pkg_confdir" ; then pkg_confdir='???'
+-  elif test "$pkg_confdir" != "${HACK_CONF_DIR}/" ; then confdir_err="$err"; fi
+-
+-  if test -z "$pkg_fontdir" ; then pkg_fontdir='none'
+-  elif test "$pkg_fontdir/" != "${FONT_DIR}"      ; then fontdir_err="$err"; fi
+-
+-  if test -z "$pkg_addir"   ; then pkg_addir='???'
+-  elif test "$pkg_addir"   != "${APPDEFAULTS}/"   ; then addir_err="$err"  ; fi
+-
+-  warning=no
+-  warnL "There is already an installed package of xscreensaver"
+-  warn2 "version \"$pkg_vers\", in these directories:"
+-  echo ""
+-  warn2 "User programs: $pkg_bindir$bindir_err"
+-  warn2 "Screen savers: $pkg_hackdir$hackdir_err"
+-  warn2 "Configuration: $pkg_confdir$confdir_err"
+-  warn2 "Extra fonts:   $pkg_fontdir$fontdir_err"
+-  warn2 "App Defaults:  $pkg_addir$addir_err"
+-fi
+-
+ echo ""
+ echo "$warnsep"
+ echo ""
+-- 
+2.31.1
+
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-gentoo.patch
new file mode 100644
index 000000000000..41f8d7b7d089
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-gentoo.patch
@@ -0,0 +1,47 @@
+--- 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
+ *fade:			True
+ *unfade:		True
+@@ -62,7 +62,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
+ 
+ ! This is what the "Settings" button on the splash screen runs.
+ *demoCommand: xscreensaver-settings
+@@ -103,7 +103,8 @@
+ 
+ 
+ ! The strftime(3) format string for printing the time on the password dialog.
+-*dateFormat:		%I:%M %p, %a %b %e
++!*dateFormat:		%I:%M %p, %a %b %e
++*dateFormat:		%x %X
+ ! DD MMM:
+ ! *dateFormat:		%I:%M %p, %e %b (%a)
+ ! 12 hour time only:
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch
new file mode 100644
index 000000000000..72aa6535f139
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch
@@ -0,0 +1,30 @@
+diff -Nru a/driver/prefsw.c b/driver/prefsw.c
+--- a/driver/prefsw.c	2021-02-19 02:52:32.000000000 +0100
++++ b/driver/prefsw.c	2021-05-07 15:20:09.280321274 +0200
+@@ -798,7 +798,10 @@
+ 	     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 -Nru a/driver/setuid.c b/driver/setuid.c
+--- a/driver/setuid.c	2021-02-05 16:16:23.000000000 +0100
++++ b/driver/setuid.c	2021-05-07 15:21:05.987949943 +0200
+@@ -104,9 +104,12 @@
+   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-6.01-without-gl-makefile.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch
new file mode 100644
index 000000000000..c98d5297e9b0
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch
@@ -0,0 +1,28 @@
+From fa531a3ff2dd8aa4e0b6767e3390f88bfbaca791 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 14 Jun 2021 12:11:32 +0200
+Subject: [PATCH] hacks/glx/Makefile.in: Fix target install-program for
+ --without-gl
+
+Symptom was:
+/usr/bin/install: cannot stat 'sonar': No such file or directory
+---
+ hacks/glx/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
+index ed07a1f..6ae969c 100644
+--- a/hacks/glx/Makefile.in
++++ b/hacks/glx/Makefile.in
+@@ -320,7 +320,7 @@ install-program:: $(EXES)
+ 		  $(INSTALL_PROGRAM) $$program $$idir/$$program ;	\
+ 	   done ;							\
+ 									\
+-	   exes="$(SUID_EXES)" ;					\
++	   exes="@SUID_EXES@" ;						\
+ 	   if [ @SETUID_HACKS@ = yes ]; then				\
+ 	     sinst="$(INSTALL_SETUID)" ;				\
+ 	   else								\
+-- 
+2.31.1
+
diff --git a/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch b/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch
deleted file mode 100644
index 79ffcd7098cf..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-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.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/metadata.xml b/x11-misc/xscreensaver/metadata.xml
index 8893ad3c39cb..31e771cd6ac0 100644
--- a/x11-misc/xscreensaver/metadata.xml
+++ b/x11-misc/xscreensaver/metadata.xml
@@ -9,6 +9,7 @@
 		</maintainer>
 	</upstream>
 	<use>
+		<flag name="fonts">Install the fonts shipped with XScreenSaver that have clear licensing</flag>
 		<flag name="gdk-pixbuf">Include support for the <pkg>x11-libs/gdk-pixbuf</pkg> library in some demos, which will make it possible for them to read GIF, JPEG, and PNG files as well</flag>
 		<flag name="gdm">Use gdmflexiserver from <pkg>gnome-base/gdm</pkg> instead of <pkg>x11-misc/lightdm</pkg></flag>
 		<flag name="locking">Compile in support for locking the display</flag>
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
index 593985b9f95e..661463a8b2b8 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
@@ -2,13 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools desktop eutils flag-o-matic multilib optfeature pam
+inherit autotools flag-o-matic l10n multilib optfeature pam
 
-DESCRIPTION="A modular screen saver and locker for the X Window System"
+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
-"
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -77,6 +75,7 @@ PATCHES=(
 	"${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() {
diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild
index 46e166226f08..22af82cbaec2 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild
@@ -2,24 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools desktop eutils flag-o-matic multilib pam
+inherit autotools flag-o-matic l10n multilib optfeature pam
 
-DESCRIPTION="A modular screen saver and locker for the X Window System"
+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
-"
+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 xinerama"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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
 	x11-apps/appres
@@ -48,11 +45,13 @@ COMMON_DEPEND="
 		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}
+	media-gfx/fbida
 	perl? (
 		dev-lang/perl
 		dev-perl/libwww-perl
@@ -69,23 +68,25 @@ DEPEND="
 	x11-base/xorg-proto
 "
 PATCHES=(
-	"${FILESDIR}"/${PN}-remove-libXxf86misc-dep.patch
-	"${FILESDIR}"/${PN}-5.05-interix.patch
+	"${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.44-gcc.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.in -e '/^ALL_LINGUAS=/d' || die
+	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{,.in} || die
+			configure{,.ac} || die
 	fi
 
 	default
@@ -127,14 +128,15 @@ src_configure() {
 		$(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-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
 		--with-xdbe-ext \
 		--with-xf86gamma-ext \
 		--with-xf86vmode-ext \
@@ -159,3 +161,8 @@ src_install() {
 
 	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-5.45-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild
new file mode 100644
index 000000000000..584b0e0ec509
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic l10n multilib optfeature pam
+
+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 ~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="
+	dev-libs/libxml2
+	media-libs/netpbm
+	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}
+	media-gfx/fbida
+	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 || die
+		sed -i \
+			's| Stay.*fucking mask\.$||' \
+			hacks/glx/covid19.man \
+			hacks/config/covid19.xml || die
+	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.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
new file mode 100644
index 000000000000..a3c8734ec8ef
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic font multilib optfeature pam
+
+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"
+
+# Font license mapping for folder ./hacks/fonts/ as following:
+#   clacon.ttf       -- MIT
+#   gallant12x22.ttf -- unclear, hence dropped
+#   luximr.ttf       -- bh-luxi (package media-fonts/font-bh-ttf)
+#   OCRAStd.otf      -- unclear, hence dropped
+#   SpecialElite.ttf -- Apache-2.0
+LICENSE="BSD fonts? ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama"
+REQUIRED_USE="
+	gdk-pixbuf? ( gtk )
+	elogind? ( !systemd )
+"
+
+COMMON_DEPEND="
+	dev-libs/libxml2
+	media-libs/netpbm
+	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
+	elogind? ( sys-auth/elogind )
+	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}
+	media-gfx/fbida
+	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}-6.01-interix.patch
+	"${FILESDIR}"/${PN}-5.31-pragma.patch
+	"${FILESDIR}"/${PN}-6.01-gentoo.patch
+	"${FILESDIR}"/${PN}-5.45-gcc.patch
+	"${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
+	"${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
+)
+
+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
+
+	# We are patching driver/XScreenSaver.ad.in, so let's delete the
+	# header generated from it so that it gets back in sync during build:
+	rm driver/XScreenSaver_ad.h || die
+
+	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 || die
+		sed -i \
+			's| Stay.*fucking mask\.$||' \
+			hacks/glx/covid19.man \
+			hacks/config/covid19.xml || die
+	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
+
+	econf \
+		$(use_enable locking) \
+		$(use_with elogind) \
+		$(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
+
+	if use fonts; then
+		# Do not install fonts with unclear licensing
+		rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die
+
+		# Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf)
+		rm -v "${ED}${FONTDIR}"/luximr.ttf || die
+
+		font_xfont_config
+	else
+		rm -v "${ED}${FONTDIR}"/*.{ttf,otf} || die
+	fi
+
+	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() {
+	use fonts && font_pkg_postinst
+
+	optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
+	optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
+	optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf
+}
+
+pkg_postrm() {
+	use fonts && font_pkg_postrm
+}