gentoo resync : 18.05.2019

17 files changed, 178 insertions, 46 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 3733197b85aa..179c27d1aaae 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/genlop/Manifest b/app-portage/genlop/Manifest
index 4bd5bc16e855..7563a8e147fd 100644
--- a/app-portage/genlop/Manifest
+++ b/app-portage/genlop/Manifest
@@ -1,8 +1,10 @@
+AUX genlop-0.30.10-sandbox.patch 1057 BLAKE2B c26b81d97da834af5c54cd4f6b27cf1556a54936b263497174d6baf85ccf9b7da6a3dc48235eea8e389ad431ea10fb8eb26be21cea9a3c7d26a474686fd9fcef SHA512 c7c4a4de633bb96fbc380e168ebe3f3bff411ede87245b2bb0039834f6b7f09d1342549f755fdcc925b5b15ff0f194a4abca0f0c5ed0082961c0d40dd122e933
 AUX genlop-0.30.10-sync.patch 671 BLAKE2B 21f73d44ac404fc94462e8cba765baa6f88c1dfa0e4add517087765d056e98fdd9bfe26838ec2f94b001c14175f8e98b45f4bab95e50d99f87083910864e86ed SHA512 dfb9edf5eefac114e868590df49b36e1f799ce4849448ca081d12c70019d40dee3dd7056665281728891ad8b7cada9213f17f0260347aa867b20009c0f87781d
 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 772 BLAKE2B c1d35e9e7bdae44a38a36da8592c1d390cdddb59644063946653736869b0d7ea93b4af41e9b29128108990d2b4ad75ab0b9f361fc8766c27c8750069599a4c3a SHA512 7fa8dfea27721eb493556cbccccaa6ef878de49a7d5f2c0d9d0897600f0380979671c8487f5b74979762dd87381f6296c50a6e491750e996e0b52776051c76bc
+EBUILD genlop-0.30.10-r2.ebuild 802 BLAKE2B b2f7e022697ada81eda7c26f02d3b4131b1f861fc3595e0680a757feca5fb2e103d448596c26cf4f45af07ac873f3f70e35bf5c74d52c3baed7411176f4225f6 SHA512 411d087bc42afac13961cfbd9d7956aaaf3f602d5a91b960970fef2bcd046984910e778e09f214572a12cd2f7ecdce0a1bcd03f50d505737cf1dfd4010451422
 EBUILD genlop-0.30.9-r1.ebuild 773 BLAKE2B cfccd4ab36b55323bf320928c7c0e8719b92c00e1254dbf295241287010913768865b3428ac0130db3d93ab6fc12f5d60e50a4e417280c21a630a83cb1180711 SHA512 c53494d4d127c4b54d6c8a8897b1ff76d3bb0f6f2ee686042ad18422570802b2ca0d8a9f4e22fd1076342f48409182a9d72f196a3f652757c312f3c9e42d84fb
 EBUILD genlop-9999.ebuild 540 BLAKE2B a1785e1dd85c8d0fc365a21175f8df825390f5ce3ba9da561d99bb7138b965eedae647e54536567aeffe32014edfd2ee909a1030db96248ddae48a13b23c8f7d SHA512 7912f2f2cd550ecee97e1778a77613b22595839f0effe4815b7afc710a03530027b1bf29baabdd75705aac5a1cd2f0721c097a6514c0556e050a400866c5f162
 MISC metadata.xml 377 BLAKE2B 275b2a7cd7c400a7f16f8031457520d9a1e44ffdf0f2a53ffc06194a4f2e752ede65f13f36b852a24a67267907a6a2a8c7a81f1cc812c5b4c676edcc1fc492cc SHA512 3bc89900e1d25dc84831f78427b06089a1f0a16710d2adf31871af825041522b2446eb2a8156c4506d7e19cb6c73fa055f318b9dc48c9bd15d92511493098f1c
diff --git a/app-portage/genlop/files/genlop-0.30.10-sandbox.patch b/app-portage/genlop/files/genlop-0.30.10-sandbox.patch
new file mode 100644
index 000000000000..1b4efdb97687
--- /dev/null
+++ b/app-portage/genlop/files/genlop-0.30.10-sandbox.patch
@@ -0,0 +1,29 @@
+From af0fccf158a0a5d0c300be2eae167eace93cc1d3 Mon Sep 17 00:00:00 2001
+From: Joe Breuer <gentoo@jmbreuer.net>
+Date: Sat, 11 May 2019 21:08:21 -0700
+Subject: [PATCH] genlop -c: filter pid-ns-init duplicates (bug 677890)
+
+The latest stable version of portage introduces a pid-ns-init
+process which must be filtered in order to avoid duplicates.
+
+Bug: https://bugs.gentoo.org/677890
+Signed-off-by: Zac Medico <zmedico@gentoo.org>
+---
+ genlop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/genlop b/genlop
+index b28c9d6..c154aa4 100755
+--- a/genlop
++++ b/genlop
+@@ -706,7 +706,7 @@ sub current()
+ 	# not check for sanity and have users check their FEATURES instead.
+ 	my @targets      = ();
+ 	my @sandbox_pids = ();
+-	my @sandbox_procs = qx{ps ax -o pid,args | tail -n +2 | sed -e's/^ *//' | grep ' sandbox ' | grep -v ' grep '};
++	my @sandbox_procs = qx{ps ax -o pid,args | tail -n +2 | sed -e's/^ *//' | grep ' sandbox ' | grep -v -e ' grep ' -e 'pid-ns-init '};
+ 	my ($e_curmerge, $e_lastmerge);
+ 	foreach (@sandbox_procs)
+ 	{
+--
+2.21.0
diff --git a/app-portage/genlop/genlop-0.30.10-r2.ebuild b/app-portage/genlop/genlop-0.30.10-r2.ebuild
new file mode 100644
index 000000000000..dcf811ab6d16
--- /dev/null
+++ b/app-portage/genlop/genlop-0.30.10-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit base bash-completion-r1
+
+DESCRIPTION="A nice emerge.log parser"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl"
+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 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	 dev-perl/Date-Manip
+	 dev-perl/libwww-perl"
+RDEPEND="${DEPEND}"
+
+# Populate the patches array for any patches for -rX releases
+PATCHES=(
+	"${FILESDIR}"/${P}-sync.patch
+	"${FILESDIR}"/${P}-sandbox.patch
+)
+
+src_install() {
+	dobin genlop
+	dodoc README Changelog
+	doman genlop.1
+	newbashcomp genlop.bash-completion genlop
+}
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index c5888a48bd5d..fede79926198 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,6 +1,6 @@
 DIST gentoolkit-0.4.2.tar.gz 3215652 BLAKE2B 97b4dcac7293b50161169a6c777623cb1c51e2f74020e0fa2f1f4441c203c03a1269c8c55e1461c5780ebfb8234d364837073d582a52a99f2d40c92e6b77a7f0 SHA512 3a9eac2fd214bcfe39380193cb2118edcd759dbf3eb165e7240525ce1047aa984f1d1f1d3a15324218d9be1f0a1ec960ae08a63191392f1bb3422277a52697ff
-DIST gentoolkit-0.4.3.tar.gz 3218723 BLAKE2B d305db514e48446c0341c1ddc7a6c1bcd464eee11b8ee58f1a16bdf797670a9bb13eacfb2afa666d9ef292ad1dcbdf9970f8ded64bd5d12ca9d73ffae8923119 SHA512 81058d4787b291b6398d82d9a32f41b78d939f8d20ad8afbf9e22a47311ff0a270098c69e53d903ab3ec72a4cd11f13f3be30279a538a6a52972e1651efe447d
+DIST gentoolkit-0.4.5.tar.gz 3218757 BLAKE2B 9ac6e7bdee622ff3069ee0f59a1834f36496f2bd07c53a67677571e0cfc99366ba64d03fca8bd964c3517d7cbcb7d4d5d08e9f3ec721d7adf598b13944fea659 SHA512 6b459684a59c5a72f09da34a2e9491b98f49c861f763bddb52ae002413a2c89d7841d84658577e6fec36a096889265a1207eaf981adfdd5e9db6ad79ca364df3
 EBUILD gentoolkit-0.4.2-r1.ebuild 2363 BLAKE2B 1564354ab84b5193b5533be6e1bb8eb48cf04bc9ebe903d47fa7de9b5839e316dec7623abddb10f6e6537aed9c76340756c80633d5fd0906f917072614452549 SHA512 1e2518f0e9a333715f8b778ce3f80613a06255fe48eee8b6b95940fc747c87f2d9c9047a452ca973a0bdd8333dfd9ce5d4adeeb7d54cb7785b2117cb7654633b
-EBUILD gentoolkit-0.4.3.ebuild 2371 BLAKE2B 6e06391fd6092b6923d9d76ce6b9634f93958c64c4639d3c6493dffb86bd2002c70e92145b9b8711cc85e56e5bcc3fddc466f8752d092fa29d106bd2e374b9a8 SHA512 7a39621ed16cc1a736e7c642c11a72e9416aed76411ee06b8afd299b2d624b3f03430058545953eafdd45d51b8aaf9d7083123d1083639e1eab895c5a0452a52
+EBUILD gentoolkit-0.4.5.ebuild 2317 BLAKE2B 16f6a9a1570f4a5234a45c7db4422a0f05222adc0ea1e796ba01e84f2e685aa84c7c4e29d1271d111a62f40079ddac702106221f021c607c9c252ba9e6e270db SHA512 4d8181000ccb5e97b9acfbd03156bef80a839af092e181832a96641686b817daaa410c379b2e9d126f3889582d35cf5becc02112e549a36b54f5022f942b21b7
 EBUILD gentoolkit-9999.ebuild 2120 BLAKE2B d6e21de1c8f8cebfad004a31d3c234e65cbf844313b76e8cd88e20f4d8fdb0d07505b152bac05fd0f008bec746f4fff11a3a64cb8eeece2170d70e36a53f353b SHA512 d5f9fceb75be60c0bbf989f90b9f12824206ac665790555ec372c8cc7ea289dede2319eaa26ab11687ced634c530198d3d8cc3dfee68dd9842979fad6e7cbb61
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.3.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.5.ebuild
index 69b1afbe1c93..5e01ac6b8c52 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.3.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.5.ebuild
@@ -19,10 +19,7 @@ IUSE=""
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)"
+	sys-apps/portage[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	sys-apps/gawk
 	sys-apps/gentoo-functions"
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index 4ee9bbab3ca1..c2ed6580a542 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -12,7 +12,7 @@ EBUILD layman-2.0.0-r1.ebuild 1629 BLAKE2B ff95ce6ba92ce4d8b536260cb15149f786bee
 EBUILD layman-2.0.0-r3.ebuild 1668 BLAKE2B 9132c3dc910abfadf07e6fd9b3a69ea6234bd63dac873d20fd0235d3c35ba21991b2b97dc992d735a1b0452eaf44cb5eea7cab6678a977dce55c932bfbb685e2 SHA512 215e1136fbba7153772417deee4456b4174d0b551194f4ebeb3f29583315a74fcb4791b631c1049fb993218b2b8d6e30910366eaf935e4d0b010725488d7213f
 EBUILD layman-2.2.0-r7.ebuild 2169 BLAKE2B c6db6a0bb066ab4a505a8d24c6d255b23ef3da9c90c2a2cc47a54c8d2c5e94683bf44b97ab071c02ec37cf98be2cf507b84645039063ad5482bf646e7455e693 SHA512 f90f728d15f6d6a98a57612e691c2e1b237d2a7033cfaa3ce7e236dc3987610b42d1794ffe5c489309123acc53b5fc776ee7666cb4fe56878d7347427594d3fc
 EBUILD layman-2.4.1-r1.ebuild 2109 BLAKE2B 2c09406d4bd3679deefc851bba94f909de9563be0131e0a747203b8cff8bbb45fc9f3481103a279a140d39953f8cb863cb2d119f8b31381ba1deeed0d5bc7da9 SHA512 0b1cd552fd2cb6c4d5bddc781c8b0a7125364e8a5967b83e87fbaf914e4f9f6eccea3e3b0534ca2ef7ce9c11abf6847e43f2c7447d039624845cd568b0890a00
-EBUILD layman-2.4.2-r1.ebuild 2283 BLAKE2B 955519c30da06558e8612f62ea07c88cb02dda32bfb14b8c7eb8c581d793ae82be7d1e17774fc0673957eeb968bb407c86d89ea8cb8620ef9467757d3f0ccfe0 SHA512 cf7262acc6186ff2ef8bb9010bffbe8b1f4274cf0f731fd1be265c856b9378b4a5303825779c52222397c2eba6e421851ee9db880a346605e549b242ecd0db82
+EBUILD layman-2.4.2-r1.ebuild 2282 BLAKE2B 8d8a1a6ec6ef824d9f58e5f28855a62963022d49efbd2648bc4321c3d1424550b27a7300d4466e6ded387aecbce9479a69f5b6979bf26f31e628ca925de172d5 SHA512 cc545f2dff482af90532c9f0a2d41b95d70fc5097d52f79af059ccba93c062ac8137074f2497d80ab919758c0184a56f0f0e944ffe97812ce160695762f1346e
 EBUILD layman-2.4.2-r2.ebuild 2423 BLAKE2B 6821448ea82274d5154163593228b8ddeb67ec6ac3e050cfc90922d43cbe92cf38424ccde8f76c7140fb3e488bf2cdc51b2b745fb961fd761596e9b474484401 SHA512 deb59af455da2adb32d694465c1af1d685bf151f1968ab532a5f65479f5036c63987686d2cee6ea7ec3b0e0e92e0603a4f370d4736985e22f34ceeb288874fa2
 EBUILD layman-9999.ebuild 2423 BLAKE2B 6821448ea82274d5154163593228b8ddeb67ec6ac3e050cfc90922d43cbe92cf38424ccde8f76c7140fb3e488bf2cdc51b2b745fb961fd761596e9b474484401 SHA512 deb59af455da2adb32d694465c1af1d685bf151f1968ab532a5f65479f5036c63987686d2cee6ea7ec3b0e0e92e0603a4f370d4736985e22f34ceeb288874fa2
 MISC metadata.xml 1177 BLAKE2B 0024befce684e122216fecaecb3ccf2f2da44fa82a3f2c8811155861041009a0cded912e93a2d6e66884814afc8b1ccbe6f006b40b6e44cafa13fa0f53c90a4d SHA512 d41244afefdb11e5f68be2200a759e4209b2b59f5b9de083e79a522d5a10f12359f9fd6f30fd24f73d4e9b190a2f974f8e519cd22614dd2b023594952dba957e
diff --git a/app-portage/layman/layman-2.4.2-r1.ebuild b/app-portage/layman/layman-2.4.2-r1.ebuild
index 10849281e9e2..781d4cfae715 100644
--- a/app-portage/layman/layman-2.4.2-r1.ebuild
+++ b/app-portage/layman/layman-2.4.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
 
 DEPEND="test? ( dev-vcs/subversion )
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 52ea180cd6ed..83261ac38419 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,10 +1,10 @@
+AUX portage-utils-0.74-qdepends-Q-regex.patch 2337 BLAKE2B b277b8097559877c60093583b13ffc0e5524ac08ed75fc2cc8b98e46c8f11c54ed6a28607ef841249b182ad35d5a899e97d20588b7062ae19593c8cb30a824fe SHA512 f6c7e8bd264a8b20effce89f1d7938e4b98c7292cb7b806cd1b7be1bdfd879bd482fdb52ec4e80e72c059ea7a73f35b6a589d974bce03cbff503fc8e3dfcb35f
 AUX post_sync 190 BLAKE2B ad1a8705af98cc7d0122173e6edb821eb7be6f024fda5eb145d713fb0d43f475fb3f6c8582ecaca88f11852097aa1cd9b866e690ccdc760194a316b72d1ebb37 SHA512 0153d2931c2d2a0f03e74f75dadc14d115c0d0e50cbc43e17c1b05a6a406b4bf47435bd32d1b2f559ce6a576e24a30dcf47e8ea6d346371553560ceb055b4429
 AUX q-reinitialize 68 BLAKE2B f1c2cd5009f30018dfc2d508a627253c08fc6e74859d072b917a0518850b879ecd0318df7a86c8597d28cf4410312f757aaf5cf8780899180a5e2a9a906b1ac2 SHA512 d322fc0e3fd82583e9cfc6ffa95636134e4491e63fc1a1f34dcda58a1749c3ebcda97caee47bea4f44fb056c35c97e30819dd22e5c2ed8c936e0863466ebf6ae
 DIST portage-utils-0.62.tar.xz 527216 BLAKE2B ac8331b74998ddb86db55a937992447bccf60611cc259ceb5fe79918c1a43b6dc4633e4ad64462e2df5c39e8d8aa193bd57ab24dcd714e088357eb3cb177e972 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1
-DIST portage-utils-0.73.tar.xz 1585564 BLAKE2B b743f459770ebceaa86cc47b0a9d0172ee495bbe2930cd57c2909d3ac2d7c1672447e84240245e1b98922004f4f34418d75b39c7e1550a34a07b964b7ecbcc8d SHA512 d35af62e3b6551c5224a3afb89ebf2e08cf42de266389c3423782c19fcfe8934433a4554ea5ed629de495a66371f0220c479fa84f24d68655211b8538e18d105
 DIST portage-utils-0.74.tar.xz 1587792 BLAKE2B 7c4588e3d44266a5260df42cc685aa03c584248e9970956033e4191a7a842a4b2162110ac99c2bb18645aaafc6ae6ee960e9b26ba0a8863497911eef1e943f64 SHA512 cd3f44c135b3d44e15a95eed41281fce62f225a9d05d5d5bb1be230b2d59cdb87755f011b313a9ec32e4cafdf3b3979c4ef423365edd7dcc472ca2e38c09c83e
-EBUILD portage-utils-0.62.ebuild 2014 BLAKE2B 58941548aecefed7c7a4bee3ec9e60de24ede0380c4a6cb4e3184ff457fb07c946e792d3e60e2a16bef4897b287fd19f9315fdaea4012bc19220379763418812 SHA512 3fc3be2e3e29821cd26cb7d8a9e7e6a026e17c839308039ef2011700677e3f05e2322e367e737e822ccbf1621221f7ff8ca929c6f60817dfdd295981745cda1d
-EBUILD portage-utils-0.73.ebuild 1081 BLAKE2B 5e765d3f7e41b622fafd1424dde7541fcaa557832d26eb91b392d41401a1cf591be5498632eac2c83c217f0583a7c80507d86b343154e131b1eb74735f22fb45 SHA512 f0bdfd0b1ea3dd278ffaa8d66614b7750a15e5cf78f9ddca9c4c12ab40e58075c31639b02e1da58579140a25d23a2a8704f646cd3a9a4f96aa930bbe67062816
+EBUILD portage-utils-0.62.ebuild 2006 BLAKE2B c44402ebef59a344bfb3ed571a46b7a58dda17b3b1d231aee55c77d42a59c62ec5de69b595a67ca2dbadc568022f63385950964f0350303c65cecc5f541b36df SHA512 579f27018139dd0dda0781d7b9483ca4a467d069f6b0a8aa55a9786b8cd3fbfa78919b7fa6b85044f78bac6ad6ec896ec7bd990cb428d0dddf5bfeb1f2175272
+EBUILD portage-utils-0.74-r1.ebuild 1140 BLAKE2B d58ad14ab2c7f786fc36147436e68ba29bdd100c912538cc2f28ff8a54be4c0556a87cafc512cd62c2b3be50c9ba784cf4b5dbe184929f3684b39d5df4e324f4 SHA512 84b221b821b7beedc52d15aefe9646e571c66f4086e89c4ac8cee7cc398b19428eb09000ca033f0eaadeb84222c468d002c76ed84070eb26a5e7200572679445
 EBUILD portage-utils-0.74.ebuild 1073 BLAKE2B 813ec25c4030ad26b1b28294c268c0f3bbbe296488a811ecd2a8d87ea6bb7f1caaa9ecdee34f272e9cf5879cf3454506ad7a62be2d3e74b926cdd012e239be3a SHA512 fa9079a716b50a4caa61fba5225ec28a2fc4d8ea2c95cb8bc283434a7c96392fa9898537c6f98277860fe06a23fe02c255c17e54a2869e371235e094a99a8e4a
-EBUILD portage-utils-9999.ebuild 1036 BLAKE2B 5f8f0cd1f69b04ed5946ec0203a8a65becc1953e85058c079088dc9e965959aadb07c9cd4b749dae367cc20f81f09b6c2ec1de06bf328372b629d04f5c29042a SHA512 aa23862f72f5d25d54890c2b953891730658f07d1ee5d24a0d36f8f9a7ed02653e4d9d0e44e6a6adc909ae5247fb6b59a2a0aade1a1448c5f36c721b7965305f
+EBUILD portage-utils-9999.ebuild 1025 BLAKE2B 19c5e62767263aef9e68337535359d1c1c9684ab83c2c395b9ac26dfc5e5c2e556aa5b564f9780ed80d5a2eb2aebaf7349e5048186a48c2482404af4ab2d9b2b SHA512 0a0c5564b45eccf468e32493958ae7ecc00c7690ac3b4514458b2e9c8ed9aabe0d01419e456b0e5404ea5ca30d98a6c568b53e4da214ca9bbcb7812f93a898c0
 MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-portage/portage-utils/files/portage-utils-0.74-qdepends-Q-regex.patch b/app-portage/portage-utils/files/portage-utils-0.74-qdepends-Q-regex.patch
new file mode 100644
index 000000000000..6d10161d704e
--- /dev/null
+++ b/app-portage/portage-utils/files/portage-utils-0.74-qdepends-Q-regex.patch
@@ -0,0 +1,96 @@
+qdepends: restore regex matching capabilities for reverse dependencies
+
+The use of atom matching unintendedly removed the ability to use
+regexes, which broke app-admin/gentoo-perl-helpers.  This patch removes
+the atom matching, and reverts to using regex matching always to restore
+behaviour.
+
+Bug: https://bugs.gentoo.org/683430
+
+--- a/qdepends.c
++++ b/qdepends.c
+@@ -483,11 +483,9 @@
+ 	int ret;
+ 	regex_t preg;
+ 	regmatch_t match;
+-	depend_atom *aq;
+ 	depend_atom *as;
+ 	depend_atom *ac;
+ 	char firstmatch = 0;
+-	char *sslot;
+ 
+ 	if (!q_vdb_pkg_eat(pkg_ctx, state->depend_file, &depend, &depend_len))
+ 		return 0;
+@@ -526,34 +524,17 @@
+ 		return 1;
+ 	}
+ 
+-	aq = atom_explode(state->query);
+-	if (!aq) {
+-		/* "fall" back to old behaviour of just performing an extended
+-		 * regular expression match */
+-		if (wregcomp(&preg, state->query, REG_EXTENDED) != 0) {
+-			dep_burn_tree(dep_tree);
+-			return 1;
+-		}
++	/* fallback for old behaviour of just performing an extended
++	 * regular expression match */
++	if (wregcomp(&preg, state->query, REG_EXTENDED) != 0) {
++		dep_burn_tree(dep_tree);
++		return 1;
+ 	}
+ 
+ 	match.rm_eo = 0;
+ 	firstmatch = 1;
+ 	do {  /* find all matches */
+-		if (!aq) {
+-			ret = regexec(&preg, ptr + match.rm_eo, 1, &match, 0);
+-		} else {
+-			char *loc;
+-			ret = -1;
+-			snprintf(qbuf, sizeof(qbuf), "%s%s%s",
+-					aq->CATEGORY ? aq->CATEGORY : "",
+-					aq->CATEGORY ? "/" : "",
+-					aq->PN);
+-			if ((loc = strstr(ptr + match.rm_eo, qbuf)) != NULL) {
+-				ret = 0;
+-				match.rm_so = loc - ptr;
+-				match.rm_eo = match.rm_so + strlen(qbuf);
+-			}
+-		}
++		ret = regexec(&preg, ptr + match.rm_eo, 1, &match, 0);
+ 		if (ret != 0)
+ 			break;
+ 
+@@ -571,18 +552,6 @@
+ 					ptr + match.rm_so);
+ 		ac = atom_explode(qbuf);
+ 
+-		/* drop SLOT when not present in aq so we can match atoms
+-		 * regardless */
+-		sslot = ac->SLOT;
+-		if (aq->SLOT == NULL && ac->SLOT != NULL)
+-			ac->SLOT = NULL;
+-		ret = atom_compare(ac, aq);
+-		ac->SLOT = sslot;
+-		if (ret != EQUAL) {
+-			atom_implode(ac);
+-			break;
+-		}
+-
+ 		if (firstmatch == 1) {
+ 			firstmatch = 0;
+ 			printf("%s%s/%s%s%s%c", BOLD, catname, BLUE,
+@@ -615,11 +584,7 @@
+ 	if (verbose && firstmatch == 0)
+ 		printf("\n");
+ 
+-	if (!aq) {
+-		regfree(&preg);
+-	} else {
+-		atom_implode(aq);
+-	}
++	regfree(&preg);
+ 	atom_implode(as);
+ 	dep_burn_tree(dep_tree);
+ 
diff --git a/app-portage/portage-utils/portage-utils-0.62.ebuild b/app-portage/portage-utils/portage-utils-0.62.ebuild
index 2ec9b75f23c2..28eb664c0b5d 100644
--- a/app-portage/portage-utils/portage-utils-0.62.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.62.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="m68k s390"
+KEYWORDS="m68k"
 IUSE="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
diff --git a/app-portage/portage-utils/portage-utils-0.73.ebuild b/app-portage/portage-utils/portage-utils-0.74-r1.ebuild
index 26bbfdf95355..4f2fd4df0749 100644
--- a/app-portage/portage-utils/portage-utils-0.73.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.74-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
@@ -20,6 +20,8 @@ DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	static? ( dev-libs/iniparser:0[static-libs] )"
 
+PATCHES=( "${FILESDIR}"/${P}-qdepends-Q-regex.patch )
+
 src_configure() {
 	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
 	if use prefix || ! use kernel_linux || \
diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild
index d2afd91deb57..224433e36f2b 100644
--- a/app-portage/portage-utils/portage-utils-9999.ebuild
+++ b/app-portage/portage-utils/portage-utils-9999.ebuild
@@ -28,9 +28,8 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	default
-	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_configure() {
-	econf --with-eprefix="${EPREFIX}"
+	econf --disable-maintainer-mode --with-eprefix="${EPREFIX}"
 }
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index 24fab52d3bbe..4f4be5a10c95 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -7,5 +7,5 @@ EBUILD portpeek-2.1.21.ebuild 685 BLAKE2B 30cacee4e050ca964f3f5a14f81e3cc15943c6
 EBUILD portpeek-2.1.24.ebuild 687 BLAKE2B 0d6ebabb7c982b78d4ad4fdfb295cce7748e25acf2ae29c69351f44c6f1cbc4bae1f8fedd56c70dc4eec5b338d6f26885eea5d26ce89af9b5f2bfb8697f153b3 SHA512 d024cc7679a47a687e1d8e2624a3e9dd901f8ef2a6e7605153e1c6022c1b5e06c11aff0b7f1eebb6b19c0ebf327e32c16b66cd7a13c64782255b70fc8a91c3b0
 EBUILD portpeek-2.1.25.ebuild 687 BLAKE2B 5a96d5261bd807434e9a39a6deaba6f2f1bf9359891f8d47dc7ef11c1ebdb7644ca3a684efb334eb1376d2579d9b7c51ef4b1437cfa4aeb80a48ad439e998c6c SHA512 2baaca14101b0e8a6d709f7761d3f58d2cf5e7fffa38bd35ae89ccaf5a1dd9ed9846d03120b0d15b5ed706e44717a0af3120d9b95c492c7cecc609666e985ec1
 EBUILD portpeek-2.1.26.ebuild 711 BLAKE2B e7f5fadbbbcd46824b684a9d0081114e1d351e27bf6e84500533ddd4fb195397bf9ab9e77b6903fe0d435c7f3b13097e292896205b47db2b73afa6a012558ed3 SHA512 2fe8b282bcb8ec8690f569024c5be883bafbbeac82ea5aa7da7db98e6710fd6d76fc0e21fb1d2167a8e063041fa1c8382c9f46cc4212e3ce4c2f341eef6a22e6
-EBUILD portpeek-2.1.27.ebuild 710 BLAKE2B dedb0010e2b334b01d183af5b14cedc9f4b3e123fbe83b4bee925d77af2a474b215791c1a3537eaa8a8e8598f2539c903913bb47b1a7b08a73f32ac9774e8d5d SHA512 6a17365090566c03efb8014ef38a2a4de2c5453df3b227c1f71070bc54126a6a02f2a7cc6b6699d4c08b8ff5162d53fce2b92558b3cc61bd1f3a9dca542c0cf8
+EBUILD portpeek-2.1.27.ebuild 709 BLAKE2B 0605e5a56036414b6a375fefbf2cbb78e202cbe584481d6d02b7d99ea1aaa0c0532fcb044b6bdc0852d709c75bf5080a30638f9f3cc4fcb348a7327f0a67bf43 SHA512 4bdcad977e17401a7a5973e4a6d3c8f80a1bbe15ad23d879a55c4fc449b8ee7e737137830eb41f1ab10098de3050a4313dc4f2d450ea24c70d1f9d86b6fa3aab
 MISC metadata.xml 222 BLAKE2B 5192d31072923545c8f760f9c3b3274f610b7a94a53cf55bc85c5c20a953b227b7cdb64cb5f5921b8b2822ec6563479b5d4883ec2b569a066d8ab569713fa8be SHA512 3d793038a1abf5bb86eeb23fee623f27db1d8e529372adc51eb4ffd1d0c2deb6df1c4d637954cc68e07d590c25e3d74a8437d02c1864a21c96f63597192cfef9
diff --git a/app-portage/portpeek/portpeek-2.1.27.ebuild b/app-portage/portpeek/portpeek-2.1.27.ebuild
index 451238bc52dc..6ce42080dd2c 100644
--- a/app-portage/portpeek/portpeek-2.1.27.ebuild
+++ b/app-portage/portpeek/portpeek-2.1.27.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ppc ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-portage/pram/Manifest b/app-portage/pram/Manifest
index dd89a51bbfd1..95705946333f 100644
--- a/app-portage/pram/Manifest
+++ b/app-portage/pram/Manifest
@@ -1,7 +1,5 @@
 DIST pram-3.tar.gz 4334 BLAKE2B f06f9cfe938f83702baaa8f8bee06937e8790e533e14ab419251934d0f4300ee75d5377a4f4e0e47a774bd3c25ef31236d7e451b929cfbfe8343d226a311ca2d SHA512 526149523b748b57095ecb3eb23f6808ab57ee1d8dc60e27067931d269ce3465ad8a0e54e8edaa3a1f74fd0a8dd135fe4a92779382ba6e367112016bc254fc98
-DIST pram-4.tar.gz 4406 BLAKE2B c01a8d322f7449398ed0264c9ed4108ac9fc697ef68e5dfc035fb20a53f5c5f9a42e9155937a4b6b6722816779c71dbe4558e7e60e8c19dcf961667996380802 SHA512 00a1f4e0cc07c5b61026e42350212cc55a66b6597082ee677bc905f9bfd0f5692a830c62f15a66a5ba42942449f40b92544f740344ad1d064bebc667c6f730e1
 DIST pram-5.tar.gz 4443 BLAKE2B 0c5d1ddfa44944e8480cffd0b4f49d6143fff36ed690c9e7c0acbdd54ae6ea50b6c1610c65914c2626a260c9de1084b42e101ca38952a3e8fb9264663c3ad00c SHA512 7634bcaac11c999e2ef01d5e12305d96032396ce624cc6085b4954583aebf6d54f0a1155604863d1aeda1c2bdf17ddcfd81b833decddfbe11eb8689297c70b23
 EBUILD pram-3.ebuild 493 BLAKE2B bed413200050b99fd437dddbc02048e966e7c81f35804475e8e174ef3298647cd1a84c402deb2af0090603e1e03c0f7b8ffe616e2eb01616b7165e82f3913e98 SHA512 201dc579fd7918a6044b0b1938b74211afe19a6d50ae3d12d72017dd4695c5fe3b737135fa57c7768b8b1bfdf7859a971d0663ae5821b983609395cbd977b730
-EBUILD pram-4.ebuild 495 BLAKE2B 564ab559666243a00b0484e74608cec8d1cbe75fed20c86b7532ba1b2563af221e1dc9600ee4cda700093cd7291d62734e4ae8fa86b9c36c209eb14f15bce8fc SHA512 a5c13b3f07a9b4190c14f4c2ab23d28a060a6e48feaa1d0775aa950232489bb4343a35df91bcc1aa1e31d87f93c4f69d56977dcad7f86cbbbd35536c5177ed33
 EBUILD pram-5.ebuild 495 BLAKE2B 564ab559666243a00b0484e74608cec8d1cbe75fed20c86b7532ba1b2563af221e1dc9600ee4cda700093cd7291d62734e4ae8fa86b9c36c209eb14f15bce8fc SHA512 a5c13b3f07a9b4190c14f4c2ab23d28a060a6e48feaa1d0775aa950232489bb4343a35df91bcc1aa1e31d87f93c4f69d56977dcad7f86cbbbd35536c5177ed33
 MISC metadata.xml 521 BLAKE2B 666d2a5e1366b0623f3ee47cae65ec248612729ffd0d39b009f0bb95ea79fefb1b0fa3343eff98841d2b1b0f6ccf03c6579370415cb4240441cff5f942557ed5 SHA512 36326936f659a738a0a7a0d1e7b6388820e4f19acf29dbd9efa646cdeb7ad65814b509f9619dddb822fc012ea8b2e06258d2887c5825283db6c77365a6fdc77d
diff --git a/app-portage/pram/pram-4.ebuild b/app-portage/pram/pram-4.ebuild
deleted file mode 100644
index d5151395d54a..000000000000
--- a/app-portage/pram/pram-4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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=""
-
-RDEPEND="dev-vcs/git
-	net-misc/wget[ssl]
-	virtual/editor
-	!dev-perl/Gentoo-App-Pram"
-
-src_install() {
-	dobin pram
-	doman pram.1
-	einstalldocs
-}