gentoo auto-resync : 06:05:2024 - 00:00:51

12 files changed, 87 insertions, 561 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index d963c74cdb6f..6cde05257471 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 3c8ed69e1769..2205419ae46e 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -2,6 +2,6 @@ AUX dmenu-5.2-gentoo.patch 972 BLAKE2B 1fbb21554a33fe2d69ce51190371e23d790995635
 DIST dmenu-5.2.tar.gz 16196 BLAKE2B f827f0d0d935f9da8103dbb73ed8b67818f1213d2f8e5a406de5e8c9496ea0479b4ccb50d3a29004abc1e4e679cac177163c02458ed144d323bb50fc120f936d SHA512 7be9bb76b11225ec86a30e643e9b884f6d13af581526085212cb7401383d448a72fe4dffc3ce84ffb8319dbf36ca8384597a89070cd27d39d5618f239a2da6e3
 DIST dmenu-5.3.tar.gz 16274 BLAKE2B fd76b0b11a153f98dd58ec888820bc8a0ebc67f814cdf2d13a35ea3addcc3ad423bb9b2f4f73897cf6293e61a507900e7b7fec65e4f0acd15cc8e425f5506faa SHA512 60f758134063ad7f304fbb0785c66dddc21461e5e5014f8735cf6d5c95dc22a177f069d48101e633ddffe5bbefc1118a2bf8b31daaf7b6438fdf6fe1bcb5d61c
 EBUILD dmenu-5.2.ebuild 1436 BLAKE2B 2feb44229d9a9cc66d6e34d198d59c6eb930142e952f82a75f4655900a80b51ff9592b3276517d711534ac17081548e0dcd5b6a52c388e56b72c3e96e3df9351 SHA512 fcdeb4e045bd4ef6089f152f2a30afffc97bb2c377eb4a126e9fd05cea65d5251d0c8ffb79f03808c0c74330f65b48da2fa651cd8a4239e24af2e62ef01d4ec0
-EBUILD dmenu-5.3.ebuild 1441 BLAKE2B 70ca99eb1effc55806eb43c288bafc1619664989f71fd5a9539971ecf9b36f8bdd1ef1fddee3b3f360f14f8699fbf66d1b5c6ff975cb5d6aec9d7b5eeef8e21c SHA512 9bbaa14759ab94e15ab008a294db2aebbea43c4a9f4f72182c0e4d467c676ad52c6981da48cdf60636ea4e20a30c99ebf0a5e9aaadfd438009d90eefa85ff6d0
+EBUILD dmenu-5.3.ebuild 1436 BLAKE2B 7997adae7bd91f08566f4b7cd380eedd9e2713f44820a34d8e73b6b79fd694026d49cf3e31292b454b785ea028bccba09838423ad29cbd76ac2a39effa39b8fc SHA512 51c3cf3630d60f4d7edbf033d34524c77ed9fa101526c31e8ea31dae8316a6bcabc3f19ad5f1a780242bb1e3ce32e3402922327dbd4674a3b607e0a69d581a0b
 EBUILD dmenu-9999.ebuild 1384 BLAKE2B 7f4260a2dc5fe2e64c0c63666b113265e892b7885ad13c3645366ccd188e636d91d03a5b48b4879b0a89f7100164219257fdd2cd95ab2f318a2d05ebfd2116ff SHA512 1caf8ded14335d3580f9e921a13a177c9e495544e80f93c4eac651b3d309b8dc45a8c499422de3218819f39ae682e1679ffe61de0fd28e6b70d4f505fd70ed5a
 MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/x11-misc/dmenu/dmenu-5.3.ebuild b/x11-misc/dmenu/dmenu-5.3.ebuild
index 7d41a6f1d7f5..ba847486ffc0 100644
--- a/x11-misc/dmenu/dmenu-5.3.ebuild
+++ b/x11-misc/dmenu/dmenu-5.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86"
 IUSE="xinerama"
 
 RDEPEND="
diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest
index 87ab7c599174..a41f22d034a3 100644
--- a/x11-misc/menulibre/Manifest
+++ b/x11-misc/menulibre/Manifest
@@ -1,3 +1,5 @@
 DIST menulibre-2.2.3.tar.gz 488117 BLAKE2B 2bb157f6f8fb1af8c5059bfa2f93dbf99eb3a0cf9b3072cae28284d50c6a7d847da7a7dc5905ff59386f7d69029f7ffd7c39cb9137e029355fea2f52741283c6 SHA512 bd554606ad35cdd41272ed656427ae3f610d6aacfc9e91e4de6ed342034e1bb6070812017a1372d04b0df4008ae1cd7207ca243142a874b6abb0a00893740da3
+DIST menulibre-2.4.0.tar.gz 520920 BLAKE2B c55dbb077db2af477dc9c1882449981ff15cb66b9c12ea4433ed11a1649f9dedfa8c743ca15f54b5cfd9993c8d8ae3398fd0c87c4b5e3199f5e291029f9c81af SHA512 0c520d9cab6d9eccaa9119c4ff771dbef913909202b3f2d600f4b71f5b2db87c71df35c6d8374099fda07b33b6c02686bd6b53ca0fa3d4dbd439b3c5cdcb2839
 EBUILD menulibre-2.2.3.ebuild 1315 BLAKE2B c1e297299c8db6f4e0ac1b980ee02df86ce3d0b2eec5231ce7a653b6967b21ed2786cfa9af15d9c9fb8aa567381e9f3562b21fa2fbc896b6e164918589c364b0 SHA512 996edfa5b0527df130cda9cbc1cd97e672aca8aeb3072c98069d967fc7471c096890ab50402ca054cfcc0974e14fc79969a897837062d3751bc98466fe5b5100
+EBUILD menulibre-2.4.0.ebuild 1324 BLAKE2B fac175e311090d92bef4c8bcd33904fac255d841a5995ec738271f35c3886e3623ad37b4260a8306235731c7f228334408d43cfa7f6156ddd67132515ef709f6 SHA512 5fe3cc9c000f8f11abaee8075527c24e3284b705b0ed5b8d23a7d51a9ba302117ee2b13355d5246e5af734c398088b0228413c3accc8773498e161ab23964cd9
 MISC metadata.xml 276 BLAKE2B 5ae33ec24b361408186426738ecfc12a6a3ae761e023050d59a02b6bdf5f4dd788ac33ef6c9ff0c0c27e415fb369aa3cf8118bdc6268d95c3a33e75a5341140e SHA512 f186b9f746afb87c00b913f67250ed8a6f9563df447b2caab6717b212c7a8e09ae78b7dcce76bf4acdff238ff12d1faf3b997991a38ba34beae17f734b37b060
diff --git a/x11-misc/menulibre/menulibre-2.4.0.ebuild b/x11-misc/menulibre/menulibre-2.4.0.ebuild
new file mode 100644
index 000000000000..b3658ab5b65b
--- /dev/null
+++ b/x11-misc/menulibre/menulibre-2.4.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="xml(+)"
+inherit distutils-r1 xdg
+
+DESCRIPTION="Advanced freedesktop.org compliant menu editor"
+HOMEPAGE="https://bluesabre.org/projects/menulibre"
+SRC_URI="https://github.com/bluesabre/menulibre/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	gnome-base/gnome-menus:3[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-themes/hicolor-icon-theme
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+	')
+	dev-util/intltool
+"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# show desktop entry in all DEs
+	sed -i '/^OnlyShowIn/d' menulibre.desktop.in || die
+
+	# workaround incorrect behavior when LINGUAS is set to an empty string
+	# https://bugs.launchpad.net/python-distutils-extra/+bug/1133594
+	! [[ -v LINGUAS && -z ${LINGUAS} ]] || rm po/*.po || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/share/doc/${PN} || die
+}
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index d5d97e7e1802..ffb4c72ee39c 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,5 +1,4 @@
 AUX xscreensaver-5.31-pragma.patch 442 BLAKE2B 375199197c7e3eaf5028099f0fc8b754b7e5dca4911a76de46372751c82a060ae9c0ee5ed35d1efb33f02d6ffbfbd5903ba5f823e1db5ba9d2762a8841cefacf SHA512 9aecda422bc0f22bab5eb0de22f1c861b9ed1a2ff4fff2327bec134fafc5e3116156d80a70e81b67e9ce7ce05eb6f842614b2e939cb91a618dd0b10e1d443557
-AUX xscreensaver-5.45-gcc.patch 549 BLAKE2B c762b7792d2e597893b7156e1b12e52a03c84a40344b408d3261b60a9b6f4357070644ae5c2d6cf1f4f93229cbf5e66d0f893d71e5c6baa13d77b96d17d09d33 SHA512 6549885e1bf7515845c1e2f47ec211e2c948b22531e14a5cab0cf700863450d6bfff8b1cd385a8a083771c73591a5f65fbd9f1b4d0280cb08edeea31236aeca6
 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
@@ -7,7 +6,6 @@ AUX xscreensaver-6.01-non-gtk-install.patch 1780 BLAKE2B 38d2a71fb9d35d1694fac4d
 AUX xscreensaver-6.01-without-gl-makefile.patch 862 BLAKE2B 9762e84d535b4e913c0e4da6818605d8ff6fc0c9d184ff2cdc60969fab977b603bc18b16dfab7b1124948e814d230a50cd384bfabe785ad1e38e735a5e063d0c SHA512 8b445ca766d24b23904423c8d3a561a0558eca6d4b70b242d05df4949c371e455251be5a473b07fa837505550e00ea13c3154e2efda239468bf7a2a73a063c1f
 AUX xscreensaver-6.03-without-gl-configure.patch 541 BLAKE2B 42818f7ad82513cde5317c1c41c6d54a60a4abe14c98bfa3350b9b5be38141ab7b6c569eb03527ebdab577c87cbe91e1c7197b4bf49613e2a0a94f31420a018c SHA512 bd1b57143eb0a923b41c0d513649735700edd884d39bcb3f00f886d62c2bf94c1349327797008f5698cb8b44952b7517f218d03a12a7e6128c2790005752fd88
 AUX xscreensaver-6.05-configure-exit-codes.patch 1179 BLAKE2B 7ed0bd31730bdf35278e5dc26ce9c96db6b56a094b246ce2ac0a5172a390033f00de2b8e6b25fcb0ea75131151ed19d26a7c8e2da275f1a337f15eda4ee402b3 SHA512 2db1841f485a4933837fc66d275b3516218a7c0757aad4f28cf38016aca2d4fd88138d3f94f86fb6fa42a487d10e7458760562a02fe8d2e5c534e2171cb9ca85
-AUX xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch 891 BLAKE2B cbf7d70ced4992ca0090ff99436f817a98e255374c33f8596b7a39862a1b95c6b0740f8e91cb3ee41e904562b309a7f5c625f8ba3fddb9015d7642ff82aeff9c SHA512 9dd0156d7a13136c1959b82cf58b95c3a13583c770e24b44bca7e62104fedd1a25a46507bf804940e90ee2082013331a74fc0158f6ae6a5e36b7b280fd5d089d
 AUX xscreensaver-6.05-r2-configure-exit-codes.patch 1649 BLAKE2B 3846edb722f7b59d349d89608ca446971ec59d4179c461a28e9bb9cffd8c956c560993502d83564db49ca234cad7ce0a8dd978beae8016f07128e60db2c03746 SHA512 12e122672fbe6ee7058fb031300978a48501f21e69ad9bcd8fe745ce29f870d94524900dbc82bf8ba30f2989e1c6b8d380649ac26744b92536f1697e81fd4d90
 AUX xscreensaver-6.05-remove-update-icon-cache.patch 368 BLAKE2B a595875f69e339a52f415e664be0524929c1b64ddfa8c80bb797379c08df0ef9860e6a5f3047d069084542eb81aff40470dfcf1db3dcb7e3515a0b986495a926 SHA512 7b797ae8b0cb8ec437f968e575bb3d9fdeab6bdf1f289302c1dabffad7276d4e73c8f03f10a4d8f8a0bedd223269e03c661187ea7c018f42cd11594454350d1d
 AUX xscreensaver-6.05-teach-handsy-some-manners.patch 1820 BLAKE2B c94dbe895479b301d4bc57cf4a830b604c6b51fdf512656536c04a234e7be8f77c78ff4f91bec603ce70036b294c18d736c3b0ad9d3a14b49a627e5d1ccd6dd5 SHA512 06cbe07674a6902ca1467a72bf06f677693da0a030ecca7b880949406cfbf946ee42f5bb9daeefe4869cdad850d28b749e798b66ea890daf8c6f35c90eab9688
@@ -16,15 +14,11 @@ AUX xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch 654 BLAKE2
 AUX xscreensaver-6.07-allow-no-pam.patch 646 BLAKE2B dc73fbc96ff644e7604ef6abe89ee7bd4b965ebb6adb0d16694e519ef51ab453670f21773ae7359fb278f39dd1c52ea3bb09b74ab4410a81815fe6a1f6e2d56c SHA512 66206825f17795820e8bee9c96c059ab7f09b80c2e15b780d5815628302e95083d5d12acc85affdeba3d794013952782fa89cd72b6f0419a232c772482a290af
 AUX xscreensaver-6.07-fix-desktop-files.patch 1399 BLAKE2B 20af65a4aef251ddd93e519486d6c85a1be1d93bbd42f32a117098e872fbe067356d36caed2ed6dc158742e85ff9d20d492080839fe43722f5d7d8b999f74247 SHA512 0091e8b56b37609b86648b638ce7cf91a8166072fb00cb5e267be5dd694ed3acd44f1df13bec73bab458229ae20ede249615b22708b405475b2a99031d3c16ae
 AUX xscreensaver-6.07-gcc.patch 814 BLAKE2B aa313e5bf454cdd750cf37a1792057f7cb39667fab94ed04f319c17b28896fe42532cd9c10c53659c82993cee3ec62aa6b8aec7f8cdcdccde3eb7ab8bcdd54d0 SHA512 af0d4edaec1cc00feb78a1aa3522b0daec7f5df4ead084ef49e66ea67d0b04f54933ed4240879bb278b44f586016a529dc93b3575caaa79dfe20fc2a869ab96c
-DIST xscreensaver-6.05.1.tar.gz 26110057 BLAKE2B 97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3 SHA512 c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3
 DIST xscreensaver-6.06-logind-idle-hint.patch 4036 BLAKE2B 48c2766ff5879b77f521d17f08452c84a9c926fabba932a02d02615808f6f2503ed2be4bbfd71f21152ba833c7f4cc0d672cdc219b82729963d6d357c6198682 SHA512 fd9848843c43a5eb07007e5cca21ad1517cce1e3ebecd9d678bb6287b9b7f80eee0751b5789f2ed9fb5e0cefa2430ac9d9657aade724d70c6457cce3df1f6ea3
-DIST xscreensaver-6.06.tar.gz 26334374 BLAKE2B f15a439430bbca0852926c15716d3c4b22148d8c36d60b18ab033454d4df0d981400029b32e1f30a061592273deb648453db91813994b9bc4d6c66a61774a5d1 SHA512 988e30d422ef985ac348c275e098ddfe1ee034a2e916c91690ee2836c908801c1e017e22d828aca981b0f8bfc5491cd83ab7c45aabc155ba5013df8b149cbcb5
 DIST xscreensaver-6.07-xscreensaver.service-start-with-no-splash.patch 834 BLAKE2B 57c509e370ba79c4197a2a51188e09c2a48cc172f889c8876c0fb1af995b87465ddc390b3e704cb572c29c1537f3d05b065365d6357c51047c910124b7c8f6c4 SHA512 6e7dcfbe0e687719f3f5579790a48544bb8728231cd7ac1c8b82f5814da0be1e67f2308de7f0354a2ba20ac098c2d5ae8c212b9a3a7b84177bc4bb10739378c3
 DIST xscreensaver-6.07.tar.gz 26365057 BLAKE2B b0fc24e34713dd5591cff2ff871ec05deae089d7d76fe1239dd59ec1addf97eb764a583d01685953ae6409a7193ca97bc201a20dcf86d5244cf898e4eb9b1221 SHA512 abbf75faa49bb23d35985a7bf269891d168c87fe8939ad5acf6857398dfb056815d79dcf39bba9a33808e2717a47635fa84282c03ed9efeeeb449763253179a5
 DIST xscreensaver-6.08.tar.gz 19990058 BLAKE2B 1dd13a656471335663738e677dd1b367ab1114ba91e65868ad2a1d8ebe95b16ff0311c2b69a2a5409ebdea68451d5e6cb507a66a5fb641921a469b8e69ec6b2d SHA512 a333d4921ed3a8219f3b672dd68543aea31fcd64ea6766143f1c7f6e5ed3bc7122355635d5afba1632457ad71a11cabdc7b2756431e4f1dc7e0426ae0896e6db
-EBUILD xscreensaver-6.05-r1.ebuild 6656 BLAKE2B f81ee77f5656a4db4abccf8e1c97fca9d463700377199e313102a81a9645e7610c7a27d939e53b4c7ce43d69128ecbd6fb2eca4a7ed110d197d04a0c57c180ed SHA512 6dd5901f8792adb803b93bbed8454d2e7533e46acee8e10003abbbf0713de86af3aa19093691f453134cfc87c19bdbb3da4ab0c3ed1df129bc34c5015e48d3d8
-EBUILD xscreensaver-6.05-r2.ebuild 6751 BLAKE2B 72da19435cca28ef576524b45c737bf4fb311fcdc42130e6ef18fe7d7571402bd78dcad51ef803176a9e97deefef16cc7c282db9995484b7874a42e7625ef518 SHA512 fc67c7d6b72c7266973e0ba484a81fee6c668a59e4271268b241057e42fec5606d9a70c14355e173867a2e2da3ee53bd5ea1929e332d001f948eb6a91e572de7
-EBUILD xscreensaver-6.06-r2.ebuild 7388 BLAKE2B f264fcd5ccf0af06249beed6b65dbb8ac53dd6e49237e7a000eceed4cf250af8431153d5ae86a16565644cc400355f5bed4f1b2c0d9852c10a9bb4a477a2c76d SHA512 d72a5e50e24a10b34f47b3f7eb9c590d62697b157e53c3e1490e5fcc2d5b32bc77a2f8597dfc14480dde5754dbdc66fba056fa1a53f3d049c4a40b13c526b34f
 EBUILD xscreensaver-6.07-r2.ebuild 7836 BLAKE2B cfeafc8c992ca5780a8443378a58763befe65f30f22dd44d7798545c0279ed400917e1e2c1fe6f01743cf26d183934344d5ccb2d4f80eebf514dff7c67fb06c7 SHA512 30de98243305f0b991bf4fa71b897992b2872e2dbe9358f11d1942357c08227f53fb1c00b1125cc258ed77107762d9af98ad60b05a20c4a8e629b2091334fea2
+EBUILD xscreensaver-6.08-r1.ebuild 7772 BLAKE2B cef3a580d6e15d5d6abb99f5e767662cd115c0f8d2cf8f94d87f10aa6dff6eb6110e958eb10f7a38e4f023a4ab61a88286d7fef4208134f0c9c3f63b9aef98fd SHA512 d7098cbcb8b981767b70db38cc5504025a0cf4d0d8c319a2604fe27218f57a2d53e897d78bcb9f182e4b20232c51427329fb1da4185e8e9c0ae0ead8fd70257b
 EBUILD xscreensaver-6.08.ebuild 7836 BLAKE2B cfeafc8c992ca5780a8443378a58763befe65f30f22dd44d7798545c0279ed400917e1e2c1fe6f01743cf26d183934344d5ccb2d4f80eebf514dff7c67fb06c7 SHA512 30de98243305f0b991bf4fa71b897992b2872e2dbe9358f11d1942357c08227f53fb1c00b1125cc258ed77107762d9af98ad60b05a20c4a8e629b2091334fea2
-MISC metadata.xml 1451 BLAKE2B 052182f01632e8179ad1d6fe358a823384284776cc90eaa6413b809744783b31f7d8fc8ddefa03e66a691ad11aab967db3fb400290f813cb7eff2dab149f45cb SHA512 d4abaebc08315a90d2c68baf08b307989d4fc8efc4606b151ae3d94311c64ebe13253f572845cc5a8e1e30d1bbccf3d0b16c74376d5ff61de1f1ecb1030099a8
+MISC metadata.xml 1262 BLAKE2B 3800cee01a975dc0d79d1576fbe11910ac6233eda87b285aaa612c030786ea06697383e82d88707dbcb4d26b54a7df018ffb905351dd3d9bd81eb991abbc1774 SHA512 4e7c2ee2c57e76f3fbb51329f41151f7f8a2fb8dfd25d06161a0a85a6a3bfad253233935de40eff29b1b78a52202443dc1e5c962b09f922712f8ee76f6904abc
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-gcc.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-gcc.patch
deleted file mode 100644
index b62fd1f309e3..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.45-gcc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -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-6.05-get-dirs-from-gtk3.0-in-configure.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
deleted file mode 100644
index 4147540e1189..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Even though xscreensaver now uses GTK+3 instead of GTK+2 since version 6.05
-it still gets its directories from GTK+2 which results in an empty prefix
-when GTK+2 is not installed.
-
-Bug: https://bugs.gentoo.org/878875
-
-Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -2822,7 +2822,7 @@ if test "$with_gtk" = yes; then
-
-   GTK_DATADIR=""
-   if test "$have_gtk" = yes; then
--    GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
-+    GTK_DATADIR=`$pkg_config --variable=prefix gtk+-3.0`
-     GTK_DATADIR="$GTK_DATADIR/share"
-   fi
-
-@@ -4282,6 +4282,6 @@ AC_MSG_CHECKING([for locale directory])
- if test -n "$GTK_DATADIR" ; then
-   PO_DATADIR="$GTK_DATADIR"
- elif test "$have_gtk" = yes; then
--  PO_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
-+  PO_DATADIR=`$pkg_config --variable=prefix gtk+-3.0`
-   PO_DATADIR="$PO_DATADIR/share"
- fi
diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml
index 9963b899eb86..68803a1d6b15 100644
--- a/x11-misc/xscreensaver/metadata.xml
+++ b/x11-misc/xscreensaver/metadata.xml
@@ -17,7 +17,6 @@
 	</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="gles" restrict="&gt;=x11-misc/xscreensaver-6.0.2">Emulate OpenGL 1.3 in terms of OpenGL ES 1.x</flag>
 		<flag name="glx" restrict="&gt;=x11-misc/xscreensaver-6.0.2">Use GLX to interface OpenGL and X11 instead of EGL</flag>
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
deleted file mode 100644
index a5ae58707410..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic font 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}.1.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 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login offensive pam +perl +png selinux suid systemd xinerama"
-REQUIRED_USE="
-	gles? ( !glx )
-	?? ( elogind systemd )
-	gtk? ( || ( gdk-pixbuf png ) )
-"
-
-COMMON_DEPEND="
-	>=dev-libs/libxml2-2.4.6
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	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.22.0:3 )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	locking? ( virtual/libcrypt:= )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
-	)
-	virtual/glu
-	virtual/opengl
-	pam? ( sys-libs/pam )
-	png? ( media-libs/libpng:= )
-	systemd? ( >=sys-apps/systemd-221 )
-	>=x11-libs/libXft-2.1.0
-	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}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-util/intltool
-	app-alternatives/bc
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${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
-	"${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
-	"${FILESDIR}"/${PN}-6.01-configure-install_sh.patch
-	"${FILESDIR}"/${PN}-6.03-without-gl-configure.patch
-	"${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch
-	"${FILESDIR}"/${PN}-6.05-configure-exit-codes.patch
-	"${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch
-)
-
-DOCS=( README{,.hacking} )
-
-src_prepare() {
-	default
-
-	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
-
-	# 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
-		eapply "${FILESDIR}/xscreensaver-6.05-teach-handsy-some-manners.patch"
-	fi
-
-	config_rpath_update "${S}"/config.rpath
-
-	# Must be eauto*re*conf, to force the rebuild
-	eautoreconf
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset BC_ENV_ARGS #24568
-
-	# /proc/interrupts won't always have the keyboard bits needed
-	# Not clear this does anything in 6.03+(?) but let's keep it for now in case.
-	# (See also: configure argument)
-	export ac_cv_have_proc_interrupts=yes
-
-	# WARNING: This is NOT a normal autoconf script
-	# Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X"
-	ECONF_OPTS=(
-		$(use_enable locking)
-		$(use_with elogind)
-		$(use_with gdk-pixbuf pixbuf)
-		$(use_with gles)
-		$(use_with glx)
-		$(use_with gtk)
-		$(use_with new-login login-manager)
-		$(use_with pam)
-		$(use_with suid setuid-hacks)
-		$(use_with systemd)
-		$(use_with xinerama xinerama-ext)
-		--with-jpeg=$(usex jpeg yes no)
-		--with-png=$(usex png yes no)
-		--with-xft=yes
-		--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-xkb-ext
-		--with-xshm-ext
-		--without-gle
-		--without-kerberos
-		--without-motif
-		--with-proc-oom
-		--x-includes="${EPREFIX}"/usr/include
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-	)
-	# WARNING: This is NOT a normal autoconf script
-	econf "${ECONF_OPTS[@]}"
-}
-
-src_compile() {
-	# stock target is "default", which is broken in some releases.
-	emake all
-}
-
-src_install() {
-	use pam && dodir /etc/pam.d/
-	emake install_prefix="${D}" DESTDIR="${D}" GTK_SHAREDIR="${installprefix}"/usr/share/xscreensaver 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
-		rmdir -v "${ED}${FONTDIR}" || die #812473
-	fi
-
-	einstalldocs
-
-	if use pam; then
-		fperms 755 /usr/bin/${PN}
-		pamd_mimic_system ${PN} auth
-	fi
-
-	# bugs #809599, #828869
-	if ! use gtk; then
-		rm "${ED}/usr/bin/xscreensaver-demo" || die
-	fi
-	# Makefile installs xscreensaver.service regardless of --without-systemd
-	if ! use systemd; then
-		rm "${ED}/usr/share/${PN}/xscreensaver.service" || die
-	fi
-}
-
-pkg_postinst() {
-	use fonts && font_pkg_postinst
-
-	# bug #811885
-	if ! use glx; then
-		elog "Enable USE='glx' if OpenGL screensavers are crashing."
-	fi
-
-	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
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
deleted file mode 100644
index 8d3e14908a05..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic font 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}.1.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 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login offensive pam +perl +png selinux suid systemd xinerama"
-REQUIRED_USE="
-	gles? ( !glx )
-	?? ( elogind systemd )
-	gtk? ( gdk-pixbuf )
-	pam? ( locking )
-"
-
-COMMON_DEPEND="
-	>=dev-libs/libxml2-2.4.6
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	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.22.0:3 )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	locking? ( virtual/libcrypt:= )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
-	)
-	virtual/glu
-	virtual/opengl
-	pam? ( sys-libs/pam )
-	png? ( media-libs/libpng:= )
-	systemd? ( >=sys-apps/systemd-221 )
-	>=x11-libs/libXft-2.1.0
-	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}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-util/intltool
-	app-alternatives/bc
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${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
-	"${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
-	"${FILESDIR}"/${PN}-6.01-configure-install_sh.patch
-	"${FILESDIR}"/${PN}-6.03-without-gl-configure.patch
-	"${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch
-	"${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch
-	"${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch
-)
-
-DOCS=( README{,.hacking} )
-
-src_prepare() {
-	default
-
-	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
-
-	# 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
-		eapply "${FILESDIR}/xscreensaver-6.05-teach-handsy-some-manners.patch"
-	fi
-
-	config_rpath_update "${S}"/config.rpath
-
-	# Must be eauto*re*conf, to force the rebuild
-	eautoreconf
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset BC_ENV_ARGS #24568
-
-	# /proc/interrupts won't always have the keyboard bits needed
-	# Not clear this does anything in 6.03+(?) but let's keep it for now in case.
-	# (See also: configure argument)
-	export ac_cv_have_proc_interrupts=yes
-
-	# WARNING: This is NOT a normal autoconf script
-	# Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X"
-	ECONF_OPTS=(
-		$(use_enable locking)
-		$(use_with elogind)
-		$(use_with gdk-pixbuf pixbuf)
-		$(use_with gles)
-		$(use_with glx)
-		$(use_with gtk)
-		$(use_with new-login login-manager)
-		$(use_with pam)
-		$(use_with suid setuid-hacks)
-		$(use_with systemd)
-		$(use_with xinerama xinerama-ext)
-		--with-jpeg=$(usex jpeg yes no)
-		--with-png=$(usex png yes no)
-		--with-xft=yes
-		--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-xkb-ext
-		--with-xshm-ext
-		--without-gle
-		--without-kerberos
-		--without-motif
-		--with-proc-oom
-		--x-includes="${EPREFIX}"/usr/include
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-	)
-	# WARNING: This is NOT a normal autoconf script
-	econf "${ECONF_OPTS[@]}"
-}
-
-src_compile() {
-	# stock target is "default", which is broken in some releases.
-	emake all
-}
-
-src_install() {
-	use pam && dodir /etc/pam.d/
-	emake install_prefix="${D}" DESTDIR="${D}" GTK_SHAREDIR="${installprefix}"/usr/share/xscreensaver 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
-		rmdir -v "${ED}${FONTDIR}" || die #812473
-	fi
-
-	einstalldocs
-
-	if use pam; then
-		fperms 755 /usr/bin/${PN}
-		pamd_mimic_system ${PN} auth
-	fi
-
-	# bugs #809599, #828869
-	if ! use gtk; then
-		rm "${ED}/usr/bin/xscreensaver-demo" || die
-	fi
-	# Makefile installs xscreensaver.service regardless of --without-systemd
-	if ! use systemd; then
-		rm "${ED}/usr/share/${PN}/xscreensaver.service" || die
-	fi
-
-	# bug #885989
-	fperms 4755 /usr/$(get_libdir)/misc/xscreensaver/xscreensaver-auth
-}
-
-pkg_postinst() {
-	use fonts && font_pkg_postinst
-
-	# bug #811885
-	if ! use glx; then
-		elog "Enable USE='glx' if OpenGL screensavers are crashing."
-	fi
-
-	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
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild
index fc7dab387fcf..a044a8b3bf9b 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild
@@ -13,6 +13,10 @@ SRC_URI="
 		https://github.com/Flowdalic/xscreensaver/commit/59e7974c42dc08411c9af2a3a644a582c2116f46.patch ->
 			${PN}-6.06-logind-idle-hint.patch
 	)
+	systemd? (
+		 https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch ->
+			${PN}-6.07-xscreensaver.service-start-with-no-splash.patch
+	)
 "
 
 # Font license mapping for folder ./hacks/fonts/ as following:
@@ -21,9 +25,9 @@ SRC_URI="
 #   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 )"
+LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama"
 REQUIRED_USE="
 	gles? ( !glx )
@@ -84,17 +88,16 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.31-pragma.patch
 	"${FILESDIR}"/${PN}-6.01-gentoo.patch
-	"${FILESDIR}"/${PN}-5.45-gcc.patch
+	"${FILESDIR}"/${PN}-6.07-gcc.patch
 	"${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
-#	"${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
-#	"${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
+	"${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
+	"${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
 	"${FILESDIR}"/${PN}-6.01-configure-install_sh.patch
-#	"${FILESDIR}"/${PN}-6.03-without-gl-configure.patch
+	"${FILESDIR}"/${PN}-6.03-without-gl-configure.patch
 	"${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch
-#	"${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch
-#	"${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch
-	"${FILESDIR}"/${PN}-6.06-service-remove-Alias-org.jwz.xscreensav.patch
-	"${FILESDIR}"/${PN}-6.06-service-start-xscreensaver-with-no-splash.patch
+	"${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch
+	"${FILESDIR}"/${PN}-6.07-allow-no-pam.patch
+	"${FILESDIR}"/${PN}-6.07-fix-desktop-files.patch
 )
 
 DOCS=( README{,.hacking} )
@@ -105,7 +108,21 @@ QA_CONFIG_IMPL_DECL_SKIP=( getspnam_shadow )
 src_prepare() {
 	default
 
+	# bug #896440
+	mv po/ca.po po/ca.po.old || die
+	iconv -f ISO-8859-15 -t UTF-8 po/ca.po.old >po/ca.po || die
+
 	sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
+
+	if use systemd; then
+		# Causes "Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver."
+		# after "systemctl --user enable xscreensaver".
+		sed -i -e '/^Alias=org.jwz.xscreensaver.service/d' \
+			driver/xscreensaver.service.in || die
+
+		eapply "${DISTDIR}/${PN}-6.07-xscreensaver.service-start-with-no-splash.patch"
+	fi
+
 	strip-linguas -i po/
 	export ALL_LINGUAS="${LINGUAS}"
 
@@ -211,15 +228,14 @@ src_install() {
 
 	if use fonts; then
 		# Do not install fonts with unclear licensing
-		rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die
+		rm -v "${ED}${FONTDIR}"/gallant12x22.ttf || 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
-		rmdir -v "${ED}${FONTDIR}" || die #812473
+		rm -rfv "${ED}${FONTDIR}" || die #812473
 	fi
 
 	einstalldocs
@@ -229,10 +245,6 @@ src_install() {
 		pamd_mimic_system ${PN} auth
 	fi
 
-	# bugs #809599, #828869
-	#if ! use gtk; then
-	#	rm "${ED}/usr/bin/xscreensaver-demo" || die
-	#fi
 	if use systemd; then
 		systemd_douserunit "${ED}/usr/share/${PN}/xscreensaver.service"
 	fi