gentoo resync : 10.02.2020

42 files changed, 81 insertions, 276 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index e434794a7f3d..afc6578fc8ac 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/dsx/Manifest b/x11-misc/dsx/Manifest
index 7e29b005aec4..adf96b94052b 100644
--- a/x11-misc/dsx/Manifest
+++ b/x11-misc/dsx/Manifest
@@ -1,3 +1,3 @@
 AUX dsx-0.1 2218 BLAKE2B dc20fbd18c0fe455a704cd0384e9d310e5f3b378842a196de5d0969b844117a1444fbe0bb04c2f2a6e698216a0eff838a95052333601befcbbf755bb825cedc6 SHA512 918d05297dc39166fe1684b306441c519bdf41e56a94d4a5f090698f69fdebb1f4d077d07be4e6d5a22614f163eb4ff8645c8751397ba52e265daece840178a9
-EBUILD dsx-0.1-r1.ebuild 516 BLAKE2B a63a5f1a782c741fcb431374a923f5251bab4284bffc733dfdcef91c5d71493f69ac42aad5283e80628867c3b67f3838e1871b0eaecbb76d76a2df7435404454 SHA512 212fc9f5f553792a7dfb24b0d879178b74a20ca636f073e92b45117b559f23ec23b5e7d99cb5af0b0dd3ca810658f2f362b2c339d9d8378bee2a00d0e987e545
+EBUILD dsx-0.1-r1.ebuild 533 BLAKE2B 8ebdbe744ee52741f0a75479a9672d600ac5437b2174a69afe499cd785e78d52aa78318fe80e48128a5b287996615252943a10e3667807f6f205acff1e579e3c SHA512 9ca29e2f8b0ffb78dd0d014127e2104d106ebbe013848ca628cd0c38baff85cec926486df634d24321953047d7d3ff22eb7c7406fc0192ce0b3aa2b89c216f61
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/dsx/dsx-0.1-r1.ebuild b/x11-misc/dsx/dsx-0.1-r1.ebuild
index fe4368e5c75d..a82b09375705 100644
--- a/x11-misc/dsx/dsx-0.1-r1.ebuild
+++ b/x11-misc/dsx/dsx-0.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit python-single-r1
 
 DESCRIPTION="Command line selection of your X desktop environment"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/x11-misc/easystroke/Manifest b/x11-misc/easystroke/Manifest
index a7182f46045c..8dc5c8169d1f 100644
--- a/x11-misc/easystroke/Manifest
+++ b/x11-misc/easystroke/Manifest
@@ -1,7 +1,7 @@
 AUX easystroke-0.6.0-abs.patch 1246 BLAKE2B 3fe3e984d8119198de364d4b65adc6368cf2ba94a5744878bc52c9949488304b2804ac5cf835a1a0cc77d4323778eed91310e3827b9797b4bc4020477e753116 SHA512 80596ce9fa22e880f7e41dd3574513005252fa1f2c74eb53ab7e1d3cbcd973a4bf35cdc76bfd9770a161551209cbb78677b572410a36cdc5c9075a601a809ae0
 AUX easystroke-0.6.0-buttons-scroll-send.patch 1431 BLAKE2B bba629d5d54c3544bb1564474812521587ef05c9ecaedce51dcecacf74e263602095e0e64f1961bb67c5640e3a86eca7369f46c5aabf82a919f4563bf25c7f89 SHA512 f8a862c450c665db4409d9abb07687fac5fac182a8f36038c795eb25a0cf732e0ccc3e589ae6c6eb65bde9a4f4cbd680f267734d2a65b301d1c8e7fa078dfcff
 AUX easystroke-0.6.0-cellrendertextish.patch 718 BLAKE2B 98856aa9e0cb70ffa0fb28f429a714f4caa732c18d4e16143fa2d63bf3f1ab70bf2329bb4eabccd1249e1bd09a435d37e18109bf0edfb0e9e6ced712fbe088a1 SHA512 2feacef4d9b1707dd1e20a2e84b78313744bc9ce9b2a7d0070cab47b691ec2cfd1e1616aaf1c30a722ae5ecb16c230b6a647965da4194f2700262977eedb8b9f
-AUX easystroke-0.6.0-cxx11.patch 748 BLAKE2B c6dd91ac07693d26c79c75c4cd323a9c3158e999bd34e2e034c1e0b05be845d224a8e412e4cdddde95f4aaba1906c4b157d72f83ce2a69f33b4e0a55c1957c5d SHA512 e16229a595dbad028665b967b8ee7a3c27860fa33e3fc3a40e2e7657e5d69338bde571f8526431ec1044ad59f1aaf65f66e294f38d735d932a7386a19d8f55a5
+AUX easystroke-0.6.0-cxx11.patch 529 BLAKE2B c56d9d2c342019bfd7f32835d19f28958d910e956f782e506c0297a339474d95d7ecb7b5fd68b11fcf128a1e0227b08f723d6b426b66b4d8a76d94137fda2d1e SHA512 719254e530e7f3de2e55ad28d4c5a6a5e817de243339813748001222b19c7266a623f3fbddca642859d0cbdef8a7dcecac53961c259ec539b4124035f2b8a101
 AUX easystroke-0.6.0-desktop.patch 294 BLAKE2B 090d292720cb8168896b57011369a42ca9d32e805a19ed21bdca45023f64eedf5e06c2618dfc954a3d40d5f8476555837c64e0c3137b414b95de3925d4fa9504 SHA512 082b353b21fdb7754a3b94519a426f69c67caca32977657bdc09ca158d783612a454b2fc08949cb9cb2ee2d1c3ce07d6f7915e782f50c3829f456e31f6330471
 AUX easystroke-0.6.0-gentoo.patch 1672 BLAKE2B 5ba245c95108e3f8025f371165dac2256c0bcefbdf20024b722fb97c2634840398e38c7d8c171d84f8357c81c2d31aee6b6ffdd7ba7448aa77825a87d4ff68d8 SHA512 e44b7d01506242985ec2b53d4f267425d7877649d4ca734ade93a68b9d52b03af1cf7fc9eab81617d2459cbe27eb88f4f82754416a910fc01e1b0de9b34486a8
 AUX easystroke-0.6.0-reinstate-signal-handlers.patch 1070 BLAKE2B c994676a92954c90f093ba1b466a2c8bdf42846b3df3d7547852fdc4f23edeee95d259c969b70006ac86934b290c5b649afa86e25b96d2445e1fd36bdd5c454a SHA512 9cfe216ecfc2148e22d2a91f25b294bde2f7933e912f2ede86002679763e0a6eb14bb3f1182fd07156d103baa4bef4434e45b27ae3753c31758524c680665572
diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-cxx11.patch b/x11-misc/easystroke/files/easystroke-0.6.0-cxx11.patch
index b628d1b14d34..8619e8e9fbdc 100644
--- a/x11-misc/easystroke/files/easystroke-0.6.0-cxx11.patch
+++ b/x11-misc/easystroke/files/easystroke-0.6.0-cxx11.patch
@@ -1,7 +1,6 @@
-diff -uprb easystroke-0.6.0.orig/actions.cc easystroke-0.6.0/actions.cc
---- easystroke-0.6.0.orig/actions.cc	2013-03-27 17:52:38.000000000 +0200
-+++ easystroke-0.6.0/actions.cc	2015-12-07 22:07:17.720041171 +0200
-@@ -51,10 +51,11 @@ void TreeViewMulti::on_drag_begin(const
+--- a/actions.cc
++++ b/actions.cc
+@@ -51,10 +51,11 @@
  	context->set_icon(pb, pb->get_width(), pb->get_height());
  }
  
diff --git a/x11-misc/idesk/Manifest b/x11-misc/idesk/Manifest
index c292377071d1..1b39c8054657 100644
--- a/x11-misc/idesk/Manifest
+++ b/x11-misc/idesk/Manifest
@@ -1,4 +1,4 @@
 AUX idesk-0.7.5-glibc-2.12.patch 544 BLAKE2B 460044772e452f1b583513c8926e99d1021e80a3906cdcde918f7177da415ac9d898d2097088d37a223b424444d25d3e0fadac489549a85ac1b1a812525fb16e SHA512 f21f419d7facc62990a35b67e57bec2f9b46c76a6026a267348edfbd0207c14682cf1a3b8ca0ab4d508668a0c4dc9cc8ad06921b3218f077225bafc3f1ae9fc6
 DIST idesk-0.7.5.tar.bz2 185858 BLAKE2B b1cc2e423ff7f9f9db12fcfd46c0d9b03e29ad6b4b44f79ab6fca76b356b7df798532261364e30991dfacef9d377b69bf3dc9b5f44baf817b44629eb3805f3e6 SHA512 42c15cecc6e2cf6546420542fc4480902fd33c26c19ffc32e65eb04d09116d3b80f5539cde4ca86d4bec30ce96417752bfe7416ec83c531235d9064d06ec0475
-EBUILD idesk-0.7.5-r3.ebuild 772 BLAKE2B a612ee88d3ab007ca4ae66203fa5080905025ff9ec404e278b55c3d8d397a1524e890c52c51a66c1f52618d0a31ff41a809bfcf555a650601ef58c0e48d4e010 SHA512 b39fd400fed81186612c255c1508ab52947e578e4da9ca81839737c9559c752dc9dd77ec04a6313ecdf78b760b231ca48a7bbb7d907f1f43a5dbf3f6d22d6974
+EBUILD idesk-0.7.5-r3.ebuild 770 BLAKE2B 4e21319d663f3ac90702593679d7108f00bc04304874bd97f66883cea485316203ec05c22c8e68e9b375e00dbfa09e30456020bd63bba98722e54e8238ff6959 SHA512 37135af52eeedbc2e60a979d0a53b9f9ff966cb8a5310f8acfe1f03c6f7ffa2f470154b564de2e20f9543b6c1be399be18d24c09890a5738ce26f24e10ca3171
 MISC metadata.xml 351 BLAKE2B 057803e3853f27e027d449303e5c8a326d453e0d6d701946bc008dd34581e5cfb037b79c0c0eaf44f48ade1d65e88ba84affc5ad643e42a0339b29214a5f26df SHA512 038678d7cde9b7ec4365e763f7a5759a36eb125b7852d9e110f31e1737ee04c1043c73dee482f998c4284176f8d46cc7ee8a1a2e044651e9945e56d6523c39e2
diff --git a/x11-misc/idesk/idesk-0.7.5-r3.ebuild b/x11-misc/idesk/idesk-0.7.5-r3.ebuild
index 6969b99b185c..3a6373426c22 100644
--- a/x11-misc/idesk/idesk-0.7.5-r3.ebuild
+++ b/x11-misc/idesk/idesk-0.7.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/mugshot/Manifest b/x11-misc/mugshot/Manifest
index 01a3a0b11eee..6a6e4d92d404 100644
--- a/x11-misc/mugshot/Manifest
+++ b/x11-misc/mugshot/Manifest
@@ -1,7 +1,3 @@
-AUX mugshot-0.4.1-missing_default_face.patch 782 BLAKE2B be9ef8633839b505c37ae13430ebca92b95a0632fed667c49b5885cc393ee0bb6743453e9e5fa621959113c43b87590842e56d735f8666533bb22a6522606027 SHA512 5abb02cd511482c3f32e56a7f121bf6cce102dab7dfee196a105ff5ed2cbf3d9ee3f20f0d75eecfe192d0c16603dd80555fcdc872cc85bffa74de7d0bbab79b1
-AUX mugshot-0.4.1-use_office_phone.patch 996 BLAKE2B 4c8647647f424775a1557f176b271e7f23d5df99a4db3246c37f7d108640a1d18bb6a8185f1e1bdd2f31bba2cbc62fc4d39df5172edc72e3142dd3954afee329 SHA512 488f99fde5c09aa2e15bf9b78bb19b6e244476a1b0e8053f3af5e0e6ef70febbc92d3970f774332dd961af7893e29a5fab7cc7e964d24ffc46d67c9567e2579c
-DIST mugshot-0.4.1.tar.gz 121660 BLAKE2B ce0c0d4b76184f35e4ba5204b984393412924c0288b09fe51ec0e6635b1556e24ed98ce4a893ae57f25810bb39ce035fb40b6990e1b6516406cb0f670acdbac0 SHA512 f7790b3f80fc98d9b19e9b9dd74eafc41ae7598e38f70e148502056b4bd375922271cc72cf4664280f1449b2f5e1d89052ecc5d37c6dc453041e5312f736bbbe
 DIST mugshot-0.4.2.tar.gz 121020 BLAKE2B c092e25273dbd8ef9cbfbc001fb5f86b134ed8f9bf5d84993d5f46664f17eb74eda5c121ee70b5f0c4b0adb5aa1fc4d21d8c59d3f0cf4a4f67991d06690f5aa5 SHA512 721629cf4a7e4d84fd8505279cf88c88ac88c7b6c995ac84a2fd6a9b978c92716bbe20d7b0301ca70e99c007698e4cddf41b6cf1111bf496eec4d39591cd9ed1
-EBUILD mugshot-0.4.1.ebuild 1379 BLAKE2B 37f3ac78d45003c6ea1ff7ae2962df1b8570bede4855fb3c31dd3e3efd7f62b111b23ee84277ebb1648d9b2e996231b9897c38e2d7c3a3f4b7808bfcbc3807d6 SHA512 d17b643af0187e52ab4749c0e02059f4b814ac6ab6adeb3401d0574c8137fb7568df8e4966d522cc79b8a695d0c4039b997b90ac4fb5bd0dd9dc6133b9827ae6
-EBUILD mugshot-0.4.2-r1.ebuild 1535 BLAKE2B 350e700b586efa542926143101f4fe664125faf7fff5c4b0900219ac0542a2dbe70e09f1278eb40a9f168336a0bb41f9dfe4e67bbc8ddcd49dc0fc9e84e29efc SHA512 d452547817dafd12c8c51eeef333969ddb939ef55af28e689377ea87a1c64939eda40dc483c92343f8e4717f829df341f95706809a9239833ace3e79cbd25f86
+EBUILD mugshot-0.4.2-r1.ebuild 1534 BLAKE2B 9ec842e924950051e7e65eea7c10afea40fe9802e69fad07098e78b76c179908e177fa1f7326b68813ea3f573892326f660b5899814b517a37629c547502dcfe SHA512 44934fa75f7554eac3a914742ce8d08003a8f17583dc7d2eb14cd66059d86bb3fc697ea60f95f50dbba8829154edb01586f5d53307d4f3bed560c9bff038267c
 MISC metadata.xml 943 BLAKE2B b39c09aa84b6a1f25d001e073b2c369af9ebebb7448fff5b3abc83898516963e117c33d1c03fb6db72422e4b20c065ed78e711326f28912e1ed5321b232bbee1 SHA512 3b4e66543245b2db7d1c255adf30112834935ab552a7d6773921838510417e000fd41c63fcab7e6be8df043f3daeab1cfcbebccaebf44f6185abfcb47898a3f2
diff --git a/x11-misc/mugshot/files/mugshot-0.4.1-missing_default_face.patch b/x11-misc/mugshot/files/mugshot-0.4.1-missing_default_face.patch
deleted file mode 100644
index cc504d667af9..000000000000
--- a/x11-misc/mugshot/files/mugshot-0.4.1-missing_default_face.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/mugshot/MugshotWindow.py	2018-08-08 11:22:42.000000000 +0200
-+++ b/mugshot/MugshotWindow.py	2018-08-15 22:48:39.998699923 +0200
-@@ -256,10 +256,11 @@
- 
-             if os.path.isfile(face):
-                 try:
--                    if os.path.samefile(image, face):
--                        self.updated_image = face
--                    else:
--                        self.updated_image = None
-+                    if os.path.exists(image):
-+                        if os.path.samefile(image, face):
-+                            self.updated_image = face
-+                        else:
-+                            self.updated_image = None
-                 except FileNotFoundError:
-                     self.updated_image = None
-                 self.set_user_image(face)
diff --git a/x11-misc/mugshot/files/mugshot-0.4.1-use_office_phone.patch b/x11-misc/mugshot/files/mugshot-0.4.1-use_office_phone.patch
deleted file mode 100644
index 07c2003f50d8..000000000000
--- a/x11-misc/mugshot/files/mugshot-0.4.1-use_office_phone.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/mugshot/MugshotWindow.py	2018-08-08 11:22:42.000000000 +0200
-+++ b/mugshot/MugshotWindow.py	2018-08-15 22:47:02.108700297 +0200
-@@ -617,14 +617,18 @@
-         # chfn 2.29 uses "-p" as parameter for changing the office-phone (LP: #1699285)
-         p_command = "%s -p \"%s\" %s" % (chfn, office_phone, username)
- 
--        # other (newer, older?) use "-w"
-+        # other (newer, older?) use "-o" or "-w"
-+        o_command = "%s -o \"%s\" %s" % (chfn, office_phone, username)
-         w_command = "%s -w \"%s\" %s" % (chfn, office_phone, username)
- 
-         if self.process_terminal_password(p_command, password) or \
-                 self.process_terminal_password(w_command, password):
-             self.office_phone = office_phone
-         else:
--            success = False
-+            if self.process_terminal_password(command2, password):
-+                self.office_phone = office_phone
-+            else:
-+                success = False
- 
-         return (success, response)
- 
diff --git a/x11-misc/mugshot/mugshot-0.4.1.ebuild b/x11-misc/mugshot/mugshot-0.4.1.ebuild
deleted file mode 100644
index b64746d894fc..000000000000
--- a/x11-misc/mugshot/mugshot-0.4.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 eapi7-ver gnome2-utils
-
-DESCRIPTION="A lightweight user-configuration application"
-HOMEPAGE="https://launchpad.net/mugshot"
-SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnome libreoffice webcam"
-
-RDEPEND="dev-libs/gobject-introspection
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	sys-apps/accountsservice
-	x11-libs/gtk+:3
-	gnome? ( gnome-base/gnome-control-center )
-	libreoffice? ( || ( app-office/libreoffice-bin app-office/libreoffice ) )
-	webcam? ( media-libs/gstreamer:1.0
-		media-libs/gst-plugins-good:1.0
-		gnome? ( media-libs/clutter-gtk[introspection]
-			media-video/cheese[introspection] ) )"
-
-DEPEND="dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-	dev-util/intltool
-	${RDEPEND}"
-
-PATCHES=(
-	# Both patches are taken from Arch Linux
-	# and adapted to newest version
-	"${FILESDIR}"/${P}-missing_default_face.patch
-	"${FILESDIR}"/${P}-use_office_phone.patch
-)
-
-pkg_postinst() {
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild b/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
index bd4ac251e3f1..c547ba1e9538 100644
--- a/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
+++ b/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/bluesabre/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="gnome libreoffice webcam"
 
 COMMON_DEPEND="
diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
index e384ff4e1104..549aa3373a3b 100644
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -1,4 +1,4 @@
 DIST obconf-2.0.4.tar.gz 456523 BLAKE2B ef3b3e4664ccd1095f5e1cd468fa3d021cd469a641930309a41c7b1cf418b9d87b2d8f4420342363dc4781d8e3aca3e8ffc0b9aac0151a2399579c5ff0997cc8 SHA512 b8cf6f363fa8c2f1d21142a3f79687a72f683f564285b05751c822ddf7a421b09c3440cbc5b08eb09d151601c6ada835ff5cc940bf5abeec2210cca26b552294
-EBUILD obconf-2.0.4.ebuild 803 BLAKE2B 026c0b16d24f3fdd2bb96b30028ec13058abc73d7cdb54cc243e8bd988e9576a524794e13d6e6d688a06885cec376ddb8c29818d9427e24febc834b6b3eaa4ee SHA512 60627587db8700ab9cdc3adb0c5085ed326d2dfa4b7b742017f06b39d67b16c007b15c16d2b5bed3913dac46f4b5f2d41ed49179107173b5f5c56939720cbf1d
+EBUILD obconf-2.0.4.ebuild 801 BLAKE2B 03caf8e6fea52bc769e80ab0042a650cd45c67616c9b4a4f2413a45040ca3395335510e40f978c5cdee3ef98471a5da45f929e463a7738f54a5083097da4a2eb SHA512 78f43c0b91bd1a7bd364305c5d9d5c139e0e3497fb6e43cc8cf9c4126c2a616fdeba19491dd2234497c150487288c892a1b747f6ef0b8a705cdcda6834b530aa
 EBUILD obconf-9999.ebuild 767 BLAKE2B 83d6d4c188108b33926b8afa8f1115a00dff7fb0ac2d3f4ccd94f0930567305ca2bd626f5159ed5e0683a6b2619e9bf6b0c6f563268a7db6be2bb218a861a364 SHA512 cc71a7f24edc705f8155ddc52e368027beef8bce3f5abc063ff1a7a6f71e8baa0bdddbcd66d95a79be6a64b682d27b8aa607771bd6ce90abbefaf667072cf71c
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/x11-misc/obconf/obconf-2.0.4.ebuild b/x11-misc/obconf/obconf-2.0.4.ebuild
index ee142e7660bd..ac99cce34b26 100644
--- a/x11-misc/obconf/obconf-2.0.4.ebuild
+++ b/x11-misc/obconf/obconf-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://openbox.org/dist/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~x86-linux"
 IUSE="nls"
 
 RDEPEND="gnome-base/libglade:2.0
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 7b1ebd40a110..43bd76eca836 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
-DIST py3status-3.24.tar.gz 403557 BLAKE2B 1b1b0ceafaaf757fa06a4c9637b4efcec7315662b55e61812af8100048832d5f104f11f36dbe9cbe8e9fd7bc8b8f6f5a0e0a5398aed38b35b249ba47b5418f31 SHA512 4e3aebc314498ba0ebe740455c2cf179715e65cfa72ed690d0d44fa9c2a8c3cf17b5785cd1163481afb8232fbb5e22d47ba60d95479472feb56fcf6e6b1b1eab
-EBUILD py3status-3.24.ebuild 723 BLAKE2B a4fdd260b5153ca22d22a456a6565e74bca40196afe4da5a6eb24f2240c08b97ff22f2bac2f704a0cb45bacbe931611ca0bbb87d8921ceb71448777c7d3b6967 SHA512 3d13a14382b80a7c1306de839a36c18822f6982860f9fe9bd342424a632d83ec818411b933087b3fb06e23beceecea0baf2c4d278e707f33377d3b959bfb476b
+DIST py3status-3.25.tar.gz 405276 BLAKE2B 9ff163f8ff037eedda29e7479bc637c9e3ddee1edb0848bdb61b32702ad8855745340beca7f5895612209d05bae838ce71a17521ded50cb61f2516669b740009 SHA512 114c510fc3126256af49f9fd7a141ebc86fe8306cf10094c1c9e9980757bf8f23e0ddb131d54aaa8acdcb5b98f0a230e9c2f0584ea09a68b779be5b66bc865b2
+EBUILD py3status-3.25.ebuild 719 BLAKE2B 56da3c804b99364042d91fbd5bf4c028452e27b1d65042529fe283fe9e6e43e54ad8f8595e64695d217c7cd21bc6bf1ea88debacc1b3e26d4d035f8dc974ec26 SHA512 1086f878fd00553f9a82f0358d8298b425526c9d37cb62a95c794d62fa7b243ea7e7c09b5d1824bdb3cc35f54b26a1ba8aea335d4e4c0622484b9515fbed8316
 MISC metadata.xml 742 BLAKE2B fb30bc364ed1b07670aaff51142a99a185c06b7f20661e3ed9cab9b3a21040fcbc15db807102af9c580a6c80071267c6883fe4d5a152c109e14f9d03e213f2ec SHA512 2a30e73f6450a2227574cda7f1f0d10a6eaa6f5919fac21c51578e025efe02a831582237013648b66b1061241c51f6598ac6f0c31e6edc9d05a4d5be8417f2de
diff --git a/x11-misc/py3status/py3status-3.24.ebuild b/x11-misc/py3status/py3status-3.25.ebuild
index 9a663f1dbd32..9b33b20bb0f9 100644
--- a/x11-misc/py3status/py3status-3.24.ebuild
+++ b/x11-misc/py3status/py3status-3.25.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 SRC_URI="https://github.com/ultrabug/py3status/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest
index f5bb7d1615c6..12a4958f5df6 100644
--- a/x11-misc/revelation/Manifest
+++ b/x11-misc/revelation/Manifest
@@ -2,5 +2,5 @@ AUX revelation-0.4.14-gnome-python.patch 925 BLAKE2B 83bf8889d0de3a6d6077929ef76
 AUX revelation-0.4.14-random.patch 2127 BLAKE2B 9fa01845124172e9544679c144cc49f23104aed615a1e1087f7f6b63051027136435ef51e8ac794c78c7e554211a5f125a4641e9572c52a1279b8eaef3170738 SHA512 be5e805e58d04c0be29ad9c30a6aa867a869a4d0a8df31ce234fbe331d0191cc3bf7b82e11ec6a7c1c8306b68ddbc5ed29d9f5e8c9e3838b293896adb69c5d13
 AUX revelation-0.4.14-xor.patch 1874 BLAKE2B 44b4e6b6f1323201818c55ecedb464304dc5265a7d356224dff41021554f8611f05fabc2fc353bf7a43b7bc4e2afe32f16c7b57ef30539abeb307de50f7b270d SHA512 c4b76a92f0b6e4e1856948e1c1d4bb118bc8f2383e9ec778515fd87949814b60dd51b8dc814a070665c0138111b3ffd9d8fdad03c43bdbb0320ad19ddea23ddc
 DIST revelation-0.4.14.tar.xz 316096 BLAKE2B 163fe15fe9ae1f35613390cec6d67b7b0193aea1d613d8ed0b237c190680b700fe509e076911cf28233194c3e82917ae0772d9fbe842eada0ac8bffae256dd4d SHA512 0af5b7eea47a7706dd164f4f0a1da12fd2595e8add1455e4e4092e4b6aa1507faf2c94227dd838734bdc19fef9d268938362fca2d3cde59897580598eefa1145
-EBUILD revelation-0.4.14-r3.ebuild 1072 BLAKE2B a0411524eed3e218ed385323826e86e9b4e113d93fa3158b3be3412770b772ee92e0d0b11781ab13517a7cefab84c79c9eebf9ec52c6482a617dcb8778868315 SHA512 f1dd8e89467500de3c40399f0de4af478ec0572d58210a992e63ed0ce224383554d45fba20840ac655da6c38c8ebc946758d07da7b836ae0de655f5f70892049
+EBUILD revelation-0.4.14-r4.ebuild 1136 BLAKE2B 0fa578d41b7eaae6aab27e8d5784633d67b73442bac3d7e2e56a6991c541244fc8b7a452fd53a75811455c7b6c82acc98c7a4cbfd9ec38ea43419071376b3509 SHA512 14c7a4b4691ab3e7a4e9c6e5d8a29b11b4c518ad155f181477a0daa85b03f9ffc91b7ffe61bfbb845d2fb1790fc14b7e6f836784f8093761ce2405cedf3c8a69
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/x11-misc/revelation/revelation-0.4.14-r3.ebuild b/x11-misc/revelation/revelation-0.4.14-r4.ebuild
index 8c636fe6e57d..704d9967b80e 100644
--- a/x11-misc/revelation/revelation-0.4.14-r3.ebuild
+++ b/x11-misc/revelation/revelation-0.4.14-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,11 +20,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="test"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/gconf-python[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	sys-libs/cracklib[python,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
+		dev-python/gconf-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		sys-libs/cracklib[python,${PYTHON_MULTI_USEDEP}]
+	')
 "
 
 DEPEND="${RDEPEND}"
diff --git a/x11-misc/tintwizard/Manifest b/x11-misc/tintwizard/Manifest
index 850704a94e41..b0aac606db52 100644
--- a/x11-misc/tintwizard/Manifest
+++ b/x11-misc/tintwizard/Manifest
@@ -1,3 +1,3 @@
 DIST tintwizard-0.3.4.tar.gz 22918 BLAKE2B f634926017d06bbbb6d288da327603255a7b5acd85b6ea4681be3a08747020b1bf63dc7c9216126412fc9ac333734dfb7816ee9ce62db45d1336dd6ef69fd0a9 SHA512 e67f6cf7db4a34d344104b2795491799ef72365b76b65eaef01595fa2a624e219ed852a9dbbfb6221bec7b9028fdbd487bc7c1d82653466e1ff2a7b38ba4e27d
-EBUILD tintwizard-0.3.4-r2.ebuild 631 BLAKE2B 6554f39efa724348d86f1351b03b3943230f3b8c7177fca1e7fc21d35ff6f3f33e8cc4996c5f1d5639b90fa34765c0731a39fbb476216ad895e4dfd224f34763 SHA512 3c82996428568b1fd24e261e25ff23744edcca480850ce0f6b9995f6a640233f824a41556d5a90d27a1d56d97f9f975325af4e869426bdc5839c542e0135e2d9
+EBUILD tintwizard-0.3.4-r3.ebuild 664 BLAKE2B 4f7c875d7fb2124ec609b5b09e8f4d62cf1e85a9676f35a966f0de3806531d69412563d869cddcd2b15bd0d29130118e782f0fc87f2c082f44c12f077a1e1420 SHA512 84b8101db848721be2e9861b80ea6404720dbed998119d328df18072085354d4bb0c098c2843e8b09d8349d22fcfca24c395eadb438862eb48b1972b6d7c57bb
 MISC metadata.xml 530 BLAKE2B 2208af0c2907746170146056abfc38aef3c3fcc7374a3e021ae8468e37fe7c4884559b5c3d940feaa314e8b2de8cb476b263d690c2f7322f2a144628b4af8c23 SHA512 9e3759be90e5523b50f9626399cda039c992025d693628c02a1c356bac2f1b2c92a9e669df4d54f3f89ebca38b41c39182ac655cbf3dede1d9d28ecc9cef9a6a
diff --git a/x11-misc/tintwizard/tintwizard-0.3.4-r2.ebuild b/x11-misc/tintwizard/tintwizard-0.3.4-r3.ebuild
index cb32eb555eaf..d854ab98fff7 100644
--- a/x11-misc/tintwizard/tintwizard-0.3.4-r2.ebuild
+++ b/x11-misc/tintwizard/tintwizard-0.3.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,9 @@ DEPEND=""
 RDEPEND="
 	${PYTHON_DEPS}
 	x11-misc/tint2
-	dev-python/pygtk:2[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+	')"
 
 S="${WORKDIR}"
 
diff --git a/x11-misc/wbarconf/Manifest b/x11-misc/wbarconf/Manifest
index a452fca885df..cc544d1549f2 100644
--- a/x11-misc/wbarconf/Manifest
+++ b/x11-misc/wbarconf/Manifest
@@ -1,5 +1,5 @@
 AUX wbarconf-0.7.2.2-install.patch 2843 BLAKE2B 5d794bda0b1ee7f4ed2f2d7bfc26ad7a9d361260bc2e828d236f5c8c2c949e5335aeb70267a470d4d8838fc7cdc3751427b016695796f6d3f15b8070748001b3 SHA512 496392ec3236c4330f4c2d09ecc29a5dd0dc89a40adacbb3b27c4dce4b7170e05f22ca083fb10d045cc21253f5e460ba4a73e632d68056df3fe64ea8fd954c7c
 DIST wbarconf-0.7.2.2.tar.gz 764073 BLAKE2B d2dbd517d31332179fef612b8a6dc863976e27eda18e27f917f8e2cc7c9a3cfe9499e82fc6ada8f36491454dc57fa56dc43b7b62bb358aaa69f358ed3d51aa82 SHA512 9be4fe4ccceb8432d601806e4e10c19d4072502b63648e1111537e8a693a64d78f2a08f12598bd7ab0b356a1a24ccf138bcd893cb0cccb5bf7fbf80caf9d9eba
-EBUILD wbarconf-0.7.2.2-r2.ebuild 767 BLAKE2B 4fe1efd267816b2c081166f66da5b603d6ef35d4206a5dfba44522085814f69a5cb48f3f69c45a594651e513f37d724b0d326dca114e83bcb22da24474fd2559 SHA512 522491806c81ee6942881b0998da7be66e646c3e070a75b5224469f8b2136b503f49d9f0bf0e547dce174c6419cc03c565b406269d44b05dc858c7ec87eec879
-EBUILD wbarconf-0.7.2.2-r3.ebuild 844 BLAKE2B c59ac072c034cc975924f509681f7bd078f691015c5e1705a3b3ebd55ebd9f566362ee53a6c1448f15f3b2c4c44f2007280dd5aa09811e676bfe7aa6c86fe60e SHA512 46924c9c15a9fb93f59bdbf4ed64f1e45a149edad4c112151b6eb50dbc5a871d84a6a660c698df96ee8bf66000c3b1688e49797ca7cc90c1632bfc46c849de99
+EBUILD wbarconf-0.7.2.2-r4.ebuild 807 BLAKE2B 58ddb54c829aa9c224234a3651e95391defa3e1680fcf89b2be09b38389cfaeaf0305edddc392458f5e24b9e9842c798071db74aef6a6ec7542e01c5cc68c4e6 SHA512 91d91af4c0844733018a6606f4927e5becd773dba3406c4284d9675c3e1d23dfee1e070c48420265d95b6dc1f6f13b80556420329882ce3cb147c99c21187fa1
+EBUILD wbarconf-0.7.2.2-r5.ebuild 885 BLAKE2B 56f16792d5d4d8701c3150c82990b7efbee31bb1e706fa03d70d798337692087d2cdcbad2bb19dfb03fa66d5c5e4fa6dc7c696e1d7b2b731a07bfd434747196d SHA512 351e21813d6e1df69ab5d7c48e4f179a3c6279c94af9451a25437f3c7f8eb5342741a34acdb247e06dabd5e3c571abab79e3db3c904df3e2284eedf7bdece59c
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r4.ebuild
index d5ff90ab324e..3caca84352cf 100644
--- a/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild
+++ b/x11-misc/wbarconf/wbarconf-0.7.2.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,8 +21,10 @@ DEPEND="sys-devel/gettext"
 RDEPEND="
 	${PYTHON_DEPS}
 	>=x11-misc/wbar-1.3.3
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+	')"
 
 S="${WORKDIR}/${PN}"
 PATCHES=( "${FILESDIR}"/${P}-install.patch )
diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r5.ebuild
index 2c5f19167c25..91921185ba32 100644
--- a/x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild
+++ b/x11-misc/wbarconf/wbarconf-0.7.2.2-r5.ebuild
@@ -20,8 +20,10 @@ DEPEND="
 RDEPEND="
 	${PYTHON_DEPS}
 	>=x11-misc/wbar-1.3.3
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+	')
 "
 PATCHES=(
 	"${FILESDIR}"/${P}-install.patch
@@ -33,7 +35,7 @@ src_compile() {
 }
 
 src_install() {
-	./install.sh "${ED%/}/usr" || die "./install.sh failed"
+	./install.sh "${ED}/usr" || die "./install.sh failed"
 	if [[ "${P}" != "${PF}" ]]; then
 		mv "${ED}"/usr/share/doc/{${P},${PF}} || die
 	fi
diff --git a/x11-misc/wdm/Manifest b/x11-misc/wdm/Manifest
index 1b72349d5915..9981c106ecfc 100644
--- a/x11-misc/wdm/Manifest
+++ b/x11-misc/wdm/Manifest
@@ -4,5 +4,5 @@ AUX wdm-1.28-remove-fakehome.patch 950 BLAKE2B 127755e61a73772d20625c32e9263f386
 AUX wdm-1.28-terminateServer.patch 422 BLAKE2B 6d85344c1b045a8dfc206c6b0b4f5375be3d62fcb69335c628e1d63b131d62cf54784a9f84a27d49e7ed1c0aa48982bb4c5fa95249bfe6e0203991e1e6c0b381 SHA512 f00685ce1ff38f34df57864d05dd52b7148d27a81177f2c560157a470b089bd9b981ae73bcc6da8c1995822d8b74c6dffdb6166dff33adcf4cd4daa2bc9dc8cf
 DIST wdm-1.28.tar.bz2 381522 BLAKE2B 72105e949c5bc8043967f5b36838c171e32728a40d2ef5f6fe618b04337e3f37329696a7f9f1cee591bf1a037de4ca4168f270a316375e27fd7ce0c919880833 SHA512 393ace12d3975e978c05b90be691a7c27921e7e2db0bdef5f4fe06b324da56edea4936200dc123130c6de9e45af5dac6175559d641957fec104d66bad67c03a1
 EBUILD wdm-1.28-r4.ebuild 964 BLAKE2B b2714b4eb0a0ab4316d3b2d2d6700c1cd8262346494aec00db40b7ddb9bb037cd289ccdaf64c1db612cf7b67ce6fb16f59acc86c248ba2bc61b40f9056e9915e SHA512 9a0df70e77c7d40681cb44291f0ba2132a00ccdf90ebe430f62896ae65cca766d31d921b5d8d2f9b0d540a7caa08c4650b1a2684710fe56c00e307540833df6c
-EBUILD wdm-1.28-r5.ebuild 1139 BLAKE2B 095ce6dfef68e23c0df67a6c407b72219a4f5dfca5e15454d24b3204798061012e60c84087c0c587871472f41403adc6d15f4aef09986333b8ac01bd6b45da2f SHA512 69ef29063c09cf477ffb0625cca76cb904c37949f6e286dbd371d023a1870a229f9baacc16cd1ffce427c79eade9db658358ea44309b5e52b3217ffe6b94c28b
+EBUILD wdm-1.28-r5.ebuild 1137 BLAKE2B 86d6821c182674a55f4675c4c242ef01a2c1b116cc835c9502a53fe26cda5db09060a16667cd5f59a94d06277665585de7c1ee8eed8dae30aa6eecc8ca0974c2 SHA512 51eb29bdabf8090de9223993fe36cafc7787880c92c5daa14421b78cb0e22a6d8c949c90a18033b6fb989f55993e60b45ac9860f64a18d6540de4bfe86a7a719
 MISC metadata.xml 350 BLAKE2B 1b1cab426ff16f13bed9114bca2d0d543457d97400f739a78cc1a1975683a7ae7c48630af6033f9f94268fa61f9382b6caa056346b2eb3038a83523261b4c8cf SHA512 deecfc72a65212b6498334be4dc9abc35d9f22b64f041181474bbeca8fd71d1e3ebdcccf9a98f57ccc57bd37958b206944c9f520bc7c4cd2d8329f9ce14a0b19
diff --git a/x11-misc/wdm/wdm-1.28-r5.ebuild b/x11-misc/wdm/wdm-1.28-r5.ebuild
index f31e2f6ea263..d6edd5dca123 100644
--- a/x11-misc/wdm/wdm-1.28-r5.ebuild
+++ b/x11-misc/wdm/wdm-1.28-r5.ebuild
@@ -52,6 +52,6 @@ src_configure() {
 src_install() {
 	default
 
-	rm -f "${ED%/}"/etc/pam.d/wdm || die
+	rm -f "${ED}"/etc/pam.d/wdm || die
 	pamd_mimic system-local-login wdm auth account password session
 }
diff --git a/x11-misc/xdg-user-dirs-gtk/Manifest b/x11-misc/xdg-user-dirs-gtk/Manifest
index ab9f290fcbd8..a42c0c91ef68 100644
--- a/x11-misc/xdg-user-dirs-gtk/Manifest
+++ b/x11-misc/xdg-user-dirs-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-user-dirs-gtk-0.10.tar.xz 116528 BLAKE2B f86237859636046ecc72bdd62ee5c6a3726ad701aabe04f14bff6541554d3e9de82265cb95b353714adba5d6c8742f94150df9b6f3e4043db9e6885e61e569c1 SHA512 c3ef070244cd1c87312c2c2602dbe7bc3dd26eed632b0d8d779580d7ee6259efdda453ab7bdf4415cc72fad7a74d9dd36476189fe446d5627e4db75d905302f5
-EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1109 BLAKE2B 49bb8dd17a44bcfd5f0a8a6c0b059c670613f3ca32099cf3102dbaad785fd462bf8be857decce6120fdd2985ee432777c08fd6d49506470e2de419435c0fae02 SHA512 da7676ac521af50196434bd442b8534a7db42785e6c47fd20dd27f3314635cca8083493a097f9197cf69e0a71ea68457a54d8e48377e842652a242395c409cfa
+EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1110 BLAKE2B 2e9ea4b5ffa939840e3681b8a9fa23e378e01ec85342e96e4e95c392b4a3d016a57064e168f12eaf3eba3f9dc8258202eb78c66849f964ae745bc67fd5ad351d SHA512 c3518e6ed37dae65117e7a8372a6c53cb01c068643bdc70b26c21604aa63dde3ae0f4031f90f9bda7b0958d294cfe3cecd772ea18ed101dece6dc0c021420912
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
index 62e640ff2d57..71d92d0a6d07 100644
--- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 07bc37dfc4ad..99dc5bd167b1 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,12 +1,10 @@
-AUX xlockmore-5.46-freetype261.patch 587 BLAKE2B a5666fd2c06d23b388d20cc8fbb6b64b47e81c219a248f539e76fdaedafba8765a3f8786483d801f8f95703b1d6911c4d595bb904daf5a010faef7697ceb1226 SHA512 330d2120a0e3c9c6ffffe90e1fdde255325394fc03aa4f9d532086859e6bdcb3f80aeab4a0b4d7f5eae4bcaef69fcba924ec86014c3c8e13fe8c878f9ebc8077
+AUX xlockmore-5.46-freetype261.patch 561 BLAKE2B f5fde1a8984784a2892363b85413728b86082f8bdd3303358643bcd634a80bc6064fce930aabca92624897fddf71c0647a6202e7e0debb02b4127d275c99b57e SHA512 58b75f4509f4762f4009fce797b5f0420ac3bee79a3fa4444a90603b1522c5f60deb9a1ce94ecacb025d27ac6272f2b431075af912b121f6e5cfa541b696caca
 AUX xlockmore-5.47-CXX.patch 613 BLAKE2B ace9eb868bcdf4fa7fda07d5a0dfc316f992fd176616c531aa71ff5d051169165f991dd8a586685b5a0b8e1a66b0da247a441fd7a56ecd24cc39bd58f2267e8b SHA512 4eef79a2b791401433ae0c6e55179975f88b74c4e57cd64ca81df48a232723e5edaccbd7045c9f67ba81ba159e70257d5e070ea59808f52430ac08539ea91087
 AUX xlockmore-5.47-strip.patch 2048 BLAKE2B 0f0f00a38e1d3b5edebf40416698ad3b87323ce9167e7a3e0a44ca2fca853b16e9c1ff59ff74b0bf50b3484e25722a3ee840b312f2f249644614aef55095bfcc SHA512 2de24cbacab2a54e7a41f4604625096030763ad6212ec30b34be2c2fc4035b44f146bfb9d0a34df9c9ce4fa96a0eb1c9c7701b512a917fdf3eb56a5195c8585e
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
-DIST xlockmore-5.59.tar.xz 1935296 BLAKE2B 3a7027dad227179dfe3917108f8960a751cc16481fef541e80c656f99832de6d203cad1815f0f31f66aa2338d06035a99dce18664af2bc0b8e4610ef25339d20 SHA512 02758869ba597ef32ed1e594fa88141644264bbbc8edfe9ae8742a4508fa3e38d059c9ffbb9fa9bcc323b92e1763f96c8b6d054494849df465a08bc6be71bf33
 DIST xlockmore-5.61.tar.xz 1936312 BLAKE2B f4d12f1dbd5da1d8cef16690e393fdd9ba4162722398c8239c0091f2cd46cc3f401c1a62ed1910bf37fc0d98f0bf0723ca9003caf507e3d8a6a83f7b51228f35 SHA512 be64b3dc22f1c0c310ed4a085fcaf9f7ed96c5d2a97f3359966201df54fc5acfc3e5d94cb0616a28a217e0cc6954f9a519198c238e40202263a7c03438771a7d
-DIST xlockmore-5.62ALPHA0.tar.xz 1942228 BLAKE2B 3b40c3d7c29a4e285dca7b6ade8555f0946872c65920be691cff859558abd825709d5adf9b9abc95bede94a6905845910562552734817711a8e3d1dc99bb2f7e SHA512 095a5d9e382ea61f77d5888fe2e38b216991e47cbe9e9739a4ccd06a8e7992284bd2ec85d73ea3a1ed07e57e3fa29938732f813360db2d146efa9e21fecac7d0
+DIST xlockmore-5.62.tar.xz 1943836 BLAKE2B 6ce9b9ad709881a50eba0e32ae1e7524414a5e92e34daeff1ce68b6bb4738117155543d15219723ab514d520064601824a22d438541a699c742ab0c620285c64 SHA512 fc7c63a8ce781ba1a9598b5e3d585cc85051da864dbd59e3232b2fa6b6529743f9244e52bdf588ae438c02a2e1e745eb81b372234189e73ae6698cc962c387c2
 EBUILD xlockmore-5.50.ebuild 2166 BLAKE2B d16a6e03566a9d6317c30770a4db9ac4cac59a40969a39441407452f1384e536a25efd6aa6bea54d496714de03ac52c511b0b2ec4340977c151460e61d72a405 SHA512 25f71e1a893560db9f82c91214f375d9957fa658205f856686dc407ab59473a15355866255ad0a2ac3f50a5ed1047fe97d4770ffbcd712577d5eeccdb94cccd7
-EBUILD xlockmore-5.59.ebuild 2215 BLAKE2B 23d6084ca97979ba699487f1676a53cd3f5e68d9b7e41ac5d70ed45cb7eadc6009f52d83a9a7af12cfc1dc87c40ce6f0285b1d14b4e3a0282b321dc8fd22b7d1 SHA512 bfed1a62f23710eba0f57570a1a43533400eefef3b7d556a9063f0fb8803b227c39290101bd83ea371dc8c4be53898b1f79c0b43cea0227a661369a1015d3704
 EBUILD xlockmore-5.61.ebuild 2215 BLAKE2B 23d6084ca97979ba699487f1676a53cd3f5e68d9b7e41ac5d70ed45cb7eadc6009f52d83a9a7af12cfc1dc87c40ce6f0285b1d14b4e3a0282b321dc8fd22b7d1 SHA512 bfed1a62f23710eba0f57570a1a43533400eefef3b7d556a9063f0fb8803b227c39290101bd83ea371dc8c4be53898b1f79c0b43cea0227a661369a1015d3704
-EBUILD xlockmore-5.62_alpha0.ebuild 2215 BLAKE2B 23d6084ca97979ba699487f1676a53cd3f5e68d9b7e41ac5d70ed45cb7eadc6009f52d83a9a7af12cfc1dc87c40ce6f0285b1d14b4e3a0282b321dc8fd22b7d1 SHA512 bfed1a62f23710eba0f57570a1a43533400eefef3b7d556a9063f0fb8803b227c39290101bd83ea371dc8c4be53898b1f79c0b43cea0227a661369a1015d3704
+EBUILD xlockmore-5.62.ebuild 2215 BLAKE2B 23d6084ca97979ba699487f1676a53cd3f5e68d9b7e41ac5d70ed45cb7eadc6009f52d83a9a7af12cfc1dc87c40ce6f0285b1d14b4e3a0282b321dc8fd22b7d1 SHA512 bfed1a62f23710eba0f57570a1a43533400eefef3b7d556a9063f0fb8803b227c39290101bd83ea371dc8c4be53898b1f79c0b43cea0227a661369a1015d3704
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/files/xlockmore-5.46-freetype261.patch b/x11-misc/xlockmore/files/xlockmore-5.46-freetype261.patch
index 5258121bbbea..819708c6be80 100644
--- a/x11-misc/xlockmore/files/xlockmore-5.46-freetype261.patch
+++ b/x11-misc/xlockmore/files/xlockmore-5.46-freetype261.patch
@@ -1,5 +1,5 @@
---- xlockmore-5.46/configure.ac
-+++ xlockmore-5.46/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -1912,7 +1912,7 @@
  AC_DEFUN([AC_PATH_FREETYPE_DIRECT],
  [test -z "$freetype_direct_test_library" && freetype_direct_test_library=freetype
diff --git a/x11-misc/xlockmore/xlockmore-5.59.ebuild b/x11-misc/xlockmore/xlockmore-5.62.ebuild
index b993e74bcdd2..b993e74bcdd2 100644
--- a/x11-misc/xlockmore/xlockmore-5.59.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.62.ebuild
diff --git a/x11-misc/xlockmore/xlockmore-5.62_alpha0.ebuild b/x11-misc/xlockmore/xlockmore-5.62_alpha0.ebuild
deleted file mode 100644
index b993e74bcdd2..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.62_alpha0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic pam
-
-DESCRIPTION="Just another screensaver application for X"
-HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
-SRC_URI="
-	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
-"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
-
-REQUIRED_USE="
-	|| ( crypt pam )
-	pam? ( !xlockrc )
-	xlockrc? ( !pam )
-"
-RDEPEND="
-	gtk? ( x11-libs/gtk+:2 )
-	imagemagick? ( media-gfx/imagemagick:= )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	nas? ( media-libs/nas )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
-	)
-	pam? ( sys-libs/pam )
-	truetype? ( media-libs/freetype:2 )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.46-freetype261.patch
-	"${FILESDIR}"/${PN}-5.47-CXX.patch
-	"${FILESDIR}"/${PN}-5.47-strip.patch
-)
-S=${WORKDIR}/${P/_alpha/ALPHA}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use opengl && use truetype; then
-			myconf=( --with-ftgl )
-			append-cppflags -DFTGL213
-		else
-			myconf=( --without-ftgl )
-	fi
-
-	myconf+=(
-		$(use_enable pam)
-		$(use_enable xlockrc)
-		$(use_enable vtlock)
-		$(use_with crypt)
-		$(use_with debug editres)
-		$(use_with gtk gtk2)
-		$(use_with imagemagick magick)
-		$(use_with motif)
-		$(use_with nas)
-		$(use_with opengl mesa)
-		$(use_with opengl)
-		$(use_with truetype freetype)
-		$(use_with truetype ttf)
-		$(use_with xinerama)
-		--disable-mb
-		--enable-appdefaultdir=/usr/share/X11/app-defaults
-		--enable-syslog
-		--enable-vtlock
-		--without-esound
-		--without-gtk
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
-	default
-
-	pamd_mimic_system xlock auth
-
-	if use pam; then
-		fperms 755 /usr/bin/xlock
-	else
-		fperms 4755 /usr/bin/xlock
-	fi
-
-	docinto html
-	dodoc docs/xlock.html
-}
diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest
index e18a110f53c7..623a61403b7d 100644
--- a/x11-misc/xosview/Manifest
+++ b/x11-misc/xosview/Manifest
@@ -1,5 +1,5 @@
 DIST xosview-1.20.tar.gz 146373 BLAKE2B 7d53b5f2f8ce463917a1cfa65eedb60c835c6d530a19ede6bba6bfe295a01582861ca3fb7513b9a8590d9fe5111779a38db8723a2e38c911f002bce88bfc95f6 SHA512 25cd6a8cdaaff9121f0e8de7a1799d4c2706c5eb1111f3b3f8427b16e45a333fb4c675a1dec2ef6b40773e83124ff27eacc82f2b9eb6c836855930cbbf08957a
 DIST xosview-1.21.tar.gz 146428 BLAKE2B 899e0cb68489bd02e035765f8f33424d41996b80a7c16651f60a2e46538cf4eac1a9377342c2ed4f35da6cb00aa3961e34802c77fe26e4743a23e2d3dc443484 SHA512 9c42247d9e9b391b94c18ffc8c38df414f5293b7426aa57d3b357e680b02e9a3a2b332299905f2f529d488c23590e957cad9e088ddf753a6904905e2dff8074b
 EBUILD xosview-1.20-r1.ebuild 1199 BLAKE2B ac32bb78ba75f80e44e1f4274da49e3823aa76d86ab36626bfbb6894f4aed4100c9cccaec494884f0230410d5274db90af18fada6675c8a62d0c58945cff30fb SHA512 6495b16378dddf4a39ba53bf5d781d464ee32e5dcdbcdb1b9ae5e49d22e4841ed7414ccb85037a5292caf7d04bd24b3137f9b2947fea8861e722c6539466d0fe
-EBUILD xosview-1.21.ebuild 1203 BLAKE2B 35780c1fbe4c4d9070e9ab245bdb46d115dc910d4690fc25b549deea37c134cf59e13cdcbcb26a9e9c02d0f5c799fce45f07278022d77eb6eacefdec84f3be86 SHA512 1e78f0a0c87d266229a7bb533b701180d843f8f77e0b8e566feb62df715301429ac872cd7219140d60a78b79506da6b7f2fc141f81ab3b53e13189f0c7b7ca9b
+EBUILD xosview-1.21.ebuild 1201 BLAKE2B 825c03480f61d70a36d226860f2e363c2a948dd2a532774e3f9d4ddde41a980c27240eaecaef2cfeb80e483f97f646f82bb3b20ce7ab0df9460f244363c80792 SHA512 cc61c884b3ae13425f80da6995bcb17ef04b84bb9822bb7f5f9c613475e3888980b52ff88ed1d01b32619e68ea9b7f3425aa6de23bdfc7ab5d508daae0027327
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xosview/xosview-1.21.ebuild b/x11-misc/xosview/xosview-1.21.ebuild
index f19498d37816..002938c66082 100644
--- a/x11-misc/xosview/xosview-1.21.ebuild
+++ b/x11-misc/xosview/xosview-1.21.ebuild
@@ -37,7 +37,7 @@ src_compile() {
 }
 
 src_install() {
-	emake PREFIX="${D%/}/usr" install
+	emake PREFIX="${D}/usr" install
 	use suid && fperms 4755 /usr/bin/${PN}
 	insinto /usr/share/X11/app-defaults
 	newins Xdefaults XOsview
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 6c87c5553e5f..5f4b8efa8ad8 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -12,8 +12,8 @@ AUX xscreensaver-5.43-offensive.patch 1799 BLAKE2B f85d26a07ba2712855567a0779eaf
 DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
 DIST xscreensaver-5.42.tar.gz 26903469 BLAKE2B a82716a3f1f19f85eb1bc7a8ba1981221ac2ad47c1411687f1043da7e50edada73ab9c7465d655546f8a9015db69ab4f35ef8ff2a0b3d79f5a59d3e02aa2f819 SHA512 84cde9364c933de720acd51a0bf75eb4d0642d60f62b92de89d932233eb5abb51e1edb53cd413b2dc4801a02cb68652a28d7d1f83cdaa8d8cdd1fee7d651eefd
 DIST xscreensaver-5.43-r1.tar.gz 26973508 BLAKE2B 67b57214e8a41ba895df6e9efcac3e712f24be06ee7914b38d3a8e639d4945c927c4ac28469d2180bc4a3999a4b89d2a60e633799ac5204c42fa17ad76dd21fc SHA512 7ccaf30fb05ae2110f742f1a5c99f83cd4c8e6749124066b5a418cf3e0ba1b8ff09858eeec29c11b0c8ea428b95b2916481c50cee6a5d952ec941b3ad1b6adcd
-EBUILD xscreensaver-5.38.ebuild 3408 BLAKE2B 85e26671a2162ef909b6f7567cf70cde5dac8bdd5fab8e3757fd8493d8ebf44b382b4983f35e61548ced9d6f315b16e20e5878df63cd9d5e1ac8116d7b41e855 SHA512 32b8695b9402fff813b002f59083b638ac3a181c16b8051a8b959d628f530424d098276401c892ff474898ae0ede9e5c72f057403c7a221d285152a6569da7a3
-EBUILD xscreensaver-5.42.ebuild 3401 BLAKE2B 6008a494b624d49bd69f7fbb6b2d155d75d7f4ff0bd848e70193fd906884b2a1342aad80a0d93719892e73d4fa776e7e92bfa0aed1f6588dd3ee1764612d4129 SHA512 b20cb44c72af6f55796a269bf233f8c557ccaed2e6a3242fad8fa5ca0d175e1ab26586672fd7a2a0870247b15443084412ad69b592d0360514c094c84bf59673
-EBUILD xscreensaver-5.43-r1.ebuild 3442 BLAKE2B 7cb5c74a413cff4c95b649be15cf08d930dbc10e393557eb5987fad058f7ed49cbf71b20f15a8eaf4d1d3620ba8501d175b777ffdd246393d8e34d049fee9e0d SHA512 cdaf898566a3b00015aeb1f73c909ad817be9ff9087468bab74223351def40bbe1ee477335dc455c157d82f33f9b735d0f57eefb09cdc57d97476a2f1852495d
-EBUILD xscreensaver-5.43-r2.ebuild 3444 BLAKE2B c86e25198d52538c0234da6d3157c687f899f41b70c78dc7b728e1f7f7d660e271054d0b31d313dfc33ba2da3fbdb95125501719f874fe471a068d4d4f246847 SHA512 1812eb23c921e09663bf4471d2591d9ddd30ad9209b9ecba146d180f3ef1d8bcdecf603c4eb8225e4904188b3d119ace66d963101817ea08d9edbaf319e044b1
+EBUILD xscreensaver-5.38.ebuild 3409 BLAKE2B d9ce98672b029191da8b8b2ae6c160a8061c923b49dc85a0869009a0cbdcac98be3a0ed0b22cdd9ff7625a36d2b55e4e347d63be556e939e61da925cbb2049c3 SHA512 7dc0a26b82a3a3eda05af891c6331f5061ccfcdd0d63a504bf2e12c6444ae28eaf8eab8c0e98f8f4a477eba3bc4729721075b566ec0f31c1b13d17a33fe5d66f
+EBUILD xscreensaver-5.42.ebuild 3402 BLAKE2B 266daa4dfb7b02fc3e8635aabc1600603ff29c62555abbd9ffb320873d85c94692d8e88043041150d8679441e8d8b2e23da90293500dbd489b32547e9024bfb7 SHA512 d0c0172babad596a0c18dae0de277733de94c2292c0cdd540c30cb1c5361eeea2d658124db6bbc29ea383879b7046ad2e58332598360d2c7e1a2153f171b536c
+EBUILD xscreensaver-5.43-r1.ebuild 3443 BLAKE2B d4ee4e76e29bf6b9a1656f8137472c013a4cb7f418af5a943df3f3ed04fd62d378ae46147c0c3cb65ac15e173adc9002cdf52467f51d57989b3fcfc1b8164249 SHA512 5b491dc5ff639eede1678fb74d2338a25e0f28efb0e60450030d4cc1a86b833a3273392c5eb69a23bdd06bd5a4a90118daf646e880cd4e29e1669ff5a1906b9b
+EBUILD xscreensaver-5.43-r2.ebuild 3445 BLAKE2B 5b2d7b4484cc82c336996251f39f6308dd58230598f37a987c4e5b3c55d8ccd13db805a3409a33db56c4705df12295515658206f00b42e89b5c815f3c00321da SHA512 c93b67a8c87326e33d90feb79823aa69258a77dcc15a8008b4ada06db0cefcdf1a8202dc3fc6864eb65952a50a6673b469cb622b5a41213b773f133efb2e34f8
 MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
diff --git a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
index eca91dfbc852..6ebfe87bb887 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xscreensaver/xscreensaver-5.42.ebuild b/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
index d3224ffad7b0..b0eaeda5d446 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
index 626d74e50e27..cb4566b00df2 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
index f9b66cd52c59..66f449186fb1 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index ba1e92e010c7..aded634839d7 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -2,7 +2,7 @@ AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd03109
 DIST zim-0.71.1.tar.gz 2883082 BLAKE2B 66d1c571a67e12d8d38cbc6d8bd32918f98f47bff0aa34971986896b3aeec91170cd1f2a87a411a8fccda502addd3de8176cc70ebfbafedc87c462a751e87036 SHA512 0da59955f730cc0bbee033a292c7e531b1a302c950773aed68bd8a18bf1485826086522c4144f24f500e9240ebcb9b592b33dda390923ca0eba6ab57273c0896
 DIST zim-0.72.0.tar.gz 2590406 BLAKE2B 0d77052e9eaa62b855be30eee64863197498ee54949f8610528ccd86cf32e7c9c55fb2faca719a4d92e0568941dc6b100299e76a33f8c49bddc5e367ec98d923 SHA512 60f59c2cf2ebb920515ecbc77e7fb1ddb9b0a6f6179503176b582b6b87ada759707ec4ccee929896a8a7d489f25ff13f7a6ff61fa637ecdb3d02640182cda0b9
 DIST zim-0.72.1.tar.gz 2596910 BLAKE2B cdc6c875ed316dcd5655d75c280b46189d9b7068922ea0cc05606bce8f5bd0ef7d92b7965ee0af067add28ef75f53363e864b3ca43d216dbf99fe2cac6e19a73 SHA512 3b74388eb9272e6c5c89e752d784428b18ffc6cbc76311162aa8f42f2de434ad8e9f9c6932b8aaa62e2a3abdb879a31c982cc3103e7eaa3a5407a02cb6750bfc
-EBUILD zim-0.71.1.ebuild 1908 BLAKE2B 7f7ccbb6757d758096d682d813cdf26352042ff9b0025a288fd20fc555bc2e78a762cc5af1e5216d85240ae58ca722566443212d118563e27807f96737aa0305 SHA512 5401f6bff60e4518f5f5df667da340b8da29b7955b3095a94896d72f9a36c1589bdb7493bc91c9295b56ac65e781c797fddf64713e68de41ade1f2ec3a6a603d
-EBUILD zim-0.72.0.ebuild 1891 BLAKE2B bf456447163aa74af87dc9034c3318c5107f7c4d100ee3b2ea67d6c6836df6378add13ee45d79dec06af20257f10f466adda9c84d4f32dc443e308d902ccbc85 SHA512 9ec423255032328da8756fb7d762fa818cebf9c4da83f8358b91c386ea5ba959108ff15cbc1637d7a18501c0ac62808849dda7e420adf2b18b87121fa88ed0f7
-EBUILD zim-0.72.1.ebuild 1891 BLAKE2B bf456447163aa74af87dc9034c3318c5107f7c4d100ee3b2ea67d6c6836df6378add13ee45d79dec06af20257f10f466adda9c84d4f32dc443e308d902ccbc85 SHA512 9ec423255032328da8756fb7d762fa818cebf9c4da83f8358b91c386ea5ba959108ff15cbc1637d7a18501c0ac62808849dda7e420adf2b18b87121fa88ed0f7
+EBUILD zim-0.71.1-r1.ebuild 1951 BLAKE2B 252170b5d9f586212befa366909af94a1ce9e5eb78536bd9dc952f4c539c5e32e0eed71e96deb276c877dfcaff698f91993dd715e08c4b07c54dd79cd7053c30 SHA512 9525cb0a84df79ea7330ade619d242bb315184a893cb570965014fff8bc2f1c9face8f790b989859ef2c203b5cf1369b4c55a1b3b6bffcea3f0ad9bab9c71577
+EBUILD zim-0.72.0.ebuild 1934 BLAKE2B 55516ba1fe0208901156c6beab8bc6a36ed3bfc60bcd1891ea129ab33d213effa7c6d3d12c9de3a588d7ca2f939d2800729577178283340d9816322bae244b84 SHA512 842f5ef971f44df01dd775c7ec65b13766b615caa6bdc862ddbf878c1022356e1749220d2c6437bc80ba234904535d00893094e76768ea92525d47c4dbb1d052
+EBUILD zim-0.72.1-r1.ebuild 1934 BLAKE2B 55516ba1fe0208901156c6beab8bc6a36ed3bfc60bcd1891ea129ab33d213effa7c6d3d12c9de3a588d7ca2f939d2800729577178283340d9816322bae244b84 SHA512 842f5ef971f44df01dd775c7ec65b13766b615caa6bdc862ddbf878c1022356e1749220d2c6437bc80ba234904535d00893094e76768ea92525d47c4dbb1d052
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.71.1.ebuild b/x11-misc/zim/zim-0.71.1-r1.ebuild
index 17560f2d59f1..5408e1591821 100644
--- a/x11-misc/zim/zim-0.71.1.ebuild
+++ b/x11-misc/zim/zim-0.71.1-r1.ebuild
@@ -20,8 +20,10 @@ KEYWORDS="amd64 x86"
 RESTRICT="test"
 
 RDEPEND="
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+	')
 	x11-libs/gtk+:3[introspection]
 	x11-misc/xdg-utils
 "
diff --git a/x11-misc/zim/zim-0.72.0.ebuild b/x11-misc/zim/zim-0.72.0.ebuild
index 7d6ec427d216..64ca6bb5736a 100644
--- a/x11-misc/zim/zim-0.72.0.ebuild
+++ b/x11-misc/zim/zim-0.72.0.ebuild
@@ -20,8 +20,10 @@ KEYWORDS="~amd64 ~x86"
 RESTRICT="test"
 
 RDEPEND="
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+	')
 	x11-libs/gtk+:3[introspection]
 	x11-misc/xdg-utils
 "
diff --git a/x11-misc/zim/zim-0.72.1.ebuild b/x11-misc/zim/zim-0.72.1-r1.ebuild
index 7d6ec427d216..64ca6bb5736a 100644
--- a/x11-misc/zim/zim-0.72.1.ebuild
+++ b/x11-misc/zim/zim-0.72.1-r1.ebuild
@@ -20,8 +20,10 @@ KEYWORDS="~amd64 ~x86"
 RESTRICT="test"
 
 RDEPEND="
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+	')
 	x11-libs/gtk+:3[introspection]
 	x11-misc/xdg-utils
 "