gentoo resync : 21.05.2019

37 files changed, 64 insertions, 243 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 3a7f956a91bb..25f0fe60e9d3 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 677302b70c44..8385ece773bd 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -2,11 +2,11 @@ DIST ansible-2.6.14.tar.gz 10732165 BLAKE2B c753860a521c37357c7a5042391957680865
 DIST ansible-2.6.16.tar.gz 10738431 BLAKE2B b801eb524f631950c385f7a949bdeae288e95d1590ea96f98e955f6ebc4ccfc5970e3926727850e7ef13fbcd7118ad6388e516a8fe62b53f1bf8b4d5b484dbab SHA512 ff67803cf6afd512ab779b7c862d4427591c90bb0ed9391e32fc8ea30c24c70cc31c910c9af51b4dd423885f858f65c1c8d6274565c90296ecd7a00df3374977
 DIST ansible-2.7.10.tar.gz 11844278 BLAKE2B c847b642ebe4cbc2194538a0b194cd5c0bb82e0ba2a6da2e272670c75596b9793e028d067ddb37000c07f2c2427b5b99248b16c544daed4976c0210b601d3c97 SHA512 4d58ef080c8ee02ef36eb3116ec89e4542b5b4042262953b2001081601fe1066237191cce5e647f354efa9e1933cf5010519d049e678a90e8ca08620cd1788a5
 DIST ansible-2.7.9.tar.gz 11830476 BLAKE2B 7688ce9f74b0ab1fafd0e31dce90d995a9d8ca90bbe436f2d4ee9d005069b6e1b2c4dd679c2430a6873233da54ae06d3ebf08736681ec2e59e5b3ddafa6bb1e2 SHA512 4d39c7d4eb97264ce8f92812fb986b24af0c663efa6d8cd1d9a4cb25731d55e7518e503c04764e62d0458916b601baaa7acc623f9f83ce8b93e7f22900e29a53
-DIST ansible-2.8.0rc3.tar.gz 14280884 BLAKE2B ccce66a66dd4567686b936b6bc7578b0bbbf33f4d315e4606c5dc1c317801b0e41a94263a6c94b6d17e2a5c3a51d7378bff2120255bfa597156bbf5254ad8da9 SHA512 bb9e2a885d2f19ed8b477d65bde636d7d3fe1540b1a5c6b84e5ce38d35973a68bfe7ffd8b43a8daa5b82bedcbbc4b3392eeeefb264b98cadb03b6f8fce2e4bec
+DIST ansible-2.8.0.tar.gz 14285827 BLAKE2B 090c314e0c707e24ce4c21722bfbb34d18d95e6e8cd63b06af78e41fedb3183adbdf6718da1bb8a2c7037f9ea9ffffb96add17a44cb199d0c000c1d6f88cd53e SHA512 fab8a0ac00e947e47ab606bee0a15e8c031f900b5e6fc68540429db0035ffdf3144e18e1d2265ac07bbea0a78873b85c43e636ee51ecfe14f3d612d2c54eb29c
 EBUILD ansible-2.6.14.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
 EBUILD ansible-2.6.16.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
 EBUILD ansible-2.7.10.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
 EBUILD ansible-2.7.9.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
-EBUILD ansible-2.8.0.ebuild 1739 BLAKE2B 1f3f8caccfbd9a0f88d3646f3eedc8a35d1234e294a6baee468df5cbe505ec28779ba7c00b674046ae7bd42e412aef4672e8e053fad1c1b79af770f8bf647ef5 SHA512 71559a8fe3090bbe8bb6c16252d711bc56d878433a3c656b48ecdd34d8f50e5ce80ef3973590e6b330697711d95a39b2d46c5c9a32192472ec7e566a21748678
-EBUILD ansible-9999.ebuild 1638 BLAKE2B 40aecbf314bb9e743fb7543c696a271842955853fe981bc4dc69293dcc9905e950a743a56398b0815e09107db801ba554b68ad9511ccb9e25dd3dec0f0b156d2 SHA512 814b1430d499d2e6f50879c41b1a51e07b5e5a79355deab730e26b9e9a28f9ac94e2a46b884a5e0e8ed4a12d7a74bbbdffc0a55b8e120b438c91aeb9e7ae718a
+EBUILD ansible-2.8.0-r1.ebuild 1663 BLAKE2B 45885bbb6444622d27827ad2243ce05aa2062bdde7e545aea5617b1c3979c088ea4565e0ce07f9fda2e9bc14bb819aa89954d51bb3eb1a287acbec1da0792d54 SHA512 e679d5e32060071736fd555ef68d44d8ca28e44cdb8229f2c79019f5c05b36fc8d095b33ff5e651d89d9a07007401178024593b3f6e4ac055961a3eecdc36af6
+EBUILD ansible-9999.ebuild 1654 BLAKE2B eb0aa61cfa0eab600a18d26cf8d7060be0f93cc0413a844ac5e6a9938010b52d77a0ef28a2b36b802e7e8deba33caf5c4f6659410c2d74b13a13f92d50c0106a SHA512 040e5403acec6a13ca5042a3840480c4993eff4beef319229bd761c3a46cb673473d9c0297be176a3806f4cc15b30586a8af5e7743778de36d19d16dc5512b79
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.8.0.ebuild b/app-admin/ansible/ansible-2.8.0-r1.ebuild
index b02d7718efec..e6b530db760c 100644
--- a/app-admin/ansible/ansible-2.8.0.ebuild
+++ b/app-admin/ansible/ansible-2.8.0-r1.ebuild
@@ -9,13 +9,13 @@ inherit distutils-r1 eutils
 
 DESCRIPTION="Model-driven deployment, config management, and command execution framework"
 HOMEPAGE="https://ansible.com/"
-# don't forget to fix also ${S} in the next bump
-SRC_URI="https://releases.ansible.com/${PN}/${PN}-2.8.0rc3.tar.gz"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
 IUSE="doc test"
+RESTRICT="test"
 
 RDEPEND="
 	dev-python/paramiko[${PYTHON_USEDEP}]
@@ -43,8 +43,6 @@ DEPEND="
 		dev-vcs/git
 	)"
 
-S="${WORKDIR}/ansible-2.8.0rc3"
-
 python_compile_all() {
 	if use doc; then
 		cd docs/docsite || die
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index 5beb3f4d23f8..7d03f14a7d67 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 IUSE="doc test"
+RESTRICT="test"
 
 RDEPEND="
 	dev-python/paramiko[${PYTHON_USEDEP}]
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index 408df237b8ed..85de9e8a2955 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,5 @@
 DIST exo-1.2.0.tar.gz 3281293 BLAKE2B 15875c98b8470a003a6c187830b470ed739c02877e29197a296878db25ab567014bcdcc615c7d2ca5cb3c77fc85833261ef68774af69db58458566d6727f886d SHA512 308893b339a3749f523d7f2e33942050ef93958b97b3f652b7af49a4aa6d3b3faede4091aeafe1fb21da082f01d829da2c7fd1881fa14c1f7695854df80ab451
+DIST exo-1.3.0.tar.gz 3282243 BLAKE2B 3310ff4abc6f416033f51892742714097af2c7d668e1214897d107a9c1adf8bc06530a54e92ebb4bf1ca0a3d9ed9022a49ea4f316ce26a48d70f8ffac707e1f4 SHA512 3225ad4a6636ddf0cf193de6fb493d222c28a59f4467836d02112ea4934c15a41e6bc661982085a8541f9c090c5f112a979222fc6ff6955336bfd07ae7077ec4
 EBUILD exo-1.2.0.ebuild 545 BLAKE2B 1e55be70abe5f2e18f9db5058bbe72eda356212f9f698c7c9f5130d40a3da55e466412bf173952f0255370965f46b9b2af1faf8cea448c52bcef36fddcc57b1f SHA512 72e9a1fed8dc44277c4a29f71837cda8ae9a8e9ba591d78918e860122630fe6c800f4aa49d4dad62f97ee4d216212135ec9de61cc5acc8a2747a3cbf3bd00661
+EBUILD exo-1.3.0.ebuild 545 BLAKE2B 1e55be70abe5f2e18f9db5058bbe72eda356212f9f698c7c9f5130d40a3da55e466412bf173952f0255370965f46b9b2af1faf8cea448c52bcef36fddcc57b1f SHA512 72e9a1fed8dc44277c4a29f71837cda8ae9a8e9ba591d78918e860122630fe6c800f4aa49d4dad62f97ee4d216212135ec9de61cc5acc8a2747a3cbf3bd00661
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/app-admin/exo/exo-1.3.0.ebuild b/app-admin/exo/exo-1.3.0.ebuild
new file mode 100644
index 000000000000..ebb329b957ff
--- /dev/null
+++ b/app-admin/exo/exo-1.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Command-line tool for everything at Exoscale: compute, storage, dns."
+HOMEPAGE="https://exoscale.github.io/cli"
+SRC_URI="https://github.com/exoscale/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+DEPEND="dev-lang/go:="
+RESTRICT="strip"
+
+S="${WORKDIR}/cli-${PV}"
+
+src_compile() {
+	go build -mod vendor -o ${PN} || die "build failed"
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/app-admin/gentoo-perl-helpers/Manifest b/app-admin/gentoo-perl-helpers/Manifest
index 28f21be4aace..025eac7200eb 100644
--- a/app-admin/gentoo-perl-helpers/Manifest
+++ b/app-admin/gentoo-perl-helpers/Manifest
@@ -9,5 +9,5 @@ EBUILD gentoo-perl-helpers-0.2.0.ebuild 1218 BLAKE2B 4baf35b2b995c5bacf1cccc464e
 EBUILD gentoo-perl-helpers-0.2.1.ebuild 1225 BLAKE2B b8ae3e131353a8da9c3194ce8bae01c5c2d4593b3c842cfdf5acd15d0e99098056c16e9462b9eaf1e4c531bd4b512f951becf87742a00931baa8dba8302c62d3 SHA512 60a21a692d621e44e0592576112d66ba14fc01b86874678ff56ee843cc27dbf1ca95d849b6aec6040ee76e0a58add2d07445d2be9be4293e61821464f1c4e426
 EBUILD gentoo-perl-helpers-0.2.2-r1.ebuild 1255 BLAKE2B 117575619f67a68822e1e3f349447befc0f9b3e3b312297f1ba91a136904d4afb730eea2a170ba660a6441ccfdc92c8f44b42cdab7911e433a69b9499e94cf70 SHA512 62e682d07a9d61746378e7f56adcf7bf624b1f41a30065b2fb246ca008d39876cb03152bbbc23d5225895ff735d5479f53125d4b8f428eda6b8a7dfe2049673c
 EBUILD gentoo-perl-helpers-0.3.0.ebuild 1255 BLAKE2B 117575619f67a68822e1e3f349447befc0f9b3e3b312297f1ba91a136904d4afb730eea2a170ba660a6441ccfdc92c8f44b42cdab7911e433a69b9499e94cf70 SHA512 62e682d07a9d61746378e7f56adcf7bf624b1f41a30065b2fb246ca008d39876cb03152bbbc23d5225895ff735d5479f53125d4b8f428eda6b8a7dfe2049673c
-EBUILD gentoo-perl-helpers-0.3.1-r1.ebuild 1291 BLAKE2B d76e24b40ae645f75ca7108911f458ed28c855e4f05129c08cd7425be14f513b03066dbbae4e9594106b15b1105049b9052ee26aed26d4d5932a37c327cfbf72 SHA512 b3a6dd3eb1698d8549b71ae7503d3bc9c33ad034bb54562f20becfdd856b0f3921e1d74e1d5df8be9fd8cf25e89f7ffbca5a6f2beea7de0704e5028aef3496d6
+EBUILD gentoo-perl-helpers-0.3.1-r1.ebuild 1255 BLAKE2B 59495c331a5363515ee725ca8ed048454023aa5b68db0d28e11d3d10df091a06b8790e5af778da55525bd04266e8107060f0a626c318582bfee92dcfe4f3aca5 SHA512 2dad7ad8fb595480d533a31e6c4b2c79b0975aec0e1782e17e3ead8e10ea3298217f66f2665977f511d9feb5aae536e74979a9d5cddca8250008a157c8aa937c
 MISC metadata.xml 453 BLAKE2B 0a9ea49a54e1b0ac4c4d98615b15251770556bfe672eea650b8b52ac7dc9a0492d3456b894b8724c033aa272567bb0c7ad4847451ed3f29fd5aa365ea2e2d315 SHA512 a32d375d6aa0ac38a20cdec805c887be0d6493be5d47572a0e950e1f4a8b28018ab364cd06668ff59c52fe89487853c9c4bffdf05b79913c691d99fdc848b201
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.1-r1.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.1-r1.ebuild
index 345b7fdce83a..fb9e7711d383 100644
--- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.1-r1.ebuild
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.1-r1.ebuild
@@ -27,10 +27,7 @@ IUSE=""
 RDEPEND="
 	$(: --format support)
 	>=app-portage/portage-utils-0.60
-	|| (
-		sys-apps/portage
-		sys-apps/portage-mgorny
-	)
+	sys-apps/portage
 "
 DEPEND=""
 
diff --git a/app-admin/haskell-updater/Manifest b/app-admin/haskell-updater/Manifest
index f51d3270f561..9c98b2f33f5b 100644
--- a/app-admin/haskell-updater/Manifest
+++ b/app-admin/haskell-updater/Manifest
@@ -3,7 +3,7 @@ DIST haskell-updater-1.2.12.tar.gz 26708 BLAKE2B d0b040cb3b6211b3c5c60f8cfa3dbcc
 DIST haskell-updater-1.2.9.tar.gz 26675 BLAKE2B a3d11cdcee886a07d87cd2888a9deea1d963b7234b4a10a6b78e9467fae4e9382c92f14a6ba0593f86bf9422ab2cb4bec823de96f34b463590ae18429c118edb SHA512 d19b6154d5ef4da176638c237082586688e2ac73a41c075fc3e51979b86b9e48ca5a9bfe6c870d468d66d95c1464456feed8afc388aea282aa7aad5a35f5e0da
 DIST haskell-updater-1.3.1.tar.gz 26573 BLAKE2B 68e5357e8f24b9b372dba4feac76595cbf35602d9d9094d616497c9d0040177b5f1def5833770041b693220717f3a4976877e0608858d5d8d4dddd26620c71e5 SHA512 39c36c4a8997806bb4d64625bc9ed72334a68e57f8c32f75d0c3704ab52b3b68605444c89480e5186c04bb275b3608ea9544366ebc5a00e010cc5fb4ae8296df
 EBUILD haskell-updater-1.2.10.ebuild 1076 BLAKE2B a21ed61a21f62a06fb3ef9702b7bd82f696646c71a84e49f19a94250cd16701cc1aa18a3e0151a09df973c442957ae8f025294585916f66f82c88a6fa3045ef2 SHA512 877d611303b52feade51b60fcaca3513a20e5173235d78a65fd78988655ff6d76f0a2b51267549473e84374ef331c7231b25486af28951c3f46a616332f78b2f
-EBUILD haskell-updater-1.2.12-r1.ebuild 1119 BLAKE2B c113e890a1375d3bd70a4cc94afebac0f9217206b8bbeb41811d9880cf03d156db293639c4d86423ca3ed6be0147a787a9ed67d101f6b0b9b87664057b16df99 SHA512 bf33e4b6f45689d4763a3ac88bc6d35f28f8cc5d4ccf6dd2e509c8ac05912905f21735f690d83ca833cf1ed85859c1acffec4a35cd7459e0cdb7303b5c5a2d4b
+EBUILD haskell-updater-1.2.12-r1.ebuild 1093 BLAKE2B 9eaf109b857302eb065310c67e0f93b583a9a4d1d18683f78489a0f1dfe96bf29a2fb87fd10e14cab9abe5ded2277d7e4638e7c3c25186182b337dd748a45bd9 SHA512 274d02b8d3e2430b677c8b942f6028e6bcc6b407856d86a0a924d94c1ebc8af54cde249d77493346aee90000c2a3796cbcf447d9dc222748e43b00192983bf4e
 EBUILD haskell-updater-1.2.9.ebuild 1076 BLAKE2B a21ed61a21f62a06fb3ef9702b7bd82f696646c71a84e49f19a94250cd16701cc1aa18a3e0151a09df973c442957ae8f025294585916f66f82c88a6fa3045ef2 SHA512 877d611303b52feade51b60fcaca3513a20e5173235d78a65fd78988655ff6d76f0a2b51267549473e84374ef331c7231b25486af28951c3f46a616332f78b2f
 EBUILD haskell-updater-1.3.1.ebuild 1093 BLAKE2B 9eaf109b857302eb065310c67e0f93b583a9a4d1d18683f78489a0f1dfe96bf29a2fb87fd10e14cab9abe5ded2277d7e4638e7c3c25186182b337dd748a45bd9 SHA512 274d02b8d3e2430b677c8b942f6028e6bcc6b407856d86a0a924d94c1ebc8af54cde249d77493346aee90000c2a3796cbcf447d9dc222748e43b00192983bf4e
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
index 9391ee6188a7..7861b7114a80 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
@@ -19,7 +19,6 @@ DEPEND=">=dev-lang/ghc-6.12.1"
 
 # Need a lower version for portage to get --keep-going
 RDEPEND="|| ( >=sys-apps/portage-2.1.6
-		sys-apps/portage-mgorny
 		sys-apps/pkgcore )"
 
 src_prepare() {
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 6ae98ee6c004..967dcf14e304 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -17,4 +17,4 @@ EBUILD logrotate-3.13.0.ebuild 2543 BLAKE2B d79fec2304b6b52ec1cc064fc40aed2054ed
 EBUILD logrotate-3.14.0.ebuild 2511 BLAKE2B c824de62f72544448b54948e5025b0bfee7be00b9355be4e5c64d51721efc064dacec319f9de4e93c61a7aec2bd70c4d0515a693be375d35c16c30cb1a2b927b SHA512 e088a56371b59e4d10f4ea5574ba12985b9b7fe81de11624cfb302fee0bc08581334230776aaca74d67d9ca160dad4301f06b14e5c608c26ecffccbf370a252e
 EBUILD logrotate-3.15.0.ebuild 2491 BLAKE2B 54d0c42640b5bc52d8a06515dc93a8fb3882e5bff1307ff83ba61c02022f5a798646e56eb3eac11edad9b1d4a347a792401a155e8782df4bfe78eb782d429043 SHA512 ca4f7eb1af6d0ade04ff4917b254bb63b733daac0bcffc758804c2f15478a8b8c2ea6715fd10ace0f09966557f3d6999fcfeddcd9fd22cae6594838507fa5f08
 EBUILD logrotate-3.9.1.ebuild 1767 BLAKE2B a59f23a8a0a24b416f23a087c60fe046260cc24521f68f2551bb2a2821d12e94307e2d620ec4b625cd1b6be21cafa3d2c0f044468dbc2760897e5bb7854ac7af SHA512 ed808392727749efb6d20a410810f6eb9cb364db2e11460f4c2940abd0fb1d7430b75102f2fcabcaf64e8818da39323010d2a5d223df49c705a6171acf541a03
-MISC metadata.xml 1119 BLAKE2B ddb2266925506c260c4b3f67e4dd906d9446a17a54b5a0ffce547d3c942750ead45dd1cfdcbae548a096d87ee1e247fcda9bcb81e83b829f0526d4bfd7b4a01d SHA512 99725d54d1cf68b257446ef8afc43d4bfe05cc789c818222d603012ae1e636624962c23a845f8858f4fc7aaf5a7e7f8085a7b173185ba66d7e390012dbceef79
+MISC metadata.xml 1041 BLAKE2B da5759183dd7920f1b9eeaba5f210be086908a445239af3fd519dc7eab50caec35192a41987034c322a2e7decd6351444c551e552cdb99e1ec6a3371b0d5a14c SHA512 ac85df0dd82c18935ebd554d78993e9f57ba0c5684cbf5e85041b3f8ccc5e23f5c95e0d207255cc61bc1355f66f79b9802429ae581de66c50f9fd0cde5aa199d
diff --git a/app-admin/logrotate/metadata.xml b/app-admin/logrotate/metadata.xml
index e5648d41d70a..7ace94cc2ebe 100644
--- a/app-admin/logrotate/metadata.xml
+++ b/app-admin/logrotate/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>nimiux@gentoo.org</email>
-		<name>Chema Alonso</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Logrotate allows for the automatic rotation compression, removal
 		and mailing of log files. Logrotate can be set to handle a log
diff --git a/app-admin/mktwpol/Manifest b/app-admin/mktwpol/Manifest
index 1370ed71a47b..8a07df1e6ad4 100644
--- a/app-admin/mktwpol/Manifest
+++ b/app-admin/mktwpol/Manifest
@@ -2,4 +2,4 @@ DIST mktwpol-1.0.0.tar.gz 59748 BLAKE2B 954d86774bf5e88612dc67f0ee29b637da188f64
 DIST mktwpol-1.0.1.tar.gz 60491 BLAKE2B 66d7db396bbf7e5b2c4dd537ac9bcd387298ae733348b63c6d5cb6df79e9440ea751c27eccec66978371fa81a17929d25fcfbeca6787abf8b49f087b54a6468d SHA512 aa44af97533f130b89b83c6f2a8878d290770b677f6fb9fe654b033f57fcfb3d063a6a6ddf29599aa066452d75911cf8053d65b21c37e322851a10f4381cb33d
 EBUILD mktwpol-1.0.0.ebuild 1327 BLAKE2B e526b80f8c99b1d6f899f71d4284189ed3c6e5b5bd45a80ecc1fd735376c3d7f8b2607917e84bd3e93e87c04850f1db76aee721992fcf40708d9e5802b5ff966 SHA512 5af5b285e3cd9cf4197d7b30c485339dac7dcd0ecb7499e320e1df24514827995d2d951b53b669dee688bad0577aa004d9fed27dce7c0bc6b66a0b57a71179fc
 EBUILD mktwpol-1.0.1.ebuild 2247 BLAKE2B f6ea333d2a4c69d9eb5095eed4aa2d0612cad2221c83db9b1aff97d0bddd7e06a9538274e58ec0297049984e8c6cbcfb194102fe8078da5238fbc72456179505 SHA512 83eb862e31aae103eb629789b25fff0df6b5d795621696c0dfd6fd749125458f1157bf26c72a43aae6145201ee28b3b0930a58e54ff23c8de2f9ff0e00074c4a
-MISC metadata.xml 1814 BLAKE2B 40c3405ca2533e816785d8fc2549895f42e2748d2826a5bde48cd9d7ec6370d5f306609e2032db287ed74ff7224711cc6a508d9afb4d80a85dffa02e1a3b4d58 SHA512 861a3e0c87dee0750caff734aa96708c72d6cb8a79b33a29b8aff5442b11e3e9855beb3d80428f3d6ab91542b3d1df033f55dc6942150d1eabc02fff46139e50
+MISC metadata.xml 1736 BLAKE2B 20ff68ca7302bd5a8918c5b8befa447e8bb9cf908d2ad0a01fbf9ed0bb7f0823c0571d945906dbba7750fe650abcf0c93f516f81a0532f8b3bb25976dd5eccf4 SHA512 80690242944a3eb26ee4a5766b310c4ece95d24e6fd07d66c4cacba17ff8d6ce507d52e09a470c734acbc4757f9e41064440b302d5d65c1d39241ee293b1bcba
diff --git a/app-admin/mktwpol/metadata.xml b/app-admin/mktwpol/metadata.xml
index e635c47b95a4..7fc329f5c9b8 100644
--- a/app-admin/mktwpol/metadata.xml
+++ b/app-admin/mktwpol/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>nimiux@gentoo.org</email>
-		<name>Chema Alonso</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer status="active">
 			<email>c.cboldt@gmail.com</email>
diff --git a/app-admin/openrc-settingsd/Manifest b/app-admin/openrc-settingsd/Manifest
index 4dffd1abece8..06a9825fed58 100644
--- a/app-admin/openrc-settingsd/Manifest
+++ b/app-admin/openrc-settingsd/Manifest
@@ -1,4 +1,3 @@
 DIST openrc-settingsd-1.0.1.tar.xz 243552 BLAKE2B 2abf084c59ef310ca72bf2d528c6f8f04b3a502ea421247989e5356e759f2850f1749ffae7592ff30c92a0496db01e9d5e55c2a4ae9dbd3a9954414d4eabd31b SHA512 1f04a4b078a5fb659573daec0962f819af7eaff17a6213c4881726833cf32becd71dd820cd63767e2933465df26b3e4a3475d94f23e203a6977298965c709b21
 EBUILD openrc-settingsd-1.0.1-r1.ebuild 1425 BLAKE2B 5b90cb066486b0a14adf524197f3c12a40fd6faa92546bfe1e9afb9e27d634eda1d28a8f43fd679ba3dcb09e0ff3fd3732763f5493d0d60ab704d1b4e4e04567 SHA512 da50ce60303a346201fe1333126e34cc7faccb326ca746f060da418fd90acef6d420a6ece3731a045424e18b39e1cdf4759d74c54270d6bb3783fbaf093bf600
-EBUILD openrc-settingsd-1.0.1.ebuild 1318 BLAKE2B b2c6e2d8e24600bc262a8560d88643e088a1136249e2de289d9f4cf184ec7ac24a89b36fda046803187babfbc22c9a7b4a1ec81c86d7d2d5973ead2369a37951 SHA512 8bd54bc1ff1f1adc6020224d58c72833c2f804f4d1f1d43f38664b52bc3e08fbf37c8c65517aea089f3acb4a5f1afa895aa60e61a8d6da26c19330e0f562b7b6
 MISC metadata.xml 375 BLAKE2B 2ef1245cabf20154d53ca5b9161f9e5055d38ede47687bc2314cf787c804dbff40a1278769fec061468c95139a8c5f9f573e06e901c580e6923e93b29e3db398 SHA512 489eae3aa828d6aeb43f3b24783777644f7abd7522d842c44918ba6c5fecf0ca9f02f91764f7f2566960283737f4a2c17f307f4f26e9d1c8ff92ee9e2e99e8fc
diff --git a/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild b/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild
deleted file mode 100644
index 239c59db23ab..000000000000
--- a/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="System settings D-Bus service for OpenRC"
-HOMEPAGE="https://gnome.gentoo.org/openrc-settingsd.xml"
-SRC_URI="https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="systemd"
-
-COMMON_DEPEND=">=dev-libs/glib-2.30:2
-	dev-libs/libdaemon
-	sys-apps/dbus
-	sys-apps/openrc:=
-	sys-auth/polkit"
-RDEPEND="${COMMON_DEPEND}
-	systemd? ( >=sys-apps/systemd-197 )
-	!systemd? ( sys-auth/nss-myhostname !sys-apps/systemd )"
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	dev-util/gdbus-codegen
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--with-pidfile="${EPREFIX}"/var/run/openrc-settingsd.pid
-}
-
-src_install() {
-	default
-	if use systemd; then
-		# Avoid file collision with systemd
-		rm -vr "${ED}"usr/share/{dbus-1,polkit-1} "${ED}"etc/dbus-1 || die "rm failed"
-	fi
-}
-
-pkg_postinst() {
-	if use systemd; then
-		elog "You installed ${PN} with USE=systemd. In this mode,"
-		elog "${PN} will not start via simple dbus activation, so you"
-		elog "will have to manually enable it as an rc service:"
-		elog " # /etc/init.d/openrc-settingsd start"
-		elog " # rc-update add openrc-settingsd default"
-	fi
-}
diff --git a/app-admin/packagekit-base/Manifest b/app-admin/packagekit-base/Manifest
index e9bd289d2307..857c8f78030a 100644
--- a/app-admin/packagekit-base/Manifest
+++ b/app-admin/packagekit-base/Manifest
@@ -3,5 +3,5 @@ AUX 1.1.12-cache-qafix.patch 1103 BLAKE2B ab5fe2d05729dbd449e14aae25332172073554
 AUX 1.1.12-elogind-support.patch 6656 BLAKE2B 0bc942015430479fc1ae7c5cac080a8e68c53e4f5c45cea994bd44232f7dfe22e6623d31f9ed9a46bf31a851e888eea462785bc728db16951cf21c657fe1b575 SHA512 2126d57f2c0221cbad9f9796df0bfd817aaf26818f1287bf99c38a2396a7a0a140ff96c6369a18bfa008a91768d531fc4c0c5acd897fab3bbb35d755f39e946f
 AUX 1.1.12-use-autotool-python.patch 1072 BLAKE2B 8f96a404b3a80d13cb10488bf21a5710d9abf40e1725e47480a7451f7adcb9c4a0d834ac65f35d2013425b3c867d0126c23e999ff6077dd9735571fb9916432d SHA512 33e5d4364e32147de550204809fd86407607f102964986402379c8904f44f64db6ef7ac3a1b967fe6e70c8654f8a271b3f2934a370ec9422e58aaf54352d0320
 DIST PackageKit-1.1.12.tar.xz 1439024 BLAKE2B 458cb7a9a47941214ec58846fb840f852851555dbd94ed5113745f9e375cd28edaa8475db30fb889b1722ea01bce5200a5ea7a5f52e45b424703228bff59d689 SHA512 a7428416ae85df0c8e7dbe017396921e9214612c8eb7c91020523457d0feaff86ad50d595f702d255e4091364cb10b8d9506b603b9d0e449c39fced07180840b
-EBUILD packagekit-base-1.1.12.ebuild 3985 BLAKE2B 956dce71fcff9167e234bfa12ca447888ca52700a732007eb13d44ac8d63c59db5d9a8b9fc1ad59a178b2ea5b2cc7b5e4abfa368bdc78132e454e032e035fe96 SHA512 f350646c77c4a64b10a788b121a4fdbeaf4926d88c6eda52b633402884f575784866cc873f7ef01de9c949f38e00b199ba4401cb411c7ef55e6079dcf6e4c760
+EBUILD packagekit-base-1.1.12.ebuild 3931 BLAKE2B 10c64f9a1db740257ba02d8d5eed2541fc153eb47291147b1770d44897ee2912df6cf3ecbdd747ee431e4ed6f0de9b89f2ae777bac0ed73c82deca907edc5bf1 SHA512 b457c367772214634bf53d021a0513cae6e6ab35eef7aaa7d98e1d4bb617a3b256203d7a313ccf6c0750013f887674a9ec5b56eac7fbb1db3ca7cd43963f5511
 MISC metadata.xml 772 BLAKE2B 88885c4f2b4c7ea16857f8727affd074dfc13a0a407f23a53e1a7dd7801c98adb4dde13baed734cc9b0f2aff1cc560dc45cd17c4c591acc0d9fcb1a95ce7e72e SHA512 14bf2712da5db44c38ebfab0e994a0a874213ce7265fce7a9f40b6b9e61b93a9935dcff532ade1980465b98d07b305c4ebcc69a344b7624c21b57d1b03bdb69a
diff --git a/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
index af42930c60e7..0d5aba38b6d8 100644
--- a/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
@@ -58,10 +58,7 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	>=app-portage/layman-2[${PYTHON_USEDEP}]
-	|| (
-		>=sys-apps/portage-2.2[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)
+	>=sys-apps/portage-2.2[${PYTHON_USEDEP}]
 	consolekit? ( sys-auth/consolekit )
 	entropy? ( >=sys-apps/entropy-234[${PYTHON_USEDEP}] )
 "
diff --git a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest
index 940534d852d3..ef6903d0d21e 100644
--- a/app-admin/perl-cleaner/Manifest
+++ b/app-admin/perl-cleaner/Manifest
@@ -1,6 +1,6 @@
 DIST perl-cleaner-2.25.tar.bz2 7435 BLAKE2B 348f5429874bf7b1db5c9ba5b1479c3d5fbce68fc9ef91aa44dad3325ab2287d4bfda9221063dd643ec3b6df465443bb9a024705ec46f15c50ccd618ef193ce6 SHA512 5ef5682872ce840c0df98de82a6cf622120435f542206a00bb8fe0f9d5e46fb9898a89ab576b08a74b0d69d57a90a930d9f8d7d0b527fa3a928a6e4ddbad6ee9
 DIST perl-cleaner-2.27.tar.bz2 7493 BLAKE2B 03d8bc336fd0a42bce16c4bf8b2272a7ff24d605b483af777ef7ab3d59accd0082709200705638ab116934f675b17c5cf109c40a3ab739654ff64abebd8c0558 SHA512 097d68dff30da198636f73fc44600f1863c7f69f87110315bb83297c96d826f2f101f56ab546fde94ff60ca00da0aaa569fefea3c2599155f3bd69c66fb42ed6
 EBUILD perl-cleaner-2.25.ebuild 1033 BLAKE2B cb2b0768286815689d8516f06b8fb78436b0fc3746768e25458af4d8843e65c20298496cb808c0b19c55f96d9c2eaeb121afc6aed52704b48ddc18bb6467175c SHA512 5d13694ae65fc83e1429c85a92b30dbc033a30ac31e93809eb63e54c7d22e1ec24479ddffdf01d3fb6fe2164b3373a96a0e0383ba5d2e4afa6d80036eac61e41
-EBUILD perl-cleaner-2.27.ebuild 1093 BLAKE2B dc0c431f0024fa11db73c08c661f571b6f011e41992fabe8b1018b936cb300cbbc336f767579482343737b80ad1f5b6e38afe101874608c7ad2089154527f4f0 SHA512 664a08e2bf9cd59727e9a4d4f359d4df49177d1c5ae181cc4315d6521161c128a6932de2e080d4416cab1b0cde1f1f70b6d9bcfba4f17a4f51db35238099e30e
-EBUILD perl-cleaner-9999.ebuild 1106 BLAKE2B 4e6fa320ee3bce622156c4bf2550b932915909c9c31a130035fa2e141925dba8189f1b9cea3644c99a1194bb1612b7e42e09d833bbc1231760b742617f018ae6 SHA512 20572bea7bf7c4d4f47ef6ef74c5ccaa02a76bc50a8d4a6b4a3d0237c3546068fd1633839bdbd6fba27e6db3fe85e09799eb26a844f99af7d7c9c3040ed8afb3
+EBUILD perl-cleaner-2.27.ebuild 1037 BLAKE2B 284f21939352dfec4cc062d5894897928a8bf66ec232677345b7de87f716f41f60d3e1f93fd0cbd0b20d92d57761d6033dbe26a40d681ab94c24600aec737741 SHA512 fad95dfce502ed72c6127ab26502a4ee3dc7cff6ce009c3359d4f1c57a6669ed4ab9148e5fe34c4a3f46d1d940331276205fa7ed5285df12371295e54caeea99
+EBUILD perl-cleaner-9999.ebuild 1050 BLAKE2B f76baac00e3c30d41dfbd55f46c06cf864cc2aae23aa6eef08fff4312bdc74f3867d696524aff2626ca58f1cdcf300d4fcab35979292da82828be5910827f996 SHA512 f9fe20c139ebe9704210a1550887d2ff9c09d17b6b1366ee1a4ec6815f2b4ca304b6cb321d94550c40bc7b7eaf8ded066b83e7b141c415b921bd66287fbdb07b
 MISC metadata.xml 248 BLAKE2B 7e969e31666e369b4b1826230eb9c103e51962ac23701a7d5e49d211d6da6ee2f6a8372d72b3ba454140d2c1fb7ab6d122f011e9c8144e95a9cc11f01d2e6481 SHA512 53fd9b61e8fd7f18f9493861896a34938e5f6ee4efb3d2c71703dfa81587d0943f0d439fac0e0c106966dabba08d6aeb4b0a2ff85addf30d992c9b7c78ab6314
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild
index 8b7df3e35322..00eefdc2e1d5 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild
@@ -26,7 +26,6 @@ RDEPEND="app-shells/bash
 	dev-lang/perl
 	|| (
 		( sys-apps/portage app-portage/portage-utils )
-		( sys-apps/portage-mgorny app-portage/portage-utils )
 		sys-apps/pkgcore
 	)
 "
diff --git a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
index 14733e60594e..5fed8f148ae8 100644
--- a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
@@ -26,7 +26,6 @@ RDEPEND="app-shells/bash
 	dev-lang/perl
 	|| (
 		( sys-apps/portage app-portage/portage-utils )
-		( sys-apps/portage-mgorny app-portage/portage-utils )
 		sys-apps/pkgcore
 	)
 "
diff --git a/app-admin/radmind/Manifest b/app-admin/radmind/Manifest
index b04f8411e3fc..d786c001f1a3 100644
--- a/app-admin/radmind/Manifest
+++ b/app-admin/radmind/Manifest
@@ -1,9 +1,5 @@
-AUX radmind-1.14.0-parallel-make.patch 1447 BLAKE2B 875034aeadbd247e2578f3bcedb8384782b1825d9e8c92e48af51fd6216faede28d5c4d89888103468f2056f3955ec31f8fcfd8335419b3111791524c30e9f06 SHA512 6fc839a6a626dd4a3366fc85b185f4f0e944e21a8ad3ab4763f290d15c0ed8dbba3919f19f74f7b2a9e59709b017c6ec9e9c2baab7b31b24fc4c212e3b504c4a
 AUX radmind-1.14.1-glibc225.patch 709 BLAKE2B 48890c31f0b2f4a8945f8cbf9c02cf842744949be10355f3f2b6aee0f56bfe9847b7293524151c72a5ed93e1fa1ca1957261c8b7d000668e4d10fed8bd5154b8 SHA512 faba25648305e3c5374f37037cf61f22bc2e6d1a3f40395e988f00f6c2335cd22fe962d0a9a6ae3ccfd879afb05965916f8f333fb677e89e7b7080f5c977a3b0
 AUX radmind-1.7.0-gentoo.patch 850 BLAKE2B 3ad977b414913caa868e6bb967f73fb0920c2a59fe91f22617f27aec89a7750e0b3b67cf8eaa383d3b3a5326f1033346b507ec46bfdb48fafda0a1551da549e5 SHA512 9eb98ce293fa9c1dae22ec596353deae2e9262427ead062890ef7848fb5fdff1e061b4bacef681465eee2b17d06c371b01c12e547538e0b9385ebfffb9b46a72
-AUX radmind-1.7.1-dnssd.patch 493 BLAKE2B 8c431769b3908b6961380d5da1b54a64cc10ed00c77900f08a680a5782df0b204cf63be9155ba62fea1d637e4ae7ffe84ce1e2745ae0488e4fcab2ff3faad6f1 SHA512 95577070b42d8abc754c1ae235a8d40bd15acbea71b560a8defd69f2becf8c89b592420d872b93409eb142731b7ea0a5180394218ed440d7d633a6e004b7aaa7
-DIST radmind-1.14.1.tar.gz 403553 BLAKE2B ea89c7c28714134df3d9f9ab522c4499590f5f08f3b5d6c0d02c750ee896922720d66e4f08dac70fe93933da0fa5d8776fdf0f7d32b926d76ece27cbcedb87ad SHA512 bccf9681a6899be3b500065237dd1e04cd83ffb6f9be0e355412e7b0c556325f7d13435cec65a8a5e156e4411da915744f01a615472f6361d52c4d54d8be20eb
 DIST radmind-1.15.1.tar.gz 449653 BLAKE2B 8a516ede28d561a60f7c51424c6e48ea030dd571528fd3422fab3b23b4448ee898d408136c4845ebe9c5f9088fb425ed67b341f4d1721747a415183687e6daa6 SHA512 3dd9477d00083cf9912e2143adff52f9bc127665ff6705bc200b7323e53390fb76ac125733596ba309905fca3db062c7b1bc1d1372b77a3044c3794bacb96e6c
-EBUILD radmind-1.14.1-r1.ebuild 849 BLAKE2B 9cc537d2916f26bda7f72fcdce9d51c328bf8e5044b447eaba23d085d8ae1ab8bb7d03348c4e1c7c7afb74bdbd64c15a1c8da1c2c8498d3cca1a41760f9a9592 SHA512 88a7d9d50ae65477b38a157a92e4c12717aff0fb52f2580b199a0c4d28d037c305cecd714299412137ab3bf98ef06f62635c4037bdb4ca06b87e11a7bab754d7
-EBUILD radmind-1.15.1.ebuild 731 BLAKE2B 261a0daaf587f0a46c8eb38a8ab1aab8983f27c3fb035ce1c07226388de4cf3608f1aa9d325624fc8bc79c5158317d89fdea026b42a8500f07618bb801b24313 SHA512 9d1402ad6e36b6a1a26951f2ff6f0d2dd2a6b6c89018815ec650f9c2226884d39c5b30aaa18862253144c7c6b8e210c361d7275f4f0172b065cd7606b5f31321
+EBUILD radmind-1.15.1.ebuild 729 BLAKE2B 59e1e182c895135aee7ab58c129b1a493ec75a1a910080a95c834f60424a2d740afb5c80f7b4fc9a30e5766472581d272323b3873a780bf308a8fa9c226d8460 SHA512 0323b67915a069a79e716a4a147e72abe76e652ff58aec1a9b683e243c9645ddc41ee781961b603e83c2a81dbbf29fe15e7368eb41f6c38631b506dba8dec133
 MISC metadata.xml 404 BLAKE2B 365cee5ab102123ebee500dc96ba31bc9b47b9e415c1a6b5f682adc011d62f460a09174888f444ecdd6136b86843a55aa64ab15dd9e7af00ffa628099b87b261 SHA512 cac73072027c59e6e34a3eee8cb602d72601306e5f1d8d4b4214d12b900320f0f7cc7f4a8f0a6590e2f6286799d0f96d3edf5c14d85b4f586ae9ad1293138577
diff --git a/app-admin/radmind/files/radmind-1.14.0-parallel-make.patch b/app-admin/radmind/files/radmind-1.14.0-parallel-make.patch
deleted file mode 100644
index 63c52ba33066..000000000000
--- a/app-admin/radmind/files/radmind-1.14.0-parallel-make.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -204,37 +204,37 @@
- radmind : libsnet/libsnet.la ${RADMIND_OBJ} Makefile
- 	${CC} ${CFLAGS} -o radmind ${RADMIND_OBJ} ${LDFLAGS}
- 
--fsdiff : ${FSDIFF_OBJ}
-+fsdiff : libsnet/libsnet.la ${FSDIFF_OBJ}
- 	${CC} ${CFLAGS} -o fsdiff ${FSDIFF_OBJ} ${LDFLAGS}
- 
--ktcheck: ${KTCHECK_OBJ}
-+ktcheck: libsnet/libsnet.la ${KTCHECK_OBJ}
- 	${CC} ${CFLAGS} -o ktcheck ${KTCHECK_OBJ} ${LDFLAGS}
- 
--lapply: ${LAPPLY_OBJ}
-+lapply: libsnet/libsnet.la ${LAPPLY_OBJ}
- 	${CC} ${CFLAGS} -o lapply ${LAPPLY_OBJ} ${LDFLAGS}
- 
--lcksum: ${LCKSUM_OBJ}
-+lcksum: libsnet/libsnet.la ${LCKSUM_OBJ}
- 	${CC} ${CFLAGS} -o lcksum ${LCKSUM_OBJ} ${LDFLAGS}
- 
--lcreate: ${LCREATE_OBJ}
-+lcreate: libsnet/libsnet.la ${LCREATE_OBJ}
- 	${CC} ${CFLAGS} -o lcreate ${LCREATE_OBJ} ${LDFLAGS}
- 
--lmerge: ${LMERGE_OBJ}
-+lmerge: libsnet/libsnet.la ${LMERGE_OBJ}
- 	${CC} ${CFLAGS} -o lmerge ${LMERGE_OBJ} ${LDFLAGS}
- 
--lfdiff: ${LFDIFF_OBJ}
-+lfdiff: libsnet/libsnet.la ${LFDIFF_OBJ}
- 	${CC} ${CFLAGS} -o lfdiff ${LFDIFF_OBJ} ${LDFLAGS}
- 
--repo : ${REPO_OBJ}
-+repo: libsnet/libsnet.la ${REPO_OBJ}
- 	${CC} ${CFLAGS} -o repo ${REPO_OBJ} ${LDFLAGS}
- 
- t2pkg: ${T2PKG_OBJ}
- 	${CC} ${CFLAGS} -o t2pkg ${T2PKG_OBJ} ${LDFLAGS}
- 
--twhich: ${TWHICH_OBJ}
-+twhich: libsnet/libsnet.la ${TWHICH_OBJ}
- 	${CC} ${CFLAGS} -o twhich ${TWHICH_OBJ} ${LDFLAGS}
- 
--lsort: ${LSORT_OBJ}
-+lsort: libsnet/libsnet.la ${LSORT_OBJ}
- 	${CC} ${CFLAGS} -o lsort ${LSORT_OBJ} ${LDFLAGS}
- 
- FRC :
diff --git a/app-admin/radmind/files/radmind-1.7.1-dnssd.patch b/app-admin/radmind/files/radmind-1.7.1-dnssd.patch
deleted file mode 100644
index fe71ee013d1b..000000000000
--- a/app-admin/radmind/files/radmind-1.7.1-dnssd.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ru radmind-1.7.1~/configure radmind-1.7.1/configure
---- radmind-1.7.1~/configure	2007-02-10 19:20:01.000000000 +0100
-+++ radmind-1.7.1/configure	2007-02-10 19:22:04.000000000 +0100
-@@ -5265,12 +5265,12 @@
- echo "${ECHO_T}$ac_cv_header_dns_sd_h" >&6
- 
- fi
--if test $ac_cv_header_dns_sd_h = yes; then
--  cat >>confdefs.h <<\_ACEOF
--#define HAVE_DNSSD 1
--_ACEOF
--
--fi
-+#if test $ac_cv_header_dns_sd_h = yes; then
-+#  cat >>confdefs.h <<\_ACEOF
-+##define HAVE_DNSSD 1
-+#_ACEOF
-+#
-+#fi
- 
- 
- 
diff --git a/app-admin/radmind/radmind-1.14.1-r1.ebuild b/app-admin/radmind/radmind-1.14.1-r1.ebuild
deleted file mode 100644
index e21fec83efb0..000000000000
--- a/app-admin/radmind/radmind-1.14.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="command-line tools and server to remotely administer multiple Unix filesystems"
-HOMEPAGE="https://github.com/Radmind https://sourceforge.net/projects/radmind/"
-SRC_URI="mirror://sourceforge/radmind/${P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libressl"
-
-DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${DEPEND}
-	!dev-util/repo"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.7.0-gentoo.patch
-	# remove dnssd as it doesn't compile
-	epatch "${FILESDIR}"/${PN}-1.7.1-dnssd.patch
-	epatch "${FILESDIR}"/${PN}-1.14.0-parallel-make.patch
-	epatch "${FILESDIR}"/${PN}-1.14.1-glibc225.patch
-}
-
-src_install() {
-	default
-	dodoc README VERSION COPYRIGHT
-}
diff --git a/app-admin/radmind/radmind-1.15.1.ebuild b/app-admin/radmind/radmind-1.15.1.ebuild
index 7c4ecf7017b0..3d2decf2a3d7 100644
--- a/app-admin/radmind/radmind-1.15.1.ebuild
+++ b/app-admin/radmind/radmind-1.15.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/voretaq7/radmind/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libressl"
 
 DEPEND="
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 35d3104df0d9..7484ceec85ad 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -25,7 +25,7 @@ DIST salt-2017.7.8.tar.gz 12060430 BLAKE2B b2dde1b6f43bbb9b9db29b70dfd57591ae0e4
 DIST salt-2018.3.4.tar.gz 14404085 BLAKE2B 932b30b1ba60aefd3a6874a8ebe4cb6c469d82e31f6acdbe8a5641d09e3316796b5403ef803a355cec6255c1aede8bac3b66af179bd1bbaa5418c7076229cef9 SHA512 f17e06fdbf4741f231d9e769be57de4f6079e9283881b4bafa0d23928d7626a1f9c02b9f49c654b29c3e6ee8ed3d3ddf42c21baecef158ad63a97dc87895b21b
 DIST salt-2019.2.0.tar.gz 14952746 BLAKE2B aa3bba4b7d9548a8d333c242fc0265a743f56ff1a259da7c8618d37b3b022e12f09ac594a09f0ceec80fd9d3a6b6b9ec35b33e879b7a124e6612f2ec2a63a01c SHA512 de5a976213d011c230e423a172952effddb87168367958b8657eaaaf8fd2a8bec8471f547b6ff9e896a17064a13d387dbc12e12c605c8a241062e3238bd19eca
 EBUILD salt-2016.11.10.ebuild 4855 BLAKE2B 8d6321e45aca368c5919104752f3ab5f0ba0778b183a232cbbbcd19da126eaecc2d0c40c29e3745a27d7f1cff9dc620840d7cbd86de7a3d8c6454bc2ff9b900c SHA512 a4e7ae265c66a659eb70fccba97c2c52ba9fe06fe20e23d3643029fd68442aad4f82d94f8a9dd55a5f040644a50571dec645ab866b20ef05a70ad8a550553c92
-EBUILD salt-2017.7.8.ebuild 4674 BLAKE2B 25596e8971338d54c1dfba75bcdc5bed6300548c2db642a12192e755aa11c1869c96ecbf72080c94aa9313c75b2e50b542d692a0bfa1dbf43e8fda9b118f6165 SHA512 90c8d4ab7ad908cbaa8c378926e27d5a2a0f71b719d5f84afab0437574a7d309590fb3c2e2ee1134e2a6ffc564062233f835bd9b054e2ce0756c564590a78ee7
-EBUILD salt-2018.3.4.ebuild 4965 BLAKE2B 3307e641c333dbdb9b47cbf6a848c19bfbe38d856b950704f99c4e5fc5f8213b09caac90766fb35146f3db468706d551655e378f3663ce567523c7017a5c47d2 SHA512 8b7167be45a9ab45c0b932f020c9326eb8b99020af61ec4ef686f4e41c1c23fb8b67a13cb518560af0667860096781930acb89cae0dcbcf3267186091e27d37d
-EBUILD salt-2019.2.0.ebuild 5033 BLAKE2B 9426cf160cf6036a190b51b8d1aa890248324fcceb7e828d95d2eed2f0c66d8da430be025f13fb57b3504e3253d9476dc374d2b8644a7a83b17052fd495b751e SHA512 9ebf7231b3f1bdd4f2787cbcfb3fbe383021158909675e7b57f8c6a08f19e7434e6a952d6ea5bfde182ab5b7515b03830d460464ccbaffe826bb02de825e8e29
+EBUILD salt-2017.7.8.ebuild 4614 BLAKE2B 8974a75658aa59bfc4cd98efa9d601ebc374f407ea33d51b98b02fbcd00f195455c867f824cf16092e3859fcbccfc4a0c7ae2933a1724180d34a9f616432095b SHA512 a9a09dc1939775f46687e4e25fae24a3b7bfa48c1358bfec00fcc70fcd271d947c4f2ea5e9c0a9b4a522b87c5d2ab334f0df3d487dc2799db0531cafe23e7a2d
+EBUILD salt-2018.3.4.ebuild 4905 BLAKE2B 882cbf2fc6fd4547a19bbd078a27b6deb5053702fac869af73bac8a7a664f0d368e66a1a3da3b9c30bc0a892f71c1f7d5135fd14240b80cbe24c7fd9438276c7 SHA512 217870e4aef470660089e0627674b8001a3047c783a1fe6fe95c20084ad00ec089d51e0d2783c9a6a69f407aa475091bed4b8fc9a35001e32883440f30f5c1f0
+EBUILD salt-2019.2.0.ebuild 4973 BLAKE2B c70bd776e088b3b148df8a38fdd72bae9cb06716a1536efaa90d221fbcd9461f758b7f99566e1d430efe904a844d3a0ce3ef31b6673bdfae9b5f56ce1fd551c4 SHA512 1eb634805f5e0ecf8fda2bf97bba0108062625edec62d3197d25c7bf863bd4a05a13e4b79fa5ca1d4f456dc040ef130eb27afc7d1670e0175963cf011e36502c
 MISC metadata.xml 2288 BLAKE2B dbe7f76af8cd8a97d852536684e914e3759bd1f17e4bdea3c8c16da7c6485eee08151a8d4e41919c1ae89ba4f786783f899e23147159a4bade0009c7a668f741 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969
diff --git a/app-admin/salt/salt-2017.7.8.ebuild b/app-admin/salt/salt-2017.7.8.ebuild
index 4f709783b1e0..2ae95c954277 100644
--- a/app-admin/salt/salt-2017.7.8.ebuild
+++ b/app-admin/salt/salt-2017.7.8.ebuild
@@ -55,12 +55,7 @@ RDEPEND="sys-apps/pciutils
 	)
 	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? (
-		|| (
-			sys-apps/portage[${PYTHON_USEDEP}]
-			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-		)
-	)
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
 	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
 	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
 	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
diff --git a/app-admin/salt/salt-2018.3.4.ebuild b/app-admin/salt/salt-2018.3.4.ebuild
index 92a5a2af478e..3e71e1254a62 100644
--- a/app-admin/salt/salt-2018.3.4.ebuild
+++ b/app-admin/salt/salt-2018.3.4.ebuild
@@ -56,12 +56,7 @@ RDEPEND="sys-apps/pciutils
 	)
 	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? (
-		|| (
-			sys-apps/portage[${PYTHON_USEDEP}]
-			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-		)
-	)
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
 	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
 	mysql? ( dev-python/mysql-python[$(python_gen_usedep 'python2*')] )
 	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
diff --git a/app-admin/salt/salt-2019.2.0.ebuild b/app-admin/salt/salt-2019.2.0.ebuild
index 13e8f948ad20..16433de1b07d 100644
--- a/app-admin/salt/salt-2019.2.0.ebuild
+++ b/app-admin/salt/salt-2019.2.0.ebuild
@@ -56,12 +56,7 @@ RDEPEND="sys-apps/pciutils
 	)
 	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? (
-		|| (
-			sys-apps/portage[${PYTHON_USEDEP}]
-			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-		)
-	)
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
 	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
 	mysql? ( dev-python/mysql-python[$(python_gen_usedep 'python2*')] )
 	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
diff --git a/app-admin/swatchdog/Manifest b/app-admin/swatchdog/Manifest
index caf960cc6d90..e46514d7432a 100644
--- a/app-admin/swatchdog/Manifest
+++ b/app-admin/swatchdog/Manifest
@@ -3,4 +3,4 @@ AUX swatchdog-init 1502 BLAKE2B 547590375d8f35b9a96cc149eaf6a66a6b705577a5ed7ced
 AUX swatchdogrc 299 BLAKE2B 05a0b3c13e6e184d7da0d302f62a0a6c3bcf25a90a30a3c207bcb19d6aa07f7068db7a56ffc5518625d0e40cd2b269e5c2fca7e2a5808cb81ba564087e0ad469 SHA512 64dfe179ccab5674742b8198f15b5439c324c7e9648fa0064a36010f7160303abd09c5af4efdb422628827ff8f327a8db312c4fdfbf02aab29c772d82f1d5b44
 DIST swatchdog-3.2.4.tar.gz 30122 BLAKE2B 103491a231306cedad030fca8cc309ce89e8cbc8a3fcee63cd482efb733b91db8b29193bb1e9b9c5213261b150e3dc6be2b506dee83b2297d5af2f1451f596c8 SHA512 4e0a4e3feed00df0f0d04f94cc090e53e71fa9b20d46236ec41d63b98b5733d80a5941b491cffcbb0b655a9c7d2b5c9423ca7ae043346dbe1b05ee6ab24b9489
 EBUILD swatchdog-3.2.4-r1.ebuild 767 BLAKE2B 5763f3766e8840120532c40db221a371fbea422cb41c400f492b85f0d83ba569d53ce299c08096e2cad312e71716285c46ed125410f800466feac588cfd395f6 SHA512 6002de4c68848260f282666cf0cf51f9f97acc7466bd71301b80a3d1392ffb2f6c1e94a41bd6c0db3f98f05eb35bd152fc3fe691b09846b41308ed32b0f3e8f8
-MISC metadata.xml 1137 BLAKE2B 83db6178d7c8813c8ab5b3f97aee38492de3d1fa31e9778d108a311923014d4e1a30a9a19b6628d9540a47eb0ea5f77cb2d751490c44f990efc09a6d958ffe43 SHA512 3a4efd76ee1a609c59a84ec43482982c27d9cf0ba4e4f42cb162c8dc39acbe89ffb146735d04aa111c404e546311df40cd9da782d76c766ac37e14aedb5f4884
+MISC metadata.xml 1059 BLAKE2B 51b78e31bbd8888f2e7befb66aaa1de4d5d15f20b1054c15ef282f54eaa9c44d14c2cef1394a7b4891e5bcb385917fdc4bd1f41a8b225bc8ff7c1465106b596f SHA512 cc3dac43b83c180b48772c8142be11a9a5bebff4275dcb8fc65c4eb1cd4d23a9b5657fe33f843202a392eb0e880bb76ab893131d34527cf6056eeecb21bb0b5c
diff --git a/app-admin/swatchdog/metadata.xml b/app-admin/swatchdog/metadata.xml
index e0a3fdd952e8..85011a1a233c 100644
--- a/app-admin/swatchdog/metadata.xml
+++ b/app-admin/swatchdog/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>nimiux@gentoo.org</email>
-		<name>Chema Alonso</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		swatchdog.pl started out as swatch, the "simple watchdog"
 		for activity monitoring log files produced by UNIX's syslog
diff --git a/app-admin/tripwire/Manifest b/app-admin/tripwire/Manifest
index 38a5b494853b..0781e2d84f98 100644
--- a/app-admin/tripwire/Manifest
+++ b/app-admin/tripwire/Manifest
@@ -3,4 +3,4 @@ AUX tripwire.txt 11492 BLAKE2B f157c47e1461095a51e9868127d25df6769c3ea6441fe3492
 AUX twcfg.txt 604 BLAKE2B 78c0e1457e5ea37031c8f9cf5a340ee600775973ea2475daadb07f3cb59f117667506438628ced1b4b1fa738855748df7d4b2e6695d65de9ed832f335943797a SHA512 c8a568638d5a18bb9508ee6f70aea815b8bfdb9efbf7823cdad59890a617bbe941454f6f4622e38e4ac4622e1d611c9fc085d73aec5a23b5c13ae7f1d783b388
 DIST tripwire-2.4.3.7.tar.gz 1002257 BLAKE2B fb0c847087e8b27d2a111b4a4122b3c4d5b187efe6f80995c6d06c7592a22fec2c537bbebba9c21a7761a8047535de4a96a6b94246da586faad4e9fc92137196 SHA512 541138f4a4c3a4227f31de6607503d305f0d893bdd5d24928d619d3a25bb8fe7061a45c041992ace957b976b834b5f4212b5c727eee1cbc76ddb2e2c52aeafbd
 EBUILD tripwire-2.4.3.7.ebuild 2352 BLAKE2B 8f5af9db16c1d2bc652d1f26da4fede5931263265cd5a55fdddedfe90dfa076a854c26a01f90a5816f9e6acc5171e1365ef3f8d3f7e7d799089778a80bf5726c SHA512 97ca9b2dc6cce1fe4de2b1d710c48bc51bd07a90f6fc72db0d1def23f95e7936cd3327259d14f15ff76dc7ceaf222a7ad9836ae2cc1e57a9300f284765f5ef80
-MISC metadata.xml 1616 BLAKE2B bd19945c4dfb57c6e1102e5d2460f5784fbc4eb54c53a04052a08f45c4131edf8117e834d1b964a350512618e875aab3323f986ea71a893fee19ec08b54a0da2 SHA512 ae04a581b34beb18adb7aea67d9ec17dc5cd897d3e974515c5c59e2e5e8391f86238bcaa59967aa7413c99ce56ae670a7badf8008ed8b6926f7f0a4eab0b83a2
+MISC metadata.xml 1538 BLAKE2B 24c822b7e513325d6daba8c4647afe2849032120492733ca117df4cf109358657c8ff8bd482a9a033834893fb0768aba47ae7df907f342ee61e72f7b374110d3 SHA512 ac08238f1e05e7fa7fe888ace88bbfd71498fed7508bd59e53088b767b1b9c8b566bd62dddd2aef87d28987974fbbdd5be94d1fe9ed01dddd15df59081d7cd20
diff --git a/app-admin/tripwire/metadata.xml b/app-admin/tripwire/metadata.xml
index 9cf612218444..af0f126ac4e7 100644
--- a/app-admin/tripwire/metadata.xml
+++ b/app-admin/tripwire/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>nimiux@gentoo.org</email>
-		<name>Chema Alonso</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Tripwire is a tool that aids system administrators and users in
 		monitoring a designated set of files for any changes. Used with system
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index 597f66949e4f..7e33e4db29e3 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -9,6 +9,6 @@ DIST webapp-config-1.55.tar.bz2 72583 BLAKE2B be958dc991f0e1f6835d9c29350b7d97e3
 EBUILD webapp-config-1.52-r1.ebuild 1606 BLAKE2B 9f9f8643009e63730bc35ef404784d4883dfc396cf901d1cd13099c49bd8ccd5fea30603d2f8a2951dabcc5f4c9755a1cebde4457e4a26aed54bcce26530d4d8 SHA512 bff85d0cd35afc3fc99525ea34db8a6a49c0aa56b91ba4e8a6ad5dab9f5a34880b7f193166c0cdc40d37e51741306e091a080dfb363cc5d5401a315fce0d4d79
 EBUILD webapp-config-1.53-r2.ebuild 1681 BLAKE2B fcd34092a599031d937b6493db7623d92e2744c313c93abd2ec81ef732f06f9f08e3f16c23f1ecdeabea6c69754ce16cb97d6fdf3242d4bc0ae66456044b9f81 SHA512 cd626595ae8c4ac134088870d409311cabcc787a08766a945210e7f2c0ba464b985f899812cf0d291e8cb602c3116026fd1b10d66ad05d8753b7d721ed9641e6
 EBUILD webapp-config-1.54-r2.ebuild 1736 BLAKE2B b4d7b8e5996f95ffc3f334d00ae9e78f13f839e09c844034071060a63ca56527adf51c20424aa26c0649dd59deccd4be9278a00f3a4b3b5c50a97d7d978e8edc SHA512 87093f86927d996abaeb289a3f629783142c1f58a669d0d1643af2b686e76c232d6acf2f7319d6461b837f0a81b44f9b9200b4abce84deead4b472d7033ed32b
-EBUILD webapp-config-1.55-r1.ebuild 1746 BLAKE2B 3c96f1f78711fdb87d4155206a4214792a3579d4f3652d2667eb4f52986a2f117a3bb94cc49502068c234c9041f002be79f6448dc9c8c2dae071013bd0cae0b3 SHA512 99e4ab94f3fb0bb0fd738035bb37bafc0127fd3618b648c9ee462e875adbd0cab05d446bad62fb5982f2c01ebccaaad168d4d4525fa9d17c15923ebe337a0e84
-EBUILD webapp-config-9999.ebuild 1872 BLAKE2B ab366fb1d26ac3a7833e96bf7bc6ac81b33406a4e1ae08d12d37784ec95ff139887df7df28cbec0eb30edbd5481772618398c581c568fc64d0aad2ab458a7229 SHA512 c29ddecb501ba60f8820770748f9f5e33b33cbcbcea802b7b4edb15398b8cd7e533f35f7ea966ccc27fe29344008603783b62c38a6932f264980dfd63631fcf9
+EBUILD webapp-config-1.55-r1.ebuild 1686 BLAKE2B acf048e850ed315d6967bd00645d01470d590c0be742a5e927944d31314a2e5989bc20c114bf62e93a458a6eb58b305f7d15f437cc5d41c0b1465e7ad5704225 SHA512 290e3e19f6fb0eea1039d36786e3eed2a94f4d93ef467c7959d660b03c6915d649cf673a5e776484fa6a1982e9ba0898a6049e86ec6ea24370dc2115df821dba
+EBUILD webapp-config-9999.ebuild 1812 BLAKE2B d1649ed301a740e9fa809a25bf60c1824a3cf2006418cb3d6c51bcfe734305ac08a7135bbca13e6e8170e11869c5e85216c594c75fa3f71c984792c54e05988c SHA512 8a9cf42de3160d6404bbcb0ebc4cf71a8babce0a2e477b31704b6949f647a58a66efcdbfa1ac92ddc4eb1782f29aa45006560f963904bbe27ea254f6b8f9b29f
 MISC metadata.xml 549 BLAKE2B 44f2ec07f40387bd51440d500cacc4ff24cbb3d1ec2e1c9bec29119a589e4c4bb005723d861be2ab9c1929d74d209c10771de5500eedb56e44265969129201be SHA512 1c99c9b52ab10378a3716d3f6dd1d6f70f61ac6bcf0c8a934254b71376a429f601358ad1108292e03ab780bc6c53810fd8a484e42a4ad6f959fb1903ed591b7b
diff --git a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
index 3025b6d1a795..8624a90412d8 100644
--- a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
@@ -20,12 +20,7 @@ IUSE="+portage"
 DEPEND="app-text/xmlto
 	sys-apps/gentoo-functions"
 RDEPEND="
-	portage? (
-		|| (
-			sys-apps/portage[${PYTHON_USEDEP}]
-			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-		)
-	)"
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
 
 python_prepare_all() {
 	distutils-r1_python_prepare_all
diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild
index 2dbfe48a89db..da6dfb24b9f4 100644
--- a/app-admin/webapp-config/webapp-config-9999.ebuild
+++ b/app-admin/webapp-config/webapp-config-9999.ebuild
@@ -27,12 +27,7 @@ IUSE="+portage"
 DEPEND="app-text/xmlto
 	sys-apps/gentoo-functions"
 RDEPEND="
-	portage? (
-		|| (
-			sys-apps/portage[${PYTHON_USEDEP}]
-			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-		)
-	)"
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
 
 python_prepare_all() {
 	distutils-r1_python_prepare_all