gentoo resync : 29.10.2017

16 files changed, 14 insertions, 288 deletions

diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index e00e66632b83..c088919de161 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -7,7 +7,7 @@ EBUILD eix-0.32.10.ebuild 2941 SHA256 431fa60b9dcfae7d9a372730fa00e2cea9cb79790c
 EBUILD eix-0.32.4.ebuild 2360 SHA256 26b9b757c3e31bd1d7b543e885112645d592e6a823e281fb9f8a9b96aeef7a99 SHA512 1b34e69dcab7ca2851ebb26ede4c73acc3221ce03370935674ac6f399f9005bcb6bed6f40c783d578891ab0ef0056182a94ef1e9bd64743f20e887a31249dc06 WHIRLPOOL 512bda5d7170c6e916815468cdef499a31f10fe6a24ab4674e7c451a3f11396c2d5ed1b3ad6d313f1433e068c57a9ff916bbe76fa94f867ec24c88cc3e73ee78
 EBUILD eix-0.32.5-r1.ebuild 2941 SHA256 431fa60b9dcfae7d9a372730fa00e2cea9cb79790cd458d217d06a3705516bdf SHA512 ce4660b31445a0bb1b4ff1a4624e0f8db7f6a6ced85a8e3b7109e2bd6dc8244511fa95e4b79d130823917ff810529f9e611e92c5a13dba0c0941e089fa6eb254 WHIRLPOOL a36c91cb65c98fcede5563e3e76a87d827c0a941e850e63034fb0af48848c7e6e6f43df83beac3dfb03d35e2c1dc0cdb72bd7f3f0cd4769c9851e1fb10ea2786
 EBUILD eix-0.32.5.ebuild 2454 SHA256 affb1e42e44c972dd070af11bbf9a68394e6c8fe8f3d5869b764978d3e00a6e5 SHA512 248caf260d7f06375eca2a60debc9427326623496a90c321a5f33b141b247c2d660345dfd3aa60473003e02d9e86ba78f14c91c19576f742d700aa7f7dd207c0 WHIRLPOOL 33c8f33093b4c6268f50e044e5ac987cad5b2654a6f2b65edbdb1c13f9b1ab0d384565491bc28a5a59b611b686257789810896818f57d743954f70f73552ced9
-EBUILD eix-0.32.9.ebuild 2935 SHA256 141d76544dee96bba594cd364ee28ab0509e83397c6deabc658513867bcd8c5f SHA512 15abd792e3e9302bbb60076780b04ba6b25c564921a777807cabb9f16d0825e9f9403e31bd22d3e958572aa149f6e916c0151dcd7c1ffd7f394632915cc175d1 WHIRLPOOL 13c9a729e2512c05961ae3141398cd002b40f47c259c5e2ac269860306ede72eb611afaeda7b864f82fe644fcc639be41030e85d6a939ab32ca0c038deaa7a50
+EBUILD eix-0.32.9.ebuild 2934 SHA256 daf51f6239185b3cf61afc7506798df5de226221884bfea9eed94cc068e08709 SHA512 85eb3be3b7d9120146920d716edfc162f5b35ead802a1804eda8888b76f8ac42ab1986b7bd51bf8b3b63a7ca381bc71061e3a1a2560a71ceac15bde666434af5 WHIRLPOOL ffe9cd2cd83aa3e8f988bd9c772503ce5e39c6ce0675f8ba29dc02049fb0ac2083c7ed11cff6cfb5e370ba25230faeb55aead99198440754ef4b767118a59672
 EBUILD eix-0.33.0-r1.ebuild 2875 SHA256 5b5f9dbfdae314c5104a658b389bd4e2e2026e9dfc3ce2ee7d9407f801c5fe74 SHA512 83747fb3c36f165cf989edc73c00cb6905a002218eefd1058099580aa53ab7819d7765af6626725beef9b32915dafb72fd4b3e7b5e207e434e3457a7f82fadb1 WHIRLPOOL adc0c4340237ac758a41787a81a9fd073025a722563e0ca454ad53c25c6c52b676cf80410b6e6d99d0527b459566b4ff7204c2c1b06aa3bea7705a2847cab82e
 MISC ChangeLog 9770 SHA256 4b50e3176529311b7210564458969cfe7e9bcccbb476d012507a1b01dcce5d6c SHA512 fb26b4781f4a4af63619763afd097566190545b48a81e737e58ea7aab41f12b4bf8e9e713f4302bea29f3779626cf172f5f3713546a51c39ae14f52faef84da5 WHIRLPOOL c3b7f92c57f9b21cf095f867406895c29de2e5f3ab72a4afeb53994d2a75e3c72ab27239b45fa4fc91373f9bdd5e1c8968ec53fa9f1870932992a75bd51424e6
 MISC ChangeLog-2015 62879 SHA256 dd3e3360c5a6ff69ddc4ebd0263adcbde4b4c72d130ba57b2ae304af40f62c09 SHA512 d6f1888e8cc75bccd6609c062689c64d978458b4bd9056a9297016d1419752f65cc19f7c175d0d0ffe4d7ddfbd3bb22b668717f073525a18cd6c136f9e000f46 WHIRLPOOL 4bb43b05071475173f9bc3afa4d7bfef3ad434c0a8ae9de21d8e9aa78272730c83dc21789aecaf886491aa1c5dbcd93b4a5213b6c83b7124b823225bd4b17c10
diff --git a/app-portage/eix/eix-0.32.9.ebuild b/app-portage/eix/eix-0.32.9.ebuild
index 1a7168ed6a6e..edc7e712d07e 100644
--- a/app-portage/eix/eix-0.32.9.ebuild
+++ b/app-portage/eix/eix-0.32.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc nls sqlite"
 
 BOTHDEPEND="nls? ( virtual/libintl )
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index bd21e3391a2d..fe9c5ab4527d 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -8,7 +8,7 @@ DIST gentoolkit-0.4.0.tar.gz 3215377 SHA256 3696b45b304b4b789f21d897e09311cf0847
 EBUILD gentoolkit-0.3.0.8-r2.ebuild 2569 SHA256 e20a5852712f094eecda0895280fd72836a18e9237f160e6c4f961a6f4985d5e SHA512 0796f45a84f363d3c868445d4e34e6e87d65c00d3cc01c398e44071d33040fb1d65aa2132386374e4e16c8c654f03f34fd3f2a18f28ff5810f48db995fdda3f9 WHIRLPOOL fee5219af98ab4c9b3484b88ae577851ad769e3c94d1cace0f5abc74232bb2b1487ed09d3e423007c0a45b3ecff1df1976e821c47d22cec825d76a83313fe34a
 EBUILD gentoolkit-0.3.2-r1.ebuild 2244 SHA256 0e7b5fc22d0415f1493f931e4ee7b5fd16e1873b96f93a022efeca009f4e778a SHA512 0f7841b73128a56f85889480d7358d7472b5e40ec5eb1f53c7191bf2ef37e73b6744d340acc0f94fcdffb211f568ee0d87e73f03fcfb47dfb2b214eda50090d7 WHIRLPOOL 5ee1e6733481143b95aba28bd655205b9fb69d53aeca5efb3dcb622d77215d4d77400a2a9cff5d977963088606a0eb041e106b74b6dfe4e6c1b0312394f58b73
 EBUILD gentoolkit-0.3.3.ebuild 2190 SHA256 96abe4ba43ac0dcd731c08fb7609f60d6477060c350fb9270455245ea6ddd889 SHA512 6f95f1af8e2ae139ef6058b3798f75e331890bc05efb8abb4cc3c0e4014176424a424e9663f748f3cbae510186d8a7dce1b9d11e0813aa5e65ac9e4ee6d3aaa8 WHIRLPOOL 0476bfb125e2fb141398ed5a9a483de7fe5ba34c35be9591b43e2c92ace976b4bcc1c137ca4220bb3c63a72973930579a8d50c9b188dd4eab92ae70c90fbef18
-EBUILD gentoolkit-0.4.0.ebuild 2169 SHA256 6bcb86f3de5f3834f96e72e13ef1dd209304c58106a84d17fca663ab29411bb7 SHA512 df9634374caf14b6358661f2021e8cdbf5c4bd1f50834b5680125fb8b067f0e8f430af2334ee25692d859e0686c4c15ed2f7688c54543ab5a1b54127d41e6b41 WHIRLPOOL 156abf5fe310787c9e91216c5ae426ae17f74c2b0c7f936d6c1274fb9ffc26c71659598df165e0833c148c6c8f2dad3e63b13de6dd427da0076a889c70ea84c7
+EBUILD gentoolkit-0.4.0.ebuild 2168 SHA256 f7cea2c772b420a4a38c009f488861f428238355076bab4c1569241b6f48a31f SHA512 e207659c944eacee1e266099e4d29a2abc09e07ce083f55079d7403844cc553ef0fba0be9e231824aac5dcd2781be5f9df8521123953c79f83aa0376b38349f2 WHIRLPOOL 7364f0d35327321a2f11d29587060c51bc46b97f917f38ea0a5b3d6800806a9f869fa664a26af56560bd5e4faeeffe45f59f72d91239d9d8a5d1c69623f6825c
 EBUILD gentoolkit-9999.ebuild 1972 SHA256 d581494f29bafdb6b585d48dd54b5fc494a1d6e765ca1b03c8a8102dc46c276b SHA512 3c4443aa492625e7636854c651a1c70fb7059dd22e0168765bf27fb89dcb473f9c18dbc479a278067eda756021bca20e482e941a2b4ffcdd48f987cd800ba2c2 WHIRLPOOL 914f86d7971d167ae2c06241946397974d03724445e20af5ec4f1a47f1a9a1331098eac7ac2bca07e8045adcc457777b5d771b29f2993ec2fb5efa45e65a1aa1
 MISC ChangeLog 7216 SHA256 ecd70d2fd05932d6ba807c47f2f141c856d6fdbc60e7541c7a3f446916ba15ea SHA512 a9ab9e5e6eba30938c756ecf6a6af5671dab5a567384f6d7d124724d7e8eb5daba3975c31a736a1e31077456736a6b311188b1c3569ce8e1066cf2a9acdbbba1 WHIRLPOOL 44d726f589915c8b348775ff61f6fcad879b9853aabd7316f8a8483bd94f6fb68334feee9d1cdf17212f34d2c3b1931524e8fe65ccbe13aca062e41296e162b4
 MISC ChangeLog-2015 81145 SHA256 2be0115c31ea5a66f6ec2cab2d1280dd85d47c7fcb68dbd2ab81ae732b2adbf1 SHA512 a4a8f6cc06b49b8be331a0eeefa5bfa9c18ae4599025c0e6846497af0ba39cf627f4520082d50b818eb21716b65005bb155de466bf25a61f9c3f739119327b28 WHIRLPOOL ce50e41dbd48411c01c2390ab9c5eec9953c4a3c4128a4f104aca579c59b73d37910621d959049a8dac16c1e2cf2c39833f02666c683fcb50ca5ac7d7e396cfc
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
index 4624209bf61e..d2b36e84cf6b 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-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 ~arm-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 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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}]"
 RDEPEND="${DEPEND}
diff --git a/app-portage/getdelta/Manifest b/app-portage/getdelta/Manifest
index 40fe84c47930..77b64cb5c8a8 100644
--- a/app-portage/getdelta/Manifest
+++ b/app-portage/getdelta/Manifest
@@ -3,4 +3,4 @@ DIST getdelta-0.7.8.tar.bz2 10335 SHA256 72bd5dac59e86a5c78217a15e3198df513152dc
 EBUILD getdelta-0.7.9-r2.ebuild 1391 SHA256 2b116f25a5ac6a047ab0a06469efc6aeb0901151e4a65b03e8bb7d1eec20881a SHA512 5d50594b215d4901b7378d627d78c51162bc39ec75901ecb00722658704948bc4e8dffc4eba4467fb2c32bf0dc389c7b1d0f7930c3cfb318f16bfb1da81deb1a WHIRLPOOL 8821a3e0877532f7a4fcdba98ca84e06867ee205b4a2f4cccaa000f3c7424a19796f535127bbc0191ee123dc9a1b567b998861683a48f0b2fc04a1993255371e
 MISC ChangeLog 2468 SHA256 09f1dc1393ee22015f37a79bebd5ce01986fad9f31b3bab6737bce52c44896fd SHA512 9c3041c8b79bcc73a71884bbaae8043b04cb43f04ddb0531f225a7666cf4bdc9ed16c8a0d0bce5e24ff5e7df1545716f7f65523761518244360d3b4b025ac6b7 WHIRLPOOL 33a343db93464fd623afd69b583cf3b7ddacceb0063a08c6f2555c01e2d19b855e16b4d355c3d33d533587974f3342ebcc706f37422a2c9a5d28860e61695643
 MISC ChangeLog-2015 4496 SHA256 8b83addcef5950dd0e2a4781146dbd67afeb3bdd8798affc1dba66302abd1f66 SHA512 2328b4b3e0ba54fd05677d76183813da2a103fb1a4493c510d2b954dd80f360cc1d9d9ae4e5618777eee0685a3c5299d0727428bbfecf0180cb0ce5d82437eaf WHIRLPOOL b8e3f4015a63e1c68fe0bffadb7cd7f44de8c1056284e7070de663ffa9cfd890d710150f1716358d6a32069413e863f274ac74def2050852ad06f74ec243f880
-MISC metadata.xml 495 SHA256 470b264a335319f6017d0a732f2928060c37263df90e12a03dab96754fec3840 SHA512 1e2fbc185f118b58adafb9ccc5c03d56d3802aa719601ba2bda7cdc2fae31a4f558261087d1da74e33786539f7b827a24acc9ad85a0ae4dadd26be31417efd92 WHIRLPOOL dd4a3bd3db297bd2bc61b1ea613de0b297768661b1f5a12153ba0e0d9a59627b93a36927a9ed06421df7f745df28a643691516a1f1c7b81bc7be8c2be9970886
+MISC metadata.xml 253 SHA256 0c78fc0afa8613e977eb4628a883b16145da7aadb7d5de8f1c46404cefd75e5b SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1 WHIRLPOOL 7a7e49ac517082517073244d5b110e8f751910e5f5245d52dada566f95f2432696db1747492592bc84b35fdf48e947d2e9aeca6e44f1f2a5076c26f3d6e1870c
diff --git a/app-portage/getdelta/metadata.xml b/app-portage/getdelta/metadata.xml
index 9b449d0de5af..f3de5f693ed8 100644
--- a/app-portage/getdelta/metadata.xml
+++ b/app-portage/getdelta/metadata.xml
@@ -5,12 +5,4 @@
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
-  <maintainer type="person">
-    <email>nlissne@linux01.gwdg.de</email>
-    <name>Nicolai Lissner</name>
-  </maintainer>
-<maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
 </pkgmetadata>
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index 83125dcdd07d..188a71aaf4e1 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -8,7 +8,7 @@ EBUILD mirrorselect-2.2.0.1.ebuild 867 SHA256 524d3c915ee61f7412e8e50417acc8a762
 EBUILD mirrorselect-2.2.2-r2.ebuild 1132 SHA256 51c42c18e87c40736a4511f1820ce29cff897c2f9e9b89ba4b1818cad840a2fb SHA512 42ad846a47675f9fcf9290b09941ef161ee5b827e42025e81937a502ecb39e8d6e597c206f9b55b28f12fce2554a1af14890cc43ae85f373e5ccb1171f8aea8a WHIRLPOOL 2681fbd5ad9a1b32c681ac7676ba696f3ee74973e4a84b95c5aa58929b7ab13fff7995137a60ddd0e0b7fa53e72816577ff69071f1258ffeb7556a70de96fea5
 EBUILD mirrorselect-2.2.2.ebuild 1018 SHA256 fc222c999b977535990cd4b98d05f1b6dc581278aa93bd10454b7034ed682893 SHA512 95b12638b7e49a49597abedffb6e09c412237714ee649a10360c595a38935512644988b226afde7526749568938a1453aaff03c28d7ce77c623414476f94597e WHIRLPOOL ae5fe5c551a9a989e8e56a2c3407572099c71638156a91790ba360cab71b1af50aeb4e83f5f9c1ab253c03f55abc05cf939c182ae2cc6283e42027dc6ccc6ab1
 EBUILD mirrorselect-2.2.3.ebuild 982 SHA256 f52a7c60c52b8ae3a3aa81e75b683ffe502dc9103053332c547e84b589af326e SHA512 59cd003de18fce4bbacf0a5ce7d5da7cceb423a2790de29ddffdc72386f9f4daf602730e4f4b583b0f1ea8a96f82a4a9543dcd1feae9559a52eb466117337e29 WHIRLPOOL 4b640a59a5595687c281869ddd3a505990af55a8cbc6209ad91181e97aa12ad59fcc1202479fda3d654a866befa7601594f20d8822d8dd2e68e98b85d8a959e4
-EBUILD mirrorselect-9999.ebuild 1045 SHA256 f42f54122b83d979b529f2506cd7103036d310bd726e29c70434b96793737dd9 SHA512 8775aeacb9942cfa6761f25391843449310a9b540845b01090a7cca57b6d1b804e733e8429fe2b16139af346960884070e895284335683fdf69665cda60f04cc WHIRLPOOL 2f1705adc553e1becd1d4a1927ffc2b20b0b0de3543b0ff4d9db57285c8e9445a09b6d87425be81282d9063fc89a38c0999bed86fe4c4644b2527ff80a13ade5
+EBUILD mirrorselect-9999.ebuild 1053 SHA256 b03239f19397586339be557965d4ad91223bb8c551581755c349353651326858 SHA512 e1ec6c42a99cd00ab71ed10aadbb8a7600a388c3a56a5b20662fb15017649e8fc95afb5e27deb9a67b407aa00b16b59207a661bdb420a44bae1e27174fe205dd WHIRLPOOL 920417248e1c69abc68307cde10e54ac4aeacc6886f6cab24e91ccddaba3f4d44804e4a5a105da282f7248fac5751e85839f3c377f7dd9aff233e9ebade7ae97
 MISC ChangeLog 3234 SHA256 a470d0747ffc95fe85798b97765e57e0dc8d5cc01b9777ae4463ddb0777daa4f SHA512 9ad777fef588761c2dfc199d8e66f7a7694db354d854863721c9031974f4707cc5e76f0f0b5d88d279db820681d1a4cf93e7fc0e255e32b3ffe2f48463a0debc WHIRLPOOL e7f2c1bb7cc30476b714856543493cba9f171478b8352a1567c0ce82e4843086bc5d32d74c4a795dc7ae20d74d3bb3a9e8622e22fa2ca8c7bb19e5c03136cf81
 MISC ChangeLog-2015 26452 SHA256 aea6097654520a07a39f6d6f3ca0423244b4bbb64714ae013017b636547617d8 SHA512 2eadbd2b3bbfb96540f3ba9914590f18b69d10f9d68be4cd46b0f139f058ee0994607e35640c1bac3fc44863de2473a4f985c61f75c4c347980f0cb01180047c WHIRLPOOL 6964bb40d7435f8fa27e89cd2f9b3df1ec2821d1dee1a48a2c0bd3b4cb0d28b083923555d8277acd3793c4b03c255a648ccb3f36d92b8c6bd50d8ec8e60408eb
 MISC metadata.xml 470 SHA256 be91a5dc173ee9e08b578140db70f8e8b5875d38834c5ca041cfbb0cde01e0d1 SHA512 31405437e73acec409d4d9c14d33fb10b03aed300ac88d5f793666cc7324abd46ff8703d794009316716d1a63b2b80721dc5e0841f0e1d0fbebc1f9b83f13acc WHIRLPOOL 72fca0179318df04428d67d8e36233f14f7ec58473d9211241bcd6870ca0a4ac92e6a63e18e5917bfaeb861ebf312d151869d5d33daccdfc1856ee77f23fad14
diff --git a/app-portage/mirrorselect/mirrorselect-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild
index efbbddff3d18..4b49dae3c819 100644
--- a/app-portage/mirrorselect/mirrorselect-9999.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 git-r3 prefix
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index d3f249a54026..f8888a12b016 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -6,7 +6,7 @@ DIST portage-utils-0.63.tar.xz 529012 SHA256 7a754cccad2d4c3331d348ba9df51bb3b95
 DIST portage-utils-0.64.tar.xz 533124 SHA256 a53505758d04b2115f636afc9f0c15176a591f3cdb58f684cfd148b29c4783f0 SHA512 e384b88454607aa9123ac3a71d55fb16de475ba59f4ba6efd236594f42140e75650696430138cdb6e1c4e1792db091bbc1db42b1c1102fd579af6514ecefffb7 WHIRLPOOL 19e34782c2f1ed637db73865acc6c07c4162ace55c0b24287bf92c66a9ebea4ca0ab230bb94478aa71bee72280231f75dd5de4eb8fc10248b52ee77cc977392e
 EBUILD portage-utils-0.62.ebuild 2255 SHA256 521aa5d3d09a887c1971d6f2003840feba084f26ab58806bfbda8113c57759ba SHA512 7623733d270ec35228f8ae3383ec123a4593e764aad2c960ab37ad3e08e616cc60e690dc59494dfcf4a06162ff822377bda580a0393beda20ea026bf557cf22e WHIRLPOOL 74b65fa301f624495c83fbfeb47e1f1d1e34efb2531778ab2ca2df9dd42c97db5b668c6e11464071b88183637c4b38824fc669363607eaf05cfb1c1fc23a975e
 EBUILD portage-utils-0.63.ebuild 1202 SHA256 3b1d9e46fc06983f68e1596f696e5577a1ac915e2f8dc30810b87be66c34224e SHA512 59a8f22bff1da852dbc0b4cf6d37b98c8a7dbf4c1fe5abed40f771479471a08de418a4e898d90b6e52fd13a1bf92e6a3f74a88792bf52b54de27d9ae41cec3ad WHIRLPOOL 5b99ad53bdc322a9d4216c018b98d430a3f3003e8b0884be7b2613f3ca89a38c4040377f3b69502542db819b5ed96c75ad48362c5b357578680a4ab1e4a68962
-EBUILD portage-utils-0.64.ebuild 1092 SHA256 73d7591d9e61f8ae7cfd43ec078d539e650ebd67fbda1ec212f8b688857b89bd SHA512 d39de750a6a4e4ad2522c2caa1a80a963430417412e0908a8e54f015be4f62c492a8a6038b8bdc7aa1bd42320cfc3af6c537d1931bc1cf235047cdbe3da259b1 WHIRLPOOL 52cca1546ea531f94a90207d91c7c650186bc6a4b636a88a304471ec745ee7766b24232b3cb6b2efc5e5046c172b46679069c66bf52e18ca4f4ccf21419dc935
+EBUILD portage-utils-0.64.ebuild 1091 SHA256 ce0ce84f03c77d99f263bbdd1ede443416c2ee58b954bfae515c047799779961 SHA512 ef73373fdfcd7dc2c205f90cf96bad725c3d9578a816548e7aeefadb6414b43dd290ca637d79e8969e8e40a41b6146a9dc28b05288719a18dcfc8f07f67e2cbe WHIRLPOOL 60332b47a5bfd03fcd8c7096a10046d601f77b8300964e05bbc2a5c58da27197fead3055077b429f254560c35ce69d9ccb588090c157de964d59c30a007416d8
 MISC ChangeLog 5551 SHA256 ff22e38cd7884953731308cce4eec5c58ab6fc20346fe1f63b67b8218f5a3045 SHA512 b60867699b62397ad1eeaa58a1f7a39ab7582b73df14901a3d7fc12c7c073a31090e051b8e5de4dca5ab5998765b20a015783569b2678efdd19b6d868a9b4ad0 WHIRLPOOL 69858193d50d6c894f176dffa6ea92cd759a1ed0eecb3403d3c695211260f9301e3dac724f0ab9571f74afc2d28b3e4512f18a5eb7b865eb97c36ec47bc31385
 MISC ChangeLog-2015 29800 SHA256 fb987414375c6e0cf3014c646223045e16cb82678578617025df2a8b51c05312 SHA512 3905ac03de51f61ceaeb5873c57702459af1dc6158594015752e2b72a636006664ee1a6da783f531a27988352d73c9dd8a68aa1775d44fd9649565ca380a2134 WHIRLPOOL ee3a960bc7e66f1f5501b2ad24aedacc7fada42337a3f3a7a6478098e48177f8c334749b13272fb27ba4ddefa37dcc3d85826decabe7363230bcb80973cae427
 MISC metadata.xml 214 SHA256 67bae2549564e628c2309c047a10077b3864da7f3903a79a64597be1197ca4d4 SHA512 d0c4ab837bd2d936086900fa4ad3d048ad069bfbc58dc7f07ad3819b383646d66f392407314bfe8f542fb8b0b2ffec0848bc7b2d122469f23b9ddaa4aec0a9cd WHIRLPOOL be2c2d84627f9fd53ea5a6b1d1e7bb570423c19588c69157546fa3f6d615be5f98caf2227a0d218ff4ca5df3433baefef6f6d2d7b1ecdec773f8ba8689477758
diff --git a/app-portage/portage-utils/portage-utils-0.64.ebuild b/app-portage/portage-utils/portage-utils-0.64.ebuild
index e4abec1e8395..3d08632ea6b0 100644
--- a/app-portage/portage-utils/portage-utils-0.64.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.64.ebuild
@@ -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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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"
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index 750c7c10a533..2bef8e945878 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -1,16 +1,11 @@
 AUX repoman-2.3.0-bug-586864.patch 1034 SHA256 178a501c97e39666d49e656ce649c909433848a0ccaa45326fcf238e33ff9299 SHA512 463bd5f0255165faf0c60faa327c29d9eb1a6f9ccdf41369879485f234e1bf9d2713332c115b36088ac9227a56ca154786b3955b2d6e8ffdf7bdc3f10a5a762e WHIRLPOOL 82594eda5b608e4c5651ec769f76eb5842256160430319348f0a3dcc8934278e6ea03d39639e759d9880dd525febc59925e53ee53811fea8071fb000202a361f
 DIST repoman-2.3.0-bug-586864.patch 1074 SHA256 4ad35afd9237be63c1c2c21348501499c252c4bf828a04f08ca0a129e091001d SHA512 b48112a623a4844e5783f229ee0208f729b99ab46128d19735a76633efee17deb81342b5dc8fa67f4f4f5a851509c04c8d2f2ba2cbd992a9d26e61da4ed5f7e8 WHIRLPOOL f1cb4d9a11d8958fae726642bd0d12a0bb8d6564077c09b961fa2f0448c0503132683b4199e37f7cbd5bfd01adb1eede50496ed9b2ad32572284eacd3b2cd2dc
 DIST repoman-2.3.0.tar.bz2 75285 SHA256 e67d1a2dbb89f44e64a49259e64affcf138ade8ad0f397b93c9cbdecd517b726 SHA512 960c63caed12f7c89d374ecceb39677b62d588bf75cc8da1857641c60310061188f4c2fd7177c93a4e8f20cf00a423426f2a70666320f263158531a618a7ff9c WHIRLPOOL bff6d55a4abc5032cd3d04d8e56ec3bb7902c6877836ca4b129f5a57480c01eb6a6225b75fd0cc0b6a2a2991728896ddef3b7ee2a225a901c0523d88d99cecf6
-DIST repoman-2.3.0_rc1.tar.bz2 74621 SHA256 e1de34b710cd43787a91ab49e0b0a6ca32d942ee130ec74523b00f3c5f4ccefa SHA512 7594053472512ab66a269acd1e5f3a9191a519df061ed65b612af0ee30f830ff71ab6b602416aa968476fec1f534ecf313317a28df6120b74c7379197b769983 WHIRLPOOL 9e00736856879f222eaa2f8330109e92b8c7d262ed5a1ef0cf0c3c36f84dfdedfea2de202043aba7585f42353e1ebaf04b16329c812d7e71f957cf697899abd0
-DIST repoman-2.3.1.tar.bz2 76678 SHA256 93a39ff20eac6166ec29497ae2476cc168ea35d8822aaed33a3010fe9c2abf91 SHA512 6655027acaa6b98b7fdf927b6744e87b6ea09fe6d61653874aeb5603943aa9fc68df9435335dfc8f51d25949354660eaccdd1c8b659dbc87aea7a2f8bf3dfd16 WHIRLPOOL 29ddd58a8585a3926853beb66afe5d1a41a16667c9155b7dbc08a63ec02ea8873b304ac7267e3525341cd49c15dcc0dc01e0d0802c61a438fb75b113b7aafd66
-DIST repoman-2.3.2.tar.bz2 77218 SHA256 69b6ed4fae2475f4b4faa4117498caa943ec8e9e360cd5551e819abc7315d19c SHA512 262dfa8d018b318df695003ec1f370d0d2065f50594cfc2c2ef26989409f61d43e6c0e42d279ed1e316e2a9027ca3fd6e46a06b95d80700d57e0bc3e3713cb6c WHIRLPOOL b571a759717af651737047d13dd35f122d982a73091f2c4509ff4e45301badf947ecd10668f10ef5cb865eb0b0e49133ceb4561d9872bde9bc4de7cbbd524360
 DIST repoman-2.3.3.tar.bz2 78045 SHA256 8e8fdb81e3c1f0a7a1d49b161083fa39d47883b3b2bb6ff9456d23f41a75b807 SHA512 17212c19b14817a8a004619dd56ad557457d45919da45edfb27538304e68187fe1104f0b6ccc2b29fa1709645a7a82c75676b118b20d79dc790b0eb2ebf5a2ce WHIRLPOOL b4533763b06ef3e1e2e885bcc5340e05a4d8ab32d47856cbe48920066dcbdb4ce3fd867bef17eecd0caeb91e5481fefdab020e6046518145331727c9496a7a15
+DIST repoman-2.3.4.tar.bz2 78764 SHA256 fedfb840333ce6784fdd244ef23075b67fdf018f6c88aca459b48ae026e0e02c SHA512 1a434eea6361cc06ba3c27ccd31aa02875af1a577860490f8de666b0160370f09d1c46cea95d577163845e12c5672486b176c0009c32e735e16752d67bf4d96c WHIRLPOOL 695ccb19e820274eeb2c3d14506cc3239cc48d2ee925e6600aa311dd38f54617576d9d159fe5554323a89f18a75f83f6bf4478422607216634842185895a89a2
 EBUILD repoman-2.3.0-r1.ebuild 2524 SHA256 ced87e9d318754b7a622020f0af5a853a7466f0556fb2ff31a00d197c2ba470d SHA512 4fd4259a8160ea50677dbf7dd790fcd158dd48986e5ba60e6fd45db17d69e70f0a296e5b04f7a4199f1641364a558395723686763787117a0460c4837b89c0d7 WHIRLPOOL 03c0b1f6a9aa5fb54e7f0bab25e7de458ddffe5d213df09eddc07fea95bddbd940aad7f6f4234d7a6fc3f046216541c1286f55a414f4682080dd47ace4b2c1bd
-EBUILD repoman-2.3.0-r2.ebuild 2070 SHA256 b515ace3569a701282ffc57b0e88de2c02648fbb7c71f666adaaa1846a81d9ef SHA512 88c1b2d5bdb4d2673a01bfc818ff86a6d97ada48384fe3f1817fc65c420682e55a8b354ed6cfde341e8d36c443958d65b5753271ce5e0d32cb8888e226eea6eb WHIRLPOOL 99940667dcbe426e757372d0e7862f98f9a4b341c9ae4d6b3507954c024b534442c60650614dad65e8f78596c14817e8d57e6868627a991c0ee7eb08d7dd9e28
-EBUILD repoman-2.3.0_rc1-r1.ebuild 2339 SHA256 4c6c38efdfcde04082c1abccf2a00645acfff98dd7ef89e8691ff5cdc81277f3 SHA512 ea588da9b8b92cbd796093a3300d052d8083f77fd1f59ff62abf670a037e5e81cded59aa9bb8119f5c6fd387e57ccbb86dad6ce3c89dc0ade4bb22622223da5c WHIRLPOOL 93954d495fdec814267153ed0f8e7d27342406a9317c63b05202c7c8f57c16d2205430f1408ec838b93e24e8f871b0676af958c7cabcbd64e6b10ed15386f78a
-EBUILD repoman-2.3.1.ebuild 2308 SHA256 ae768d03e3e3169aaa1f2d71787e6b357fde3149c850ec296dcfc5eb832cd1ac SHA512 3dbdd9a4e2e3a7d7dcff47bd8961556499f9ff4dc16fac691fdd42f0e80c48d3da6bdd51b045f42696b5aed0aed6936d0d3d1b967bb9cec7c5b347e87ff7f84e WHIRLPOOL ed7304e9a4d7e2ba05d1f1958688262e7dab45d55a177ffb73c9c642e1dfc5df89b4b0e0a8d71232c4c62349dab3415cd3aa466959fb2548c870cf6d6987433a
-EBUILD repoman-2.3.2.ebuild 2329 SHA256 3d8f24a69c42d287cfff8426a9ccb4d422cdf46c1aba5e5ef98df35b2b122c8a SHA512 98e29099a07f6e64448c9845f229bc5bb8d6d85e957d84e920f1d6a7c08166c5812e01e8748bc77c9f75694dc1a6f421b7508fc005e24f7782d5cdbf21bc7e31 WHIRLPOOL 3bb64068eed7311ecbf46f8f555f0c4dd7727ecb04ac7f004a3f0a220bc8f724c65613335a705efe66afce0bab3f2cc6efb6ec5d44372f6ecdf11323edfb44e3
-EBUILD repoman-2.3.3.ebuild 2321 SHA256 2c2d87f313c5a22d56b0b7ae33d631a47681b176920fa7c4875f2e2d3ed804af SHA512 d864d75295c2895d2bf961eea2ccba01fa06f0b37985bff00965f40d01467870893021a6a66f62aba6f1fd57eff1cb255f97c4c3243bebddebaf8a189b340cff WHIRLPOOL ef1fbab485cb2d4a3e98158b217db094844e761d6856729df15e9aa672f6adce948487e677879fa3b3ab9b9a706a3e8599c7387c8099398f4557c623aab22438
+EBUILD repoman-2.3.3.ebuild 2320 SHA256 bbe1e6841001a32a7594415a6b03939cdd1b00b9f52b9e8b88073c3024d1d494 SHA512 30b61a3a5c12b53fa0edd7d8bf64a4ba082611e04cee2966661b2cabd4d52ae81430801fa18833ed9fb85183cf015c3d20ff416ce0a8ada0243f5c2e2838bccc WHIRLPOOL 8075fbc67e2e20b16462eb5707c1e27d4171f311904e1be4c61a34dc9d68d2d2ede943dbc4742ba6d336028011678bef78e2238cf488abc27e43661869c06573
+EBUILD repoman-2.3.4.ebuild 1911 SHA256 114c92105f529c817319119d3c8014f37f3fe1b4a5a2596267454b16a98ff428 SHA512 13466195689cc62920b4d1e74a8e0420cf41dd394785d59ed5f9f6f6b2010251fa29223c721d8d0e1e94c613b01c8f467257899327987bd9f18c3830f0826cf5 WHIRLPOOL 85d64a9e32c6294e59a10936d4ee98be8c6c3c8279613f5b782e1b7288e8534c53d0beb147d796102b612d9cdf37c5a9e2a0f662b4b73c0f6224b1b34145d379
 EBUILD repoman-9999.ebuild 1911 SHA256 114c92105f529c817319119d3c8014f37f3fe1b4a5a2596267454b16a98ff428 SHA512 13466195689cc62920b4d1e74a8e0420cf41dd394785d59ed5f9f6f6b2010251fa29223c721d8d0e1e94c613b01c8f467257899327987bd9f18c3830f0826cf5 WHIRLPOOL 85d64a9e32c6294e59a10936d4ee98be8c6c3c8279613f5b782e1b7288e8534c53d0beb147d796102b612d9cdf37c5a9e2a0f662b4b73c0f6224b1b34145d379
 MISC ChangeLog 3297 SHA256 e5006daf1eb546a30991fab2d1cac52df6c32b5527671aaefcc6d1df5013f280 SHA512 46e97258481fd9d9da54ffcd58af12af33fbd640e63658d0169e5118bd8af19e717008e049909754ff1af5645d0233c6ec0c5fed5f7e279e5bb2a13b2a88c500 WHIRLPOOL 7b8729002820e4a461853023ab65acb37edd535712da93f607ac330822c84d3c1159c2198cffb7e90b257e03915925debdcc83a1674bb089f97c7bc03775d466
 MISC metadata.xml 472 SHA256 86bc3425785a5e30c01ee34eec4888dc145ffb17a005a91ceed62141923092ef SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0 WHIRLPOOL dcbe2acccbeb3454b0ec333a99d35332c57801fa52e74efd2a14d4d605e64d26ecb93e41db8ccb40fa2efebe3715a83f7163c19d1e0a1d013c425a0f38ad6e6c
diff --git a/app-portage/repoman/repoman-2.3.0-r2.ebuild b/app-portage/repoman/repoman-2.3.0-r2.ebuild
deleted file mode 100644
index ed54ebf5fd53..000000000000
--- a/app-portage/repoman/repoman-2.3.0-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="
-	!<sys-apps/portage-2.3.0_rc
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.3.0-bug-586864.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if [[ -n "${EPREFIX}" ]] ; then
-		einfo "Prefixing shebangs ..."
-
-		local file
-		while read -r -d $'\0' file; do
-			local shebang=$(head -n1 "${file}")
-
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${file}" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "This release of repoman is from the new portage/repoman split"
-	einfo "release code base."
-	einfo "This new repoman code base is still being developed.  So its API's"
-	einfo "are not to be considered stable and are subject to change."
-	einfo "The code released has been tested and considered ready for use."
-	einfo "This however does not guarantee it to be completely bug free."
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild b/app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild
deleted file mode 100644
index fba438681a65..000000000000
--- a/app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_3 python3_4 python3_5
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-lang/python-exec:2"
-
-RDEPEND="
-	dev-lang/python-exec:2
-	!<sys-apps/portage-2.3.0_rc
-	>=dev-python/lxml-3.6.0
-	"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/repoman"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "This release of repoman is from the new portage/repoman split"
-	einfo "release code base."
-	einfo "This new repoman code base is still being developed.  So its API's"
-	einfo "are not to be considered stable and are subject to change."
-	einfo "The code released has been tested and considered ready for use."
-	einfo "This however does not guarantee it to be completely bug free."
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/app-portage/repoman/repoman-2.3.1.ebuild b/app-portage/repoman/repoman-2.3.1.ebuild
deleted file mode 100644
index 6a2af5d05d95..000000000000
--- a/app-portage/repoman/repoman-2.3.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-	S="${WORKDIR}/${P}/repoman"
-else
-	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.3.0_rc[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if [[ -n "${EPREFIX}" ]] ; then
-		einfo "Prefixing shebangs ..."
-
-		local file
-		while read -r -d $'\0' file; do
-			local shebang=$(head -n1 "${file}")
-
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${file}" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "This release of repoman is from the new portage/repoman split"
-	einfo "release code base."
-	einfo "This new repoman code base is still being developed.  So its API's"
-	einfo "are not to be considered stable and are subject to change."
-	einfo "The code released has been tested and considered ready for use."
-	einfo "This however does not guarantee it to be completely bug free."
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/app-portage/repoman/repoman-2.3.3.ebuild b/app-portage/repoman/repoman-2.3.3.ebuild
index 14c363f5d47c..fe87e427fefa 100644
--- a/app-portage/repoman/repoman-2.3.3.ebuild
+++ b/app-portage/repoman/repoman-2.3.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-portage/repoman/repoman-2.3.2.ebuild b/app-portage/repoman/repoman-2.3.4.ebuild
index 93c73208b024..a5a60b0ee04b 100644
--- a/app-portage/repoman/repoman-2.3.2.ebuild
+++ b/app-portage/repoman/repoman-2.3.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
 
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
 	S="${WORKDIR}/${P}/repoman"
@@ -30,24 +30,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if [[ -n "${EPREFIX}" ]] ; then
-		einfo "Prefixing shebangs ..."
-
-		local file
-		while read -r -d $'\0' file; do
-			local shebang=$(head -n1 "${file}")
-
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${file}" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-	fi
-}
-
 python_test() {
 	esetup.py test
 }