gentoo resync : 10.02.2020

22 files changed, 80 insertions, 61 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index dd1fcfde7a57..83193296ae68 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index 602f528a2b74..d93cb47d5b08 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -1,5 +1,5 @@
 DIST elogviewer-2.9.tar.gz 24157 BLAKE2B ff527c0198e86f7be15fce3f25f0e9677b6911cef72cfdc1f582c62f534fc15adac8c2cf612475f174561dd46b489dcaf819c8ccd1b5893adeb7a6c085ce11c2 SHA512 e5781eeaf663fafa680b0620c4a6aec63afffd05c1cb4cb5362e9eca3a35c85550ee295a6b753155b0392d69442068cf155c3ead872c457e5a3cdbcd59b1ab2e
 DIST elogviewer-3.0.tar.gz 28349 BLAKE2B 44f3ca5b28d075bb8349450cc817fd8ccdd1d1dc7eb948a9d65ab3b423191eca04cc479b2d6bec0bf6bc7f1120eccd257fdf61bb736919129ee756c2f4bd4366 SHA512 7eb59849a06632053ee0f7d1d76d9848220dbb8ad48d04c80fea5e64304f86c1a99987f525c6df682c832bd8453e07781a5c95ad2dee0539e954400730f47e36
-EBUILD elogviewer-2.9.ebuild 1683 BLAKE2B bb559758ecbe038a05746c243df9dc8cab5b64436aff962a9af0b2cb9ce70525a7c0de9d467938bd98ee7805fdc2fc8b6298afdba08db854b7c9b00efd465048 SHA512 6c0390a209bc42555cbed8afea61e339529d6e3c01ff11d38614f88b5c7a04bcac217c2cc5e3ddfcb5ba3ab9d41731f71660f9c30aea69413ed05f46495ffb6f
-EBUILD elogviewer-3.0.ebuild 1686 BLAKE2B ca25da9a3620ffcee16c8d725cabf4a1a073cea3c883a12a19dfe17a80cbc48f6fd3321e1466fd48088437086fb40e6433334ed1dfb21a05e39d2e9dc1e19162 SHA512 6f2e2eecc570895a0690fc470518aed811cf3056af85befc5431864aa4b4bfaef35222581b173b17d3db68583ecbe2cf7dfe1010ff16af885ac6a153555e53e2
+EBUILD elogviewer-2.9-r1.ebuild 1763 BLAKE2B 86d38970ae69a6c698e200364048ac7d54c7c459d47a53e3c192efa5e0ed10d169d5a77a388884873d1980dde59c7cc515db4cfa91bf010343499e098614e3da SHA512 33d3557e382233aac8add44b6b4b306cbc36d4e38e13b0370f71ee22055bcf1317b74bbf2d1ba6b3ed2ed0681a88a1e0160bce72fb3f5d1696551fd840976cc5
+EBUILD elogviewer-3.0-r1.ebuild 1772 BLAKE2B 01f4332f0f3c92d2641434dbbb352b568fc8e5fd885eb7eaac91cac7bb7fc232768cc0d5a26cf0aefde45367f4b12171a9d5e1e1e488074328aa61d6bf5455d9 SHA512 e489129cea55144f62bddd192842a9afbae0568e862dfde959b4ed6853e69bcde1dc1786c8200ccef52d0d70813dd7a566c5e9ae676040f9cacd33e85fa3e62d
 MISC metadata.xml 402 BLAKE2B 4cc6503c5c74f4f0883d2c167bb06515878ad1324931d38d9402b463c774b009d14ad2ec5b8d2611ea361e0793ffa3b4d463e88173f2f08dd0b1c0a988bed44a SHA512 77f982c8b1070592bcea3b91ae6e4c2fd815c5be0a63b7160793f7e7fbd1b1e60c3e3a993da1e7d2933b22ca621d6320955f7ac360b7ed09dc04a149ee32d567
diff --git a/app-portage/elogviewer/elogviewer-2.9.ebuild b/app-portage/elogviewer/elogviewer-2.9-r1.ebuild
index 33df6b190e26..d4455cc879c6 100644
--- a/app-portage/elogviewer/elogviewer-2.9.ebuild
+++ b/app-portage/elogviewer/elogviewer-2.9-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 DISABLE_AUTOFORMATTING=true
 
@@ -20,12 +20,17 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	>=sys-apps/portage-2.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+		>=sys-apps/portage-2.1[${PYTHON_MULTI_USEDEP}]
+	')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_MULTI_USEDEP}]' python2_7)
 "
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+	')
+"
 
 DOC_CONTENTS="In order to use this software, you need to activate
 Portage's elog features.  Required is
diff --git a/app-portage/elogviewer/elogviewer-3.0.ebuild b/app-portage/elogviewer/elogviewer-3.0-r1.ebuild
index 40533d03c311..aca7afc730bb 100644
--- a/app-portage/elogviewer/elogviewer-3.0.ebuild
+++ b/app-portage/elogviewer/elogviewer-3.0-r1.ebuild
@@ -20,12 +20,17 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	>=sys-apps/portage-2.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+		>=sys-apps/portage-2.1[${PYTHON_MULTI_USEDEP}]
+	')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_MULTI_USEDEP}]' python2_7)
 "
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+	')
+"
 
 DOC_CONTENTS="In order to use this software, you need to activate
 Portage's elog features.  Required is
diff --git a/app-portage/elt-patches/Manifest b/app-portage/elt-patches/Manifest
index 29ee00e9b2a4..0c7395706307 100644
--- a/app-portage/elt-patches/Manifest
+++ b/app-portage/elt-patches/Manifest
@@ -4,6 +4,6 @@ DIST elt-patches-20170815.tar.xz 27864 BLAKE2B ca699e3fc3f5903f660fba70aa424603d
 DIST elt-patches-20170826.1.tar.xz 27912 BLAKE2B 886644713651448784e040fbcde6ef11f98f12abffb347f2213b990c1f0ec2df3af6c729c18781235a393e6de907b4da6ec5d140f7fb856466de6e7cefd54b00 SHA512 30a1e8b77d2963b7c56eef3a7a0a576ea6d30f1133c7bf6ad3b5b57cbe3e2de5e8cfbc50a929fea589b42ca02802a7ed16ccf7adb868290a2cc3add5b4fc77d3
 EBUILD elt-patches-20170317.ebuild 692 BLAKE2B c1b4c40736890b07d934d86fa36db875b8c35412d453985f5bc08b22b35966f110ba7765746b59eaedd2eebd0a812309b1f8a31572f8f0a9a8bd9beaed05fd0a SHA512 f282f6e223d70ed60106a3784b549517549d93787ce2746b971d1aabc65db9b0b9c5cbd5dfcfd3aa7b53bc339429697584e99fb4c2ba8f706fea91a0727718a9
 EBUILD elt-patches-20170422.ebuild 815 BLAKE2B 7d0b15643a486d844703349b8f01e1f7a248d6677777c0763b163cb6ef55ba7480e9d02ac09a039a26b68d8f80ee59952e958fe625d6f5b04de3ea1607077015 SHA512 ee9d939e63c3c5a0e544e6985082fecd7866cb027966579533eb4c64c04a551eb2c7d7edf2e9ce451b7e9f0411908929351a15f0e08168d5b0c748850fdbd795
-EBUILD elt-patches-20170815.ebuild 819 BLAKE2B 8b032449696046892d7d125031e2c40d9ef85593385c4f46c3d622d526505d948f03edc092158933e7017e099b47d48307c87727a63616ecef02130bddb83ca4 SHA512 5fffd1dfc88fb82afe2c13374e30aeb11cee8756ff2fa227d39763a094e22df5226e3f04ff3ac696327a3118afb7d98ff511c61897c8f614fa2583b14dacf095
-EBUILD elt-patches-20170826.1.ebuild 835 BLAKE2B d97df7d53db3f391e4b0c5edc6b819172430577a74b051d4e2a085d16d981ce85e0ce2b1b58a6e7066533e8c83d97b7e1a70c40a98e8bbb015f044ec43660d0d SHA512 86277957080d8f9f11a9b4c713da0832f5ddc146e007a6d3148b78eaf852933370e25831624c0664347164d18839a57ec2ef81663dd2bfbfc57885e33bdb04cd
+EBUILD elt-patches-20170815.ebuild 815 BLAKE2B 9dd857cb4b00f14c60b5855b62ce7ad5d78962982fc72cca0c839001a978ac6c0a95a6bc8352f8b450c77a4fa7efbed1fb124f096c477d1a7a180f649dddd1b4 SHA512 8c33fbcb2f8bbe1b10e7f190e8f4db6ae684847dcf28d51f53f8deafc0cde1c08ec4628b8387e109ee3f52468fcfa88d7943cce438db9c7c39f04acc5b763e5d
+EBUILD elt-patches-20170826.1.ebuild 831 BLAKE2B 180456dc41acfef88ca3b064ac7335150f670a8bda95246e111cd850cbc0db7f3a2aeb7189968e74309022fe89d5e5ebd21fdaab4f11d63de4d2b7c2064f15ba SHA512 82e2b0e3b8450944f880771c4bcfd1f50aa11543ec90672eeef8356a8d3538e826378663f3254925c253e5ccab184978e9a77fe66cf4491dc6b271fee500a96c
 MISC metadata.xml 223 BLAKE2B ce9aaf73ccbc1745f44acf92e5a32b134fc36a7f40c1c83a4f8296bafe3902d851ca1d1b67829d82573b8e9df4bd2643122a98846ed7824bbf67fd88b0c822e0 SHA512 291302ff827472b8aaaa094bf6ed7b728166f21c9603b98beed59db2071a75193d7c5e462c4d435eea7e1047a1f31076bdf6deb08a1c8ab794ddd965c9be92bb
diff --git a/app-portage/elt-patches/elt-patches-20170815.ebuild b/app-portage/elt-patches/elt-patches-20170815.ebuild
index e3277fd1030d..dc6afb3eda28 100644
--- a/app-portage/elt-patches/elt-patches-20170815.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170815.ebuild
@@ -16,9 +16,9 @@ RDEPEND="sys-apps/gentoo-functions"
 DEPEND="app-arch/xz-utils"
 
 src_compile() {
-	emake rootprefix="${EPREFIX%/}" libdirname="$(get_libdir)"
+	emake rootprefix="${EPREFIX}" libdirname="$(get_libdir)"
 }
 
 src_install() {
-	emake DESTDIR="${D}" rootprefix="${EPREFIX%/}" install
+	emake DESTDIR="${D}" rootprefix="${EPREFIX}" install
 }
diff --git a/app-portage/elt-patches/elt-patches-20170826.1.ebuild b/app-portage/elt-patches/elt-patches-20170826.1.ebuild
index 83c31abb0a3b..69f1f1e61fb5 100644
--- a/app-portage/elt-patches/elt-patches-20170826.1.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170826.1.ebuild
@@ -16,9 +16,9 @@ RDEPEND="sys-apps/gentoo-functions"
 DEPEND="app-arch/xz-utils"
 
 src_compile() {
-	emake rootprefix="${EPREFIX%/}" libdirname="$(get_libdir)"
+	emake rootprefix="${EPREFIX}" libdirname="$(get_libdir)"
 }
 
 src_install() {
-	emake DESTDIR="${D}" rootprefix="${EPREFIX%/}" install
+	emake DESTDIR="${D}" rootprefix="${EPREFIX}" install
 }
diff --git a/app-portage/gs-elpa/Manifest b/app-portage/gs-elpa/Manifest
index 56dc979e93b7..92852f384274 100644
--- a/app-portage/gs-elpa/Manifest
+++ b/app-portage/gs-elpa/Manifest
@@ -1,5 +1,4 @@
 DIST gs-elpa-0.1.3.tar.gz 15486 BLAKE2B 6e34aa27aae9d7e27d41e122ed18890b5b63a18e5803f83aaa2fe5c82cf95fb010f7d428e576ce1c8493b27fbb587e37f74f8c9ed3ed9320722ec61eff1f535e SHA512 616c6cc33e89094e727c9ebe577d211cf9200a95b7ad6fd4b350b16d6982e3d509278b63a145880cdbc8f83481ba409b650e43260d463bf90a22e2a705997020
-EBUILD gs-elpa-0.1.3-r1.ebuild 607 BLAKE2B 7f7a184815838665c5ad3c933e8457cd1afe446e2012d4d0e1bcf5a8e262239fd16d14f28ccacec0ffb881c526ff6c7d628138a3136667b5954fd83ceeba22da SHA512 c14df45857886d3ffb1c0d575e6ace78c016e333f8cedf9eacf078a90877a36be9287e2f8c5e619b93e9e6bff6aace528a796701b74da8feb11f6f685f91aca8
-EBUILD gs-elpa-0.1.3.ebuild 601 BLAKE2B dea8a0b01179e9b9eb6e0d872d397fd9c25621dcc2b80180fad9bfb8a625e3b10eaf52c19c57c5f3da394da098dd769fe8daaa3c8a851cb973a29edde6fed7fe SHA512 ab8fa141fe05ee4aabdd80684978bbc8b802e623b49c090a3e76dc20e1e908c157cd5af34ce0c4f4dc62a00073b508c0d563e3ade4f004549df229dcd7f76c23
-EBUILD gs-elpa-9999.ebuild 599 BLAKE2B 7918fd5270ca458e5305826d0cc7dd34952645d530def78059b99c3ba62739b08ee9b8f16e3aadf19d166f97d8f1c77bb263f4a53f679c1f96f8e99dc7367d94 SHA512 0a95636e5b30d233de3220ac07149a42ca1b612de99e84ec444e95eee6c6db9b944d84272df71607708eb9a0b2da2c1eac33420881262a0affbd6c3c596c5910
+EBUILD gs-elpa-0.1.3-r1.ebuild 601 BLAKE2B 97a6e89212b673a7fb35ed5fa84e214ad1e01ef53cf608a8ee83b06b588f20ffc5451768c2e03f0393f84eb713e2ffa1c58ce1571508a81158ac75d77016b758 SHA512 40b1b0e553e3b01db388d6bfea79e3325db0047c8c9edc4575baf875a2269cc329f5b14cbb28dd4945e638a0c1f7a8fe4cc500cbdcf654d7e6beede64bb106e9
+EBUILD gs-elpa-9999.ebuild 593 BLAKE2B 23ef195780293ace28a7c6ca4c9729abdebaa11cfc661cb5316030ff4ef9cf98c4b6f600b817c491d9511c6df4a6cfe887eaab330e708582a7473fe326bcc6bc SHA512 f99650ffcc462906b7fd0f72a4c3b21ba6cd2a102a56feed7fdcd7a805bfd97ce6624d3105279005b1c72ed6acbc658f44f9281c3dea9c1f8d56bd79528f910c
 MISC metadata.xml 332 BLAKE2B fba6bf848c564260ffecdccc4a972f929bc0bec8b8df1a5842da68943d1877a27eebe514d3b6d963d398050f3411b8c6626be4cf743382559646099cd681d570 SHA512 cd0d491e5d3362c673b23769d802067f467d48038f0590d94a3a93fdcd6ebd3edc2162829854d0123576dc92a7b1bf49dd3fbad2a0e2a85c311701027d8d4fb9
diff --git a/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild b/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
index a8f738252568..9d3af3fb369e 100644
--- a/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
+++ b/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=(python{2_7,3_6})
+PYTHON_COMPAT=(python3_6)
 
 inherit distutils-r1
 
diff --git a/app-portage/gs-elpa/gs-elpa-0.1.3.ebuild b/app-portage/gs-elpa/gs-elpa-0.1.3.ebuild
deleted file mode 100644
index 5cbeae5ba87b..000000000000
--- a/app-portage/gs-elpa/gs-elpa-0.1.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(python2_7)
-
-inherit distutils-r1
-
-DESCRIPTION="g-sorcery backend for elisp packages"
-HOMEPAGE="https://github.com/jauhien/gs-elpa"
-SRC_URI="https://github.com/jauhien/gs-elpa/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-portage/g-sorcery[$(python_gen_usedep 'python*')]
-	dev-python/sexpdata[$(python_gen_usedep 'python*')]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/*.8
-}
diff --git a/app-portage/gs-elpa/gs-elpa-9999.ebuild b/app-portage/gs-elpa/gs-elpa-9999.ebuild
index 46e8ea22a802..8f1844ab7fed 100644
--- a/app-portage/gs-elpa/gs-elpa-9999.ebuild
+++ b/app-portage/gs-elpa/gs-elpa-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=(python{2_7,3_6})
+PYTHON_COMPAT=(python3_6)
 
 inherit distutils-r1 git-r3
 
diff --git a/app-portage/gverify/Manifest b/app-portage/gverify/Manifest
index 54c4772f308c..fb4092353894 100644
--- a/app-portage/gverify/Manifest
+++ b/app-portage/gverify/Manifest
@@ -1,3 +1,3 @@
 DIST gverify-2.tar.gz 4609 BLAKE2B 73f97ba232fe0269ec56649bc5682650d48c001e432f8076c820a58a94c3d1de079dc89873d589a76b91164153e5c5be78870ef34b3b69f3c39ca0c0e388b114 SHA512 1756671d22047edc6ed1121b65af8c163afba854364a50a9089cef733213ccd6c9dd1276e876b9118741bcfa92ad02cde572fe2b6cebb22339664552c67d2957
-EBUILD gverify-2.ebuild 692 BLAKE2B 5b9c74d8a2f86f153e5a8c4a0821153d119e032ca06f29bd715f7b1a8c77920a0de164586e131f10568c8a21debffa77993ef30e990426ce191484128547fe2d SHA512 3a450468e173dfd89f238159e90e00a96ea52d65d60636dc2108af7aa6306244ed3046aaf4a37299e172fa635307d96e345e1790ea628a0f4c6b2c3f9768ce8e
+EBUILD gverify-2.ebuild 686 BLAKE2B 294f69fb53fef8eb589a7c24732fd42402006dd67379a5fdf0158c8d4b17bd2708496d1b4acded09af9b94c718b0bb09a58f4d94c762f992171ea407c6d0bf56 SHA512 72dfaf73e05dfd593707d1e8141278ae4bcca782854ef7e7fcd74f0a9947c0755981f5570408b51ae7cd4a89b1ecfca6a716dff33f34aabdaea0a0f1a5f17f4d
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-portage/gverify/gverify-2.ebuild b/app-portage/gverify/gverify-2.ebuild
index aaa8e33b8e8a..777fce25cd7b 100644
--- a/app-portage/gverify/gverify-2.ebuild
+++ b/app-portage/gverify/gverify-2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit python-single-r1
 
 DESCRIPTION="gentoo.git signature verification tool"
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index 356fb6fabe57..0be449d827fc 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -1,3 +1,4 @@
 DIST portpeek-2.1.27.tar.gz 13000 BLAKE2B a134d7c9a99dc4bfd8cbd56343a6d049c215eadde745f1db6af234c5b561f916f2bf3393a8a01ae44ea4a74bd501b46abdd150cd1403d5254d70c12ad7d7545f SHA512 aeaf47cd5701531c0488709ac63cf38faacec73dafbc96502c34cf279051679242f63bb452fcf14c1b739d08821981e59af3734f4795905d7af31dcaa95f26d2
+EBUILD portpeek-2.1.27-r1.ebuild 689 BLAKE2B f42bf733273706cd29899adeac31b1d87f91e5d8795d09d1ffbadfad00d72ba7338597750dfe7a2aa575656cbf700fde24114d8c0705b390fe3932dc2ace4d23 SHA512 e28ba1901e384245fc12fdfdd1d46790b0b3fa6d3ca47ece1cdca10a82f359211dc45e524e512907f04915ca0923675c55edac3605e54b5f96000913191a6238
 EBUILD portpeek-2.1.27.ebuild 686 BLAKE2B cef2678482877d963c47af57a6000818859a942ddefd27d2e00a064f43781806d0632c02d780f5aa21818fceea512fbe8a46558fa0de242f1135a098d2630b9d SHA512 7b62e8d8a3c363d587367742738cd37a3f4133a464812b90b5be41aa2718d7d1b82d96b0531b8a8d0d3f7dd3ea42ba90b9beeab0bf6b2d81b1f96b7f93506f2a
 MISC metadata.xml 222 BLAKE2B 5192d31072923545c8f760f9c3b3274f610b7a94a53cf55bc85c5c20a953b227b7cdb64cb5f5921b8b2822ec6563479b5d4883ec2b569a066d8ab569713fa8be SHA512 3d793038a1abf5bb86eeb23fee623f27db1d8e529372adc51eb4ffd1d0c2deb6df1c4d637954cc68e07d590c25e3d74a8437d02c1864a21c96f63597192cfef9
diff --git a/app-portage/portpeek/portpeek-2.1.27-r1.ebuild b/app-portage/portpeek/portpeek-2.1.27-r1.ebuild
new file mode 100644
index 000000000000..a1b5331b43d8
--- /dev/null
+++ b/app-portage/portpeek/portpeek-2.1.27-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-r1
+
+DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
+HOMEPAGE="https://www.mpagano.com/blog/?page_id=3"
+SRC_URI="https://www.mpagano.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=app-portage/gentoolkit-0.4.7
+	|| (
+		>=sys-apps/portage-2.3.85[${PYTHON_USEDEP}]
+	)"
+
+src_install() {
+	python_foreach_impl python_doscript ${PN}
+	doman *.[0-9]
+}
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index a646feb85494..cb43d72804ce 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -1,6 +1,6 @@
 DIST tatt-0.5.tar.gz 23249 BLAKE2B d98456bab4ec4d820bddc2ec614e02582f5b0385d806c876a5155cb09bd1468908ded3f5c879fc38f2cb4211f8415dddd640dd20b6b123c926b02387d49dced1 SHA512 0e2fa0dc12339be2ee2408a9dfa06201857bd2ef570b1c5ab46f0c4f0dc07492fc16d74c8f05cdef9232361b77843703d5f7e6752bff17a1ca2c3aa3cb1c1f29
 DIST tatt-0.6.tar.gz 21689 BLAKE2B d11bfb616cd27f1a303d4c95dec875cad42d31d72654be4649dac2c7b3f086b7c5a1886d9c9fbd0a858d9e042c9db0a7b5e2f4167c46b6291509f9d97a654097 SHA512 c12ea273af8b5bb410493f297776d730b7c36748a5f1b735c94dfb0542f9f03d28482060858951ac9fa161fc299c21473f5bdeaa4d89fb88ef61187a809dcac2
-EBUILD tatt-0.5.ebuild 827 BLAKE2B 64a4a7b8317c3c255bd5f2fde1e0e4ab873aea9da490e6a4dde74cb86ef30c2ab1a04d972fd0015f12c6e3f6b1521c2128f9e6612564b1cebd45b655f94124ec SHA512 2eca825604ecbce791e31bfa486d937b500d042326c26f06ae610c98897205a7bc985a7ea98f8b1c4431b7d5781edb18f6153f0c3f3d00d6700d9520a786e10f
-EBUILD tatt-0.6.ebuild 829 BLAKE2B eb17f1334a2d1d2990514e5daee3ee7cbcb6023da8695027c1ea8bb69b33370a99a6a11bd4b764ade735ab919b8587528ee769dc1ca630082650553ca88b9160 SHA512 41722f1e64065725e0298125d40a91b0e4b33a8d994aab29c3dd43bdaf0911c03243b30d4b828be2083d936ee7ce3251c8ec94f9ff938580a9b4d63015d8f0d7
-EBUILD tatt-9999.ebuild 787 BLAKE2B 86e616fb77044aaaf2182f31440eccaf99ff661ebd1b0226670fbd1ca26d2ec48204b1196d8dbc40a57a9c5b59050a18ac754450bf502bd715d317916579448f SHA512 b290521d30ed1fa0bdbf5ba2d25e242922c53ceea720fd3823254ebe01e2d609c1789fe2cf2dab295c98cfc39655405113a6f0d21c7fd5a847e4e124faab9569
+EBUILD tatt-0.5.ebuild 817 BLAKE2B 2cfba9753e8489dfbe47588eb61a74aba5bdee846bf3d7dbf4a10c10e61a23dfa8271a807573511cfc5af465c760fda81bbf0973cbbffa02f27dbce6915e6a58 SHA512 783889f0ab7c3b2ca88a0861dce022639c5f389802e5e05bcc3d6a1b1d4a3798d599a5436e5506ffd0c741d8ce654f8d80aad1a1c7f28704da19d0df56625cbd
+EBUILD tatt-0.6.ebuild 819 BLAKE2B 9c92e7ffebbd06a132467fd3a097a5dc194c307922de06885da08b109c892ca1e597e82b175bbb916ce9df7ab14ef1528936272fea082494fd6fabc79157f284 SHA512 3d3fd320f0940b7c3198cafb42f4e6fc85ea893e0e52f2210cc8b49a939c8e81bcb8775f67b74b9abfefd963b6340da023464d181020b2e979b77d29fbb450e3
+EBUILD tatt-9999.ebuild 777 BLAKE2B 5e3f662008cf447ad3e7982f80228542ed89f2b5854821b6eb42514415a32dd76a37cf4b39bd94e5ad5c49a70dd5aad99e397c287c8b1814030409facecb6311 SHA512 a93dddaea45560a76023b06cdf57751433e2d28c0e2ceab2dd6c0e413a082f0f4c7b7892207cf9a11636322435570480c4b7f12eac008c80a40d307657957a74
 MISC metadata.xml 640 BLAKE2B ced0c34c83e7caaa4158afcb814c0dd58fdde9f1bf1db6c1a041ae080b6c188e5d92546ccc6229099560787292a252a16d4d636a35b969a3964fca5aaa151815 SHA512 1320dd15e0191463c28417c1fdc9084362356c89a0ed34c4002f6f0a2266596645e8170b781f39cbb60d40da58953f28893b4e9a6804f077393ca739f6bc15a2
diff --git a/app-portage/tatt/tatt-0.5.ebuild b/app-portage/tatt/tatt-0.5.ebuild
index 34f4aa75b7f1..347603126f66 100644
--- a/app-portage/tatt/tatt-0.5.ebuild
+++ b/app-portage/tatt/tatt-0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-portage/tatt/tatt-0.6.ebuild b/app-portage/tatt/tatt-0.6.ebuild
index 99e6ef2ee940..ead88748c274 100644
--- a/app-portage/tatt/tatt-0.6.ebuild
+++ b/app-portage/tatt/tatt-0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-portage/tatt/tatt-9999.ebuild b/app-portage/tatt/tatt-9999.ebuild
index c0f9e775f5c7..8351da5ce080 100644
--- a/app-portage/tatt/tatt-9999.ebuild
+++ b/app-portage/tatt/tatt-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 git-r3
 
diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest
index 5e512b7725a0..e63f5ad70ac0 100644
--- a/app-portage/unsymlink-lib/Manifest
+++ b/app-portage/unsymlink-lib/Manifest
@@ -1,4 +1,4 @@
 DIST unsymlink-lib-17.tar.gz 10550 BLAKE2B 036cf63e3619113763f01086fbd952fb2a6efda4d4f4989a5d8cadc0d47b439cba0fab84d53336d615ccbec4e0815519cd4709162f11bbf5fa42c770b928f6f2 SHA512 b981419e320da74f983c184f2b9739b0f1cdae7adf1b9d29c3221b7d010432f6844ff3bdf93793b2f701e2337acebc28a6bd2df0763a081cd8e53a8400aaea42
-EBUILD unsymlink-lib-17.ebuild 627 BLAKE2B 23527042b9398281e992af52465012fa0c0d4eeebfe6f8dc54f2acc221b0fa1de8bb2faed3307f847ac6fc531f4c3c516772498f6ac05cfabf13b3024e877f0a SHA512 ea2e14aec535206a853cf88177bc1a542f0b986e90cda1973287afc9a4e45a2897aa236f4e26f680d0547648b0ca10accd8c19166e539cf27a11be99ebbbae00
-EBUILD unsymlink-lib-9999.ebuild 564 BLAKE2B 409fcd8bd82f72c77359dcebb83f805ae45562fcc7462272e53b1bd3c4500b4ec48684fa88c20460b8cd1c20ba87492ee7df2fc72ed8bfa6e0c138022a6506b2 SHA512 44aa96bdeb404f203194cc02a1a37d0898e009e84805cf5a88d5fea5592ebbd95a3b954ff2d1943b6531dc0ded625583fac8e3347a4397dc1b9f7856d94807de
+EBUILD unsymlink-lib-17-r1.ebuild 657 BLAKE2B 2b9be8bd43f046c52b9cf8ac09da43170fd8c77c1c4815e3f8c06329ad6953a5266b3b2ad9858fe49c0bc710cc4807eb622f89d6f36f0c5db26869df22711b82 SHA512 33532a1fe671cc03cf6b848d2de1e4c7cdeb1cef8e1b43bef024f66d587a7911e6247b939ca3012191eef06a12221aed6eacb5171fefd6a85c2b27705440de20
+EBUILD unsymlink-lib-9999.ebuild 594 BLAKE2B 28667fafeb47bf7109b95c8de17805a375586ec4202387dfb1ad9b81835608dd7bb777c43057eda8a7a507a203eb22442d240077f95ae6f9d65b04ad981b88f3 SHA512 d3138e0bbd1c530d9ff8f046f9e2153153136afe96ba6edd3f89aa17f34f8cbdb84bfde09681dd03d8ea82e50b5be920a74d531bc1768caa53f732904be616d8
 MISC metadata.xml 401 BLAKE2B f16ce51083f8054e7190c2d5fc193808898071af155cc8442a9ef7064cb4d46e6639d8724f85a4a0f551477c6f7ae0f81434c6bef8bd88b2077ea7b7e1f2133b SHA512 dbd79971b54d9027956c46586b547f8308404e273e91dd7ff84d3fbbd50936b8f19dd1dacde5e16a22ca2ef17924f19f66ec83e64c9f145f29322150db9e00a6
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-17.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-17-r1.ebuild
index f8585615353b..e70e33b01d94 100644
--- a/app-portage/unsymlink-lib/unsymlink-lib-17.ebuild
+++ b/app-portage/unsymlink-lib/unsymlink-lib-17-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit python-single-r1
 
 DESCRIPTION="Convert your system to SYMLINK_LIB=no"
@@ -17,7 +17,9 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	sys-apps/portage[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		sys-apps/portage[${PYTHON_MULTI_USEDEP}]
+	')"
 
 src_test() {
 	# tests are docker-based
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
index fbbc79d8b0ff..2e579b57e72e 100644
--- a/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
+++ b/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit git-r3 python-single-r1
 
 DESCRIPTION="Convert your system to SYMLINK_LIB=no"
@@ -18,7 +18,9 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	sys-apps/portage[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		sys-apps/portage[${PYTHON_MULTI_USEDEP}]
+	')"
 
 src_install() {
 	python_doscript unsymlink-lib