gentoo resync : 22.05.2018

27 files changed, 47 insertions, 701 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index f121b354421e..3bf4a1e520fa 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/agedu/Manifest b/sys-apps/agedu/Manifest
index 0ba81fda0612..87dbc57fea96 100644
--- a/sys-apps/agedu/Manifest
+++ b/sys-apps/agedu/Manifest
@@ -1,10 +1,6 @@
 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 813 BLAKE2B b397889d6e06a4f4415f815ac43a813a7c18b466eb486d6e74d2792ce7957c6920d57797796723aeb6a7fcb278d56567744dddf36696e3f3e7a01ebb4e5fb5c0 SHA512 8ded6c3042e80a75b1d61b445d661c93656cc9e087eb9fe16bc2e77a8fcc08da287820a0064bccbe7fe829995ae6c3d9b8ba340d7057b8ad4fa41d3c4a22537d
-EBUILD agedu-20171202.ebuild 813 BLAKE2B 6daf7f976207f138c6b05dd1e88e7f6ebcef4f5d48248f796d4c72983156fe29ee7f85df13641121aa17a3b96bb5e153a91adcfb1cf13f768c930b9300637cad SHA512 63e72c5a253098d63a519a24f75ff6a10152b74d5aa45de96ba16a6ae4024be8784ea7a73ad7cb1dc2434eb517e7e480ae77b837cbd0b4fafac286e02dd08afb
-EBUILD agedu-20180302.ebuild 813 BLAKE2B be74cba7f0f8d56d58d34758e9ae02bb1eb5cc830366704fdfe053ed3bb525fb584463bada94b44cf938a1f1c127b477ff01b2038d70bb55d5c18718fb3ee54e SHA512 b1bf546fa3b98ccc54e16205c5ca90275e9966b172a94b0dc126472a4e257727fb14696933e314af379b0fdc3f07c34af2c6d73cc4279b8f6ef689603d079d3a
+DIST agedu-20180522.5b12791.tar.gz 178887 BLAKE2B f9c669d9b5e24bc40f59274626939713632bd16a4a3a6804665f35844603e88524a800da1dea6b311957284348014a87e9b513e934f178dbd07abea42b73095b SHA512 89774e3cd0cce8a1a9c8d6415076a7b8b8109642bbb58a126707a651ab3da348886a4cb15fa975502a6bf4fdddb78aff16e5a7059c7ede89017e0c7a3cbf9618
 EBUILD agedu-20180329.ebuild 820 BLAKE2B 980c34c4804a0d081a281367b1d846e805a2a48dcad0c55e0e5b42b78026efb23bf97462ad88dcf413b206b41bc569d48b44d0de86f7f132b08d34620395a077 SHA512 3a4f336ec030a5091dd5e45c851b61ef08b18ed5f667062f7177e461ec5984eec945eafb21c8f389b38502079e60e822f6640263bd8f1bbd1fe9a93707afc230
+EBUILD agedu-20180522.ebuild 820 BLAKE2B 6c4b0519f380b03374ee067d934c8182b49681f970b819684fef4ba71d4b2db36e9efd94a62f4867c1cdab8476ac94f755b14203df8a10f62010bb1d259f1663 SHA512 def2b615a879bc3fb735300e8572a91328ca1d1ebb26fc028363ce3c07d9be565970e5dfbe4c7f3c5733345ff2eb8314ca9186bc6bbb251e59575638215beffa
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/sys-apps/agedu/agedu-20171202.ebuild b/sys-apps/agedu/agedu-20171202.ebuild
deleted file mode 100644
index 0cfc94bc80fd..000000000000
--- a/sys-apps/agedu/agedu-20171202.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-# agedu-20151213.59b0ed3.ebuild is not a legitimate name
-# so we'll drop versionator and just set MY_P manually.
-MY_P="${PN}"-20171202.8a8299e
-
-DESCRIPTION="A utility for tracking down wasted disk space"
-HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/agedu/"
-SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/agedu/${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ipv6"
-
-DEPEND="doc? ( app-doc/halibut )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-r9671-fix-automagic.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-ipv4 \
-		$(use_enable doc halibut) \
-		$(use_enable ipv6)
-}
diff --git a/sys-apps/agedu/agedu-20180302.ebuild b/sys-apps/agedu/agedu-20180302.ebuild
deleted file mode 100644
index ced64253757b..000000000000
--- a/sys-apps/agedu/agedu-20180302.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-# agedu-20151213.59b0ed3.ebuild is not a legitimate name
-# so we'll drop versionator and just set MY_P manually.
-MY_P="${PN}"-20180302.9421c00
-
-DESCRIPTION="A utility for tracking down wasted disk space"
-HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/agedu/"
-SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/agedu/${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ipv6"
-
-DEPEND="doc? ( app-doc/halibut )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-r9671-fix-automagic.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-ipv4 \
-		$(use_enable doc halibut) \
-		$(use_enable ipv6)
-}
diff --git a/sys-apps/agedu/agedu-20170831.ebuild b/sys-apps/agedu/agedu-20180522.ebuild
index 0924f9239532..bf79051e2ba8 100644
--- a/sys-apps/agedu/agedu-20170831.ebuild
+++ b/sys-apps/agedu/agedu-20180522.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=6
 
-inherit autotools
+inherit autotools eutils
 
 # agedu-20151213.59b0ed3.ebuild is not a legitimate name
 # so we'll drop versionator and just set MY_P manually.
-MY_P="${PN}"-20170831.fc6b2b5
+MY_P="${PN}"-20180522.5b12791
 
 DESCRIPTION="A utility for tracking down wasted disk space"
 HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/agedu/"
diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
index d72f307bf1ee..eb60acda18f3 100644
--- a/sys-apps/fakeroot/Manifest
+++ b/sys-apps/fakeroot/Manifest
@@ -1,15 +1,8 @@
 AUX fakeroot-1.18.4-no-acl_h.patch 763 BLAKE2B c41f0fb90f549d27681b8680cad71bc76182bee731fbd143b8866fb1673a980c2557b4e38b8ad54b820ce126fd2f34839ed510cdfdbef85892fd7c55f482a6ff SHA512 a534bbd2918328bc4717256010a14218a5341cece7c4f043e8e5df0d7f671effce2bcc7fe868d333fd37472382c14d389bf302fc2d5c2651a4c45361845a6e27
 AUX fakeroot-1.19-no-acl_h.patch 915 BLAKE2B 2392343f314e5cc3fa49def14a245cf2898902d99ff2fbe4bc0a883e70ae1382ed5c4c506533545b9c428958f8e4be54e795601063d48dd8ffe9e80d56ec267a SHA512 d077e8ba2bc4407ba1a57fb5920f2a866bdcb13fa359c2245e479019bbc19a3aab398cc25220079edf7c42c4d09429e57326b606ff5795f83de24c7a31835717
 AUX fakeroot-1.20.2-glibc-2.24.patch 1021 BLAKE2B 1f907d709be9819d4d7a9113fe17d72497145bcb8e5e1b2acf43608dd03f1a2b9ee688fda8859491d79c898e6f412eded6a5c8a24734640e2479eda95319a265 SHA512 824e71169877702c5d98970d62866d5074d1a728d5bc52460483117610f50f6869f65714608313f20e40b7432ea4c50cf9f47158d8f2f9ef4a3c00220ccbd52c
-DIST fakeroot_1.18.4.orig.tar.bz2 309298 BLAKE2B 49cc2664b2292ebbf9cf2b6847100f53be31326d72a6361484d078d7ee7d4ed72db8aa630feae1359313042c9d6de1f7d70b4c93ad2930634757196c55267936 SHA512 497292fe21d18a37eadd657fbe01db8902f4b8d87d63605928efd59789f4c14737997b9f0abc4d794dbef78066b952064bdb2dd9f0910ec75349d7dd313cd058
-DIST fakeroot_1.19.orig.tar.bz2 312304 BLAKE2B c217564ed1ab152b64cbd67b71e113396299e417139421868872567d639f56d0d84ca7cfb01ff6f7027379b4cec2101035fc97ac37313424082211914901b34d SHA512 ff3f50cdf168deafab337d3d98299ccd4129ed2a9befa5f28171d92c2ddfa08c8f42424f32b3fbcbb1f83c16f22952e571946f4152246d08b0d18bab77c458e9
 DIST fakeroot_1.20.2.orig.tar.bz2 326910 BLAKE2B 813fce6416a375de7dce0581a2a7398f023e5e5d6b981d6dd973e9e29380b5908e0bb9e1e84db3b20638933817ed85a8f7d341b369631881905aab9ca4cf2119 SHA512 1ac231f995774aa40f43c4325cd9e6de45365963277c32a85776690c3e7fd281ac410f3d91395dc1e5e5ca3b143e89914e048632011a3985ead216e870852231
-DIST fakeroot_1.20.orig.tar.bz2 321491 BLAKE2B 6f8b1ea6df5cba2a261d5d494cb6dd6cfaf712765804324e0a2c050c85d9069aa45cd2eac36a0f0d4bca93087815ce10de5262699c2acbe6959c45670c94071a SHA512 b041ab87559f784041f05bfa9d5186ceaafebbcbd03057ede62bf420551e337ceec4b7101854937e206c6389ac2c0719545d5971457edaf564856bb44ce7b4b6
 DIST fakeroot_1.22.orig.tar.bz2 338238 BLAKE2B b6cee7483ea7ec17747e638cbfefa565f26b3b00517f3ec90280f8ce556ce8efa3833accc07885365e20f80967a67291fadc27cd80766548cc86e2aa70c74c33 SHA512 193478d9ff88ca2ae69fe47b73b6c61aeb2ba3f2a9e7ed5d455022705857c6f34cdcbe2d3f614c4c4c9509368dc78b9a7b7aa56fb3b50bb3309448140abd796a
-EBUILD fakeroot-1.18.4.ebuild 886 BLAKE2B 8bef60325497051c2d247155d8af515e827b760a55da6dd63ec8b165d93470ae9b42add6a89f53ddc81d37cfbb815743f548d4551ea35e8f943975721442f58c SHA512 f509536a58b9acb6472eb32d93be2c4ececd23832b92190845be1c80f9b1c799db3f02e01a07c1f31c45139dafacb18fd7613c2e2f63dee5ba918bdafb48efd8
-EBUILD fakeroot-1.19.ebuild 836 BLAKE2B fd2449fe3fc858702cee6535d1dc3da3a90c34de8aced86f2574e8d6f9caa3e5e66ecb9c3a83a34f9889c1758a9d4bc4805aaf7be6c2b70a800955703f45823c SHA512 7d56406d9b41f4ae6b2fa674b19fefb4b8cecb561348e7daf52ce2964a894090b6d49ee131ca086000e3a023d240006119b8ad04c6e710c5e57a23d090ae4f98
 EBUILD fakeroot-1.20.2-r1.ebuild 1008 BLAKE2B 75a46f53e7c9c02acff4f84cc7c1a439e3821df80d23714282e3f1ea9d106424083b705c4d96481874631059c6c4022e9d924ed0b73881f60513a93a9bd8c712 SHA512 de5fb74abfe42b1a6fe4a3aaf2c25db69c5ccb4616195f721f66bd0491e3560d50c79086f40cc12d8749632d413c75af77156010043186e99e063e726468741e
-EBUILD fakeroot-1.20.2.ebuild 921 BLAKE2B 42f038e1d6b5137ec87b8f1d6779a10814b04b1cb8eb2b291bf7671b9a18e0e3d63590665df9511c2b49702c7fd6592536e3393ee7657bb16f902f93ff326ba2 SHA512 72f0bd48be4ab63a2c012d01ce58a639c31ecdf2c7d5319d45d4b7554258d82b30636e66127f8e8578390b4ce54a0d9166466644570a266c173b92eaa380f21e
-EBUILD fakeroot-1.20.ebuild 917 BLAKE2B 12ffc05c9cdcd0f6f4017dece5a9ecbd0a395353ddf59dd3e6ad4d2ab1dedad1afbc9311a498da5141d86cd41dd2497463882c4df981a3ab6def749de8eaf133 SHA512 178ef091b3a1ba0b314390bd5e4ca4c7da91efff9b053fc97f16e21fc2b5b634c38f4df40b2c712952f6efd6b8aa4358c3e3533a8f6523ba58b68ff88c44ae92
 EBUILD fakeroot-1.22.ebuild 1036 BLAKE2B 0e6ef225e2386e2c58f311e10c79d93a68d7604113cfaa64e88e76782d4d9be89eb68103d7343f2465eb80c607fe8ed50ef43f1317be2e2fdaadfacd401ea63d SHA512 4e61d9ed8cd0e86bcc221bd2bde2335ff09b1e74b8e4710a75e009c77fc31270a71487e3f8ef7b304f7aa22dfd9047c8391c007c6fc6b5cea4932fe39ce28635
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-apps/fakeroot/fakeroot-1.18.4.ebuild b/sys-apps/fakeroot/fakeroot-1.18.4.ebuild
deleted file mode 100644
index de37d87752d2..000000000000
--- a/sys-apps/fakeroot/fakeroot-1.18.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery"
-HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE="acl static-libs test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	acl? ( sys-apps/acl )
-	test? ( app-arch/sharutils )"
-
-DOCS="AUTHORS BUGS DEBUG README doc/README.saving"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.18.4-no-acl_h.patch
-}
-
-src_configure() {
-	export ac_cv_header_sys_acl_h=$(usex acl)
-
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/sys-apps/fakeroot/fakeroot-1.19.ebuild b/sys-apps/fakeroot/fakeroot-1.19.ebuild
deleted file mode 100644
index d3d2f857a13c..000000000000
--- a/sys-apps/fakeroot/fakeroot-1.19.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery"
-HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE="acl static-libs test"
-
-DEPEND="acl? ( sys-apps/acl )
-	test? ( app-arch/sharutils )
-	sys-libs/libcap"
-
-DOCS="AUTHORS BUGS DEBUG README doc/README.saving"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.19-no-acl_h.patch
-}
-
-src_configure() {
-	export ac_cv_header_sys_acl_h=$(usex acl)
-
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/sys-apps/fakeroot/fakeroot-1.20.2.ebuild b/sys-apps/fakeroot/fakeroot-1.20.2.ebuild
deleted file mode 100644
index db368714fec5..000000000000
--- a/sys-apps/fakeroot/fakeroot-1.20.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils flag-o-matic
-
-DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery"
-HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="acl debug static-libs test"
-
-DEPEND="acl? ( sys-apps/acl )
-	test? ( app-arch/sharutils )
-	sys-libs/libcap"
-
-DOCS="AUTHORS BUGS DEBUG README doc/README.saving"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.19-no-acl_h.patch
-}
-
-src_configure() {
-	export ac_cv_header_sys_acl_h=$(usex acl)
-
-	use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING"
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/sys-apps/fakeroot/fakeroot-1.20.ebuild b/sys-apps/fakeroot/fakeroot-1.20.ebuild
deleted file mode 100644
index a93af73e7d34..000000000000
--- a/sys-apps/fakeroot/fakeroot-1.20.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils flag-o-matic
-
-DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery"
-HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="acl debug static-libs test"
-
-DEPEND="acl? ( sys-apps/acl )
-	test? ( app-arch/sharutils )
-	sys-libs/libcap"
-
-DOCS="AUTHORS BUGS DEBUG README doc/README.saving"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.19-no-acl_h.patch
-}
-
-src_configure() {
-	export ac_cv_header_sys_acl_h=$(usex acl)
-
-	use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING"
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 6ffe7121f90d..ece5c6758ade 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,9 +1,7 @@
 AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b
-DIST help2man-1.46.6.tar.xz 171044 BLAKE2B 41e5edddac3d7e9683b92aef2c5b1fc57c3a3684e13e17a58707bb2f332b4290841a80bd47913f9466e9d2cb02fcacaa515b4f4bb7053993988d599baff6256d SHA512 55bea01b80baf318e4350ee505bf67da9a7e76b7a5cbd861d0fd6e3afe47b82d1de8f1079d0df2f4ea8ec176d6ca95d5c847d8b1c118cf96ab59b06567c1204c
 DIST help2man-1.47.4.tar.xz 189456 BLAKE2B 58bccbaa5f126b369683b6e051446242750e07274cbfbd6a4aeec2e8a9b57f2d845a2ddede36cc49eb2ed141690830b90f9a86ddd7c913586ea0f573e8cc3cf8 SHA512 3320890c4068086bff7a858653fb67ac80363f26772fb0bb702233052e2bcbe647e7b20b1a2246b1a0e026ba2aa8679e6baafe302d78c747da04e29c59b9bafd
 DIST help2man-1.47.5.tar.xz 186044 BLAKE2B 288eeaab3781293209f4a6aeab570317e5ed9e2e76acf9a1669c767b627e3896936fba775e32f6016b7881b5747a51b5020c0ab4fc77030d1e27c15acab032f1 SHA512 c94f94bbdfb9e288edff2b3181e0f2e858d309aa4fe77cae141571a06b9b5bc2a5c5a4d25ffc1f9108222d56c9040989d63770f5d804323a52d3978059d1eca7
 DIST help2man-1.47.6.tar.xz 192980 BLAKE2B ddf2b899e4479a45505aefaf3dabfceb1595128da35c000b81be79046aabceff58e1d605b2797880c5c652947d0fe59673eaf087de911152e79768c571037a73 SHA512 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942
-EBUILD help2man-1.46.6.ebuild 949 BLAKE2B c1bc74c78bfb78764a17b747e1f16a0d2abb8f78a1e35737f829212f127b0739f97f14dbdfc1dbe465034dd0f603868e35cd02b2fceb15c699946cc93fcbe5b4 SHA512 578767b49b696227dabe944055ceb1afc410382230de113a6a6b898f23a33fab50dc433b670329bd550b61ffd12955e44ea1a8729077d521bac43156f3cc31c9
 EBUILD help2man-1.47.4.ebuild 1083 BLAKE2B 7523e2059116c743bdee30f6fc6a5698f6d899e0c35215b0029195658084ffffc92db6afd02c4b5b3275c1d8d26a899c0afeac5bd8abc16bf1810ba3ed45130b SHA512 964a18c1fae41a4c6f45cca17f8109b0497c5334cb06dc88d5aabccf7337d66c8a53142473cac9b5efbc8d9bb5a9518b665b01f663e96fa7d6a3599ff16f7a65
 EBUILD help2man-1.47.5.ebuild 1065 BLAKE2B e8a2b3deb5706a5dbdf42bf9ca43c432d51aa65f9607f1f29f6b846da8927a27e826c65d558bca593a26434cd89bd6be4f90387288cb354600bac8ab3ecdc915 SHA512 f4d4cb55e2019a4295d5f100466b5e47b3fe228beb78872b2dcf6e85e77ee61ecc1bd5e674daaac233d10a574ba8718f0d21520626e5983be852c16a29e64f74
 EBUILD help2man-1.47.6.ebuild 1065 BLAKE2B e8a2b3deb5706a5dbdf42bf9ca43c432d51aa65f9607f1f29f6b846da8927a27e826c65d558bca593a26434cd89bd6be4f90387288cb354600bac8ab3ecdc915 SHA512 f4d4cb55e2019a4295d5f100466b5e47b3fe228beb78872b2dcf6e85e77ee61ecc1bd5e674daaac233d10a574ba8718f0d21520626e5983be852c16a29e64f74
diff --git a/sys-apps/help2man/help2man-1.46.6.ebuild b/sys-apps/help2man/help2man-1.46.6.ebuild
deleted file mode 100644
index 3dd0890fd359..000000000000
--- a/sys-apps/help2man/help2man-1.46.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="GNU utility to convert program --help output to a man page"
-HOMEPAGE="https://www.gnu.org/software/help2man/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls"
-
-RDEPEND="dev-lang/perl
-	nls? ( dev-perl/Locale-gettext )"
-DEPEND=${RDEPEND}
-
-DOCS="debian/changelog NEWS README THANKS" #385753
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.46.1-linguas.patch
-}
-
-src_configure() {
-	# Disable gettext requirement as the release includes the gmo files #555018
-	econf \
-		ac_cv_path_MSGFMT=$(type -P false) \
-		$(use_enable nls)
-}
diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest
index 245d4ef2bc3d..6022d9d539f2 100644
--- a/sys-apps/hwinfo/Manifest
+++ b/sys-apps/hwinfo/Manifest
@@ -1,9 +1,5 @@
-DIST hwinfo-19.1-1.2.src.rpm 740650 BLAKE2B 01a4f1e7dba1f4ae56792151d817b8a5dea0c972751eb41673a04434f8248670b3c89f78c2f6c14b919ddcde9ce5dbbd4d45f5dfb57fbc97bdaf65426fda30de SHA512 1e617cac0e2d1872f26ad15b0a4b34474d5e0cc4a9fa715de04b54b829d73b0f54fea99765bf795d759e01e3a84c868149e4e035bef59dcfcc628faa365fee31
-DIST hwinfo-20.0-1.4.src.rpm 741036 BLAKE2B 981e5a2bc87dcfad4f1374e42ac5ade203434992c7299506ceda19cbff8576a6e20eee54880a90278427b2db9aa79f921b281babbdbc8d0fccd857ef302697eb SHA512 e44dcc0c826630d75b2604f99f6b0ae6c203a52266c2c7e220989424d7a4c99dc34f6157d6e4d385404c0eade3f943f77ddbf007d83b76f132eada6b4bf68cb3
 DIST hwinfo-21.23-1.2.src.rpm 844672 BLAKE2B 33cfd68c06081d76b33243474b9a72cc5994c749ff57b7fc4f36c88627707068fb86d4825bae66e4e08f730dc8849264f5f31f8717f28400b3d54302ac12b1eb SHA512 d25c955fa5620268a34a857916e0bdbbdb92f8e092735ac453e7bacc6476e00047c9ccef3a5275e5d50cc354bf9e3cffef57af519dc885d0afd3d161ab426629
 DIST hwinfo-21.4-1.1.src.rpm 781525 BLAKE2B 83c6d0b3d15a7b4354223eef8b976643ec6520842007ce6fb06534360a8994d4aac0975eba059275910f59391e7069b0166b69301006ea78ca4b74c6aefbde7c SHA512 bccac7749751924e1e1a8005e6fd783da7114926b6d9b9a1247b3b26dd680848eb2b85b368c312d08b444c8d7b75036d249daf33afc5b7efbbcc09bfbad4b340
-EBUILD hwinfo-19.1.ebuild 1433 BLAKE2B 63a8675b950f8522217bbb9332889dbf1919c6521f1e640f1561ef9e55b5e8e86c3441cee4b2c284571762d77d268caccdb3a2c8af0bf73c3674d6ed6e24d3e0 SHA512 712b20167ab5f631ab23dcc8f2202bdb16769e60f5410bcd8359a0377d5c371f756a57e4f996ee3d4fd970488e9a3e4150d2e54fd5ac462a8e082fed96614347
-EBUILD hwinfo-20.0.ebuild 1568 BLAKE2B 26ce1a0f7b14e336fb0a765b73019c616e813934ffceab8c63b327a299b9f0ef8b9652800f0b2fad11fc135b4771768937d96c3bd603ed345a6d6d4651d82a23 SHA512 78a5265c4bf4bdb3d82f80575287aae7beb33aaeeb20b25f09c89186e008755324da88d84e8a7fa1e99a6391604bfe8f5599ef7d4efd9f0871371dd1c20e0d1e
 EBUILD hwinfo-21.23.ebuild 1289 BLAKE2B 192bea366a2727756ace6060fe9d5850d73d031f0b392811e2e51535d23ea04a6f7cc634317afcd985b596cc374355c1919fc73a31ab7305a9621dd97bb574a1 SHA512 41b2702c7e1e0e3320b9abba0352bfb7a3927b92ffa4a57ec8fddac605b48eac06806010228b4d0bd9f1274bec4bb7d65ee62282127be95bf36b84715676494d
 EBUILD hwinfo-21.4.ebuild 1570 BLAKE2B 9927f7206038e657ecbba400ab7d0d22afab0432636abd5e0d2df53409e16de10f5002b54c0d6e95080fadc0281352a8790556bd056637a5d96fb8ab256696d9 SHA512 95c9e5a28a3e27b201ae1d7f801361dffe11c8c551d45acff7b9f7ced601fbec3572ec4f639d85ed448e84ac7fd097384a4379b48542246dfd5c446ecf2f9a3d
 MISC metadata.xml 256 BLAKE2B 7380eb4443aa7d04fc02d228edb72f675580a9f36244c083c4bbdcbc492a4c5169fb3121158d4a613f25f7c0464042bba7951fb92cf9f11c5208a2d9699e195e SHA512 574345bb2730bbc2d0190a03b16703d10441ccd589623c5e8bdddf84d7ce86226da7e079d7b2135e4c724d0813973c551143cdd0f525a58efdd37716dd83edfd
diff --git a/sys-apps/hwinfo/hwinfo-19.1.ebuild b/sys-apps/hwinfo/hwinfo-19.1.ebuild
deleted file mode 100644
index d291224361d6..000000000000
--- a/sys-apps/hwinfo/hwinfo-19.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit multilib rpm toolchain-funcs
-
-DESCRIPTION="hardware detection tool used in SuSE Linux"
-HOMEPAGE="http://www.opensuse.org/"
-SRC_URI="http://download.opensuse.org/source/factory/repo/oss/suse/src/${P}-1.2.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="amd64? ( dev-libs/libx86emu )
-	x86? ( dev-libs/libx86emu )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6.17"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_prepare() {
-	# Respect AR variable.
-	sed -i \
-		-e 's:ar r:$(AR) r:' \
-		src/{,isdn,ids,smp,hd}/Makefile || die
-
-	# Avoid -I directories for dbus because HAL is obsolete.
-	sed -i -e '/CFLAGS/d' src/hd/Makefile || die
-	# Respect LDFLAGS.
-	sed -i -e 's:$(CC) -shared:& $(LDFLAGS):' src/Makefile || die
-	sed -i -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' src/ids/Makefile || die
-
-	# Respect MAKE variable. Skip forced -pipe and -g. Respect LDFLAGS.
-	sed -i \
-		-e 's:make:$(MAKE):' \
-		-e 's:-pipe -g::' \
-		-e 's:LDFLAGS.*=:LDFLAGS +=:' \
-		Makefile{,.common} || die
-}
-
-src_compile() {
-	tc-export AR
-	emake CC="$(tc-getCC)" RPM_OPT_FLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
-
-	dodoc changelog README
-	doman doc/hwinfo.8
-	insinto /usr/share/doc/${PF}/examples
-	doins doc/example*.c
-}
diff --git a/sys-apps/hwinfo/hwinfo-20.0.ebuild b/sys-apps/hwinfo/hwinfo-20.0.ebuild
deleted file mode 100644
index f67dfea6e88e..000000000000
--- a/sys-apps/hwinfo/hwinfo-20.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit multilib rpm toolchain-funcs
-
-DESCRIPTION="hardware detection tool used in SuSE Linux"
-HOMEPAGE="http://www.opensuse.org/"
-SRC_URI="http://download.opensuse.org/source/factory/repo/oss/suse/src/${P}-1.4.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="amd64? ( dev-libs/libx86emu )
-	x86? ( dev-libs/libx86emu )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6.17"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_prepare() {
-	# Respect AR variable.
-	sed -i \
-		-e 's:ar r:$(AR) r:' \
-		src/{,isdn,ids,smp,hd}/Makefile || die
-
-	# Avoid -I directories for dbus because HAL is obsolete.
-	sed -i -e '/CFLAGS/d' src/hd/Makefile || die
-	# Respect LDFLAGS.
-	sed -i -e 's:$(CC) -shared:& $(LDFLAGS):' src/Makefile || die
-	sed -i -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' src/ids/Makefile || die
-
-	# Use linux/pci.h directly. #506876
-	sed -i \
-		-e '/#include.*sys\/pci.h/s:sys/pci.h:linux/pci.h:' \
-		src/hd/*.c || die
-
-	# Respect MAKE variable. Skip forced -pipe and -g. Respect LDFLAGS.
-	sed -i \
-		-e 's:make:$(MAKE):' \
-		-e 's:-pipe -g::' \
-		-e 's:LDFLAGS.*=:LDFLAGS +=:' \
-		Makefile{,.common} || die
-}
-
-src_compile() {
-	tc-export AR
-	emake CC="$(tc-getCC)" RPM_OPT_FLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
-
-	dodoc changelog README
-	doman doc/hwinfo.8
-	insinto /usr/share/doc/${PF}/examples
-	doins doc/example*.c
-}
diff --git a/sys-apps/ifplugd/Manifest b/sys-apps/ifplugd/Manifest
index 66cbfdac8487..3a7096578c09 100644
--- a/sys-apps/ifplugd/Manifest
+++ b/sys-apps/ifplugd/Manifest
@@ -6,5 +6,4 @@ AUX ifplugd-0.28-strictalias.patch 1585 BLAKE2B 78d096d5ce1edb60e8f2599d2cc24434
 AUX ifplugd.action 891 BLAKE2B 47f664abda4ba6453178f81adfe4dcc9516e75a88bce02bdc03d6ac509457adb342fad71afe7f71a8c1ea5ca4b623d53248571d6ae5094bc05188611082b28dc SHA512 749f503a8e7acc3114af0b795d23e03108040b8df12bae475aa96127d0b135c30382cec6abd0a03147d1f69b545a2c5d2bd8a18c9a9ebe0613e8888ae305f949
 DIST ifplugd-0.28.tar.gz 142677 BLAKE2B 78a9d69d30c6f46f2ee2dc96298c6409f274d9b8e5d1e754051ead48c87ea88c4f68329ba1101d825f601c1ecc2ba0ce69753dea75cf006b9c26d33af38ffa04 SHA512 c606e456f81f224eba9f8912e11fb76b759c160313d1db3c9035775b8c1ca57ca10c88dfb33318ba02f5c025218a377ca78ee160fc3d9a31ac6e95b92f340d4f
 EBUILD ifplugd-0.28-r10.ebuild 1198 BLAKE2B 9a5e3b287aa3ede56db97deaec69f744e71b1c777d9d96fd7fceb95dede41fe08e81933f15bdf72e25eb369d50c927b76674e34524d460783209167801accdf2 SHA512 8c3230a32ddd9914fe3ac95c3be8f8f204ab2c5017024649ce7ce19ec79e9195904dd5b3bf1891f423ec600232816a193de97bf155f9df90863fc1ae950ab4e1
-EBUILD ifplugd-0.28-r9.ebuild 1824 BLAKE2B 0ab4c13a8c9e517d694a58b9135df20dcb02e5b8f97a2e82e9fdc5bdfd8dfec71891a94ee920fc4e948e8fc9adde98c7fb2640cfa866a89d606f66ec71861449 SHA512 9a66b4e3eaa56709806faedc895fb2b765c7762c54458c02188d616011ac396557bdad91b55275d6bde567d95f1ff429266737ade9b2ba1ed8acfb7d5f0e7144
 MISC metadata.xml 366 BLAKE2B 0479c465ea03321b635b24e72ca5e6298418a13dfd09ece7550e9baeb3699a80f219596e046d0711d5cecbe482dba3b848f15e2872ee1cf9a9e6ceb181e85d0b SHA512 2c4b526e804b08e6e971e0413b60c0b0684104d2cd2ac810495a6c6b9ec6a2d8ad846beb929b45639f77a707b08edaabb525af8b9ebfab411ad02214ac4bd60f
diff --git a/sys-apps/ifplugd/ifplugd-0.28-r9.ebuild b/sys-apps/ifplugd/ifplugd-0.28-r9.ebuild
deleted file mode 100644
index a3a9bd0112fc..000000000000
--- a/sys-apps/ifplugd/ifplugd-0.28-r9.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
-HOMEPAGE="http://0pointer.de/lennart/projects/ifplugd/"
-SRC_URI="http://0pointer.de/lennart/projects/ifplugd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm amd64 hppa ppc x86"
-IUSE="doc selinux"
-
-DEPEND="virtual/pkgconfig
-	doc? ( www-client/lynx )
-	>=dev-libs/libdaemon-0.5"
-RDEPEND=">=dev-libs/libdaemon-0.5
-	>=sys-apps/baselayout-1.12
-	selinux? ( sec-policy/selinux-ifplugd )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-nlapi.diff"
-	epatch "${FILESDIR}/${P}-interface.patch"
-	epatch "${FILESDIR}/${P}-strictalias.patch"
-	epatch "${FILESDIR}/${P}-noip.patch"
-}
-
-src_configure() {
-	econf \
-		$(use_enable doc lynx) \
-		--with-initdir=/etc/init.d \
-		--disable-xmltoman \
-		--disable-subversion
-}
-
-src_install() {
-	default
-
-	# Remove init.d configuration as we no longer use it
-	rm -rf "${D}/etc/ifplugd" "${D}/etc/init.d/${PN}"
-
-	exeinto "/etc/${PN}"
-	newexe "${FILESDIR}/${PN}.action" "${PN}.action"
-
-	cd "${S}/doc"
-	dodoc README SUPPORTED_DRIVERS
-	use doc && dohtml *.html *.css
-}
-
-pkg_postinst() {
-	# Warn about old init script
-	einfo "baselayout now starts ifplugd automatically on wired interfaces"
-	einfo "If you do not want this behaviour then add !plug to your modules"
-	einfo "in /etc/conf.d/net like so"
-	einfo "   modules=( \"!plug\" )"
-
-	if [ -e "${ROOT}/etc/init.d/ifplugd" -o -e "${ROOT}/etc/conf.d/ifplugd" ] ; then
-		echo
-		ewarn "You should stop the ifplugd service now and remove its init"
-		ewarn "script and config file"
-		if [ "${ROOT}" = "/" ] ; then
-			ewarn "   /etc/init.d/ifplugd stop"
-			ewarn "   rc-update del ifplugd"
-			ewarn "   rm -f /etc/{conf,init}.d/ifplugd"
-		fi
-	fi
-}
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index a1dce3e7039f..ebb6352241be 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,10 +1,7 @@
-AUX lshw-02.16b-gentoo.patch 4972 BLAKE2B f9b383850aefc180c7e9e5e818921fc6bfc57c6fa49f7b78d5dc66c03855a0e7e0fa1846e1722927090845fe11aa5d8bb97268ad9ddca9afda9b0288222ad3d7 SHA512 723a67b91972d3192a422fbead27fc6c3c7020bc0d0afb0d88792659e345f3379be423517f649eda7555d20bc26583ce8298ba101eba63ba6669e7bf213c8aef
 AUX lshw-02.18b-gentoo.patch 4819 BLAKE2B 54e08c0373308bccc39c9217da4152fcb853a108fc6f29c6cb62d2a3a64d4de5412be7a460ba217f0ba625aec5cc4efb7ff9c0750cd14073f3b0783a883c1dd1 SHA512 c9492cf301ba06f225d8afab62ab889572f9acede7b63cfc0ae665275b1056981dd85b02d4d49fc6294194a71fc405ded6bf27b3f461e550b0e5a3dc6fb939d7
 AUX lshw-02.18b-gettext-array.patch 924 BLAKE2B 0ebb872cff09b1578026bb9026ca895fe70cbf93ed6d648478f6ef6332af8f56a58b687425f70ac95a40b57b84de9045e916c6ac4a3e35de2199a26acd6ae762 SHA512 60f09dcfbb6813fdeb06e7ca3161c768e4b138a65a2a1c27a19d241ddabbc8e511e31922a998c15e944056bf79eafd907073e419e0887c09180b87de24f4d5ee
 AUX lshw-02.18b-sgx.patch 842 BLAKE2B b1c9b676f8875ef312bcc55e6cf07be21500d50185e25075e61811a8342d4c1e165a75916cb3cf1a2a58ca5a062079dbadf314437c543a0792867d7828d92453 SHA512 face0b384e84379297b18b0efd106f59604a76ff526f3995038d8e261409f5117f456332f357c7c559a24980750779ae40757920b25bdf6b38588620966bc5a9
-DIST lshw-B.02.16.tar.gz 1845891 BLAKE2B 57d22af384b9f6f1878439f48ebd31163738744842a7682877126d6f914c1496442d79dc818e774f76ee04c4a284407c5ce53ba72af71571731bb4940f8a2338 SHA512 ad3bd3d7b6f36f912265f0853f5aa37158c6d420a90a5e84b3e8fcd8a3c6137f7505cb5361e3eceb49954332d2466c686c946dcda8db0da3d51b3c48e343c2ab
 DIST lshw-B.02.18.tar.gz 2322176 BLAKE2B 66183895fcdd5b47bfaa044c10f7b561b3310829b53828444a20f078ce63e166a878595c8a8a79e22f1e4ab726e98165a1b31225997785d2bfc3ad5d7b0c5214 SHA512 4385db86101178b8bd33a80e991718e14f83277c66b3d63ae97cb4339196873b6e9b31a174024bf43d16fe66e1d7f8cf5cea56076697878087880c8821b11e47
-EBUILD lshw-02.16b-r2.ebuild 1578 BLAKE2B 95db87dfc3c9acd39aa1e093af275f9c733760ca3a9b5f375d687b04d7d2a482ed84c00df64c348ec71d054d9513dc528bae8fac1021560725f42257053aaaac SHA512 04bdbaab93a5afea433f2bda35b1254c3bbf3b6ce9f918acfdb2d7bf33f0f0d08df5473a7506efe10e04be8036d18e8d9e4ae0f7a37955d906893af546dc99a7
 EBUILD lshw-02.18b-r1.ebuild 1779 BLAKE2B 5fc65b823fddbd74a588f0de3ae4946530e35c221c3d1368a315c2d3d5181c80f34eb5e6032b8b5b4a8e360131487620c1a73d303a4e5d22446fa616a1e8a4c0 SHA512 c82b9b9548ebaf9dce134cc80f290e1199344ec70d9f94a7b742971a320a9419c66e06e4500865d108f73733b50e726cebfe4ed7fb31573deaa12300b457d047
 EBUILD lshw-02.18b.ebuild 1732 BLAKE2B d131f58bfd6f47fe79d4e9a65f2af1d5151522b1a804051179be674fa4b1521aaeeed7c85780df99cd0cb8fcee349f79610aadaf7c16fc9488fc06cb3fa91dee SHA512 2bb39c60194d9648309c2990ab0b354ad758abe3a46e25e21b1aec5444f87b4652a47fa63f71c9242cf9b8bbc05e997e552259b309b48f95f2094914da84629f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/lshw/files/lshw-02.16b-gentoo.patch b/sys-apps/lshw/files/lshw-02.16b-gentoo.patch
deleted file mode 100644
index dfd2c8983704..000000000000
--- a/sys-apps/lshw/files/lshw-02.16b-gentoo.patch
+++ /dev/null
@@ -1,161 +0,0 @@
---- lshw-B.02.16.orig/src/core/Makefile
-+++ lshw-B.02.16/src/core/Makefile
-@@ -1,10 +1,9 @@
- PACKAGENAME?=lshw
- 
--CXX=c++
-+CXX?=c++
- INCLUDES=
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
--CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
--LDFLAGS=
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- LDSTATIC=
- LIBS=
- 
---- lshw-B.02.16.orig/src/gui/Makefile
-+++ lshw-B.02.16/src/gui/Makefile
-@@ -1,5 +1,7 @@
- PACKAGENAME?=lshw
- 
-+SQLITE?=0
-+
- CXX?=c++
- CC?=cc
- STRIP?=strip
-@@ -8,13 +10,14 @@ OBJCOPY?=objcopy
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
- GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags)
- INCLUDES=-I../core $(GTKINCLUDES)
--CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- CFLAGS=$(CXXFLAGS) $(DEFINES)
- GTKLIBS=$(shell pkg-config gtk+-2.0 gmodule-2.0 --libs)
--LIBS=-L../core -llshw -lresolv -lsqlite3 $(GTKLIBS)
--LDFLAGS=
--ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
--	LDFLAGS+= -Wl,--as-needed
-+LIBS=-L../core -llshw -lresolv $(GTKLIBS)
-+
-+ifeq ($(SQLITE), 1)
-+	CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
-+	LIBS+= $(shell pkg-config --libs sqlite3)
- endif
- 
- OBJS = gtk-lshw.o callbacks.o engine.o print-gui.o stock.o
-@@ -39,8 +42,7 @@ gtk-$(PACKAGENAME): $(OBJS) ../core/libl
- 	$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- install: all
--	$(STRIP) gtk-$(PACKAGENAME)
--	
-+
- clean:
- 	rm -f $(OBJS) gtk-$(PACKAGENAME) gtk-lshw.glade.bak gtk-lshw.gladep.bak callbacks.c.bak callbacks.h.bak Makefile.bak
- 
---- lshw-B.02.16.orig/src/Makefile
-+++ lshw-B.02.16/src/Makefile
-@@ -21,11 +21,11 @@ export SQLITE
- CXX?=c++
- INCLUDES=-I./core/
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
--CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- ifeq ($(SQLITE), 1)
- 	CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
- endif
--LDFLAGS=-L./core/ -g
-+LDFLAGS += -L./core/
- ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
- 	LDFLAGS+= -Wl,--as-needed
- endif
-@@ -39,27 +39,25 @@ export CXXFLAGS
- export LIBS
- export LDFLAGS
- 
--DATAFILES = pci.ids usb.ids oui.txt manuf.txt
--
--all: $(PACKAGENAME) $(PACKAGENAME).1 $(DATAFILES)
-+all: $(PACKAGENAME) $(PACKAGENAME).1
- 
- .cc.o:
- 	$(CXX) $(CXXFLAGS) -c $< -o $@
- 
- .PHONY: core
- core:
--	+make -C core all
-+	$(MAKE) -C core all
- 
- $(PACKAGENAME): core $(PACKAGENAME).o
- 	$(CXX) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
- 
- .PHONY: po
- po:
--	+make -C po all
-+	$(MAKE) -C po all
- 
- .PHONY: gui
- gui: core
--	+make -C gui all
-+	$(MAKE) -C gui all
- 
- .PHONY: nologo
- nologo:
-@@ -70,7 +68,6 @@ static: $(PACKAGENAME)-static
- 
- $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
- 	$(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
--	$(STRIP) $@
- 
- .PHONY: compressed
- compressed: $(PACKAGENAME)-compressed
-@@ -93,14 +90,13 @@ oui.txt:
- manuf.txt:
- 	wget -O $@ http://anonsvn.wireshark.org/wireshark/trunk/manuf
- 
--install: all
-+install:
- 	$(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
- 	$(INSTALL) -m 0755 $(PACKAGENAME) $(DESTDIR)/$(SBINDIR)
- 	$(INSTALL) -d -m 0755 $(DESTDIR)/$(MANDIR)/man1
- 	$(INSTALL) -m 0644 $(PACKAGENAME).1 $(DESTDIR)/$(MANDIR)/man1
- 	$(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
--	$(INSTALL) -m 0644 $(DATAFILES) $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
--	make -C po install
-+	$(MAKE) -C po install
- 
- install-gui: gui
- 	$(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
-@@ -112,8 +108,8 @@ install-gui: gui
- 	
- clean:
- 	rm -f $(PACKAGENAME).o $(PACKAGENAME) $(PACKAGENAME)-static $(PACKAGENAME)-compressed
--	make -C core clean
--	make -C gui clean
-+	$(MAKE) -C core clean
-+	$(MAKE) -C gui clean
- 
- .timestamp:
- 	date --utc +%Y%m%d%H%M%S > $@
---- lshw-B.02.16.orig/src/core/pci.cc
-+++ lshw-B.02.16/src/core/pci.cc
-@@ -17,7 +17,7 @@ __ID("@(#) $Id
- 
- #define PROC_BUS_PCI "/proc/bus/pci"
- #define SYS_BUS_PCI "/sys/bus/pci"
--#define PCIID_PATH DATADIR"/pci.ids:/usr/share/lshw/pci.ids:/usr/local/share/pci.ids:/usr/share/pci.ids:/etc/pci.ids:/usr/share/hwdata/pci.ids:/usr/share/misc/pci.ids"
-+#define PCIID_PATH "/usr/share/misc/pci.ids"
- 
- #define PCI_CLASS_REVISION      0x08              /* High 24 bits are class, low 8 revision */
- #define PCI_VENDOR_ID           0x00    /* 16 bits */
---- lshw-B.02.16.orig/src/core/usb.cc
-+++ lshw-B.02.16/src/core/usb.cc
-@@ -27,7 +27,7 @@
- 
- #define PROCBUSUSBDEVICES "/proc/bus/usb/devices"
- #define SYSBUSUSBDEVICES "/sys/bus/usb/devices"
--#define USBID_PATH DATADIR"/usb.ids:/usr/share/lshw/usb.ids:/usr/local/share/usb.ids:/usr/share/usb.ids:/etc/usb.ids:/usr/share/hwdata/usb.ids:/usr/share/misc/usb.ids"
-+#define USBID_PATH "/usr/share/misc/usb.ids"
- 
- #define USB_CLASS_PER_INTERFACE         0         /* for DeviceClass */
- #define USB_CLASS_AUDIO                 1
diff --git a/sys-apps/lshw/lshw-02.16b-r2.ebuild b/sys-apps/lshw/lshw-02.16b-r2.ebuild
deleted file mode 100644
index 36348d30564e..000000000000
--- a/sys-apps/lshw/lshw-02.16b-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit flag-o-matic eutils toolchain-funcs
-
-MAJ_PV=${PV:0:${#PV}-1}
-MIN_PVE=${PV:0-1}
-MIN_PV=${MIN_PVE/b/B}
-
-MY_P="$PN-$MIN_PV.$MAJ_PV"
-DESCRIPTION="Hardware Lister"
-HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter"
-SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="gtk sqlite static"
-
-REQUIRED_USE="static? ( !gtk )"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-	gtk? ( virtual/pkgconfig )
-	sqlite? ( virtual/pkgconfig )"
-RDEPEND="${RDEPEND}
-	sys-apps/hwids"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	# correct gettext behavior
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		local langs
-
-		for i in $(cd po ; echo *.po | sed 's/\.po//') ; do
-			if has ${i} ${LINGUAS} ; then
-				langs+=" ${i}"
-			fi
-		done
-		sed -i \
-			-e "/^LANGUAGES =/ s/=.*/= $langs/" \
-			src/po/Makefile || die
-	fi
-}
-
-src_compile() {
-	tc-export CC CXX AR
-	use static && append-ldflags -static
-
-	local sqlite=$(usex sqlite 1 0)
-
-	emake SQLITE=$sqlite all
-	if use gtk ; then
-		emake SQLITE=$sqlite gui
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	dodoc README docs/*
-	if use gtk ; then
-		emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-gui
-		make_desktop_entry /usr/sbin/gtk-lshw "Hardware Lister" "/usr/share/lshw/artwork/logo.svg"
-	fi
-}
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 748f92069168..7776cdc79d73 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -8,5 +8,5 @@ EBUILD policycoreutils-2.7.ebuild 4966 BLAKE2B 1e252c86aa33e9ac68c14d859ced7e277
 EBUILD policycoreutils-2.8_rc1.ebuild 4897 BLAKE2B 4c0c156f179ff00bb15b50512ba2085c69385bc4cdd3c33779ea66405198d315662f7dfdc359bdb68e12faced56743ea60bc2c6e1f3c0299d0591ce4f8b46c30 SHA512 a700c9ab01edd4219ca70ed571dcfdc63be9c7f4248be53a58f3680baba690a3a71d017e11861c87e32b055656e8d65d3206fc692cbe2ad4c51b7039342688f6
 EBUILD policycoreutils-2.8_rc2.ebuild 4897 BLAKE2B ebb8a9a8cb960ee4b7ef5a96ebbbfeeb804870e853bc448ce59724c029280ff67ce48f17c55605a8e529a7003afa88fc0c01890e03e7ccfe5c1ef97a5d26ddc7 SHA512 6b65d82b5e59e19137450b589f02351206104266f5a79ae28a7b3da1810e8b6048fafeec27aeb84784f74e6dc5890b9fcd3912fa200f58a75fd8dadf526e72c7
 EBUILD policycoreutils-2.8_rc3.ebuild 4897 BLAKE2B 3dccfa5e1f27a1642a8705a62415309a48e4e119b0aa39722250ce8c069dc00214934ab5a03ffefe19b8e724dd46b3f4d3706c983f428beb65fd5aec1d5604dd SHA512 4a0337b168a541bf400473ecc400a83f24883c16b4a007eae53094859b9c00272cce5d5d79bc9d5a86547f8bafe5659be8beea27799e7f0b9c877580afee4b0b
-EBUILD policycoreutils-9999.ebuild 4897 BLAKE2B 3dccfa5e1f27a1642a8705a62415309a48e4e119b0aa39722250ce8c069dc00214934ab5a03ffefe19b8e724dd46b3f4d3706c983f428beb65fd5aec1d5604dd SHA512 4a0337b168a541bf400473ecc400a83f24883c16b4a007eae53094859b9c00272cce5d5d79bc9d5a86547f8bafe5659be8beea27799e7f0b9c877580afee4b0b
+EBUILD policycoreutils-9999.ebuild 4875 BLAKE2B 0630a4672625933b6abda266748ab0db457e3e6f15d9eb0c6a31e410f73dfb79e8c0430e2181461af2edd10708bfa55117c688c66c9296c18dbd20709b51c520 SHA512 1f5c419f949b4c634a4645006d2003fce342c4dccbb01f2c7d077d05b68d5361a3877cbb748fd318550ea687501cb33be274c472318d8d5c6bd2a07bc65f0e12
 MISC metadata.xml 1117 BLAKE2B 0ec558cea900ec5f25cef43a76a5c0436562ca9d43cfa23d9251ac4e8eb22f0154ca577f061f50762559be9b567faf5dd7ed994c59308ba140f2fe2b8a5d1ad0 SHA512 1f8703b31ced13b4e15311ecc9d4e03c085eb580e61394e8781744a9c33794e0f10144617415e69b703f5716ca5fd15ad6db14fe93a95c9b5d46c429542beac5
diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
index 869c231e4972..61c30a89194c 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
@@ -41,7 +41,6 @@ LICENSE="GPL-2"
 SLOT="0"
 
 DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
-	>=sys-libs/glibc-2.4
 	>=sys-libs/libcap-1.10-r10:=
 	>=sys-libs/libsemanage-${SEMNG_VER}:=[python,${PYTHON_USEDEP}]
 	sys-libs/libcap-ng:=
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 8308c4e88541..41b272e8a1ca 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -6,6 +6,6 @@ AUX shadow-4.5-CVE-2018-7169.patch 5778 BLAKE2B 59e06cda2d3b48d77548c22073f9c4ce
 DIST shadow-4.5.tar.gz 3804933 BLAKE2B c4714b7fe9a1af5a5751d4274e70e7fb31994cc40058b44c401bbbdf83c238fcf48e6e6e663d8a61f614b6291ea524862d9d2425d7d839340a10f8fb7c8eaa85 SHA512 02d6482a1159689e404dd49a68b4e2db85e9ffdcdfbacc8efcbd9043f14a1ec3fc4d749700df915d375df67d589219b6b0f57a6cfd9fb5b197012888a608913b
 DIST shadow-4.6.tar.gz 3804282 BLAKE2B 268c90e7daba138827aec6039f428f52cdcf7929743fa1f49f801cc669de7456ec5a69531194cdb29f051ce7d0b2f1e966fdf2513a9fc8f7fbdeb29d786a509f SHA512 36358333e7f03ef558772f3361bc5851a7d7fd3d85c993a6b732e37304b8068b2893d55607b9bfe8b8eed616a687264f947ff66cefc74ea1a48ba9396d464714
 EBUILD shadow-4.5-r1.ebuild 5405 BLAKE2B 7518b3700adf543a619413066415f64959a50efbbe669b28622e8d2d4cd749705b256c62e3ba73a88e6f3c0d6c195c87c377e7541e165ccbf4328ec5f4b1b0df SHA512 a50352c9b189d5265e921e977acff5c96dedef2634b046f66b376e6d6e2fdab40b629e453695a3153dd1edb13740e94d6d205daed544b3bba885fd35dbb7251e
-EBUILD shadow-4.5.ebuild 5324 BLAKE2B 7e31b15f14edc3434fa1acca45a5c4955f78e5794d342d09834a0f9dbccb16c1d71e83952fa971a71f03844f6868fa81b16da7b473383156f10cebb2432b0ea8 SHA512 baa289b709d84f9b056d2415ed147d0bf80bed3e3645ab7738617693d7b8ada235410cf95c1d944044125bbab79f9feb101bcb1cd2d74eb33fc709346711107d
-EBUILD shadow-4.6.ebuild 5354 BLAKE2B eb7ac514ef34198192ccb8f9a2a173d1e26859fe1c329fbe396cfae6cd9944d0956efa03ab1997d9dbdac11e3e7671c302832fe32ed0f9b3e1cf015dfa80dfd7 SHA512 a7d03338be86a296886340a33f90342c5c1f996947ae05ef7c3bfee9cdf5c5e4951b3918c0a44b4b555bc809b10b5f26b2829df081e8b1e274e21d96a0dae4bf
+EBUILD shadow-4.5.ebuild 5321 BLAKE2B fa760284cc0e44d1adb2735b90bdf8e191af67bfb51501551b0626a9646bbf3f3df2f34555c848d6ca6fb377d363621b8b8a2e52370313e0026fc94674257ca6 SHA512 33f57cbb2f8aef136deea2f4ded91a68a1358edec538ca2e4ddcb4d9ef55d477ca1c8e6424054e5e7cca21502dc4888a73af9661916a9eb3f2d328ff2ce49c60
+EBUILD shadow-4.6.ebuild 5351 BLAKE2B 231e53bb1d28b4b6afb1e440f0b481353669a2b5b34e9f659df985d671edcc8e9f5423b8613302fc4925807c72b14630ecee28d238ba84214860f5a735b0666d SHA512 489c9c84d1c75d07be162698387195be245ac1b4d37343b0a61efe173113eb190fd89757ee5f3cab42f5179388b4fee67932797450b1dafc0c45c32d1620eaf9
 MISC metadata.xml 565 BLAKE2B bdd91116c16f590eabb6f18f05a4f72b55651383431c78fb07c27b23e7152b25816895e2ae3e2afd1ecd6e2b9fa9dd0005d198f2ab7ee2061583b586e4c44b01 SHA512 be29faf2eb981bdb0d643ca691d48b10ee702c3a32ca7fca1d00365aa1c4beb5b1b4bec8104be4352fed32f3fabc3108061b8eb8f0054e612c268b5c6f4b1469
diff --git a/sys-apps/shadow/shadow-4.5.ebuild b/sys-apps/shadow/shadow-4.5.ebuild
index bac5e9be3bd9..0b67db2fe8aa 100644
--- a/sys-apps/shadow/shadow-4.5.ebuild
+++ b/sys-apps/shadow/shadow-4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-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"
 IUSE="acl audit +cracklib nls pam selinux skey xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
diff --git a/sys-apps/shadow/shadow-4.6.ebuild b/sys-apps/shadow/shadow-4.6.ebuild
index 2332de5703a5..fd1e15e8a1ff 100644
--- a/sys-apps/shadow/shadow-4.6.ebuild
+++ b/sys-apps/shadow/shadow-4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-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"
 IUSE="acl audit +cracklib nls pam selinux skey xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
diff --git a/sys-apps/unscd/Manifest b/sys-apps/unscd/Manifest
index f7626f26e540..f13273db3207 100644
--- a/sys-apps/unscd/Manifest
+++ b/sys-apps/unscd/Manifest
@@ -2,5 +2,7 @@ AUX unscd-tmpfiles.conf 29 BLAKE2B e899d228b801b5c86b9bca3eb500acf9f07bf2f46d54e
 AUX unscd.initd-r1 321 BLAKE2B dd36cd5c9e5d677655204048b3d43d8e5fe8b2f5d9c69c862a230257ab73350a5d27c3c6b8a107f2541d617e4e6cbbb421d1e06c83270de3100ed3101715137f SHA512 41def8b588f818b7e6e42809b37ab9d794d7d30c4be7dca047f64cdded55a401fa00cee962066125efe69a8efb9080fa2588c0941f4fc915243f1e111ac169c7
 AUX unscd.service 513 BLAKE2B 443b97c41978967d2ce0d9ef021dd271e1fc292cec082f060109f28e96f83bc8c53937f63a4c38bc1e04cb5b72af9f80ddcf55b8537938e10fc8f8eca040ca38 SHA512 3a03be4807c06506caea41aa163bb036c2600566e7a73267e08ef0aebb3a288d37eb12e448740942277baee365654c6118102915479be882cb65dfefaf53917b
 DIST nscd-0.52.c 73144 BLAKE2B 962c619044d54d3136ce2cd3f4766a0a5a11b0f341fb595238332ec4ef521854f6ef60c846ae0c8e3069774361366b6b53c1b48c8d21ebdf11b42bf05677852a SHA512 ba48410309fced9b8d9f929c52b39ca9a8caaf451fe73742bde7d4a4ab9980bc0f353551e19c846e96d6cb8a71e3c5edc7ddddf76cce0613282f0d01fde0612f
+DIST nscd-0.53.c 73206 BLAKE2B ce3b8e02ce8879664bde7ee7362ee0d920ad9e9cd24da08b02e83d49b2e0bef7fb1b3c6635bc4e8a26d901170943a78bae608903459e4447edf004e5ef716468 SHA512 d14362d21282d0ea919af3b353f7838d1514c293b49df084bc8df424392b4121dba3443a07118f4c8c1cfdca0cbf8ebddde24cf73459b06349e9d1a68801403c
 EBUILD unscd-0.52-r2.ebuild 721 BLAKE2B 285e3465617c6cb8285f197a6916fb363cb0cf1a0bed6b4ab4a83a2ae1cb2f18c2b923fade56806c74229818160f14ece371373fdddd52df1faf7e496aa7d0a3 SHA512 d65568ef1c55d0bb689c7736e2ffaed83631abde06a4817797c937f508eefd8ec06362d8a17ff220c572e9253f5ecfc1de87329bc2e9599e1dbcde831bc11a9d
+EBUILD unscd-0.53.ebuild 723 BLAKE2B ff678564a24f51b673bbdb5cde9677b0fce4d41826b132066a88404d18bdc4999ee3c4c4ee2cc2f949a2362ff078cdd4b0336061dd2609fc362155dd21eb387b SHA512 52b3313f3f26144f93c53747df694706c1c6d9165fa7d3fceb2603f3c768fd989086fef0a5ec4353cba5642487e123415d9a630eb2e4f962f8a76f12701260ec
 MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/sys-apps/unscd/unscd-0.53.ebuild b/sys-apps/unscd/unscd-0.53.ebuild
new file mode 100644
index 000000000000..d191aa03c5e6
--- /dev/null
+++ b/sys-apps/unscd/unscd-0.53.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="simple & stable nscd replacement"
+HOMEPAGE="https://busybox.net/~vda/unscd/README"
+SRC_URI="https://busybox.net/~vda/unscd/nscd-${PV}.c"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/glibc[nscd(+)]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${DISTDIR}"/nscd-${PV}.c ${PN}.c || die
+}
+
+src_compile() {
+	tc-export CC
+	emake unscd
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/unscd.initd-r1 unscd
+	systemd_newtmpfilesd "${FILESDIR}"/unscd-tmpfiles.conf unscd.conf
+	systemd_dounit "${FILESDIR}"/unscd.service
+	dosbin unscd
+}