gentoo resync : 03.11.2019

26 files changed, 294 insertions, 266 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index df5de9aab8ea..e0f37da0bd60 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 41211b1810a3..e9a758be2a20 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,7 +1,11 @@
 DIST gemato-14.1-multiprocessing.tar.gz 71707 BLAKE2B d7d22615a65bd598160b23e01a938c20ecadfb1a1332db3842b14bfac69006269efd0f1da6d6bf0f10f3aafb07ebe01af09e64f9612c50b8e98a0bd6aff27651 SHA512 fd4722dd2f632bda4abac59b7e62f531edbdc455be1f1ec94d8bf99194956de15b6cfa4d623713bf3c25e55a6cc6adcdf8039cb7d20a556924bed0ddefd95daf
 DIST gemato-14.1.tar.gz 71142 BLAKE2B a7c8f814f9c6875e977aa178d4a49e3454ea8d6e19750786452aa2f34f0904f0ccc0a9a58411a0214a68cecd571320769c6374b265e2aa7f52fbead53ba6b284 SHA512 de57f3b7aa17e650894876bc2423c4fa9809f2de25aa2fb8ef070e943faa182c80f7ea8a519ecdf6edec8098d11f786344ee872b9e98c69bd6739760652baa2e
+DIST gemato-14.2.tar.gz 71315 BLAKE2B e94284512bc42d129ef29b686a007dfaf74e8d325a5596f44ddae0e6ce76bf86cf24fa94ea72476fc17eb575a472ee39b02b987c1f97d987eb03ffe6901d472f SHA512 de4e2764bf5778cb5c5fe23c912d9d8c89c4201256305ce5820555fcb5eea4236b8d64ccac9b1a72fc497ec9a4a4e64446835850a8f9be7a8271cddde52eb561
+DIST gemato-14.3.tar.gz 71325 BLAKE2B d42a5182c12bcc0281df47ddb6b933bb332b9b842b2a5c874c3fa4030ab5a8a16759ee289609d428a3fc1338078cd73d234060354513be88c184d5a6bbec545d SHA512 99904b1a38b8a05ff7bf7c265aa463a56ea3aa6c77dd844dc2d154faae5460e3535f4e9799e8863fda256ee6cd374e051ed98193c9b1fc52dc30c9c2655010cd
 EBUILD gemato-14.1.ebuild 1391 BLAKE2B 0a130c15a4aa07d3d5da7d5e64e5d318430c298aedf9ebfe67ee91e963ce13dd9e9e8085fe19fcf17d3e0d4db99cb1447b9ce73b909ad24a1072fa9335e37fa6 SHA512 09b33fa833e567bc18135b2a9281736d1d882160c18749951d486681198cd4189c74b79e9e5064086a5e8ba9bcd1910c363faabd790f27abbf551bfabe9aaff5
 EBUILD gemato-14.1m.ebuild 1674 BLAKE2B ee7a98540166272128fc94af0e5f8a7bd45ad0c30e65777f08f0b45576cd287558058d0f0cb6c121939d79cea63b1a1cd4cfb24b69bb66759ecc744ec840f378 SHA512 c1509d319373ca7c35603e1cc14d1beac15e839b97c2648fe2aa9970f9d06b59f6355ec34196a6a0b7c4f3e87e8e99dc61b050be8fd543f6e6580aa9395cefb5
+EBUILD gemato-14.2.ebuild 1392 BLAKE2B f807e0d3bd911d5089913cbe38106b09b7133c4a9049df86ec89503c1c0c2c388712f08b8821f1d33bcc7a4fae79328796b12cb7c06b85f24813d992f5c7fcac SHA512 1ec51b5e2facd52fc0acd8a83abf8e47d8a7868f33afab6c1efe6d7a4d937c5343aa168b3bda41f3f58f2b449870e4e7a36bca7afb1ac10bb691ebac4616c7d0
+EBUILD gemato-14.3.ebuild 1392 BLAKE2B f807e0d3bd911d5089913cbe38106b09b7133c4a9049df86ec89503c1c0c2c388712f08b8821f1d33bcc7a4fae79328796b12cb7c06b85f24813d992f5c7fcac SHA512 1ec51b5e2facd52fc0acd8a83abf8e47d8a7868f33afab6c1efe6d7a4d937c5343aa168b3bda41f3f58f2b449870e4e7a36bca7afb1ac10bb691ebac4616c7d0
 EBUILD gemato-9999.ebuild 1298 BLAKE2B cc2cdc3081a1662d04b4a991a4fec1a6cff50da2faa90536efc34b47b3cfa1831c9e6e69e5fb304c39fd807dbced6e0a67d16830733e5ec2061e88931d6d41cc SHA512 9cc1345c6e9df9112c43cacaf896d46917753873a23ab4282e0fea5aa20dd26d0190eebce0d67bc73fb66b1d4dad5fcb9cc5797236377c2ea4f4c01031ef5ad6
 EBUILD gemato-9999m.ebuild 1493 BLAKE2B 1826c7324f6b383dc4766de75731b93b46f2f13c6b9c4b7b928cda02e2ba9d6882fecbe828cd2e52b235ba0a4395663db13953e6d0d835614e66534fc0e0098d SHA512 b94f5e54cea9aa25dd90133fc127f8f14933d6b102ce5016346a3d73a78205aca21cee413e6de4f55c6c6df0ce2a65f86999e8cc8d0cfc1f85d8bb0a7813957e
 MISC metadata.xml 814 BLAKE2B 1e6845b23a861560cb0972f787a14f7ade2b471d98ff28f2ae3153e99011d98f2751d720d312a6006554117e3241e5ea8557211073f8d03bbfb751c23565c390 SHA512 d2367bd897e76939768a3cf8f173723e773ec5d12b7144793a69843a3a18aec50bcdb593956cce6644d45f27c263ebf1893ac375e5d4ee3d894dcb0bd4aa6d9e
diff --git a/app-portage/gemato/gemato-14.2.ebuild b/app-portage/gemato/gemato-14.2.ebuild
new file mode 100644
index 000000000000..d58a025ed50f
--- /dev/null
+++ b/app-portage/gemato/gemato-14.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pysha3 is broken with pypy3
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
+RESTRICT="!test? ( test )"
+
+MODULE_RDEPEND="
+	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )
+	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
+	gpg? ( app-crypt/gnupg )
+	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
+	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy) )"
+
+RDEPEND="${MODULE_RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND=">=dev-python/setuptools-34[${PYTHON_USEDEP}]
+	test? ( ${MODULE_RDEPEND} )"
+
+python_test() {
+	esetup.py test
+}
+
+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-14.3.ebuild b/app-portage/gemato/gemato-14.3.ebuild
new file mode 100644
index 000000000000..d58a025ed50f
--- /dev/null
+++ b/app-portage/gemato/gemato-14.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pysha3 is broken with pypy3
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
+RESTRICT="!test? ( test )"
+
+MODULE_RDEPEND="
+	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )
+	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
+	gpg? ( app-crypt/gnupg )
+	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
+	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy) )"
+
+RDEPEND="${MODULE_RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND=">=dev-python/setuptools-34[${PYTHON_USEDEP}]
+	test? ( ${MODULE_RDEPEND} )"
+
+python_test() {
+	esetup.py test
+}
+
+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/genlop/Manifest b/app-portage/genlop/Manifest
index 49aa9a352219..4d7cbbb467cb 100644
--- a/app-portage/genlop/Manifest
+++ b/app-portage/genlop/Manifest
@@ -3,8 +3,8 @@ AUX genlop-0.30.10-sync.patch 671 BLAKE2B 21f73d44ac404fc94462e8cba765baa6f88c1d
 AUX genlop-0.30.9-display.patch 676 BLAKE2B 4fe5071ecbd13e1c10e969d66a9bd74dadaae7a71b73fbac55657c29973629fe580f8cf5901b0d37b3a2cae1f0405ad0a75820c45d7462c176cf06673dd29d91 SHA512 76b5663dd1c2fb5700e8519b303db82ee37e6567fa847251304eec10e04bbb0c83a13d09b47f3cc725f9196d3ad34147ae9781c1284d33820f859703399c2f93
 DIST genlop-0.30.10.tar.gz 20872 BLAKE2B e06088678598464c67b78cf10a7472d7bf7b22d69c85fc072064b7a90fe57e2015fddba30edaa85574381cd59367b81c7bf514c269d5dc186fbcc367bba0cca4 SHA512 eab59d7dc012fbbdbe7de509deba66e6c7d0c5a37064e79c25a37c64becc259ee5206194615b60b3363022fa59e458356547edca307ceb4e19eeeaf4b146c593
 DIST genlop-0.30.9.tar.gz 21160 BLAKE2B 4d8fd34c8ea1e49498ebb887782c02b2dd20bd20bd1559b469dc93ccaa9873b27681c8c50ca85d3a96ca687f28f77750d79d9d93ac50e10c3d0fac2a593dd1ea SHA512 659c85bb1d75a90e37449a194fca2c610b2684dab3eb722d566aa929626d958aa1584d12a623f31518d982543be9392786291886ea66a5511e61de1beb3a6936
-EBUILD genlop-0.30.10-r1.ebuild 750 BLAKE2B 317f223e06ed89420defe8583e3a7b460c3ddcf301777cf8b6b7e617e7ebacbb9a0090cc80d8ca004fd675b558660f6ac46bf93f10d24c2571600b53b138552e SHA512 e184fe56b21aa2f4480a33e593717f8ab63e12f6e5645479289a703eb5ec2abdb3e6a42fe04a9c2050e70483fab645cb5199b022a47b762a5fd367f2d3f9b222
-EBUILD genlop-0.30.10-r2.ebuild 775 BLAKE2B f460e05916e2e96bb3127c5f43e8a5dde7738c7c55a1683ffd280f85daac06290f1e3cc4f34113092d3345572a66d2e809b089d76119bd9fbc5367f3d08eb88c SHA512 de0675d45edb01f11b1830ab775b0dc5d170d10a75783c198aa43dfff2a84ba13b12329f849c8b738ced6e673318c7bf3fceb030d81b3b1100b386e11ca1d778
+EBUILD genlop-0.30.10-r1.ebuild 763 BLAKE2B 6b3449fe92fece540b2e68ebfc56ed24eb4c0247885eb089e93cab2adc75656d511d61e14ffabbebb6547987b2fb66b718e1f0960f8fdeb9c4d82e8289209d75 SHA512 a09435ea347bc23d6f6525aa09adb139df36d031b5e968313797895042e2e181b0a36dd3906db2b604f03c4b741df44d8c4fed2b4feb97f51f4448140fa9b60a
+EBUILD genlop-0.30.10-r2.ebuild 788 BLAKE2B 99b503d589dc15cca65cf790a149212fb9d16d674524eba3b5903a625783a24076364aa418c39c5ed68f8adbbb56789257d67a5517b4005df3288a3df059a2eb SHA512 24d5f6069acf12539bbce611622e6de20db9daf4c4827b47f009b421bafe56dfb866f3bf056bb5d17963b81386814d7502301f718e4294a10a8e582eecb12e52
 EBUILD genlop-0.30.9-r1.ebuild 751 BLAKE2B ddf1257aa27c50d2fcebb8a80e64896f3460752dbc539eab1d41a3980ca2921faa1e1407d508b90617e9ff1c23b43bc8ca15821d5a759ed620c007bf9a3343f5 SHA512 60cc6b8a0382fc579247278ee14bca66ea7b4973f23e871f83eea21b376cb4353b6dc952ac3e19db72c4e099b16ad960e96106f4f9fddd1b5036d2d655a830fa
 EBUILD genlop-9999.ebuild 540 BLAKE2B a1785e1dd85c8d0fc365a21175f8df825390f5ce3ba9da561d99bb7138b965eedae647e54536567aeffe32014edfd2ee909a1030db96248ddae48a13b23c8f7d SHA512 7912f2f2cd550ecee97e1778a77613b22595839f0effe4815b7afc710a03530027b1bf29baabdd75705aac5a1cd2f0721c097a6514c0556e050a400866c5f162
 MISC metadata.xml 377 BLAKE2B 275b2a7cd7c400a7f16f8031457520d9a1e44ffdf0f2a53ffc06194a4f2e752ede65f13f36b852a24a67267907a6a2a8c7a81f1cc812c5b4c676edcc1fc492cc SHA512 3bc89900e1d25dc84831f78427b06089a1f0a16710d2adf31871af825041522b2446eb2a8156c4506d7e19cb6c73fa055f318b9dc48c9bd15d92511493098f1c
diff --git a/app-portage/genlop/genlop-0.30.10-r1.ebuild b/app-portage/genlop/genlop-0.30.10-r1.ebuild
index 575971e30ed0..07c073cc8881 100644
--- a/app-portage/genlop/genlop-0.30.10-r1.ebuild
+++ b/app-portage/genlop/genlop-0.30.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl
diff --git a/app-portage/genlop/genlop-0.30.10-r2.ebuild b/app-portage/genlop/genlop-0.30.10-r2.ebuild
index 0aa9a6145cb8..cc0a33340409 100644
--- a/app-portage/genlop/genlop-0.30.10-r2.ebuild
+++ b/app-portage/genlop/genlop-0.30.10-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl
diff --git a/app-portage/gverify/Manifest b/app-portage/gverify/Manifest
index 33df217b63f0..2cabcc4e3054 100644
--- a/app-portage/gverify/Manifest
+++ b/app-portage/gverify/Manifest
@@ -1,3 +1,5 @@
 DIST gverify-1.tar.gz 4558 BLAKE2B 193fb63dd3816b4577314199e4f8606a20f60d883f22f36636f1dba4c3fe4a701e89fd352b33ee3ce5bfb10b39e351f971aa55c8cd6eef493fc492e2c4c5d17e SHA512 f666306973bf173683edd845499ea1b244ffc9254ed0d816660022f871e7cec480d452fd962db5417b23d3101496b80a49caece29cbddf3058e2a21ec945a268
+DIST gverify-2.tar.gz 4609 BLAKE2B 73f97ba232fe0269ec56649bc5682650d48c001e432f8076c820a58a94c3d1de079dc89873d589a76b91164153e5c5be78870ef34b3b69f3c39ca0c0e388b114 SHA512 1756671d22047edc6ed1121b65af8c163afba854364a50a9089cef733213ccd6c9dd1276e876b9118741bcfa92ad02cde572fe2b6cebb22339664552c67d2957
 EBUILD gverify-1.ebuild 656 BLAKE2B ca6e3bfd5fb6353854229ebd9d4c0cd374197af5030f2f9879c64e6619415ca22f9e4f7c158fce92b8b9d6c24349419c17f19f0f16ec0c70b1a0131bf997571b SHA512 da8ec323226418f4b24f00f9a5457547b144718442cc0579baebdc6f7359c814467167193126ef66f03a6d2a55e1e73aa220fa60ced8e2172072bdb84805fbfd
+EBUILD gverify-2.ebuild 692 BLAKE2B 93bfed177d5f58371f8b32c9ce12674cd0f3c4b56b839599b9ba783af43f04d466aa7fc5263681b6d7a848502a97b150831a8cd611e70743c70307f8c2d82710 SHA512 e0bf2302363292b8de464b982e2a197a5749c5dfc5fd8a59b7a7d9127b02d6df97f1ac190d20d40b97993a4b1de7a3aa4f232b08fbef410e698ee9f199c5bf66
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-portage/gverify/gverify-2.ebuild b/app-portage/gverify/gverify-2.ebuild
new file mode 100644
index 000000000000..18068b633e4c
--- /dev/null
+++ b/app-portage/gverify/gverify-2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit python-single-r1
+
+DESCRIPTION="gentoo.git signature verification tool"
+HOMEPAGE="https://github.com/mgorny/gverify"
+SRC_URI="https://github.com/mgorny/gverify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	app-crypt/gnupg
+	app-crypt/openpgp-keys-gentoo-auth
+	dev-vcs/git"
+DEPEND="${PYTHON_DEPS}"
+
+src_compile() {
+	emake PREFIX="${EPREFIX}"/usr
+}
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX=/usr
+	dodoc README
+}
diff --git a/app-portage/hashgen/Manifest b/app-portage/hashgen/Manifest
deleted file mode 100644
index 6da7e772e0e1..000000000000
--- a/app-portage/hashgen/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hashgen-1.0.c 36299 BLAKE2B 4419ffd2b4c8435b05b0cf2d9e54e2df5c539f945166da8305c910ec267e5d93cd26822ef189777cf952bb8644193fbfeaafefa4e98c5b7561845fb9a1f40c0a SHA512 4f8df94e91b02ebc611553d2dd9776de4ba77989869ed1ce411b91cc7fed224c3d8715d15cce6234caa25f2143962949dfd59da79d8f1ab211c287c604c22fff
-DIST hashgen-1.1.c 38543 BLAKE2B 8830fa1ebd3494ef6e42b12bb750e4b45f0ebb975de8aacc29e67200144cc9110532846b349cf36b0a060c3b2770095a65bc24be2eb7ea997adfd5be309328d2 SHA512 84c44689e2d0061566ce990b943ea76824f5cf257d611571cd0b5932154a079670f186b7e97d3e16de3e991a629db595a63c21336c6a57f48b967b5ebb40eea8
-EBUILD hashgen-1.0.ebuild 1275 BLAKE2B a32fc75cfb026181bd0f7b182d888e6bbbc91efdc35e3fec4412dc6abf74429e76cd8622ae25e22a53ccf06519321f055332dad99868802be03e0498107216df SHA512 00dc4fe2efd8f433442406775134d8d34cf47074d78dc42e0c9c1a830b254d6206d9bb2b70860f4a03bffbb65ab647f46d971e16007aa149b153adddacf4df42
-EBUILD hashgen-1.1.ebuild 1275 BLAKE2B 2a1bfcfd8442f411d4b7e31a5cbf5cf586684cbed8e857d1abc09bc88d7a145aecfa050c4431dfdb6d228e24fd430d13c28507e778bd776a810ce0fbc2cbf8bb SHA512 51b06dade1b3ba23a1f34da3239b2fdd9c0b5e5dcc5569777654be5c3c9644cd90a5a9cca33f4c18c96981cd8374c94046f7066f996dd29cd718f6eee8bec1c1
-MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-portage/hashgen/hashgen-1.0.ebuild b/app-portage/hashgen/hashgen-1.0.ebuild
deleted file mode 100644
index 48a5df120816..000000000000
--- a/app-portage/hashgen/hashgen-1.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Manifest generation and verification tool written in C"
-HOMEPAGE="https://prefix.gentoo.org/"
-GITHASH="7fc3cf2b4baddc8b98c994b8ee024330d8f29956"
-SRC_URI="https://gitweb.gentoo.org/repo/proj/prefix.git/plain/scripts/rsync-generation/hashgen.c?id=${GITHASH} -> ${P}.c"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="+openmp"
-
-DEPEND="
-	openmp? (
-		|| ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] )
-	)
-	app-crypt/libb2
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	app-crypt/gpgme
-"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	mkdir "${S}" || die
-	cp "${DISTDIR}"/${P}.c "${S}"/${PN}.c || die
-}
-
-src_compile() {
-	v() {
-		echo "$@"
-		"$@"
-	}
-
-	local openmp=
-	use openmp && tc-has-openmp && openmp=-fopenmp
-
-	[[ ${CHOST} == sparc-*-solaris2* || ${CHOST} == i?86-*-solaris2* ]] \
-		&& append-flags -D_FILE_OFFSET_BITS=64
-
-	v $(tc-getCC) -o hashgen ${openmp} ${CFLAGS} \
-		$(pkg-config openssl --libs) \
-		$(gpgme-config --libs) \
-		-lb2 -lz ${LDFLAGS} ${PN}.c || die
-}
-
-src_install() {
-	dobin hashgen
-	cd "${ED}"/usr/bin || die
-	ln -s hashgen hashverify || die
-}
diff --git a/app-portage/hashgen/hashgen-1.1.ebuild b/app-portage/hashgen/hashgen-1.1.ebuild
deleted file mode 100644
index e52b35617a66..000000000000
--- a/app-portage/hashgen/hashgen-1.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Manifest generation and verification tool written in C"
-HOMEPAGE="https://prefix.gentoo.org/"
-GITHASH="2ea68e88531288c29c5533440d63da6c8136d477"
-SRC_URI="https://gitweb.gentoo.org/repo/proj/prefix.git/plain/scripts/rsync-generation/hashgen.c?id=${GITHASH} -> ${P}.c"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="+openmp"
-
-DEPEND="
-	openmp? (
-		|| ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] )
-	)
-	app-crypt/libb2
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	app-crypt/gpgme
-"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	mkdir "${S}" || die
-	cp "${DISTDIR}"/${P}.c "${S}"/${PN}.c || die
-}
-
-src_compile() {
-	v() {
-		echo "$@"
-		"$@"
-	}
-
-	local openmp=
-	use openmp && tc-has-openmp && openmp=-fopenmp
-
-	[[ ${CHOST} == sparc-*-solaris2* || ${CHOST} == i?86-*-solaris2* ]] \
-		&& append-flags -D_FILE_OFFSET_BITS=64
-
-	v $(tc-getCC) -o hashgen ${openmp} ${CFLAGS} \
-		$(pkg-config openssl --libs) \
-		$(gpgme-config --libs) \
-		-lb2 -lz ${LDFLAGS} ${PN}.c || die
-}
-
-src_install() {
-	dobin hashgen
-	cd "${ED}"/usr/bin || die
-	ln -s hashgen hashverify || die
-}
diff --git a/app-portage/hashgen/metadata.xml b/app-portage/hashgen/metadata.xml
deleted file mode 100644
index a53ffbea77d3..000000000000
--- a/app-portage/hashgen/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>grobian@gentoo.org</email>
-		<name>Fabian Groffen</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-portage/java-ebuilder/Manifest b/app-portage/java-ebuilder/Manifest
index 9b0aafbd411c..6174d68051b6 100644
--- a/app-portage/java-ebuilder/Manifest
+++ b/app-portage/java-ebuilder/Manifest
@@ -1,6 +1,4 @@
-DIST java-ebuilder-0.1.tar.gz 22291 BLAKE2B c958ec8c02d33dba4f70877aefe9c8e11a9a8b9acadad614c4c792f736f9a25306ac45fe6730dcebcbf33bb5135d9086a7915f01c58f6273d1a3e54c0c52766c SHA512 bc058b03da53bab03d7a48b2971f34da812bfd03aff7cc64ee4a3209245f4855bf8095d12c5c506f49b896db69fba09f06814f4c35e13a25c4e8f381d6416637
-DIST java-ebuilder-0.2.tar.gz 22998 BLAKE2B 3ba143a765f2f9b6a99bce1733724aa90ea5d0472d4d3d679217d3854ad61eefb32fd760cb117ef6ecd3a9a57b477895353f471b59a3d79748b383e6bf1fec05 SHA512 c76b15d4a81413e05359202c7b73b84baa3b277faddb7aa5f904290e5e47ed2bc6d80638c7b5417acc4224d067e4f48f1687972b7e36c363da8e9a89ea7f2766
-EBUILD java-ebuilder-0.1.ebuild 1397 BLAKE2B 07fbfce5267efa90ac7f966a6df3dde4f9af59798045b0f354a5aa07ec989f9c90d4a1860015d9924924251f9d138e181040cb4255861506f2386892db539362 SHA512 0001504bf184ed2ea32b1aca77be9f2ba8584a756757169033e3c7026a0322cec24558e503c70a6444ea4996b5b0705adc61fe539e36310782b8c9e44918aae2
-EBUILD java-ebuilder-0.2.ebuild 1402 BLAKE2B 2e49b26e438423ba57aeb43354516d19f974ef35a82dd763f9c84f7ae58a23527370d1a86a5021a26d6db31cd119f84a500237ebe30d4dc57de94728f1f7c743 SHA512 cc8503ead6ca6e77c60909f304fe0b263e248ec470a06fd2d4192b9c5dc62d1941722d9803b4d6e1f34b8fca773481ea0df252882857d9e85455779994ff0172
-EBUILD java-ebuilder-9999.ebuild 1401 BLAKE2B 57f0044ff4dc0d26903c15aea2064c87bef1ae3eb2c03b2289ff096b71bffa604e54ad0d2a41dfa58576554ac6521a04215282d9dbaea563f1ce0aa4bf70d640 SHA512 b143151a16b6e1b9316f616a0fbc6edd20d0a12f4c07344e182cbf706323207466e607c91e3641aa461ff594daf0aff8674ae099f46569ecf5a2b8ff40a03773
+DIST java-ebuilder-0.3.0.tar.gz 23127 BLAKE2B 2893d8afffe128bff769f2e2bbeaa393182c8d6671cdc3da0755a3cabb07552f6f22d9120e77232f7db83dbde5baae8ce9b40becbad85fabaf5238f6ee96bbeb SHA512 0f6ce22d144e888c05d4cbe488434454f9f5ff8598ebb6e6f9734bab90cead14283b6b82b5bfc52aa43f39ad786085453d6171d81537af2983717363645b6c63
+EBUILD java-ebuilder-0.3.0.ebuild 1548 BLAKE2B c3f4966e10bc0304040583e445a1d11d4ee7b66f0f35a5eac52534338d9c72615031f900e75aee6c86d7f1f85a4c2e5f97dad32c56269d0c264810b3990aafe8 SHA512 141b6cc1edf7d901319a18d165fee172aa2c2b1145233c8c7681483a1e4c099435bab4324936c36ae6d810cd98361947d6782f5b52da7b9966041777e7b59c5b
+EBUILD java-ebuilder-9999.ebuild 1555 BLAKE2B 30c9cd2065cac2ac3cf07cd61d8ee566db89df3abcf97b3179a15d816fd84c84e877b3d1412778a0ce183c01e067934ac6d76a106897e1798f7d5dfac4a356c1 SHA512 19880c68dbd405e2c4f39a1a91567f0034f6f991fa082218bdcef85909440afb845516000abb8523a48828b066651335440102e71f898fd73e8428a1effab77f
 MISC metadata.xml 339 BLAKE2B e6068070bc51e0f0a213a76593f11fee385ebe1546b08f23088706ba46469e7352f4f73647980595b9c3aef4fecfd96d9d2d907cfe7e147897e9259c02dfb30f SHA512 b200cb9a9934082d9460c2dcaded12756bbafde1c0df15638979a31974736233f02fe15bffd5698532ebfffdad7f9b3b6df9129c2e7f1383314cf1ac5898595b
diff --git a/app-portage/java-ebuilder/java-ebuilder-0.2.ebuild b/app-portage/java-ebuilder/java-ebuilder-0.2.ebuild
deleted file mode 100644
index f294a30ebbc8..000000000000
--- a/app-portage/java-ebuilder/java-ebuilder-0.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2016-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999 ]]; then
-	ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/heroxbd/${PN}.git"
-else
-	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-inherit java-pkg-2 java-pkg-simple prefix ${ECLASS}
-
-DESCRIPTION="Java team tool for semi-automatic creation of ebuilds from pom.xml"
-HOMEPAGE="https://github.com/gentoo/java-ebuilder"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8
-	sys-process/parallel
-	>=dev-java/maven-bin-3"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_ADDRES_DIRS="src/main/resources"
-
-MAIN_CLASS="org.gentoo.java.ebuilder.Main"
-
-java_prepare() {
-	eapply_user
-	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"
-}
-
-src_prepare() {
-	eapply_user
-	hprefixify scripts/{{tree,meta}.sh,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
-	dodir /var/lib/${PN}/{poms,cache}
-
-	dodoc README maven.conf
-
-	exeinto /usr/lib/${PN}
-	doexe scripts/{tree,meta}.sh
-
-	dobin scripts/movl
-
-	insinto /etc
-	doins java-ebuilder.conf
-}
diff --git a/app-portage/java-ebuilder/java-ebuilder-0.1.ebuild b/app-portage/java-ebuilder/java-ebuilder-0.3.0.ebuild
index 1c42c4d5eeee..ecd724819f2a 100644
--- a/app-portage/java-ebuilder/java-ebuilder-0.1.ebuild
+++ b/app-portage/java-ebuilder/java-ebuilder-0.3.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 2016 Gentoo Foundation
+# Copyright 2016-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 if [[ ${PV} == 9999 ]]; then
 	ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/heroxbd/${PN}.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
 else
-	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -31,18 +31,23 @@ JAVA_ADDRES_DIRS="src/main/resources"
 
 MAIN_CLASS="org.gentoo.java.ebuilder.Main"
 
-java_prepare() {
-	eapply_user
+src_prepare() {
+	default
+
 	local base_dir="target/classes/"
-	[[ ! -d "${base_dir}" ]] &&mkdir -p "${base_dir}META-INF"
+
+	[[ ! -d "${base_dir}" ]] && mkdir -p "${base_dir}META-INF"
 	echo "Manifest-Version: 1.0
 Main-Class: ${MAIN_CLASS}" \
 		>> "${base_dir}META-INF/MANIFEST.MF"
-}
 
-src_prepare() {
 	hprefixify scripts/{{tree,meta}.sh,movl} java-ebuilder.conf
-	eapply_user
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	jar uf ${JAVA_JAR_FILENAME} -C ${JAVA_ADDRES_DIRS} usage.txt || die "Failed to add resources"
 }
 
 src_install() {
@@ -52,6 +57,7 @@ src_install() {
 	insinto /var/lib/${PN}
 	doins -r maven
 	dodir /var/lib/${PN}/{poms,cache}
+	keepdir /var/lib/${PN}/{poms,cache}
 
 	dodoc README maven.conf
 
diff --git a/app-portage/java-ebuilder/java-ebuilder-9999.ebuild b/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
index 367d6061c927..7a78207628c6 100644
--- a/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
+++ b/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 2016-2017 Gentoo Foundation
+# Copyright 2016-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 if [[ ${PV} == 9999 ]]; then
 	ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/gentoo/${PN}.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
 else
-	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://gitweb.gentoo.org/proj/java-ebuilder.git/snapshot/${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -31,20 +31,25 @@ JAVA_ADDRES_DIRS="src/main/resources"
 
 MAIN_CLASS="org.gentoo.java.ebuilder.Main"
 
-java_prepare() {
-	eapply_user
+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"
-}
 
-src_prepare() {
-	eapply_user
 	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"
+}
+
 src_install() {
 	java-pkg-simple_src_install
 	java-pkg_dolauncher ${PN} --main ${MAIN_CLASS}
@@ -52,6 +57,7 @@ src_install() {
 	insinto /var/lib/${PN}
 	doins -r maven
 	dodir /var/lib/${PN}/{poms,cache}
+	keepdir /var/lib/${PN}/{poms,cache}
 
 	dodoc README maven.conf
 
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index f6d0af073810..02dc1e9f25bf 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -1,11 +1,9 @@
 DIST mirrorselect-2.2.3.tar.gz 15230 BLAKE2B 7234ab8a681713c63b201e1ae362ea9a28d5e76b5640c6128d79c66d9967660474d0597822604defd3f562cd155524835c5ae20cbf21c5526595775b3be39dc4 SHA512 af1d3657b9ff5a6184ebfd89579a1bdbf11f7389ca12d4cd7a41cd136a553732cbbfb7675e25f7d79756b0b9e74b496d28ee5fdc8872173825262fae0052e8e2
 DIST mirrorselect-2.2.4.tar.gz 16085 BLAKE2B 67d3de3e25a993a4bfc546ae7d188b2a7e61da1cfbc85ac50119c88a81c4966959e31f88101880ba86ef27f0b0674a3d279b11135d2475d0b2fed1ea899021f5 SHA512 8749a916911088d128f9064d5aa78c3bf8b529d583db86eb6f7190959008257e231f7b0bae9a2f2fd6edc45f6d0ffb07364c16a3f190f8c97b88472c2d082037
-DIST mirrorselect-2.2.5.tar.gz 16638 BLAKE2B b306f146936344309e79469281830bdbd088bae3686de777bf24bce5bd4e915c951b1f01612c9600cadcbc90139c74a9a5774ca5779bae339d1d5f33d17f70f1 SHA512 845df4073f5dc7544d7c1ae410f154e27ef9a9848c2fa182f4d0acd287f17792d11065b1b3394856bd760589d6b24e30e031d10e4ef6c987ac4321dc7e044e4e
 DIST mirrorselect-2.2.6.tar.gz 16727 BLAKE2B 8875bf61e26ac474338d81a602297fa4fdf3fab3dbd478b02129dbe71f2d09445efa9b82792e3e654725c5e87a4ca00d37a3d924f8bd6f2decdf74148d1069c8 SHA512 ff2b88bf568f79182275e2c85cafbeee7cbeb0226225a7c3289f0a1d7a8b5eae9d41c69b099bb7e0cc9b0300b23afea43c3ac1baa13f37c696159bb1b3ac05f8
 DIST mirrorselect-test 102403 BLAKE2B 8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27
 EBUILD mirrorselect-2.2.3.ebuild 978 BLAKE2B 38888e533900bd27b40e5bf67c06fe6466fa4665caed5c1a54a11c88a44eacf36d6a05d70311950bf90b7ddddcad30a75bd4af0cef41e7c402d60beffc2e9f73 SHA512 e73b6f9e4c3d6f14be05937d630bfbbb4edb719136a4c6e1d1ee5734531039fdbb598269c6474bf82596067b9504b52256613b1d0cd6b798ba5699f1c8ea3f4b
 EBUILD mirrorselect-2.2.4-r1.ebuild 959 BLAKE2B 8099445a86cda60203dd60ee2b596c46cca8c3d4e06536fa5ae14f48c09e025030bd9553cf3288061d3acd38a461f4378a8d686f7461ca7dd6f2285624e07ce3 SHA512 3d6865a1decdf07e1d19c0f2e55b69a82323a781cd130f7597d1a130a4bbd8c49b0f708224f5abfe8ff37d582792777f3fdf5da707267484f7598f6026909258
-EBUILD mirrorselect-2.2.5.ebuild 1059 BLAKE2B 25101e55b872c5a14a47c85a21bb96a840212f3cb0ed22c21c8667fc11771202c425d9f0abb1a17cde3ec82d9bd14a2c2bf72b101b7612a908a56553ca140432 SHA512 67f89abf3ea60047ed445fdbc0c3427d2790305749b321d7a67f472cc85aefa2eedb7bc273b894ae78c71401cd19ef60f3289d81245e02f900d0064f0855a757
-EBUILD mirrorselect-2.2.6.ebuild 1310 BLAKE2B a244637c10ddc818f512af4eb1bbfef2259dbef6de7162b924b8b45b7916d8f20334ba6f7715f14d0b954062ecfd38b516f222b7200c84be91027d73a089ddb6 SHA512 f95cd8a60b263fe0bb90c3d28df28b4124c20e6e846219eb4fe8b15a82687814311e4fe9103e7a34c90b70716aa358c6fd8d7002c9a7e9dd27cbfd8ca3f865e0
+EBUILD mirrorselect-2.2.6-r1.ebuild 1488 BLAKE2B bc51100a528b64db0452547e2c2c64e970d570607002412b39628447ceae812fdba9d1ce8fd0ef942528ab997c7d7ec80ac3c6d114dd2ec07459f93372c316ce SHA512 d4fdb62edd163aa79a8b54528cf488e5b8fe292fff43a1c450a97f5426f7e7ef4692f08561e80ec5ec970cf271eb146ad8545c1e21c08580087a0cbfb9cc3de9
 EBUILD mirrorselect-9999.ebuild 1125 BLAKE2B 52bd3f705108f52a8cc381fca6b9296264b2152848b88321b5b874fcc9672469fde32f20a27728b2b0fb042ff591f961dcd4a702f77bd73adc9b7ad948b44ada SHA512 eb6bb88fc85b92606f3dcf3fe149e6c41f5bd67bc6a96dd158ff2db1f191909557d82cbf82d3ced101e18de5101a91bb22d53913eee9b719b0e839e78a234b4c
 MISC metadata.xml 470 BLAKE2B 5b799aaffb1a8166846fbc1f4bc2f28c3e664bc2a17c8dc9d743c9294a682787c404c9f099faae26667d1b38c977910acbf5e4e0cff21467bad45fc0f0e142d7 SHA512 31405437e73acec409d4d9c14d33fb10b03aed300ac88d5f793666cc7324abd46ff8703d794009316716d1a63b2b80721dc5e0841f0e1d0fbebc1f9b83f13acc
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.5.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.5.ebuild
deleted file mode 100644
index 745675eb6f78..000000000000
--- a/app-portage/mirrorselect/mirrorselect-2.2.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE="xml"
-
-inherit eutils distutils-r1 prefix
-
-DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
-SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.gz
-	https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-	"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-RDEPEND="
-	dev-util/dialog
-	>=net-analyzer/netselect-0.4[ipv6(+)]
-	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
-	"
-
-python_prepare_all()  {
-	python_setup
-	eprefixify setup.py mirrorselect/main.py
-	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test || die "tests failed under ${EPYTHON}"
-}
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.6.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
index a8348fc40d2b..22fdd516033e 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.6.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
@@ -37,6 +37,10 @@ python_prepare_all()  {
 		sed -e '/^NETSELECT_SUPPORTS_IPV4_IPV6 =/s|False|True|' \
 			-i mirrorselect/selectors.py || die
 	fi
+
+	# Apply e69ec2d046626fa2079d460aab469d04256182cd for bug 698470.
+	sed -e 's|key = lex.get_token()|\0\n\t\t\tif key is None:\n\t\t\t\tbreak|' -i mirrorselect/configs.py || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/app-portage/perl-info/Manifest b/app-portage/perl-info/Manifest
index 3cb4d8ba90bd..35478d53e07c 100644
--- a/app-portage/perl-info/Manifest
+++ b/app-portage/perl-info/Manifest
@@ -1,3 +1,3 @@
 DIST perl-info-0.16.tar.gz 2058 BLAKE2B 07691f2b2bbc36c171706e55257d8ed57a45f629e71e12d438d236a0d026d50fdf8a0ddc05644befb4d916cf8cb2ad6819753f27baf5e14ac00c86e331dfaeeb SHA512 4e37b2496d8a9490de9d105fcaf74ed24d7d2809a4aea4709d0f15811736a8101edf9a4274c82448c24be37692455350e490d29560e616d688da1e6d72d38483
-EBUILD perl-info-0.16.ebuild 569 BLAKE2B 95db230e7395184a8206a60921521e6b80302442dc2ca0f4ac7f5671963577e4c17fe9a3110f422c1fbbbe84bedafb64c92c7b097d9c7f21bba8f1b014a1291d SHA512 11c2a5d2208ea56d80955de8fe8085c7e122d219170e1f4984ad8951219df8977e6fe0b669391396ffceb513476113c6e55a9fc879b6324237e17615bf961949
+EBUILD perl-info-0.16.ebuild 554 BLAKE2B ebc9873d7449ead5f69b6fd0b028cd09b5e380ffd4f861b84c15441c5433de117393f9711986fb4b08306a7b0714bbb9ade1dbf594b60198d52ae74792ba3bcc SHA512 f2fcad3d5291d5737aa74f6b0738f5136d8c7175c1ae1869e258a063ad6c2ffcd69123337e7dfb0f0cd499d2f21fd9690e35d225c8150022302ef814efe21735
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/app-portage/perl-info/perl-info-0.16.ebuild b/app-portage/perl-info/perl-info-0.16.ebuild
index 467d498b5fca..2eae853e43a4 100644
--- a/app-portage/perl-info/perl-info-0.16.ebuild
+++ b/app-portage/perl-info/perl-info-0.16.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="Tool to gather relevant perl data useful for bugreport; 'emerge --info' for perl"
 HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
@@ -13,11 +13,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ~ia64 ppc sparc x86"
 IUSE=""
 
-DEPEND="dev-lang/perl
+RDEPEND="dev-lang/perl
 	virtual/perl-Term-ANSIColor
 	>=dev-perl/PortageXS-0.02.04"
-RDEPEND="${DEPEND}"
+
+S=${WORKDIR}
 
 src_install() {
-	dobin ${PN} || die
+	dobin ${PN}
 }
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index ad3dfa3d2bfe..109785e081dd 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -3,8 +3,10 @@ AUX post_sync 190 BLAKE2B ad1a8705af98cc7d0122173e6edb821eb7be6f024fda5eb145d713
 AUX q-reinitialize 68 BLAKE2B f1c2cd5009f30018dfc2d508a627253c08fc6e74859d072b917a0518850b879ecd0318df7a86c8597d28cf4410312f757aaf5cf8780899180a5e2a9a906b1ac2 SHA512 d322fc0e3fd82583e9cfc6ffa95636134e4491e63fc1a1f34dcda58a1749c3ebcda97caee47bea4f44fb056c35c97e30819dd22e5c2ed8c936e0863466ebf6ae
 DIST portage-utils-0.74.tar.xz 1587792 BLAKE2B 7c4588e3d44266a5260df42cc685aa03c584248e9970956033e4191a7a842a4b2162110ac99c2bb18645aaafc6ae6ee960e9b26ba0a8863497911eef1e943f64 SHA512 cd3f44c135b3d44e15a95eed41281fce62f225a9d05d5d5bb1be230b2d59cdb87755f011b313a9ec32e4cafdf3b3979c4ef423365edd7dcc472ca2e38c09c83e
 DIST portage-utils-0.80.tar.xz 1762692 BLAKE2B 32e4502d517ec088eadf17a4a348b9b9bc33348380b65f93ac7c043150732ba3ff0d18ee96f8877c697a91000fdc036de392d6e6711d62248bb7c57e25d4433f SHA512 cca86877e87e5bd2e9423822db4b7afa15e8f291717c808ef0455b121db0778b2364552e9f1d5e1a8bad3f1f8880ae2b5dbd586bf1dd74d7c4f4e72fa990c78c
+DIST portage-utils-0.81.tar.xz 1763088 BLAKE2B 1fa40950f9deff721ebfd8f3dc06a1ec99e1f5c1e8bce7cb20120feef4d0789f6ff02dac43fae84d9d554d9b9867423db43a0e7cb7a6070a60cb0619f36547ad SHA512 d9fa971e27aa8a58d4278cea8e9ec238f92d03e51f44b7124f51289613800790dcd5a0c886c3930dd89abd8cd032d0cfd05723e12ba7e2403a85a2d72b359ce1
 EBUILD portage-utils-0.74-r1.ebuild 1118 BLAKE2B f51e775f5fa127ff2d6fd4e75096602f8bab392bb2773a2f6fc5ab20adfd3e99af4e9ee69d9260402fff33419bc762412fc2014b9feb219af11aee6c9ee9d0a9 SHA512 bdb0de9152c30e8064d67abcd65dd569b5549bb8eb21b25d4d57f8f126edb270e091684cf53d62a4e4557871ff1c9f3056dca0a1cdbbda2253cddb0396189744
 EBUILD portage-utils-0.74.ebuild 1051 BLAKE2B c8647973636f57b948978607ab73d4bea3a86eb51f045ecef3ca641a5d68976070cbf5c00520291c8876c6f003510c782252e5c5fc7a99245897a2e3585916b6 SHA512 158a8a3a4892bd99c48c6f0ae75c00b9b3c4df56678b6eb7deec2eb4f4a6974a0a4788f54dd4fc1e3b6d27d95cc989683f19ccf1bae214d376da0726255722fa
 EBUILD portage-utils-0.80.ebuild 2251 BLAKE2B 9c7238b96dc6dc7acc9ca3765f1f545ea2cf8df62c492820ee8e1c8c979a3b5337f01080d6a68b920a9a3fd1458bfc2a2cae9b795a3f7178b83ac6d15838b2e4 SHA512 7ef7e5094c1bb02bc633c410f27db6e77d6cfdbc820adbded8996e889aaa27071ff4a1fba992ba70f32723c4d76d240941caf135afc6d38eb42d708f6078b805
+EBUILD portage-utils-0.81.ebuild 2264 BLAKE2B 467b8bf1ed1795c6e09d9f86f188d727f2992c0717e7215af591be2246e3f0a97a51fb2cb602cb588ca62f7dab2452bd08fa583f79a19e403334f1be720270df SHA512 3569b23821830052a63e010be3835cdc213e37b565eb1898b0c6702e22f7a39ebe50b98cb71c606bec8fb5e35659a77e155ee816be7ae8f4468f2db98ee78ce9
 EBUILD portage-utils-9999.ebuild 1885 BLAKE2B d0cc4e20e992c06091cdadfda6049b6b367fc972aa6b372ebef996e95fa321d96e75a267f9e164123f6083d08dd653037965bebd106155508bfce5d73c21c96f SHA512 c11f51098cc8637d86b9143d715f506574acea6b2e51715b2309f04f4e714ee43bbd8b874815bd6ef1edd7be0a760162c7338962d5ef839966c84c8352a95322
 MISC metadata.xml 490 BLAKE2B 36af527c82aa05f09ef3187a5c93ec34412a625a00016ad87fa1f6e7a00108f87bd3c8af42aad0aec87fa11e1ec25da71f1f4776c0da053e7426b8006d876103 SHA512 eacb9a20b0228c67896f7633619e67ef0e2de38444436ed720f849b8d9fcbed3c2569d2534e38fb7060cd755195bfd74cbcc9d77dbd5da4fb7b1654f87f70a1f
diff --git a/app-portage/portage-utils/portage-utils-0.81.ebuild b/app-portage/portage-utils/portage-utils-0.81.ebuild
new file mode 100644
index 000000000000..a898b264573d
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.81.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Small and fast Portage helper tools written in C"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls static openmp +qmanifest +qtegrity libressl"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
+else
+	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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"
+fi
+
+RDEPEND="
+	static? ( dev-libs/iniparser:0[static-libs] )
+	!static? ( dev-libs/iniparser:0 )
+	qmanifest? (
+		openmp? (
+			|| (
+				>=sys-devel/gcc-4.2:*[openmp]
+				sys-devel/clang-runtime:*[openmp]
+			)
+		)
+		static? (
+			app-crypt/libb2:=[static-libs]
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+			sys-libs/zlib:=[static-libs]
+			app-crypt/gpgme:=[static-libs]
+		)
+		!static? (
+			app-crypt/libb2:=
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+			sys-libs/zlib:=
+			app-crypt/gpgme:=
+		)
+	)
+	qtegrity? (
+		openmp? (
+			|| (
+				>=sys-devel/gcc-4.2:*[openmp]
+				sys-devel/clang-runtime:*[openmp]
+			)
+		)
+		static? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+		!static? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf \
+		--disable-maintainer-mode \
+		--with-eprefix="${EPREFIX}" \
+		$(use_enable qmanifest) \
+		$(use_enable qtegrity) \
+		$(use_enable openmp) \
+		$(use_enable static)
+}
+
+pkg_postinst() {
+	local pvr
+	local doshow=
+	for pvr in ${REPLACING_VERSIONS} ; do
+		[[ ${pvr} != "0.8"[01]* ]] && doshow=true
+	done
+
+	if [[ ${doshow} == true ]] ; then
+		elog "This version of Portage utils has undergone significant changes."
+		elog "Please read the elog manpages for applets like qlop(1) and"
+		elog "qfile(1) where argument options have changed."
+	fi
+}
diff --git a/app-portage/pram/Manifest b/app-portage/pram/Manifest
index 6093ba1c258c..e87186109355 100644
--- a/app-portage/pram/Manifest
+++ b/app-portage/pram/Manifest
@@ -1,3 +1,5 @@
 DIST pram-7.tar.gz 7471 BLAKE2B 5152002be35755031a81dbaa61118fcab0529eb9732f134b11eb2499a539e04b8b8cb6402ee3bb39c7b7c82bc918ee4fef30e247fcdba3fe32c5457cf654e257 SHA512 42e95577802d5940a0eab8da5fd36d9eb2338eccf654260364b91990a0d8de9d56cbfde767dc60bfd3c826eb45a1b0e73af717740488af0a25ff6d8c656df93e
+DIST pram-8.tar.gz 7918 BLAKE2B cc5bea629e49b229622a77c585a62710234e00ae245b68cbcfbae5be538b82752e8b2e8da5ae82f571dd4d7368ecaacd1233affe975fd9e20177122808dc39cc SHA512 bbd9e7ce3207550f1651d63a045474d90c4aaf20ab0c541b2a78e6af6351f9c7bd278b649ee57ed1b3b85cbc4f38f1b98a008e791bf9d19e4ea718892544bd46
 EBUILD pram-7.ebuild 560 BLAKE2B 24d58edf63065bd835826298377cb064922df5b7d8321f52af29d72776e4a4a10f6d056433622df1bce49a5a1fb9ab2fc754fc5414a2d1bfeeaa969e64007a44 SHA512 1ce452c60ebd05d2f030729637581362efc7370d01ce303cb52e5e9589911d7c5b140ad258cc11be5f6f537b4b3ab83df07bc99850c157895129870d200ba411
+EBUILD pram-8.ebuild 562 BLAKE2B 0887b922142a71a6aab8ac5f298132f5603ee513b3042207b439df1b473e7ac6883d9ffd67d7e6de9735b532eeab0552818e604e9bd8d327f94008f9dd9e3684 SHA512 56a224a9026b222545859f6d22b7082c96afd4dbfef4e4b752eff04ad54e80ad44c0f7a5a43b0641701ba38897268ce4cb8630e7085ef3343a7878c5e1c3e417
 MISC metadata.xml 521 BLAKE2B 666d2a5e1366b0623f3ee47cae65ec248612729ffd0d39b009f0bb95ea79fefb1b0fa3343eff98841d2b1b0f6ccf03c6579370415cb4240441cff5f942557ed5 SHA512 36326936f659a738a0a7a0d1e7b6388820e4f19acf29dbd9efa646cdeb7ad65814b509f9619dddb822fc012ea8b2e06258d2887c5825283db6c77365a6fdc77d
diff --git a/app-portage/pram/pram-8.ebuild b/app-portage/pram/pram-8.ebuild
new file mode 100644
index 000000000000..61c091c9c5c6
--- /dev/null
+++ b/app-portage/pram/pram-8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Tool to ease merging Pull Requests and git patches"
+HOMEPAGE="https://github.com/mgorny/pram"
+SRC_URI="https://github.com/mgorny/pram/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-vcs/git
+	net-misc/wget[ssl]
+	virtual/editor
+	!dev-perl/Gentoo-App-Pram"
+DEPEND="
+	test? (
+		${RDEPEND}
+		app-crypt/gnupg
+		sys-apps/diffutils
+	)"