gentoo resync : 10.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
commit: 71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree: 9f1f0dee23e13658e52f49437befe78427148c51 /app-misc
parent: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)
62 files changed, 302 insertions, 159 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 7990eeca4e3f..74bacfd3969e 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index f424a9d18d51..d1b3c5a8a952 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -2,7 +2,7 @@ AUX anki-2.1.0_beta25-web-folder.patch 498 BLAKE2B 5a89ac454e8b4c551c7593bc8d428
 DIST anki-2.1.0_beta25.tgz 4117303 BLAKE2B 0f7021c4da4efa918c285fa6bf85242e52999d0f340d4a882651cf1e2857ac015f6f99967d4a7fee6df92a2b3c4849eb838707b08abd04d534f4d21ce28eb749 SHA512 9ddf984c575df00fe9b7974f24166a0f18d63e904b3d9bd4370de506828a251efed0fb319f06dc23c6852aae46e552994c6633880603a6e746d4d242b9e627f8
 DIST anki-2.1.0_beta27.tgz 4127906 BLAKE2B b4f83cc30dc3e89f3ca17c03ba8dcfc9a487de43d8ac564d5dc83488e286c302816c8a8140aa764b596404194c5f3727218deec303ef201ccaef38b945d8b32d SHA512 50b4ece1361ecafdfe08dad04e9b622b1e8ba2224bfef7e4660c95f81cb8f525d892170548d741ff53bc19ff4c13863f488a71c31c8328511fea3203d2c345f1
 DIST anki-2.1.13.tgz 4248906 BLAKE2B 82a2a9a556cbf3596af22a73a2865815561cdd408b249443fc7e144734fdc2b62317120db71475afd7b0d4027f19e53c47437132028ef78b158ec3624f54a33f SHA512 921ef48b16c0c8c83b85523aa0a5b828210b210cd51fa471f57e9aa6777a1aced30c7e24084ef0c2f14c9d846a19091923d13faaff7ed9075860fc23f8ba1cd3
-EBUILD anki-2.1.0_beta25.ebuild 1905 BLAKE2B 829fae8c282bf4e1cd4fbce8f316b08f038da25f88563b07844c689d195483bc8639d7ed52901e7fae9414dad6d8ec97a1c07c235b22bc074a2bd6f987394265 SHA512 e32db8ebf71b6179a243a47c914be8ee0c2c5fbd3b7fc1f11edd0e59ab89b232160239bf51e5680028568e45337e786e73013ace994c82344dbe5ed6d599e7eb
-EBUILD anki-2.1.0_beta27.ebuild 2072 BLAKE2B e75ad518d27e1214490522445fa0e77aa446816a84c393fecfa3900b98b33ae46043daaa2bbc3f5d94df504307bd49dded57a97bbda1b7eb054d9eb67dffa015 SHA512 7601927a486cd07af40881c9f4763dde1b6752ee161705bf1adf3fab9ccb01423e69b975cae6e7f97f08fbb9ff00a3e22418c02f30d48ea9661b46778867a1b9
-EBUILD anki-2.1.13.ebuild 2180 BLAKE2B 66911e134bf317bf589c3a470d380a2dc1d9df543942a8e1c618658de59b22c10747deee8fa335cdf77d8f81d04d7431b364c80a5272373771762daa1c19c7db SHA512 dc2c6c7374c56c9961c44de9842e3a468e08f540cb06591de5cb77090bff6ad68a93bd7bda3c74e502518dae470b87b66d3641e7d31ee6310cb275ceec7c3968
+EBUILD anki-2.1.0_beta25.ebuild 2034 BLAKE2B 92f9982dae6bf17a571ffca9dbbe9562fc13747d9d21452744b5bddcef5b038507218f914b5932f93b69833f25344a1631c15cd3d1625a09ab7310bec89ffb2b SHA512 6b8fa96df089ec57332f1bd5acafacca6ea1d16c6b3efb56a62aa0f93389bf3923bd00b1eda5df95dedc41cec17bd9856c868288262120c68e30b3df0771a97d
+EBUILD anki-2.1.0_beta27.ebuild 2219 BLAKE2B 76dcaf2ceb91906c74149db1559499628b86ce8a3491109da81d02a8c3eff1ecc94a4eb5cf06ce01e10aca4a6b2cc53bf71c962e3d607d7062face38f1dec2c6 SHA512 4261913d808ec9dae0f26b799f0a96fc8d225202626d9ee590fe3634b2d10f74514ba1a00401cf055a153251b243698c8463a05204e8baf0d528aae07da637b5
+EBUILD anki-2.1.13-r1.ebuild 2317 BLAKE2B d14f2116c5f2358160e80dcdfcd109dc0dd3c968cac8e5e5ed5ccf0047b87ebae804f7e68e0368a1f0504e590631b37e9590c1bd92bf7d66493b2bc44ad23075 SHA512 22cc7c60afeb37590c74bb7710e418a8cccf7efee418788cc4de06483ff053c2b50ce461229e1577834d47ee4099647da1212ad3e31d8dd76c64986782c98150
 MISC metadata.xml 619 BLAKE2B a41d6e72dccb367627bfc34855a7f2dc657021907f1940c837ea99f134bf30cccb84157c6eea96944fee4e4d5275c329b5721abcabfb31b3a572b86789cd0ed2 SHA512 8b6656964a3c2cee9761b278839f31546a3fe2a4efd500cd015658af3502b548888e939bbeee45ead9c88632ade12c7f0ed33fcf8cdfc6d0ac91de63ac8bb351
diff --git a/app-misc/anki/anki-2.1.0_beta25.ebuild b/app-misc/anki/anki-2.1.0_beta25.ebuild
index 7a709e1e39e3..7e5c0bc5b290 100644
--- a/app-misc/anki/anki-2.1.0_beta25.ebuild
+++ b/app-misc/anki/anki-2.1.0_beta25.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
@@ -23,17 +23,19 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/PyQt5[gui,svg,webkit,${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	recording? (
-		media-sound/lame
-		>=dev-python/pyaudio-0.2.4[${PYTHON_USEDEP}]
-	)
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[gui,svg,webkit,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		recording? (
+			media-sound/lame
+			>=dev-python/pyaudio-0.2.4[${PYTHON_MULTI_USEDEP}]
+		)
+	')
 	sound? ( media-video/mplayer )
 	latex? (
 		app-text/texlive
@@ -41,7 +43,11 @@ RDEPEND="${PYTHON_DEPS}
 	)
 "
 DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/nose[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 "
 
 PATCHES=( "${FILESDIR}"/${P}-web-folder.patch )
diff --git a/app-misc/anki/anki-2.1.0_beta27.ebuild b/app-misc/anki/anki-2.1.0_beta27.ebuild
index 341c641fe86e..9b0a46164d62 100644
--- a/app-misc/anki/anki-2.1.0_beta27.ebuild
+++ b/app-misc/anki/anki-2.1.0_beta27.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
@@ -23,23 +23,25 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	|| (
-		(
-			>=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_USEDEP}]
-			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		|| (
+			(
+				>=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
+				dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}]
+			)
+			<dev-python/PyQt5-5.12[gui,svg,webengine,widgets,${PYTHON_MULTI_USEDEP}]
 		)
-		<dev-python/PyQt5-5.12[gui,svg,webengine,widgets,${PYTHON_USEDEP}]
-	)
-	>=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	recording? (
-		media-sound/lame
-		>=dev-python/pyaudio-0.2.4[${PYTHON_USEDEP}]
-	)
+		>=dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		recording? (
+			media-sound/lame
+			>=dev-python/pyaudio-0.2.4[${PYTHON_MULTI_USEDEP}]
+		)
+	')
 	sound? ( media-video/mplayer )
 	latex? (
 		app-text/texlive
@@ -47,7 +49,11 @@ RDEPEND="${PYTHON_DEPS}
 	)
 "
 DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/nose[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 "
 
 PATCHES=( "${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch )
diff --git a/app-misc/anki/anki-2.1.13.ebuild b/app-misc/anki/anki-2.1.13-r1.ebuild
index 15c2f2cdf075..9c1a33eea458 100644
--- a/app-misc/anki/anki-2.1.13.ebuild
+++ b/app-misc/anki/anki-2.1.13-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
@@ -22,19 +22,21 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	|| (
-		(
-			>=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_USEDEP}]
-			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		|| (
+			(
+				>=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
+				dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}]
+			)
+			<dev-python/PyQt5-5.12[gui,svg,webengine,widgets,${PYTHON_MULTI_USEDEP}]
 		)
-		<dev-python/PyQt5-5.12[gui,svg,webengine,widgets,${PYTHON_USEDEP}]
-	)
-	>=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
+		>=dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+	')
 	recording? ( media-sound/lame )
 	sound? ( media-video/mpv )
 	latex? (
@@ -43,7 +45,11 @@ RDEPEND="${PYTHON_DEPS}
 	)
 "
 DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/nose[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 "
 
 PATCHES=( "${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch )
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index 5c8c8c1cbfc1..777a0bc21ffc 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -3,9 +3,9 @@ DIST byobu_5.124.orig.tar.gz 582725 BLAKE2B 1bf4de3cfd5ce3a31c020f3a56ac495e8968
 DIST byobu_5.125.orig.tar.gz 582407 BLAKE2B 7e74e121422bd9875697a96f39ab2e8e8f9d7f724ab8a597d2483bdbe89b3887e1894069dbe9b6ce75e610580b1bb002cfc632b6f2b8884db229382a719c86ea SHA512 cf5ef0e8902552fcfe839793b660454a6480154e0a315322311cecbc962ccf31aec5a6de035b7e83979d49058a64b222bade146163c31bd597feeed11c0a94b1
 DIST byobu_5.129.orig.tar.gz 758633 BLAKE2B 1ba446a5f1571bd36f7bf3e620d09022b93323e6f422067a4be0dfe28ee8332db481d99bb1000aa48d384efca33f76e5e42d7d1b795f527e95a17119936966cc SHA512 a555e2084863ac604c3a511e11339a65059058af454eeeeb24993c5e432b42527382d3b1d308996a732e190157dbc6f003d11bd5a611cd59799fdfbb3f9a5fe4
 DIST byobu_5.130.orig.tar.gz 761162 BLAKE2B 8ad45f3f8cba9435638aced30022e67e927288ac7f7bcea7d464d248a3fa0edddf4716bf782d790b8ea75d249e86f19acb76aa706c875f525f1b3b1ae9c47321 SHA512 dae3d0de3f1a65e5f3a647c1135ecf89261bf2518fea44bb49e00109ba5e1e5a8939206bb85d97f45fa01482438b3bfcb6f9ddd03dbaa1a8caca807f95b279cf
-EBUILD byobu-5.123.ebuild 944 BLAKE2B a35be83cc51db13385b74be9d9d1d78ab08900c4074eee26e53c98739ac494e78da2d05aa26d2503cc1b87fb37797f01debc17c5ad3762de0bb557abbdc04126 SHA512 68e5edd4db0a5afba31ce4c984e3c1a95c84a16e7e5f8fef9afe6be77126c596e9e288f339f3994eb00c4d7f56514e5e2ce13e61a7cd0542542835aaee903d85
-EBUILD byobu-5.124.ebuild 946 BLAKE2B d688877e98d148332c753143ccaa5c6bae3d60b78338947c489ecd02664a348dc2902d6a151b7f1012b46e6b35a9866a220e2b550662c73e167cb58a7f81264b SHA512 468978f2398a70477a5b62df314507b44891b29fe4df4f8424f5be639238f9f997a39debeedfc3ddf30a60f447147fdb2d50707d2c98d6f7b73fb3836773e115
-EBUILD byobu-5.125.ebuild 946 BLAKE2B 42fba6e3128dd545ca139484b3749c8868e96ef0062d4b48b81b462073d1f1d673d2a57ab2efffd67e0c6a7cfa647955a1fe021615e2ee13cc82d2c2e95acd66 SHA512 3fe3808e439bfddb8b5b3c393b947ec22f9ec4d965ae30ac59259fb1032328e945d2b57f010a3c84ef3ac138bde07dfecf86b76e5e618ef360bff7626cbfc7e5
-EBUILD byobu-5.129.ebuild 953 BLAKE2B 3893b4509dc2bff9352a6b7020f8c8561b13d4943a6ab8a95547f039273cf3ce6cec1084a7a2eedae7ccd52840c926b528eea2cf46d6aa5c67953f91574d33fa SHA512 d68d1733611739bb6d76524619d7dbbc9d8935d1f53bcdd3e88a3d10b4755621bf78df6640659db9e6729edd7773c7809dce5fe451fd326c72ed68c547cfce9e
-EBUILD byobu-5.130.ebuild 949 BLAKE2B e1ea4e9574d0b5288326c75f4bf1c834c300f04440d28fc018a72d5bb4c997d6f11b9254f5d1b0b17c5140776224cf0cd5bc3441d897c6c1cf6718997f364a97 SHA512 abb25ef5a65f87abd90bdec6257e461e98f1ddc8a26fa0ea4b3d1f1213000d45e0c6a9b6a050094290c598a4de234187efab0f5e185bd5b21bde3c82a694daee
+EBUILD byobu-5.123-r1.ebuild 977 BLAKE2B a2f8b13b92d9bd618c46c6e2c9683a449fbfa68421e7713a602527a2f111192390d8f59a94308ee5a339585030586ec9f190e56ad04a33e8561afdc1f66ebcbd SHA512 2e3a4037f9608ea420bc321ada67ddd876f6439ef758f20f77ce079e61479de654d3ddce5d78f3d4d0cd40bd1e387c1b3e61179467564889d1ed3713fe47e0a4
+EBUILD byobu-5.124.ebuild 979 BLAKE2B 806914a9df9c9443e22840b2894ec6a7ab7607311ef497f94b98af5309411625133f0966a21c2ca902ae5c2f58be9e61d9e23704dcb66fd725a84e8f713111d9 SHA512 5a0be3feb1cd56710d8acc5723b98dd53a5aaca13b3e191b9e95ee1448450154eb8f981a8a3a864c6f9d01198c1b6d136ecc0e58b9fcf0a1dc856ef8facb8eed
+EBUILD byobu-5.125.ebuild 979 BLAKE2B 806914a9df9c9443e22840b2894ec6a7ab7607311ef497f94b98af5309411625133f0966a21c2ca902ae5c2f58be9e61d9e23704dcb66fd725a84e8f713111d9 SHA512 5a0be3feb1cd56710d8acc5723b98dd53a5aaca13b3e191b9e95ee1448450154eb8f981a8a3a864c6f9d01198c1b6d136ecc0e58b9fcf0a1dc856ef8facb8eed
+EBUILD byobu-5.129.ebuild 989 BLAKE2B d733be11979684db1df4dc8aa2ad17febf9db4a556fe78653a2cbea159e5ec0f57efea905ee77e025fa8f1b03dd5fcbb22ed94da762d717f76b7d38efb3ffe28 SHA512 9bf5f039c393f6ce7982673a6126d23eaecad86a42d2567dee54b124bf96cbd570e8bbf5a5f53ae2b6fe269c04d0093d3808eab1beb60faefe7561f1916b7485
+EBUILD byobu-5.130-r1.ebuild 985 BLAKE2B 371e7c2662f57d4504cb756b29c1240e74c7d1e55b16aa71720d157914109ac85f0b7241c92aafcd2bd86af9259fd3299eaf8b43b0658b0182215bf368c973c1 SHA512 cc6283a7165bb1ca3eca688c9dbd8e79b04269de7402ab2107069b72065b9a5b94dde68eb7bf36adda2707ac3e19122446fe78b86da33d513d5cad3f2e226068
 MISC metadata.xml 981 BLAKE2B 8e3ed29634279b4fec3b92e5b192e4aaea2c3d8aeb29d1e29f03220d32f3c522d27fdcf8aa2fd601fb647c8ec41e1d56e5d1cb32c635070b516592cffdac9499 SHA512 6056ce18301ef9147fce0922c07ef455c416d75b78e23bc0aca9154e1765f167ebffbafc8e330f4878f0b575483131d417354f14e392568c91ef04087cf87d0b
diff --git a/app-misc/byobu/byobu-5.123.ebuild b/app-misc/byobu/byobu-5.123-r1.ebuild
index 33c36ce0cdc5..058f7590d893 100644
--- a/app-misc/byobu/byobu-5.123.ebuild
+++ b/app-misc/byobu/byobu-5.123-r1.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
@@ -17,7 +17,9 @@ IUSE="screen"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-libs/newt[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/newt[${PYTHON_MULTI_USEDEP}]
+	')
 	screen? ( app-misc/screen )
 	!screen? ( app-misc/tmux )"
 
diff --git a/app-misc/byobu/byobu-5.124.ebuild b/app-misc/byobu/byobu-5.124.ebuild
index f67cbf99d559..b8e2216b67cf 100644
--- a/app-misc/byobu/byobu-5.124.ebuild
+++ b/app-misc/byobu/byobu-5.124.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
@@ -17,7 +17,9 @@ IUSE="screen"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-libs/newt[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/newt[${PYTHON_MULTI_USEDEP}]
+	')
 	screen? ( app-misc/screen )
 	!screen? ( app-misc/tmux )"
 
diff --git a/app-misc/byobu/byobu-5.125.ebuild b/app-misc/byobu/byobu-5.125.ebuild
index d3b11ec6f89f..b8e2216b67cf 100644
--- a/app-misc/byobu/byobu-5.125.ebuild
+++ b/app-misc/byobu/byobu-5.125.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=6
@@ -17,7 +17,9 @@ IUSE="screen"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-libs/newt[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/newt[${PYTHON_MULTI_USEDEP}]
+	')
 	screen? ( app-misc/screen )
 	!screen? ( app-misc/tmux )"
 
diff --git a/app-misc/byobu/byobu-5.129.ebuild b/app-misc/byobu/byobu-5.129.ebuild
index ccb44bcb8188..2719fbfec1c4 100644
--- a/app-misc/byobu/byobu-5.129.ebuild
+++ b/app-misc/byobu/byobu-5.129.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
@@ -17,7 +17,9 @@ IUSE="screen"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-libs/newt[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/newt[${PYTHON_MULTI_USEDEP}]
+	')
 	screen? ( app-misc/screen )
 	!screen? ( app-misc/tmux )"
 
diff --git a/app-misc/byobu/byobu-5.130.ebuild b/app-misc/byobu/byobu-5.130-r1.ebuild
index 9a6ddebbb407..59b72cc7ec64 100644
--- a/app-misc/byobu/byobu-5.130.ebuild
+++ b/app-misc/byobu/byobu-5.130-r1.ebuild
@@ -17,7 +17,9 @@ IUSE="screen"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-libs/newt[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/newt[${PYTHON_MULTI_USEDEP}]
+	')
 	screen? ( app-misc/screen )
 	!screen? ( app-misc/tmux )"
 
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 8c70d8dc0b9e..be732362beed 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -2,5 +2,5 @@ AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d
 DIST ca-certificates_20190110.tar.xz 243472 BLAKE2B b63e541fcf611712634f8c7fd2da5f189b999c39118047a7e2fd43ddd5e0fbefeaa08788363482a02be55a347447d4cc95f1505bf869accf9cd847578ad2e879 SHA512 9ce2661018edb120d0ef5bd3ed52c0f73f577d7607d135a31730549f5eb4176db4865cdb8bde77a78dc3efb8968846da5e72af8a833a9da2a8a7deb4f1560372
 DIST nss-3.43.tar.gz 23466026 BLAKE2B 1b43036daeedea1643a7fe1a8defa167097997efec529417c4857eaa29d453b6a588f462078f13662193d58dfd8f9566c22d729729591934ef154b9befb8f98d SHA512 e9dfba5bd6f68c5ab58fc7a6fa1b16a035be1b1b7c436cf787bdc99257c5f54c78d73d94d015bffd29420df19b2a2818166c68fe592dd7208ab5605344827fb5
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD ca-certificates-20190110.3.43.ebuild 5778 BLAKE2B 9aec117e4d8c24df3440bd594a0781699daca17683fd07ff653a4c05cf8bfc9d416a934e0b27c15797774127bed1879793a1667dd962ea91161d880b7d3c2061 SHA512 35750546f115661f99d466cd76787412d669b21beda840a67ce7bbc942a16655054a31a6777fb837bb03a9b36003f4c78191db0eb644ce55b63108219638cdfc
+EBUILD ca-certificates-20190110.3.43.ebuild 5772 BLAKE2B 698479fee419513c09f452612600ba383595f77a478e1bf3299bd5f3c49b03bfe482afef23d4cd4226ee8d2933d85961d1273fa0b42133e63c0b4cc97657b94a SHA512 df794184f8d8baa57c730563ffdd65a6051ded9020229c4322317d72cab95968051a9e318c49d104aa882ca54093bd77944ef18f8389d09e827247272cfe51ed
 MISC metadata.xml 436 BLAKE2B f37fed732b387ea5e778bb88c349c78127b0db613def815d75e5cc2b7a7dbd049131eef33617fe3139975bd0c6bb187cf20e98c27e3ee10c3928b394fe6f02ac SHA512 dade84534ac0e574b3d127a1dc367b2f206874500057662d6139a00dc30506e1d977e3020b8e983750a8ef243bcfb34e152391d12027d88f8c116d151090ed9b
diff --git a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild b/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
index ef88f80cf3ca..871207e9ae75 100644
--- a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
@@ -26,7 +26,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit eutils python-any-r1
 
diff --git a/app-misc/email2trac/Manifest b/app-misc/email2trac/Manifest
index 75251ff5718a..9bb9ac93c8f0 100644
--- a/app-misc/email2trac/Manifest
+++ b/app-misc/email2trac/Manifest
@@ -1,7 +1,7 @@
 DIST email2trac-2.6.2.tar.gz 104732 BLAKE2B 0121497f98aeb1c8374e03c5e68f6ccb669dbbff757379121bf34b3c670f2022e31c7bb91bf78f505f490025f028948db98727533f3cb434e5ab49a4548e1269 SHA512 69b596b4c60ccc40b53ddfce5c13d5d7f27ac1fc5674e1cb3fbf84b083c2abc77d36879d665924a62b826e7d3a52d0ead1e1d693a55aae5edfc092998e01a0df
 DIST email2trac-2.8.4.tar.gz 107791 BLAKE2B 69973aab1ff851917bd8db3fa1fc3495da65b9be274d3e433dfc46230a108494b2790441e0f801e4beeaf4126e6fe1ee37a7b2627108bb36e931cc6fe5186e81 SHA512 f0bfd00442d50090f9cc582849026b08bb091bc72223b4569597c2ffdb57759206500da65390dc1609a24e521e137aee072d1ee3412391bf0e4b778933ff2165
 DIST email2trac-2.8.8.tar.gz 108366 BLAKE2B cbe5acac3ca21f19ab630995173dd49b5edf30ebba1bbaf0c575c93d356f8337a1aa6e22c4dd526d6da80041fb8780ea41f773a56eeca5e986930243b34702ff SHA512 8b13d22b50367337e5ed939dc689e0fbde4a63e1932351cab6aac2da7878fd37c9a09ff6e9f9aa4a1f709f24f2808de5d25b494813e292f61ee9be973c601da5
-EBUILD email2trac-2.6.2-r1.ebuild 981 BLAKE2B 176d7107433347ff792ad41ae201bfea766e85609e3fce98fe2fc42b74e590b863fad540c70972ef03b9b022396890842f5556249f9d2342df6478e94e19b261 SHA512 6a8baee10560e563f1b09de0b042b8b06ff3254212e2f35a3ef07bce79327167a7d7ca85afe89acf0656bcdce5affb2ab999880227ebae7b35ba3d4cd238ad8c
-EBUILD email2trac-2.8.4.ebuild 981 BLAKE2B 4f2ccae782c9287e1440bdf2732efbaa4373371d2a9f6901907753431e47a5bdb90b29dc69015fd9a93ba99de923fd9a18deb4cabe078a5e699b2c38047eebce SHA512 56fc3b70aabae2ff8872b940a92d0c6144d0a96e2e1a5fba88b992dd4a703810fc7a55a2516af7911049e0d635f4d5ff3c62730150e0efc6e0632044df93596f
-EBUILD email2trac-2.8.8.ebuild 981 BLAKE2B 4f2ccae782c9287e1440bdf2732efbaa4373371d2a9f6901907753431e47a5bdb90b29dc69015fd9a93ba99de923fd9a18deb4cabe078a5e699b2c38047eebce SHA512 56fc3b70aabae2ff8872b940a92d0c6144d0a96e2e1a5fba88b992dd4a703810fc7a55a2516af7911049e0d635f4d5ff3c62730150e0efc6e0632044df93596f
+EBUILD email2trac-2.6.2-r1.ebuild 985 BLAKE2B 4fce5dcaab46ffbc3303dde2b00f29cfc48793cbc2f88e7161a76faf07e55b100904caf60cbfb932db0c697eef44dfc760c20e9cea58e57a6dac44c386bc353e SHA512 3bb3fd996dca7ea58d7a17f1efa0c84a5f459e619a02ec811571108e336a49f004ee73ec3f22b17259e44002731f54211ed7c37b97ab98ada51a3b092bbd5ba4
+EBUILD email2trac-2.8.4.ebuild 985 BLAKE2B c20f2da38621791216d7683217e6f1c9a8baaaefec5df5043a83d9d1882807425b6c4563f1c36359c9ffd4d2cc127257d3889611cfd099e21990999eb77e1ff5 SHA512 371b2901c7838d20007c1218fbce2737a2497d4d835fb1c080c41c1ffeb90eab50272bf8028846836489b9e0fa273e2ece70d5b26ed8fd286f1cc082982f3f4e
+EBUILD email2trac-2.8.8-r1.ebuild 985 BLAKE2B c20f2da38621791216d7683217e6f1c9a8baaaefec5df5043a83d9d1882807425b6c4563f1c36359c9ffd4d2cc127257d3889611cfd099e21990999eb77e1ff5 SHA512 371b2901c7838d20007c1218fbce2737a2497d4d835fb1c080c41c1ffeb90eab50272bf8028846836489b9e0fa273e2ece70d5b26ed8fd286f1cc082982f3f4e
 MISC metadata.xml 249 BLAKE2B 58e91668bbe25a94a9ee787048ee974f1cb6944ae51bdf9f872f7df04894f44b261855cee2124514219894d93c3b643f9a47bccdf63f9cb0f46adc75528664c9 SHA512 8a900abd5f574a3ada624556efcdc93f5702661e50e03ae696f24ddb8d20a64cbe3bf3f5c71a018c6ad285d580d58eadcf4efc583046532b98405c9629d8d61f
diff --git a/app-misc/email2trac/email2trac-2.6.2-r1.ebuild b/app-misc/email2trac/email2trac-2.6.2-r1.ebuild
index 8ab769b33c37..06cbb0e81cb7 100644
--- a/app-misc/email2trac/email2trac-2.6.2-r1.ebuild
+++ b/app-misc/email2trac/email2trac-2.6.2-r1.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="5"
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-		<www-apps/trac-1.1[${PYTHON_USEDEP}]"
+		<www-apps/trac-1.1[${PYTHON_SINGLE_USEDEP}]"
 
 pkg_setup() {
 	einfo "You can set the following variables in make.conf:"
diff --git a/app-misc/email2trac/email2trac-2.8.4.ebuild b/app-misc/email2trac/email2trac-2.8.4.ebuild
index 7c7443a662c4..8ebdae6ac932 100644
--- a/app-misc/email2trac/email2trac-2.8.4.ebuild
+++ b/app-misc/email2trac/email2trac-2.8.4.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="5"
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-		<www-apps/trac-1.2[${PYTHON_USEDEP}]"
+		<www-apps/trac-1.2[${PYTHON_SINGLE_USEDEP}]"
 
 pkg_setup() {
 	einfo "You can set the following variables in make.conf:"
diff --git a/app-misc/email2trac/email2trac-2.8.8.ebuild b/app-misc/email2trac/email2trac-2.8.8-r1.ebuild
index 7c7443a662c4..8ebdae6ac932 100644
--- a/app-misc/email2trac/email2trac-2.8.8.ebuild
+++ b/app-misc/email2trac/email2trac-2.8.8-r1.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="5"
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-		<www-apps/trac-1.2[${PYTHON_USEDEP}]"
+		<www-apps/trac-1.2[${PYTHON_SINGLE_USEDEP}]"
 
 pkg_setup() {
 	einfo "You can set the following variables in make.conf:"
diff --git a/app-misc/gentoo/Manifest b/app-misc/gentoo/Manifest
index 67ba78ed94dd..e38e951aeb3c 100644
--- a/app-misc/gentoo/Manifest
+++ b/app-misc/gentoo/Manifest
@@ -1,3 +1,3 @@
 DIST gentoo-0.20.7.tar.gz 1414198 BLAKE2B 18af2f136557d5d5674e05669839e1213c1c8234bfb2a14875057989040cae2955e7a569456a93fb181121afa796e711a8b26e26397d743dc6d3ac2eefd7088d SHA512 7a4d601526d7071392bc3f2f34fd86337f4186fc45e633ed359b32ba44f43faddc4760a9ebd2e20d08662755052dd4c02a06724d274f98db342ac53fa28e39b0
-EBUILD gentoo-0.20.7.ebuild 1289 BLAKE2B a43d3eb6af676e496126befe7d344df3a51d9a507ba05449f31f1e2e855323b292c9375399e09cb375f28c91a81bdc6aaa1c1c53ce96693093dddc8789004edd SHA512 817825036e24dfb3861cdbd91948fb6cf352c885b80142b682ade87b7086d7840c44bd60bcbc74118cacf61b1508def49faaae557d1ec644e71999db5a257970
+EBUILD gentoo-0.20.7.ebuild 1290 BLAKE2B d7a18ab5b6654dc0dd7dd64ac040f66956b1e05fdf0aa1c30950d5c95738c788454fc8caae68f584655b70c6681729dc2a7bf7cad86ac524f6f8d8e3aabe8199 SHA512 8d4226cee90afa68b7859c58f3de6596d679c8f168f6403b3d7443e5f2527c73eb3cab340e5338b3e37fdf538a4632b424aef8fc5591a6f298c1267d97b973ad
 MISC metadata.xml 352 BLAKE2B 72fa87ea40fa0242a63fb53b736533de198a19cbdbdd751ee68413ff914b064169cdf5df0b5abed6d3d757a8a044c40261abd25bbbfe90ee159264a703fa977b SHA512 ff05feda3a7284c70f12d7fe7f7beca8c49eeb120c6c7302c73f5c28f2f903ecb97cf91a8a374e7b0c86d9dfba1c80627274a30249a388a65390303dd09d194a
diff --git a/app-misc/gentoo/gentoo-0.20.7.ebuild b/app-misc/gentoo/gentoo-0.20.7.ebuild
index fc126a228ae8..97b5d95f31dd 100644
--- a/app-misc/gentoo/gentoo-0.20.7.ebuild
+++ b/app-misc/gentoo/gentoo-0.20.7.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
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 293b98684dee..c3322e62e4ad 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,7 +1,7 @@
 DIST gramps-5.0.1.tar.gz 16718439 BLAKE2B 75b4a70275f7e6e181ba948df6fe44cbb9221436c2e860db8ef83bcc02b916aa3921ae09fa8ed18876f28551ed10b5047ae1aef0967b48532b54ad97c8af6d8a SHA512 68b905a8e59eedb620329b05bdd4cca842a79f885645140d31b637fc82ec7470892ebf0fd899aeb6a1205473f79e7f13d6c5e05b36da94b9049dcbb78e07aa76
 DIST gramps-5.1.1.tar.gz 17281131 BLAKE2B e729183832799a66547bb3958b4892c69359ec8e506766f4c64450f8bec3bf253460850f54388fa73659243cd96679c787fbbb9d645214682df26041c43b2c56 SHA512 fee7df5d2df2ae202c5e8ff4b941df4db6675925f6fce185c0fae709dd35ecfd6a1b81c8266d3f417f4949bed4e39f984a56917e74f56a3f3e499a4353927c37
 DIST gramps-5.1.2.tar.gz 17304294 BLAKE2B 5d253f59e8312b5438922bcc00cce10368b75e45170d3b2f83be4b6226cb734dfd6e90bcde506aea9a572592f5f156aa0a1b977736df90b3eaff9bda3d592690 SHA512 12e88645d14717823457308cba55e1f6899e2a6aebcf281875261765f163529fd75512fca034db59816473c6542319166375bec6d5502e8e6a7c452bfc10c0ad
-EBUILD gramps-5.0.1.ebuild 1986 BLAKE2B 0c49f29b06afe4abf8610c01adbcb62ee44f42f36b0e96a81ce1c4e9fb5c14be19b5a87eedd75501a7d0ed2276b7886861806de2ea071ca86f6e604e7671c45c SHA512 41796aa75d8808e1f7b679230925a43e35adddf41331068128482e87bbbcfde599fb83a1dda4fb197e38e3f74c2b7813574fb6157c0bcb32dbce8e08bdbc0349
-EBUILD gramps-5.1.1.ebuild 1988 BLAKE2B 9c02efe72a2cf6f0388e8818240a5cff16371c185d1d60444544e9b946d9f133628878039e4530a98af970cdb9f0c7a401ee93b0245b8ffc19fe5abb063faee9 SHA512 da02bab29f0719ec42c73c198b50a44e16dcf0dd9ea17d4985dddcb8c8d3e7930e421ff3bf5d7630d6efccd615b261275d0a08448aab333899138da5f9f79517
-EBUILD gramps-5.1.2.ebuild 1992 BLAKE2B e29411b6361370100e81376b913b6abfcb47bf1969ef5bd6c4737b46ec00e7c49c68401d8c250e708b22ad5821803e3cd02471e40b98dbfd2b140afd67725eb9 SHA512 78dba9ac2b6dadc2fc03029eb20570074dd0465189c8d190c12b21052e9cd0829c9b2ad63ac6e45b5d3930055131c8dc3d754613f7571a696c879d90a1fb29cb
+EBUILD gramps-5.0.1-r1.ebuild 2050 BLAKE2B 74b0a5331425c3d66228d12bc7302acf3bfd072982321fee4d2e53c70ed1bb788d9e986f2716e696bac8d64e28149620215c278160b040d1aa031081025aeaad SHA512 14ce17792d6ecef68a42ad7b2b16f261bd045822c29ea404ff5f40f6be64cfdf231a694211067a01c79c369a95bae027fcf9072fe76ee1b6468b825df57e8fe3
+EBUILD gramps-5.1.1.ebuild 2052 BLAKE2B bd0885f5764b3bfe2287f6d22c6e09a88da0f194fa5159445c7d951b2119bb1fe5a040b24c0c458fbca24d3998e154e19439949304b3e5987e7821b43b7467ba SHA512 683e11aa8de69c81ac1529e2c160243390f8472597a07ab9851c28cc68d9a03fb39d45cf4f7c7d2fda546ac1150794b42f9c35a33eb9dd5c222e4d2ffec59c69
+EBUILD gramps-5.1.2-r1.ebuild 2056 BLAKE2B ba0b6cac1e1a66d0f946a352f2d9cbfc4c48ce04c082153e6fe06af38af9beb8f49fd68f470c26aae4f1f82bc74b81360ebfdb8d96e0091d44c7b6ec6565eba7 SHA512 cd2292377350beaaedcd9f94e5e6fd364b73c93072edfbc39018ff90eb8473f403e135f6a204460570e7955a2e25584243692f01ab3e6ab716b9ebd78dfc7a4a
 MISC metadata.xml 5598 BLAKE2B 4516bb11bb4fa57403d9b86409a073021dc9372b4d6d53af2c90cb31d5988b960ce4ab9f190b7e82948c1118f1fb0581bef1f8e1e4bbc9da8c294541eabbeda5 SHA512 74b37ffecc01f6c140f349d822ceedf20eb36af2c7a09faca53abaacede12d916cae4b514d066026600bd46d04943c4948dda7fe8c85e7e01714ebd24e428359
diff --git a/app-misc/gramps/gramps-5.0.1.ebuild b/app-misc/gramps/gramps-5.0.1-r1.ebuild
index 50a51f97b2cb..e10ef31f3c22 100644
--- a/app-misc/gramps/gramps-5.0.1.ebuild
+++ b/app-misc/gramps/gramps-5.0.1-r1.ebuild
@@ -19,16 +19,18 @@ KEYWORDS="amd64 x86"
 IUSE="+rcs +reports exif geo postscript spell"
 
 RDEPEND="
-	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-	dev-python/pyicu[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_MULTI_USEDEP}]
+		dev-python/pyicu[${PYTHON_MULTI_USEDEP}]
+		exif? ( >=media-libs/gexiv2-0.5[${PYTHON_MULTI_USEDEP},introspection] )
+	')
 	gnome-base/librsvg:2
 	>x11-libs/gtk+-3.14.8:3[introspection]
 	x11-libs/pango[introspection]
 	x11-misc/xdg-utils
 	reports? ( media-gfx/graphviz[postscript?] )
-	exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
 	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
 	spell? ( app-text/gtkspell:3[introspection] )
 	rcs? ( dev-vcs/rcs )
diff --git a/app-misc/gramps/gramps-5.1.1.ebuild b/app-misc/gramps/gramps-5.1.1.ebuild
index 70d6bfc83f93..b82dd8fcc4bf 100644
--- a/app-misc/gramps/gramps-5.1.1.ebuild
+++ b/app-misc/gramps/gramps-5.1.1.ebuild
@@ -19,16 +19,18 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+rcs +reports exif geo postscript spell"
 
 RDEPEND="
-	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-	dev-python/pyicu[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_MULTI_USEDEP}]
+		dev-python/pyicu[${PYTHON_MULTI_USEDEP}]
+		exif? ( >=media-libs/gexiv2-0.5[${PYTHON_MULTI_USEDEP},introspection] )
+	')
 	gnome-base/librsvg:2
 	>x11-libs/gtk+-3.14.8:3[introspection]
 	x11-libs/pango[introspection]
 	x11-misc/xdg-utils
 	reports? ( media-gfx/graphviz[postscript?] )
-	exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
 	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
 	spell? ( app-text/gtkspell:3[introspection] )
 	rcs? ( dev-vcs/rcs )
diff --git a/app-misc/gramps/gramps-5.1.2.ebuild b/app-misc/gramps/gramps-5.1.2-r1.ebuild
index 4d31c478eb8e..6098483d6f9b 100644
--- a/app-misc/gramps/gramps-5.1.2.ebuild
+++ b/app-misc/gramps/gramps-5.1.2-r1.ebuild
@@ -19,16 +19,18 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+rcs +reports exif geo postscript spell"
 
 RDEPEND="
-	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-	dev-python/pyicu[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_MULTI_USEDEP}]
+		dev-python/pyicu[${PYTHON_MULTI_USEDEP}]
+		exif? ( >=media-libs/gexiv2-0.5[${PYTHON_MULTI_USEDEP},introspection] )
+	')
 	gnome-base/librsvg:2
 	>x11-libs/gtk+-3.14.8:3[introspection]
 	x11-libs/pango[introspection]
 	x11-misc/xdg-utils
 	reports? ( media-gfx/graphviz[postscript?] )
-	exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
 	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
 	spell? ( app-text/gtkspell:3[introspection] )
 	rcs? ( dev-vcs/rcs )
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index c06695315d9c..fe93c97ebc7a 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,3 +1,3 @@
 DIST hivex-1.3.14.tar.gz 1332257 BLAKE2B fe7c19e05d29c7e98a334842cc1144aa76b148a3b7aae91449a4923a124eb54227a9a004346ef3558732c688c4f92cacd0c9328056930c33dba0404465634da0 SHA512 dd7dd52dceda580179a815fc48a2a2c7e8f7234614beceb937fba7e317df17984e65453338160c4c467b70d7d4f9bd61b48aad3ca51e19bd5e4cfbca8ee3adb6
-EBUILD hivex-1.3.14.ebuild 1859 BLAKE2B 0042949d8cf5c1bb481718ad45b57f7259d33d9726dd60e6f8a64c3e99f537b985371c26f285218f31efb00104fb2d9e2a0f373fc9bb62705dfb224a2595830f SHA512 f1d3c557ffca13131b6adbbe54e0fe9ce0c57513edaa7336268539400ab4b2f1940a2234c5cfd48e065388c9b39ee86c0049974fe4b3bd08a3afa19f62d80b60
+EBUILD hivex-1.3.14.ebuild 1849 BLAKE2B 0c138e91aba7d4bdd04680d34330123cba162564f1ccc70d8310d77de7ab87940bd3bc87f65a84a2585a194cafc821538a9674c2ec32eb45f001c7895c26d432 SHA512 0c25e80c4a57e7fdaec743ab7696149f68541468569d2f46353dc2c16e9441270108ebd5238b38cb96d25f1d74eda56b3afb0d9636200edd730b6df5f8a5d97a
 MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/app-misc/hivex/hivex-1.3.14.ebuild b/app-misc/hivex/hivex-1.3.14.ebuild
index 2e226ec0f396..9f629900febb 100644
--- a/app-misc/hivex/hivex-1.3.14.ebuild
+++ b/app-misc/hivex/hivex-1.3.14.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 USE_RUBY="ruby23 ruby24 ruby25"
 RUBY_OPTIONAL=yes
 
-PYTHON_COMPAT=(python2_7 python3_6)
+PYTHON_COMPAT=(python3_6)
 
 inherit eutils perl-module ruby-ng python-single-r1
 
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index ae47c84b4e60..1a8533293f99 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -8,7 +8,7 @@ AUX lircmd-0.10.0.conf 57 BLAKE2B 8c39aac91bf5ac603a1495bb7e27b74ee5f09e55e35297
 AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a387be62a9e54b3d4f3c78734f5dd0a54ddb04dd2b48ba270177ca7af777ac80ba8bacdcbe3f9ce2d62 SHA512 c744553b6246e62845ee61e18d78d97e7242969d0bb5478072bd9072ce0a02486306b577ca64c1c569c9b136e3231a4f0663c94114879827329a769e5f36413d
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
-EBUILD lirc-0.10.1-r1.ebuild 3738 BLAKE2B faecad30946682bae43b79958bf28a104c30ddd15ef16bfcddf2774e0071258152ff7bc8b63ddd4331aa2079f930f8474b2f59b7775501f57860db305f1160d2 SHA512 1c52edcbd2098e792b7b3d8c3e31d62b64548cf8b256ea63b5adf7781cfac79bb563b678a661f4cc5db898a172ba5330f26005267feb7ccfeeeea261b690995d
-EBUILD lirc-0.10.1-r2.ebuild 3785 BLAKE2B 64b727b5e693af133653912abd70ab6190857c5eced7f632ab4bbf1cf0516a1c8e717cb3175ecf2f4be41b1d07d5523218a397d44d21aaa9792f06cc4ef0a4e6 SHA512 263eef1f495adb0d98a315f6ea16b456b29d33d976ef5d5272a5afa2c56db736b3d9688426700ec414d8645d484609e8efc8883f86af10ad1fd8221256ef1900
-EBUILD lirc-0.10.1.ebuild 3724 BLAKE2B a6a2bfcc0ccc61b06dc0e9187c5b4d6f9e92d03e054e289b014997785d5de84c81cc926c41d6485eaace39e6693c9edb2e977470b2a6bd9e7669b1d6819c9f0f SHA512 f5f5d939a0554e95b4e8737522630913d047800754c5495313a2bed96487e7f70fb5467c84497ac63fb93e10011eea930fd0d931d41ec2d34a923f6e02366fee
+EBUILD lirc-0.10.1-r3.ebuild 3848 BLAKE2B 86b6a69cc1b3127806884dd52cba85aea21a7621aa21fe46daebdd250bf7f8e98da1347c0f7caaaddae06696724bc82b07ffecb21390878487d3329a95829a6e SHA512 75ba28d58e744557c82f7aa9de722ee703c0596cc769726a5480b469b32d295b956d65d02fe3a13fd59611f95c5eaadd53f5af8d6ad4c95965da1488f1be7937
+EBUILD lirc-0.10.1-r4.ebuild 3895 BLAKE2B 5b598a3a94abf8a80710f643b264fcbbdd18cfea180118db6fba9ebbe68fd23a0f4b17d9bb363226448da163c93c65b594b966eaa21d4598c9fe9e25c95208df SHA512 f276a6c04cbd28c54a140428dbb22c98cdd664e709c8432a35d0249006761712a46a8343a88a9596573ddda8c4bc0c444587ddae40d0dc7ea1544edda8f157b9
+EBUILD lirc-0.10.1.ebuild 3834 BLAKE2B 3f449d519f75120f7a558fb626562e2cd178e783993a980b6e04018b05249e46a51432ece7137a721cb87e679a3535e66fce54df17a075970d9fd97d2226e319 SHA512 514a8c5a44baaf0ad87f86a06050c90da3bba5f2b2038e6e7a5a36f85e2792bf6c7546a7144a1ef418afeeae608b0fc3ff4bf3e16d7a6e418abade771e15defd
 MISC metadata.xml 969 BLAKE2B 6dabf8921994f06c7f9e39e2049c0ac86b5e5523c554eec3c061151627512f6f17d14eeb00256585dd9fd323f4293f74175ace6bd87846ba461a72ab6e7caef4 SHA512 fc510d070b7b97d28159b77a7540b38e8558efd8a780dffe8755e3bcea7bbd601211f19733c217ce670407c523b6c5daac2c9aedde2ddeecb81dda8472c48fb6
diff --git a/app-misc/lirc/lirc-0.10.1-r1.ebuild b/app-misc/lirc/lirc-0.10.1-r3.ebuild
index af0e1339c581..368f73717811 100644
--- a/app-misc/lirc/lirc-0.10.1-r1.ebuild
+++ b/app-misc/lirc/lirc-0.10.1-r3.ebuild
@@ -38,7 +38,9 @@ COMMON_DEPEND="
 		>media-libs/portaudio-18
 		media-libs/alsa-lib
 	)
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+	')
 	ftdi? ( dev-embedded/libftdi:0 )
 	systemd? ( sys-apps/systemd )
 	usb? ( virtual/libusb:0 )
@@ -52,7 +54,9 @@ COMMON_DEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	dev-libs/libxslt
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+	')
 	doc? ( app-doc/doxygen )
 	sys-apps/kmod
 	sys-kernel/linux-headers
@@ -62,7 +66,9 @@ RDEPEND="
 	${COMMON_DEPEND}
 	gtk? (
 		x11-libs/vte[introspection]
-		dev-python/pygobject[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 	inputlirc? ( app-misc/inputlircd )
 "
diff --git a/app-misc/lirc/lirc-0.10.1-r2.ebuild b/app-misc/lirc/lirc-0.10.1-r4.ebuild
index 8454fbe9244e..52fbdf73aa50 100644
--- a/app-misc/lirc/lirc-0.10.1-r2.ebuild
+++ b/app-misc/lirc/lirc-0.10.1-r4.ebuild
@@ -38,7 +38,9 @@ COMMON_DEPEND="
 		>media-libs/portaudio-18
 		media-libs/alsa-lib
 	)
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+	')
 	ftdi? ( dev-embedded/libftdi:0 )
 	systemd? ( sys-apps/systemd )
 	usb? ( virtual/libusb:0 )
@@ -52,7 +54,9 @@ COMMON_DEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	dev-libs/libxslt
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+	')
 	doc? ( app-doc/doxygen )
 	sys-apps/kmod
 	sys-kernel/linux-headers
@@ -62,7 +66,9 @@ RDEPEND="
 	${COMMON_DEPEND}
 	gtk? (
 		x11-libs/vte[introspection]
-		dev-python/pygobject[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 	inputlirc? ( app-misc/inputlircd )
 "
diff --git a/app-misc/lirc/lirc-0.10.1.ebuild b/app-misc/lirc/lirc-0.10.1.ebuild
index ae37d7aea7ad..ff58dab0f42e 100644
--- a/app-misc/lirc/lirc-0.10.1.ebuild
+++ b/app-misc/lirc/lirc-0.10.1.ebuild
@@ -38,7 +38,9 @@ COMMON_DEPEND="
 		>media-libs/portaudio-18
 		media-libs/alsa-lib
 	)
-	<dev-python/pyyaml-5[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		<dev-python/pyyaml-5[${PYTHON_MULTI_USEDEP}]
+	')
 	ftdi? ( dev-embedded/libftdi:0 )
 	systemd? ( sys-apps/systemd )
 	usb? ( virtual/libusb:0 )
@@ -52,7 +54,9 @@ COMMON_DEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	dev-libs/libxslt
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+	')
 	doc? ( app-doc/doxygen )
 	sys-apps/kmod
 	sys-kernel/linux-headers
@@ -62,7 +66,9 @@ RDEPEND="
 	${COMMON_DEPEND}
 	gtk? (
 		x11-libs/vte[introspection]
-		dev-python/pygobject[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 	inputlirc? ( app-misc/inputlircd )
 "
diff --git a/app-misc/livecd-tools/Manifest b/app-misc/livecd-tools/Manifest
index 632e8f183ac7..f5b87b0f1b72 100644
--- a/app-misc/livecd-tools/Manifest
+++ b/app-misc/livecd-tools/Manifest
@@ -1,6 +1,6 @@
 DIST livecd-tools-2.5.tar.bz2 11500 BLAKE2B ed33e82931eb36f6c2648e31cdb867e1427ae7af740204334dc851d710078b87ee52ca0c1b3b714eb05dea78e1e6ace8feec19e8e516a31f7b7623a7c96a58c0 SHA512 b358cfb4390eafa212f2f1b1e604f2b021844f03490e3f0590bd7b5aa12777b096b8db7e2109dba1be5b05f35b625547041cbc69b155c7d910aaa3ed1ddc6798
 DIST livecd-tools-2.6.tar.bz2 11555 BLAKE2B 732cb5f17c0684d778925268cf326b57c36ecde333f177b6cfd51219f1a89d2866df19b1d1a997219fa3e8358eea33c7f87fb53118d5ecfc75671f89a08ce8a6 SHA512 5bf8b293909abda87ae892b92c996a4d64830f2b2b00efed2529beb6d01d6b6aef4703db0ef26087cacc1e48f20cd0ade37f4eecfa6e2bfd90471722dc06f3b1
-EBUILD livecd-tools-2.5.ebuild 967 BLAKE2B 45753e82c26ec63610bd472a7b3a962c8657bd4b7823d6b1286c1bf2f1eff85d0835fa01751567c3d01d2f916a52089c5ef3d9a4199d8b4c6a089e8844189108 SHA512 e1e4348a1f995820978248aded77a105f566def0dd573bade7051d2f7119b04c44ceee1235dc9edc70258cac4bbbffa0688f5048183d0ac30e73acd12376393c
-EBUILD livecd-tools-2.6.ebuild 968 BLAKE2B 0a0047cbece559afd000da12a8d7acaf598442da8674ede2dd82037a242c804387595aa8ee445f32bf74bb447df7f525044137c931b6cf71bc5ccca3a821ab38 SHA512 d8e9ed170a9d948f17c8e36264bd5880876c41e29524c753080ec1bb9d16528889d72c5438247112f995daaa6b667af8f12fe13c25c4363fcaa3e0486fdaa4dd
-EBUILD livecd-tools-9999.ebuild 975 BLAKE2B 69f5eaf3530334e88e39b197a5843eae6d2eef7b0d77d7b06c47cf5e7dd1d7a81d3a08469586a309aacff0ff2a6cac2b4c64d1a2f6ede56bbb1337aaf1f3074f SHA512 d04bcc2070275017ea935e6a60e43c7345ff39980420c3087f359eaf1b6bba727ccfddd8a18a9c6766c616be078b7b2e3e42201a6e8ebed91f918c67acf5d80f
+EBUILD livecd-tools-2.5.ebuild 985 BLAKE2B 0bc4e890d5188048b734a7b997949727accd06e2d2e4eef813dcc525d39ac98ae06be54d6cf40684c64f3ff78fb7769bff05be277351d83b018c7b26e60a21e2 SHA512 931679c4ee19454a4fed1ef183a008f5545843e7aa254740e4020af3c0cd13435a22433f12fec00a158ce2125bb03ebe9c3d9834cd24f9f6e36483587e8da307
+EBUILD livecd-tools-2.6.ebuild 986 BLAKE2B 433830291e7b0bb306c4cf43cfad415bcca13a8657e9069e2567b8dc08137964383012c345b0fe464c4afbd2c83da3d32f9c7b3aeb0672e2800a449f4aa3ca17 SHA512 36d8242b2323a0942096662b9d8f99fd52847f9a39f6155497529592d5b14d86b42db2f9e0351d57210f2579bcda73a36ce0f52b984b406636e2b9b08d81fecb
+EBUILD livecd-tools-9999.ebuild 993 BLAKE2B 48476c8c1120d51f0837b055df0ba17b5e155a179d283e8041349d161b28c2d566db07e5f56830b9c35d28e968c21a5b73e9f5f3ed5b488bfd5603f92b8d9bae SHA512 40d997af3a7321c814cd2ebb1d176a9b28ccd6c2c381fa16e24e43b14b4dad6eda39fdd7d3bd32001a0487b64aed1d5688570589f50e1304bb62439a663dbe37
 MISC metadata.xml 251 BLAKE2B 914f6ce3b97ef33310dd17c219739df48b081adb06e58d6a38a10cf4368eea50a9096c7b274077b6ca67d17ab9601b7c46995bbc89479d2842705dcc3ba75461 SHA512 2da7a6b2b1b7153b8803cc52201fa006313bf75a25f7d917f26eadd7a6426529e4b30a57c3c24cca20865d9dc4f3d56fdfa14b10254158bea2dfeb2c64fcc18c
diff --git a/app-misc/livecd-tools/livecd-tools-2.5.ebuild b/app-misc/livecd-tools/livecd-tools-2.5.ebuild
index dd81387cc093..f6923628fe04 100644
--- a/app-misc/livecd-tools/livecd-tools-2.5.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-2.5.ebuild
@@ -12,7 +12,7 @@ else
 fi
 
 DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/app-misc/livecd-tools/livecd-tools-2.6.ebuild b/app-misc/livecd-tools/livecd-tools-2.6.ebuild
index 9cc93d10039c..f4940e1eb1ab 100644
--- a/app-misc/livecd-tools/livecd-tools-2.6.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-2.6.ebuild
@@ -12,7 +12,7 @@ else
 fi
 
 DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/app-misc/livecd-tools/livecd-tools-9999.ebuild b/app-misc/livecd-tools/livecd-tools-9999.ebuild
index 75042487d6fd..bd090c1eca8e 100644
--- a/app-misc/livecd-tools/livecd-tools-9999.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-9999.ebuild
@@ -12,7 +12,7 @@ else
 fi
 
 DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index b892a051fea0..c520422ce1c7 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -7,7 +7,7 @@ AUX mc-4.8.23-vfs-gc-SEGV.patch 1249 BLAKE2B 8620f1f9dda92ea431ed31d82e72b9e81e2
 DIST mc-4.8.23.tar.xz 2552944 BLAKE2B f246f30d852f93ac96f81ec7a933a1bcd86ff3bfa040a0fa1cb32c14d781f77df34452e4dd94f0846e379d91a648cd417241e4660930a9c90defe58cb19d1cee SHA512 e51c7f926d296280a57a8ecb5f4b296a850022b7ab9beaba89f5cb7554d8fc3e13c73b8571f78c3162ee85df88f7f46d07c9c893156cda4d1377a01071cdd1c6
 DIST mc-4.8.24.tar.xz 2434988 BLAKE2B 18bd730d5bfbad19fa5e70fb578cf587a3df8da33885543b3d316548ac0d29bd67e4683d32b2751471e148e89390c7658edb622fd741eae054b7fae774996b60 SHA512 ec9e40198455e7001bb1d06ea060b9b4c32ad3a3750d0cc9bac334b53eb666df1746335bfcd411213fa4386b23e516f6026fe3d74ad9119b2340b26c63ccd4fc
 EBUILD mc-4.8.23-r1.ebuild 3045 BLAKE2B ab1d575bb42bff712cd9b2bdb6e5308999005bd6dcb8ddb6bbd8d98cb03910755197cdea17a15246099e2127ec5e3382443b851cd7fcc6e8b890fcd40df5e805 SHA512 0f0e3d52d10ed69b27c73c51ea785d09b26c5124a552a48354cb9ff199ad719454148bdb5790fecebd0f558d0c0c416b495e7b9fc9e54d1450477348424a6d1d
-EBUILD mc-4.8.23-r2.ebuild 3141 BLAKE2B 0a1a19152c7212392c5a4301b681b9183a0f3af7b88e9aed547414b789e71fe1758c196aa94cd92a9be227e7912eacda978fc8656177434ab39bc9a94ef4ea5a SHA512 dd5514bcc062baf18be629cf9fe04b02aab308f0a5f9dbfc223ce742a86998c01411d6370d3202f2d6374adb9ba6915ab816f72624ae60dc21ab75744c1be6af
+EBUILD mc-4.8.23-r2.ebuild 3140 BLAKE2B c1ade4dc4009448607d9a47a8e363e25d708bba9061c5f96844ead596a007f118b0c53a21590f93c8d751c9e93296c9f4b622eae28ca2cabb4cb6d6763578249 SHA512 641d151b9bb695b91f55fa24e7e9cd06f9d7e3b5bdc79c28ad0577073819bad8fdd6f94a4a05e4e1b8eb43d8f050aaa304544fbb8b4ea0450e2ce62cd6f7a16c
 EBUILD mc-4.8.24.ebuild 2870 BLAKE2B ddc4ca916a85e9b2855a74859fe5dca45cc91c03a83db1aa71f9d48e4d0ec15c3583b9b72cac0f52a09eb9b96e487a697236b272a78d2a9ec175a3bc90470e76 SHA512 51dbeab090160c41f573c7d1d9950ebd7bf3f92f648e6eea8e5a208b33d9f13caab191a53f9395511ae7d616c56347990819b2d7f82ccc8bf736badd036d26cb
 EBUILD mc-9999.ebuild 3129 BLAKE2B 86eecca3b1675bfcfaaa8c36f2ca937541b9ab6bcc96d693cc686c5dcbd4e93bfd209e2b425c9d5edcb7b2db353d007a1b04ae94d04742fcf3cb3e789db4dbf0 SHA512 9815a1a8bec31b5d4e1ab03fa25aba3c8c75232c23fbeab0322a39317a46a355c5feb94fe37f4c5ff17661fcfec8fc786ada179559e4cd92153764f3166a3c40
 MISC metadata.xml 916 BLAKE2B ebd4f95dda619c29e09fdb42087a52a5c1ff2dfa0d5a7ed5bea12776734247bb04d8e19333be9ea45345a3e520ac7504ea490501767111feacf9f933caf3661a SHA512 e8b3384dc473a15550dca185fce45d12019939170155665ce26e6ce2e0abf8e387501e6429c30eefe0e5f15a1b0b1b49d12e2cf5305ef6c08415bbddb48db9ec
diff --git a/app-misc/mc/mc-4.8.23-r2.ebuild b/app-misc/mc/mc-4.8.23-r2.ebuild
index 64112aaf67bd..d9c7dafe3f3f 100644
--- a/app-misc/mc/mc-4.8.23-r2.ebuild
+++ b/app-misc/mc/mc-4.8.23-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/metromap/Manifest b/app-misc/metromap/Manifest
index 115c8e0d0e1d..2b7c0357d30d 100644
--- a/app-misc/metromap/Manifest
+++ b/app-misc/metromap/Manifest
@@ -1,3 +1,3 @@
 DIST metromap-0.1.4.tar.bz2 3419243 BLAKE2B d0072d4414657bc6314a972e635809ce239be4b081368ccef44c8549eea646cfbaa20ac30621e9dafc5ee1419a5916fa62274b77392d1d437b7af3561dfb18c9 SHA512 16407c9c8f2d3f608e9188e40b38d20530f552254dbe0c59d7c94ed913b8cb61deae23ffc6180d17fee0d98091c269f24eb04e624dedbb37cc6ece85b46e93ec
-EBUILD metromap-0.1.4-r1.ebuild 961 BLAKE2B 472e0393ada3c9999e9a9ace054e7ca65cdeb6f525acb8fdd2a403197fed82151386a576be1101fa2cdffbd53d51ea4b0f229d4e76bbb739262740cd02bf102e SHA512 ec656cad496e2078f39b7a661f41392ee85c54c1305de4af8dedcce93ed938159fa14c10d59a7e64f79b720a01222d4c8347478734351d1ca728eb6caee4ab88
+EBUILD metromap-0.1.4-r2.ebuild 1001 BLAKE2B a03a975a51b8a9d10d110bff3a1c0216ddcc3adf70ae968286b4414aa7b12fd58b5062f787e71202656db8916484907bf8aa1794136305c9992c4b331bb77326 SHA512 2857363da540559fdab46435bd54966f80e8a9690ed441c6aefcbf25b36695a45b70cf2408abed3ce628f90c76bb6479ab9c709bd9b1994e0e419c13fb5dd072
 MISC metadata.xml 249 BLAKE2B 210caabfc49730fad6228e8c34b09d11554fece8f3f754a26c6239b3b0de845ea128507b2c17d6e97343f9e6e2ae01272eb024992c3c64d3903794fbf73a66ed SHA512 c13d64a0d3034eeb4c9567f5e1236ecd6f3c3cbdec69b805627298cdb7050ae01a19a3cb075ec905de9497079a3e855bdccef2f37f65540b6ae184439f01cdae
diff --git a/app-misc/metromap/metromap-0.1.4-r1.ebuild b/app-misc/metromap/metromap-0.1.4-r2.ebuild
index 6d0dba3d4e4d..25eca6fecc16 100644
--- a/app-misc/metromap/metromap-0.1.4-r1.ebuild
+++ b/app-misc/metromap/metromap-0.1.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,8 +19,10 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.8:2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygtk-2.8:2[${PYTHON_MULTI_USEDEP}]
+	')
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext
diff --git a/app-misc/mime-types/Manifest b/app-misc/mime-types/Manifest
index 9b2a298d85a3..dc26df46c4e1 100644
--- a/app-misc/mime-types/Manifest
+++ b/app-misc/mime-types/Manifest
@@ -1,3 +1,3 @@
 DIST mime-types-9.tar.bz2 15524 BLAKE2B 075f73f6d41a6b9100baf891378b12658c1370ac3aee8ba47cdb972cf30835eb2e9f6eb8a6314a7097dc5f90b091607519750860b065a2c4a822e26223925447 SHA512 066cea30c02a326e64680422b31aff0849c0a8c7486738f2edf339b88426c6ac5a365d4fa4c80c84df0fa4c39b5e13d45db314a1bf47ce369c132dd1c46130d6
-EBUILD mime-types-9.ebuild 575 BLAKE2B a6e18056ba58ca999048c7b74597eaadad425887a2ec99ad1ce14c11b5f89412a3b2028aa453e29fac28e0cc7d702fa3b9e038c753b82e062f3bc63793e827f1 SHA512 cca6f05cc893f12ba2f8f8823a30b3d620a41d6af585b7dbc069c391aec84fbcaca507d2852fa23fc6baab24a481e9f7613dfa78a33d7f269615f474de2cbf85
+EBUILD mime-types-9.ebuild 592 BLAKE2B 2625257ed9c0958ced4abf86d0d0d997810182fdb59cf405f9237585d8a5e5e01e88033f8be78081ba8425ba73ba41c134f8074e00239cfed6ee986e53c9d122 SHA512 cc15786cc8c28a5fbc7773febe664f4b6fbfa2b7e4542abfd4e9238640db8225e9b856f1c0de2cede719fe834c38331258dbc7641985bfabb64ff903e1003041
 MISC metadata.xml 243 BLAKE2B 01e59967c1ef8c4287aa399e0b64a651d273858118726001d0cc8c9450f219696f7827ede0f3613b0947613186bd98b31629a5dad3a9e67b0517b37d9e08843f SHA512 563d66eeb96298c8537589586287f9c8c6819985c37609ce4a26e0ecab1ce19192f99a73f63a4577193f90a371ff00ed2a15254a25be6061516b73d0c1141278
diff --git a/app-misc/mime-types/mime-types-9.ebuild b/app-misc/mime-types/mime-types-9.ebuild
index 8a62679251b4..7e4e64763ad2 100644
--- a/app-misc/mime-types/mime-types-9.ebuild
+++ b/app-misc/mime-types/mime-types-9.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Provides /etc/mime.types file"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 44171f57e488..cf0faa58c916 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,7 +1,7 @@
 AUX pax-utils-1.2.3-python-3.7.patch 899 BLAKE2B bc3037b78e7caea904b91c84d115cc7e1acf91019d74dfe1c1c9c44c900d835fe550adfce89140b991b96ea4d63267f48da7596f89cf7daf1c93e43d4e7f6924 SHA512 dcbe424084b8b0cfe77c461b5897cb027e30778f9283bcaef358d70e1496473cbb5b7ed7c55347859c86571b77f9aad4c051d1b519823efed6c9e6314defc187
 DIST pax-utils-1.2.3.tar.xz 661828 BLAKE2B 4764c47b7a31e7470a454127b9db3b5b27c703a96a66973a6248529a2d858ea38adb246a270a1f343a499515f55b25613bb20c46978e2e0dddc03e5ddb9a2aa7 SHA512 efcbce49aa7e5cd433f9b3fbc8fa82f6d7b0eb80ec40aafde453d6fe96e3565e066e5020f04d71537d8d4e820147f4203c0df2dd330ebb1358a26def3dd5484c
 DIST pax-utils-1.2.4.tar.xz 665648 BLAKE2B f0003f912e42a25c8b587764591f7c466aa4c7a24f38fe101d7b64ea5abca5511b2f9329fa5620d1b4ae1926c2272eb97d4ada0210d4e55d16c7766a055672f4 SHA512 03b84054c59e8ce64d2c07276c61245c8e9b3eca2fc430269531e2dafe120009b541ebb6adc4ff54c13a1da63caf0755fb026ba272cf17d04f75e06b893a3e95
-EBUILD pax-utils-1.2.3-r3.ebuild 1784 BLAKE2B 5047eef121278a753c477cff9f93c40fd5559aaa667bfc12408744eb2926a723bee8db2bf4a52c2846e22251a9cf9747b96a194897973849728206eaffb94675 SHA512 994945da1dfdcbb3c5a330ef34ad363776a9d2e0b80bdce1554fe97fe9520678f16e3e279b587563132e065fb5ef3f5685f0624da590735a2b01fdb8e80a2d46
+EBUILD pax-utils-1.2.3-r3.ebuild 1811 BLAKE2B 10dbb7ce74ad2f410864d51da6a0aa2b9d8c0d26e2f58667693b5761f66e62513e73cdcff3eab59fbb3cac052c4365d74fad35aa00f5c896865d011f543d6513 SHA512 f61a084a9ddb5f5a971641f59fa0786e27ec3af227b2b64a74ad88c47ae82b188cf3690700bf35de8211ba2f0930a66aa9c56923bc22a124fa9ac1d9fab16ecc
 EBUILD pax-utils-1.2.3.ebuild 1456 BLAKE2B 102ef557c9ba2b21776da305f3773797906bc4b5a52417008b4675d1f03b30006f3df003766bc6a3d06358df2077d5392dc538ac408bd4a64b10df928d6442e7 SHA512 7819e495c975534ebafd3b7a260bfd9d5d26b022a6ce1d4c9097b0e2be9aae660ff47eb90058f069c8b51cdd6db0098a7e58bc3acb36a786c2163eaf9aa45ded
-EBUILD pax-utils-1.2.4.ebuild 1737 BLAKE2B ec003ef39f138afc07a6b02ec58cd44bd253c3131b03d32196580c848196aa4a318a3c817154d030845d27dbe9f371c8b38c0c353fd60097b8419645b70ee4ef SHA512 35904ea69012a08cd0d8dd28a0cfb56f181415f9883150c6378321eb719d956fff3972d7c037e9cbba12e529bc7c0f74f4fc83a41e1535158973fe27f9a1b555
+EBUILD pax-utils-1.2.4-r1.ebuild 1764 BLAKE2B e67d2008503858e90a8f77ac15b6c685eb30f19b715fcc7de55ac81053b6f04de046ef76cf91ce27eb326f3b80933d0fc8f1e3476ccaea1eee085f33a53ca7b5 SHA512 7e6a9cdf23494fbc179438f5fcb91012798f30c3284946b1f087e709ae6901ba39311ddf7d413cbd7838fb734e966cea0b2e19949432468b6aef44786a9e6bfe
 MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
diff --git a/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild b/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild
index 2f1358a19ef7..2bd5a6a4fbff 100644
--- a/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils python-single-r1 toolchain-funcs unpacker
 
@@ -20,8 +20,10 @@ IUSE="caps debug python seccomp"
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
 	python? (
 		${PYTHON_DEPS}
-		dev-python/pyelftools[${PYTHON_USEDEP}]
-		)
+		$(python_gen_cond_dep '
+			dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	seccomp? ( sys-libs/libseccomp )"
 DEPEND="${RDEPEND}
 	caps? ( virtual/pkgconfig )
diff --git a/app-misc/pax-utils/pax-utils-1.2.4.ebuild b/app-misc/pax-utils/pax-utils-1.2.4-r1.ebuild
index b4f02979653c..66b213c14c49 100644
--- a/app-misc/pax-utils/pax-utils-1.2.4.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit eutils python-single-r1 toolchain-funcs unpacker
 
@@ -20,8 +20,10 @@ IUSE="caps debug python seccomp"
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
 	python? (
 		${PYTHON_DEPS}
-		dev-python/pyelftools[${PYTHON_USEDEP}]
-		)
+		$(python_gen_cond_dep '
+			dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	seccomp? ( sys-libs/libseccomp )"
 DEPEND="${RDEPEND}
 	caps? ( virtual/pkgconfig )
diff --git a/app-misc/pystopwatch/Manifest b/app-misc/pystopwatch/Manifest
index 2c004144705c..7e4f7b734d8e 100644
--- a/app-misc/pystopwatch/Manifest
+++ b/app-misc/pystopwatch/Manifest
@@ -1,3 +1,3 @@
 DIST pystopwatch-2012.12.24.1.tar.xz 14580 BLAKE2B e9f6deabe932bb4adc658d5b5ebc0cc7f2de461a287773881c6d1f34e7f50a0b23b3b317344994a2717998fe6e611167ed0a5d380235f6b1a5e3f572964e7609 SHA512 4b3af373356eaafd14caeecb34150fef8e7099120855230dce7c0eabba68f75d497c3cc2eb733a086a02a96ae5feeca1898ba201a5f6f5597dcd32de9c80b3df
-EBUILD pystopwatch-2012.12.24.1-r1.ebuild 662 BLAKE2B 3fe88735f4eb936c4c6c8902e373f07da6430e69651fed927a2ff5c8994d4f566049f6935702b926f462833eee4c8a7f116e7ea802afca3f4d220e374c4c8bd3 SHA512 f77107c57ef88a9e6faaf8a26c024d5ad6e1405c67c3c54ce32cd085da1d7fa023a8d2f6e70277c408117c1c1c48749eabcadf93117666bbc9b3e207e18545e0
+EBUILD pystopwatch-2012.12.24.1-r1.ebuild 695 BLAKE2B bae1962a73f8ff7f97092d37444cd058eb77277c7989c8fe3878899845d23963cd61007b0590cda4c3bbf1134af0d37715a0ae123212680002e138dd798ec055 SHA512 c05e92a42dccd9712b2b8e5548a87137ab77a19cc36ca02879ebebbb95c857bcd0bbb07af5d5e5ef649b33aaca32afaaba426f2c9f4bfb0d04c827079ed1298f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild b/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild
index 8ef9462053b8..971bd6d07a00 100644
--- a/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild
+++ b/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,9 @@ IUSE=""
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+	')
 	gnome-base/librsvg
 	${PYTHON_DEPS}
 "
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index ab95010ce9b0..b54c6ede02d2 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -15,6 +15,6 @@ EBUILD screen-4.6.0.ebuild 4052 BLAKE2B 9f071833c6e5f3b853fd1314df4ef82002c64744
 EBUILD screen-4.6.1.ebuild 4159 BLAKE2B c3ddce68a667605da2db821e98460f920d3491dc2970ee2658d603710fff6a8b571f0d0f578a0c975ef66004d8d8e9da08dba783201d128063cc177f3613d8f3 SHA512 9e0b51c6f370ab5cc7df84c4098fe31d1ed2fd2d05bf8831845c4f756542f1aaae1147f36d9f0126bd108a322f3a4a206d6cbb504f4675c092d9319342e4b0ea
 EBUILD screen-4.6.2-r1.ebuild 4206 BLAKE2B 48bcdba4bca6a817e9c5d71b0c87005d416ee93f4602a1fa2e37d60a47d78ae6e67095cc4d864095912c78390dce5faa3f265814f2dd767d962f717895caafbe SHA512 af3ae5c220238dce3cc52692d48b2703b0b94fa9cb48716e1f0731f7c10ef3e30ed4087ecace455ea4475cd1f69fe886928a46e2befb9d80a6fbb914f2e81fbf
 EBUILD screen-4.6.2.ebuild 4207 BLAKE2B d24b2a2007144231ae9a24b9a25575fb17b10648de3b9b0d1e71ec1e453fec1a4fd7aacd1bfbb3802b70c43d42903ce6f6f3ae0c05831fcd1687e508f299457c SHA512 2f2f3929d96a7c95a5fbd5cfb3feda6efad52311b7cd5a69bac5a67735a85afc91cb1e1515aa3f3a3580babdf8e826a7ec2f37a79c811152aa914a2e6ed62164
-EBUILD screen-4.7.0.ebuild 4206 BLAKE2B e3572233ea5865e0f4765e0ba51e7edd63e2c9ab77c4f5c44e2268a8be049156edca873ff00fb8ea1deb97b2e8525e64768fdbcb8c8ddc088e654d4f32010a98 SHA512 24bf75dcc7c41dba4508ef758bbd2af57126ddd53f87b9e254b18ae4bebb795adc9fdfecc0f3b7502db7a6a49ba845df28badd0efbc25e0d27f14569bde1c0da
+EBUILD screen-4.7.0.ebuild 4204 BLAKE2B 4223a728e56b5fb350b08c21d05d2c306b91e4aedf95a0f7c27bb2783a26bd07762c807aaee2e3688fd5bad9c56d9315be2f014eebb81f0f6a8e47494064df74 SHA512 f80aa9acf911ac88826929e986da318986fffbe9a6cd92125417e49d72e56477cc57c1c392f98999348b427e2a5e3850df2a1a9e4ef3c1e00c1eebda9aaa72ac
 EBUILD screen-9999.ebuild 3984 BLAKE2B 6f68715e21470703626383ba4eee1871584b6dde2fa5dfa3e9cfae86ba8c7e3ce0496eecc2ecf4a091c53f19e1ea026547269a78b0e223805933d35ea7a692a4 SHA512 99f171c2963978b3a20a3c0637959a7fd0949163dcaf5a8693d8b9bd1a02a588d1d5c9ca16edf97724c2a2cbb6875caeaa8cd40c3988978dcf241f8c7a8ede87
 MISC metadata.xml 1836 BLAKE2B c91b439cb8e6301a8e7ac000f58616a6a383180671dc721b3ab74d74c826a85ec9f3e5d0d70a450a3a46430b47eb6dfff329a0d2489f4dee861ea1575f08e9c5 SHA512 39618ae8527cf9744132eb2a0aefe5f0b4a400784288661e74b670b149bf729001c950408b765a6cec0330c0517063732c7e4b15270a2a2a5d971d2e0475f21d
diff --git a/app-misc/screen/screen-4.7.0.ebuild b/app-misc/screen/screen-4.7.0.ebuild
index bdc40e9094d1..fd070e2ef570 100644
--- a/app-misc/screen/screen-4.7.0.ebuild
+++ b/app-misc/screen/screen-4.7.0.ebuild
@@ -145,7 +145,7 @@ pkg_postinst() {
 
 	# Add /tmp/screen in case it doesn't exist yet. This should solve
 	# problems like bug #508634 where tmpfiles.d isn't in effect.
-	local rundir="${EROOT%/}/tmp/screen"
+	local rundir="${EROOT}/tmp/screen"
 	if [[ ! -d ${rundir} ]] ; then
 		if use multiuser || use prefix ; then
 			tmpfiles_group="root"
diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index 67bafada3cc6..6b0eaa8e2208 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -1,6 +1,6 @@
 DIST solaar-0.9.2.tar.gz 864509 BLAKE2B 57c58d203d8d1ae390eaaa1cfc963cfcc9523de8d7edcb482f30c66bcaaceebc7c514cf0fcffb1b20ca5cc3bc869c94cb61bcddff44debba9307ec3b1c0e1def SHA512 13f469df753cc8fab55f5259ccc3e62b6e44471d277d240cd56ce0580144d2b1f95d731268176648663dd15e5607bfb512f477362f4f100aa0a653b001dfe04b
 DIST solaar-1.0.1.tar.gz 1195660 BLAKE2B e6cd89b5735e125dd438255a8961b1d5d38feb515c5097efec0403d99b9db6e29c439c13e279fcffe69cb314bf2650a7a11770830fdf1e971ade27ce8331aed2 SHA512 e0b2bbfd97d9650d94f1a4b47e4e70f09c75f684e7e1d3e67d2cf6dd197109084e941b98333e173fb205d5c9464dd07e17390d9c2d5b46393fee2efdb20429ac
-EBUILD solaar-0.9.2-r3.ebuild 1333 BLAKE2B a97c2ee886168dc4c46170e31d961bb2ce642b7d8831c4244652b04851d61e3e75f905701e1069354b9ca37924783f3fbdfa7f84b14553cd5a3a2f56498ea7e0 SHA512 f483ed000e628edbd1a9a4e25e1101f124bb9e9b2d34395caedf88730a15925d090aee57ae153f7fa9373ad409b9e42f41b4173930caf3e7fce5c0e230042a2f
-EBUILD solaar-1.0.1-r1.ebuild 1132 BLAKE2B 66b922175136ef89eb1a2cf0d0af1adae86f9587772659cc5b56cd3af4e172ecbf71001c84d44905616803b860ab65d8ab56724e546ffb4b69b926e57e72b51e SHA512 f1df0f35328ecbf3939ee02412bc7e4c5a97d49406f0d39abc08d8b806b9e684632600cc4e0f378afd2f3dff42dd9b5dd3d94181d8e6259084196516c4b0ed5a
-EBUILD solaar-1.0.1.ebuild 1101 BLAKE2B b242e82b57630c733d26c0db2c3dd7a1186614e094b99eec3118fcdae580206ca827cb1b7d92da2cbe3df140868ef403e72461ddb0e807e5a60624146976a7db SHA512 ccd896cf0b62bb3254428680170c03812eaf5abf0ca30d890ca1f58b2b3136136a5e8621b76f2e7bbf1af4e1118aa955f48fe345813bb64ef46cfb21ac7f6f91
+EBUILD solaar-0.9.2-r3.ebuild 1327 BLAKE2B 69eae627bf9da5d7433aed7067f7f861fc7a55a31deade07b46becf5d0e30a051760a6860d203f5e16656b1d5936aec28944d59bf16f9dcb5b75c3294879467f SHA512 dc4321bfa257831caaf1d07d07af93907a3157b40dfd404056f01ff3b3071b10ace13d8d14c958f864dec11d62d86670c1bb019d39a8503b2e64f1dd5340dfc3
+EBUILD solaar-1.0.1-r1.ebuild 1122 BLAKE2B 538593b24656bc75fe41f0611e5e7a636ad9c7b94881ee29614cd4466a43cb15dcbb1d07a79423f589f50fc2b6808dd37caa07d74666f87bb3e21287d484ab3f SHA512 6a1869bb08b7f22de92a48c7b5fa2239dcdafb24c3cf9fc20dd5968accd7758ca637a8c301221db8c6050563b92d06d1fe993d149610fd9820c49d75e451916f
+EBUILD solaar-1.0.1.ebuild 1091 BLAKE2B c289b723169ef89d28da5e7ba08fc0b3db95b85185e802ecede1a9ee8a31e0158b4599e470482c486e19edf896a077b1cee1b642e8d46c18038c649e3b982984 SHA512 33cf43aadc08e64b96eed3599ff81a4a67593421b90d98ab510514475c597bb08043c3b0fcd68a99e1c15bddba9cabbd5152080211ee7e29bea6769ccf99e58f
 MISC metadata.xml 247 BLAKE2B 28b1a6239555a2c8babc0c1ee34558209080f365bb6b8e2f29461758cce930f9ece751ebda2c364eccefb106aead7896b47c5bda1b8d275197c69d071edd2504 SHA512 5c9618d73d0e1e0b66294e959564df8703bc276f6e430d4692230429a377dbdaf38e7d569dd9b89b35f4acc4e2692ef6520e5cf118d0e76c8498d8ded0c98b14
diff --git a/app-misc/solaar/solaar-0.9.2-r3.ebuild b/app-misc/solaar/solaar-0.9.2-r3.ebuild
index f86d079462fc..5c823ed39c46 100644
--- a/app-misc/solaar/solaar-0.9.2-r3.ebuild
+++ b/app-misc/solaar/solaar-0.9.2-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 udev linux-info gnome2-utils
 
diff --git a/app-misc/solaar/solaar-1.0.1-r1.ebuild b/app-misc/solaar/solaar-1.0.1-r1.ebuild
index e81e7cc244bb..a93b069daee3 100644
--- a/app-misc/solaar/solaar-1.0.1-r1.ebuild
+++ b/app-misc/solaar/solaar-1.0.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit linux-info udev xdg distutils-r1
 
diff --git a/app-misc/solaar/solaar-1.0.1.ebuild b/app-misc/solaar/solaar-1.0.1.ebuild
index d8ff31e25bfa..c947969d7c4a 100644
--- a/app-misc/solaar/solaar-1.0.1.ebuild
+++ b/app-misc/solaar/solaar-1.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 linux-info udev xdg
 
diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest
index 7708578e338a..b1dccbe23643 100644
--- a/app-misc/spacenavd/Manifest
+++ b/app-misc/spacenavd/Manifest
@@ -10,9 +10,11 @@ AUX spacenavd.service 143 BLAKE2B 43621538a7362ccd655ed06517865b0b4f7b992aa6ded4
 AUX spnavd 580 BLAKE2B 948a29de5edffd17643ba2540b9a787e578e6114cef0d7536120f9a6f0b69e2dedb65a80cd8dc6827ae9f75500d1d13eadc83431927eda159cc3705f53f3bee5 SHA512 460ce173a1a68ab571fb39a0a00bdedcffaee5251037cc5787ecf90054f67333537087b3fabfd4a0e5b28acb5f72a7ef9b2bf50e9279336cdf95a18ecec13ce5
 DIST spacenavd-0.5.tar.gz 41746 BLAKE2B bd97cb9ad1ce684cbe0f39e03db0fe0a9cead9aa4a8142546632397fa923fc1067e2d33ea0270625b5bb06bc784c75f0e9ae49cfba7194d23537a7427abe1e68 SHA512 908f598e4ba5febbc1191cc32cd444817acd40c22e79b1f139c50787e1e25d4cd8328dc3fd6d9dde09bb80232b52f0e75ae429fb3345eb51fbe5a47577b038e2
 DIST spacenavd-0.6.tar.gz 54730 BLAKE2B 5d158ebb190359c6e6c2a20093f824f176e028c0d375ab4aadc635f7b26884df2ae58585e82dc3978892d04d139cc6c4704fedc300508f9314478f19d4ee11b6 SHA512 ff039e169805365ce8c1df1258eda6d263a0724c087b22a9e78269629455580817027d936e6bb7014b7654f48aa23232e8059585175003034e4bd3e0d6ed8200
+DIST spacenavd-0.7.1.tar.gz 56703 BLAKE2B 99a918090cf8875e5b5cbb48ceffc383b415d9bbe297e49630c8e48ab78bd547244005b5a91e1bb7abc01382ae332758dfc01297bc8f6fb9a05247330cde8127 SHA512 6bfd76f9187ce77c09cb6ebb73bce45391e675cda51437b647510afef574aa6e3f947f467e03a464e245a5e44f699db1d197a58a06a64a2199686b1ab596517f
 DIST spacenavd-0.7.tar.gz 55634 BLAKE2B a4257bc48e4b7973413cfc74fb4157cc93d27dd8e4c45142bfa0d8b30b94e517cff1e003c9b7216b498539a529bcfe623a5dfec48644a34c1bd300eb07d297a7 SHA512 241ed0ecf78fe683ae1ccda1e69afcee82f6ad55439516a5e02d3ff7eea1a4c5903e778e41f3e0d8b6f5dcbb8fec572a52e0be108a081bccb5a279af2277b615
 EBUILD spacenavd-0.5-r5.ebuild 2319 BLAKE2B 7f555ec38a828848ff3686def93a853a3a3b1c8af40274c7f040b3143f1d0f44c71d9931f0587db9c48a23aa8085fe3297c6d53fff4b9ffea23c4a894e362f4f SHA512 4fca63971153edfb5a69ca8cf40e543edcfd3f8c97ec729fc3afb550d00027566097f409a46c15bc2585dfe833e63208f709e3d713e58cdef2e730cd58c95444
 EBUILD spacenavd-0.5-r6.ebuild 2303 BLAKE2B 2acc81a1da275309f5fa0d9dd6931f9242107a7622467c23b37b0b0ff401bc6c560bae31a614c281527183e2464dd9ec09f95584a07a79b8b9e556f74cf6ebe0 SHA512 aeb2e1501a7a0c40f94c809994c29dc902a142362b5d5802d4a3354b62dd9c7880699eb2ba9c79a3f288cc301d453177e24ec9850c40b26758c2bfd82740d31b
-EBUILD spacenavd-0.6.ebuild 2306 BLAKE2B 01eec5ed89107490cdd2bfe2072e20e158ba05496a3f0bf16df8c796c08273cbe0b049aa22bf4f926aad70c60ff24f5569dbd9f519478c6dae826b7846a6df18 SHA512 f7aba939a76ee95ebc349c9ede93f733465c2d18f82e3736a314633d196c9e54a0824327172682ae9523822f0e397937a98696ee92847269970ee6f29c47a5d2
-EBUILD spacenavd-0.7.ebuild 2318 BLAKE2B 65b96c40800e50e3843c3b0124680ab242352fd71f1577d97d325cc330e4077c69e37e62ccbbbf504eac189422c6c9b85eba9464166b5a56217499c89bf50367 SHA512 0c86a6419e8db433d1bab2fd78f88b7bb5e2b81b0dc42d6c3dbc8455e632ea4fff7747764b5b42eeedeb55a932842e24161e7d5b55240767efe3b994b1dc3a7e
+EBUILD spacenavd-0.6.ebuild 2357 BLAKE2B 7a42f3a0eddefebbf75a7a47b0ac13406ccfaaa6844478406261c70711237aa6606851cc74945547e808de2a3aa365040a848e4108869f603592da4be4ca7e07 SHA512 bd51d709b6d94a760b934e67dba6561fca07981035e537b0395457e698b3fc4db5381ea337b7b2bb21c2dc9d5ed7e5a249a01cce45ceddb235e481ebb9da750f
+EBUILD spacenavd-0.7.1.ebuild 2235 BLAKE2B 7bcc607477018b73bdf2438619a59ff5ff34e165724b970415a4b3324d1b9ace2fde4139d3c5c8a7fdd00d4ced21ebd43739a1f894b19c2280be3993ab14eff6 SHA512 1e89683c67d8cb0f70419954efdb6b8a1f1b07cfb7de29e3f4302930db8cc5bbb21a8268e6a70ccf04de22a89e33a305ac83da9d1e3d281b6dd901c22ab2e4c8
+EBUILD spacenavd-0.7.ebuild 2369 BLAKE2B f31dab2abf32e04436ca549895d26b48acc88da8f9fd62ea16bf6643f3579ebc4bd2bbd323fb4b7a3e586a7e6538612d954fb78de69f3b8fb926085372645299 SHA512 c6bd1eaa8dab75618417a7026c11a5f6d2a4982488ac484a266f07a14ad0941a0133bd428c8324181fe1eeb5f1e05dba9443734bfa58808ff47c8641033eb9c2
 MISC metadata.xml 804 BLAKE2B 88ee8f585c24c42670e3e251bd751d712752c0e9566828c8f00dadfda7d732ec75cf970398cfe73d9e81c3f556d74c48b1845bce4230f2fe524f5a8d7cd7a70a SHA512 edc302270122ef31692806ec2fec3836cd51afcb9eabeaf5f1fb8d66e2ab703eb615efa431b3f78fe6427a6f976b90f769cbd001dfe2832bc2ce9986731e26b0
diff --git a/app-misc/spacenavd/spacenavd-0.6.ebuild b/app-misc/spacenavd/spacenavd-0.6.ebuild
index bbf5b9cf9e04..bc0c390694e8 100644
--- a/app-misc/spacenavd/spacenavd-0.6.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit epatch linux-info systemd toolchain-funcs udev
+inherit flag-o-matic epatch linux-info systemd toolchain-funcs udev
 
 MY_PN='spacenav'
 DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon"
@@ -37,6 +37,7 @@ src_configure() {
 }
 
 src_compile() {
+	append-cflags -fcommon  # bug 708648
 	emake CC="$(tc-getCC)" \
 		add_cflags="${CFLAGS}" \
 		add_ldflags="${LDFLAGS}"
diff --git a/app-misc/spacenavd/spacenavd-0.7.1.ebuild b/app-misc/spacenavd/spacenavd-0.7.1.ebuild
new file mode 100644
index 000000000000..e4ff48d27d98
--- /dev/null
+++ b/app-misc/spacenavd/spacenavd-0.7.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info systemd toolchain-funcs udev
+
+MY_PN='spacenav'
+DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon"
+HOMEPAGE="http://spacenav.sourceforge.net/"
+SRC_URI="https://github.com/FreeSpacenav/spacenavd/releases/download/v${PV}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="X"
+
+RDEPEND="X? ( x11-apps/xdpyinfo x11-libs/libXi )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	CONFIG_CHECK="~INPUT_EVDEV"
+	ERROR_CFG="Your kernel needs INPUT_EVDEV for the spacenavd to work properly"
+	check_extra_config
+}
+
+src_configure() {
+	append-cflags -fcommon  # bug 708648
+	econf \
+		--disable-debug \
+		--enable-hotplug \
+		--disable-opt \
+		$(use_enable X x11)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	# Config file
+	insinto /etc
+	newins "${S}/doc/example-spnavrc" spnavrc.sample
+
+	# Init script
+	newinitd "${FILESDIR}/spnavd" spacenavd
+	systemd_dounit "${FILESDIR}/spacenavd.service"
+
+	# Install udev rule but leave activiation to the user
+	# since Xorg may be configured to grab the device already
+	udev_newrules "${FILESDIR}"/99-space-navigator.rules-r2 99-space-navigator.rules.ignored
+
+	# Daemon
+	dobin "${S}/spacenavd"
+	use X && dobin "${S}/spnavd_ctl"
+}
+
+pkg_postinst() {
+	elog "To start the Spacenav daemon system-wide by default"
+	elog "you should add it to the default runlevel :"
+	elog "\`rc-update add spacenavd default\` (for openRC)"
+	elog "\`systemctl enable spacenavd\` (for systemd)"
+	elog
+	if use X; then
+		elog "To start generating Spacenav X events by default"
+		elog "you should add this command in your user startup"
+		elog "scripts such as .gnomerc or .xinitrc :"
+		elog "\`spnavd_ctl x11 start\`"
+		elog
+	fi
+	elog
+	elog "If you want to auto-start the daemon when you plug in"
+	elog "a SpaceNavigator device, activate the related udev rule :"
+	elog "\`sudo ln -s $(get_udevdir)/rules.d/99-space-navigator.rules.ignored /etc/udev/rules.d\`"
+	ewarn "You must restart spnavd \`/etc/init.d/spacenavd restart\` to run"
+	ewarn "the new version of the daemon or \`systemctl restart spacenavd\`"
+	ewarn "if using systemd."
+}
diff --git a/app-misc/spacenavd/spacenavd-0.7.ebuild b/app-misc/spacenavd/spacenavd-0.7.ebuild
index 4c5a57fdbfa3..e9fef0e60869 100644
--- a/app-misc/spacenavd/spacenavd-0.7.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit linux-info systemd toolchain-funcs udev
+inherit flag-o-matic linux-info systemd toolchain-funcs udev
 
 MY_PN='spacenav'
 DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon"
@@ -37,6 +37,7 @@ src_configure() {
 }
 
 src_compile() {
+	append-cflags -fcommon  # bug 708648
 	emake CC="$(tc-getCC)" \
 		add_cflags="${CFLAGS}" \
 		add_ldflags="${LDFLAGS}"
diff --git a/app-misc/tails-installer/Manifest b/app-misc/tails-installer/Manifest
index 814c1b2dc3e5..9840b8f9a38d 100644
--- a/app-misc/tails-installer/Manifest
+++ b/app-misc/tails-installer/Manifest
@@ -1,5 +1,5 @@
 AUX fix-desktop-file.patch 1046 BLAKE2B c27059fdd3baf37ecab603c1f96d70927c967909a360371c8da0cf0bc34c78c5425a9e64af4582ec0b3de5b2a5328cb3d4248f999ddc662ce8370bec6377c4bc SHA512 9c51d36b6b97e7fd52aaacc8bae9b6dc16785c249eddc01cfa1ba3bd76b5badfd1b60e53c8735d6d206753e19d7ac48e7405d2bf69300c08391b94a0ca173dc0
 AUX sgdisk.patch 1138 BLAKE2B 1dcbc23924f592a619336827fa5c4bd21fb37f52070bbd44b08ec41c3dae8c8d09a322f2aeae9e0e67a2dce435cb9ddee7729d9e83e31fe3f06513f35f1ba934 SHA512 971e9b89acd7d175e7b6e44d3c31f7541721936e5cb7c08ba196b257170e841fb95965bbdfaffb2a9cf49f43e3ab05cde29136376b497ff3ba9741735c1cbc35
 DIST tails-installer-4.4.11.tar.gz 346123 BLAKE2B c6e0888cce180d411ab60a8098581da0df64ea6b2201076e58d6ae4d489feb5e9967fd67a457e8d333fad9934350d5df13044e02e2d428980bee335fd5420dcd SHA512 06d7e21f01841250ada8eca3dcb14078331450b61be4a15923fd0543970b9fb4284aba6cf12729515b2adff9dfa3f8a011e48d97a114356fff1edfd1eb914684
-EBUILD tails-installer-4.4.11.ebuild 1158 BLAKE2B 50a17a692c89d7ef4281b4d5523143027265dc7691b751013ff64df045a5b73366dcc39fcc4f05f3fa50b2129afd3210637c21ba63a2e38629e72878a1c906d6 SHA512 bb52088ac9b0a26824b894e85f13258710b6e4643c8cf3e6945aaa26973a7a65b3684713e251c83bccd77dbd66f1f5a23c655ac7368e50e8a55229fc4991b262
+EBUILD tails-installer-4.4.11-r1.ebuild 1241 BLAKE2B 05eba22612e6a95b77f2730ccf12c486263dad7659ebdc82533a084e9bc8e90678f14a3e75c4e7fe9aaf410aa67c61d866abe65ba9c911253281362bdbd1d356 SHA512 48bf513dbb655d05bd873b3aad028323358e00dcf02a637793b3c7180b4cccefe090ae9c0c0b822e26572a0f772ff0bd3dc7771c93d240d4b9d2a0aebdab3972
 MISC metadata.xml 309 BLAKE2B af6f3c6aa04dd9f3f9b808ecc90fab80f06e47641fd56b78305edeb1feb5efc50c874007ddba4ba3d414cd9993719f844d22aac97f04c41020890d4b5e6b8e25 SHA512 6e72318e11edc847698cc3b37002b61b70b62e6f8aa644fa400c55801613ec30187b6073cc9b5218911ba4e6e08603dc77d9f3585d28acf683c732dbda2b816b
diff --git a/app-misc/tails-installer/tails-installer-4.4.11.ebuild b/app-misc/tails-installer/tails-installer-4.4.11-r1.ebuild
index e67daaeac16f..241bab952e7e 100644
--- a/app-misc/tails-installer/tails-installer-4.4.11.ebuild
+++ b/app-misc/tails-installer/tails-installer-4.4.11-r1.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=6
@@ -19,13 +19,17 @@ IUSE=""
 PATCHES=( ${FILESDIR}/fix-desktop-file.patch ${FILESDIR}/sgdisk.patch )
 
 DEPEND="${PYTHON_DEPS}
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/python-distutils-extra[${PYTHON_MULTI_USEDEP}]
+	')"
 RDEPEND="${PYTHON_DEPS}
 	app-arch/p7zip
 	dev-libs/glib:2
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-	dev-python/urlgrabber[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
+		dev-python/urlgrabber[${PYTHON_MULTI_USEDEP}]
+	')
 	sys-apps/gptfdisk
 	sys-auth/polkit
 	sys-boot/syslinux
diff --git a/app-misc/towitoko/Manifest b/app-misc/towitoko/Manifest
index cf15a5629acd..747f841ab22f 100644
--- a/app-misc/towitoko/Manifest
+++ b/app-misc/towitoko/Manifest
@@ -1,3 +1,3 @@
 DIST towitoko-2.0.7.tar.gz 280177 BLAKE2B 0a58abc81a8106415d25d82a9eab4338d8a1cb8dc04b2d7b1d3790ae1c8429d0fdec2641dae68a9f38b3ce9aa9f14fa5ba1fb4fa9281e75e87a308024ba59873 SHA512 e2e21bda3b1dad55dee1cfb4063e114394a21973b4b2409b9dcff1479fc312fb93bf6e634d38e1f7a30e6f835d87af8268a478b534f65c916eeb13d5dbd07b86
-EBUILD towitoko-2.0.7-r3.ebuild 672 BLAKE2B 53dabd2475dd2c730df8dcdc88f42164c661b14f4a3c6bb70f6f82e8806fd9cb5630a0f39f5258ee2e2727f36a64b1eb89222bcb22864f2611e3a5051f6d48a1 SHA512 09ecf90205ce1a93e6b633607948bedcf3ec85959ec1a3137520105dd46e07709fba90673ac466264f88149a37fdec5632472a8e5051b1e5ee0599f945556b17
+EBUILD towitoko-2.0.7-r3.ebuild 689 BLAKE2B 78ba507fab5a0b44013bfe9481d81064928705a8a9f0a02f351d151427b4ed542c92e2c6dca68c4d0de626357a964d31e591f5f827d7eb7c82fcb84d35ff825e SHA512 80b9a13cfa7991d2981ce8d0212a3aa74e0d8d21d7b81e7242379b36a9637ca51cf20c9ee93f85aa3ccbc4272d382fda9c229061fa9ef0616ce78bfed61e477f
 MISC metadata.xml 278 BLAKE2B 6cb5d9c1e26e7c00636842a387c8b772f44a284cd24fb44e8133edd04d4d37a2fac01d0cf77768b88137ea7ab302554adf4a32e41df5246b2ab01ac21476f8a9 SHA512 4d69e222be58da2fefd590fa9cdfa2dd6e7108c3f663fb0f491d49609b0ebb8e10b4dccf22966d09f83b81074f0543723837b60015e7d4102b7a7085744c770a
diff --git a/app-misc/towitoko/towitoko-2.0.7-r3.ebuild b/app-misc/towitoko/towitoko-2.0.7-r3.ebuild
index f545f018ad15..053d19504e51 100644
--- a/app-misc/towitoko/towitoko-2.0.7-r3.ebuild
+++ b/app-misc/towitoko/towitoko-2.0.7-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Driver for Towitoko smartcard readers"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 3f551f0ff20f..b2a795216d61 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,3 +1,3 @@
 DIST tracker-miners-2.2.2.tar.xz 2893476 BLAKE2B 30bfd0454c5429a708ee10a299210e800e2d713859a20206b8c96cb41f4a1d14c438266b198788056b4d2f7fd5a9b8b465d9d7b460e3e57ddbd56d98f89c5ae2 SHA512 41dda92ddde2ba473ac0887ab5a0c0918c8a26a99cdcd1c0a7d49cdce0f7b02ff080fa868df7e855d08ce5cf61fa55b3ef0737bc58a83e80d2096435efa11cf3
-EBUILD tracker-miners-2.2.2.ebuild 4691 BLAKE2B d1ed0be0579c342940c2c648d1edfadbb1799ca02657ae601fd8450920cf709ce023a38dddba5e3275dbe9890498d1335469ec6a4d7a056def013fb470ecaaf8 SHA512 b2eaee0f31dbd69e5fa6c564bb70ead1e045380cb33253aceab83e4e98990552dd92dfff8bf7385f7d4fb29b7d3c2cd2f5f283390a608f8662244a35c458e3c4
+EBUILD tracker-miners-2.2.2.ebuild 4687 BLAKE2B 1c7ee9e246f29b54aa4744ef42dbb62ae50aac309306ab304472eaced129db8559c521eb35d6520bb25aeb7e5f43515264c64131ce8d9f5c2ad075973497a6f6 SHA512 493c0c9134ab39df3d3a7b91691a9198b8236af24f6f4130e58dabcf8e9694f06e9bae1ee4330bfc1c31cea9bcc7cdad0fca673c4ea9dc460c692d6b3c4011ac
 MISC metadata.xml 739 BLAKE2B 0ac1d8e892ef4b1caebea7f598b35694bc21956680ccfc16b2693528f913fde9354fb984fc09f20bbf9ad3671af2438818691d05fbfc05a06783cd2aa401ed8c SHA512 e685c1ed8e5029828251ed7a6e8124e8716b365172d976116a29aea67ec01744450892a30e53ce0a3ae4f1fa2b41d9af8fd4429667c31478e83aa3086cc0aa01
diff --git a/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild b/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild
index 9541f9757a22..22dec178b9e7 100644
--- a/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-2.2.2.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} )
 
 inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
 
diff --git a/app-misc/unfoo/Manifest b/app-misc/unfoo/Manifest
index f1eb46f33219..e6a94581d112 100644
--- a/app-misc/unfoo/Manifest
+++ b/app-misc/unfoo/Manifest
@@ -1,3 +1,3 @@
 DIST unfoo-1.0.8.tar.gz 31862 BLAKE2B adba517a24a1fde7e1733b10a0c69d1ee5b0827adfadf89a7073366f77bfa2439413c1ce682d9a6d24f8b7b0402f409c84754f75dd5ee31c03ab51ffe3918f81 SHA512 b4a2489ca4ae5a81feacc57aa7c9c6437e3fbb0cec997d1b5e182e9ea7e19c13998968f23094e78908e6d41e699d50a1353ae475ec32146c63298eff06182281
-EBUILD unfoo-1.0.8.ebuild 1281 BLAKE2B ee184bc3c7dbce1f36269fe5b1b9fb54b96c4588a68c10d228f3ca85835e6ab58749dac99d0b19c395555944474a0a130d2481274d3bfdb397e21121eeb9c42c SHA512 cf38734e031235164849090a7d5ef28faf804c067e9977d890ec2f9f42b0bf0e95b7d50da2d72d664772e68661cc46a4d5a74a715b2659745b928290cd88e78e
+EBUILD unfoo-1.0.8.ebuild 1180 BLAKE2B b6b76734ae0eb8ac537db0d7f0db06f7df741f4064ea2224d04d76b7ed74e0efa5631f63c8a4a8152022cd29f657d30215c151c0acd7205ca651ca6303fd8595 SHA512 139e423094d00fab0cd51eba701094dc115d6f10316bfc4489b9dc0065bb9fb63041dad313f16674d12c502ae38b2fef66bd9ef437255892b853f3129d05761a
 MISC metadata.xml 443 BLAKE2B df80de233a6c7d23093b4770b2f4064c389ae85837b7a405a1b3132c42bd050ea99b6ff922d75d118e616c011191f4d708a0080b094aa40e938fcefb556f6f14 SHA512 d51afbee4941d3a6d5239b983e2beec524d9991c67131f691cf0f424b4ab5e798405fe89f7d8019c912a4e54413bf38f611bbb1574c4cef809440d7a1a60ee3e
diff --git a/app-misc/unfoo/unfoo-1.0.8.ebuild b/app-misc/unfoo/unfoo-1.0.8.ebuild
index a6c641e8024b..1049dfaf93bd 100644
--- a/app-misc/unfoo/unfoo-1.0.8.ebuild
+++ b/app-misc/unfoo/unfoo-1.0.8.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
@@ -45,7 +45,5 @@ pkg_postinst() {
 		elog "optional packages to do so. For a list, either consult the source"
 		elog "(less /usr/bin/unfoo), or see http://obsoleet.org/code/unfoo"
 		elog "To get full support please use USE=-minimal"
-	elif [[ ${REPLACING_VERSIONS} < 1.0.7 ]]; then
-		elog "To get full support please use USE=-minimal"
 	fi
 }
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
commit	71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree	9f1f0dee23e13658e52f49437befe78427148c51 /app-misc
parent	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)