gentoo resync : 22.04.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-04-22 14:25:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-04-22 14:25:03 +0100
commit: 5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (patch)
tree: b041acef19bb9ae66c228d5c9d34d1e00aeb2b95 /sys-apps
parent: 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 (diff)
72 files changed, 614 insertions, 273 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 8d1f8ecc3382..52d6d0f8a91a 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index 50e72bfed156..df626d41dde9 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,5 +1,5 @@
 AUX acl-2.2.52-xattr_header.patch 4777 BLAKE2B 8903fa3bcee96d43f9e142d70ee78fa59b9a6dc3618fb853352caff263afd05a83afa77f4ed70ecb010b32d113597a8c40ea711aeda14ac7bf387a0b407fb8ed SHA512 356eaedccba561d92f5a518dc1cba27c5e525bd9063ea852ed1f0597bb379996d7c56ae97c4a19e20e569dfe5cb2406b32453866f40466680e6fdc63e5a75906
 DIST acl-2.2.52.src.tar.gz 386604 BLAKE2B e8b7b555cec93f84579aac846ce64235e356d73770844e88898564d1742fcf3d7c314511f0321aefbad33bdd85800406102178e8ab6414bc9c883891442d3188 SHA512 59973199d371cd0b2368e95bc829a1b47f04e808a174fefba4c6854e766158bd19a71d9dbcc8d6fdc1573a1f971cdda39c453f7fa243bce02c1ab97c6e7c72e7
-EBUILD acl-2.2.52-r1.ebuild 1533 BLAKE2B 73da94f2dcc30de766614cd45dae855f5c2c79899061d104e61d25d9cf09c6345be3c6dc062410ba8da60cfe95f88f52451ffd000f82cb11a5b30ebb52b7f20c SHA512 ecd38a5958715e40c23390f7d38f29aa604fd4219a56293e87b2dabfab83462fa803a909dbc6d9105541535db6c63f5331d757a06d92874f59b4c044881dd81c
+EBUILD acl-2.2.52-r1.ebuild 1403 BLAKE2B 14b7b9e8d4aeb17c6dfad20b4c8369da6880bae09aafe811bbd22238d22c960e2ac04e25e258522cad7312586e657078c60837b7d44f395c0ef63d624cb8a7e9 SHA512 43e6f0ddceaf2da55a1bc5bb39b1a5ec3b9d6270c9d47a841b6341881fdef966d5e9659963e9bcbaf025cdbd4ac62efc8eb8016d9107d484cd5119930c1f4b98
 EBUILD acl-2.2.52-r2.ebuild 1523 BLAKE2B 993d5d0790231e9afb2777812000c916519c307a8d1b9490e7d0b2d96c7d44ccc55d7a5247690c58510554bc948483e9de86f96881c1bb3bf4da81f8bfdab6f4 SHA512 d4ae75c33c5f93ead215360d69d7458ff1f6ea85aedb444a1ecd513c433da6f7826ddfc4942d8dbc2dcaecc2055b080cf6c257e7a7979c6771ac775a883e3f3a
 MISC metadata.xml 293 BLAKE2B 2b8092a768f4f905c414e9bde92180e659085a60fd6ec13cecb29b6a88471941e7c8e2ad86f2864f44fa4f74589b20433ce64c3e89c3e210838b9d997deda136 SHA512 1e61b3f2d76e95eca037de073678326400b069526c8a308ca4169ce67d3e47c8cd199cca59f83fa245bb5fcbaa9efe7f31e34cf8588d69383ed0da78ab54cfaa
diff --git a/sys-apps/acl/acl-2.2.52-r1.ebuild b/sys-apps/acl/acl-2.2.52-r1.ebuild
index 3420a6f7fc2d..762f4a985238 100644
--- a/sys-apps/acl/acl-2.2.52-r1.ebuild
+++ b/sys-apps/acl/acl-2.2.52-r1.ebuild
@@ -14,11 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="nls static-libs"
 
-RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140406-r2
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
diff --git a/sys-apps/agedu/Manifest b/sys-apps/agedu/Manifest
index 0f0d6358b95e..0ba81fda0612 100644
--- a/sys-apps/agedu/Manifest
+++ b/sys-apps/agedu/Manifest
@@ -1,10 +1,10 @@
-AUX agedu-r9671-fix-automagic.patch 1847 BLAKE2B a449fee6a973a27af67ac5e48547d392e5dec547735e018be7e1752ae473f4a5462c1b0865eb18f1a45d83fe716f0652731c5ec0d28f87c817c847421ee239a6 SHA512 a85805f0d8bbb61964719d246d033c9423fa90f4b7a29fa4d48bd0ef69ee58304b6fa45b9c0a6024f0f05ff64dd164d23cb93791e0f1611363a51bfc993d00e0
+AUX agedu-r9671-fix-automagic.patch 1684 BLAKE2B ab7d2d33a7577251fa65e222914a25e621c68f6bdedbe3c9e62b43f2d8b51e29bbdbc08560fbcd76beab98e115ddf43e76e4cd290f1ce751c0452318ad8ee9e1 SHA512 61f11c624ebd5fa632f24ecc46230146f999a68ffbd9c2ce73f6319a527cd9c37d634ecec9a6b2a7fd1dcc792ab3d23a6c8a599499bab54194f36acb262a201b
 DIST agedu-20170831.fc6b2b5.tar.gz 175900 BLAKE2B f7ace0209afe6c40a54d4f576fd7c2fb7a1fb5433de00c1ae29c8457b32304a3b8686ee38efc3bd64860561bb5ea730f5cfee70d20b56addea1b312ba650a9da SHA512 6e9255776b668de33209486d6fcdcf68e1d4785bd84e2d5392ac71d13e54c7b156d9959e681fefc9b965b43727fbab13ef0b1e1e7587fd56d8dea29568dd0e75
 DIST agedu-20171202.8a8299e.tar.gz 175917 BLAKE2B 9789a901ce2aabd5aff31423d704165f5d2e5a21c6b8d316eb3c97365a51559df1d7c4dc071f329fadb12b4ca748ea4c9d3a697e5b0bd93c7a0b23c5b08af3b8 SHA512 be0f37d0ec94241462095e1503bc94ea3ba1bc1bc8a9b5a8d853cbb96ea09cf267a121fb8c8479c7b5670947b1e5d61d0f93b0ff10337fad9c7ee000765da380
 DIST agedu-20180302.9421c00.tar.gz 176129 BLAKE2B caa30fbb09c7e6f06b0a1832e6206b9400d0ded63866275ecdd3918133f1464db167e046edb5d516a4128a2dcfd9a07692835a88da0b640b4a52500e199e7aca SHA512 ebcb7413fba41341dda00fe8138c37890d5ca3a577060de479c1d1f5ed134ae40228562d24ae58aa496d4a25f59eace28670bfbd7cf033c935776f9592f0148a
 DIST agedu-20180329.af641e6.tar.gz 178860 BLAKE2B a3b17bb708edb530ad56644314969b069577b6663cb3f6ccdc72345ac666c18f80b1eae14c5146be46c9f9692d820104111ccca586e3d5a564bb34a4938aff6a SHA512 66fcaf1f4ee6a66fa68cce88f5a5edbfbc919978513370821de4e01f0fdb499beb7642333b459adb705934dcba2f4a14a8c28edc1045a8fd1b42a4a317061707
-EBUILD agedu-20170831.ebuild 820 BLAKE2B 95cd6fd4dd51d46e1a171c2e1dff3dbe03b4db8a830692277a6189709977044a88b67a6d8011a88107f98c60eb496aeefedf59bdcee721cef6c22cd42a8f5e61 SHA512 0ee867b3ff0802f28d9ca7b919a087c94dbc1ea826b5be998fd6aea959e17b172543230cbd1e8f5b1fa2d3327d86465637c72a76902f6e89295bc2e2fe964fbd
-EBUILD agedu-20171202.ebuild 820 BLAKE2B 13bd8b1d737b2ea3d2b709cf1aee362bc8d6afbc2890a3e9edc3312507b71848a5fbfc62309f4638b7c59f0f37c2d21d2f104f5fb0965a05dedce2b8428ff212 SHA512 774a707927913e22c78a742ef78952d959e9639f9ea09ba717cb5caa7dc2bfb0c25d9dfb01110c8b3575292a881941cdd29de0e7249990b37e875a8e460f2b84
-EBUILD agedu-20180302.ebuild 820 BLAKE2B f5040038168c4e9dadbdcc036551cd1372307e3526b1619c7a3c6d27ad0fc6db0e4c98deab5dc0be661a6a968bc650817f87f0e41c91bccc333c6a57d0d4e8cf SHA512 5796596884e90be15e9c636601110056905b73c6f244500b4b9a84bec76fab65a09d35136eb57cfeab7a82cb8ba2da2fe501f0e6b7789251b6f40403efe9ac34
-EBUILD agedu-20180329.ebuild 820 BLAKE2B 4520dcc0d9dea33c80ccaf66e425c8f11f51672bafd29727d1144ed27ea79e1336de6e3fd450b700e46ac850fa5da503cbd4f04777d24f3999e05e82f5cca3a9 SHA512 f83dfb089017e07e1ad6e10bd38dd78f0f3021d3943f7f51407bb173ad4049ec0b24c304edf46b93323430e44b6e31b762a218f6a78e6826bf257130ee9c82de
+EBUILD agedu-20170831.ebuild 813 BLAKE2B b397889d6e06a4f4415f815ac43a813a7c18b466eb486d6e74d2792ce7957c6920d57797796723aeb6a7fcb278d56567744dddf36696e3f3e7a01ebb4e5fb5c0 SHA512 8ded6c3042e80a75b1d61b445d661c93656cc9e087eb9fe16bc2e77a8fcc08da287820a0064bccbe7fe829995ae6c3d9b8ba340d7057b8ad4fa41d3c4a22537d
+EBUILD agedu-20171202.ebuild 813 BLAKE2B 6daf7f976207f138c6b05dd1e88e7f6ebcef4f5d48248f796d4c72983156fe29ee7f85df13641121aa17a3b96bb5e153a91adcfb1cf13f768c930b9300637cad SHA512 63e72c5a253098d63a519a24f75ff6a10152b74d5aa45de96ba16a6ae4024be8784ea7a73ad7cb1dc2434eb517e7e480ae77b837cbd0b4fafac286e02dd08afb
+EBUILD agedu-20180302.ebuild 813 BLAKE2B be74cba7f0f8d56d58d34758e9ae02bb1eb5cc830366704fdfe053ed3bb525fb584463bada94b44cf938a1f1c127b477ff01b2038d70bb55d5c18718fb3ee54e SHA512 b1bf546fa3b98ccc54e16205c5ca90275e9966b172a94b0dc126472a4e257727fb14696933e314af379b0fdc3f07c34af2c6d73cc4279b8f6ef689603d079d3a
+EBUILD agedu-20180329.ebuild 820 BLAKE2B 980c34c4804a0d081a281367b1d846e805a2a48dcad0c55e0e5b42b78026efb23bf97462ad88dcf413b206b41bc569d48b44d0de86f7f132b08d34620395a077 SHA512 3a4f336ec030a5091dd5e45c851b61ef08b18ed5f667062f7177e461ec5984eec945eafb21c8f389b38502079e60e822f6640263bd8f1bbd1fe9a93707afc230
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/sys-apps/agedu/agedu-20170831.ebuild b/sys-apps/agedu/agedu-20170831.ebuild
index 8b2ec089f3f4..0924f9239532 100644
--- a/sys-apps/agedu/agedu-20170831.ebuild
+++ b/sys-apps/agedu/agedu-20170831.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="6"
+EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 # agedu-20151213.59b0ed3.ebuild is not a legitimate name
 # so we'll drop versionator and just set MY_P manually.
@@ -21,9 +21,12 @@ IUSE="doc ipv6"
 
 DEPEND="doc? ( app-doc/halibut )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-r9671-fix-automagic.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
-	eapply_user
+	default
 	eautoreconf
 }
 
diff --git a/sys-apps/agedu/agedu-20171202.ebuild b/sys-apps/agedu/agedu-20171202.ebuild
index b157209b4972..0cfc94bc80fd 100644
--- a/sys-apps/agedu/agedu-20171202.ebuild
+++ b/sys-apps/agedu/agedu-20171202.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="6"
+EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 # agedu-20151213.59b0ed3.ebuild is not a legitimate name
 # so we'll drop versionator and just set MY_P manually.
@@ -21,9 +21,12 @@ IUSE="doc ipv6"
 
 DEPEND="doc? ( app-doc/halibut )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-r9671-fix-automagic.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
-	eapply_user
+	default
 	eautoreconf
 }
 
diff --git a/sys-apps/agedu/agedu-20180302.ebuild b/sys-apps/agedu/agedu-20180302.ebuild
index 8aeb20dc9846..ced64253757b 100644
--- a/sys-apps/agedu/agedu-20180302.ebuild
+++ b/sys-apps/agedu/agedu-20180302.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 # agedu-20151213.59b0ed3.ebuild is not a legitimate name
 # so we'll drop versionator and just set MY_P manually.
@@ -21,9 +21,12 @@ IUSE="doc ipv6"
 
 DEPEND="doc? ( app-doc/halibut )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-r9671-fix-automagic.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
-	eapply_user
+	default
 	eautoreconf
 }
 
diff --git a/sys-apps/agedu/agedu-20180329.ebuild b/sys-apps/agedu/agedu-20180329.ebuild
index 72f7d0242506..24322243c5c3 100644
--- a/sys-apps/agedu/agedu-20180329.ebuild
+++ b/sys-apps/agedu/agedu-20180329.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 inherit autotools eutils
 
@@ -21,9 +21,12 @@ IUSE="doc ipv6"
 
 DEPEND="doc? ( app-doc/halibut )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-r9671-fix-automagic.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
-	eapply_user
+	default
 	eautoreconf
 }
 
diff --git a/sys-apps/agedu/files/agedu-r9671-fix-automagic.patch b/sys-apps/agedu/files/agedu-r9671-fix-automagic.patch
index 8e0c6ea2969e..0ea79d1a170a 100644
--- a/sys-apps/agedu/files/agedu-r9671-fix-automagic.patch
+++ b/sys-apps/agedu/files/agedu-r9671-fix-automagic.patch
@@ -1,6 +1,5 @@
-diff -Naur agedu-r9671.orig/configure.ac agedu-r9671/configure.ac
---- agedu-r9671.orig/configure.ac	2012-10-20 21:20:47.000000000 -0400
-+++ agedu-r9671/configure.ac	2012-10-21 15:13:08.000000000 -0400
+--- a/configure.ac
++++ b/configure.ac
 @@ -10,8 +10,6 @@
  AC_PROG_CC
  AC_PROG_CC_C99
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index e961179626e9..b14728106a86 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -1,6 +1,6 @@
 AUX attr-2.4.48-perl-5.26.patch 635 BLAKE2B 474a08f4dc2ebd1f6c234461645985dc1dbe5bbd33d8a073a76a74846a3dbefd27dc6803f3f671c9c143e6dfa840e7f9df2e763026895e12d9ac894b51155453 SHA512 1a04e4e3fd733dd229049c5c1e1300a5fb7bf9ff90d5ac51fd9a636fcf40b833073c9c9adae9df46f492e07933a136faa775b22b351f04ae6afa85332cfd4f45
 DIST attr-2.4.47.src.tar.gz 343692 BLAKE2B af4d509f156cb2e693f0faebf1a6cfb4a27cbdd3fd7f8b436cc01419c905ff9ac36214ada2ca8269e49c2e276917b1178dcda97050cf25cecd65382f22bdf9bb SHA512 2a333f63655758298650cf8f89c175efdc0112dcc4013e8d023e2a9a69f177e4bcb1f1d10b6666d6f2027dca4dec0833d54749952ab153d28367e1a72e6e2831
 DIST attr-2.4.48.tar.xz 346292 BLAKE2B eeffc17bf485749b5d0a1fce4ac3702c33a0bacce3ad635400e8b0b52981f14c5e750ef570f8fd19657e460e51e6e09f972134ef8a3e6efc15c2a7203682df75 SHA512 78b8160303aec9e01f63b5cf725a9e16432ff1d4a6e0065ce1a52715ae1266572e0c01f9be25c938c484deea288fdff2ce27981c3aea578753ad854084957e8b
-EBUILD attr-2.4.47-r2.ebuild 1849 BLAKE2B 85b4f61c38d025e9f00d95afc3272b02d0c39b191414f462477c23478eee13f26cd92a5266ca06a9ba350928de64606a41947dee125fa6fada542c0c05b1c2fc SHA512 23f6808bedd1beb0267c81a60703cedebb3c64ebf5c27f5846aec20cc1187bd75a5e13a35a91c802abbd6f97b30f16e806d2569513a4b4f58a73ddbb213485ee
+EBUILD attr-2.4.47-r2.ebuild 1721 BLAKE2B 59cb46b36bdb2ad79feb1fb4249940f05fd9020580db49778cb7c64e3358b7f7480473e17c8527c1c22f4a191a217073393bba98901cf1a8a6f71b401abde6b2 SHA512 8c6415eaf04fc1e2fcc42fef529db9db3536b6e71ac1acb652ca4e2b1b053e1a1f6e7061dd903071ed28e433a21c4939eeda087a5c97d9b490419ac4667b3d9d
 EBUILD attr-2.4.48.ebuild 1441 BLAKE2B ec4c81afa4dece6a95f91e3851db45ec99446d0ad57243d4e2f6abb8a9adce2b0908b24b14bb5acc324f0e5eb2c7ac85d5ca0f027786fdb96cf6bf2bfe146316 SHA512 fd786dabba25d3d57f5b66a093e9ab4fabf9a7432c5f9f00653c83827a069bb69d5668d5db8f08abf511119cb6615bb1205141c8e1c340a386468e0fb823604d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/attr/attr-2.4.47-r2.ebuild b/sys-apps/attr/attr-2.4.47-r2.ebuild
index 6dfcf00898c3..76ba3d7e08df 100644
--- a/sys-apps/attr/attr-2.4.47-r2.ebuild
+++ b/sys-apps/attr/attr-2.4.47-r2.ebuild
@@ -16,10 +16,7 @@ IUSE="nls static-libs"
 
 DEPEND="nls? ( sys-devel/gettext )
 	sys-devel/autoconf"
-RDEPEND="abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+RDEPEND=""
 
 src_prepare() {
 	sed -i \
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 2a54357902a7..bc6b697884ef 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -16,7 +16,7 @@ DIST coreutils-8.29.tar.xz 5286588 BLAKE2B cbb66d9054bdd2db5b9a6010876484b16d178
 EBUILD coreutils-8.25.ebuild 5839 BLAKE2B 118fc33f8b2ce4dcb1b797af0630e3aa6ba45f491d220a700841f53201578afabb3088ad06552080a42137db7ff9d930c25d232d4c71b082c0e1e16f5d732348 SHA512 86a917921cfd7c20755c2570c58438f7bfe923f8838e91508300a745a4417038cc81112a50972f288a02ff3acbb0405ac01784170fbebd62c9ac4c1e40294816
 EBUILD coreutils-8.26.ebuild 5858 BLAKE2B 9247499208fc8e9155b0b107dea5cd99b7e1da3ebc55c2cac9c25c4939d7a522afb8de33398169635c678fae8a0f58ee981d9542074e47aa0a6fe56041ae478e SHA512 fc8a6d01fb2e3885b876756dbc0c4a78e0300d470ca2e845de5045f6dc79f8d004b7069ca5df40bfee05662bbc01d05107ad793c868e2b6451b757fb2e149e14
 EBUILD coreutils-8.27.ebuild 5901 BLAKE2B e15c043848f33eb817f0237b1428928feb5063b2b2e553667aff0b7ed5b81062fcb8e078d4419da2c6196de56d5dfeab7a849ee25afa4bdc80109f90d43c508a SHA512 a230b81b5913e0b98efe30f2876587178539c9dd462424c4eb71f5572fd496e4b0224f76cef92be973601f022f439ee36da393fabf4b70c2bfec71785321e8cd
-EBUILD coreutils-8.28-r1.ebuild 6517 BLAKE2B 611f07f4028dc8524717136719b9905f8a8487c1f72a3b1e84d2985672a42ae85ce3b599f5e43ea151622e41c35bff5a57a5cf6ca7adcff4a5f4bf1f244e1005 SHA512 52e4d5ce216fef2b1dcc2b5ee7e8cf7e5d428053e2f330cd29961d9d72d3240b82a649232a60abacf8c7b620a3b2b2233cba9e2721265b00cda3c369c452ce05
+EBUILD coreutils-8.28-r1.ebuild 6516 BLAKE2B cce086ffecc713b04301bbd498bca6cce4bb501d2d80ab93fa9dfd86b3e88c62ea79f652385a789b09f4e02f66a6a500637ff9d393f4c3294c1005f018de04be SHA512 8df28ce72003cd7f890f252b1f62addd0c80b2ed3b6599cde3cde7d25478923fb9848783c8ff5e88c91f75ba3c879e89d0e955acaa8467583cddc00630b57ad9
 EBUILD coreutils-8.28.ebuild 5871 BLAKE2B de4df961f1615d7acec165054e2118b81eb091d09ba7bdb773bb6592234643312713d78d09ad9def4cea37e0f41618426b089e4b5f4e9f14f95d751f1f90cc4b SHA512 e3f725bf850b21e6881465b29dca4984dc61a6cf0efc24f7c5ae970142cee83cdfd3fd1a8a8ab8801a66d99e40acffe655c6739c4c026c5c2deebdc19abd58bf
 EBUILD coreutils-8.29.ebuild 6063 BLAKE2B 3582ae6e941fa7d6dc47729939ebec016d6d682d616069cac70c58dc34ecf13820820191be18c353f0fc4d86bb6af7becd888024fa5cf21c718c005c26bebd90 SHA512 095b2958618e972ae9f6d04f7868acc97996a3fbd8bede850d6f215d392736cfe046ee5afb99919e10f34b1dfbcbdd501ef37880f9d6ab0a697d68e342231196
 MISC metadata.xml 869 BLAKE2B 397aa866d67eb1d6ff5f604194cf071be0f75606092d78e1cf7f0ced85cf4474d67677307e7e8566ba402c1f94ae2f3e3906ef5006a50e73d6673edb25d517fa SHA512 19e07c93cbe1cfe087eb7fdc8647aa4c264f1e6a193a0ed4e1ceb302bda92565aa76966b6ef2efa15d7535082ef0e6a1454fee20eca4797466f5de5e37ac4957
diff --git a/sys-apps/coreutils/coreutils-8.28-r1.ebuild b/sys-apps/coreutils/coreutils-8.28-r1.ebuild
index 9397aebfcb4c..6629afaa9633 100644
--- a/sys-apps/coreutils/coreutils-8.28-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.28-r1.ebuild
@@ -24,7 +24,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 ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux static test userland_BSD vanilla xattr"
 
 LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index b90175fd3d57..b2751c8d2c46 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -5,7 +5,7 @@ DIST dbus-1.10.18.tar.gz 1986589 BLAKE2B 95b8a04362e78001e723301e5f170e923bca8b7
 DIST dbus-1.10.24.tar.gz 1991358 BLAKE2B ffa82a26f156d5d5b5864cc675f2a24b103dcf5c73ac8a570e1e13f37f9d6b8c2aea2545b1a3979d3a94ce7a2ddda7280afde4ecd9b682d3d31355f82af217f7 SHA512 fc0b88b756affdb4fc7a62e84a6f7757121293afeadc38acf8aac48b6c2b82531e136a575be2ab503a39d7669cb7b609a021e20c1064e28c965c091e94c4f68c
 DIST dbus-1.12.4.tar.gz 2067402 BLAKE2B 621a9223c9d20a76415935d421a506100bbdf4852dc3c2a4f221750f739757a4945d60cb4a1f9032602f2993b868b502e7eb1835c8d2764666902c01daa01ba5 SHA512 ca9f7c76f705aca0f71366627fadf8b5c68992d5bcb6fae1746a8c14e9dc93c4492e80c63b6fd522b8753ec264df046e33482a5ce20be82adf181a6dd69b36a5
 DIST dbus-1.12.6.tar.gz 2068612 BLAKE2B 3dbb05e899e511a636816393ebc28548cc2ecaabaa0c04737189a0812791da195708ee455d7b0439fc81eea113f4bd8fc64b1b9b93e9dac84664b9c51049e75c SHA512 a0599329190e90d5982215138a19031028ed825f54c76c1ae13b54c2e4ddf14c949eacaac05c667db11bca13fb4bbdf8855fc9e15641cece55be1efde00c41ab
-EBUILD dbus-1.10.18.ebuild 7511 BLAKE2B 723c6e71e73b4ed5c3b2a664da5b00fd37efca9103e96e19ca0e0a58482e3e60ddc3325c1ad50b2cf58862ea2f1f1ea9944c3a7093a729f3a712b3e4e42255a3 SHA512 1623a683105edaf9f495b18ca770ff788e528302a50235fe584b9eab2b91cd655a5ed0eb3b3e60ca810382a7637a7bdfa736b8b1129a86e56e4040bb16a4d81b
+EBUILD dbus-1.10.18.ebuild 7378 BLAKE2B d258aceeb402a50f56a971ed97e5789b15f9c2c32b64adf0570e67fd78911813e7c3f7de8c41f43e326b120561ee27b179aed6424a7db2e438067e8a1b1233d5 SHA512 e2a689defcb78cb6fec98ec393af42c8e1b71f7ad2afe1c9fc2d039ffb7b0b3684ea13ed06f1127567dbb8b6621c0da259334070ef1e22982d75a3c9ade491eb
 EBUILD dbus-1.10.24.ebuild 7386 BLAKE2B 767c81f2173c494a53e70576acab80946879adc6ed2edcf63332eb926dc2d2dfcf1c61bd606df299480cea26f66a7d5fe77c7c84bc60ed89a838d1038a8000a8 SHA512 9e7ce68ca8a1e0399bd53eb27d41b539dc6680f71c776532a955ba1ce8d6c1e3fd014b909a2ec3f78b5fd8bf9e3300487998df891938b0379c773d0868ea7cac
 EBUILD dbus-1.12.4.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
 EBUILD dbus-1.12.6.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
diff --git a/sys-apps/dbus/dbus-1.10.18.ebuild b/sys-apps/dbus/dbus-1.10.18.ebuild
index 3bd2f2d691d0..3a57a0a8f3ff 100644
--- a/sys-apps/dbus/dbus-1.10.18.ebuild
+++ b/sys-apps/dbus/dbus-1.10.18.ebuild
@@ -23,16 +23,12 @@ CDEPEND="
 	>=dev-libs/expat-2
 	selinux? (
 		sys-libs/libselinux
-		)
+	)
 	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd:0= )
 	X? (
 		x11-libs/libX11
 		x11-libs/libXt
-		)
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r4
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 	)
 "
 DEPEND="${CDEPEND}
@@ -43,7 +39,7 @@ DEPEND="${CDEPEND}
 	test? (
 		>=dev-libs/glib-2.36:2
 		${PYTHON_DEPS}
-		)
+	)
 "
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-dbus )
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index a53e3d6e3535..0610464279a5 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -3,6 +3,6 @@ DIST debianutils_4.7.tar.xz 156276 BLAKE2B 9d32dc8222b67d4f1f91d58af0811412924f5
 DIST debianutils_4.8.3.tar.xz 159292 BLAKE2B e655741f42594ff12b4f349331da57ec09073802c9778594619686c93fc3061cf5248ac8e9e2c1b391eb49dd572f3033b1db206ff43f373b17caf7f3c835111f SHA512 468b8f001c0338f166cbc2fe25079edc5feeaa38dce2f5c7e6724c691d6cb35f4843e987695e33ead557bb11887e78ff8a5e3e1f52a266a0f32fb978fa643897
 DIST debianutils_4.8.4.tar.xz 156344 BLAKE2B 069d15039579d4ce03d2ca4bfd0df199f0044049e7cd6ca899104eec5d917f3db290649bfdd851d8b14519df2750fb975bc6d96e98e14cdb626a610d44da80b0 SHA512 7d7b2d12d4907f6032477b4cd5b5dc94d8093724af8a97859c1d4cf229479e2dfe6d44143b454ed9b1990ca2d4833eaeb059659d8c305623875fdc8420659855
 EBUILD debianutils-4.7.ebuild 943 BLAKE2B bfa2506c83becb7dbf47bf311f00ac931107679446551ab4f38938f957377997d5340009bf8947036f2b6c0fd9a8b4ab265cc8ac5b28c0ed5784938ee0ae906c SHA512 f45eada04cddfefbe2961d7c2a7ff5ddf3a742947d9ffa1dd66b37ca33b99dc06d5d811b24fd660e972b0650569483eba78b4d7e4d97fe957f9e0db297227dea
-EBUILD debianutils-4.8.3.ebuild 950 BLAKE2B 989c5b4718c5127ff2d5a9ac5108e4f173a4c223ee5450e16b408d7f5df9e2e1f939836498a851841384c362e5301120214b9d4872bd5d80700570b0cd73f401 SHA512 ad3b04d67af8cc62936be2b0c094fc913d1b1ef91eeb6226df864fd41a6b91b4de98d0f038ec433ded1212ea1ce9bd82b2a74f96a2d631e94ba8d4621129ff84
+EBUILD debianutils-4.8.3.ebuild 946 BLAKE2B 91e2ce2423ce3c2314eff13866e6436c221ac87a97fe08daa804f7a3ea798bca0bb8ca8c224d46d8ea6912d6ca827cb3a9986b4b50581d2451291459f79bd1d8 SHA512 a59a6eae24697d99ee40c31ff6fa84e50a45a0df787552d9241b2276af069af982adcb96652f30be25e39bf9bc9fa293400662543a688495e3df1fa693572786
 EBUILD debianutils-4.8.4.ebuild 963 BLAKE2B 32705ce1d6aef1a96bdb597ef36e3ca0465611f53b975dce303842ad3abf51984c719c5f68187cb1cd7d433d0e5be6738bba62a6369d9efa83571130c168ea50 SHA512 df8c91246658fb77f1e126a37479814e28d3c1dd8f8c532197689f5150088ebefe56d4296cd6674215e1eafadcf226e925d08a3c85d8553208faeaf6ea7a1071
 MISC metadata.xml 355 BLAKE2B 9f0e6370bbf41d0180e561b2a747f2d3b9e400ea2f9396c059f0b03ad5293032554135573e5fc02f4d91b68d41bdb6722946662eb1c94ac10b1e0384aaeeeeb3 SHA512 967535ef4f2ce2ae377f05548d1cd15589b6e9ceb0b76c49a3ceec1d464aaff2aea43c98be4d8ffd7a8566f77dbce41a75d4b5dc489bc03b4f7562af656b3f84
diff --git a/sys-apps/debianutils/debianutils-4.8.3.ebuild b/sys-apps/debianutils/debianutils-4.8.3.ebuild
index b112ecc70208..c9ba8f106406 100644
--- a/sys-apps/debianutils/debianutils-4.8.3.ebuild
+++ b/sys-apps/debianutils/debianutils-4.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="kernel_linux static"
 
 PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index b88f7abd4e58..83697178fce0 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,5 +1,5 @@
 DIST dmidecode-3.0.tar.xz 58704 BLAKE2B d3e22cfeb8f537f461523d0927cc5eb5fa6214638b8a9360b2159abff1b9f60c8a8753f24a233a77f7c413b074f9a910f000a0c49ca166ebf3297ad673e9fb93 SHA512 fa31190e43ae7a0b61f6313b45f5eba3ab66390accd587129419e48fca931b631cbb331d6893cf0c1bfca94c86ff8c557215166e0881dee93b3af10a86878eb1
 DIST dmidecode-3.1.tar.xz 61204 BLAKE2B 439e265dd3f7b225d61b5d4228c0a77b25dd44b5d3672fdd9bbe432f5ae59ac23d2abd80e40621cda934643c9819b05f34d4f5befc8a75b93ae1840caf717cea SHA512 226557ad5747a2a2eb54a938543373b9ddcff032d330ca3b9a066cc81c0e137028f606ffedc042e0220b523346e2f2f7abb0e4b8b34a8bd173719aa858519de9
 EBUILD dmidecode-3.0.ebuild 1145 BLAKE2B 874b9c55f5e927b9418f7f4a41bdc97cb8c461c279007052a3bb7f182154ad7602508eb406a20c5d4e786662e1aec90d01536f5727cf0bc4e172e9f441729433 SHA512 9a361a7c80194bb062b6d27d9f06bb8446298da1a09801223ab9c52e275904486945229a769b8441c51eb0c508982ee6eae116027ef3b22bded76b9f132edada
-EBUILD dmidecode-3.1.ebuild 1145 BLAKE2B a470eaf8f3dc2d9739a2010fcef5366f3669b4e34eb14a9ad96a44bcaa1c2b71db4fa7a1b50cfb9418d3a703be603f12f7b7d70d6ad5ad97eb86c8cb4df6a319 SHA512 29421a3b94aebd1491e26a2f1a255de47b1c222964b90214675db853c368b8966d1345a7a713c520fad7f44e6996b5cdcad52e3b69cd659dde9e1c24f5ba2dcd
+EBUILD dmidecode-3.1.ebuild 1144 BLAKE2B 453c85be0a196dc2514e0589346d9b8015e5671f496483574ab71c6858b45a1d1599a84a59d727e59d006b61bc5476d0c31b30b9a4107e806affd107ccea33ec SHA512 23a0210cb4291f580f12291afb4c56fbbddd8da9cfa1028804e2826a9374aabe4fd3fdf9c5884ad5071aa44346d7681d9bd3dc60dc81c1b60b2ab3a69f28c94c
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/dmidecode/dmidecode-3.1.ebuild b/sys-apps/dmidecode/dmidecode-3.1.ebuild
index 7745384ae385..a128dccc3dfe 100644
--- a/sys-apps/dmidecode/dmidecode-3.1.ebuild
+++ b/sys-apps/dmidecode/dmidecode-3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
+KEYWORDS="-* amd64 arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index a840c833cf43..c34d38b2d431 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -2,7 +2,7 @@ DIST ethtool-4.13.tar.xz 217472 BLAKE2B be60c4763a06dba4b246c17b76dd10bf956e69d1
 DIST ethtool-4.15.tar.xz 219408 BLAKE2B 7667f3e24f62c6dbaeb2590e79b59198d15ee44a46440c9af917154a5e5b6fde5f29b88ada03fdc195a642c2585c16ae503cf04b1be941d98413a596e4396ee4 SHA512 7ffd76b17b56de4182a14c2a77bf3026715f4af4c60809aed192f5631cb72173ed3c5d451e54711a73b65fee8339d58c857e83ddf60b85057bfed20863476527
 DIST ethtool-4.16.tar.xz 220676 BLAKE2B 12eb2e69493bb83b3789747a8019e3f8b7d6d39dbff7b1fc5fa6352943334881dd47c35d355d53a07ba517e91663aa623afb5ecdc1a1f57137dd44f20f492954 SHA512 c0cd28ca34e7fdc9af3335fd0b666b4b879ecbaf0c0bccf032aa36fdd66cbb01b6ddf16c6b60823d46a81f9b5f377047422ac88cc7cd0a869e239a3171966c66
 DIST ethtool-4.8.tar.xz 214932 BLAKE2B bbfbc7eb23a7fe057e28f22fad962bc8b46c581e4c6fc35612c345863b300478232b95569a2e35fd26f76eb48f824bdf7dcd0cdb8bdcc136e7494c5d39361f2b SHA512 ab1f13db57129fdef6018d8d8ee4ad9733041813aa0b7a29d46407e93d3c264a42aa24e2f1892084d523ed9946c62c6b9d2ae886629aeb013a58a0946fd6be96
-EBUILD ethtool-4.13.ebuild 458 BLAKE2B 7a3eb2f6d0a10e389392ebeef3e88e45d7aa59aea28557dee85e30b1fc48dbb8ebd5b61485383ce132add6e23e40422c93a48dd8d75a6bf7a9f7d6f6abf100a7 SHA512 4a186f6a1255c885f0a98e156e0fb93eb5bc5db4bbc77e63aa069128279dab11f0951de99559e77e83142b64a5ecf2ac871d0e577480e5f1068aea0f76ff42f9
+EBUILD ethtool-4.13.ebuild 456 BLAKE2B 290f866c3b5aac7dc8bcadef299bdec8615605c5f5a8ba023f638b2683a0f4b530b1a42c30baac65c8f040680c32e0a698d9835a9df381c66ba4e048e34515b2 SHA512 5379f661b4060f2a5d2920926f6163d8ecdbfa6928772d1c85bfdd7af4e15d5478afd77cb8895013c13e0bcd01ada9f694064a1c0de53e9e7fe636155e2dd298
 EBUILD ethtool-4.15.ebuild 461 BLAKE2B 723e352428fe60e0a62a1f00a839061fe3c146b889336e16a9e8b4a58f64f06c9d16faba896dce89b363985f9aa3c2723e8d033123624f0060eb7c6cf4e01b18 SHA512 3d045feec342b69797788268656a4acf63f0ec35e8e8facfae70e6e930ad69352b3810c317b22bcd27151cf06692bed324ac5a08236431f1f899f512288640fc
 EBUILD ethtool-4.16.ebuild 461 BLAKE2B 723e352428fe60e0a62a1f00a839061fe3c146b889336e16a9e8b4a58f64f06c9d16faba896dce89b363985f9aa3c2723e8d033123624f0060eb7c6cf4e01b18 SHA512 3d045feec342b69797788268656a4acf63f0ec35e8e8facfae70e6e930ad69352b3810c317b22bcd27151cf06692bed324ac5a08236431f1f899f512288640fc
 EBUILD ethtool-4.8.ebuild 453 BLAKE2B 46fd2c76b13b3ac09bf91980870c7eb70a2600ea46d3146b006b54d1b21dd72bd50cd01f29504ae9329db8be393fce2cf1bd540a006278e0d2530278b3a84ca7 SHA512 f5ebf39536df9e46be717e5e42334472c7f30d02a3dd9f8b1fbab8e2242cb0c67e573fb829fbf74f115d431b777a83ebc17005150751d83f8e681e5966e8fce2
diff --git a/sys-apps/ethtool/ethtool-4.13.ebuild b/sys-apps/ethtool/ethtool-4.13.ebuild
index f9c5c5d3088c..4d69f3c760f4 100644
--- a/sys-apps/ethtool/ethtool-4.13.ebuild
+++ b/sys-apps/ethtool/ethtool-4.13.ebuild
@@ -9,6 +9,6 @@ SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86"
 
 DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/gradm/Manifest b/sys-apps/gradm/Manifest
index d4c102ed8e44..3b20a35b614f 100644
--- a/sys-apps/gradm/Manifest
+++ b/sys-apps/gradm/Manifest
@@ -1,10 +1,10 @@
-AUX respect-gentoo-env-r3.patch 1999 BLAKE2B bd1c650f3ea99843e49336477ea31b101deec10f7ae4afe2f8c999eca791ea367452e48725fbc27abc483b487da23d22410e535d1a1280fe84d03da04dfbe24a SHA512 61e7919f138525b3a674e36a90e921ca6a5ea61334d2af102b2d90b4eae0e2a4ad5af6abdaa89cb456f3c4263aa44a945d4cd21b857a8428a56f1ee2caac96b0
+AUX respect-gentoo-env-r3.patch 1864 BLAKE2B 7392d487d9d35039413be785f2d5798fb4469108618c118d751e5e493a437a9a977fdfbb0851f4b1a52e44e25f5b22f68598d2dab73090794a7bf0f740a7437e SHA512 1502cc8bc68fa2fb8df904fad0f791c54bfdd94cb59e4ec25cce06423350aaff7afa1547386be28637efefdd23003d5483499cc812c46d2b7a534f753562e2d2
 DIST gradm-3.1-201603152148.tar.gz 91549 BLAKE2B a569ebbac10418ad69effb47a4102bdfd16cb99448d70550a71cad5ab2dca8076d03c4234819fa8ba9d3d50a57d676c2d703c2f308396a7d9ffdf527b1f1a5d8 SHA512 a423db1dfdaa0b068970b92dc970d6e10bfc20695437e92d967b064c3efe05114ab6de672eec984ab2f048b67b12ec8c6667a71bc584f03e5d2f0ebab1476158
 DIST gradm-3.1-201607172312.tar.gz 91667 BLAKE2B 207f86d12789ada00eeb3bc813863d671be54265eff7649a40960ab41296977d0e36dc60ebc482514e1803050026783d43017e7423e25e4d652f813cfb3e75c0 SHA512 61f14038ee555b99e4d0096dd01697d8adba45e057ffceadb44eafbdfba807b53030684c5073d169c005902acfa6baa673975ed4ab00ad035941c209f8f1d2e2
 DIST gradm-3.1-201608131257.tar.gz 91949 BLAKE2B e1dc55706a0c8492b2d0716cfe8abb4efdcd3829da725f412bd6882e28b34e0f52eb796fb9ff0b25db93512893d9d7dafe1aa54f44fa2f3b329adb48d4bc14b4 SHA512 0947abda8d4085fd6f4a569a29f146d6f093c7013ea3aba50df4fb740487b93696b63ab475eb862cfcd26aeb62cd69a55c3d6083b91a2eb9349ad566735f8cfe
 DIST gradm-3.1-201708012022.tar.gz 92238 BLAKE2B 220a2cba3f01e92adc6bf959cfa1721d6ea41247be2c6b742577c434071fe80d0135773e18b9a8a89f1c893c9cd03443e29af0e0b027c97422e4a743f8b6c960 SHA512 1c319ce5b102ad54d0c4d0c43222ed755719bb2568c9a4575b62965a73b0765265dc7068488e5e34df52ed9382b17e4bf1b32a8eef20a4d7a534f3f9a4ba2b3d
-EBUILD gradm-3.1.201603152148.ebuild 1088 BLAKE2B 5ff8a4b1a63600b0d7759d1b84d8aed15d09dea58d600c22875edd82c5487e10ba55ae1d05d910dc58d4609495753d39a125fca583bde0a33ed1bee1e1d89fdf SHA512 1af30a86418bfebba36d4774eb4486c2eb0458961cb06753133093dfface0456f32353b097dc5a628c841e970e2a2a217f9074f184b0302655fe6fc2a2aad5c9
-EBUILD gradm-3.1.201607172312.ebuild 1088 BLAKE2B 5ff8a4b1a63600b0d7759d1b84d8aed15d09dea58d600c22875edd82c5487e10ba55ae1d05d910dc58d4609495753d39a125fca583bde0a33ed1bee1e1d89fdf SHA512 1af30a86418bfebba36d4774eb4486c2eb0458961cb06753133093dfface0456f32353b097dc5a628c841e970e2a2a217f9074f184b0302655fe6fc2a2aad5c9
-EBUILD gradm-3.1.201608131257.ebuild 1090 BLAKE2B 1f623cd7094a62c0baeb97e145c3e27037bcf2d4e7b78578381364d170f57cd8446ddc58ef834420151adb9c20448b584d7a965add7290c2dfd0a47aa31045ad SHA512 97e5438d3f02af476e739e9c449dbc78a9a65b5776f53914d586ca7dff019dcd8c1fd951a9f6d3ee6e43c4b3985c92edcdd8388ed74d9667e743cbc113b41f64
-EBUILD gradm-3.1.201708012022.ebuild 1090 BLAKE2B 678a535028e9f4764d5006101ace00b52de3fe703e3313d49b5533bc6c1029e99b7bacbf2f18c62218e6795386f36b8796f50ed4db6a1b2398a5f5c5adab5c63 SHA512 0c9374b23d4f309dca4069cc9c1c9bfcab06d78a370b2d08270b568d000b3c39bc279d04386839f99f90b2caebfbc5e3e5f938cd3a9e218a25d6f42445caadc7
+EBUILD gradm-3.1.201603152148.ebuild 1081 BLAKE2B bd9ed5b7f58fd5028880bcc75dbb7e3c8522625a7d9af31fdf433b78962c5923fec2e3525701074963176391faf6cb39c942bd5c16a41ed1d050b1b36bb02092 SHA512 38e02d2493d68b9dfacf10a86e465c89dd656393b17d1f5f3fa26adee6460e540a3ec140cf2059618c7e6e4dd2666faef4c4335e4118faf8f28e0841ef41bf52
+EBUILD gradm-3.1.201607172312.ebuild 1081 BLAKE2B bd9ed5b7f58fd5028880bcc75dbb7e3c8522625a7d9af31fdf433b78962c5923fec2e3525701074963176391faf6cb39c942bd5c16a41ed1d050b1b36bb02092 SHA512 38e02d2493d68b9dfacf10a86e465c89dd656393b17d1f5f3fa26adee6460e540a3ec140cf2059618c7e6e4dd2666faef4c4335e4118faf8f28e0841ef41bf52
+EBUILD gradm-3.1.201608131257.ebuild 1083 BLAKE2B 27878e0b59903977b5a8119894edf12a6a8edb698be8bb91e5a9b48d79cbdd0fca6e90e2ea38ead3f2d08ebbff0c5fa687069e1671e82805c45f51217a242aee SHA512 4fc03ef60ac32cf8352909b5a39b8e3f2b7bface4567add63da88170bb1c334ff4e3055ed9d483c6f0cf36f83da668acc9b8fdf06c41614264f33332b880c9f6
+EBUILD gradm-3.1.201708012022.ebuild 1083 BLAKE2B 27878e0b59903977b5a8119894edf12a6a8edb698be8bb91e5a9b48d79cbdd0fca6e90e2ea38ead3f2d08ebbff0c5fa687069e1671e82805c45f51217a242aee SHA512 4fc03ef60ac32cf8352909b5a39b8e3f2b7bface4567add63da88170bb1c334ff4e3055ed9d483c6f0cf36f83da668acc9b8fdf06c41614264f33332b880c9f6
 MISC metadata.xml 363 BLAKE2B 27b81c37d5a0f685942eda5610d73a0933a7654282c851a92bc352f27676c609452b6c7a3f3bb94c0fa358fa360c5c113aac6acd24e186347912f61cf4a0bdf3 SHA512 b848c5de5ed09c4843c3e75d59ea4697c5d1c1fa2ce8c9e9a0bf38b5102d57f25aa626f3c6295f4f3a345b1cedc15553fb45b460bf41e73df43eb2eef6e00281
diff --git a/sys-apps/gradm/files/respect-gentoo-env-r3.patch b/sys-apps/gradm/files/respect-gentoo-env-r3.patch
index 7c899b139745..13220ae4689a 100644
--- a/sys-apps/gradm/files/respect-gentoo-env-r3.patch
+++ b/sys-apps/gradm/files/respect-gentoo-env-r3.patch
@@ -1,6 +1,5 @@
-diff -Naur gradm2.orig/Makefile gradm2/Makefile
---- gradm2.orig/Makefile	2013-08-09 16:28:37.000000000 -0400
-+++ gradm2/Makefile	2013-08-10 07:57:12.000000000 -0400
+--- a/Makefile
++++ b/Makefile
 @@ -18,18 +18,18 @@
  BISON=/usr/bin/bison
  #YACC := $(shell if [ -x $(BYACC) ]; then echo $(BYACC); else echo $(BISON); fi)
diff --git a/sys-apps/gradm/gradm-3.1.201603152148.ebuild b/sys-apps/gradm/gradm-3.1.201603152148.ebuild
index 5b0e441a008d..e4eef58b2dc0 100644
--- a/sys-apps/gradm/gradm-3.1.201603152148.ebuild
+++ b/sys-apps/gradm/gradm-3.1.201603152148.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-inherit flag-o-matic toolchain-funcs versionator eutils udev
+EAPI=6
+inherit flag-o-matic toolchain-funcs udev versionator
 
 MY_PV="$(replace_version_separator 2 -)"
 
@@ -23,10 +23,13 @@ DEPEND="
 
 S=${WORKDIR}/${PN}
 
+PATCHES=(
+	"${FILESDIR}"/respect-gentoo-env-r3.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/respect-gentoo-env-r3.patch
+	default
 	sed -i -e "s:/lib/udev:$(get_udevdir):" Makefile || die
-	eapply_user
 }
 
 src_compile() {
diff --git a/sys-apps/gradm/gradm-3.1.201607172312.ebuild b/sys-apps/gradm/gradm-3.1.201607172312.ebuild
index 5b0e441a008d..e4eef58b2dc0 100644
--- a/sys-apps/gradm/gradm-3.1.201607172312.ebuild
+++ b/sys-apps/gradm/gradm-3.1.201607172312.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-inherit flag-o-matic toolchain-funcs versionator eutils udev
+EAPI=6
+inherit flag-o-matic toolchain-funcs udev versionator
 
 MY_PV="$(replace_version_separator 2 -)"
 
@@ -23,10 +23,13 @@ DEPEND="
 
 S=${WORKDIR}/${PN}
 
+PATCHES=(
+	"${FILESDIR}"/respect-gentoo-env-r3.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/respect-gentoo-env-r3.patch
+	default
 	sed -i -e "s:/lib/udev:$(get_udevdir):" Makefile || die
-	eapply_user
 }
 
 src_compile() {
diff --git a/sys-apps/gradm/gradm-3.1.201608131257.ebuild b/sys-apps/gradm/gradm-3.1.201608131257.ebuild
index a12d1fbde72a..4badd5731290 100644
--- a/sys-apps/gradm/gradm-3.1.201608131257.ebuild
+++ b/sys-apps/gradm/gradm-3.1.201608131257.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-inherit flag-o-matic toolchain-funcs versionator eutils udev
+EAPI=6
+inherit flag-o-matic toolchain-funcs udev versionator
 
 MY_PV="$(replace_version_separator 2 -)"
 
@@ -23,10 +23,13 @@ DEPEND="
 
 S=${WORKDIR}/${PN}
 
+PATCHES=(
+	"${FILESDIR}"/respect-gentoo-env-r3.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/respect-gentoo-env-r3.patch
+	default
 	sed -i -e "s:/lib/udev:$(get_udevdir):" Makefile || die
-	eapply_user
 }
 
 src_compile() {
diff --git a/sys-apps/gradm/gradm-3.1.201708012022.ebuild b/sys-apps/gradm/gradm-3.1.201708012022.ebuild
index 31c5550113d0..4badd5731290 100644
--- a/sys-apps/gradm/gradm-3.1.201708012022.ebuild
+++ b/sys-apps/gradm/gradm-3.1.201708012022.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="6"
-inherit flag-o-matic toolchain-funcs versionator eutils udev
+EAPI=6
+inherit flag-o-matic toolchain-funcs udev versionator
 
 MY_PV="$(replace_version_separator 2 -)"
 
@@ -23,10 +23,13 @@ DEPEND="
 
 S=${WORKDIR}/${PN}
 
+PATCHES=(
+	"${FILESDIR}"/respect-gentoo-env-r3.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/respect-gentoo-env-r3.patch
+	default
 	sed -i -e "s:/lib/udev:$(get_udevdir):" Makefile || die
-	eapply_user
 }
 
 src_compile() {
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 517f1b4b4689..41923d3e2584 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -5,5 +5,5 @@ AUX service.gentoo 322 BLAKE2B 302a1506492e5122a03ea616de11dea493637d904cde1415a
 DIST haveged-1.9.1.tar.gz 474845 BLAKE2B bec7ecaac93f7b6ab746dcb228172272bf7575e33d6ea1e2d1cc8a8fa63187db5e41565a5b49d922c6f4c222d71452e41d0b2dd00984eda179a8026fb76432ce SHA512 267d62cfeb886ea00fa412de1a91a34821460d0f4ad789dcfb3547018300e1cbf480917571b19652f2d449369293031d9534f9533bbf6a59560f4f10608c9cd2
 DIST haveged-1.9.2.tar.gz 494682 BLAKE2B a972d128b19fecc3d01e17bd4cf6d5ec03ae716c4b4934c73193e03f3d3f9ff3461a8280ec0a20885499fd334343deb193ddc98b0697b2b14f92fff897bbf59b SHA512 65f70950fb90ef9c24ff3bf1b26e19a9cde2bec4749e2e64d5461a51646a20cf610efa2a5014219b8605957afa0084abd2ba11c7dc15f9379afce784971627b8
 EBUILD haveged-1.9.1.ebuild 1002 BLAKE2B c63e879cf82aa18711e357aa62f49ad3f76fdd3b219dd1ef5241585deabf93106428731461d721aab95046ef82e83e67ccfe7e9e919177d927787e47eec25bc2 SHA512 f156ac90f991ccd4b090657055e323123915398a9e8877dc4363b297b192709d3240d68cab397a7d8de96465f08e5b833370ea19e0b5673cc3b9638e30f0af59
-EBUILD haveged-1.9.2-r1.ebuild 961 BLAKE2B e8c31b46e38b1dec8c4f504998026451154ab9275ab22bceaac36e4493481d7637ab20a63ae5f85956030f827d6f54acebe7cf8e6551c1b5ee7cd85ffb550d75 SHA512 e75771e470aa9d1c19336e2657d79ba3244656e4f620a82187d3726e430035f18de45aef09c7242ffdff80ded0f9d277348eb91693f70dc6cf8a7293d7cc2735
+EBUILD haveged-1.9.2-r1.ebuild 960 BLAKE2B ca6650ea624b8ca6a372ace436bdef5c2a956fc627a16a2ccf8083a0ea3e147f5cec9571b560a5e423e1a4abd36337d632d74ac4365aa7c141a8fe81d214d79b SHA512 e18f627765762c3b64f34319bd3756bda5963cb861f6fd04a3d2e31a736bd19d99d9ab4dc3690563dbf9fbd11b750431cc808c9252c5f043c6dda4b0654c2a28
 MISC metadata.xml 371 BLAKE2B d44d1873136cfff8c9c1ae42ee0ded780af875987caecc98494afba60017c3da105423642f10f2475d344636d54c71885607649ceb4f285a477698b40449d2ef SHA512 640e188a0829d4408d9bc7ca0c7558222ed8148afef25a88a136c0ae5bb44531bc8352c9c1da1c13e395cb54d67c62a485fa4f6329ad7b76255def9d979b70d0
diff --git a/sys-apps/haveged/haveged-1.9.2-r1.ebuild b/sys-apps/haveged/haveged-1.9.2-r1.ebuild
index 36adaf84b922..65f4ac487086 100644
--- a/sys-apps/haveged/haveged-1.9.2-r1.ebuild
+++ b/sys-apps/haveged/haveged-1.9.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc x86"
 IUSE="selinux static-libs"
 
 DEPEND=""
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index f59db4600a6d..6e88ad80a0e2 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -7,7 +7,7 @@ DIST hdparm-9.52.tar.gz 140737 BLAKE2B 0614bfb0844f088b533951c4636bf92879c4ff7e9
 DIST hdparm-9.55.tar.gz 136805 BLAKE2B 0739295dcc80a2b774b2edd8c447ee739476e5fe55695e22f867de2c8352746ac8dcbef220554a36bcb9417317f44c433cbbd807629ef7514b5e1d93be56c280 SHA512 a9b5be38fda9db7f125ecc5a174668e81464266493672184d214ea9b50437e089482799fb5c817c433f897eac8741fe3dc052658969bb1ebac158606dee51196
 DIST hdparm-9.56.tar.gz 137213 BLAKE2B ffea04fb2cb14fd9ee01f0583c5fbe8d0c24d3dcecaa68750653e0475d97b86f1a39bde43ca1feb68f393606613c6a4cc8090e714eb60b1a30e223929b1fcadd SHA512 5dee7211a2528920bd197d45217a7b58df933c2500d224d39a8bb89c4d3f340962953e17b7b5f66fd52205a3a3b225d5bc0b75fc7af0f064f8ea092b55090b03
 EBUILD hdparm-9.51.ebuild 1068 BLAKE2B da518c793f37b34bed3ba283e7152d4fd4ebca37548090db5dac52c14141b513f47e16ae06c89e0dafbeaf92af76728d158c8c7539cad5f91f2c623f865e8dcb SHA512 af88b4d68dbb6c844b170a0313bb0ba98b6a0b2e36b3b2b6e45a5e6f6f6129f2a2aafb6b0fa63177b2af717cac5c0e322f3ed00f7ffe6a6c941dfa8145d3d7bb
-EBUILD hdparm-9.52.ebuild 1069 BLAKE2B 44e14593c204fdce97aaa1d29d6b9e46f64e84489e897fada71990fd75fc0b0d16b00fa968ae4f1052eb145a290fa89c8874b71a5382a9b5cae1c2d2a319b4b0 SHA512 c680a4798671fae975b9efef13246fba2c18f0b61a4fbd436c5693295ba4cd33880651ad8982508e83ba9de1b54799ba2e20c93e904e912aa942f8804c7cc67d
+EBUILD hdparm-9.52.ebuild 1068 BLAKE2B 61dc46bef9c599cacc1ada387cb708b774ab015761d69db8a777ce2f32c1fc87edea48956cede3a30df78394f6de998d321aafe90f554181278a84523849d565 SHA512 a6601069056b25a0447032cbf746a152d257d0a5093a88736136aafbd526964a07608654fc23854390a802b64bd28950695e4be2153ab0c621719ea7d1c5367f
 EBUILD hdparm-9.55.ebuild 1006 BLAKE2B 360e7286447cbdeb2c2550f020ec7a6f4fe84dbd1416e4a1d1777d2efb7644a4f4897ae6735d11a395f6eba17e3f6e46fdbec28e4c995a6d0f5a04f57e87a0ca SHA512 a80757a40a1c52bb9d5167ba143c1ae10f718b34cc3790fad7b88b5301fda1cf8721120ecf4f1a785e2312c948eedfccdaaf408a46a9b17f5aae75429f50fbfa
 EBUILD hdparm-9.56.ebuild 1006 BLAKE2B 360e7286447cbdeb2c2550f020ec7a6f4fe84dbd1416e4a1d1777d2efb7644a4f4897ae6735d11a395f6eba17e3f6e46fdbec28e4c995a6d0f5a04f57e87a0ca SHA512 a80757a40a1c52bb9d5167ba143c1ae10f718b34cc3790fad7b88b5301fda1cf8721120ecf4f1a785e2312c948eedfccdaaf408a46a9b17f5aae75429f50fbfa
 MISC metadata.xml 326 BLAKE2B 503d13af2b352e0b8d864559489f80ae98d7420c0a98ea46847126e792a93ffcbce3b524da7f6c3551702e07641cef62449c0c7f2ae6188d79df3f7e5a6b8685 SHA512 39219fcef0756910c51e804cf94170408208840e7b88d99b4583f8fcfb02e1664358f9d4bf4c3f1a1a619b6a87852bc4831c93f10215500842023132a85c2287
diff --git a/sys-apps/hdparm/hdparm-9.52.ebuild b/sys-apps/hdparm/hdparm-9.52.ebuild
index d61093022f6f..68667499c6bd 100644
--- a/sys-apps/hdparm/hdparm-9.52.ebuild
+++ b/sys-apps/hdparm/hdparm-9.52.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
 
 LICENSE="BSD GPL-2" # GPL-2 only
 SLOT="0"
-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"
 IUSE="static"
 
 PATCHES=(
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index ae6ae4268030..cb1690691077 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -4,7 +4,7 @@ DIST hwids-20171003.tar.gz 3035908 BLAKE2B 8ecce99f6a6233b3dd79e1663053b6718fd8b
 DIST hwids-20180315.tar.gz 3117949 BLAKE2B 34b6349d7adf38da8591a0f75e98ce09f0217bb284d1bdc70d7c1bd0a13f0c21b46b2a40ea363dfcdb7524e2a06e94d8ca3a63f5dce6f4afac2b20d05229e944 SHA512 2c52b88b74d231f7c563079b02fdbe29ff70c4df5aae64f1241ab0e1bd3ab9c3ca925e102474e32d3dc8dcb833e3451f0698024a8fff808a987ce468af281898
 EBUILD hwids-20170328.ebuild 1442 BLAKE2B de4a2b9d8395ce3c5c0a09f3f735519b0fea7166faf60439d67da84952027fb47fc2aebcb9c0ba5960d0b6c42874bc4833371596ceb99fe394a49c4af8df54af SHA512 3dbde4bd8f65b1822da919b5cea69e20d9173e2e14f26054dfaf08ee0a24839d867a699a3950de2249a88cb17848747983c3bd38e86f2deed14615c844ea6c29
 EBUILD hwids-20170715.ebuild 1455 BLAKE2B 48b2ba621d627158d3cee3c1e96cdae5327620431e894314677ea3c0341282d41d87cabf045c1dca24a1c1c7055dd3365d700b5fea973eaab5f18ee0dc7c13c0 SHA512 3460a0646dcb649b10d7c02b98f50719d298a00f224df3aa06dd79235ea1107c914b20f07a53d675ee9bed3f76fdf30befcb5b33fc61c1d10b952122a2e9430c
-EBUILD hwids-20171003.ebuild 1710 BLAKE2B aafc8aca8bb1fd6972de7bf696b5f8ec29d0d6e473a59cadcbad978c50e39b0920c2d7d550e6b1c90ba33d17ad2049360a47c478d209a4b276207d8f728f3c53 SHA512 fef7bdc58df0d1342c6384569d170ed3128aadd3cf74cf811b74afe3cbc76fc55c121265c2f80a62333027338a24b638112c2e615ab8c3ccb0b80515565a7c35
+EBUILD hwids-20171003.ebuild 1709 BLAKE2B 35f5ab9cb6d9dc304f866ac0fe087e91c3d7a02fa83ed19a8bcfd0905f4e369cc99a299c833a4749ca9b4bd74e12a687e9c1893770f2048dcb2a59cdfd4c0ec9 SHA512 eead13c9cbf4f33a94d4ce8a4f864880f6cd61db1ffc005e2b43dabe22401e8d2f81d882f69b1a54e7c76b05426e756914692d44a4cda02626070b5fb00a4a1a
 EBUILD hwids-20180315.ebuild 1750 BLAKE2B df4293882c37bd67f31031e6f57a4f530b219e79ed97a588176adb363f789cce5df1d639a4a16cbba346db05fef0d5449733d6ebf0054f9501d4b4791f56ad97 SHA512 be1425858d953975464bd1131741b791778d0399249ae2bde4d71ca92db32bab4d188a46fe5ba1fbeac1dd1d9a1351d74a377dd5a19fbbb9cbc108b116181857
 EBUILD hwids-99999999.ebuild 1750 BLAKE2B 37d13e56d50016ec2ec0d02c6c9aa5975036ab904f3e5e8b74cc13d888d73164e92b85b1e68dd82140b1fb662c1c0b5a68429c90cf4a2be2e6b48204772d3a16 SHA512 84fcacd98a96fd5c1f6ef2f13dec9ce46a6e3a0bb942eeb3c041d6bbb8ce0d4c63bf392f747f0e6473fe15420143170aee147b52941fac40b903c375b43bdda8
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20171003.ebuild b/sys-apps/hwids/hwids-20171003.ebuild
index f89b84d28519..df8110104ce3 100644
--- a/sys-apps/hwids/hwids-20171003.ebuild
+++ b/sys-apps/hwids/hwids-20171003.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "99999999" ]]; then
 	EGIT_REPO_URI="${HOMEPAGE}.git"
 else
 	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest
index a7f099b41244..83ff1884f309 100644
--- a/sys-apps/i2c-tools/Manifest
+++ b/sys-apps/i2c-tools/Manifest
@@ -2,5 +2,5 @@ AUX i2c-tools-3.1.1-python-3.patch 3348 BLAKE2B 4fbe75455e4370da6c61c786cd0eaef9
 DIST i2c-tools-3.1.1.tar.bz2 71789 BLAKE2B 0a7a3db6a3b396cfb8d5e58d8c83cae4e52239786502c6552d971350f7fc05a1ce9d7d89e9cdb154a21ac15bdf34aa0dec9501ea45317ec9c5d9fc211780bbf1 SHA512 b91f89b803e5558d49ce63f42f6542438f4f47927e4ce420cd9df989cab14a5c55d971befed73e8f793b0cf4aa41936c0ef519e5a407dceb2c08964461e803c5
 DIST i2c-tools-4.0.tar.xz 79972 BLAKE2B 982e4139ed0e2111f9e082d0690fcc0f86f97a433e292e9464b41991f14a1f90147a3612172bad6880f0df6896612e1dea0ae7bf6f459758b2cff45fb35a5dc7 SHA512 ddf86c357c101388193581bc40285089e6ab5e8d870f8aa5d594acc7ecb8596fbd30501e147b88bdea0200b1be88bc0a374356c188d1bcb067bf8e254e3dc51e
 EBUILD i2c-tools-3.1.1-r1.ebuild 1438 BLAKE2B c9d1e61d5c2f743cca2bdbae3c518998178fbafd09a42538c91d1b637dcc9bd31a1cb746a63fc81e06875c76386a70832305d8cb6f48d3fa282ec598c094b0f2 SHA512 7187a3759ab86014023b45adc9aeea93e7dc1f29f6266b7ef1c514d65e28bb097aa74844d5d279b3961d544f21283ae6076b7c5206c78393866dc4aa41173150
-EBUILD i2c-tools-4.0.ebuild 1391 BLAKE2B 0951d16029bad7c3876c5112c34e492ff0fe3f54b5eb78986ea276252cb7c40e42eb8fafd761597c7078d77d541615d5c60c3e73451e2152dcbe22a7ff313741 SHA512 af1d4c6d94a12a045c4a5bbec615a467a2d1104f54fc1b583cfad4c83dd62c753a06b8c6ae3243c2dd1418c912727028068d92d29c75c598afbf9936f3288e10
+EBUILD i2c-tools-4.0.ebuild 1432 BLAKE2B 70e475892ca52c88701ecae44ef51b9811ac82c37a4870d19437936d0896e6835fc13b6d1e43e825e40aaf901557113b387423d515922cb85925b545b871c181 SHA512 879d1b557ee60bf5619ce77bc9ff1936552e4b4073a0945eff289e905f202d86bef7ccd279284fe240519042ce0584df018c40ee9a40297670ac193d9894a740
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
index 32dffbf1e2ba..3cd2a7f55086 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
@@ -32,9 +32,9 @@ src_configure() {
 }
 
 src_compile() {
-	emake all-lib CC=$(tc-getCC) # parallel make
+	emake all-lib AR=$(tc-getAR) CC=$(tc-getCC) # parallel make
 	emake CC=$(tc-getCC)
-	emake -C eepromer CC=$(tc-getCC)
+	emake -C eepromer CC=$(tc-getCC) CFLAGS="${CFLAGS}"
 	if use python ; then
 		cd py-smbus || die
 		append-cppflags -I../include
@@ -45,7 +45,7 @@ src_compile() {
 src_install() {
 	emake install-lib install libdir="${D}"/usr/$(get_libdir) prefix="${D}"/usr
 	dosbin eepromer/eeprom{,er}
-	rm -rf "${D}"/usr/include # part of linux-headers
+	rm -rf "${D}"/usr/include || die # part of linux-headers
 	dodoc CHANGES README
 	local d
 	for d in eeprom eepromer ; do
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index 844b109f9336..de1186c75fff 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -1,9 +1,9 @@
 AUX ipmiutil-2.9.8-flags.patch 712 BLAKE2B d084480396ee8e546c2027e95ce9c95940d1d844a0aaec7448d6eb4c750d3a4a964fa53118a2cc92897733ab99b9b1064ecf2f05cdd30282b803ea511386f1e8 SHA512 3caf226020e1fffc6c45cb549a066a034a58165415d5e325445f949042c1ac756b61949c78c30d0172983d95264a0ee2c9f829f1f5c8395e8fa1a48025f87dc2
 AUX ipmiutil-2.9.9-lib_symlink.patch 468 BLAKE2B d24e4e0183f46a3a97b9a9db754b4948446eda7504d81b3854cf8ae65eebdc2f279272ecf09736ff2966dfd477219e19a900cce8665f865bc22a8674ea863f2b SHA512 35912b578b3e61e899f97d2fc6cd6352ac04da638c64c252aa71138d9b7fd1b1de474f2702febfb85ab3f5371971be7a1922a1c6bbe5960c04be2b9171f0e75e
 DIST ipmiutil-3.0.6.tar.gz 1692679 BLAKE2B dcc02dbb5467b824005dbc95c8f5231b2e2758e7600231c1c3fc31c1207cff0540400857dd1bfa83fc8b033fe0277ab23c6013f110744bff57fe4bc7b89174f9 SHA512 0c47246b7aa6a060091745d36e33aae07e7907dcad5fefb1759aac62adf48316915ce5818d2f9241e24b73be13e54fbb57046234a69c60ce56f41a933915580f
-DIST ipmiutil-3.0.8.tar.gz 1695826 BLAKE2B 1a20ecdab438c461519db6c9065aab28c07ac26303c3ace0339b1aceb53da73d05e975fa0b73f543a2d1e6ae908ec291d167b545430b85c9744b7a1252d8850a SHA512 9997dac5bc48231ec5333c86cff669bb6b321940497d9e7397763482960956dcf066f27ad2fdf33f4e42033ae2479d8f1ed37fb096b06f9075ad43709b94950d
 DIST ipmiutil-3.0.9.tar.gz 1697688 BLAKE2B 93ed8865cae1cea0ea4f7de4683f4698e3f75e9190cc7e0af1832ca44a08f52aa149393761f1ede3994827db78841061d54058bbe4178b5930accd3a4c225ba7 SHA512 c2c0a516216a46a52621159e665a77d96cf81f385fc9cf19877e72283be3e1a4dad5a4826454727b71576c22cc4de3c73ff428d26f35bf496c7dc1511305cda3
+DIST ipmiutil-3.1.0.tar.gz 1697374 BLAKE2B 42cbe5a252fff7427f9a6eed48f110a16ecccc1e251f033ef8184b9efa7d9d184af4e83483e234fa97c1cfd964bce1c5fae756e34b5713328ed58be4d66e0fef SHA512 2089110e5c829f7bb2d97d634a543a93612503fb918d5696a17e376bf12aff160272634634652085d7f374ea39102c2bc8fc06d61ccbd50c6a76152073ea0a8c
 EBUILD ipmiutil-3.0.6.ebuild 1334 BLAKE2B 01ed4959fbefdc4487df779d5659a4b9d05893b536da58f1a828e435cf34a4938e2d05ae69568a728b0a91ab6380f040d6ad27b506ba8901f0d191f4ab7241c3 SHA512 a565e97bf6a0875a50033736a8172527f3a745e0ad45ff3d44eb985576e0d597585261bfbce779d552a6d0589ceadf6c453abcb9864e0ecac2867b9ceeacc18c
-EBUILD ipmiutil-3.0.8.ebuild 1336 BLAKE2B a64dab4dff49eaa2f5e0bdf22476e88ce7ee3e780b72e5692247e53bf64b83718b3ac1d407fef7d9bfd93f169dcad4f6074bc5ecbf98ab3d128813be920b6e42 SHA512 63e1c498e25e2dd153d840c3a78f7d9b3d74f4a9ccaee1efd728dde314b7c866875133b89d67f39a5589c97c3b7652ab71647a15a30b463dc1f3a4e5fe86d31c
 EBUILD ipmiutil-3.0.9.ebuild 1431 BLAKE2B 80a5a7d78fdc0862346cc3c208110f5e934d2f4361e38fcf5572e90584ed931e24539891994318cd51895aa002e93cb0357cb2b9a9d3c6a661782df87c1be185 SHA512 7a600b99dcc43ea953c5bb37cbb5b313fd13714378a97d4159248f44ed2076e3ba783f6b326309744bbc4c599c09349fadd97a57f406988d0579950cd5265491
+EBUILD ipmiutil-3.1.0.ebuild 1431 BLAKE2B 80a5a7d78fdc0862346cc3c208110f5e934d2f4361e38fcf5572e90584ed931e24539891994318cd51895aa002e93cb0357cb2b9a9d3c6a661782df87c1be185 SHA512 7a600b99dcc43ea953c5bb37cbb5b313fd13714378a97d4159248f44ed2076e3ba783f6b326309744bbc4c599c09349fadd97a57f406988d0579950cd5265491
 MISC metadata.xml 337 BLAKE2B 5f04801092c5d0cf4166c36b508c4cb27e3a08f53f8f86d968d01d1d6911c6dd9cff78d70ec5c9bb60e6f3a028b7e5db1b629a9ba7961b3d729accbc6b62f9c2 SHA512 85f9992b8c7fddbffe99cba761637a897e7ba68f70762f882c039c6492feefefa6bd1ca38fbc73d0a214d04ddb07f5f0ea2106552e4133736d4594e43fae4845
diff --git a/sys-apps/ipmiutil/ipmiutil-3.0.8.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.0.ebuild
index ffa3c3ea3fc2..ac6d2f9004f7 100644
--- a/sys-apps/ipmiutil/ipmiutil-3.0.8.ebuild
+++ b/sys-apps/ipmiutil/ipmiutil-3.1.0.ebuild
@@ -11,6 +11,7 @@ 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}
@@ -52,4 +53,8 @@ src_install() {
 
 	# 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/iucode_tool/Manifest b/sys-apps/iucode_tool/Manifest
index 08736136f087..1ca22111b659 100644
--- a/sys-apps/iucode_tool/Manifest
+++ b/sys-apps/iucode_tool/Manifest
@@ -6,6 +6,6 @@ DIST iucode-tool_2.3.tar.xz 153220 BLAKE2B 4d4fddd1c479172a2bc13c4f45a9be13caf66
 EBUILD iucode_tool-2.1.1.ebuild 428 BLAKE2B 995744378da3c9bba27f340859ad1bd800a40c1dd418091336d49661ca1d03520616466d0f3ad6e058acd2ad9218ed353653891aea0a17bda84beb655deb48a9 SHA512 62d09ae12e31934b7f37181327e3da5bf9d8cf9a0296fdc25ec832fde2555e7d78f7bd409fbcef0fd69da360b4b5f14fd5f221a8a675e66c5e6a294f14bcb0bd
 EBUILD iucode_tool-2.1.2.ebuild 430 BLAKE2B 6cc756dba5a614cd5a89f6f05312730c939e23b39352dead0535213c805fd2c7ed3e12b598ef8f2045fa9527b9db2333fc3a3a0fb7c07fdccc73adc3fdac7a8b SHA512 d4a8b86cd113cce64c4a6b8d11e70aa01e638d1e5f5649c3f92073ccc9252e3abcea36cb8ba3709a92b306e783d8f081483888ae2818baf9ddce67ab488144aa
 EBUILD iucode_tool-2.2.ebuild 430 BLAKE2B 6cc756dba5a614cd5a89f6f05312730c939e23b39352dead0535213c805fd2c7ed3e12b598ef8f2045fa9527b9db2333fc3a3a0fb7c07fdccc73adc3fdac7a8b SHA512 d4a8b86cd113cce64c4a6b8d11e70aa01e638d1e5f5649c3f92073ccc9252e3abcea36cb8ba3709a92b306e783d8f081483888ae2818baf9ddce67ab488144aa
-EBUILD iucode_tool-2.3.1.ebuild 430 BLAKE2B da114bbda28a9a44c2675c43f3a122c575af3ce9c1b3ce6014e345676e5f6b9bb95817426d2eb62e8cd7c56a2ad3b86a4a807ffb4d4ef374b238d84995832c1c SHA512 457f93c88e1a7df27639d808c6c4f0f6756a6196009add95ea2cb514ef21a47f5ce017d9765b8b503ff5c8517495ea4bbad8c22ad54a2cac61313fa9b92e499d
+EBUILD iucode_tool-2.3.1.ebuild 429 BLAKE2B 7b5426f7c75e86b8e787536b9592fc3dfd8c52a2ee4aaea141f9a56e6bf983155198fe395205ad469f03d2f076efa8bad99f2cca0cd043e3a5b6fd717a516e24 SHA512 0a396fc4e6934a633e188f53b02402988df8d1d3ae941c97349a3684d68b200cac5530572ff240ecf95b6be0c767d5c18184a1598d0b01e31ddccd1449e2fe1c
 EBUILD iucode_tool-2.3.ebuild 430 BLAKE2B da114bbda28a9a44c2675c43f3a122c575af3ce9c1b3ce6014e345676e5f6b9bb95817426d2eb62e8cd7c56a2ad3b86a4a807ffb4d4ef374b238d84995832c1c SHA512 457f93c88e1a7df27639d808c6c4f0f6756a6196009add95ea2cb514ef21a47f5ce017d9765b8b503ff5c8517495ea4bbad8c22ad54a2cac61313fa9b92e499d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/iucode_tool/iucode_tool-2.3.1.ebuild b/sys-apps/iucode_tool/iucode_tool-2.3.1.ebuild
index c7682ec00783..c8f2ea39a57b 100644
--- a/sys-apps/iucode_tool/iucode_tool-2.3.1.ebuild
+++ b/sys-apps/iucode_tool/iucode_tool-2.3.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://gitlab.com/iucode-tool/releases/raw/master/${PN/_/-}_${PV}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE=""
 
 S="${WORKDIR}/${PN/_/-}-${PV}"
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 880b17b5eb5b..f35339c4434e 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,7 +1,4 @@
-AUX kbd-2.0.0-tests.patch 841 BLAKE2B 8162bc2521c6b6c470868ccabca87d9b5e2fa9417f8c4682bf9ff1cb67a0f4fefd403a1a9da99685403c8a280f9d0ed39c06768cd8cb436a88c42ec9ee813953 SHA512 b189b02c509f851bb871d75903dcbbef0177b39db923cf7b3bff4b3058868074975dd7c32bdafb54d50d3e4798ae8648a5b4e461078c86d025257e0502405f58
-DIST kbd-2.0.3.tar.xz 1037036 BLAKE2B bbdc0ecd21e74c2d1074339f6d0e4caa69e0d3ee10a211c4ccd187906d7f513032df495c18e1c2667d1f2960a68db3d5aa995bdaafd3719fc35da5b769af7c11 SHA512 522718859c2a95abee06a50dd0a7cfe7bb9c8f4b3959d54fd9e56cef23acc85b9af85405aa4953f20cd029397412051d72c8b1b0d639ba3a26b4952f89ef6a3f
 DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f
-EBUILD kbd-2.0.3.ebuild 1362 BLAKE2B 2467e0d4c9d52258b9568b96df23f612bfc894b1861c16fff67d129b0d0345b2b7e6c3c0b9562678905cee44128758d8d6ca007b0f64cf64ce651aa918abeb01 SHA512 1d75087eaf1125646cd7650be96b45b9267751e0f4a278c635f760f30fd7c755f39ec49b7abb2c7fb5821a0357cbdd2ebf830042223f3e2d3da90e9a6fe7da65
 EBUILD kbd-2.0.4.ebuild 1342 BLAKE2B c003f42111f3ee52aff6589e00ebbaef2f4bc165a0b835fe327e442411e38d9cd977ce9f346b5be51c494b547834433f6f17367f6bbe29f9b53907bcc4ebfa54 SHA512 2e9a027bb6a35be73b81e8000f632496356e7045794ab730a3daa0a77113d5e494a5c25621c79b650e74b24f5e67cd8984d8371990c09310642e519073dde658
 EBUILD kbd-9999.ebuild 1414 BLAKE2B 3b9e77383bdc18b4801eef6a7758f9eae122b3811dc924c06edad6c3826bf1d2ac68bc8231e7c159565a7fb00e64a026f6479502d9f1c7a791964eb144ecd0f0 SHA512 dbd5f7b4cedc8192b400aeca9f63dbed8d6f65cf075067dfe580ea8b77232e77ba0916e7b08d2cf71a12a78c9a52b697b55de485b1f7c8c8390d067da1a4585e
 MISC metadata.xml 321 BLAKE2B 608f4a02a31f6c1590d7c237516a00cefa06f641febb7b479b7b0a276e9b59c0b7a88bbc6f4bdaca942ae83b85ebad6c6e84097916315eb985ebc2d98a70b171 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641
diff --git a/sys-apps/kbd/files/kbd-2.0.0-tests.patch b/sys-apps/kbd/files/kbd-2.0.0-tests.patch
deleted file mode 100644
index 6a1c7ea851e3..000000000000
--- a/sys-apps/kbd/files/kbd-2.0.0-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://bugs.gentoo.org/485116
-http://lists.altlinux.org/pipermail/kbd/2015-July/000558.html
-
---- configure.ac
-+++ configure.ac
-@@ -11,7 +11,13 @@
- AC_CONFIG_SRCDIR([src/loadkeys.c])
- AC_CONFIG_HEADERS(config.h)
- 
--PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
-+AC_ARG_ENABLE(tests,
-+	AS_HELP_STRING(--enable-tests, [build tests]),
-+	[BUILD_TESTS=$enableval],[BUILD_TESTS=no])
-+AM_CONDITIONAL(BUILD_TESTS, test "$BUILD_TESTS" = "yes")
-+if test "$BUILD_TESTS" = "yes"; then
-+	PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
-+fi
- 
- m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
- AM_SILENT_RULES([yes])
---- Makefile.am
-+++ Makefile.am
-@@ -8,7 +8,10 @@
- 	CREDITS \
- 	contrib docs rc
- 
--SUBDIRS = src data po tests docs
-+SUBDIRS = src data po docs
-+if BUILD_TESTS
-+SUBDIRS += tests
-+endif
- 
- kbd-$(VERSION).tar.xz:
- 	make distcheck
diff --git a/sys-apps/kbd/kbd-2.0.3.ebuild b/sys-apps/kbd/kbd-2.0.3.ebuild
deleted file mode 100644
index 3d02370de950..000000000000
--- a/sys-apps/kbd/kbd-2.0.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-SCM=""
-if [[ ${PV} == "9999" ]] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://git.kernel.org/cgit/linux/kernel/git/legion/${PN}.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-fi
-
-inherit autotools eutils ${SCM}
-
-DESCRIPTION="Keyboard and console utilities"
-HOMEPAGE="http://kbd-project.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls pam test"
-
-RDEPEND="pam? ( virtual/pam )
-	app-arch/gzip"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-
-	# Rename conflicting keymaps to have unique names, bug #293228
-	cd "${S}"/data/keymaps/i386 || die
-	mv dvorak/no.map dvorak/no-dvorak.map || die
-	mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die
-	mv olpc/es.map olpc/es-olpc.map || die
-	mv olpc/pt.map olpc/pt-olpc.map || die
-	mv qwerty/cz.map qwerty/cz-qwerty.map || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.0-tests.patch #485116
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable pam vlock) \
-		$(use_enable test tests)
-}
-
-src_install() {
-	default
-	dohtml docs/doc/*.html
-}
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index a00991f6ad23..f9632086088a 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -8,6 +8,6 @@ AUX keyutils-1.5.9-header-extern-c.patch 1154 BLAKE2B df4ecd72145c8634b2ea043e45
 DIST keyutils-1.5.10.tar.bz2 74190 BLAKE2B 8eeab02ef363b785152ac4576f1ce9792711f482e27c3ba71d906624ecc88ef4ce2ee909d7bc3a35b42b50e971c0bd0600cfdefa9a3db35b25553bfcbe7d2d13 SHA512 7f6f956c7e76cdc2aeb52e74fe670b20a5f9a5d9b543fd2ce971d80c48745f37d05235a42f0a8f152b1128a109c7d8bf07e751282a20d2d3f433a99a5308ae8d
 DIST keyutils-1.5.9.tar.bz2 74683 BLAKE2B 8d5133dcc4c1f40e634fcd6584f3e2e56a0fd4ff25ded41c5f94ef3193ef7240ff4a24ef1c5beba6ba835195605a77126bf77aace35a1b4acf025160a2082dcb SHA512 d4ee1dabb87844e18bfd8d094a5bc9ce792c96720b71e77961b6c36bb1addb9acea2a7004ddfba1d09b167af908368162312e5c3656b22a6266955bb57b887e2
 EBUILD keyutils-1.5.10.ebuild 2840 BLAKE2B a2c5e97bf4a87b1e8d5a4b7546004dc32c172c5bd0771721a5469aab7f2f198c3dec04eb9d48ae32d5f941a96881c9753ab374b278838afbef7b751934b36e55 SHA512 e3bb4180cbf4b6331c0f48ca2a9c3f636d1a4d28f731678a8db8eb92c7f0b377dec220894135bd8fa90f4a641ee99f80f4f09e4bc39220e39972aa1e8c09f078
-EBUILD keyutils-1.5.9-r1.ebuild 2293 BLAKE2B 6839a041eaafe1ea4cfd4706970694883ae01e1c8a39bd031a4368378ded11fce323e7c56e23025e1e523a81ee382bfdfa9ee3f5deddc156440c29d95d30d6d4 SHA512 fbcf7923a757dd2247cb0d1c644e865f03c31f09fa3c880264d1e0b5631e7b8f4611c6206286d8fbba616bba9c0f553d9c1c714744d94e454f309f64ed37980e
+EBUILD keyutils-1.5.9-r1.ebuild 2163 BLAKE2B d425809fc5197a5c160e500f12fbb729410db5d6ea2f5703e7a76260e2735a158a0bbb95aaf6fde4fa37ac151314d3c3611744a805d5a593384f5917a25941ef SHA512 ad3387908cf7590c54f43ae6d7d25f408d338818df786bdc3911475cce93680aa4d1c27b2b078529b7362dc4503e145f2010cc03a6f84f970739c59e14efda2d
 EBUILD keyutils-1.5.9-r4.ebuild 2984 BLAKE2B f93ee7c4a4fc0cd4f623d13f2007355294e0a9dc6b6f86ee8afce908569db146e166a2e90565891ed396137d5f8dcff762287674e3f36167b7d377177f36d591 SHA512 0175ceb620c7ffe593145ac41303a200584bb8212fb1df3767ed23a1a99c6027afe457da33a1fbb4f18b6bd19dd0f22808fe39cadd921a687a7464602a55019d
 MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
diff --git a/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
index c68b8acb2668..5dd6f75e4ce1 100644
--- a/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
@@ -14,11 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="test"
 
-RDEPEND="
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+RDEPEND=""
 DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
 
 pkg_setup() {
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 372df0d533e0..44d8d20a7fbe 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,7 +1,7 @@
 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
 DIST kmod-24.tar.xz 536864 BLAKE2B 2d61a4a5e598c864cc1bae4f3d2dc5e434e1df8685ceb2462315c0e5dc955b58f02ffd0504a77859b7030c3619f1b5f6a7fa3fb25ec99d90ac67f0167b1eb889 SHA512 58c8da100418b6325de1595bceee4115cbdd7151d03a028c0b1f6d5d3e6611c667e27f3a0245d29781125581849fd1e854fa8d87b63c4b8fa3f196d0a97e1779
 DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252
-EBUILD kmod-24.ebuild 4909 BLAKE2B 345dc8d612ed9ec4c33e564f393f0cc9f8788ee4c087330271309f8d6c6dd7edc039e2c85a345e89a611c23b7fd0d567b5191c59a041e4f3e9ad256197e1eb0b SHA512 d8ba00ffb265f3d3c54c4676cc5790c738d2ab18c8784b90450ea5fb6678ee3443923fbde1b2dbb0a0759c675da49d86f4d3d04582d49194d660b0fac26a14fd
+EBUILD kmod-24.ebuild 4906 BLAKE2B c5a2fdec4cbbb9f793ef48892159a8735465758093e3a4bb4b4f6d73c10f70a6e5fb485650e8f0281f06910c56905925172da515230e718a0f2ec2c928fa895b SHA512 6f39d39f8d0035850e826e1009b28bfd67b326e1a1c8062716988a9351adc0c62cadb70a0ac3491eb874e2305a38473efd7ad4cc1aa58422c922faa957bf4318
 EBUILD kmod-25.ebuild 4931 BLAKE2B 99cf8a56f86668414041e08c2d07664d55696d70bdf7c6230a9e5fa0dcf0080aac13308c13c201ba4687fd66cff78f130192ce07cf6f8fa5a2033d57c5199027 SHA512 27aa9d2c5e85af98778df261cda4e5aae65a6490f2f28b72dd9475e22eb0b75a5ad1bd4207462b21c60a04265cab91027d628a0dee12d8444fa450318514e6d6
 EBUILD kmod-9999.ebuild 4931 BLAKE2B 99cf8a56f86668414041e08c2d07664d55696d70bdf7c6230a9e5fa0dcf0080aac13308c13c201ba4687fd66cff78f130192ce07cf6f8fa5a2033d57c5199027 SHA512 27aa9d2c5e85af98778df261cda4e5aae65a6490f2f28b72dd9475e22eb0b75a5ad1bd4207462b21c60a04265cab91027d628a0dee12d8444fa450318514e6d6
 MISC metadata.xml 540 BLAKE2B ec5ee262fe76215688d99e32778848e71de5825f488eea2219e076290e020aa86de6138ab8366d5e077d44797789a27c22fea1c64f9c6e2713cf315b4b891455 SHA512 c4f47a77dfa7bc4cbaa61744fc46c5547763b51b48521cd229ac89680325ecbf415bd9e1ce9c71982ea721d0d5c4cf3677a0f70e8dad65235f523840cd14de94
diff --git a/sys-apps/kmod/kmod-24.ebuild b/sys-apps/kmod/kmod-24.ebuild
index 1cbe82a97cbd..90a239400cdf 100644
--- a/sys-apps/kmod/kmod-24.ebuild
+++ b/sys-apps/kmod/kmod-24.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-2
 else
 	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 	inherit libtool
 fi
 
diff --git a/sys-apps/memtest86/Manifest b/sys-apps/memtest86/Manifest
index f3332335259c..787a3fb9bc5e 100644
--- a/sys-apps/memtest86/Manifest
+++ b/sys-apps/memtest86/Manifest
@@ -5,6 +5,6 @@ AUX memtest86-4.3.7-io-extern-inline.patch 1128 BLAKE2B 9ee86f121772490fa1859568
 AUX memtest86-4.3.7-no-clean.patch 636 BLAKE2B a7488c0f556929607a7d1a94de1f727cc00ac6c673b2b03fbbb5ea45a64accf5028df89ca56f49e9d9e97228a5129b8ed4673b287bff05c59249a5eea48d4ed3 SHA512 7bac031e907a10bf66d260d29ef209362395bce3c1a735abf77bebd9a8662f0ecfc3bd2ed33abbfaeebae77da4868b5c53f0814e82a0ac930b4a01fd25a6e8b1
 AUX memtest86-4.3.7-reboot-def.patch 253 BLAKE2B 8213b6deb590a23316fe560493ebb96b53944f368b5f7040d6988296d3bba432b4f070a44e034cf4b9e03dc502cfd9ae8129a4452c70e3f6a06874e6f09665a6 SHA512 0587d2b4de397813f5a2a95859c7a656b0c760653dd711ffe8bd0d0602a64c4ed340c494fbfe2de6825f89aa21021df6a92c4a9e030b72aedf70f83b483a1160
 DIST memtest86-4.3.7-src.tar.gz 125583 BLAKE2B ef74b599f5a0b3a550854c7aba12afcddd9e8115418d60e50aee2b1d83b5a838a7d747039cbdd542e1cc136dd5426e8e803f305147121d38edac1a3de814918f SHA512 f1cee9085e157b399869222310c65e8094c028565d2b21fe40fd485505b988d20cff49b2c56559181ac114c39089b60c6eacb9aa5d7652df78b3f8e7530cb644
-EBUILD memtest86-4.3.7-r1.ebuild 1880 BLAKE2B 5365bdfa98d5f1e758c73f492018fe96606602769a4cbd343d1ef31ff892155fae143283dc27911c990e7218eb9aee9244a7f65ba50d6d4156b9d5f2662991ff SHA512 8ed4be4d2b0b40e91e9c29e3a4dbe349f9d5acef96a87f64ee4883edeca3f46a3548e8a79107a749483b1f3c96e673e36e0068d8897cc96f27932ba67a1d07d3
-EBUILD memtest86-4.3.7.ebuild 1718 BLAKE2B 5d8f88444acc7b6738d6943928927152565ff2040bca04f32876d6bd18735ceb2ec501cfc1e8431ba824d14afd1fe1aae5bfedce7bcc46111fa5a5c540388964 SHA512 4c88c1c46ae296b5138fa0f93c5e04cf3048662371db093a11d86c549fb799faa93398839fcb3ec5e1a904e928453f558d226138953eb884853d8b749770e894
+EBUILD memtest86-4.3.7-r1.ebuild 1882 BLAKE2B 2925acd74ab48cdd715407493f32202c0d53de3982b652bae03f2b4762e172e785cac15419e836faa2266ed90da4a92ae721fbf0b929ec9c66ec76e95e08d57a SHA512 924a1b5739d4c805277e962ea81aa2c3ea3a25dee55fad283df5858def098ab60e8e0f1de8d07d5dbf89fb8bb1724d4957d5d4e951626e66149678437c983cad
+EBUILD memtest86-4.3.7.ebuild 1720 BLAKE2B edc6bef2450f491abea4fb5e1a125df95d9458350ee21221621afb0ecc51897a91a67e9d14d2235a612bb05bbc78572ce063fb111e667b6bb20ca919a641a2d9 SHA512 20ee22412ec27ed6c4104bde2365fa2cd62d0c9f4bf0286c771f19022c54a5c59aad4bc1d898b78a366f2bb6c3d2e8f31089a2ec665aa75778a25f0a47e7ac4c
 MISC metadata.xml 330 BLAKE2B 6f4b07ab61c2988a16203242719afc8653fa5bc4dbe7a0a0e83c1c8ed51eb743228fcc03213cca774d30a746b3947c88c10e141229b6cfb01b63d4f280f37498 SHA512 09543a0051e47f888e650455b2774012b9b4284a0ae01a4605f673b4548bc3f8bd1af0309c7de5887c5a2bafc6dde828d580c2a8e7c1ac74b93d70c6b6180d6b
diff --git a/sys-apps/memtest86/memtest86-4.3.7-r1.ebuild b/sys-apps/memtest86/memtest86-4.3.7-r1.ebuild
index 73cf407c5484..b9b031c7b5f0 100644
--- a/sys-apps/memtest86/memtest86-4.3.7-r1.ebuild
+++ b/sys-apps/memtest86/memtest86-4.3.7-r1.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="5"
@@ -6,8 +6,8 @@ EAPI="5"
 inherit mount-boot eutils toolchain-funcs
 
 DESCRIPTION="A stand alone memory test for x86 computers"
-HOMEPAGE="http://www.memtest86.com/"
-SRC_URI="http://www.memtest86.com/downloads/${P}-src.tar.gz"
+HOMEPAGE="https://www.memtest86.com/"
+SRC_URI="https://www.memtest86.com/downloads/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/memtest86/memtest86-4.3.7.ebuild b/sys-apps/memtest86/memtest86-4.3.7.ebuild
index 0999afaccb77..bd402545b0c8 100644
--- a/sys-apps/memtest86/memtest86-4.3.7.ebuild
+++ b/sys-apps/memtest86/memtest86-4.3.7.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=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit mount-boot eutils toolchain-funcs
 
 DESCRIPTION="A stand alone memory test for x86 computers"
-HOMEPAGE="http://www.memtest86.com/"
-SRC_URI="http://www.memtest86.com/downloads/${P}-src.tar.gz"
+HOMEPAGE="https://www.memtest86.com/"
+SRC_URI="https://www.memtest86.com/downloads/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 849b869179e9..c787936c5dcf 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -6,8 +6,10 @@ AUX nix-2.0-user-path.patch 390 BLAKE2B 08118fb6664ffe96bccd68596e7aa26fe895a928
 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.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
 EBUILD nix-2.0.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48
 MISC metadata.xml 566 BLAKE2B 3891567411993e2864f7e0d6fd158937c0c7075ca92aef2413d28e0aa18e6d51982383d3ee71ab6b926ba6a397c59c3ef84f4a4b7cdd4f103f4256f4693f0cf0 SHA512 93d33392316264e30403abbf79a0bf836ed35f2eaf802f930743cb9f31955f939ac263946b93ee32bba34d2534329d95476e96816d1893747b077b0d9690281c
diff --git a/sys-apps/nix/nix-2.0.1.ebuild b/sys-apps/nix/nix-2.0.1.ebuild
new file mode 100644
index 000000000000..bea6bd1a4240
--- /dev/null
+++ b/sys-apps/nix/nix-2.0.1.ebuild
@@ -0,0 +1,133 @@
+# 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/pciutils/Manifest b/sys-apps/pciutils/Manifest
index b6411be1521c..e005a87628e4 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -4,7 +4,7 @@ AUX pciutils-3.1.9-static-pc.patch 373 BLAKE2B 39e44412bdde832e9812cd719155f7638
 DIST pciutils-3.4.1.tar.gz 404166 BLAKE2B 75c50e7b4469fe4fc3719ee3b58f94be98f113ce4cb36be3d3fb8e57aaefef039866d31a6acc90e6136b21883239c1c7db2b497776e0db8ce05f19c6336b55e1 SHA512 1394647d5e9d324d68bd8bdf4709a438ae06e6a83ded40b9e0026968c032f214073bc764fbf59e15da90b2e424d90dc430db5810d7ff5fbeab0f3e5c6250ee49
 DIST pciutils-3.5.5.tar.gz 437331 BLAKE2B 695aecfe58c2e8cde4da1aa0a1869ad8d62c6a7244e2b8d54f24e8ca59bd6de578770ff3d1ddf73a266653eb3640ffe70ee87adeb1dbabfc870c9a15e9286a51 SHA512 b2c89e1d742c5a23cad662ed6bb1d47d7587b0d823fcbf3abc6d613735961473f7d29c83a4ccb49b64ec4f674026f17e88693eb34b42cb6c128abd1407c778ba
 DIST pciutils-3.5.6.tar.gz 442190 BLAKE2B 9f1237828436f0566caa13e49a154b40fcc41ddd165268011012e55a33ea401e3b78ddffecc6f0ec36efb24b6d9338a691167ac094d0d26f855e42cd055701bb SHA512 dcdca7e0bce69d1bee1fa5ea480a9f38534d66da576fdc710aefd8eeb0c18bf6ec5b39e63019d29d6bae0ec2d3881f5d07a4a105ca04c320d84c17821f7297e4
-EBUILD pciutils-3.4.1.ebuild 2985 BLAKE2B f623d9f76fc9ff79bbb62c94c3c1e4cf1e12b93b222d7de1833930d3098274f231660fd22086f2aa4a0f0d8813f21fa46dea5910dde10596aac038c0c082ef25 SHA512 55a6c8d02aac32c5115dd563ff1962dfc79fc09681cb062872cbd9c0dab0873eb3183efd51ed8bbd075a21815f9fa779fdbd5ec8c6556acbbf1dff44bf26af48
+EBUILD pciutils-3.4.1.ebuild 2854 BLAKE2B bfc624cfc8a303673e2c480ffd77d888243bf0df8c84733ba37bf9dd7c13063df458160f9649c3c8c67d3320418595406cafd9596814f399d24646161ff8d9b0 SHA512 cd86bd701d2225009923bbdc4bbc75b32b1992fb0f2b212fc7b0288c1e607f7ac64a3503c85dfdfc1a448f75cac9f904e4b2767d01abc7d5f5f8b048d826896c
 EBUILD pciutils-3.5.5.ebuild 2922 BLAKE2B e89cb60e40b4fd1b1ff51f1dda3825cc43ee25f7016d8bb1044b6a81e25e7c814e61c4df9d7d059eeac3a1b7fa3dc20d89445475caaa0cc09caf5ec25228f23c SHA512 7421156ce321c3cd979712debccf4908ace3dbdd70d0b033c15fecba3f010122b4675d567a302fb4ec594edf2e46535691c24abd23e37bf296fdddc0c9c41d9b
 EBUILD pciutils-3.5.6.ebuild 2900 BLAKE2B ce68aba5b8564d1b3d043a1e71398fbbb5608e48401013a600186d6f1fb76a700b0f91ec6d1e50f28ab1388064203504e8948bbcb93f4163b526f4a7e706b8b4 SHA512 b4e20c6644a5767c960dfa2e232f0e3e148a15f3476825507fd7d4895e883b96de2e346f2d0e474259ac2e8321f8ec6b02e4796e6d7e250ac7e5c05088073065
 MISC metadata.xml 524 BLAKE2B c000b3995b57cf87ea92270e4e2d9b8463e5db65dea3a3aeef50a72a153ff3320a1ab1825cf0a2dcac3569d32f6d17015debb79d567c22d7c6891ce48211d661 SHA512 881e7cb9a71e1ccbf84be8cbaab54cfd0258a782aa1e4def6f3398444f4c28790a23eb194c3facc6e7c77437c06e4c17db01e0360debb1f01349cbca69dd8020
diff --git a/sys-apps/pciutils/pciutils-3.4.1.ebuild b/sys-apps/pciutils/pciutils-3.4.1.ebuild
index 5688ca238f9c..6769a5b8e41a 100644
--- a/sys-apps/pciutils/pciutils-3.4.1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.4.1.ebuild
@@ -22,11 +22,7 @@ DEPEND="kmod? ( sys-apps/kmod )
 	!static-libs? ( ${LIB_DEPEND//static-libs(+),} )
 	udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}
-	sys-apps/hwids
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r14
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	sys-apps/hwids"
 DEPEND="${DEPEND}
 	kmod? ( virtual/pkgconfig )"
 
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 64bd9a9200b5..e4f44574d294 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -2,5 +2,7 @@ AUX 99-pcscd-hotplug.rules 358 BLAKE2B 6ff034ffd1a1942d5d0429f9ed35428853ff8daa0
 AUX pcsc-lite-1.8.11-polkit-pcscd.patch 744 BLAKE2B b9a846a989d1708a30bb62e93ab19fbf5cfe4c2c601d435b53a8933117d919a4fbac8835e68b895507840a25a9aab85e35f6b4c2e7461ec3c7893d483e12f759 SHA512 4f8b774ec888d51c0ad82431cb9d041be6b69af0bfa2a535c6b7e47afb0056147c08ab9265d7da2259a74347ceba9dba320ad0892d3a25797efc64b79113f4a5
 AUX pcscd-init.7 408 BLAKE2B 15ba28f80cc0f44598a553bced62bf8972b698bf8c02a715531ffbb0724915004e47e2779fefa6349adccfdc7d32e8880f8d6d82ea98178e8556b9453c31019d SHA512 e4dac959dbea3d418a3e4012788a3cc7b8aeea295f56f1c3e2f0a599cf469d302f3eaadf05cd0b3c7929a583f8d0b6756177ebe2c497c404b70e9aed7fb7d003
 DIST pcsc-lite-1.8.22.tar.bz2 751724 BLAKE2B d11ca9588449ea8508550b60aad2d2bb6a140c02a86287f6d972ced97fdc8a5db80d542624cbaebdda564192217186c79c30b046cb7d6f6c7a450d91c0f1c9fb SHA512 762eccf6a25040653f563b93bf11262ddc015323d06d759a3472ba80af0489804410ba17c7e5330ccd4b5accc8b7314c80b5e99da278561d3818d8c381e6a025
-EBUILD pcsc-lite-1.8.22.ebuild 3217 BLAKE2B 72cc7aa8bccaaecfc09b19cd79a623a56d7c4352d827e0405a07978df48eb8a1f28e9792db66fe312701f613520bc3ae414b9ffe520ac208342b6822d2a70035 SHA512 0b7ab64205791b089d2bf0cca6671fbcfd6743fcf7f2276170712692ce9c21eeb5c11d51044c15ae2b21a17909542ca8a0f6e2d9bbca887965399ffab61cde06
+DIST pcsc-lite-1.8.23.tar.bz2 749922 BLAKE2B 62c7fb931735bf5fba55e75141a3e4216a126c56ae47833168b154abacd3294dba4afc47b74814a474ca9e52c7ca62a532a0e6ae9fb88b635592e8c545f68e76 SHA512 fef9f40376660bc9de938608cfdbf12ca764be1ebb59c7a1065cb74a21ecc7333f86add25028bd47ec55b2227a9e2d15e1afcb6d0aeb510636d2aadef254bec4
+EBUILD pcsc-lite-1.8.22.ebuild 3113 BLAKE2B f99ef19bef77a212ad46e425088864391764a7ba9203353a4db1547fa67c1dd08784de841f62ea3da7b902b3f3a344996656caf182bcadc0bb2b699fd14c8af0 SHA512 1901510e684d820c94c685306921d82c5e8c7c69c87ee7626e89aefbcdf15057cb26ad28ca218a1dbb9bded85cdb9aed12662ad95042fa37ab0ee71150027439
+EBUILD pcsc-lite-1.8.23.ebuild 3183 BLAKE2B 24e0c7ed8e3c16a54b4e31d63c8a1c4484a63dd98dc946491e50f6d3a99a750197e3e501407dec5e3e36392ce6c53b834ae0b5f3bc2f3ad26b5a09b9a3a70f6e SHA512 786f364687a8968f72f4e24c138e8431fef52b5519ab1b633a9d0e7319590c3f176338eeddabb4feb49e0bdcdd574ee750be3469fc9730720e038c1d07d140c2
 MISC metadata.xml 1077 BLAKE2B d13414e4b691e3df98ce7fefb9939a2cfd224d7ce76b78a72c0585c22acf18939ccee85a5f19791ccdbb8e31e8ba93cb0c537dc86a8a8820435efbef07c7d941 SHA512 4abc19855a868236dfdcfa6d42fcb901fdf52796e08b589a1413c78b931aee74fd482121ff67da632c2cf2e1ba018ff02f1122f1dac5c2185046f98952efd838
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild
index 14f6de001e56..e2d647e8c507 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.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"
@@ -7,12 +7,9 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit python-single-r1 systemd udev user multilib-minimal
 
 DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.alioth.debian.org/"
+HOMEPAGE="https://pcsclite.apdu.fr/"
 
-STUPID_NUM="4225"
-MY_P="${PN}-${PV/_/-}"
-SRC_URI="https://alioth.debian.org/download.php/file/${STUPID_NUM}/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
+SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
 
 # GPL-2 is there for the init script; everything else comes from
 # upstream.
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.23.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.23.ebuild
new file mode 100644
index 000000000000..2b6ecf20768a
--- /dev/null
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.23.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit python-single-r1 systemd udev user multilib-minimal
+
+DESCRIPTION="PC/SC Architecture smartcard middleware library"
+HOMEPAGE="https://pcsclite.apdu.fr/"
+
+SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
+
+# GPL-2 is there for the init script; everything else comes from
+# upstream.
+LICENSE="BSD ISC MIT GPL-3+ GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# This is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="python libusb policykit selinux systemd +udev"
+
+REQUIRED_USE="^^ ( udev libusb ) \
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# No dependencies need the MULTILIB_DEPS because the libraries are actually
+# standalone, the deps are only needed for the daemon itself.
+CDEPEND="libusb? ( virtual/libusb:1 )
+	udev? ( virtual/udev )
+	policykit? ( >=sys-auth/polkit-0.111 )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	!<app-crypt/ccid-1.4.1-r1
+	!<sys-apps/baselayout-2
+	!<sys-apps/openrc-0.11.8
+	selinux? ( sec-policy/selinux-pcscd )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
+)
+
+DOCS=( AUTHORS DRIVERS HELP README SECURITY ChangeLog )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	enewgroup openct # make sure it exists
+	enewgroup pcscd
+	enewuser pcscd -1 -1 /run/pcscd pcscd,openct
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-maintainer-mode \
+		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
+		--enable-ipcdir=/run/pcscd \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$(multilib_native_use_enable systemd  libsystemd) \
+		$(multilib_native_use_enable udev libudev) \
+		$(multilib_native_use_enable libusb) \
+		$(multilib_native_use_enable policykit polkit)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	newinitd "${FILESDIR}"/pcscd-init.7 pcscd
+
+	if use udev; then
+		insinto "$(get_udevdir)"/rules.d
+		doins "${FILESDIR}"/99-pcscd-hotplug.rules
+	fi
+
+	for f in "${ED}/usr/bin/pcsc-spy"; do
+		if use python; then
+			python_fix_shebang "${f}"
+		else
+			rm "${f}"
+		fi
+	done
+}
+
+pkg_postinst() {
+	elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
+	elog "the pcscd group, to avoid running as root."
+	elog ""
+	elog "This also means you need the newest drivers available so that the"
+	elog "devices get the proper owner."
+	elog ""
+	elog "Furthermore, a conf.d file is no longer installed by default, as"
+	elog "the default configuration does not require one. If you need to"
+	elog "pass further options to pcscd, create a file and set the"
+	elog "EXTRA_OPTS variable."
+	elog ""
+	if use udev; then
+		elog "Hotplug support is provided by udev rules; you only need to tell"
+		elog "the init system to hotplug it, by setting this variable in"
+		elog "/etc/rc.conf:"
+		elog ""
+		elog "    rc_hotplug=\"pcscd\""
+	fi
+}
diff --git a/sys-apps/portage-mgorny/Manifest b/sys-apps/portage-mgorny/Manifest
index 88a81290e3a3..614089df3413 100644
--- a/sys-apps/portage-mgorny/Manifest
+++ b/sys-apps/portage-mgorny/Manifest
@@ -1,4 +1,6 @@
 DIST portage-mgorny-2.3.26.1.tar.gz 1237698 BLAKE2B 73dcce2f57930bd074f6de5103a31ba3730537196438302ea7b25b21ee32d6ab8b3292b42825eac2e912639be1dd0a1b15c049c5cb22f54525c476b96f4817f4 SHA512 38c5ca6a1fee7125942fca10921f3c2ae201c6c06b4f69ee7b0b90b44486aca7b8e4f5817efad99c1ef5ad3f558cd9da144d2c3c26242a1a05bca9e17921b173
+DIST portage-mgorny-2.3.31.1.tar.gz 1245744 BLAKE2B f9085fd7b66c2e018736cd1b5740d03cd61ab50d18113d651289521c3cb7786bd7963b24fe9a8d55e9dd107a01bc77c5ca2e8f343e4728a844fc17fd608a3680 SHA512 d2f6188f78c94341c97ca71915bd1428b49d26ea2d22f34b71029128dbd9ec0c9673b2835af730f17d81aba96927bcf05e46ef82ba1e94c3ae7249b6ac8ee235
 EBUILD portage-mgorny-2.3.26.1.ebuild 7148 BLAKE2B 6560b50e0e55106e2415c3ebe7ace10d0b62ab4f8183d90566bf172b9d819ec2e816e6bfc241e7208bd4a24444a6e8b337f9b7a328ec6d05a246e6168af2f789 SHA512 9745458840e04187caa20076f939d83a325e0bdbb58e36eda4572b1ec1d989fa343389a8dda730f90c12ca3e308a0a5bacb1d3d5d443625293abe48eaea5cb8b
+EBUILD portage-mgorny-2.3.31.1.ebuild 7148 BLAKE2B 6560b50e0e55106e2415c3ebe7ace10d0b62ab4f8183d90566bf172b9d819ec2e816e6bfc241e7208bd4a24444a6e8b337f9b7a328ec6d05a246e6168af2f789 SHA512 9745458840e04187caa20076f939d83a325e0bdbb58e36eda4572b1ec1d989fa343389a8dda730f90c12ca3e308a0a5bacb1d3d5d443625293abe48eaea5cb8b
 EBUILD portage-mgorny-9999.ebuild 7060 BLAKE2B 283fe989708567de926d6a7d227193a6f8761caec6a485cd80d95c60f2efb018b9b6df48362cdfebeefbaaedddcd9df9066bc3a42d4c913a4b2f5c4f505b9382 SHA512 a2a77e0a75ea9169e28f7c886a41b11368196e6f27980c33406804b40deea275ce58d1564de4c6dcd3c5e44caabd640d3c576fb415ac12bcc2fb34ec2f934e76
 MISC metadata.xml 817 BLAKE2B 8792bea6f73e3d72c747a11a0946c119abd9a24e3a1f40c457563536a9a1ce304c8c2ff0682fad3f94913d171806a262cf73de7437b5f250215810d8ffb32447 SHA512 e3498363b89e349d37b13dd40c7b3225f8c445b1ea2db9f70f2a1d718b7576103296d52581aa5ae0edc4ddd3fa8123161425c2732753f88e997b1cca818572b2
diff --git a/sys-apps/portage-mgorny/portage-mgorny-2.3.31.1.ebuild b/sys-apps/portage-mgorny/portage-mgorny-2.3.31.1.ebuild
new file mode 100644
index 000000000000..d6c166badf4d
--- /dev/null
+++ b/sys-apps/portage-mgorny/portage-mgorny-2.3.31.1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1
+
+DESCRIPTION="Fork of Portage focused on cleaning up and useful features"
+HOMEPAGE="https://github.com/mgorny/portage-mgorny"
+SRC_URI="https://github.com/mgorny/portage-mgorny/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="build +ipc +native-extensions selinux xattr kernel_linux"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	>=sys-apps/sed-4.0.5
+	sys-devel/patch"
+RDEPEND="
+	>=app-arch/tar-1.27
+	!build? (
+		>=app-admin/eselect-1.2
+		app-crypt/openpgp-keys-gentoo-release
+		>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		>=app-portage/gemato-10
+		app-shells/bash:0[readline]
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_4,3_5} pypy)
+		>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
+		>=sys-apps/sed-4.0.5
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!app-portage/repoman
+	!sys-apps/portage"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+	)"
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+	if [[ -f ${EROOT%/}/etc/make.conf ]]; then
+		eerror "You seem to be using /etc/make.conf. Please migrate to the new"
+		eerror "/etc/portage/make.conf location before upgrading."
+		if [[ ! -f ${EROOT%/}/etc/portage/make.conf ]]; then
+			eerror
+			eerror "  mv ${EROOT%/}/etc/make.conf ${EROOT%/}/etc/portage/make.conf"
+		else
+			ewarn
+			ewarn "WARNING: You seem to have make.conf in both locations. Please take"
+			ewarn "care not to accientally overwrite one with the other."
+		fi
+		die "${EROOT%/}/etc/make.conf present"
+	fi
+
+	if [[ -f ${EROOT%/}/etc/portage/package.keywords ]]; then
+		eerror "You seem to be using /etc/portage/package.keywords. Please migrate"
+		eerror "to the new /etc/portage/package.accept_keywords location before"
+		eerror "upgrading."
+		eerror
+		if [[ -d ${EROOT%/}/etc/portage/package.accept_keywords ]]; then
+			eerror "  mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords/99old"
+		else
+			if [[ -f ${EROOT%/}/etc/portage/package.accept_keywords ]]; then
+				eerror "  cat ${EROOT%/}/etc/portage/package.accept_keywords >> ${EROOT%/}/etc/portage/package.keywords"
+			fi
+			eerror "  mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords"
+		fi
+		die "${EROOT%/}/etc/portage/package.keywords present"
+	fi
+
+	if has_version sys-apps/portage; then
+		ewarn "If you are migrating from sys-apps/portage to sys-apps/portage-mgorny,"
+		ewarn "please note that Portage will abort upon having to unmerge itself."
+		ewarn "However, sys-apps/portage-mgorny will already be installed at this"
+		ewarn "point, so you simply have to restart emerge and it will successfully"
+		ewarn "clean the old package afterwards."
+		ewarn
+		ewarn "If you did not use '--dynamic-deps n' in Portage, your VDB dependency"
+		ewarn "graph is probably broken. You may need to use '--changed-deps y'"
+		ewarn "for your first @world upgrade to resolve the conflicts. Afterwards,"
+		ewarn "--changed-deps should no longer be necessary and any conflicts"
+		ewarn "introduced afterwards should be reported to bugs.gentoo.org."
+	fi
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py ||
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i pym/portage/const.py ||
+			die "Failed to patch portage.const.EPREFIX"
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "${REPLY}")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${REPLY}" ||
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
+			-i cnf/repos.conf || die "sed failed"
+		if prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [[ -f make.conf.example.${ARCH}.diff ]]; then
+		patch make.conf.example "make.conf.example.${ARCH}.diff" ||
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_configure_all() {
+	cat >> setup.cfg <<-EOF || die
+		[build_ext]
+		portage-ext-modules=$(usex native-extensions true false)
+	EOF
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+
+	keepdir /var/log/portage/elog
+}
+
+pkg_preinst() {
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED%/}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED%/}"/var/log/portage{,/elog}
+	fi
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index bf57d4315d5e..d466b9d6ccad 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -15,9 +15,9 @@ DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c
 DIST systemd-238-patches-0.tar.gz 30019 BLAKE2B 0f393865cd6bcd815c1a6e932c0e5a25e125768d2bdef072d5fa7830b9ea012d0986380a1cdea8e369e1fffe89ea7657e4d55de2bae0d785ae374796a4e7c64b SHA512 f7e6fb7bf3b5cde2717a9e5dcd779a4595d6185d1ecdad8405a075edbb55b32c2573558f6af119ff50ea0df8eacef12ae7ee710fadd269f83db0985d76eb22dc
 DIST systemd-238-patches-1.tar.gz 47512 BLAKE2B 9edf8835ec7bba43bd00b1481b23bc5a4148030724633a8bfe1e82ec48b79699d4822b0bc5ea3a979b404e706efa9c0eae8e0460d76658ba2e901c4853da0c04 SHA512 809d8a3a9a023217b509b738e0d341d060f1343df6159e5acfcededfb452986de140ddf4b879a5157fba1a5646d00db8b6537aba8358c48f75fd6527f881a14c
 DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8
-EBUILD systemd-236-r5.ebuild 13049 BLAKE2B e06a3d3d52778f00c7ad935ea674e76c19185adff4fcabfb08ad4ab77866256358d17a0c359d8d69d083f5c0a0adfb457d9abcd52bef71c9019c5cd005f51edc SHA512 d17627d55e3006fbcd2c6c91a51482c599788a3d96ba10bd5d4fc369fbb6ab7dbb2daf0f432402f422df21fb8bb1fa9416366853dde90710c51f23505be732c6
-EBUILD systemd-238-r2.ebuild 13272 BLAKE2B 1f24a5fb90f29640fd52b1c37d67180c733a5fea1a66ae855daaee797b9458bbf42db3fe915b10e0fd90ebfcbfe9cb415fec7d6d4c83cc529e284725b3463cc7 SHA512 537f5053ce876c4b57677768e249be492e1f8b238d96230ddca780ca1ca3785aeda5b61a805703f3efffa7c8e08196fb3022334d2efbb407178440cfae96b451
-EBUILD systemd-238-r4.ebuild 13174 BLAKE2B 712d300426c0463939f6684a0458aad3abbbbc473fbf830c1ecc2b8d75163cb25b1b97a712c39d4b4fa635863f0fb646a4993e164d8cd9f02abe56a55f6bef90 SHA512 a5894928bc22d1a420d56345dac8f8baaff11b3c308245f90585f6596ef6cc93ba64139c8ab94d6613ca7923bedf85a8bf44638302236fe46b45b14bc40645dc
-EBUILD systemd-238-r6.ebuild 13177 BLAKE2B 29c923de27c5d1f94ab53e95b78123a68fc4f324381184b590c1609dae89e12ac92236b5deb16bd475e0fa029b57555bf76c5431be86f2540932f0f559cf8003 SHA512 a3ec0a9a7ecf360d0f8a4965bae7c005d1ddf114cce2250753313cbada90ef2299b8740233ac700fa9d97f3adb9ab55c57a2f5b4b59b36cfb29e74590595ba8d
-EBUILD systemd-9999.ebuild 13186 BLAKE2B 8de75e0c231da02f48ac6a886abc6014ede50b1761ad65e6fcdd3ade2f2cb38bef73bfd4b49f1e35f9b651057b18be886e39ce7d9c09ddbcaea52b7456ff84a4 SHA512 7d2d65b6c37479ebf5997540a35b39125fbb2a050021090c588acd1a38a3b1b09822c59887883b2cdffd518c5a3d4f980193fad23ac5baa6beb736317ea2fbda
+EBUILD systemd-236-r5.ebuild 12922 BLAKE2B 861984963426429351ef99c8f0dfa0133bbb21ca37bbeae9ce5c31e726a4c265d3b3280e37841b01f200d5c283ba3b9252469ae4d1ce79fe02366bc1c7ac1f82 SHA512 38f92e4f61fd74144470d0d7055bb19b47cad7c475ee2b66364de45ed2031ee76027b73d56180a1e14f97c63758f248c434aee5714fbe3ebafddf8f2801bd10c
+EBUILD systemd-238-r2.ebuild 13145 BLAKE2B 026520104d0f8fc395bf19b1f04d0a5f46a22dcbbc02dab148469f8c88ec7ab9c80a2d8416d594cc3161c71f794c755db37ee71bbe0d51061a7f1b9df3dcc22f SHA512 8183c0bc11f9385721f02fbc6da07eefdacb84f18eae71fd01bbddd8f6c4aab8f7c9f015fc3bd8a54acc6394c2c9c77656360e2986712c2c899bc54cb977cdc4
+EBUILD systemd-238-r4.ebuild 13047 BLAKE2B fe8bf96af2b3e665151c4118721ffd60e2b84991883d06fd75134e49ab92b455c7c190a9424228769000addb8d2998530037e15938e5f8669a90844150b59b5d SHA512 e384cee4eeb6ae614725131c2a61f75950060ebfc04f970c19583b093d1ad93fe95d7084cc9014e68a557fe5869ed7706f2addc7a5badab7af8927fa0174d4b6
+EBUILD systemd-238-r6.ebuild 13050 BLAKE2B cde2f02fe5711d80e4caabcc93cb5cbb76987305116f0dc4676b9433d0d3bc7fc4292f210e0ab9023351cc060c7fee6bd59f8b7ff23ef7c0662f22f61b87ca52 SHA512 ad8b56b5d219b03f0a73adcc132fff250d59428b914f32b8c3d47bd982a6ff81d920bcd81edbca537d2397e575bab94812f69cf71fc316e1ae045217a32bf0eb
+EBUILD systemd-9999.ebuild 13059 BLAKE2B da423d06afdca5e08107850f4579d903560d39617d580d883cdef8655b474491e13b9b93d4e4e336b579f0a2d0f7ac7814c87b002bc561903b9b5f0695ca01f9 SHA512 446f62913818c097c2da05e641d174295e59542ce83a76423f41a3118343877e8e9b56b3f6ad3faf7144847f35e07ca6c766f216ef3805a8130eed15355c084f
 MISC metadata.xml 2036 BLAKE2B c2f3d74c0cdcf1a5d850c31d43085ab441523e025369c9ad07d9e518d01c7c585c2019c4365892dd6b395c1b4eebc3c7f31c8948c13cab78acf6a2f9528f614c SHA512 72d9f1db3a9cf681a7971d9ded4d73b8b56bf7c467e453f7599293bf3761c66daa7e80716b5c70adcd18a181521f6710267b92df78e8e9a3430a340f8d33fd47
diff --git a/sys-apps/systemd/systemd-236-r5.ebuild b/sys-apps/systemd/systemd-236-r5.ebuild
index 1661ac965008..0d53bc5e946a 100644
--- a/sys-apps/systemd/systemd-236-r5.ebuild
+++ b/sys-apps/systemd/systemd-236-r5.ebuild
@@ -58,9 +58,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	qrcode? ( media-gfx/qrencode:0= )
 	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
 	selinux? ( sys-libs/libselinux:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
 
 # baselayout-2.2 has /run
 RDEPEND="${COMMON_DEPEND}
diff --git a/sys-apps/systemd/systemd-238-r2.ebuild b/sys-apps/systemd/systemd-238-r2.ebuild
index a6d00af1933d..41ec7ba2128a 100644
--- a/sys-apps/systemd/systemd-238-r2.ebuild
+++ b/sys-apps/systemd/systemd-238-r2.ebuild
@@ -58,9 +58,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	qrcode? ( media-gfx/qrencode:0= )
 	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
 	selinux? ( sys-libs/libselinux:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
 
 # baselayout-2.2 has /run
 RDEPEND="${COMMON_DEPEND}
diff --git a/sys-apps/systemd/systemd-238-r4.ebuild b/sys-apps/systemd/systemd-238-r4.ebuild
index 0aca5fbb3029..afc515ee2618 100644
--- a/sys-apps/systemd/systemd-238-r4.ebuild
+++ b/sys-apps/systemd/systemd-238-r4.ebuild
@@ -59,9 +59,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	qrcode? ( media-gfx/qrencode:0= )
 	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
 	selinux? ( sys-libs/libselinux:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
 
 # baselayout-2.2 has /run
 RDEPEND="${COMMON_DEPEND}
diff --git a/sys-apps/systemd/systemd-238-r6.ebuild b/sys-apps/systemd/systemd-238-r6.ebuild
index 8625668cfff4..fdb75ee3a4f3 100644
--- a/sys-apps/systemd/systemd-238-r6.ebuild
+++ b/sys-apps/systemd/systemd-238-r6.ebuild
@@ -59,9 +59,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	qrcode? ( media-gfx/qrencode:0= )
 	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
 	selinux? ( sys-libs/libselinux:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
 
 # baselayout-2.2 has /run
 RDEPEND="${COMMON_DEPEND}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index a57c2ffe12cf..dd80472a4804 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -58,9 +58,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	qrcode? ( media-gfx/qrencode:0= )
 	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
 	selinux? ( sys-libs/libselinux:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
 
 # baselayout-2.2 has /run
 RDEPEND="${COMMON_DEPEND}
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index ddf41eadfe79..b30a10d81eac 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -3,5 +3,5 @@ AUX tcp-wrappers-7.6-headers.patch 5419 BLAKE2B 6d56c77652299c8bc75ea76ff42c5dfa
 AUX tcp-wrappers-7.6-redhat-bug11881.patch 956 BLAKE2B ac2e8e4c8778899c6460bf6ae680b189158c9936428644e7b93981403ed017ef26806f3de184f66eace573cf385ae350f3b0fa1b3f250b2a0b4708908289c558 SHA512 d530f788c3b40f5ec2836ba7c6e73df529869ef465b93fe2b2d8460dfcb5e9031e78c8e6a99c71d6262a05b82f25e694fdd717686198a87dfcb2c9b9d5a52ef4
 DIST tcp-wrappers_7.6.q-22.debian.tar.gz 41730 BLAKE2B 2e507269b14e5cf3e1a599b4cdae40c2900b098a1e40fc1b74e6b5565183fc71e25306e8dd0863fb16e6e52a6c471aeccb73c0b7c42d6f3f98aa9f95274583fb SHA512 cee45f265c34ec1c4e9e81d54be636dcd9702964f9cf5bb076f72d6772d2dbc638d2ef366560b51c24a216724807826bb3b7bf9d5d0f5c0923b71de7d0b002a8
 DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac
-EBUILD tcp-wrappers-7.6.22-r1.ebuild 2634 BLAKE2B b9477640f2ba6f1d5de3638d8782e4f96e11e7154093cc0ff0a7427cb85fd6669da6d3b7a3312979e015499704323ab37dae545085c4f058c28b38ba5e7bb94b SHA512 f3a8f5608e4841841eb3d9df67c5fb4a7c1fef9de59c403d561e2336c2f8e4d84312ba7b3d995e9943f9440c670906afc89ec9e4f39ff37edc20f3301c058352
+EBUILD tcp-wrappers-7.6.22-r1.ebuild 2504 BLAKE2B 16fdddff4a289c1e8fdf826b06bbd3fa2d323074e3d0cd345e7b09a584bcd8264578969f50e2f449229c51a05d385def0ecf40930ed5661139c41bf1bb9f44ac SHA512 a092bfe8a468e20f041c9dc20465193e3bddf2ed598b8112a1311fdcd5c88e6038efd5741d0b0be2aa65c86c12a7d51cd3732862484c407c5736ef75326b7430
 MISC metadata.xml 440 BLAKE2B 701c101283758170adf92309f323c549f8cdac83c8885cff01e0a9841474e88b00cd8ce7d3e5c0d19209cc2acd8c113d23129c54a116433cf495126960758bea SHA512 3075ada2500265fa53064720159a33779d79c46e4244a5cc6624d0c2de81dcacf62f89232162182bf29477c36025f4b3f4618d9ae3f592ebd714a658425428a5
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
index 44faddac36fa..211b1a2ca298 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
@@ -18,11 +18,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="ipv6 netgroups static-libs"
 
-RDEPEND="
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r4
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+RDEPEND=""
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/sys-apps/udevil/Manifest b/sys-apps/udevil/Manifest
index e7173c147e70..1b522fcb0121 100644
--- a/sys-apps/udevil/Manifest
+++ b/sys-apps/udevil/Manifest
@@ -1,9 +1,9 @@
-AUX udevil-0.4.3-flags.patch 1047 BLAKE2B be293618e22f165e884e1b505aeaa37690953a9e2f3126caa7218920313dcdf3a4ab1bbe86e400410ae223ff0647fce5e86c20862491c96f785a131d20004a1b SHA512 71ea30cc73e3ac56fe4e1278672e85434079fd2b6ead78409a30ba22a5d13dd308bfa20624fe1096f970a54fc5e6385219f1ec4d70d42c90c51273ca121bc480
+AUX udevil-0.4.3-flags.patch 1051 BLAKE2B d9c6ad984ac5ef75f20226f7d2e2a3ce73126af48e92fef672307356ede10185bc14c7cb36d07bf6fedccea2813de2c994390533f03fa490142b7b1355fb4c6f SHA512 9c4cb6c11b776f55475b481f3b21d5f4d1c9750bbe3da980f1c26fb794b5eb9aac651d73a4fe810d67431c224904817f2f0a26e144d8f82a0c8c475a8fb6ef80
 AUX udevil-0.4.4-include-sysmacros-r1.patch 648 BLAKE2B 4108b070be813f09b613122d125e8fc746b9c490837622f70da16dbfd4ec19c1691419b46c34ac37af3cf81b060067fbef1e7a359003621aa144f0a4f7f7b54b SHA512 c6acea65ec4e628013ef95b336cac921bcd25070c2604c7b457006ac248160d3c8a941b5e58070d1a1a352b735148cead85c2ca3d24bc2c1fcc9c86dec59865a
 AUX udevil-0.4.4-include-sysmacros.patch 398 BLAKE2B 36369bc56a5d3b66dd455f8fc481481156a4fa2b005046e7718ca186a2c3a1b980456d0025ffe3e25db476c91b3011fa5a3a209f270847508e78aaf2081c1b2a SHA512 ce9070dcce7fb0117e50cda0f8b27f493a24f881a9e11fef2024ff3e3b70a1804bb7beef35c9935247baa1f74a499a0ad928a9ff7dbcc586b8c7ee26c5a57776
-AUX udevil-0.4.4-stat.patch 230 BLAKE2B 9331554f554f0a9059e255d2b674673dc0898c713ef036e97689c368b6b2c575f1dbae2248a8282e791bb198b5828a1f9642a110602f2d95026d283ec1e32ad4 SHA512 d7cbba53c3e52551f3a08774412f5ff23b8467bb02905fa7d60f28593a57a1eaeab6cd3f8d07f07779100c7d0c14e2973a5a5cc96f0cc010eafa2db15d3267d8
+AUX udevil-0.4.4-stat.patch 234 BLAKE2B 834ac0c306e4f13cea623304637729e285ff5d286b40e6b4a05f8a8acbf4ce8ff95d6552b6274e01de22ebfc3ee683376decb2de2afa70b56d66bc944a325590 SHA512 92a9889e3c70e3b9b0bdd4f6470ba0368a69d42eb852f10bcf00bb1f06ae126ea1579cfaaff15127e359c790f0672c655b34efddb7c27fe88addee70ec4d7583
 DIST udevil-0.4.4.tar.gz 477254 BLAKE2B 16a1980da8b3b98e36921c8e2fe6490c495066178dd928695a07eb8d5d7367cae49e314983f251a1ec684bd16a34286ea4ccc83329c9af0dd71af84c77ced20d SHA512 adce4916e06d1cc4965521abbcbc2901e53930691167f431cb18e28d3ef8bde740e95a6a5f40dfc58dfd7b4b661b4475d3dd2b6174a5d7a55ae7c65629b82327
-EBUILD udevil-0.4.4-r1.ebuild 1922 BLAKE2B fdecab7535d5e4abce85d8ff584f825ba19879dd5470261f8954b311df119cfeb247760e4c5b3d7cf5195a4241ca6310b926af780e585ca3240df14093190bb0 SHA512 9ccb1b2e9fd377c02cedea8ee3e8bc7ee0b0ccf1647b733d34122969d24a284e40d251c3d0e294aeab1b830589d60621e793071e46d523bfe34ef12b5deacad9
-EBUILD udevil-0.4.4-r2.ebuild 1988 BLAKE2B 6e2cfb15a2a7d80fb125aae5577b166295f54aa770f7149b4153f34bd55b7b3f4577c91368de493265caea0df8fa4f935a7790210e013cd74d8ef72093552643 SHA512 6802bb465b172e4a42fad2366bcb4ae1ae05b0c48f772e0ca545df5ef8409ad21c1dad721a9838fea188e6ba4bb7e693d03f18fa73895d60074641ca1050ab8a
-EBUILD udevil-0.4.4-r3.ebuild 1989 BLAKE2B 4f021d1b6e6c63d3f3b2b66273116f1dee686116cc36018228976ae8e007dea465ebea76403eff70c584680b74539e57abcf6c76cf7b4a302bdaf76db68144e4 SHA512 dc1d1d46004a1633ecab5096383caa64e12df393ca79cc0688dbbbfbdb6bb55712435e3703d0970e387c494157bfe6085dc50b73f5ae7f440629f553d348c797
+EBUILD udevil-0.4.4-r1.ebuild 1929 BLAKE2B 2aa9974037fc6a8e839a103c1a9f155236305de2521752b4570df6d251f1c1ae1f562e43ff4f056cf2a4f12436757a09e99fe11d9f31d8843ccc6922ac4c1af9 SHA512 d485071b991959dc45476bf9d0f54264c39386e8698e93beb3a0ac4eb8741937558e418a8c6353328bf9ab40d69fceee8f98afe48ab64eef777b3efcb5bceee3
+EBUILD udevil-0.4.4-r2.ebuild 1983 BLAKE2B f55a86aecb963c18879a78715dc1d91dea20474443ce1b221049cb6cc1a89771d7f1f1a336a5e2c82fec6b8cee3865a4f40ed1841ec6618d77cd97d711625971 SHA512 c744b083e8c0becbb09804c6e0c41704469f3a226588d4e36cd9aedbcca35bd51ee1ac2838a893879fa7b712e350154d680e8a291d5feccb5e637429506f4ff6
+EBUILD udevil-0.4.4-r3.ebuild 1981 BLAKE2B 41c282b74f6add017ea962267a8430115f0fc4776b9d39fde351351fa405bf054843a4c74384ee70e824c4ecc6fd18548ecd39e821ed90b51876566892fa43d0 SHA512 287d08a8535aa11394a26a4d6f995ad344cb1bbc2ed2c53781d6e2df5ede3a875d0ae301105e122bccedf1481cfd3872e3d99697d97571d2ac0c099545e0affe
 MISC metadata.xml 250 BLAKE2B 0a529fe4be14917719f846d11e5d49e7129b42ec81e665a0895c29fe63ea1300d30a5e470b9c0c06f18d214a862cd02669c7e3f92f174aa21339b84e29dd3f14 SHA512 6b612fb510b795abda0fb36e0440a98c315e1d09b397e2865f8eea7b740763f93673a19cb356e8366ace8f00f1c4e2e4246d74d6c4fa87e3427300d33f975537
diff --git a/sys-apps/udevil/files/udevil-0.4.3-flags.patch b/sys-apps/udevil/files/udevil-0.4.3-flags.patch
index 166a4357e9f3..524cdfff9900 100644
--- a/sys-apps/udevil/files/udevil-0.4.3-flags.patch
+++ b/sys-apps/udevil/files/udevil-0.4.3-flags.patch
@@ -4,8 +4,8 @@ Subject: build system
 
 	respect flags where possible
 
---- configure.ac
-+++ configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -18,26 +18,6 @@
  
  
diff --git a/sys-apps/udevil/files/udevil-0.4.4-stat.patch b/sys-apps/udevil/files/udevil-0.4.4-stat.patch
index 22e41d467821..427a6f1f670d 100644
--- a/sys-apps/udevil/files/udevil-0.4.4-stat.patch
+++ b/sys-apps/udevil/files/udevil-0.4.4-stat.patch
@@ -1,6 +1,6 @@
 Fixes bug #552072. Thanks Helmut Jarausch.
---- src/device-info.h
-+++ src/device-info.h
+--- a/src/device-info.h
++++ b/src/device-info.h
 @@ -14,6 +14,7 @@
  #include <libudev.h>
  #include <fcntl.h>
diff --git a/sys-apps/udevil/udevil-0.4.4-r1.ebuild b/sys-apps/udevil/udevil-0.4.4-r1.ebuild
index 9f3cd58b0b13..73596bdd436e 100644
--- a/sys-apps/udevil/udevil-0.4.4-r1.ebuild
+++ b/sys-apps/udevil/udevil-0.4.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils autotools user
+inherit autotools epatch user
 
 DESCRIPTION="mount and unmount removable devices without a password"
 HOMEPAGE="https://ignorantguru.github.com/udevil/"
@@ -31,7 +31,7 @@ pkg_setup(){
 src_prepare() {
 	# This works for 0.4.4 too, no sense copying the patch
 	epatch "${FILESDIR}"/${PN}-0.4.3-flags.patch
-	epatch "${FILESDIR}"/${P}-stat.patch
+	epatch "${FILESDIR}"/${PN}-0.4.4-stat.patch
 	eautoreconf
 }
 
diff --git a/sys-apps/udevil/udevil-0.4.4-r2.ebuild b/sys-apps/udevil/udevil-0.4.4-r2.ebuild
index c93bc7b9dcc2..a75cf290506c 100644
--- a/sys-apps/udevil/udevil-0.4.4-r2.ebuild
+++ b/sys-apps/udevil/udevil-0.4.4-r2.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=6
 
-inherit eutils autotools user
+inherit autotools user
 
 DESCRIPTION="mount and unmount removable devices without a password"
 HOMEPAGE="https://ignorantguru.github.com/udevil/"
@@ -28,12 +28,15 @@ pkg_setup(){
 	enewgroup plugdev
 }
 
-src_prepare() {
+PATCHES=(
 	# This works for 0.4.4 too, no sense copying the patch
-	epatch "${FILESDIR}"/${PN}-0.4.3-flags.patch
-	epatch "${FILESDIR}"/${P}-stat.patch
-	epatch "${FILESDIR}"/${P}-include-sysmacros.patch
-	eapply_user
+	"${FILESDIR}"/${PN}-0.4.3-flags.patch
+	"${FILESDIR}"/${PN}-0.4.4-stat.patch
+	"${FILESDIR}"/${PN}-0.4.4-include-sysmacros.patch
+)
+
+src_prepare() {
+	default
 	eautoreconf
 }
 
diff --git a/sys-apps/udevil/udevil-0.4.4-r3.ebuild b/sys-apps/udevil/udevil-0.4.4-r3.ebuild
index fc14c4677245..0dede83db0ee 100644
--- a/sys-apps/udevil/udevil-0.4.4-r3.ebuild
+++ b/sys-apps/udevil/udevil-0.4.4-r3.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=6
 
-inherit eutils autotools user
+inherit autotools user
 
 DESCRIPTION="mount and unmount removable devices without a password"
 HOMEPAGE="https://ignorantguru.github.com/udevil/"
@@ -28,12 +28,15 @@ pkg_setup(){
 	enewgroup plugdev
 }
 
-src_prepare() {
+PATCHES=(
 	# This works for 0.4.4 too, no sense copying the patch
-	epatch "${FILESDIR}"/${PN}-0.4.3-flags.patch
-	epatch "${FILESDIR}"/${P}-stat.patch
-	epatch "${FILESDIR}"/${P}-include-sysmacros-r1.patch
-	eapply_user
+	"${FILESDIR}"/${PN}-0.4.3-flags.patch
+	"${FILESDIR}"/${PN}-0.4.4-stat.patch
+	"${FILESDIR}"/${PN}-0.4.4-include-sysmacros.patch
+)
+
+src_prepare() {
+	default
 	eautoreconf
 }
author	V3n3RiX <venerix@redcorelinux.org>	2018-04-22 14:25:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-04-22 14:25:03 +0100
commit	5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (patch)
tree	b041acef19bb9ae66c228d5c9d34d1e00aeb2b95 /sys-apps
parent	5cfef3c94cd7e82136c69a0322f5ba21f7e64632 (diff)