gentoo resync : 02.09.2020

26 files changed, 371 insertions, 82 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 27afeeb8297b..bbbe28a6ae25 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 6a3e9fa870ea..2557836458a1 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,6 +1,12 @@
 DIST gemato-14.4.tar.gz 72630 BLAKE2B c8956b979d7c8629e245ba339e8ee707cd51ffe545a85c712c31b97ee2aaabef7a4964cac46c9cd8c4954c33529623293a94a26ae40b578a6b640aab15d47835 SHA512 0b514e4ff7773eefd2d9adc063a4fbc6a1e7d9ea3dfa783b1d5a8e6ec1e482533a8c70cd5e200a8b9671161d77e14254ad14aee6659e3c96eb9be3bbedcf11af
 DIST gemato-14.5.tar.gz 72752 BLAKE2B 61ca43c92556850afdc8ab1d027aa719d13e77727caf9660d1861b1cb07ab40c05bd0fab23f99eaa47252e09465813685c59d1ebb5cc89c2c3381e1571256836 SHA512 0979de8cb4fc51c79d5af485092e0b376094238d6bb67d44db96c66b1d5ee945f0ba82dc6f72bea1042b935029cb790c5cd87bc419ba82da21a972141f3690bb
+DIST gemato-15.0.tar.gz 73757 BLAKE2B 1315e621ccd10db4b1dea159fe01386e51632716b02dc1a5e797296b506de14506691b4cf9eeb58b66081ae761c1926c1c7fc6f1c1543143fb64e9e5dc47984e SHA512 ed88961bc22df77227c46ff013bafc801f1648827085bc02845b4374f3a4e67cdc79b68cb2bcd31956ac40cb0014e0f5348d79d77394ceed9152b2a0aa30599a
+DIST gemato-15.1.tar.gz 71954 BLAKE2B 29a899eb215b78c608f6846c8978837c96df5a69c112c771e4c25c89df268ef22e02bcfb171e9a1b5b2377af101c1029638156c7317e6961133b5a9206747204 SHA512 3263c8e0bc74e1b031775cc37697be5f3214d09ce00ea922af00b8b46638756ee74ad3bc75e73fe8e3563a0ccd5b76986a8f5fc7c00423db863296d89dd233a8
+DIST gemato-15.2.tar.gz 72679 BLAKE2B 83e28fa3bc83976538610fec87c3a31e91a18847c107dc7793e16b5421eba69f7b60f8f05195f345ef6f4f8486203e4acbc01bad706b55c20a11480e85a3420c SHA512 5a98040dab0beac64e5e54bd54c6565cd301399709beda9e030ae9206111caf9e792260aa3c6586040060d4be71df3f1368e7554dff6affaa899c4157116faf3
 EBUILD gemato-14.4-r1.ebuild 787 BLAKE2B d4d4b1c7011ac007f52e1c2a54825bb479427b29b435516c93219cbef62413810dec626ef452e30a3ea39c1b8737701c86c83e928b324d7012a625e28ae6fca9 SHA512 8840b697663b8e1b38d49f9e9ed94a4e1851f256cd7d130eaeeee86f4b61c04eb320829f530a48b2f0a8da82bf24110add5e217f0a9104ba4fd228f52bef7636
 EBUILD gemato-14.5.ebuild 796 BLAKE2B f57c8485072e46ab7a35d1ed15d4d56fa73326073c5f6dc2ee892cc5b4da14ed965abfd64fe90ac6db13e0c994cde491c1e43f3100e2ed3fba0862b05008255d SHA512 2e0841d93405d2f42c4163cbbeea8bef31a6d3048d80cbbd4931d77c794d6f0643a37656b8bd0e7c1ac110df5a549f129da57955e06708160d2b6d85d6c2544e
-EBUILD gemato-9999.ebuild 694 BLAKE2B bf2acd0d9ba10d40289b4036d3abd6f2ebe2fdbfab893b695ef275b0f637f6c84b9568a80b18402eba2f026bd98318c0d6ebb951c105d7d2391bf380e5bb3764 SHA512 fcd80befddd73597b78b2fce5aee76bf53d1c57abb56f421798c531e9c50a19fe9ddfe8cf02be6972c9560a4af233203c8074962492efea8ecb4761d3ced2411
+EBUILD gemato-15.0.ebuild 934 BLAKE2B 63a94374190e1792ce69087d10b48fca4bb183fbfa03d63c4d9c4e9969bf17ca9f8ccdb55ac412fdd9a08d2a6dbf789cac24c7089d769eebfde6ebec8fe87058 SHA512 a9ed3673f74d60864e0892b6101756ae021329392b73ee029febe2725fd2efb26e9cf33e325fc513a590230e95ba1c1495342372f8bd60dcbbb86b22940b685e
+EBUILD gemato-15.1.ebuild 946 BLAKE2B aaff7b99065b1acfa231846c68efb8ffa8228419a3c29a86ba56f1ddcba49653c5543a7fca96c094bf2ba060ccaef396c39189106f90e95deb1e46ef6810e3d9 SHA512 5bf0e12f963a91ce0d0ac4d61afde89e8423621339a8435e64ee59caaea2808d047ee2c08cdbecd4125612780e68b39f1e054f0c931652d0621da0c72f9e1776
+EBUILD gemato-15.2.ebuild 952 BLAKE2B 0da8c4dd44a1cbd0df62764d37c41c22bb7c98fa4821470612977a9e23b923de25c89454bb480df9eb92769370d8c1c84d441b9e2dbf8f38b601c39b20ea6646 SHA512 9e25cd3533b7a9ee8a56b0139cb146fd25a5ca2bf2b814a98c53be78d9895834e1ac7432d992385d9b0d2c600b58bbbf832921efd9c567f47fe27caadcf7c449
+EBUILD gemato-9999.ebuild 869 BLAKE2B f03902d3f38100a86805183c7a9581fb14ea32ba20ecd829d92370c1a722b649f325fc55f3510f80537c5df97a9496d430e58687966211e009f8548a48c219f3 SHA512 e25414612582ce448167b372bf5260b1122ef1fcfffad720086cbee5a072bb50b7f7552251c0c58fab5c34cd04e8d1b6d62060054f051712406ed99f29adedaf
 MISC metadata.xml 670 BLAKE2B 227576c022fb4b2011152a3c423ecab3b8f7524e4e2ec07bb7e963c573fbc17d8b99c4123af93ab665f0e24690c1dd6394e2683bec3999112e1e2204293e91a4 SHA512 c45044a72c71f1e98245019db989a2222e9487cbfad87e7583c57964bb724b1947700497718035a726e4dfa4563dcd154c8ac9eeb43173b6a690037349e905d6
diff --git a/app-portage/gemato/gemato-15.0.ebuild b/app-portage/gemato/gemato-15.0.ebuild
new file mode 100644
index 000000000000..6e3922e1c1a0
--- /dev/null
+++ b/app-portage/gemato/gemato-15.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit distutils-r1
+
+DESCRIPTION="Stand-alone Manifest generation & verification tool"
+HOMEPAGE="https://github.com/mgorny/gemato"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~s390 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+IUSE="+gpg tools"
+
+RDEPEND="
+	gpg? (
+		>=app-crypt/gnupg-2.2.20-r1
+		dev-python/requests[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	test? (
+		>=app-crypt/gnupg-2.2.20-r1
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use tools; then
+		exeinto /usr/share/gemato
+		doexe utils/*.{bash,py}
+	fi
+}
diff --git a/app-portage/gemato/gemato-15.1.ebuild b/app-portage/gemato/gemato-15.1.ebuild
new file mode 100644
index 000000000000..268ee6d821e3
--- /dev/null
+++ b/app-portage/gemato/gemato-15.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit distutils-r1
+
+DESCRIPTION="Stand-alone Manifest generation & verification tool"
+HOMEPAGE="https://github.com/mgorny/gemato"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+IUSE="+gpg tools"
+
+RDEPEND="
+	gpg? (
+		>=app-crypt/gnupg-2.2.20-r1
+		dev-python/requests[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	test? (
+		>=app-crypt/gnupg-2.2.20-r1
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use tools; then
+		exeinto /usr/share/gemato
+		doexe utils/*.{bash,py}
+	fi
+}
diff --git a/app-portage/gemato/gemato-15.2.ebuild b/app-portage/gemato/gemato-15.2.ebuild
new file mode 100644
index 000000000000..c65e93122327
--- /dev/null
+++ b/app-portage/gemato/gemato-15.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit distutils-r1
+
+DESCRIPTION="Stand-alone Manifest generation & verification tool"
+HOMEPAGE="https://github.com/mgorny/gemato"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+IUSE="+gpg tools"
+
+RDEPEND="
+	gpg? (
+		>=app-crypt/gnupg-2.2.20-r1
+		dev-python/requests[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	test? (
+		>=app-crypt/gnupg-2.2.20-r1
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use tools; then
+		exeinto /usr/share/gemato
+		doexe utils/*.{bash,py}
+	fi
+}
diff --git a/app-portage/gemato/gemato-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild
index 9e747002e740..dbb32fd9839f 100644
--- a/app-portage/gemato/gemato-9999.ebuild
+++ b/app-portage/gemato/gemato-9999.ebuild
@@ -20,9 +20,18 @@ KEYWORDS=""
 IUSE="+gpg tools"
 
 RDEPEND="
-	gpg? ( >=app-crypt/gnupg-2.2.20-r1 )"
-
-distutils_enable_tests setup.py
+	gpg? (
+		>=app-crypt/gnupg-2.2.20-r1
+		dev-python/requests[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	test? (
+		>=app-crypt/gnupg-2.2.20-r1
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
 
 python_install_all() {
 	distutils-r1_python_install_all
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 2c786528bb04..b4f5d9e7ac6c 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -5,6 +5,6 @@ DIST gentoolkit-0.5.0.tar.gz 3206598 BLAKE2B a379dcbbaba9d52c241fea020b87c458384
 EBUILD gentoolkit-0.4.6.ebuild 2289 BLAKE2B c405f76dc529c42474e0e160df1669f036bbe1000b29ea188a777808c7530f280cfd770a27bb5414e7dfdcdcc36bccc2add5ec4c6bd0aaf9ef004948b7f83837 SHA512 67ef3bc311e4ea96e6c940d7f413fe8b05b03d0d3412cb3b75fb0f2a8a180d72f10f35991eb3ef012ee0b5b176d230007ea1a7e254883f57c9f91c4cc48b6397
 EBUILD gentoolkit-0.4.7.ebuild 2306 BLAKE2B f979fb2faab8d450bfa47ae0fc51b032f7613807048f0e6ae52c6acd7d52dc336d605a3b78ab72582b481452ef05c27de9f20a3f782e47d559c1360ec3a53c77 SHA512 046b1c64203865794811eb01ba111a593600f7bf7a4878d9c2c0e8dcb1421451cd2c6b42ac7094061807de5f056f72ef582df999bbc61a8a7d13075b2f6ee90e
 EBUILD gentoolkit-0.4.8.ebuild 2297 BLAKE2B 10d21be291c5222f70be925db74d50698d305cc591ff174842ad384a158f06d76e8b11e606bfe773970c2925ce7e15f0b2665a600bac98ae0642030aadff72b6 SHA512 6af0f28b49cde8aeba62e4f4a7d4d536609d38ec14c4d378b2e71deaca4a1b0442ba9f0b9d9dad853e7bba6d8ed7b3e099a1e7d723bbcbed7be2caa14fd0e30e
-EBUILD gentoolkit-0.5.0.ebuild 2274 BLAKE2B 2fefe9adc700ba67043566e09ee83cce021faddafa338a5a75f2550210e68ee151b8cd242a4f4e6fc7a9e1e1d3cd484bd589a520e577a1d3e0c00972ff221b8b SHA512 722c5c11ccb88aa1ab4c0d85abee2b421367852695b70f1427db2d3abe07613041256a40836b4345684bd24f1f21e1135a7421b2e987830e9260581ba306b5c1
+EBUILD gentoolkit-0.5.0.ebuild 2273 BLAKE2B 3143f2010f26e0b8568c7e27d13179b83eac8023e200c20dba151c73a48e456dab8000ce3d4d88aacd35dc492dc96e035e9e4497d5ff9ae127edc980abca13fb SHA512 efcfa97a6a4252bd27c8f3c8298fa2284eec44cdb67e2842f390187abcb48f83881fbb8c2c6cc65e0630b1281e947ee11583337b2a49b425e5261533fb324341
 EBUILD gentoolkit-9999.ebuild 2055 BLAKE2B b5afb916af8f235a53452b1cd99b369438eabedd7bb4db23893ec29d30d26695cfc4328c8da559eb7c5c3b906a353ca001d79a5b6b67b0203276d2b2517b8351 SHA512 7e782f89a184ac8bd3f4a23513fe67069ab2d3d0e20338e5337793553df850409699e24cffac872335208b5237739b7ccc9938c05644fd9c806235b94b7a4986
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/gentoolkit-0.5.0.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.0.ebuild
index dcfacade2670..986d9b2a799e 100644
--- a/app-portage/gentoolkit/gentoolkit-0.5.0.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.5.0.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index 5fba25bca0cb..e238ac65d303 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,5 +1,7 @@
 AUX implementations.txt 830 BLAKE2B e10d79ca8ea5091166a29b1547e9db03ded897d66391a5ec7deefed5dc1cb4b7546409b585d6185368a9c9ca5e82c01b191a8edca964475c206d09d935246a6c SHA512 43b446e24080076f5351ffb153e6bfb9aa2d1d03632d397c0dc1ffc445d842255a89e5561a939a4bf4a9c8c1b63c961a91b56e8bd18160c1056e8d39c0c8310c
 DIST gpyutils-0.4.2.tar.gz 19771 BLAKE2B a5b58efcaad803a3eeb4a04b51811c2832f5a61154ac60b67c31e1962efd5f1a801e06fd3245c2336e6440b03fae2c30642e99c7588af89b7a3d0173b93f0c87 SHA512 699132833ddbaffe26bec8b3cb8914a609cc98ee2d8b852b59162265ee3daf6a0a0bd8ccc4d693e319d4e413c441ca94bd6837f07f1a132bda383350593792c4
+DIST gpyutils-0.4.3.tar.gz 19951 BLAKE2B 2d15c6c714a7f75be4a5398b7287d6281a201f1b5806c6cac34093cd74ae3449fcd103d023edc54ab088807e8a7b24e08bb223ae9f40d156ade97706cf4b9355 SHA512 02067d6d075afc6670eea75a0e9ed12bf02eecb623accd010701c45d4176bb23b1dd0fb9eda3a4e899d3fb90581c5f3fc46b5fc8760b491c31fddf592aa7a291
 EBUILD gpyutils-0.4.2.ebuild 528 BLAKE2B 4fd3e00f22c182ee0cae2d64eabc42c4b211001122b6bcb71a86b764969139434f873706615178cf08c559d78d6d578deacb7d248b4198f9737f54a96d0d4782 SHA512 50044413bf71f9ccf37d762c7e3edbe748dcd3204c4a41cb3d5cf735dc2159f54604627434f6491f208188256d8d2408130da419d4e3276cc611e7ab11aa25d0
+EBUILD gpyutils-0.4.3.ebuild 530 BLAKE2B ad0dd68af616c72e6ea6ffd478a7ceea20c5fa84c093663e6001e950bcc1034360b1ee2490fb017e9b847225e8c24d4faaf74e1e824ff6460d2aa0b96786a859 SHA512 b678c80698024a1e50e6fc093c1d10adefc6c48e524be7bbe51d4eb0ea4321538cdc98a8a12458a3482a3778dab45645600fe4102575b05dd0b7965584a04c72
 EBUILD gpyutils-9999.ebuild 510 BLAKE2B 12227a6eb086a0a1108d2029316d06f189a29399fd665deb3d5bfd53646606b3ec038ecbedaf7ec9c61e006fd405a11d95a5b2c33be64b156345face1d513a32 SHA512 9952706005d8bb34f65d7ef5dc238deb189fc01e1892d323da60f5cc4b6a404e26f3f99be25030aa70540e418086514ee9fbf264c4a47c84c97d153074a31f52
 MISC metadata.xml 552 BLAKE2B 1f0cbee3cc1240b53c9c60122f488628643742b1afc4f68e9780bccbd959f0d45fb612ffbe9a8f9ac0cb8b5b6586af133c3a5d43884d42b09c8f3a8e2d44076a SHA512 f6788974678b69e9f38f9813333b62bd53c0e41beb5aee3f1d962ab6a739e8a2e2d3b2e1e03e6200172641b73df5ae0eb2cd74ee664ad20ea665ed63686ac7d1
diff --git a/app-portage/gpyutils/gpyutils-0.4.3.ebuild b/app-portage/gpyutils/gpyutils-0.4.3.ebuild
new file mode 100644
index 000000000000..a519e2a5c0f2
--- /dev/null
+++ b/app-portage/gpyutils/gpyutils-0.4.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Utitilies for maintaining Python packages"
+HOMEPAGE="https://github.com/mgorny/gpyutils/"
+SRC_URI="https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-portage/gentoopm-0.3.1[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-portage/java-ebuilder/Manifest b/app-portage/java-ebuilder/Manifest
index 3aa87ad4f943..0e13db888392 100644
--- a/app-portage/java-ebuilder/Manifest
+++ b/app-portage/java-ebuilder/Manifest
@@ -1,4 +1,4 @@
-DIST java-ebuilder-0.4.1.tar.gz 26414 BLAKE2B 9dd418bbb2c9631d36c20649c5b4df916f476561bac28fc729e32001da086207a74e26b2379106c9066b7e4114b3ce35f225e54680990c1fbf9e515b3fe42034 SHA512 7782055991a650526d8da95c0b5b6c55ce68dbfe0a5374f6893320baccbd783d271630d67f0a6e2ab176ab6979f343082a0ae0f72e1d949d07a0f202572d4e7a
-EBUILD java-ebuilder-0.4.1.ebuild 1548 BLAKE2B c3f4966e10bc0304040583e445a1d11d4ee7b66f0f35a5eac52534338d9c72615031f900e75aee6c86d7f1f85a4c2e5f97dad32c56269d0c264810b3990aafe8 SHA512 141b6cc1edf7d901319a18d165fee172aa2c2b1145233c8c7681483a1e4c099435bab4324936c36ae6d810cd98361947d6782f5b52da7b9966041777e7b59c5b
-EBUILD java-ebuilder-9999.ebuild 1555 BLAKE2B 30c9cd2065cac2ac3cf07cd61d8ee566db89df3abcf97b3179a15d816fd84c84e877b3d1412778a0ce183c01e067934ac6d76a106897e1798f7d5dfac4a356c1 SHA512 19880c68dbd405e2c4f39a1a91567f0034f6f991fa082218bdcef85909440afb845516000abb8523a48828b066651335440102e71f898fd73e8428a1effab77f
+DIST java-ebuilder-0.5.1.tar.gz 51590 BLAKE2B d37638247650610637d71e91c7209c1bace4489a5bdd2a3c3be3961e8f1238c96c6d0978f59b32f3a44f51d4f1b26c5016cc5c82c7b619ae35601eeeed866a35 SHA512 e091b1c80eaced03b1950fcb769f2bd5922aa37ebdb480b48870f9c601017c621486b049e7cd694a57f832baf4f04c6fc8a31848f9c63f4d26dd4092b1193c55
+EBUILD java-ebuilder-0.5.1.ebuild 1267 BLAKE2B a299679eea724515f5da20569faf606ab2f4173305e3bf38e6d287b2dec7a8b2ed00f9a9841436afe845f16895b734943cfc6992dbd64b81bcba22b703f4fe8c SHA512 67d4332febeb284a982ef64d7643421a28e80275871e2cbf2c222fe05d179ee5b1fab4578daaa1f9c85ca495cc0d094cac65ed99127e0052b0b82e287180f51b
+EBUILD java-ebuilder-9999.ebuild 1267 BLAKE2B a299679eea724515f5da20569faf606ab2f4173305e3bf38e6d287b2dec7a8b2ed00f9a9841436afe845f16895b734943cfc6992dbd64b81bcba22b703f4fe8c SHA512 67d4332febeb284a982ef64d7643421a28e80275871e2cbf2c222fe05d179ee5b1fab4578daaa1f9c85ca495cc0d094cac65ed99127e0052b0b82e287180f51b
 MISC metadata.xml 339 BLAKE2B e6068070bc51e0f0a213a76593f11fee385ebe1546b08f23088706ba46469e7352f4f73647980595b9c3aef4fecfd96d9d2d907cfe7e147897e9259c02dfb30f SHA512 b200cb9a9934082d9460c2dcaded12756bbafde1c0df15638979a31974736233f02fe15bffd5698532ebfffdad7f9b3b6df9129c2e7f1383314cf1ac5898595b
diff --git a/app-portage/java-ebuilder/java-ebuilder-0.4.1.ebuild b/app-portage/java-ebuilder/java-ebuilder-0.5.1.ebuild
index ecd724819f2a..32f44a7de32c 100644
--- a/app-portage/java-ebuilder/java-ebuilder-0.4.1.ebuild
+++ b/app-portage/java-ebuilder/java-ebuilder-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2019 Gentoo Authors
+# Copyright 2016-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ if [[ ${PV} == 9999 ]]; then
 	ECLASS="git-r3"
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
 else
-	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+	SRC_URI="https://gitweb.gentoo.org/proj/java-ebuilder.git/snapshot/${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -27,32 +27,18 @@ RDEPEND=">=virtual/jre-1.8
 S="${WORKDIR}/${P}"
 
 JAVA_SRC_DIR="src/main/java"
-JAVA_ADDRES_DIRS="src/main/resources"
+JAVA_RESOURCE_DIRS="src/main/resources"
 
-MAIN_CLASS="org.gentoo.java.ebuilder.Main"
+JAVA_LAUNCHER_FILENAME=${PN}
+JAVA_MAIN_CLASS="org.gentoo.java.ebuilder.Main"
 
 src_prepare() {
 	default
-
-	local base_dir="target/classes/"
-
-	[[ ! -d "${base_dir}" ]] && mkdir -p "${base_dir}META-INF"
-	echo "Manifest-Version: 1.0
-Main-Class: ${MAIN_CLASS}" \
-		>> "${base_dir}META-INF/MANIFEST.MF"
-
-	hprefixify scripts/{{tree,meta}.sh,movl} java-ebuilder.conf
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-
-	jar uf ${JAVA_JAR_FILENAME} -C ${JAVA_ADDRES_DIRS} usage.txt || die "Failed to add resources"
+	hprefixify scripts/{bin/*,resources/Makefiles/*,movl} java-ebuilder.conf
 }
 
 src_install() {
 	java-pkg-simple_src_install
-	java-pkg_dolauncher ${PN} --main ${MAIN_CLASS}
 
 	insinto /var/lib/${PN}
 	doins -r maven
@@ -61,9 +47,10 @@ src_install() {
 
 	dodoc README maven.conf
 
-	exeinto /usr/lib/${PN}
-	doexe scripts/{tree,meta}.sh
-
+	exeinto /usr/lib/${PN}/bin
+	doexe scripts/bin/*
+	insinto /usr/lib/${PN}
+	doins -r scripts/resources/*
 	dobin scripts/movl
 
 	insinto /etc
diff --git a/app-portage/java-ebuilder/java-ebuilder-9999.ebuild b/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
index 7a78207628c6..32f44a7de32c 100644
--- a/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
+++ b/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2019 Gentoo Authors
+# Copyright 2016-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,32 +27,18 @@ RDEPEND=">=virtual/jre-1.8
 S="${WORKDIR}/${P}"
 
 JAVA_SRC_DIR="src/main/java"
-JAVA_ADDRES_DIRS="src/main/resources"
+JAVA_RESOURCE_DIRS="src/main/resources"
 
-MAIN_CLASS="org.gentoo.java.ebuilder.Main"
+JAVA_LAUNCHER_FILENAME=${PN}
+JAVA_MAIN_CLASS="org.gentoo.java.ebuilder.Main"
 
 src_prepare() {
 	default
-
-	local base_dir="target/classes/"
-
-	[[ ! -d "${base_dir}" ]] &&mkdir -p "${base_dir}META-INF"
-	echo "Manifest-Version: 1.0
-Main-Class: ${MAIN_CLASS}" \
-		>> "${base_dir}META-INF/MANIFEST.MF"
-
-	hprefixify scripts/{{tree,meta}.sh,movl} java-ebuilder.conf
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-
-	jar uf ${JAVA_JAR_FILENAME} -C ${JAVA_ADDRES_DIRS} usage.txt || die "Failed to add resources"
+	hprefixify scripts/{bin/*,resources/Makefiles/*,movl} java-ebuilder.conf
 }
 
 src_install() {
 	java-pkg-simple_src_install
-	java-pkg_dolauncher ${PN} --main ${MAIN_CLASS}
 
 	insinto /var/lib/${PN}
 	doins -r maven
@@ -61,9 +47,10 @@ src_install() {
 
 	dodoc README maven.conf
 
-	exeinto /usr/lib/${PN}
-	doexe scripts/{tree,meta}.sh
-
+	exeinto /usr/lib/${PN}/bin
+	doexe scripts/bin/*
+	insinto /usr/lib/${PN}
+	doins -r scripts/resources/*
 	dobin scripts/movl
 
 	insinto /etc
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 3c34faaa8e06..4b73ad5c3c7c 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,5 +1,7 @@
 DIST mgorny-dev-scripts-4.tar.gz 6702 BLAKE2B d816e0d15004d21f595e6020d146aa1babfe238b325afb1523bfae60786c067c8591fa5b046f7b18520f5334e0d0506d9d0c919c2ec6a55a85bae09441d1f45c SHA512 0b165f21930ad29de92a715fab27174e2bf2e16e6b52dac2d5bf6ae59c68163f30de955703c2c37a9a799fd4409d1b602d417100a4787787f4b48fd71e6391e3
 DIST mgorny-dev-scripts-5.tar.gz 6834 BLAKE2B 652db4d1be6c5438b9b71fb814cde2424c92fdf1aa88266761beb899a782df34a5f02c39a4f18d1cac471aaee2d0ad8f94a960e86b09144494db0e4438505b1a SHA512 fb1fd66ea8d8757bb0b81285c6d821cf8548001d39c47d028e8367865b67c594187086ed18b21c8f87e0d702d879dcf55c043404f3337b27a1d943cae78b0765
+DIST mgorny-dev-scripts-6.tar.gz 7270 BLAKE2B 30945ccc04111c91dcf22d180b0f653606910a0f13d3d2c2acdb037a51bc6490917d8dab91580c27caf492487dca7ec575c5d59181ce622dd67dada49e653462 SHA512 b46d6919cea7233131e90c423392bfdc8a560800adc05e164ef88351d84d51a73dfd982fcaf12bd9519219bc08b84b6a1aa3dc078bb30d35d57847ad1b22efa9
 EBUILD mgorny-dev-scripts-4.ebuild 584 BLAKE2B d61e63f71823c955ce2fee7e6a968e992f86f049e69c1059501fb43ea522620ef7240d63ee521f8ee51349d0dbdfbe06ca6f65bed5a43fa3b1bb5743d44d2138 SHA512 4dcf38df6e12fea6a02d94ff4ccafefe608023f08d8c456bb2725826e4b1bcca5dcba4d3fbd0145156416033c3f9d619d1e9e0a4292c20d17c4ea1d77cd77ff6
 EBUILD mgorny-dev-scripts-5.ebuild 584 BLAKE2B d61e63f71823c955ce2fee7e6a968e992f86f049e69c1059501fb43ea522620ef7240d63ee521f8ee51349d0dbdfbe06ca6f65bed5a43fa3b1bb5743d44d2138 SHA512 4dcf38df6e12fea6a02d94ff4ccafefe608023f08d8c456bb2725826e4b1bcca5dcba4d3fbd0145156416033c3f9d619d1e9e0a4292c20d17c4ea1d77cd77ff6
+EBUILD mgorny-dev-scripts-6.ebuild 584 BLAKE2B d61e63f71823c955ce2fee7e6a968e992f86f049e69c1059501fb43ea522620ef7240d63ee521f8ee51349d0dbdfbe06ca6f65bed5a43fa3b1bb5743d44d2138 SHA512 4dcf38df6e12fea6a02d94ff4ccafefe608023f08d8c456bb2725826e4b1bcca5dcba4d3fbd0145156416033c3f9d619d1e9e0a4292c20d17c4ea1d77cd77ff6
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-6.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-6.ebuild
new file mode 100644
index 000000000000..43affbe632d2
--- /dev/null
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Handy scripts for ebuild development and more"
+HOMEPAGE="https://github.com/mgorny/mgorny-dev-scripts"
+SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-portage/gentoolkit
+	dev-perl/URI
+	dev-vcs/git
+	net-misc/wget
+	sys-apps/portage
+	x11-misc/xdg-utils
+	!dev-util/pkgdiff"
+
+src_install() {
+	dodoc README.rst
+	rm -f COPYING README.rst || die
+	dobin *
+}
diff --git a/app-portage/pgo/Manifest b/app-portage/pgo/Manifest
new file mode 100644
index 000000000000..9ff32031c6bf
--- /dev/null
+++ b/app-portage/pgo/Manifest
@@ -0,0 +1,4 @@
+DIST pgo-0.0.2.tar.gz 1758457 BLAKE2B b31b9c2d200fb925390881019b9c540e8c95454874fa60a8829b73000d27ed470686dd7150d8cdcc7267a7329fcb6883d7f9eee27c622c91c36cfb6648bdda56 SHA512 36435813dee1d6256888e3f845b0bd053d9b58ed1c810f7368e935ac8e58f209956b8d3b0cff5cca464d76d8cebe3f483dba692a47c2785dc626842a30758554
+EBUILD pgo-0.0.2.ebuild 577 BLAKE2B 4a92a4c1251bb0e867647a83769bc4ee0ff106945758da9f512e86bea773ee179693f354a91ad53b67c90514f970f4b627c62cc090848e22c047c7426d11d816 SHA512 b38fbfccabcb745e8af56b4808ef7af7da179b765456e22d508a46851f25428db418f3f5bc2d33584620fbb83578815908efa5e93c3c314b311e2abccefadb8b
+EBUILD pgo-9999.ebuild 577 BLAKE2B 4a92a4c1251bb0e867647a83769bc4ee0ff106945758da9f512e86bea773ee179693f354a91ad53b67c90514f970f4b627c62cc090848e22c047c7426d11d816 SHA512 b38fbfccabcb745e8af56b4808ef7af7da179b765456e22d508a46851f25428db418f3f5bc2d33584620fbb83578815908efa5e93c3c314b311e2abccefadb8b
+MISC metadata.xml 831 BLAKE2B d83ceb60c84590a186615d9ddf2dc02feb95bc2af89b9aeeeaced964698864aae382b524f62fbe74526c8c36f39d96a8e1781714489c14e8d9174023361f3cff SHA512 7226f2d0ae45f560e9254f3f4ff661f48fe86cd1d0a74aeb96e7a80923224d85fde07b8a9ce3060c95bf328b78975d7d6e8266f1a8030d20fbdfbc9a6fe6c2f8
diff --git a/app-portage/pgo/metadata.xml b/app-portage/pgo/metadata.xml
new file mode 100644
index 000000000000..e7c029f91d68
--- /dev/null
+++ b/app-portage/pgo/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arzano@gentoo.org</email>
+		<name>Max Magorsch</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
+	<longdescription>
+		pgo is a small command line interface for packages.gentoo.org. It is
+		using the graphql api of packages.gentoo.org to display information
+		about packages like: versions, metadata, dependencies, QA reports,
+		pull requests, bugs and the changelog. It's also able to display
+		information for maintainers, as a list of packages they are maintaining,
+		a list of outdated packages, or bugs related to the packages they are
+		maintaining.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-portage/pgo/pgo-0.0.2.ebuild b/app-portage/pgo/pgo-0.0.2.ebuild
new file mode 100644
index 000000000000..e3a6873088bd
--- /dev/null
+++ b/app-portage/pgo/pgo-0.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/arzano/pgo"
+else
+	SRC_URI="https://github.com/arzano/pgo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A command line interface for packages.gentoo.org"
+HOMEPAGE="https://github.com/arzano/pgo"
+LICENSE="BSD-2"
+SLOT="0"
+
+src_compile() {
+	env GOBIN="${S}/bin" go build -mod=vendor || die "compile failed"
+}
+
+src_install() {
+	dobin pgo
+}
diff --git a/app-portage/pgo/pgo-9999.ebuild b/app-portage/pgo/pgo-9999.ebuild
new file mode 100644
index 000000000000..e3a6873088bd
--- /dev/null
+++ b/app-portage/pgo/pgo-9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/arzano/pgo"
+else
+	SRC_URI="https://github.com/arzano/pgo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A command line interface for packages.gentoo.org"
+HOMEPAGE="https://github.com/arzano/pgo"
+LICENSE="BSD-2"
+SLOT="0"
+
+src_compile() {
+	env GOBIN="${S}/bin" go build -mod=vendor || die "compile failed"
+}
+
+src_install() {
+	dobin pgo
+}
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index 8759ea798e63..a36c741aa0b3 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -2,8 +2,10 @@ DIST portpeek-2.1.27.tar.gz 13000 BLAKE2B a134d7c9a99dc4bfd8cbd56343a6d049c215ea
 DIST portpeek-2.1.29.tar.gz 13067 BLAKE2B c0385849738303a3fab8123f6af321bd000f88975b26d363c08aacf873b657b872a898af92a0396f1e3060b5b804fc9f2ddd8579101d2f5da18628080dc4e490 SHA512 3933b39c248e3758d67e0c1dd04cb93727eecbda4ae35d55fc266d01f01d7f87c535701cbc54d48a212e1c642a4447d487f2c62aa649f084e1d1fca458263b27
 DIST portpeek-3.0.1.tar.gz 12906 BLAKE2B bca14b3d1c82b270a5418ca3ff1e5422a16251bd5d7ef775311c9bf86cbb3b5c1304c688c0631247aa1e6f479d5e7eb5313c83fac5a9e197dc70bda6aa48b569 SHA512 8e0d71d71afb6b6d990e88f3c212a7e999b544cdc7a06d44cadb59ae3b70849fbbd864d855f014bb4090a031efc0713c84dc2a3079e37ab8967e546c8d165394
 DIST portpeek-3.1.3.tar.gz 13698 BLAKE2B 67b37e4e02a178076bfa57da850eff7cdf2664e34ffbe287daa92b5db924d17f486eae078b7d09e497a2a6e21588134e8167d113d6181d9b3760ba7e20fa6635 SHA512 31d85e9d8c742409a7429695dd73a49da6d4b3fce67716b2e8ea766df95e130e16ef5cc05c4cd27278d51956e9b78fd17eadbf615da1e237a15e0649dba6b5e2
+DIST portpeek-3.1.4.tar.gz 13703 BLAKE2B 9afba0c81e63761160182aaea5f505e640867936e0ac982bfff15dc7c8ae201eede211e04f29b832d8989f9b0e63789234fab08c9cb073ea0d4c7fa96d87d90e SHA512 aae4d79d32c6a8c0bdcce83e3ea67235007db96cc3655e26861b11431bea1e7ac3cf90bed12d3f79cb354381f0590ed0b409c2c7593717ada8b2bf8d8ae4de37
 EBUILD portpeek-2.1.27-r1.ebuild 691 BLAKE2B 82344fbb0c1255de4d20baf9dfb62daabc77da8ef290bbd6b342195b50f7fc46132fd21b77eafc5fe5d5338618d6bef8fb4dd3f21f35e740d68213e1d71bd1fa SHA512 eb0f940e006a32796b8ea47b9deeec5795271846ac1678132d45abed8cb766d801583b4d735dff540176b0fa96b5e5cc4da386cb058c9d5bda17d57e5440e1e3
 EBUILD portpeek-2.1.29.ebuild 696 BLAKE2B cd0c7d39b0775ea6f7a566a9440467bf9d31eabc2cc4cf4f9a18ca676b466ebaf947816cceb988b79c66b5c3cdc119ffeb2e3525922d397d720367862ef75c9b SHA512 e3001270e57e40d89aaab66999d6b10e3b4347bdd17e35b90fce0a5bc0156bbec39fbd0550bb8fc19119c7f1643410b3f2cd97077e7d336c539eea035fcc8316
 EBUILD portpeek-3.0.1.ebuild 693 BLAKE2B 3e3cc221f2d54107f8493e0fcc0dc6b4359e18d55740993798aebbf462cdcf1876e8e8996156f3025c74e937272441b1856e2cacefa1631174b4fafb263bf761 SHA512 17311479ba6da7b866a0bf21672b924b6623e447b065ff7eba371724c78feb0ad7d0ba07c34fbfdecbe43e7e332b6e155ba0e13b6032dec4434bf3d1e17d7e14
 EBUILD portpeek-3.1.3.ebuild 693 BLAKE2B 3e3cc221f2d54107f8493e0fcc0dc6b4359e18d55740993798aebbf462cdcf1876e8e8996156f3025c74e937272441b1856e2cacefa1631174b4fafb263bf761 SHA512 17311479ba6da7b866a0bf21672b924b6623e447b065ff7eba371724c78feb0ad7d0ba07c34fbfdecbe43e7e332b6e155ba0e13b6032dec4434bf3d1e17d7e14
+EBUILD portpeek-3.1.4.ebuild 693 BLAKE2B 3e3cc221f2d54107f8493e0fcc0dc6b4359e18d55740993798aebbf462cdcf1876e8e8996156f3025c74e937272441b1856e2cacefa1631174b4fafb263bf761 SHA512 17311479ba6da7b866a0bf21672b924b6623e447b065ff7eba371724c78feb0ad7d0ba07c34fbfdecbe43e7e332b6e155ba0e13b6032dec4434bf3d1e17d7e14
 MISC metadata.xml 222 BLAKE2B 5192d31072923545c8f760f9c3b3274f610b7a94a53cf55bc85c5c20a953b227b7cdb64cb5f5921b8b2822ec6563479b5d4883ec2b569a066d8ab569713fa8be SHA512 3d793038a1abf5bb86eeb23fee623f27db1d8e529372adc51eb4ffd1d0c2deb6df1c4d637954cc68e07d590c25e3d74a8437d02c1864a21c96f63597192cfef9
diff --git a/app-portage/portpeek/portpeek-3.1.4.ebuild b/app-portage/portpeek/portpeek-3.1.4.ebuild
new file mode 100644
index 000000000000..9bda36898f42
--- /dev/null
+++ b/app-portage/portpeek/portpeek-3.1.4.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_{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 ~arm64 ~ppc ~sparc ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=app-portage/gentoolkit-0.4.8
+	|| (
+		>=sys-apps/portage-3.0.0[${PYTHON_USEDEP}]
+	)"
+
+src_install() {
+	python_foreach_impl python_doscript ${PN}
+	doman *.[0-9]
+}
diff --git a/app-portage/repo-commit/Manifest b/app-portage/repo-commit/Manifest
index bc11a0a1a84e..bc9e24dfb038 100644
--- a/app-portage/repo-commit/Manifest
+++ b/app-portage/repo-commit/Manifest
@@ -1,4 +1,4 @@
 DIST repo-commit-0.4.1.tar.bz2 54416 BLAKE2B 85b4c9608baac4fc267047cb3177a80fa9d5ef761cb70a7d752acf5448607330c873ec1180c207a399e81b55d82ebf23816cfefed380ecb2de0d5eff3fc63b61 SHA512 25d4ec02605454e49dafb59a753abbe6b28b2e07225d5479bfa0e0d493d3dd6bd2302dd4efaa2d6a6af5f8c7e41a5029ac8edb9d7b1dd8ec9349a057d1d61622
-EBUILD repo-commit-0.4.1-r1.ebuild 406 BLAKE2B 4a2c24f551d4bef743442f4d06b4ad7d378126bd692b7e74fed8d74fab8e4d0672071f675ada1b8cfad5fcd58a716d3efa903e0ade97a3a62dcf826ff4f3b133 SHA512 0e67f6cd1198b0b534f3b6a92e43eb54e0a2ca19aed096d4b1fc28f67ce6afc7c95783426a2f072f4e184d73fb1c7252804c7680ae1573550519db07f0de86b7
-EBUILD repo-commit-9999.ebuild 555 BLAKE2B 850858bde43d1809839472bda73b74f958d634999ae828cd2517d4e414ee81d4f2c11342155fd0fc92797e9411c6d0e5af7d4adb663f1cd3b754baf8b2154ffa SHA512 fc7990cb9c61156cae3ae92c33f3d3ab76bae92269c9f595fad5685bcda0cd7ae34d853aa69baec498b9fff7d23c6daaa4025fa6552ea922f1dff1239d61ef8d
+EBUILD repo-commit-0.4.1-r1.ebuild 565 BLAKE2B 6b390d82724de16fabe776b92eb6c44d8a5eb9ff6e4ec5334b6597ed30542b0f4dfff17fda889c9a92f79ef34258f5c4d84e8cb717a5c638d4a1f0950711ad69 SHA512 5bfa2f49e4a3df33e412b9076b03bbcc691e8ad0d3c805a11ce1dc6b3a47d92d830a497ade2e108567eae4919224a99159e6249f500d951b25d2edbb574dfdc1
+EBUILD repo-commit-9999.ebuild 565 BLAKE2B 6b390d82724de16fabe776b92eb6c44d8a5eb9ff6e4ec5334b6597ed30542b0f4dfff17fda889c9a92f79ef34258f5c4d84e8cb717a5c638d4a1f0950711ad69 SHA512 5bfa2f49e4a3df33e412b9076b03bbcc691e8ad0d3c805a11ce1dc6b3a47d92d830a497ade2e108567eae4919224a99159e6249f500d951b25d2edbb574dfdc1
 MISC metadata.xml 457 BLAKE2B adf49765568b3c6a4ad55eff2daf1f1a5025b26dff64aa1248355efc56ed62bdb4d6ff36d3340f2efb59d3cbd94294d6ce1d78a46aa6db0fe86ce0c3d556ec2e SHA512 5e0a666c83864d8c5701b47903b0554d21d19dd2f49c2831f4d22bf5edc469e84a0c16f024bd33490f937dc0d9a046118047b4d95cf2a972bea9bfb9b7349071
diff --git a/app-portage/repo-commit/repo-commit-0.4.1-r1.ebuild b/app-portage/repo-commit/repo-commit-0.4.1-r1.ebuild
index 978b47e224cf..5e2bdee57fc1 100644
--- a/app-portage/repo-commit/repo-commit-0.4.1-r1.ebuild
+++ b/app-portage/repo-commit/repo-commit-0.4.1-r1.ebuild
@@ -1,17 +1,27 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit autotools-utils
+inherit out-of-source
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://bitbucket.org/gentoo/${PN}.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://www.bitbucket.org/gentoo/${PN}/downloads/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="A repository commit helper"
 HOMEPAGE="https://bitbucket.org/gentoo/repo-commit/"
-SRC_URI="https://www.bitbucket.org/gentoo/${PN}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND=">=sys-apps/portage-2.2.0_alpha86"
+RDEPEND="sys-apps/portage"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
diff --git a/app-portage/repo-commit/repo-commit-9999.ebuild b/app-portage/repo-commit/repo-commit-9999.ebuild
index 97ac51081e02..5e2bdee57fc1 100644
--- a/app-portage/repo-commit/repo-commit-9999.ebuild
+++ b/app-portage/repo-commit/repo-commit-9999.ebuild
@@ -1,29 +1,27 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-#if LIVE
-AUTOTOOLS_AUTORECONF=yes
-EGIT_REPO_URI="https://bitbucket.org/gentoo/${PN}.git"
+inherit out-of-source
 
-inherit git-r3
-#endif
-
-inherit autotools-utils
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://bitbucket.org/gentoo/${PN}.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://www.bitbucket.org/gentoo/${PN}/downloads/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="A repository commit helper"
 HOMEPAGE="https://bitbucket.org/gentoo/repo-commit/"
-SRC_URI="https://www.bitbucket.org/gentoo/${PN}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND=">=sys-apps/portage-2.2.0_alpha86"
-#if LIVE
+RDEPEND="sys-apps/portage"
 
-KEYWORDS=
-SRC_URI=
-#endif
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index 260859ff908d..253ec80e2bcf 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -1,4 +1,4 @@
 DIST tatt-0.7.tar.gz 21802 BLAKE2B a0195f253e2777a8756fd7d1f83804bf3a4ca90fdeb07b2f8dc28dcb6f1d1f3c47fd948e0d001103f7972dc8cb8ee45a237dd24b3dc149392aa9841fe3d6532a SHA512 1f2a144512801d50585d40074553049ebd08bc5f084a0623b89d901acb9448657e7f42f2c8da5f613e0b2ff5c3fe59fbada1ad911c9693846923e256a2e97ecd
 EBUILD tatt-0.7-r1.ebuild 831 BLAKE2B 89842ca9be4a6c16f2c0921365e522c935ffc705a24166c879ba264a6784c7e32a5fd33b580038f6f64070870bc32118af60e4ab9929817082dd43b23c4c1250 SHA512 2ef85bcd8ff1cd2d964d6cc5e814da50856964f80b245a9cc3fd833748515763fd188558ab63fbb24b65c655035e204d7a076bd5fc50c4b2dc6389281cfcb239
-EBUILD tatt-9999.ebuild 792 BLAKE2B 64a6200397abf180aa1231a54df06ed8f103ffdf3cb825bab8e2276ce6ca68eccedba067f530a9dd2ea77c7bbeb8e2986e16b9cca9a455ebd9502c4d717ebd36 SHA512 67e1a46312cf9c3f0bc36cb26650d48e769b9aa3c5d9d5468c86e1736a1a85415336dc508639b73e771a1dd4f47900d5d632e2f465322bba88b72e7963722a2f
+EBUILD tatt-9999.ebuild 794 BLAKE2B 264a6d81711af89dbae0286b566ac9c57da3dcdcdc738a281a6fbc0110a6995367775205d96c98e1f78764f12519601b560ac3a81b506d03761aeac22bfa4eb5 SHA512 c751805637179a9a61dab118cbc3e8a2dfc824c0554ea91014acc8333834178b3088597b4cf0278b169af3b516bf6b96f5d07348a9f0413472799bd110c18895
 MISC metadata.xml 640 BLAKE2B ced0c34c83e7caaa4158afcb814c0dd58fdde9f1bf1db6c1a041ae080b6c188e5d92546ccc6229099560787292a252a16d4d636a35b969a3964fca5aaa151815 SHA512 1320dd15e0191463c28417c1fdc9084362356c89a0ed34c4002f6f0a2266596645e8170b781f39cbb60d40da58953f28893b4e9a6804f077393ca739f6bc15a2
diff --git a/app-portage/tatt/tatt-9999.ebuild b/app-portage/tatt/tatt-9999.ebuild
index 5786e4c4a61b..2539f2a5dff5 100644
--- a/app-portage/tatt/tatt-9999.ebuild
+++ b/app-portage/tatt/tatt-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1 git-r3