gentoo resync : 09.06.2018

56 files changed, 162 insertions, 1125 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 41929c200781..76462010034c 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baselayout-java/Manifest b/sys-apps/baselayout-java/Manifest
index 3bbf3c89aafd..8e3645963ce9 100644
--- a/sys-apps/baselayout-java/Manifest
+++ b/sys-apps/baselayout-java/Manifest
@@ -1,3 +1,3 @@
 DIST baselayout-java-0.1.0.tar.gz 72571 BLAKE2B 3a41752b1bdc3980fe8690e499738e19ba9c390164fba04d16eba8f85a73557c7f9c15e311fcd738c250ed1226cc143bc933eef14edad0546b27eb5b41cf3bd3 SHA512 6f5b6ff1ed07406711e15a768f5abdf9f7edef1b31e094760f265863aa8991bf60ff71c8b10003265d8ec1aa7c94a611bede96980d25c819908b705b4d2d1062
-EBUILD baselayout-java-0.1.0.ebuild 700 BLAKE2B 0292185ddf43e76f114137bd39c780eda96149639dc66a350f790ca0f1569b0f78b2dcd837ea0f4b62656f7d9c3e417b8e96141a8ff4c0ea5bfd2e28cb7ced0f SHA512 5e2e23faaef23e77f7f268d8237df8bdcabc71e37ea4f2e5f0f1c481642bc10c2d37a9aacc1633c33ac7bf631539bf832ba4ce595fe2f7a6ddd5d8e76efa2759
+EBUILD baselayout-java-0.1.0.ebuild 691 BLAKE2B da8baf1bad6d786438108b754dc3c4f4d33ab89c22ad3f904859ba56a329c394a9b6fba9a16bb83d94c63e9782457dbcfc925e95bc74109e19cb161907f5ac4f SHA512 8f68171b8036217b07c85acbe591e7a4773bd57b53186712321e5ad91c71895a37a3d0b6f2936a02797bfd2075ab2ad1e2bac2631079794de452bcad2ea5e871
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/sys-apps/baselayout-java/baselayout-java-0.1.0.ebuild b/sys-apps/baselayout-java/baselayout-java-0.1.0.ebuild
index 66a5be953e3f..cff5afff2378 100644
--- a/sys-apps/baselayout-java/baselayout-java-0.1.0.ebuild
+++ b/sys-apps/baselayout-java/baselayout-java-0.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit fdo-mime gnome2-utils
+inherit gnome2-utils xdg-utils
 
 DESCRIPTION="Baselayout for Java"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
@@ -17,11 +17,11 @@ IUSE=""
 RDEPEND="!<dev-java/java-config-2.2"
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 9c8cabfbfc00..96e7050e8cd2 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -16,7 +16,7 @@ AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379a
 DIST busybox-1.28.0.tar.bz2 2261831 BLAKE2B 9cbb133d59711dde90ef5b20bfd4b892e34565103eaa64b2000b042bd2b9b234df14b5e8b74f7cf8f9071b907e1b9eff556e852bb921088d81548473430d3acf SHA512 346a71d44e6c4e1889ac12ae52320cb0c3d0c45c2b4b49fc4e3c0bb25f427707d8075150d545906f414b9f4e5b6d8f1a3afe8cdc31f6a64e06c62b400d7d129b
 DIST busybox-1.28.3.tar.bz2 2260586 BLAKE2B f2fec31ab1c6e6b865cea20a2819f58cb8e4c789051a8fdc8c8ca43367049fa9038e07f3fe806ba7abd90cb6a6aefdb0d095afb68119c11e94240647da6d48ce SHA512 0e87019d9d1179bc072a5ef9752d7342747e311db13c0b0dfa9f380a1e3ad1c265cca118d41f86829629ec5c8eb3e83985421c6f3ea6c8a9991b92ed301a4982
 DIST busybox-1.28.4.tar.bz2 2263342 BLAKE2B f35c81e67136d888a998f41b1418589e4bddaacde25d55eb509822a13ab93d351dcda6b147794a47e3c3c5c4141e9d8cc834ed239e0afba176f08bf3cb55b911 SHA512 92471617fcf3c1e28b468f3de2c83a1041f5ba5106580cc791e9c4cd602b7ccffabc51ce0807881ed734a89c3089113048265d6659a4d595528bd9150288d2ed
-EBUILD busybox-1.28.0.ebuild 9293 BLAKE2B 619fd35a6388d82930505fba9b7dbd9788b088ee287274676342f9e36d9f6e283cc56447a278dc0730d2b230a76445a7f4624f9d03c7bae95321fbe9f5695333 SHA512 77c30310b1716c1b7eb1246c134aecdd50cc5516f9b9f83b987c7246f82e06e4fa9e8f168cc5f70750af7125c6b562d7776b48d43d0f636b52cc895a0b0f51d0
+EBUILD busybox-1.28.0.ebuild 9290 BLAKE2B bb09b1b547fcdefed76ef91c549a4865a807707376f8d100f97585661b4d57a25b628cd62d572b509495be61b787cdc40192ec11152979318a4e78a7a93497f8 SHA512 9b59a7ae3585432c9ac89eedd0fbcfdd9782f429d171eca6c8856a6181f4976a2733b4128e02b9fb3b81cf69582483bb1eecc4184f23679236c437df3a3be8ff
 EBUILD busybox-1.28.3.ebuild 9307 BLAKE2B 00e319049af8efa963c92a360e5156e0e760af0489973ba555401167dbfdfaa2a5e3ee98af2f794b2816caa0bef464675a4289a9efe93ffdd57cadd8a0aedef6 SHA512 4a5263ad0d1ad16655f15a99cd6da391a168de8ef1066028b37940cea0d7ab045fb6c80c436e7e2f6523aeccbec6536bdec7c2b15103625c1833d9b7d12d39ed
 EBUILD busybox-1.28.4.ebuild 9307 BLAKE2B 00e319049af8efa963c92a360e5156e0e760af0489973ba555401167dbfdfaa2a5e3ee98af2f794b2816caa0bef464675a4289a9efe93ffdd57cadd8a0aedef6 SHA512 4a5263ad0d1ad16655f15a99cd6da391a168de8ef1066028b37940cea0d7ab045fb6c80c436e7e2f6523aeccbec6536bdec7c2b15103625c1833d9b7d12d39ed
 EBUILD busybox-9999.ebuild 9307 BLAKE2B 00e319049af8efa963c92a360e5156e0e760af0489973ba555401167dbfdfaa2a5e3ee98af2f794b2816caa0bef464675a4289a9efe93ffdd57cadd8a0aedef6 SHA512 4a5263ad0d1ad16655f15a99cd6da391a168de8ef1066028b37940cea0d7ab045fb6c80c436e7e2f6523aeccbec6536bdec7c2b15103625c1833d9b7d12d39ed
diff --git a/sys-apps/busybox/busybox-1.28.0.ebuild b/sys-apps/busybox/busybox-1.28.0.ebuild
index 01ebd90c83c0..22dbcd657e39 100644
--- a/sys-apps/busybox/busybox-1.28.0.ebuild
+++ b/sys-apps/busybox/busybox-1.28.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/cpint/Manifest b/sys-apps/cpint/Manifest
index eaab503059fd..fa7d670915a5 100644
--- a/sys-apps/cpint/Manifest
+++ b/sys-apps/cpint/Manifest
@@ -1,8 +1,6 @@
 AUX cpint-2.5.3-build.patch 1739 BLAKE2B b512b3cbda0ed371263c8ecb5b7494f19cb5182f80774752c192e7e861a6282d08fa969a3787f4b0c6619a722b2895dac4093fda2ea9f4b2e40c9efd3a1e178c SHA512 3800e2a9b47b1258fddbe5ef0db7ab268f985cee87e1f2ddb2639610ca236a8c979ddfd5c46c2ef031338341665e601e44e9a19757656cf5dc70c558dd8fa22c
 AUX cpint-2.5.3-kernel.patch 1454 BLAKE2B 3a52586bc642fb5ef3df08eb85ab81759557d2fb43dabcb587287762d35926e64d57faec13888f471b84e830fb1cec87201c50746fcacc3196ad800542b65a66 SHA512 b48850a91c80f36844e03a95db1616c9b11a5e076c0ca948e25ac17af4d533c0b7341607cebe7aa0f8b6482bab8508087c638fd7a0515853843a89c6c94e7030
 AUX cpint-2.5.3-prototypes.patch 1008 BLAKE2B 87928ee43fe5fd650dbbf65906172e9c97769eeb1cfff339346904b949fc1dfaefc8a30b28bca54ea0c614242fb739b60b582b6c28de2e28174e7f4d8df3bbca SHA512 ab78d5f9ea13962b2037a4fd67a88968d2fd71184389dcc7824d633eef3f2e129cd99901093656b23c126636ce7692f04c9dc315c698eee259d123ce4b77db3b
-DIST cpint116.tgz 20626 BLAKE2B 95383207abfdfd1465a299160f5cd881df0d8211218f7b0080049be8abb9ef163c445d4d0739e06a84b2a733cc7e8bc70ea7592b971cd86cab019af9d31fcd50 SHA512 6c839ab2808e5c86d7e9fb502798a8cf38c80854d9f08baf4574f99e736c677217ced92772b3df18211f45d38600c1668f11d0fb4677f7dd57c00dbcdab3d7d3
 DIST cpint253.tgz 31143 BLAKE2B e1891244857f22664bc80c7520c065fa18afd1d27a44de52fbbf1914104e36129858450998aea06eaeb06307b51867606256f33809cd7093cc6bc588c238f4b2 SHA512 ecaddee3d2b0c408828b9fd4f1c8bf0026ab8f3654f8792ef504ddfaa848a3ee6b4197f93d044768f3dad49b28dcec175246fe20454cbc7baa162c463bebf221
-EBUILD cpint-1.1.6.ebuild 573 BLAKE2B 7ab020385ba1fc3c29b2a09c89bfa914dc23f9badb256ce5cd44f968931a17985eb77cc491042170093faf665b96aeb5a36ddd42f1a7b18dd73826bfd7027ea3 SHA512 b67e2bc85adb81f9219195aa0bf4efcfd161b90fc6d113e8ef3fe60ac622c613cc8271c786294206e923b253beaf126cc04a953cc80cea774e33d6ca1b3e0f35
 EBUILD cpint-2.5.3.ebuild 650 BLAKE2B dbaa947d873ffdbae168abba3801a5d4a6dd4565800822ae70f134da0354bf51b3d4614963a9940675df568a6609768a56441116ff7c964586e0c0371f4fc47d SHA512 ad7e8b9960c06413598b1cbaa607ab3bee0826747c5b99071434b865d0b8a163de9259806127f21be7c765ff39c94ea279645915ba94170d1eccba15645fe97b
 MISC metadata.xml 338 BLAKE2B 42f7c7c447b5017a4077b209c8e052020b72efc41d798e566bff085475cb901d8e7e4f6c2cbe53980fd0498c88d0d5123ce4f0740a318d1d3d67a9698981db97 SHA512 b0b29ca2593c1435924d3594cacd8576bd60b050435f732e0e804d407297684d33003d98b7ba2030cbf96c8509f77b5b0526ccd3d25eeb41161644fe633b664b
diff --git a/sys-apps/cpint/cpint-1.1.6.ebuild b/sys-apps/cpint/cpint-1.1.6.ebuild
deleted file mode 100644
index 04daacb1e3f1..000000000000
--- a/sys-apps/cpint/cpint-1.1.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit linux-info
-
-MY_PV=${PV//./}
-
-DESCRIPTION="Linux/390 Interface to z/VM's Control Program"
-HOMEPAGE="http://linuxvm.org/Patches/index.html"
-SRC_URI="http://linuxvm.org/Patches/s390/${PN}${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="s390"
-IUSE=""
-
-DEPEND=""
-
-src_compile() {
-	emake INCLUDEDIR=-I/usr/src/linux/include || die "emake failed"
-}
-
-src_install() {
-	einstall prefix="${D}" || die
-	rm -rf "${D}"/lib/modules/misc
-	dodoc ChangeLog HOW-TO
-}
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index f2d4163653c1..d189e243ab89 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,7 +1,7 @@
 DIST ed-1.13.tar.gz 87984 BLAKE2B 296e2448457b10acf0651c76f44d21ea51aa9068f07e13d2d392ff82a825868a44ececc22a4594a1e628581d36847a79978d731ddfac22f1337c503c786b76e9 SHA512 003b4e1015b3c9eb831c805b3bb1072f2e6da02c351770ddae69b438b6e9124b06cb9e30d9a0036dd1fc6a1f7d27fbe84f7e86ac5073ef403bd5958111986f5c
 DIST ed-1.14.1a.tar.gz 91662 BLAKE2B 654eddf7328418507a3a9536da0daacd85c2ef3ea3b1a58b742fad3fc48cfc9a07f8232ecbf5e8e0da42ccf191b1da7e050b0779879e2dbe8b98a329e0f0d45c SHA512 423a30729c16355d80ed84e408034f63fe0d700d12441f82b476af1919c08e7fd4be18736c30cdecbdec5d851f9a08999242aecfe687beed17b779a7485963c9
 DIST ed-1.14.2.tar.gz 91773 BLAKE2B c09ae263e08e07ff1b3411bfea2bf39d7c56364c2c66359ea1447176b42dd0df85464eae7326b983dd64f1d344e25214ef9427be52f5fcc9c57473ca1dd02a44 SHA512 e7638a07d6bdcedc2e00686a6677075fd7b8becebfd7650e60794bcb0d317a8611c7acd90420c952cc6c4beaede250eabff304d27585e190985b1f83e5930057
-EBUILD ed-1.13.ebuild 911 BLAKE2B 9072480e149b2911d14861077f3c1d213cb32d8497d09f836be32b659d3774ee8f812ef757b1a2dec6139c75ab14f087494369432977e12b784a053f5a204a15 SHA512 6093f37ab651e0c6e12b74771a8e62e40096f5e2f84ea051a9875c56f66df495f71b07e01ccaac5bd8f24776a72fc917d87988949507fd6dc7371d46cecb32ef
+EBUILD ed-1.13.ebuild 910 BLAKE2B bddb91d370a5cc478d584f002cbfedc1a87ab36a341994e7a9f3a554d3d6c6439de89b50d0489dfba4637c4aba52ce55d0797470581d9c6dff07d0cedc13e2c8 SHA512 0871616d130d1ccade2ca980e01f096fc3191bfad6a506bdfcc9a4506b039852ce4f4b86c564fb8efad726f7b77930830d8358ebf607d53541e149e9474456bc
 EBUILD ed-1.14.1a.ebuild 921 BLAKE2B 249e5469c4cd8ffe6d8b10aa3efd46b4159e6632124d720bba0437ea0866e6f799342eb0a2a9ee538b4037581df0783fd054ff9e3b2aa661a7b9db9239e3ef51 SHA512 e9aa3bff70c0af368e3139168ffd8c4098b61b3f1a601d2bc387e013fedcee4747277072bcc70890244f569e0054ea54a4addfc3919f79fe001e8d1cc19642ea
 EBUILD ed-1.14.2.ebuild 933 BLAKE2B 19f9fcc693ad3b1e29d2dff7a1fa270d41e3418cc2ee9aee2be3b63f17b67e49baa3568d8b1726b982e99756a905cdb4eff979abe73b2730cc4dd6d720fdc9fc SHA512 257ac23dbe5557474be40169d01ac71d5b244d5e1177fd33c742392873683884e2b0814807d11883f6d45b18b1f15af4452f99acd900faeaba9b3bc89e4e79ea
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/ed/ed-1.13.ebuild b/sys-apps/ed/ed-1.13.ebuild
index 2004db464329..feaa1b77c26c 100644
--- a/sys-apps/ed/ed-1.13.ebuild
+++ b/sys-apps/ed/ed-1.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://fossies.org/linux/privat/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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 s390 ~sh sparc x86 ~ppc-aix ~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=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
index 7193d91aacc3..6a7218851f12 100644
--- a/sys-apps/fakeroot/Manifest
+++ b/sys-apps/fakeroot/Manifest
@@ -3,5 +3,5 @@ AUX fakeroot-1.20.2-glibc-2.24.patch 1021 BLAKE2B 1f907d709be9819d4d7a9113fe17d7
 DIST fakeroot_1.20.2.orig.tar.bz2 326910 BLAKE2B 813fce6416a375de7dce0581a2a7398f023e5e5d6b981d6dd973e9e29380b5908e0bb9e1e84db3b20638933817ed85a8f7d341b369631881905aab9ca4cf2119 SHA512 1ac231f995774aa40f43c4325cd9e6de45365963277c32a85776690c3e7fd281ac410f3d91395dc1e5e5ca3b143e89914e048632011a3985ead216e870852231
 DIST fakeroot_1.22.orig.tar.bz2 338238 BLAKE2B b6cee7483ea7ec17747e638cbfefa565f26b3b00517f3ec90280f8ce556ce8efa3833accc07885365e20f80967a67291fadc27cd80766548cc86e2aa70c74c33 SHA512 193478d9ff88ca2ae69fe47b73b6c61aeb2ba3f2a9e7ed5d455022705857c6f34cdcbe2d3f614c4c4c9509368dc78b9a7b7aa56fb3b50bb3309448140abd796a
 EBUILD fakeroot-1.20.2-r1.ebuild 1008 BLAKE2B 75a46f53e7c9c02acff4f84cc7c1a439e3821df80d23714282e3f1ea9d106424083b705c4d96481874631059c6c4022e9d924ed0b73881f60513a93a9bd8c712 SHA512 de5fb74abfe42b1a6fe4a3aaf2c25db69c5ccb4616195f721f66bd0491e3560d50c79086f40cc12d8749632d413c75af77156010043186e99e063e726468741e
-EBUILD fakeroot-1.22.ebuild 1036 BLAKE2B 0e6ef225e2386e2c58f311e10c79d93a68d7604113cfaa64e88e76782d4d9be89eb68103d7343f2465eb80c607fe8ed50ef43f1317be2e2fdaadfacd401ea63d SHA512 4e61d9ed8cd0e86bcc221bd2bde2335ff09b1e74b8e4710a75e009c77fc31270a71487e3f8ef7b304f7aa22dfd9047c8391c007c6fc6b5cea4932fe39ce28635
+EBUILD fakeroot-1.22.ebuild 1041 BLAKE2B b64d63b8148a5f39cad405c35d57d04f561be22a1c1215228fd78450140e274c5de1ac260f82e246147f8866c8c49708abc45f9942fe44e3016ebf67aac10862 SHA512 2abe6975c02acf769651759fb2892dd681ba2985ac6391f5e85bca84d699c92979ab50011ca0ce20e8ca690ec20bae6e999cfe1fa375817045ec7a0171ac1550
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-apps/fakeroot/fakeroot-1.22.ebuild b/sys-apps/fakeroot/fakeroot-1.22.ebuild
index a365f0e9cc68..4ca2e7a5a9eb 100644
--- a/sys-apps/fakeroot/fakeroot-1.22.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="acl debug static-libs test"
 
 DEPEND="
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 273b932f4563..4727518b6fd0 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,6 +1,6 @@
 DIST file-5.32.tar.gz 797025 BLAKE2B d00196a2331b7325acc1b3f52d011faa3864db526f1962e4fcb769a92a715a1ee9874750cdde8f7c5c48541ecedea36c0fbd788a5ee9eb175cfcfc984acec430 SHA512 315343229fa196335389544ee8010e9e80995ef4721938492dedcfb0465dfc45e1feb96f26dfe53cab484fb5d9bac54d2d72917fbfd28a1d998c6ad8c8f9792f
 DIST file-5.33.tar.gz 817060 BLAKE2B 735f176f09085243dacaddda1b734ef2191ff1684f08022ed1874e84fd0c84679b5a765383c5c5ad27a7216abc23b9c2211fb7110846122563e18285de0f0e51 SHA512 36c9f2e2aa814b5557eef114fdd3de159688c7a3c9632a9f5c6355c4d2a5694cee81279bda80897616fca07289a7fedb1f797439a2903c76dc84870694773c9e
-EBUILD file-5.32.ebuild 2899 BLAKE2B 5ec2b6b9e369d603736a4384006fb4c07a8abf23859a9d89e76bb7a0257e852bf290a96e990ce4869ebdc3f36d5033d56a7801470cd847e09cd84aecd9bc3d67 SHA512 7a01b1f616a52d8079fdd33060263922bf1279fe20c64036b365531a1e27513af28a96acafe1dc7919ff602475ff79abfa0b860645c631ae45239bb610905a63
-EBUILD file-5.33.ebuild 2956 BLAKE2B ce60b2e91e3fd36c5f7651163b80241436dfe2a2439a32ac87477ecc743e14dea8016811283d339ef157c79bcd93de7193ab44a1dca021bdc55551e7f9db26f1 SHA512 efc413413d33ed5779a83c242401974c9ff0961fc5ee026a3ba55f8749cf198360e9aa366901ea86c20049d8c48a721512038898647735b4de6ed2010e0a5c02
-EBUILD file-9999.ebuild 3022 BLAKE2B 2b873f5f3b38b9638e4bb38d2f24ea48e88d1eafd6c7a62cf5effb74b0ba1811b9122bac135e9b5e32eec216aa660282d0ad8a198ace5828668485599e74ab96 SHA512 9bdfad511f50bae091e50fb2b228a30764a25c9c5c2d148005df9af54f2c0a415546ecfc645a72a852fc10be0ac84781914288b1bcd1a50e8f44d71713cb20bc
+EBUILD file-5.32-r1.ebuild 3011 BLAKE2B 2ee0d868685cea29a4941fe9f7f2c215b015f455f0cbf735df8926c8edf275f2de1ccc950853e4cf8021d2c03f314512da4ee254fa5abcc08a65661820666e45 SHA512 78c9afc3203a567f009cb88e823a4a644c23397178926db44148ebd82ee3337899b756a2da4bb2633f158910a73594eebfb80457f9566c723f41544a70851ff3
+EBUILD file-5.33-r1.ebuild 3068 BLAKE2B a2211f853b5a9457e4f514f996d186679532c82ba99b7b8111d9ef842fac2f6e228521976326550a743a41b108a9a712dafb08f4d509bfaf5d2aac10f8763ba9 SHA512 f6b5750df767de41bf0cbbfcc63984476816fc84f637f7f1e9bb2137b4df35f000ee4bbd61cb327aa45e151de493cc4b77a94b24a14544bee06d131d2ca13422
+EBUILD file-9999.ebuild 3141 BLAKE2B 89cee448db824b8746f088e25ae2e4e1ac6951a13b5ea925283f4395b683203a90406caa523be5e96238666b0f000288f8d46f5f867074d6e55351e703b40ff9 SHA512 733e1e18d808031be18afe662079a7f130f2cb61e6c071c00ca202d7938ea9577dbdafb99fc6d534ba84f485c1b8de645e67e1d92c1dfeb0caf645ff863857a3
 MISC metadata.xml 316 BLAKE2B 475092518eaf152f7e153e84a12c7089e665a5fc089045b6fa2d452eaf726566cade92c65ef19ba5cb205e586d161e90e514b60c8587699ca5c9885565ca3b60 SHA512 8b334ba7a606600ad0548ef0ab7aa809a8fda040104d1663bfe179828a831e621128145325aba158fccf94a7f9a3ca1c9164db979a85e639403a079f0deb622a
diff --git a/sys-apps/file/file-5.32.ebuild b/sys-apps/file/file-5.32-r1.ebuild
index c431956b3788..389e0e1c2d7f 100644
--- a/sys-apps/file/file-5.32.ebuild
+++ b/sys-apps/file/file-5.32-r1.ebuild
@@ -111,6 +111,11 @@ multilib_src_install() {
 multilib_src_install_all() {
 	dodoc ChangeLog MAINT README
 
+	# Required for `file -C`
+	dodir /usr/share/misc/magic
+	insinto /usr/share/misc/magic
+	doins -r magic/Magdir/*
+
 	if use python ; then
 		cd python || die
 		distutils-r1_src_install
diff --git a/sys-apps/file/file-5.33.ebuild b/sys-apps/file/file-5.33-r1.ebuild
index 43f99c6754cb..ffec3650582f 100644
--- a/sys-apps/file/file-5.33.ebuild
+++ b/sys-apps/file/file-5.33-r1.ebuild
@@ -112,6 +112,11 @@ multilib_src_install() {
 multilib_src_install_all() {
 	dodoc ChangeLog MAINT README
 
+	# Required for `file -C`
+	dodir /usr/share/misc/magic
+	insinto /usr/share/misc/magic
+	doins -r magic/Magdir/*
+
 	if use python ; then
 		cd python || die
 		distutils-r1_src_install
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 5f51b583c407..72de11bc5919 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -41,7 +41,7 @@ src_prepare() {
 	elibtoolize
 
 	# don't let python README kill main README #60043
-	mv python/README{,.python} || die
+	mv python/README.md README.python || die
 }
 
 multilib_src_configure() {
@@ -113,6 +113,11 @@ multilib_src_install() {
 multilib_src_install_all() {
 	dodoc ChangeLog MAINT README
 
+	# Required for `file -C`
+	dodir /usr/share/misc/magic
+	insinto /usr/share/misc/magic
+	doins -r magic/Magdir/*
+
 	if use python ; then
 		cd python || die
 		distutils-r1_src_install
diff --git a/sys-apps/habitat/Manifest b/sys-apps/habitat/Manifest
index 1f3d571dec7c..138721597202 100644
--- a/sys-apps/habitat/Manifest
+++ b/sys-apps/habitat/Manifest
@@ -1,7 +1,4 @@
-DIST habitat-0.28.0.tar.gz 25147061 BLAKE2B 0412565e3816e451945b0eae73eff0039dbd881bd86d3ed1e6f0aeef90555100f9baafcf551ed48ef2188b4ddbf768735006129afe5b66fcf53e638701b93fcc SHA512 eccdced6655e46b894aa3ef29cbac7100e18b4c44c7c2c7a25d5bb31ba732f908122630a7dd35c6347fa805180b471ce7dac786113d2f9b6d35a967994913b9f
 DIST habitat-0.54.0.tar.gz 35324897 BLAKE2B 554a2097c019e61cd6f1facdd0195abbca5e94834819283ddc2d742d196b6768e1da03a8a94f462a17d3c5c751fdddc1499f59a698f73fce170387055a07cbc6 SHA512 4b34de34e6d7b20ab641222636720357c903228aeb6833462ecc3367c6844d9f377d101b3187996e3cf3c179aa7b0c71a83921b4d18d1002fe30e3b25e31a35d
-DIST habitat-cargo-0.28.0.tar.xz 84559904 BLAKE2B ed4e62e5aee3a6b336c617d7d912db8e6b58ed28f5cc747765075926659841a84d8380ef6273c0a83017f08cf8c5dcd57928de033b71e17213f7dd5f7b0ad381 SHA512 d6f798e21bfa8124820f505231423b0ef72d068a38e8a88f0d196cfcf9e5d7a2142499f809a8525ec2f5ce664e7598d5c0979efcd2511e860b8f884ac4f6fd4b
 DIST habitat-cargo-0.54.0.tar.xz 247811208 BLAKE2B 28d79018ff9f1209881908b335a1c77f60c39799fbd02e37ffde6bccc37c46aafe1cb05914c9b373150a0a917fa5b1538a94a8a75127172cf9d15cca5ba90520 SHA512 603e45b6e61b24b5420e57ef1d06bf15a67681525ae7a4210f07d14a072cf116947d28cc754e415f1e35fc6e03ede70cd47706ddf4857b76ac17aa420bf95d07
-EBUILD habitat-0.28.0.ebuild 755 BLAKE2B 7956cc74a72016dfe839cd53af4588ed17d7ed43b114bffd6c123d90dae1c337a4b82f01d6bdfe4e32262b12e966759eb4536be124edbd33baf5d9731677db51 SHA512 d63dd5b0f3576df45f9714c364123694133211ba4770fafe0c27faebd23b7c1a8f944bbee3aaa023c0c5e45f4bfaf994d31c9497bb82d6589369b038b96d00be
 EBUILD habitat-0.54.0.ebuild 754 BLAKE2B d9bcfd151b0a52503d55d158fcef886c9854c234b98c0d5b95bc068d8b3b64c4153f304a2961a61ac0ccdfe6bfd81c5010a1f161f8148d57c1b7b17a913dd791 SHA512 16cbb9a4ab24c6daae3eedfb2c2666cc93b2cbb19f1ab9c485db38e82cdafda74f74b662a26720d37beae474e7ae8500baedf2e128200cb8face4c4d8c390c85
 MISC metadata.xml 328 BLAKE2B a1f7888eef25b795b359fefb3e7d51f2909a80257b1749f1665973bb34ad655885d5a4fb67cd821c5f6420f828902556c27833f48988b62c72b195a7e25cedc5 SHA512 cdafdd1846825f625feef5635f331f12ff4490383c54e760af5dd4ece4fcbe381ae325c8c732474de7124b55dffd32e129a9647e2e2aa5e0dcaff8ccbe4b1e8f
diff --git a/sys-apps/habitat/habitat-0.28.0.ebuild b/sys-apps/habitat/habitat-0.28.0.ebuild
deleted file mode 100644
index c968a4910847..000000000000
--- a/sys-apps/habitat/habitat-0.28.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Application automation framework"
-HOMEPAGE="https://github.com/habitat-sh/habitat https://habitat.sh"
-SRC_URI="https://github.com/habitat-sh/habitat/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~mrueg/files/${PN}-cargo-${PV}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-util/cargo
-	>=dev-lang/rust-1.11
-	>=net-libs/zeromq-3.2
-	virtual/pkgconfig"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	# move cache dir where cargo expects it
-	mv ../.cargo "${HOME}" || die
-}
-
-src_install() {
-	dodoc README.md CHANGELOG.md
-	dobin target/debug/hab{,-butterfly,-sup}
-}
-
-src_test() {
-	emake unit-all
-}
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index ece5c6758ade..1a2f912c30d7 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -2,7 +2,7 @@ AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2a
 DIST help2man-1.47.4.tar.xz 189456 BLAKE2B 58bccbaa5f126b369683b6e051446242750e07274cbfbd6a4aeec2e8a9b57f2d845a2ddede36cc49eb2ed141690830b90f9a86ddd7c913586ea0f573e8cc3cf8 SHA512 3320890c4068086bff7a858653fb67ac80363f26772fb0bb702233052e2bcbe647e7b20b1a2246b1a0e026ba2aa8679e6baafe302d78c747da04e29c59b9bafd
 DIST help2man-1.47.5.tar.xz 186044 BLAKE2B 288eeaab3781293209f4a6aeab570317e5ed9e2e76acf9a1669c767b627e3896936fba775e32f6016b7881b5747a51b5020c0ab4fc77030d1e27c15acab032f1 SHA512 c94f94bbdfb9e288edff2b3181e0f2e858d309aa4fe77cae141571a06b9b5bc2a5c5a4d25ffc1f9108222d56c9040989d63770f5d804323a52d3978059d1eca7
 DIST help2man-1.47.6.tar.xz 192980 BLAKE2B ddf2b899e4479a45505aefaf3dabfceb1595128da35c000b81be79046aabceff58e1d605b2797880c5c652947d0fe59673eaf087de911152e79768c571037a73 SHA512 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942
-EBUILD help2man-1.47.4.ebuild 1083 BLAKE2B 7523e2059116c743bdee30f6fc6a5698f6d899e0c35215b0029195658084ffffc92db6afd02c4b5b3275c1d8d26a899c0afeac5bd8abc16bf1810ba3ed45130b SHA512 964a18c1fae41a4c6f45cca17f8109b0497c5334cb06dc88d5aabccf7337d66c8a53142473cac9b5efbc8d9bb5a9518b665b01f663e96fa7d6a3599ff16f7a65
+EBUILD help2man-1.47.4.ebuild 1080 BLAKE2B e6842ef0532d09fa4fae0171f07cd0c4d3ecbba79e0347d909d6db9983145607befb7007b8b895e6705519a1ecbb4a6ad3db09457ddd4dc04956c921336a9f82 SHA512 e80f43c763184fcf162e947e858de65a8eea35af193e8c59a9a5a670975f625de4e03adc6cb23fa9c439f024f376648d9eb05c255fd98cd07fd8829d25af4af9
 EBUILD help2man-1.47.5.ebuild 1065 BLAKE2B e8a2b3deb5706a5dbdf42bf9ca43c432d51aa65f9607f1f29f6b846da8927a27e826c65d558bca593a26434cd89bd6be4f90387288cb354600bac8ab3ecdc915 SHA512 f4d4cb55e2019a4295d5f100466b5e47b3fe228beb78872b2dcf6e85e77ee61ecc1bd5e674daaac233d10a574ba8718f0d21520626e5983be852c16a29e64f74
 EBUILD help2man-1.47.6.ebuild 1065 BLAKE2B e8a2b3deb5706a5dbdf42bf9ca43c432d51aa65f9607f1f29f6b846da8927a27e826c65d558bca593a26434cd89bd6be4f90387288cb354600bac8ab3ecdc915 SHA512 f4d4cb55e2019a4295d5f100466b5e47b3fe228beb78872b2dcf6e85e77ee61ecc1bd5e674daaac233d10a574ba8718f0d21520626e5983be852c16a29e64f74
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.4.ebuild b/sys-apps/help2man/help2man-1.47.4.ebuild
index d56029b0fc2a..f574c1e07a3c 100644
--- a/sys-apps/help2man/help2man-1.47.4.ebuild
+++ b/sys-apps/help2man/help2man-1.47.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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 ~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"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index de1186c75fff..da24e2087fd2 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -3,7 +3,9 @@ AUX ipmiutil-2.9.9-lib_symlink.patch 468 BLAKE2B d24e4e0183f46a3a97b9a9db754b494
 DIST ipmiutil-3.0.6.tar.gz 1692679 BLAKE2B dcc02dbb5467b824005dbc95c8f5231b2e2758e7600231c1c3fc31c1207cff0540400857dd1bfa83fc8b033fe0277ab23c6013f110744bff57fe4bc7b89174f9 SHA512 0c47246b7aa6a060091745d36e33aae07e7907dcad5fefb1759aac62adf48316915ce5818d2f9241e24b73be13e54fbb57046234a69c60ce56f41a933915580f
 DIST ipmiutil-3.0.9.tar.gz 1697688 BLAKE2B 93ed8865cae1cea0ea4f7de4683f4698e3f75e9190cc7e0af1832ca44a08f52aa149393761f1ede3994827db78841061d54058bbe4178b5930accd3a4c225ba7 SHA512 c2c0a516216a46a52621159e665a77d96cf81f385fc9cf19877e72283be3e1a4dad5a4826454727b71576c22cc4de3c73ff428d26f35bf496c7dc1511305cda3
 DIST ipmiutil-3.1.0.tar.gz 1697374 BLAKE2B 42cbe5a252fff7427f9a6eed48f110a16ecccc1e251f033ef8184b9efa7d9d184af4e83483e234fa97c1cfd964bce1c5fae756e34b5713328ed58be4d66e0fef SHA512 2089110e5c829f7bb2d97d634a543a93612503fb918d5696a17e376bf12aff160272634634652085d7f374ea39102c2bc8fc06d61ccbd50c6a76152073ea0a8c
+DIST ipmiutil-3.1.1.tar.gz 1697588 BLAKE2B 89d5f6a4b92494d5b5845a856011bf75eb6925506d7956b72efd3a258b29726f3b426185588cbf45a721c804e5e2f8203b1ba5ca132e8e907435cc2cbe5e563a SHA512 c2a7e05f85d668d6d02c990c1078d6f05c30f7ca26b5fdb4bbfe09952dcc4e9cc5eb67657ca07770fa8b0d333bc4d4a96ba845b45efe942c28342be013cf60bd
 EBUILD ipmiutil-3.0.6.ebuild 1334 BLAKE2B 01ed4959fbefdc4487df779d5659a4b9d05893b536da58f1a828e435cf34a4938e2d05ae69568a728b0a91ab6380f040d6ad27b506ba8901f0d191f4ab7241c3 SHA512 a565e97bf6a0875a50033736a8172527f3a745e0ad45ff3d44eb985576e0d597585261bfbce779d552a6d0589ceadf6c453abcb9864e0ecac2867b9ceeacc18c
 EBUILD ipmiutil-3.0.9.ebuild 1431 BLAKE2B 80a5a7d78fdc0862346cc3c208110f5e934d2f4361e38fcf5572e90584ed931e24539891994318cd51895aa002e93cb0357cb2b9a9d3c6a661782df87c1be185 SHA512 7a600b99dcc43ea953c5bb37cbb5b313fd13714378a97d4159248f44ed2076e3ba783f6b326309744bbc4c599c09349fadd97a57f406988d0579950cd5265491
 EBUILD ipmiutil-3.1.0.ebuild 1431 BLAKE2B 80a5a7d78fdc0862346cc3c208110f5e934d2f4361e38fcf5572e90584ed931e24539891994318cd51895aa002e93cb0357cb2b9a9d3c6a661782df87c1be185 SHA512 7a600b99dcc43ea953c5bb37cbb5b313fd13714378a97d4159248f44ed2076e3ba783f6b326309744bbc4c599c09349fadd97a57f406988d0579950cd5265491
+EBUILD ipmiutil-3.1.1.ebuild 1431 BLAKE2B 80a5a7d78fdc0862346cc3c208110f5e934d2f4361e38fcf5572e90584ed931e24539891994318cd51895aa002e93cb0357cb2b9a9d3c6a661782df87c1be185 SHA512 7a600b99dcc43ea953c5bb37cbb5b313fd13714378a97d4159248f44ed2076e3ba783f6b326309744bbc4c599c09349fadd97a57f406988d0579950cd5265491
 MISC metadata.xml 337 BLAKE2B 5f04801092c5d0cf4166c36b508c4cb27e3a08f53f8f86d968d01d1d6911c6dd9cff78d70ec5c9bb60e6f3a028b7e5db1b629a9ba7961b3d729accbc6b62f9c2 SHA512 85f9992b8c7fddbffe99cba761637a897e7ba68f70762f882c039c6492feefefa6bd1ca38fbc73d0a214d04ddb07f5f0ea2106552e4133736d4594e43fae4845
diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.1.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.1.ebuild
new file mode 100644
index 000000000000..ac6d2f9004f7
--- /dev/null
+++ b/sys-apps/ipmiutil/ipmiutil-3.1.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools systemd
+
+DESCRIPTION="IPMI Management Utilities"
+HOMEPAGE="http://ipmiutil.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/openssl-1:0="
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.8-flags.patch
+	"${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's|-O2 -g|$(CFLAGS)|g;s|-g -O2|$(CFLAGS)|g' util/Makefile.am* || die
+	sed -i -e 's|which rpm |which we_are_gentoo_rpm_is_a_guest |' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-systemd --enable-sha256
+}
+
+src_compile() {
+	# Ulgy workaround. Upstream is misusing the make system here
+	# and it doesn't even work.
+	# Please check on each bump if this workaround is still required.
+	pushd lib/lanplus &>/dev/null || die
+	emake || die "emake lanplus failed"
+	cp libipmi_lanplus.a .. || die
+	popd &>/dev/null || die
+
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" sysdto="${D}/$(systemd_get_systemunitdir)" install
+	dodoc -r AUTHORS ChangeLog NEWS README TODO doc/UserGuide
+
+	# Init scripts are only for Fedora
+	rm -r "${ED%/}"/etc/init.d || die 'remove initscripts failed'
+
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+}
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 774f20fe2934..f476bfd0fb5e 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -14,12 +14,8 @@ AUX memtest86+-5.01-no-clean.patch 603 BLAKE2B cb00ec1f702c7fd1697c48599ba7113bc
 AUX memtest86+-5.01-no-scp.patch 388 BLAKE2B a5b195d54c4a9d99c62771430822f87f20f6f97c7dfb28f8fc8db0f5e6aba79404bdce924ad303fbbb0cf04fcd5551abc81bf0fcbab9ac17884bd32f81832d33 SHA512 4b14e16fbe8e69a4d532e8327486fd2434798613a784aca24b381f1fb5ae39839344281494c32dfd0fe8a8a46b744abdaac7884be4a95a87b635e0baea63731a
 AUX memtest86+-5.01-reboot-def.patch 326 BLAKE2B a17bcde8563a3f1a8e88c50e981b3d93439a19d0b1186c511826f9836be8efb5bcc2f0031c28887bf0c67ef9e8c9942eca641f923f87c458f070507645007f0a SHA512 2309da17ae7bfd32137b02c0533a9d4f30c95d70dea309a009219457f07f36e0b9192e1ac55485513a23d6364247476886a4720ffe83d33a2c493124a82797a1
 AUX memtest86+-5.01-test-random-cflags.patch 679 BLAKE2B 62ccc56c3f127b3e3213d6bb9605094dd8ba2580d2047873583db8b7a3d48db225eb8b7013319903e92ba9c658569470fb6b3de4f4b7f6b3686efdd5f9c132eb SHA512 a000cf28d69396b0707519bb995f086457f8fa5283299164d969dbf02abea86b566016d71fac7e887c6089bc39c58be9e5c885cfb5f8e7eb815ea1741e097bb6
-DIST memtest86+-2.01.tar.gz 165984 BLAKE2B 6d339755472515734a74216d50d9b5f716439ffeb710cc11cec466b60d1ae0679e28fc10e0fb9a173e853193a998be88459f9fca8b2cac07cb108667d8a36844 SHA512 fb8fd8f7e3f597701a031189c18bd95247fe1fc936838359411a32a24fb8845a0012ebd2e02bb399fad1fab0f493dbe475a3e646c272d10e6343af4646d8347b
-DIST memtest86+-4.00.tar.gz 270327 BLAKE2B af33ecc65e2418d84a008f659c1c5fa5949c2b16963da08c1f15cfc89681c6900d46d9f3d15d9beb545eedbb641c174c37a53b1a6ebef63a7b9ff9d7034f28b8 SHA512 3d2075ec5fe18ce356f75bf473aa189ba6153269c63be263f13e7d553f468a57f147f1e62dad16ad9ec4fb57724e1c67c69eeffb33db3e1f6300357f26b586ba
 DIST memtest86+-4.20.tar.gz 206044 BLAKE2B 69192572fd4d83a0f447683ea48336924b41d623a57a5b9b3ef87b8dc77dedc1472599fb220bd10f8b2ae7280118caa9f3b9676a183ce6617991fc9b2204bfc6 SHA512 2213a64cd3036f840dd816dd49b62b0f082e1fbfe64e02f52370f04e39857f042dc8bc0044c1a88ba678e72c1eb8629aa706fabfd3c052e41c29c073f4e8c441
 DIST memtest86+-5.01.tar.gz 214877 BLAKE2B ef63eaabaf6d3d27b85c73618c692dd61cce52f3670a57958d181623888bdc3aa538855da9a82ec2ab70b180938e3df99f0b06f606b2d6f64e8aabbe781b3050 SHA512 d872db35ef733ec8f49094251f2bf6b98cc80eb06d04044be3aecf28d534f24ba293a08b9979b112dbd07cf27368148939a33a32c7010fc9581a3a5b150c94d7
-EBUILD memtest86+-2.01.ebuild 1282 BLAKE2B 0d237e23b7ff5393683e793cd40ce0b1b27cccd851579c553ad15c1fa9a2f6ae2436794f339cba2242a61c506fefabe04252e4540960108468f4547e236e4950 SHA512 f7feb596e0b4ca6c9bf3fd14a14051cb7f4f3d94570f27c9adc8fbc162313c95476111cc7995284d30d0ebada100485184df4a0a70c36e8d90da25fa0f9b9a89
-EBUILD memtest86+-4.00.ebuild 1932 BLAKE2B 847e74b095bf46b34f7a9edda230822a9a12d3666125e9170ce3b8bbb136cba33e639f0f40d53773ed8e3f08c5cd6234c8784ffe6c63a58fc3738f1bafbfb156 SHA512 e18073eabfe5e206790f7cded2834ebf28d531488af9489e10f3b332d76a0a1f1ab5e071479e22fd1bbb0700489d3c9486a9f8038a3d147b658cb02008221db9
 EBUILD memtest86+-4.20-r1.ebuild 1950 BLAKE2B 7748912836525d02d7909675f7c8b362f253fc3567495d243b0a08e3570d382c300de6239c3052af5b60db1761157754555f6f98793a7c285aeadc7b2f274cee SHA512 5bff802747e652f95f2b8bd7c4d73efaf581c5008f1bb6c17aa492335939012b9ef661a2986447a0e6f9493c522ea9cbd93f4ca3e6164f7142543b8a05adf2c4
 EBUILD memtest86+-4.20-r3.ebuild 1756 BLAKE2B 1e9d161b3358030cfc89d3b1c439d9494ac2063af1db9c28432e60200b5825a675ea421f6c7161bc7a9f151efdcfb1483a669aa60a4bcdd97961e00b2f643111 SHA512 3cc41d0ccd74282b5ed2929359829f4377478605b06c868728e9446f3b1df8a5f38166d793f0c800428b17b724118e0eafdfb44791ef577c8bef87d614d422e2
 EBUILD memtest86+-5.01-r2.ebuild 2384 BLAKE2B 6a7205c3fa74bd10c7c290151a49c2e6cb4bb966bf193a34956c763eca1969d2930a9abae09f5558facb37ce74c5ae32ae20824f6e75809b8f2e9fde310d6963 SHA512 a2912927e8d490829a187959711c85438649a912e440af637f1a9d401a574dcaf368203337123f5c9168897e5bdca0658170c2b07861bc4b10b40e53693820f4
diff --git a/sys-apps/memtest86+/memtest86+-2.01.ebuild b/sys-apps/memtest86+/memtest86+-2.01.ebuild
deleted file mode 100644
index 2051cc102de5..000000000000
--- a/sys-apps/memtest86+/memtest86+-2.01.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit mount-boot eutils
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="serial"
-RESTRICT="test"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-2.01-hardcoded_cc.patch
-	epatch "${FILESDIR}"/${PN}-1.70-gnu_hash.patch
-
-	if use serial ; then
-		sed -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' -i config.h
-	fi
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	insinto /boot/memtest86plus
-	doins memtest.bin || die
-	dodoc README README.build-process
-}
-
-pkg_postinst() {
-	einfo
-	einfo "memtest.bin has been installed in /boot/memtest86plus/"
-	einfo "You may wish to update your bootloader configs"
-	einfo "by adding these lines:"
-
-	einfo " - For grub: (replace '?' with correct numbers for your boot partition)"
-	einfo "    > title=Memtest86Plus"
-	einfo "    > root (hd?,?)"
-	einfo "    > kernel /boot/memtest86plus/memtest.bin"
-
-	einfo " - For lilo:"
-	einfo "    > image  = /boot/memtest86plus/memtest.bin"
-	einfo "    > label  = Memtest86Plus"
-	einfo
-}
diff --git a/sys-apps/memtest86+/memtest86+-4.00.ebuild b/sys-apps/memtest86+/memtest86+-4.00.ebuild
deleted file mode 100644
index 354fe5b3134f..000000000000
--- a/sys-apps/memtest86+/memtest86+-4.00.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-QA_PRESTRIPPED=/boot/memtest86plus/memtest
-
-inherit mount-boot eutils
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="floppy serial"
-RESTRICT="test"
-
-RDEPEND="floppy? ( >=sys-boot/grub-0.95 sys-fs/mtools )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-4.00-hardcoded_cc.patch
-
-	# Merged upstream
-	#epatch "${FILESDIR}"/${PN}-1.70-gnu_hash.patch
-
-	sed -i -e's/$(LD) -s /$(LD) /' Makefile
-	sed -i -e's,0x10000,0x100000,' memtest.lds
-
-	if use serial ; then
-		sed -i -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' config.h
-	fi
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	insinto /boot/memtest86plus
-	newins memtest.bin memtest || die
-	newins memtest memtest.netbsd || die
-	dosym memtest /boot/memtest86plus/memtest.bin
-	dodoc README README.build-process
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-pkg_postinst() {
-	mount-boot_pkg_postinst
-	einfo
-	einfo "memtest has been installed in /boot/memtest86plus/"
-	einfo "You may wish to update your bootloader configs"
-	einfo "by adding these lines:"
-	einfo " - For grub: (replace '?' with correct numbers for your boot partition)"
-	einfo "    > title=Memtest86Plus"
-	einfo "    > root (hd?,?)"
-	einfo "    > kernel /boot/memtest86plus/memtest"
-	einfo "   or try this if you get grub error 28:"
-	einfo "    > title=Memtest86Plus"
-	einfo "    > root (hd?,?)"
-	einfo "    > kernel --type=netbsd /boot/memtest86plus/memtest.netbsd"
-	einfo
-	einfo " - For lilo:"
-	einfo "    > image  = /boot/memtest86plus/memtest"
-	einfo "    > label  = Memtest86Plus"
-	einfo
-}
diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 94ca2333d42b..883f957e6f39 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -4,14 +4,8 @@ AUX nix-1.11.6-respect-LDFLAGS.patch 2332 BLAKE2B 83382d89c3ca40404460629f42dcdf
 AUX nix-1.11.6-systemd.patch 394 BLAKE2B 144b5e2c4f55077bb0c722ff71bf0a587f20858c27fe4a3bb9cd44bec159a30122382b7fff3b998478aaa4f93519247708926a6369f9ac2fa1a3d43cc5808a38 SHA512 2c5a701815e1c3091c5568b01d6709a9a227c18967a7c0eff7676f741c87f5082a49842427022991656cac079734741820bb8a895679a65cce657a29df86ddcd
 AUX nix-2.0-user-path.patch 390 BLAKE2B 08118fb6664ffe96bccd68596e7aa26fe895a9285d1dabdfe06cfa55c8ab578160f940537cc9ed7ba7ef408d167f23cc914127313bed992baac747f49a9dd054 SHA512 3eab6ae522767bd8c1f2adf6a00544f7fecb698dedff68835a880a7ac533dd4e188661a955f111769525828d761612c49669a36ccf25f16bab6d325313da3232
 AUX nix-daemon.initd 369 BLAKE2B bae15823ecd559733ebc8bd6f88314d93dccdf586dafe785ae58ed46949d1329c9bb7da93dc2918e2c0ccd3aacb50e3fdb380c019c85fb09f86575d9c80ce116 SHA512 e5a05a9f5efb179ebf3a98e58435a571e87716166a351045be4cbd19423e426cf11ed9b2eb2df6222d00e43e5d38fbed5da579820f776031e3c70de0206f980d
-DIST nix-1.11.15.tar.xz 632544 BLAKE2B 3624c396c67a7c64e2ba16fd500951e6cf1b6f29f31929793072b5dfcdf1ffe40d5645c58d3967dd82d6c8d0bf6e5e2598a0d8d5fc3f82b22ea279a7854b1aca SHA512 449b3c78b74c776215dfbe9d6d09b96d8c6abf996c69c525073df12d0cffb1a2868890d356fbb52c794e2c6f485018756395625e7b170166f7c6f9e2bdd364d9
-DIST nix-1.11.16.tar.xz 632440 BLAKE2B 0b1966b1445a18616d6ff33e7fa3d1776626872c7cfeb54be4c77b998841db69f1e6aea7638edb21fa67442b953fb1cbaf7752c841d7d21f62dd63885a823834 SHA512 164f728c96fc6609134334e61f674961dfc0f02bd2f5d1d7800d2623fe80d896bfd0b7fba0a723b1bfe23663d4c7cf3e419a7c1992d67e80eb3d6b3bdf60a2a8
-DIST nix-2.0.1.tar.xz 796520 BLAKE2B bd71d625f08b785b74a31f74e5ecdbca247bf9fc29a5a49a3e7db51c70911c5c200804783b0ee38164e909d3c287d0484fc0d617d11be6ca41531682e8f14cef SHA512 05013a2242b558a2bd3b104b9fdb570ceddf37466e420daf0c81294f9dccdf190472bd32550f00915b1cd1b738576b46c112af39c198cfe5f0121b9f6f2f4d92
 DIST nix-2.0.2.tar.xz 796404 BLAKE2B 0906488bf2c800544c0747a6860ef51f667467f50039f725cf6ec05b8389462fe073bddceba106922a7611fd784b58ed5ca321efba0065b0f424aa53d7620990 SHA512 605e2c6dbc814470c25aa4f0aca77bfd11fd6d5c263ef38915cb9b852e77bcff08d515e76de8d929c9eacd02ffeaa5dd5f6b337461d54a1b2648b1fc505c98fa
-DIST nix-2.0.tar.xz 794084 BLAKE2B 9596788df6aaad144d408e95f34575bf985849bb57424c7aac4dc1f2f2d846302bf78fc05682ce92fbaf000db04a326f867a76f5963a80b72b63e3678754247f SHA512 4531b4648108019d44521af94f8243936d2df62701395c0c448795f1984d4b5ade2438c92d12e5414d493909811e3bcb902c85539932c7e44d98d4254a2a531d
-EBUILD nix-1.11.15.ebuild 3097 BLAKE2B ae4fa60ed9ec5100beaa8f5f26cb4f269976f3e9503f1125c8ee4b9900631a8e433b23a543648de0b9229b315c57404ef98c892bb0fd5f2fe4ca88c76f29ff06 SHA512 e7f826e5b8fec2d6ce824981e422a2828a08cb8c4d1ccacfc0d1807e72e3ec7ec6a0b7f2d4b2dba8aa7aaf5c0856261899e52ecce1769d62732bc28be0791498
-EBUILD nix-1.11.16.ebuild 3097 BLAKE2B ae4fa60ed9ec5100beaa8f5f26cb4f269976f3e9503f1125c8ee4b9900631a8e433b23a543648de0b9229b315c57404ef98c892bb0fd5f2fe4ca88c76f29ff06 SHA512 e7f826e5b8fec2d6ce824981e422a2828a08cb8c4d1ccacfc0d1807e72e3ec7ec6a0b7f2d4b2dba8aa7aaf5c0856261899e52ecce1769d62732bc28be0791498
-EBUILD nix-2.0.1.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48
+DIST nix-2.0.4.tar.xz 798352 BLAKE2B 0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77 SHA512 bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0cffff617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
 EBUILD nix-2.0.2.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48
-EBUILD nix-2.0.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48
+EBUILD nix-2.0.4.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48
 MISC metadata.xml 566 BLAKE2B 3891567411993e2864f7e0d6fd158937c0c7075ca92aef2413d28e0aa18e6d51982383d3ee71ab6b926ba6a397c59c3ef84f4a4b7cdd4f103f4256f4693f0cf0 SHA512 93d33392316264e30403abbf79a0bf836ed35f2eaf802f930743cb9f31955f939ac263946b93ee32bba34d2534329d95476e96816d1893747b077b0d9690281c
diff --git a/sys-apps/nix/nix-1.11.15.ebuild b/sys-apps/nix/nix-1.11.15.ebuild
deleted file mode 100644
index d4e616516f72..000000000000
--- a/sys-apps/nix/nix-1.11.15.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix"
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc sodium"
-
-RDEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-db/sqlite
-	dev-libs/openssl:0=
-	net-misc/curl
-	sys-libs/libseccomp
-	sys-libs/zlib
-	gc? ( dev-libs/boehm-gc[cxx] )
-	doc? ( dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	sodium? ( dev-libs/libsodium )
-	dev-lang/perl:=
-	dev-perl/DBD-SQLite
-	dev-perl/WWW-Curl
-	dev-perl/DBI
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-2.6
-	>=sys-devel/flex-2.5.35
-	virtual/perl-ExtUtils-ParseXS
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.11.6-systemd.patch
-	"${FILESDIR}"/${PN}-1.11.6-per-user.patch
-	"${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-	[systemd] # systemctl enable nix-daemon
-	[openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-	\$ nix-channel --update
-[as a user] install nix packages:
-	\$ nix-env -i mc
-[as a user] configure environment:
-	Somewhere in .bash_profile you might want to set
-	LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-	but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-	nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-	enewgroup nixbld
-	for i in {1..10}; do
-		# we list 'nixbld' twice to
-		# both assign a primary group for user
-		# and add a user to /etc/group
-		enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
-	done
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/nix/var \
-		$(use_enable gc)
-}
-
-src_compile() {
-	local make_vars=(
-		OPTIMIZE=0 # disable hardcoded -O3
-		V=1 # verbose build
-	)
-	emake "${make_vars[@]}"
-}
-
-src_install() {
-	# TODO: emacs highlighter
-	default
-
-	readme.gentoo_create_doc
-
-	# here we use an eager variant of something that
-	# is lazily done by nix-daemon and root nix-env
-
-	# TODO: will need a tweak for prefix
-	keepdir             /nix/store
-	fowners root:nixbld /nix/store
-	fperms 1775         /nix/store
-
-	keepdir             /nix/var/nix/profiles/per-user
-	fperms 1777         /nix/var/nix/profiles/per-user
-
-	# setup directories nix-daemon: /etc/profile.d/nix-daemon.sh
-	keepdir             /nix/var/nix/gcroots/per-user
-	fperms 1777         /nix/var/nix/gcroots/per-user
-
-	newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
-
-	if ! use etc_profile; then
-		rm "${ED}"/etc/profile.d/nix.sh || die
-		rm "${ED}"/etc/profile.d/nix-daemon.sh || die
-	fi
-}
-
-pkg_postinst() {
-	if ! use etc_profile; then
-		ewarn "${EROOT}etc/profile.d/nix.sh was removed (due to USE=-etc_profile)."
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/sys-apps/nix/nix-1.11.16.ebuild b/sys-apps/nix/nix-1.11.16.ebuild
deleted file mode 100644
index d4e616516f72..000000000000
--- a/sys-apps/nix/nix-1.11.16.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix"
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc sodium"
-
-RDEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-db/sqlite
-	dev-libs/openssl:0=
-	net-misc/curl
-	sys-libs/libseccomp
-	sys-libs/zlib
-	gc? ( dev-libs/boehm-gc[cxx] )
-	doc? ( dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	sodium? ( dev-libs/libsodium )
-	dev-lang/perl:=
-	dev-perl/DBD-SQLite
-	dev-perl/WWW-Curl
-	dev-perl/DBI
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-2.6
-	>=sys-devel/flex-2.5.35
-	virtual/perl-ExtUtils-ParseXS
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.11.6-systemd.patch
-	"${FILESDIR}"/${PN}-1.11.6-per-user.patch
-	"${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-	[systemd] # systemctl enable nix-daemon
-	[openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-	\$ nix-channel --update
-[as a user] install nix packages:
-	\$ nix-env -i mc
-[as a user] configure environment:
-	Somewhere in .bash_profile you might want to set
-	LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-	but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-	nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-	enewgroup nixbld
-	for i in {1..10}; do
-		# we list 'nixbld' twice to
-		# both assign a primary group for user
-		# and add a user to /etc/group
-		enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
-	done
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/nix/var \
-		$(use_enable gc)
-}
-
-src_compile() {
-	local make_vars=(
-		OPTIMIZE=0 # disable hardcoded -O3
-		V=1 # verbose build
-	)
-	emake "${make_vars[@]}"
-}
-
-src_install() {
-	# TODO: emacs highlighter
-	default
-
-	readme.gentoo_create_doc
-
-	# here we use an eager variant of something that
-	# is lazily done by nix-daemon and root nix-env
-
-	# TODO: will need a tweak for prefix
-	keepdir             /nix/store
-	fowners root:nixbld /nix/store
-	fperms 1775         /nix/store
-
-	keepdir             /nix/var/nix/profiles/per-user
-	fperms 1777         /nix/var/nix/profiles/per-user
-
-	# setup directories nix-daemon: /etc/profile.d/nix-daemon.sh
-	keepdir             /nix/var/nix/gcroots/per-user
-	fperms 1777         /nix/var/nix/gcroots/per-user
-
-	newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
-
-	if ! use etc_profile; then
-		rm "${ED}"/etc/profile.d/nix.sh || die
-		rm "${ED}"/etc/profile.d/nix-daemon.sh || die
-	fi
-}
-
-pkg_postinst() {
-	if ! use etc_profile; then
-		ewarn "${EROOT}etc/profile.d/nix.sh was removed (due to USE=-etc_profile)."
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/sys-apps/nix/nix-2.0.1.ebuild b/sys-apps/nix/nix-2.0.4.ebuild
index bea6bd1a4240..bea6bd1a4240 100644
--- a/sys-apps/nix/nix-2.0.1.ebuild
+++ b/sys-apps/nix/nix-2.0.4.ebuild
diff --git a/sys-apps/nix/nix-2.0.ebuild b/sys-apps/nix/nix-2.0.ebuild
deleted file mode 100644
index bea6bd1a4240..000000000000
--- a/sys-apps/nix/nix-2.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix"
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc sodium"
-
-RDEPEND="
-	app-arch/brotli
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-db/sqlite
-	dev-libs/openssl:0=
-	net-misc/curl
-	sys-libs/libseccomp
-	sys-libs/zlib
-	gc? ( dev-libs/boehm-gc[cxx] )
-	doc? ( dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	sodium? ( dev-libs/libsodium:0= )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-2.6
-	>=sys-devel/flex-2.5.35
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.11.6-systemd.patch
-	"${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
-	"${FILESDIR}"/${PN}-2.0-user-path.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-	[systemd] # systemctl enable nix-daemon
-	[openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-	\$ nix-channel --update
-[as a user] install nix packages:
-	\$ nix-env -i mc
-[as a user] configure environment:
-	Somewhere in .bash_profile you might want to set
-	LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-	but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-	nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-	enewgroup nixbld
-	for i in {1..10}; do
-		# we list 'nixbld' twice to
-		# both assign a primary group for user
-		# and add a user to /etc/group
-		enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
-	done
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/nix/var \
-		$(use_enable gc)
-}
-
-src_compile() {
-	local make_vars=(
-		OPTIMIZE=0 # disable hardcoded -O3
-		V=1 # verbose build
-	)
-	emake "${make_vars[@]}"
-}
-
-src_install() {
-	# TODO: emacs highlighter
-	default
-
-	readme.gentoo_create_doc
-
-	# here we use an eager variant of something that
-	# is lazily done by nix-daemon and root nix-env
-
-	# TODO: will need a tweak for prefix
-	keepdir             /nix/store
-	fowners root:nixbld /nix/store
-	fperms 1775         /nix/store
-
-	keepdir             /nix/var/nix/channel-cache
-	fperms 0777         /nix/var/nix/channel-cache
-
-	keepdir             /nix/var/nix/profiles/per-user
-	fperms 1777         /nix/var/nix/profiles/per-user
-
-	# setup directories nix-daemon: /etc/profile.d/nix-daemon.sh
-	keepdir             /nix/var/nix/gcroots/per-user
-	fperms 1777         /nix/var/nix/gcroots/per-user
-
-	newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
-
-	if ! use etc_profile; then
-		rm "${ED}"/etc/profile.d/nix.sh || die
-		rm "${ED}"/etc/profile.d/nix-daemon.sh || die
-	fi
-}
-
-pkg_postinst() {
-	if ! use etc_profile; then
-		ewarn "${EROOT}etc/profile.d/nix.sh was removed (due to USE=-etc_profile)."
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 7931fdc9bbba..a798d603e343 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,7 +1,9 @@
 DIST osinfo-db-20170813.tar.xz 64424 BLAKE2B b4d46f82197bb5f1b956fe72e87ef365b139c6a1ab90906ac30dd3191fb6c3f5ef3978ceaf56d029a3766e8354558aa00554a767c637eef49b861b6a775fc614 SHA512 0ae4906b5c3eb400ca397f0c3baf5146b8197ee2dc712b1b89dd2f443f9505aee208327f008118628407b54ce52390a8b6138425f3f6f974b94f4a8d79955653
 DIST osinfo-db-20180416.tar.xz 70324 BLAKE2B 44bcc2be467f7e1ce50d1a0fd2bd2f3695f6aa68ab038fd0d548a8c46606032a9fb805152f0de08a0f56d6e096397cc17582a7451e0695dbb58760fa94363630 SHA512 e8d25dc501909803a949987239ea5a2e7a01ac4bb536f1040edff93d8ce3871499fceda882da799ada295dd5d4cc284e99c6b5f493c464dda776f6144803a1f1
 DIST osinfo-db-20180514.tar.xz 70780 BLAKE2B ccde92692b6b6a77007bd4f78f8f3f0e9db4c4d8ed3a270df2f8ba6a8073c3467a9f51e53cc7ab9138b66af7424bdb84cad0fc76edf9c5a19b8ce798bffec155 SHA512 518791269148c0e3cc6b65b4481f37284780497a5643a1c9523458aa56ecd47cb7bfe9d95c086b2155b282369214c4cd3e2926c304ab84f78ddc0568d3b30216
+DIST osinfo-db-20180531.tar.xz 70868 BLAKE2B 919a2767d24af91e9aa7b14f3a238b9239aa774bec04233c95929981531d1fabb24ebfdc5c92ab401f51cf6bbf2432b6e8486a833d06a96a51e1893f39f6f641 SHA512 48b3bd2e52c16829f70d62ad8b1f32313956fcb7085cd906965f1d7b12f61952c60123ef335fbd4a1dd86aebc9751b9bf44f71c61f4bb6ac9bcb30d514ac36a9
 EBUILD osinfo-db-20170813.ebuild 671 BLAKE2B 21131786f459a25aab816a1ea30067b7f3ed84d00063d7e2ed330c060f7e8616171e298379ac0bfad2ac54c2e847072b8a481ef85be280f19b9ded9f8f2494a7 SHA512 feecb9a6298484e19e9d78aefa7e75c376b66c0bd676aff22e5ad3fe7a745ea74fc64ddbfb6dde002f6b58a72720e5ddb571ef616c9e1af04411a910aa1b2694
 EBUILD osinfo-db-20180416.ebuild 673 BLAKE2B bc1f0a9c4f01f70e62d28c388aba1b3892cd8445c18a0020f0cb5cd5e998221f5009b828790229c73a8f62ee13dee14c9c35ae1464bef1fec04ecd1b8baf3dd4 SHA512 e873662320619e38cb827b3987208a3c74a472cc969c1774e33c0a2a91041bb17c20574513667170091c204805b042a74f7ce94da011fb8ff9dcf17ff59ab377
 EBUILD osinfo-db-20180514.ebuild 673 BLAKE2B bc1f0a9c4f01f70e62d28c388aba1b3892cd8445c18a0020f0cb5cd5e998221f5009b828790229c73a8f62ee13dee14c9c35ae1464bef1fec04ecd1b8baf3dd4 SHA512 e873662320619e38cb827b3987208a3c74a472cc969c1774e33c0a2a91041bb17c20574513667170091c204805b042a74f7ce94da011fb8ff9dcf17ff59ab377
+EBUILD osinfo-db-20180531.ebuild 673 BLAKE2B bc1f0a9c4f01f70e62d28c388aba1b3892cd8445c18a0020f0cb5cd5e998221f5009b828790229c73a8f62ee13dee14c9c35ae1464bef1fec04ecd1b8baf3dd4 SHA512 e873662320619e38cb827b3987208a3c74a472cc969c1774e33c0a2a91041bb17c20574513667170091c204805b042a74f7ce94da011fb8ff9dcf17ff59ab377
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20180531.ebuild b/sys-apps/osinfo-db/osinfo-db-20180531.ebuild
new file mode 100644
index 000000000000..9e69a433ac60
--- /dev/null
+++ b/sys-apps/osinfo-db/osinfo-db-20180531.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="osinfo database files"
+HOMEPAGE="http://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	sys-apps/osinfo-db-tools
+"
+# we don't depend on intltool here, contrary to README, as the tarball already
+# contains the processed results with translations in XML files
+
+src_unpack() { :; }
+
+src_install() {
+	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
+}
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 17f04bcab905..dc846cd37873 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -2,5 +2,5 @@ DIST pkgcore-0.9.4.tar.gz 593025 BLAKE2B f7df069a4e2f9c790eb79c7fab74cba447eb5b4
 DIST pkgcore-0.9.7.tar.gz 592202 BLAKE2B fa16380e89ad2fb2a05d8f08387c3cfa2203b4e6faad3fc4758d572eb08d6c64f781eef8c2d56151f1facec3a202325d4c4a271a1a3ced88df7371f2af75dbf3 SHA512 cb996fd35a8e4e73acfacf1942d498932ec092a282397bd41df72eea26b6d08c15e01b96ece8ebb6876e84281d85d4f8ef81e1f2ef107adff1b984ee592d6a6f
 EBUILD pkgcore-0.9.4.ebuild 1431 BLAKE2B 2d851e84a63106f9add0c0748cf2b39a4481698285b050a98ce0419e1c819b6116323936c273014f99f1916543b87cd23bdb18a2fad2ded1f6924787c1a3179f SHA512 fe0cd648df1713c8c442e880677515c9768b26afd19505168f69eb810866fe37cc970c04a6b64240646022c3bebeb09be861ecb5277569203d001f1cc8136da9
 EBUILD pkgcore-0.9.7.ebuild 1497 BLAKE2B 97b9457800e9cccef06aba9b566adbea6c7798fb1275b08646afb4bc2145f0e65375055d4430e06ee063b95b00417006a0824d6285be2cff420934561adf921f SHA512 07ad1813bc307022300766e424ae9b09a995300c802d2f89557be74dbb3783da1cdec9b56c409d6bcc647c2be49aa1524a8b63ab2f14f965d6f099a2e8deeeb5
-EBUILD pkgcore-9999.ebuild 1594 BLAKE2B 2a25e131ceebaf55e25c21a9de6fb081b8fd4db31b2bd7eca7bc3edf1f4c40d643b56d41377864d6cb96a13d06c194ab21bddec12a7e443b94cb637a7711c4a9 SHA512 21fe33032dd340ef7bf3fa65724259e3de277f38b568c29cb64f6759f9ef3029c99e589f041eff4ef9d65a905b4abdf3760a7f6e71502ad92e028562c68030c4
+EBUILD pkgcore-9999.ebuild 1378 BLAKE2B c09691826d38885886db6d58bf5bd27b1e88eaddd2aca495c389ad3a29eebefbd991a297bb932d3532468e36fc81d7be124d72f2ca8586a17b11da95a350ff87 SHA512 20e37e0e2c79b181f7f2f591468df50bf52c96041048af142ef27ae15d76c20e5448c829d104066fc54ef595261ac76fc97667e3334be5518fc8ea715fd38132
 MISC metadata.xml 409 BLAKE2B 42709aa3a13109a21d1cfa0db9ef758216a2e902d68a10f0db14b4019464a702ef0c91079d0856f9389a2221886bbd3d5d5480ca99efc708543d198d00b7ed3e SHA512 ec04202f105a62a697511c7a89dad118b3618fdce4044c25648492e1557a95b9e29c01a08fca21e106273485471af98c52a6db6b2a40605a67a632938faebd29
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 53434ea7411a..28296ac77537 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+EAPI=6
+PYTHON_COMPAT=( python3_6 )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
@@ -26,24 +26,18 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SPHINX="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 fi
-RDEPEND="$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5})"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" =dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.7.5[${PYTHON_USEDEP}]"
+	RDEPEND+=" >=dev-python/snakeoil-0.8.0[${PYTHON_USEDEP}]"
 fi
 DEPEND="${RDEPEND}
 	${SPHINX}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
-	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
-pkg_setup() {
-	# disable snakeoil 2to3 caching...
-	unset PY2TO3_CACHEDIR
-}
-
 python_compile_all() {
 	esetup.py build_man $(usex doc "build_docs" "")
 }
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d90439aea715..3483209b19e3 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,12 +3,14 @@ AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906
 DIST portage-2.3.13.tar.bz2 945477 BLAKE2B 0ad44859f04db529713cc80a51e6dadc767ed6b6d0aef1d070650d82133c05e161eaa9fd1e208b3078c513ccf6f73136b8bf865542f0dc9396de9142bad1d32c SHA512 71d9ea6c9a889572f60e7e501e9f8739db588cffd98a431303906eb90c1f7bb85c55f6779cbfb921630149d1b3174539fe2357fbeffbbe9857998907e3215ad3
 DIST portage-2.3.19.tar.bz2 954921 BLAKE2B e1bb3606ff2c5ba7b2123c61469b99f4d5d89f534a9af26065ac03bb2accd00cd363e4027e33546fc9b6d01b2fb65ca0d4311c6e2e8cc518c09030c979a69240 SHA512 94899bdfa4d22c846234bd28d4744613202cf67d3f32c242cb7fb60b17419419a2a29912e584ade7df52fba4c6a58774c5859148352221c978f34b4e7680981d
 DIST portage-2.3.24.tar.bz2 959266 BLAKE2B bc15f10599c694ad29f5a55264e929d0a04a9c5211e9cafd4f1a35de1d77e655d99df0ceb352fd431a8cefd40c733064422d8f41099edf7263aa36ef8cfd2ba8 SHA512 fca250d4afc1819a27b67daff770132ed4e88fb067038992a6b3f8aac63604536366ea628dd30c24f93db19ae55e88da372598ccc489bcf445038dfe860ce0ec
+DIST portage-2.3.40-bug-656942-bug-657436-937d0156aa06.patch 15214 BLAKE2B 0351f82cd46aa1523eb0f70109551009a422546f2fbde1beee7a18dad4ecbfc6465b3b3052a25720196950f7da81adeb66d87940f2b477fbeca27afba56fa18e SHA512 b0482b8dac8af97b841ded426001872c1c708f649dc7774bd3c7003179888fd4d126ece33d001d127b643d88b8a70b9af75bbeb36beeaca7b8ad308f92ff72e7
+DIST portage-2.3.40-bug-657436-937d0156aa06-1fc628eead43.patch 4131 BLAKE2B 1b051097ef4fb073d22b9ef3472077b4845190ec3839886f462cacbee0996dc4c036549c4beab09025e1bb42f421e5032144e90197e3aa5de08dd7d8d1c50fbb SHA512 5910469816b69afb7a0078dd3b35a5304e2c806ac03ff3949603cf4162900fd9dd1df15661b91a2181528e8406679e525308822a0f6ddf4799c79fa9652c27a9
 DIST portage-2.3.40.tar.bz2 995122 BLAKE2B 3bfadee6cf57dace32bb4a365850650e13664202f3b16bf75821ff6226e85da823785ac87875fa82bd5cf1b953d638773819495f73f471c06ffd6926518df1ac SHA512 ded128c1941664fab6bc95f05115ec08900fddaedd1b6f12afa48da024531ee8939134d49759e09995c76a95e41beafdbf5528a5b62d3bf21c826ab1ac0cd1c5
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
 EBUILD portage-2.3.13-r1.ebuild 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2896e0262f09c0d3243e8ef538582353e0386819b5c35ca192c2a3e28040296451157a5bb757c78bdb28885f101b22 SHA512 99cfbd35d7666eef17ea804a14788f4d1612d70743d8d37e4cd94e9eacace3486f7e78e4032215e52abf43fd416bdfbe5dd59178d494fa39b85d25ce569777db
 EBUILD portage-2.3.19-r1.ebuild 8415 BLAKE2B 2f317c8d4c636a870ed27cbb4dbdc3a0cba6decbef29944f5eec3d8091e6b4fd098033da44bffe55a312c23de2e9dbd16b73a9d69ba2d3c2d2ce05ba0d6cf033 SHA512 b4d363547eab3e074da48d9050b1dd091372114ded9ff146df3f0168264f7cc7781d4b5968df42f3a5dea8fcdfa1c483a5e3ecdefc59222503f7daf441c9da20
 EBUILD portage-2.3.24-r1.ebuild 9269 BLAKE2B ba60aee1fba595b80a91ee183275cd0b29d13fb78281c8d62a5b5509a557f8ddbfbd6a641fb2b7c6bc7459f35bd12574e396355363574fc1463081a8e42d22fc SHA512 a2938faf430e68a03bdf42bdfc00ee08392e18bb07ecb9b43dafca26572c0e64b3e74e55fdc8b63d85b3f2cca686df431714ddebac78163586c36be620eee1ea
-EBUILD portage-2.3.40.ebuild 9595 BLAKE2B d0ac87f07bc85b82d91dfcc5ded9fb77d76fe1133b7e07a74420d5a6351c77e382760352f3ded2ff27d6cde0f2b401dfdce2cc84fd8b8994dc084cf23710defc SHA512 0008a37f2a4c5d35a3a59de1135f620bf27684ce8cd02fb429438e00bb089d5b4f0bdf5b033991649c19b3a39cf89c532cda0404f3c6a6e130f6944a018419bc
+EBUILD portage-2.3.40-r1.ebuild 9953 BLAKE2B eb060b5615c09738798ba233c5f4e180fbdf10fa409e177e1ef0ac64a047eb7e344037fbcde2fa6088aa1754496d55c68b0c3e966669cb439995904b4faac609 SHA512 23051db511f38c8a8d2093db014d9e956d54635d32d5fa0d25e51fd1708dcd739ba2a10ee47032c35b7e294c49c7d0785d3fa9cbed2a413148e4d599da63376b
 EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
 EBUILD portage-9999.ebuild 8829 BLAKE2B e28682fac496521e83599633424ae0cad64dae33849acc131c3641bfc93627f343b4b44404ac833b91c2214f4b7a23e5e58b9a631d544a93996cb9384c23ac36 SHA512 7d6b0e36d43dab7d824c420d6a7a0f1aeaa736e5e153be5c57f30c91018b89629ee4be3d05e2b3179f1cc1d841fee473683f8cf194b6de6767d576607a1702a9
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.40.ebuild b/sys-apps/portage/portage-2.3.40-r1.ebuild
index 2fef032b5260..fd63d281a271 100644
--- a/sys-apps/portage/portage-2.3.40.ebuild
+++ b/sys-apps/portage/portage-2.3.40-r1.ebuild
@@ -10,13 +10,13 @@ PYTHON_COMPAT=(
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 systemd
+inherit distutils-r1 eutils systemd
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-fbsd"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
@@ -85,7 +85,9 @@ prefix_src_archives() {
 
 TARBALL_PV=${PV}
 SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
+	https://github.com/gentoo/portage/compare/b7f94fccf4163364ab7b4c4f0dcd42b8847f03e0...937d0156aa060bdba9095313dedbb62e0a993aea.patch -> ${P}-bug-656942-bug-657436-937d0156aa06.patch
+	https://github.com/gentoo/portage/compare/937d0156aa060bdba9095313dedbb62e0a993aea...1fc628eead43fa5da4b142479aa004ded8acceab.patch -> ${P}-bug-657436-937d0156aa06-1fc628eead43.patch"
 
 pkg_setup() {
 	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
@@ -94,9 +96,8 @@ pkg_setup() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
-	# apply d07a47ff3c06
-	sed -i 's:("--dynamic-deps", "y") != "n"$:\0 and "--nodeps" not in myopts:' \
-		pym/_emerge/create_depgraph_params.py || die
+	epatch "${DISTDIR}/${P}-bug-656942-bug-657436-937d0156aa06.patch" \
+		"${DISTDIR}/${P}-bug-657436-937d0156aa06-1fc628eead43.patch"
 
 	# apply 4fb5ef2ce2cb
 	sed -i "s:\\((self._poll_obj, 'close'\\)):\\1, None):" \
diff --git a/sys-apps/rename/Manifest b/sys-apps/rename/Manifest
index 3c844d44a48b..1471abd98ec3 100644
--- a/sys-apps/rename/Manifest
+++ b/sys-apps/rename/Manifest
@@ -3,5 +3,4 @@ AUX rename-1.3-gcc44.patch 330 BLAKE2B c574203c3df6d984de18dda43512ac3f91165789e
 AUX rename-1.3-rename.patch 2345 BLAKE2B 7c7e513726d482c8243e64d1f414c242f8f3b49e2a028567fcee0ae2acf65af4e50f63ffb1a3b6b9740544970e2b648e3c5795e5d60224103a776b6f8bd1b08a SHA512 6d0d757c3991448a1937480bb5c1cd219b681e7cbb9b1fbdb27097715cac04b2d2c0bb0b9c77ab2b131f6bbb8e0774f4da5845e815918d4de6faf96f218adb47
 DIST rename-1.3.tar.gz 83854 BLAKE2B 2dedb5f7765f9f44da1efe61b2152c56b2d3731a2787a89677792434663252f4a0f22c3c2703211fd1c7f0017e98a7e566e369c13a4affeeea62843278d9e940 SHA512 7959ef0417d02aecd23200fbc226acd0cc34595d16efdb931657c2292ec2a0b9ff794406b6baa5234db5c95b1eae8a1dcf1862936a40e66bb70710154c89e5dd
 EBUILD rename-1.3-r2.ebuild 904 BLAKE2B c622dd555b9ca55842551f472d8f58e889ea075e2bed2ed8ec98e05efaa4ff787c62e5a3eeb76d96dde06b00280d1edf0a54eb866fbaed2679686d53aa8033d6 SHA512 a219a73bae81d3edbb11aa389f621c7d371c8395124eab360ead04bae52a1e3e8cbfd19f7286cb503ea23b2d1957bd6e62cc2aebe07399c4c19cbe81c8b70bd1
-EBUILD rename-1.3.ebuild 909 BLAKE2B 0a2c9bec5c6a7c76e7fc5a8a188b60bfd65738d91c738db2abf56e478269d732c520ffc185f4a67f724286cb99274bf385b9bf6323608e8f8e4cec58a67eea41 SHA512 c7a6f92d25f30982315a46eee0804926d0c65c8f7eba250473ddcdc08935ea2b13b62b4c81fed1a8312156f637d8a1d8418f066f5595bb8e59ccfef3504a61df
 MISC metadata.xml 326 BLAKE2B 0952c4b08788858859a0b53a418f4e2504d8a05ad4623495992fed7983c3f70d7eb40a7e042a6adf2b6785bf1228af302704988dbd715acf2347b67b97701d3c SHA512 5d7e26ff9fa47efcf1728be310c91822d85ef3e521a5903d66c9ae8e6449e72465f5f87a2fecc0a51086edc34a325545a0d40210ed320f56bd34af9db9fa45c0
diff --git a/sys-apps/rename/rename-1.3.ebuild b/sys-apps/rename/rename-1.3.ebuild
deleted file mode 100644
index 1a881725c83f..000000000000
--- a/sys-apps/rename/rename-1.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="tool for easily renaming files"
-HOMEPAGE="http://rename.sourceforge.net/"
-SRC_URI="http://${PN}/sourceforge.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e '/^CFLAGS/s:-O3:@CFLAGS@:' \
-		-e '/strip /s:.*::' \
-		Makefile.in
-	epatch "${FILESDIR}"/${P}-rename.patch
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-	tc-export CC
-}
-
-src_install() {
-	newbin rename renamexm || die
-	newman rename.1 renamexm.1
-	dodoc README ChangeLog
-}
-
-pkg_postinst() {
-	ewarn "This has been renamed to 'renamexm' to avoid"
-	ewarn "a naming conflict with sys-apps/util-linux."
-}
diff --git a/sys-apps/rescan-scsi-bus/Manifest b/sys-apps/rescan-scsi-bus/Manifest
index dd7a298bc46b..d99ec56d4328 100644
--- a/sys-apps/rescan-scsi-bus/Manifest
+++ b/sys-apps/rescan-scsi-bus/Manifest
@@ -1,8 +1,3 @@
-DIST rescan-scsi-bus.sh-1.29 15654 BLAKE2B 4009d515d200c2c26baece3ba94f84167cfbc2cd9d2c91a1d928bc119a5a98b63397dae90489180453d7c810700b495b230a23c6791485132e3aa34620afd786 SHA512 dc6bfc5b8c4948c193bcf2522e6f4dedaacf9a9283eaedc9c3bcef0cf3db57a3ed8f3a95b8501853a75e1c83ad28850b291a76217b4c57690e663f3dc63587d7
-DIST rescan-scsi-bus.sh-1.56 22469 BLAKE2B 132ce0990f742ad3f25bf7c30cb9ce1b8392ad67bc31d4040701969a8712b751108ca74f6d24e3e0307d421ec87906c9920c456d609421b384beb961ef04cb73 SHA512 bdd27471568b1ce8b4d9ccc6783f294d141d56c5d5fa5ad46a7ffe983efd46877e25ff67b7869edb4e22ad182d47140c2167a58b80a141f4b3dde9c7e10ae57b
 DIST rescan-scsi-bus.sh-1.57 22575 BLAKE2B 71737a9b2df22d8aecc756bb690cc401343c7951f0e809804eee43e01566e9f5377d5fd2c1d3628602ed64536402a71770dfe8e6514ab2d36851c7f0827f0c7c SHA512 93a061af852e5f9dd3d64ad62692809a11d8ffaac68f5ce08ba1a4fd9201fc66a0a5482d3e6da6e5c36fb00805fa4f7483fc2c85c5aaf6bfc190690ccf7bc733
-EBUILD rescan-scsi-bus-1.29.ebuild 974 BLAKE2B 57f737949b2d7ff16b8c12dcc8a6e0f54b2bbd6834c440f67b449ba3e30ff5c8e85b38adab422359e27bdb56ca03c60bd5039716b3b75d08358c9e7131733324 SHA512 1bd2d0620c3ece51fc4924e61c2775d7a4d17f23066038b95a6be35f1b19948625265954c93d61c2273d24b8c3b659c01ef207cd12865d04ea1ff98778c7f822
-EBUILD rescan-scsi-bus-1.56.ebuild 990 BLAKE2B 53b00122644cdf88cb81fe45066993ae047b3fc649a6637e8de5bde4c485d20abd2c9da54576c3dd763b7c5c8047529baa621ca6b88eb9f7992f76bf82ab2f80 SHA512 58d09b0573c2b10dd931d85fbbf17671734a73905c0f3c027f582bc49c12a6fa769e585ff8a33eb0431105c3337ec16c41a15e5b44bbdd2a90ecc8aa3d93c96b
 EBUILD rescan-scsi-bus-1.57-r1.ebuild 846 BLAKE2B 1db18aaa70ad4d3e8c1b21d2a1e39beee2467c1e8390cea17fb9e27c9b20f187b600460d88f3d770cdcdacca0160763c4744ac222a0c34584b34da5195b6ecb4 SHA512 12cdf6f4b80bb3e41ded7ef9c8ec33ce0fd11a6034ee6b47a2f929440c8d172ecc8c8bf9a70e96aac12d2ffb5ecc6eab8469af2115a135092b7deedec7f408b4
-EBUILD rescan-scsi-bus-1.57.ebuild 828 BLAKE2B 55753ce796f8bdc714a8c11cf7116ab9d5941234b0cd45d85e5d4318b3d0c5b7d3fb2feadb40e2a811a32d78a0637f62c9657540f69b23c6acfb929c59afd682 SHA512 52e3b43135892e7ec92e94b35704b99b53843c18e113ed326e8aee782ce7a44a65db58693d09983ec74498b7072cfe77d8031c91b172ef609826e93a56a7d1d9
 MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.29.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.29.ebuild
deleted file mode 100644
index 09bd538c9064..000000000000
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.29.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Script to rescan the SCSI bus without rebooting"
-HOMEPAGE="http://www.garloff.de/kurt/linux/"
-SCRIPT_NAME="${PN}.sh"
-SRC_NAME="${SCRIPT_NAME}-${PV}"
-SRC_URI="http://www.garloff.de/kurt/linux/${SRC_NAME}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sys-apps/sg3_utils-1.24
-		 virtual/modutils
-		 app-shells/bash"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	einfo "Unpacking into ${WORKDIR}/"
-	cp -f "${DISTDIR}"/${SRC_NAME} "${WORKDIR}"/${SCRIPT_NAME}
-	#epatch "${FILESDIR}"/${P}-support-sysfs-only-systems.patch
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	into /usr
-	dosbin ${SCRIPT_NAME}
-	# Some scripts look for this without the trailing .sh
-	# Some look for it with the trailing .sh, so have a symlink
-	dosym ${SCRIPT_NAME} /usr/sbin/${PN}
-}
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.56.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.56.ebuild
deleted file mode 100644
index 937d29e78f49..000000000000
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.56.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Script to rescan the SCSI bus without rebooting"
-HOMEPAGE="http://www.garloff.de/kurt/linux/"
-SCRIPT_NAME="${PN}.sh"
-SRC_NAME="${SCRIPT_NAME}-${PV}"
-SRC_URI="http://www.garloff.de/kurt/linux/${SRC_NAME}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sys-apps/sg3_utils-1.24
-		 virtual/modutils
-		 app-shells/bash"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	einfo "Unpacking into ${WORKDIR}/"
-	cp -f "${DISTDIR}"/${SRC_NAME} "${WORKDIR}"/${SCRIPT_NAME}
-	#epatch "${FILESDIR}"/${P}-support-sysfs-only-systems.patch
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	into /usr
-	dosbin ${SCRIPT_NAME}
-	# Some scripts look for this without the trailing .sh
-	# Some look for it with the trailing .sh, so have a symlink
-	dosym ${SCRIPT_NAME} /usr/sbin/${PN}
-}
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57.ebuild
deleted file mode 100644
index 03a8e326cc23..000000000000
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Script to rescan the SCSI bus without rebooting"
-HOMEPAGE="http://www.garloff.de/kurt/linux/"
-SCRIPT_NAME="${PN}.sh"
-SRC_NAME="${SCRIPT_NAME}-${PV}"
-SRC_URI="http://www.garloff.de/kurt/linux/${SRC_NAME}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-RDEPEND=">=sys-apps/sg3_utils-1.24
-	virtual/modutils
-	app-shells/bash"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp -f "${DISTDIR}"/${SRC_NAME} "${WORKDIR}"/${SCRIPT_NAME}
-}
-
-src_install() {
-	into /usr
-	dosbin ${SCRIPT_NAME}
-	# Some scripts look for this without the trailing .sh
-	# Some look for it with the trailing .sh, so have a symlink
-	dosym ${SCRIPT_NAME} /usr/sbin/${PN}
-}
diff --git a/sys-apps/roccat-tools/Manifest b/sys-apps/roccat-tools/Manifest
index 6e6d1be15631..c276060244a6 100644
--- a/sys-apps/roccat-tools/Manifest
+++ b/sys-apps/roccat-tools/Manifest
@@ -1,6 +1,4 @@
 AUX README.gentoo 858 BLAKE2B d3cdc925b286481491fdad08de6c2a61c811fecb1eb36fa1e0b2cedf98577f9f3c2deff4bb881c906bab3a799616b43601d2dae494674ae439f6bf561bd82417 SHA512 3f88197dc83d4bf7e3cb8fd71079754ffa355ddf5fcf151304ae439090da44b3bdef3ed9deab44b36ffffb4b28ded2a71b1abffe5d3e1aa87f56bfa264920a7b
-DIST roccat-tools-5.1.1.tar.bz2 3564442 BLAKE2B b3fa57ee4f5b691f75cc0047dadbf929a6c09be6caab8733445a80a4409aa0390d8a5f9e3a2fe5bbbfc614e216feda07a7d964966922558b7c33ff864dba9d6a SHA512 c98469201be55ab7b534dc2b5ae43cd55c7a013e4bf0fd93f23c646f14de78daa2df3277d5f29b72076729b5c9ee07541ee22f0d51c2e5d9bd5c9f05da94fb4d
 DIST roccat-tools-5.7.0.tar.bz2 3737735 BLAKE2B fdd86cef425f1f33309165673be52c8297380a1f0a722e827c2b3697c59dd787f4b473186ab5b8ff8fadcfc851f3bb5e76c8407d831b31f82cd360679d3c1a09 SHA512 209f9fa5302806a2d2681077e990a39a4913d47b82e73f9acd86f734affd8b3a7c0087e815e5cc1dfec1787d868d09b87211d9c2a90f2ced67c150eec1b2d290
-EBUILD roccat-tools-5.1.1.ebuild 2003 BLAKE2B 612ad28ff42d887d130f224c7b7929e1163611819433548e369147a3b43b18c5df7dbd6105675e9d96ddfc66f3861a02ba2588d34b3f439c4f7df4780e3436e9 SHA512 d0544ce6f8197fda801b3917ceb19550071c474b2eceb55844f7c802152025de9bd1aac690eb5ba3ddc17b29c95ddef7e33c4b376a75c589f2083c6b8101cad4
 EBUILD roccat-tools-5.7.0.ebuild 2444 BLAKE2B 443441bec2df550833f4aa3522b229e6bab16007ddc65549c544a527b42d64408ca4e0a280dc9468b9c355524440f06a25cfe9a1842e4d83e6c68469c65ea2f8 SHA512 e1f5502c88f00ba9b109d2f85fe985f0ff1ce849dee9f46df57a7ae74bc1dc806dd8ba86be294b8b5edf4654aeece1e82fe734f4b232949388903f33e57fe107
 MISC metadata.xml 800 BLAKE2B 40adf2bae99f28467efd13b62dbde1c7c836af2c415978415bd0f05be7c08fbe264e9db1f09c6b902597b2853178dbbbeab193aefc3843b753d771a7faa9f8cb SHA512 09fbb29df81a9934f113a59f6e9e66b3927b3714bb6dc49993e574b66f443f91f4ef14b2238a3fee3da2406b54fd45b6aacd79eb824fc18c38ab1ec69c8decdd
diff --git a/sys-apps/roccat-tools/roccat-tools-5.1.1.ebuild b/sys-apps/roccat-tools/roccat-tools-5.1.1.ebuild
deleted file mode 100644
index 1b618b09cd42..000000000000
--- a/sys-apps/roccat-tools/roccat-tools-5.1.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo cmake-utils gnome2-utils udev user
-
-DESCRIPTION="Utility for advanced configuration of Roccat devices"
-
-HOMEPAGE="http://roccat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/roccat/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE_INPUT_DEVICES="
-	input_devices_roccat_arvo
-	input_devices_roccat_isku
-	input_devices_roccat_iskufx
-	input_devices_roccat_kiro
-	input_devices_roccat_kone
-	input_devices_roccat_koneplus
-	input_devices_roccat_konepure
-	input_devices_roccat_konepuremilitary
-	input_devices_roccat_konepureoptical
-	input_devices_roccat_konextd
-	input_devices_roccat_konextdoptical
-	input_devices_roccat_kovaplus
-	input_devices_roccat_kova2016
-	input_devices_roccat_lua
-	input_devices_roccat_nyth
-	input_devices_roccat_pyra
-	input_devices_roccat_ryosmk
-	input_devices_roccat_ryostkl
-	input_devices_roccat_savu
-	input_devices_roccat_tyon
-"
-IUSE="${IUSE_INPUT_DEVICES}"
-
-RDEPEND="
-	=dev-libs/libgaminggear-0.13*
-	x11-libs/gtk+:2
-	x11-libs/libnotify
-	media-libs/libcanberra
-	virtual/libusb:1
-	dev-libs/dbus-glib
-	virtual/libgudev:=
-	|| ( dev-lang/lua:5.1 dev-lang/lua:0 )
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup roccat
-}
-
-src_configure() {
-	local UDEVDIR="$(get_udevdir)"/rules.d
-	local MODELS=${INPUT_DEVICES//roccat_/}
-	mycmakeargs=(
-		-DDEVICES=${MODELS// /;} \
-		-DUDEVDIR="${UDEVDIR/"//"//}"
-		-DWITH_LUA=5.1
-	)
-	cmake-utils_src_configure
-}
-src_install() {
-	cmake-utils_src_install
-	local stat_dir=/var/lib/roccat
-	keepdir $stat_dir
-	fowners root:roccat $stat_dir
-	fperms 2770 $stat_dir
-	readme.gentoo_src_install
-}
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-pkg_postinst() {
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-	ewarn
-	ewarn "This version breaks stored data for some devices. Before reporting bugs please delete"
-	ewarn "affected folder(s) in /var/lib/roccat"
-	ewarn
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/sys-apps/servicelog/Manifest b/sys-apps/servicelog/Manifest
index 0013873cbb97..89b8e2822625 100644
--- a/sys-apps/servicelog/Manifest
+++ b/sys-apps/servicelog/Manifest
@@ -1,9 +1,5 @@
 DIST servicelog-1.0.1.tar.gz 159034 BLAKE2B 71ddc13087866b81b69d6a3e925e8d0bd8a70a9f4e16a4006aa86051582e309c82fe4ba19aa65254b1a8e6674616b60ac6b77f38994c874672071d2530f34008 SHA512 a3e6c2c8e828de71ee81ead3435fea562501a90b3930a27087096b648a831fd351b4075f3d46359b41f88c1353dbeaf6039961ce72b1e3876734b7ad02b9f137
-DIST servicelog-1.1.11.tar.gz 318874 BLAKE2B 933ffa91c8f1c33b5b099bdab9a548a4c0d26b0fa04cd313d1639d1acb2006c9fd39ab523930787be2bdda34ec1f41715328c1e6212bf3ab4d7dcb95a1ab3dc4 SHA512 45adabe828a2e700b0920cc89fa4f93ac923cbf0249facbd52e23e1507d3daf12a2e4f2b093539286cebf8291266b2cbdcfea1c17f83a75c537c368885fd398c
-DIST servicelog-1.1.13.tar.gz 357637 BLAKE2B 7306fef7760c0e9040761af2672e267ddc3f5fbd75ef3ff07ca59511724d98d460dea048629be16906d8b3b77f987b5e406f03e0d26fa7a2c6136d3f7f782282 SHA512 2c9b2705825a98fbae3bc1c35f8acd014e5234d316d4c00fcceeb86b9263080fe525dfe71553c935092f8787b7125a3ed39c0cf07c069c56d1e816748698aa94
 DIST servicelog-1.1.14.tar.gz 361289 BLAKE2B 297c03c7d97295567c988eb2080554dfabb3becc159be4cf21a4c431698baa9e50f2af063b274341ec9b9cfd2664defa0aadb7169a518a4cb62b059c0f051cdd SHA512 d7b5e4089f258d69a7a07a46e43f1083fad701a917c150af8b68542db26348c0160dbca6c0d94aa68eb7a4b77139a763780c1af8422b785009567489a5e587cb
 EBUILD servicelog-1.0.1.ebuild 582 BLAKE2B 6996bf6529fc0dd7a7f656dc4b59efa242ff3e5e7a66d5ec9945b3c040c0bbcb66d48aca8d41a3e89ec359d02370301503c06e0c092286154f697b54ce8759ff SHA512 236be32e77fb094cbe3702681ae51238ab9dc3ba0cc7cfab9ac20e15ab5d15071da42c292d81d34c210af9be7b3e237762271b835b2baab4ae246bc01c517eda
-EBUILD servicelog-1.1.11.ebuild 584 BLAKE2B 6b978491ad12fae746df1e742d921589929655af2065a5aa9be0ee076f4154e29dfdc66ab0a5f6fb479631a5b3075ff05e612d457eac14ad2d20b08414d76440 SHA512 e7bfbfb2d1f55b5694babbf018e845860223159698578877c9a62fadb23f0a9cc6be9b4a86d57771eb22c7b194f6e4b67657941ce429c7b334585df88ea50d6a
-EBUILD servicelog-1.1.13.ebuild 584 BLAKE2B 6b978491ad12fae746df1e742d921589929655af2065a5aa9be0ee076f4154e29dfdc66ab0a5f6fb479631a5b3075ff05e612d457eac14ad2d20b08414d76440 SHA512 e7bfbfb2d1f55b5694babbf018e845860223159698578877c9a62fadb23f0a9cc6be9b4a86d57771eb22c7b194f6e4b67657941ce429c7b334585df88ea50d6a
 EBUILD servicelog-1.1.14.ebuild 434 BLAKE2B 661b8e3016eacc100151f20afad36800280e067b45f02dca6b30ca666b4731b57b55a30e605fefd35d11af2560c91bc0ce4060f9544549a5ad19846e17d8396d SHA512 dfe858e3325b95cc6750cea5d99f7ffe6c55df4a97ff391b396ab38b758181aa4b2307e705308c9ad4b1fc5b48756d859615ecc6371b9623f33fbc7d0cb4eaf6
 MISC metadata.xml 343 BLAKE2B 88ff852b7b901d0f81c494ab49f283835edb7e312965526050fde66fcf0b259c197e0b1b312e09910a77257e4e1b8d8f3fd6c465b95a9fbe7288b8d64a4a6659 SHA512 42f1b8b76a107cfa61ae9db8b900aed22a3bc8e8d3573dbb3c507ebde688ef2c50f7f79847eb345e738365fbb99ba22d99aee56e302c6eed064379ddc1e3a710
diff --git a/sys-apps/servicelog/servicelog-1.1.11.ebuild b/sys-apps/servicelog/servicelog-1.1.11.ebuild
deleted file mode 100644
index aca803c06b57..000000000000
--- a/sys-apps/servicelog/servicelog-1.1.11.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-S=${WORKDIR}/${PN}-${PV}
-DESCRIPTION="Provides utilities for logging service-related events"
-SRC_URI="mirror://sourceforge/linux-diag/${P}.tar.gz"
-HOMEPAGE="http://linux-diag.sourceforge.net/servicelog/"
-
-SLOT="0"
-LICENSE="IBM"
-KEYWORDS="~ppc ~ppc64"
-IUSE=""
-
-DEPEND="sys-libs/libservicelog"
-
-RDEPEND="${DEPEND}
-	virtual/logger"
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_compile() {
-	econf
-}
-src_install () {
-	emake install DESTDIR="${D}"
-	dodoc ChangeLog
-}
diff --git a/sys-apps/servicelog/servicelog-1.1.13.ebuild b/sys-apps/servicelog/servicelog-1.1.13.ebuild
deleted file mode 100644
index aca803c06b57..000000000000
--- a/sys-apps/servicelog/servicelog-1.1.13.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-S=${WORKDIR}/${PN}-${PV}
-DESCRIPTION="Provides utilities for logging service-related events"
-SRC_URI="mirror://sourceforge/linux-diag/${P}.tar.gz"
-HOMEPAGE="http://linux-diag.sourceforge.net/servicelog/"
-
-SLOT="0"
-LICENSE="IBM"
-KEYWORDS="~ppc ~ppc64"
-IUSE=""
-
-DEPEND="sys-libs/libservicelog"
-
-RDEPEND="${DEPEND}
-	virtual/logger"
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_compile() {
-	econf
-}
-src_install () {
-	emake install DESTDIR="${D}"
-	dodoc ChangeLog
-}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index b92f8da86a73..54132d91f3d7 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -7,7 +7,7 @@ AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6
 AUX gentoo-generator-path.patch 1046 BLAKE2B 648d1fff6874135267647ff6ffb52ddd9e991af64fb2b41909246c173e55709c49edd6e47245d566457ba9f55bf6d758ed837ff740f58004f2790b5565f8e462 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3
 AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
 AUX gentoo-uucp-group-r1.patch 562 BLAKE2B 98b629d9b20e4fedfb017864dca1346aa1766d606583d12930e0375a43b10871cfdafabacdaa5f3d70ed8e8f4256b66a61369f459419931e80f57a13cd9f953a SHA512 27a3f0a037494326674e9098eab96199d2dbbd84dfa94a7dd23df0bf7fc632d1ddb21643288e71cc64109342bbcfcc4d77add07348d70633ec1da7cdf2253dc9
-AUX nsswitch.conf 698 BLAKE2B ad209377afa4bea6383dba80b045c3905e6e0c0cd091c6710f753fa7b0bc911ee2c48d6975a0646d688fc534add23d0be3fac7c1da6f3654a5a27a609c2ec434 SHA512 486581b096db702941589bbd3211df58df4979d17856dc935f6e22f7a268c5b6b1c4dfa643d38e21bc01eb258b0b97318d4e97ebab0e87abd718af1e391fde1a
+AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 DIST systemd-236-patches-2.tar.gz 54737 BLAKE2B bce5f9e234c975a2b6e474ca2a0c2c82e704f02cf19885134dddc5edbd0b7bfb3773d737f88f78ba2ab81093dfceeb44d76ecda99cf2b916072dcdfa84720c19 SHA512 b74ab6944135c938b2d0d2a1dd40ac4cc4ff26d072603d6bfbe4529d808b2e481eb910155895bce14607842ad6d30751aded51654a53f76278becbb5e317b875
 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
 DIST systemd-238-patches-1.tar.gz 47512 BLAKE2B 9edf8835ec7bba43bd00b1481b23bc5a4148030724633a8bfe1e82ec48b79699d4822b0bc5ea3a979b404e706efa9c0eae8e0460d76658ba2e901c4853da0c04 SHA512 809d8a3a9a023217b509b738e0d341d060f1343df6159e5acfcededfb452986de140ddf4b879a5157fba1a5646d00db8b6537aba8358c48f75fd6527f881a14c
diff --git a/sys-apps/systemd/files/nsswitch.conf b/sys-apps/systemd/files/nsswitch.conf
index 00667c0c088e..91dbe757f9f3 100644
--- a/sys-apps/systemd/files/nsswitch.conf
+++ b/sys-apps/systemd/files/nsswitch.conf
@@ -7,21 +7,21 @@
 # nss-resolve - host resolution using resolved
 # nss-systemd - dynamic user/group resolution (DynamicUser in unit files)
 
-passwd:		compat mymachines systemd
-shadow:		compat
-group:		compat mymachines systemd
-gshadow:	files
+passwd:     files mymachines systemd
+shadow:     files
+group:      files mymachines systemd
+gshadow:    files
 
-hosts:		files mymachines resolve [!UNAVAIL=return] dns myhostname
-networks:	files
+hosts:      files mymachines resolve [!UNAVAIL=return] dns myhostname
+networks:   files
 
-services:	db files
-protocols:	db files
-rpc:		db files
-ethers:		db files
-netmasks:	files
-netgroup:	files
-bootparams:	files
+services:   db files
+protocols:  db files
+rpc:        db files
+ethers:     db files
+netmasks:   files
+netgroup:   files
+bootparams: files
 
-automount:	files
-aliases:	files
+automount:  files
+aliases:    files
diff --git a/sys-apps/the_silver_searcher/Manifest b/sys-apps/the_silver_searcher/Manifest
index 77bccda4b94a..dde5bcdeeef4 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -2,5 +2,5 @@ AUX the_silver_searcher-2.1.0-lzma.patch 16900 BLAKE2B 80b7ed6ca050e155c07236c31
 DIST the_silver_searcher-2.0.0.tar.gz 160093 BLAKE2B 1955772c6f71cf7839270cdcaf73f917a69966afa69e781a81ff1926946d9e61a7229e5eb4981b21879b6d2ad46232563285b083de77b8fbf42d3070792b26bd SHA512 2587b9958fadcf5d95bc472f901904edb0d3d9bbc652dc6bb3801b77e7dfa744a97869bed4699776cc3fdcd7b0319fcecbe4b08ccfda617d1c2aa4ea8e9f990d
 DIST the_silver_searcher-2.1.0.tar.gz 163139 BLAKE2B 0112489e9e8c965708f2526aa5141bc700cb86bc1bc5a63ad9b2505234595f673b6e163546fdec7e5066d00789042ab1acdf02db926170bb823112847f304944 SHA512 9b49b1666bbb915b122eae45dbe5dbdba18539257b59f1dee9ba9ec86dbe73c7c8ecde1eff9d3e06951295685161fc4594fcdbfa5d19d7b466f2a7f95021e631
 EBUILD the_silver_searcher-2.0.0.ebuild 919 BLAKE2B 779ddb58c67006c8d8f70cc5d80e9061d7f22661d76e29b320d3fbe5b968865b56d3a0b61fe0ebd793823d6b6fcd80abc1aa488fd7f469c16da964e75830f85a SHA512 a8e46a1bea749feaa9f05560e89b7e88a0739a15f33391a1945f5232811703d71e1438ae68ed42e38208b92282fdb543f999edd756f2b0a7d993df8e7a7717ea
-EBUILD the_silver_searcher-2.1.0.ebuild 984 BLAKE2B a43bdc7611c19136278e71dfa833f6e75fc2e49cee685bf6e8240157b39d2387880938524a1dc08cd4888ff7c4b2e8983d0e9d38af881bf94cbae5a37f93bb16 SHA512 83c2d295235764ca60430c6e05dcc584be6af4552691a6c87da1547f05422fc68093f6d8a0abb018202dc049921156b73ac3df09d4cb500accac60b5708fdc0d
+EBUILD the_silver_searcher-2.1.0.ebuild 991 BLAKE2B 0fceebaba9461a33a8a0cdc4c75d2e83308602657c0e2ffa648b7f9d8a9fceb252c0032aaee3db5624c0d5cce4b979c2064830e06a944b2925b6f379993c0a46 SHA512 6cc37b72f06530a9fbea8aa322a3474f526ba71fc7ea34dae7800cb2ee42e6c4e0e1191f7a677ea9c26e9549a19877684032cf173e5194e2f0a7fcb25cc32e65
 MISC metadata.xml 347 BLAKE2B cec1df10eb40daa911db4a3b082a3d1e5f67a63d4326092bc337a5b2300c89b41205db84a6daf54c72d6ff775166d385717039cee458076d4b483a8c0a5112fa SHA512 56848f01fba3974410effc1dbc30118c77bf97cf09fead70be94f7360dddb80d47005ebb3b3c7d5accb97b24db3a3f7735cf0f40d7af13dde58b78a4bef768b2
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
index 94366537bd77..127b25b8bdcd 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
 IUSE="lzma test zlib"
 
 RDEPEND="dev-libs/libpcre
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 8aa2bca2d11c..999a77df3827 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -16,6 +16,5 @@ DIST ucspi-tcp-0.88-ipv6.diff19.bz2 22632 BLAKE2B 8fdab5cfc82151adaf85d1ea611c57
 DIST ucspi-tcp-0.88-man.tar.gz 7562 BLAKE2B 8b6326665cb48dd37683a50f3fe4cb65eb2fe3c28dc90ed1461b5bd878e7a7713f01d654d7d93df63e3f7a113baa4b6abfb6eeb65fdfb820051192b36070eccc SHA512 e779d6d6b24a3af0edc362def229c657c704143e5f1dfba8d16d26b3e6bcacb9c8ceaabcccac61485a4719221c144bc0c36ebca5182985dca85a6d72101d4146
 DIST ucspi-tcp-0.88-rblspp.patch 6565 BLAKE2B abf13c4c7cc25d555c57e29e45ead89340f01c5ddee4cc27a7acfdfd51f1dfae441d3b82b79d792f6acbc78b4d82843f5af34f0a166f4b7eeee44711cd39b26a SHA512 f3212d9d3bb59ec3b1f2b2bd09a80dce1eeeaf082dea68f18350a3aef818ef221eccfeb4dc7afff5c3f9e59003ec40f5e37fff86a2a5ab3145be1fe81297c990
 DIST ucspi-tcp-0.88.tar.gz 53019 BLAKE2B 3327de31e225c851b43e40ae9d8c5e4d3b93e2c15ed6ef993ad9f4105d60f322c56797c45a37363258e7cd9a8d52a315d6a8d65686c5cd45d4be19781e40c233 SHA512 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
-EBUILD ucspi-tcp-0.88-r17.ebuild 2475 BLAKE2B a65829306f631512fa724017a5fb23c6b978057c9800b9d9744f3b336ef26597a6e57317d4b70eb551f1f25a92141736b92a0b128e38e6f85006708d6ac56607 SHA512 389039ec00726d92fc6e4fccdb0db013a6efcc2feb95f5922efee9f8bbd74f90816c4f9cabaff1553525fdf8a4ee5eb9fcd1fdba4be66cec20903a644ade1b68
 EBUILD ucspi-tcp-0.88-r18.ebuild 2110 BLAKE2B 3e6f928478d0737dc74be8cf08cd182f020b07f99ab878ca1c3aeeb5776c9a494b20a94db8536b15f67320a8f425d07c621361e7664ac40d31b4c648b5024a47 SHA512 e5b7f51fe7ce2914131a6455c7fe9c474b0530532819c81e01861edbeec654d3de08c7c35182596fe75ab1646a8979955e51c958c8ad98f9d9bc78b5d0cc9e5c
 MISC metadata.xml 677 BLAKE2B 099199a467eb6f06daeece058d090c48825fecb5474425c4cec45ab90a981608a5948a7c4d11074966e7b72d80bc7d826ec8ebe2a93cb54ae90d91121deb5244 SHA512 cf774ef0c4584905cbac057f7239138025e6a92e55a6ae006a91aa438d9dcf0bd0cb9939b4bc6eb7ac1cc2ae67c7804312b5011da3d91fbe1d95f9205ea456ac
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r17.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r17.ebuild
deleted file mode 100644
index 0cef65cf25f4..000000000000
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r17.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils fixheadtails flag-o-matic qmail
-
-DESCRIPTION="Collection of tools for managing UNIX services"
-HOMEPAGE="http://cr.yp.to/ucspi-tcp.html"
-SRC_URI="
-	http://cr.yp.to/${PN}/${P}.tar.gz
-	mirror://qmail/ucspi-rss.diff
-	http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
-	http://xs3.b92.net/tomislavr/${P}-rblspp.patch
-"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="qmail-spp selinux"
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	!app-doc/ucspi-tcp-man
-	selinux? ( sec-policy/selinux-ucspitcp )"
-
-pkg_setup() {
-	if [[ -n "${UCSPI_TCP_PATCH_DIR}" ]]; then
-		eerror
-		eerror "The UCSPI_TCP_PATCH_DIR variable for custom patches"
-		eerror "has been removed from ${PN}. If you need custom patches"
-		eerror "you should create a copy of this ebuild in an overlay."
-		eerror
-		die "UCSPI_TCP_PATCH_DIR is not supported anymore"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PV}-errno.patch
-	epatch "${FILESDIR}"/${PV}-exit.patch
-	epatch "${DISTDIR}"/ucspi-rss.diff
-	epatch "${FILESDIR}"/${PV}-rblsmtpd-ignore-on-RELAYCLIENT.patch
-	epatch "${DISTDIR}"/${P}-rblspp.patch
-
-	ht_fix_file Makefile
-
-	# gcc-3.4.5 and other several versions contain a bug on some platforms that
-	# cause this error:
-	# tcpserver: fatal: temporarily unable to figure out IP address for 0.0.0.0: file does not exist
-	# To work around this, we use -O1 here instead.
-	replace-flags -O? -O1
-
-	qmail_set_cc
-	echo "/usr/" > conf-home
-
-	# allow larger responses
-	sed -i -e 's|if (text.len > 200) text.len = 200;|if (text.len > 500) text.len = 500;|g' \
-		rblsmtpd.c rblspp.c
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dobin tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ \
-		tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd || die
-
-	if use qmail-spp; then
-		insinto "${QMAIL_HOME}"/plugins
-		insopts -m 755
-		doins rblspp
-	fi
-
-	doman "${WORKDIR}"/${P}-man/*.[1-8]
-	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
-
-	insinto /etc/tcprules.d/
-	newins "${FILESDIR}"/tcprules-Makefile Makefile
-}
-
-pkg_postinst() {
-	einfo
-	einfo "We have started a move to get all tcprules files into"
-	einfo "/etc/tcprules.d/, where we have provided a Makefile to"
-	einfo "easily update the CDB file."
-	einfo
-}
diff --git a/sys-apps/ucspi-unix/Manifest b/sys-apps/ucspi-unix/Manifest
index c2bf16445fb9..ad4cff77f49e 100644
--- a/sys-apps/ucspi-unix/Manifest
+++ b/sys-apps/ucspi-unix/Manifest
@@ -2,7 +2,6 @@ AUX ucspi-unix-0.36-fix-parallel-build.patch 507 BLAKE2B 32ee69a9a63efb3b990f4e3
 AUX ucspi-unix-0.36-include-sys_socket.h.patch 339 BLAKE2B d00f18db06e084639a169b487ebe7458127086a31ccae759faf458aea69a6523cc9a6eb69922f161fc861cb3e463b4a73b637011dd8e8e86abd2f9b7080a660f SHA512 a8628e664ec993ab964879ff34b2bea7e70901cbc1f812262057fcea0fe34c64b2b910e4e1c77ba66df84fc8dfed94b69c6dbe7b7da09ddf379764b070a97161
 AUX ucspi-unix-gentoo-head.patch 1097 BLAKE2B 7ec8f2e5dd32224f14f254d55bdabdf70324d9e0b21e31ad525598e125331778434b600ca0b6a275d4758f83611d1abfbce810913d6ad3d7cb4cc1955639b9d6 SHA512 e1d5be425dcdf2bf09031c8a11c384b092a2bda38159db37abff111191dac1aa0b40a401cb068d86f97747dad684a0720f3b5b8f18c2d9caaf64368a71d46c3c
 DIST ucspi-unix-0.36.tar.gz 14175 BLAKE2B 609de0e75825ee458823bd34b41ad1d2072851cd006f6fd603c5082c69b48bc7018242a4b6bf7d2584bf43d79273f223352a3af4868575ee8574c9fc9ba4d819 SHA512 56fc5145315ff43629f455996874d6434ebee16e9fccf78ce3dcdd6312daafc508e2dce0984ca9ea73b9ff0da5d2171fc678c8e200641e1c0be02e7863bc5633
-EBUILD ucspi-unix-0.36-r2.ebuild 876 BLAKE2B 002132593c7471fe22d2a57fb2d51d295dd8deb2addea67f37e50842f21a2603f01611c9a297a8a014d5fc4b124f9f78684d69f2081a016f600a91d32a1e4146 SHA512 b3a9d11408b01957069657662863c3cc2dbac411aff3770ecbdc17ad91ca4d3287a81c303bf7957ea9d49b7bd8028bdbc67ad9ed5a184a702e565bd7eda3a628
 EBUILD ucspi-unix-0.36-r3.ebuild 974 BLAKE2B 2ae598af6554c6a0345baa60be163adadf12fa63c00cd8f6ff96de9ec6daaaebc7544713cff2cd5f44cb1a18df57dd2814d0747e48b9d0ced90e3ecbd1fa3976 SHA512 798901cc22beb4912e8fa1d779abed5bf9fc5711e43d059019684b88fce3438ebf228bf93ce77172f462aa3bbec784a1f61eac6c3f4af37bc6d5fb147476f9a8
 EBUILD ucspi-unix-0.36-r4.ebuild 1136 BLAKE2B 90bb709947cedc619da1ee9a9cf504ced1267a447610844a874db60b65113e1d76c359c165a1673bc3bb9fa5452bbe257b9ec07a4f975052b0ba1a376e9c4c9f SHA512 4544d8053f3c9a0c98396ae5c49114fb5b580637a3c95f90f494cb477b373e470f30b10b85fa0af9d81e40ba0c6ab9af4768028b093c45ffd5ae2e6ea577fcec
 MISC metadata.xml 433 BLAKE2B 884f889ede3653c18a3e3b4cd133e764ca8a3daa5eee474d698f3878ecca59d176cb5d039cbcc61934e0a84ccc59b9e7766e44551654e6684ee5f2e867cfa7ec SHA512 73fcad2c3cf5f25d07fe4c38376e3375021ddd0e2a2a9e51d05728d86ee2e0b63a28ed5f70d9d31e1643d210852b4b81f0ce605b0d9876dbf131cfd444d6fd6e
diff --git a/sys-apps/ucspi-unix/ucspi-unix-0.36-r2.ebuild b/sys-apps/ucspi-unix/ucspi-unix-0.36-r2.ebuild
deleted file mode 100644
index adc83aac1ecb..000000000000
--- a/sys-apps/ucspi-unix/ucspi-unix-0.36-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A ucspi implementation for unix sockets"
-HOMEPAGE="http://untroubled.org/ucspi-unix/"
-SRC_URI="${HOMEPAGE}archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND=">=dev-libs/bglibs-1.019-r1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-gentoo-head.patch
-}
-
-src_compile() {
-	use kernel_linux && PEERCRED="-DHASPEERCRED=1"
-	echo "$(tc-getCC) ${CFLAGS} -I/usr/lib/bglibs/include ${PEERCRED}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS} -L/usr/lib/bglibs/lib" > conf-ld
-	make || die  #don't use emake b/c of jobserver
-}
-
-src_install() {
-	dobin unixserver unixclient unixcat || die
-	doman unixserver.1 unixclient.1
-	dodoc ANNOUNCEMENT NEWS PROTOCOL README TODO
-}
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index a8e2b0cc975c..26b0a1cfa88e 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -10,5 +10,5 @@ DIST xinetd-2.3.15.3.tar.xz 383204 BLAKE2B dada7e1efb8c70d9b47efbb33de54e643e195
 DIST xinetd-2.3.15.tar.gz 309774 BLAKE2B b5c933a2aa7a2ef4a2d58b53890f04569fe592005c646f39a00d4716325c8ac9b9aa3b8b4b2f2b861430c8415167ab1d394de3d3b4bd761239c5223b1d2b0419 SHA512 9d6fee1fbc90329629d84086ae7de5cd51c25af7b68e52aa704d6f74bee5f0e3d54ca1bcf780f90f74ddc8d336ae0abb5e5e368d43c426a26b8dd2c4676d26aa
 EBUILD xinetd-2.3.15-r2.ebuild 1489 BLAKE2B 0e692389c82eaa474c6068ef4b2f3d96713dc3c9c5174c2265632f3904d6021ba966c23d0a7f7eaa7ce50ae026bf954407764351c62298556311f705949cbbf9 SHA512 552f0cda59c778ba6a576df1cba0befa55ff909e1f9fdec092dc7ea666be8371e956f2d34fdc1364c997db9eed36dd9c38ebcc10db0d5dfe8fbd576ed8ea0d8d
 EBUILD xinetd-2.3.15-r3.ebuild 1584 BLAKE2B b50232148f4aa38bd767715958ee7da6b0a4a8b35f17138f9422ad98546edb301aa87e1182b6feef7fb491fbd84c5072ec5ca4df213065f78b098820d47d921b SHA512 2ed014285abf51f3c745f94c0dda14233f0ca7e971c94fa4bcffc8ecf83265f9bc48388639e7caaebc2b24bbb07b87e4e672c30ea3bea209ef38258718a11c85
-EBUILD xinetd-2.3.15.3.ebuild 1087 BLAKE2B 27e91f406a10f647bbd37ec8b991b566bb168c3458af1756ca5698a308a2ce1b9cb22c4c88476346a6122d32dda6f5d506df0a7587dbce82b04668d7d498a8e0 SHA512 17d9e267bc473bb9dadcc4d196232cf1c06223bbf019dd84b4cb556c663174eb7b59aa5d3ec11408204ba1909f0d8696ba27fdda91b9a7ec401c563e8e9c8d85
+EBUILD xinetd-2.3.15.3.ebuild 1086 BLAKE2B a015f743a33b424703f9bff3bd921b91d9814bb96c8477d7d9d1a55ecf2987df8b2fbf242ed6a7d10b03a1aaea7eeb69b706afaa7b039b82f94c792cc3d02963 SHA512 405118491c72572a880dd48b0ec8408827dabbc08f910eef5e79188e946afe3d77b9bb1f2281dbd82c1e877e9898bd13d2b671fa0366f7ef87d4bed51e6945a7
 MISC metadata.xml 401 BLAKE2B b00f11946b61c89e69864bc02fbbb0fb9d97e6e1b58c1f4604a806361a39b2eb5f4ef25c095a8ce42e2e2d1dc0160d6525d58e6ba24c6d63057e4b07291d2052 SHA512 35d6d241dfa7e9811b09f3df32805de026244d966a5e1c62654986c67541038f79acfe64a9b4b574f5cc14611fc68cba043d4d68dfa7cd8d198a738db5685cdb
diff --git a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
index 6b4ff3e3a591..bd39ceb3f7a3 100644
--- a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="perl selinux tcpd"
 
 DEPEND="