gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /sys-apps
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
294 files changed, 1730 insertions, 2813 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index d8bb854b9b5f..8da9332fc028 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index e82be0cf0228..f7f8ee05ddec 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -1,4 +1,6 @@
 AUX ack-3.0.0-gentoo.patch 428 BLAKE2B 331f35f3ee7ab8140110bd48f499894e344bdac8ea592b0da4f8b7a5ba3d911bc28158346f94ed062cea3a1fc5bed7140fd246d6d637b70bc2eb8d73b66d0780 SHA512 a88cec8b7b4c53bb6f176e5ff6d88ff3a7888ad23e025b527a98adf649df9ac205c14686bf1565555743bf84f46db3ecfd6bb42ef6f44d817698818d79eef938
 DIST ack-v3.0.0.tar.gz 238646 BLAKE2B 679cf84c7dffd6f1ec3881de465cbdbebf9ec8958a6e36c5265d11492d84990a67b34af0e42041280b9a9ab6c57d951a2c73ba5b6fe07c9ac8774bac445c10fd SHA512 2bf4e9719d8a5ec56c9d31acbcff647aece7b52ff7ffaacbfec56e59e30efb9ca7397fa379e13a9113a27abe47053261b9adb641b995d3e8579d459c0483fb45
+DIST ack-v3.2.0.tar.gz 246140 BLAKE2B ac729ba6b1c7f0b720ddd076498452660f7f50ba7f866f908717d19c2ef985858d63dad96a2acd5c93d0a991a1870bec895da3dc64b974bc11c5f74b9245332a SHA512 3604a8ad6a79c63fdd65721fc790db09f345f66b81e5272fa073cb53b7964b576ba3638e1f358d8e0c28c38acd0d9a0362f2666ece9abe374cf6355b752a0f69
 EBUILD ack-3.0.0.ebuild 810 BLAKE2B 2617de5e26ff8f9ecf601ee5a4f5c2104ec9acfc2e42fcc1fe56742dbe64c729bfbd58f780374bdd1bc6563bac29e05284e99e73ec5f5310cef0fa10cef239b6 SHA512 574ee3043cc235a1914d2002ac9a3184890f2ae6f23037823a699bca22b04b44d15c2617d4bd910e4e00123106d2c5a47d36e8289d75b1583e758f4b6cefd51e
-MISC metadata.xml 1618 BLAKE2B 29016eb74fb367ba24bd0e78a04347b05df87fff51be27178ec713e16395752c75a2eb91ea63b5e86d34d117f2c339ee6a665e9e73f1b3634aa81d5dfcebd542 SHA512 f0317c27167f34a6ecaee0c9afe1a189c58e5f08304f7fe099a5ba5ad18688e4b952d05e42a708fcb16b755fbb9f28529bdc4da7982a739ad014c105e870b940
+EBUILD ack-3.2.0.ebuild 812 BLAKE2B 916da318cdcc7aeb9b98f65f156365f103e59248c1087615c293da0a73d4fc1ad3f535e2f6f5a422406a26a522cebcb12f97d9e05c3d80aecf64e2e445020898 SHA512 b4272f60a2ffd169b490b07f2ac28db6c069ed5543451202d1b49b34f2deea2dc05098a0a304bc4a8b5cfde86419f2ab486a8a9b5dd88951d8994d2c4946a2eb
+MISC metadata.xml 1725 BLAKE2B 864ea988225ca7865583529aebcc7eefe2b836572ff64b35aae34380287702a7693813fde2fedb3c6c2154e3ab9f0e597f512b419ecccad484ef4b49a9a5b265 SHA512 a7119c9d5de56f3bf73bf76a1803a5b851e951112b3c4a25789fd48645cc03912dc40f750e3e3f73decc3df76d12e2b7801f401ce0c630f459b27d4515965879
diff --git a/sys-apps/ack/ack-3.2.0.ebuild b/sys-apps/ack/ack-3.2.0.ebuild
new file mode 100644
index 000000000000..43cde812a941
--- /dev/null
+++ b/sys-apps/ack/ack-3.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DIST_AUTHOR=PETDANCE
+DIST_VERSION="v${PV}"
+inherit perl-module
+
+DESCRIPTION="ack is a tool like grep, optimized for programmers"
+HOMEPAGE="https://beyondgrep.com"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-perl/File-Next-1.180.0"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/IO-Tty )"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.0.0-gentoo.patch )
+
+src_test() {
+	# Tests fail when run in parallel and if dev-perl/IO-Tty is installed
+	# which enables interactive tests that need to read from stdin. If IO-Tty
+	# is not installed the related tests are skipped.
+	MAKEOPTS+=" -j1" perl-module_src_test
+}
diff --git a/sys-apps/ack/metadata.xml b/sys-apps/ack/metadata.xml
index cb46689f3b74..1dc39059f197 100644
--- a/sys-apps/ack/metadata.xml
+++ b/sys-apps/ack/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>grknight@gentoo.org</email>
+		<name>Brian Evans</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>perl@gentoo.org</email>
 		<name>Gentoo Perl Project</name>
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index afe53750e881..cba5d4c38f88 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,5 +1,5 @@
 DIST acl-2.2.52.src.tar.gz 386604 BLAKE2B e8b7b555cec93f84579aac846ce64235e356d73770844e88898564d1742fcf3d7c314511f0321aefbad33bdd85800406102178e8ab6414bc9c883891442d3188 SHA512 59973199d371cd0b2368e95bc829a1b47f04e808a174fefba4c6854e766158bd19a71d9dbcc8d6fdc1573a1f971cdda39c453f7fa243bce02c1ab97c6e7c72e7
 DIST acl-2.2.53.tar.gz 524300 BLAKE2B a4c602b18ab1a7932dce38c8dacf3a3026a3100a8a7e61f0740886ec7154a7738ca641953dc1253b5574580815d7f547a99bdd0cc0ee87238a1995abe97eb9d8 SHA512 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716
 EBUILD acl-2.2.52-r1.ebuild 1383 BLAKE2B bd6b33ba28ef7874e7b072e119f7711b779776d5891f871fd52af0f6539f5d950c98367f721b861c4b03b9713c14de9794eb981c42187e5275d2fce6404d6446 SHA512 4d975c99a096befae707e5da57777ef0e5aa0c41962c8c6231936a75b90f7ec14ccfca3d79a80ea1c5eb640df2132db219b983863b3ec53bb75e0e6f51f1c39d
-EBUILD acl-2.2.53.ebuild 1240 BLAKE2B 248ccb48642fb7c2751abf67d85481e08bb2af4fd47f6ade315cfa3566c4f7e35d44e736c2882d38dc0b6a959af7ef570d47a179b54e2956ecd97d71b43ef369 SHA512 d55631d7766b36a28cfdfab59e1285ce40ee7c4ee8e2e58f223daeb6f11a805be8ccf2df5f3199a4c21e374949a77181306e134d4b388f38d185a3407c13ed65
+EBUILD acl-2.2.53.ebuild 1231 BLAKE2B 480c89f323d9550d37dbea50847e0f61dbb8a595dc56bc7df9704f8103709cac620329ccba088ccaeba5eca58388fe8876c7cb9c564b599dfe1649f7d5b6b969 SHA512 d4243f0b74068edacf5dc8f65c2d4e3de856ac0534d3caab35754b4fdce390bdfe9766e51a5c10de8c922c01765f37948d106c6fd57c2985e7906cdd74ec0b06
 MISC metadata.xml 293 BLAKE2B 2b8092a768f4f905c414e9bde92180e659085a60fd6ec13cecb29b6a88471941e7c8e2ad86f2864f44fa4f74589b20433ce64c3e89c3e210838b9d997deda136 SHA512 1e61b3f2d76e95eca037de073678326400b069526c8a308ca4169ce67d3e47c8cd199cca59f83fa245bb5fcbaa9efe7f31e34cf8588d69383ed0da78ab54cfaa
diff --git a/sys-apps/acl/acl-2.2.53.ebuild b/sys-apps/acl/acl-2.2.53.ebuild
index 7a98a3f61eb2..6b676984e267 100644
--- a/sys-apps/acl/acl-2.2.53.ebuild
+++ b/sys-apps/acl/acl-2.2.53.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index dd22f53c42f2..be08e8c077a6 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,5 +1,3 @@
-DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017 SHA512 e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7
 DIST apparmor-2.13.3.tar.gz 7384974 BLAKE2B fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346 SHA512 137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141
-EBUILD apparmor-utils-2.13.1.ebuild 2005 BLAKE2B 8720ce38ccd2a2cc79e5d44b6c7702ae458e0cac065d4b051a999f15310a8b2348c8a00cf841deaa3005740fb824aaff56e2c7251a7f2839bcaecc8f91858df1 SHA512 41dddd15eb3a096e383c4e581db78c416baa1a8b3fbd3b50eabcd6a1d1e1304676e0c6fffdd6a0187f9fad38c50d06240149a5808c0ecd7d310bcb7c417acc35
 EBUILD apparmor-utils-2.13.3.ebuild 2181 BLAKE2B 4a71db4b196914bc0341ce1b12ac517aeba5231735622e18f4f6b9f2d3e33ee41ec6f81cf65c6f25ddafc5489ee05cb26ac579451124009126203a23dd14a3a6 SHA512 63c68749843ec4fd3ec2a749aef2fd422ede91026b9a5922dd96be0b7899ad76611dee0f45c8134561ec12041f69311cde9e8d0ed3f64f417b419dde85a11aa3
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.13.1.ebuild
deleted file mode 100644
index 1dec23f3e152..000000000000
--- a/sys-apps/apparmor-utils/apparmor-utils-2.13.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-inherit eapi7-ver perl-module python-r1 toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-DEPEND="
-	dev-lang/perl
-	~sys-libs/libapparmor-${PV}
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	~sys-libs/libapparmor-${PV}[perl,python]
-	~sys-apps/apparmor-${PV}
-	dev-perl/Locale-gettext
-	dev-perl/RPC-XML
-	dev-perl/TermReadKey
-	virtual/perl-Data-Dumper
-	virtual/perl-Getopt-Long"
-
-S=${WORKDIR}/apparmor-${PV}
-
-src_prepare() {
-	default
-
-	sed -i binutils/Makefile \
-		-e 's/Bstatic/Bdynamic/g' || die
-}
-
-src_compile() {
-	python_setup
-
-	pushd utils > /dev/null || die
-	# launches non-make subprocesses causing "make jobserver unavailable"
-	# error messages to appear in generated code
-	emake -j1
-	popd > /dev/null || die
-
-	pushd binutils > /dev/null || die
-	export EXTRA_CFLAGS="${CFLAGS}"
-	emake CC="$(tc-getCC)" USE_SYSTEM=1
-	popd > /dev/null || die
-}
-
-src_install() {
-	pushd utils > /dev/null || die
-	perl_set_version
-	emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-		VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
-
-	install_python() {
-		"${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
-			--root="${D}" --version="${PV}"
-	}
-
-	python_foreach_impl install_python
-	python_replicate_script "${D}"/usr/bin/aa-easyprof "${D}"/usr/sbin/apparmor_status \
-		"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
-	popd > /dev/null || die
-
-	pushd binutils > /dev/null || die
-	emake install DESTDIR="${D}" USE_SYSTEM=1
-	popd > /dev/null || die
-}
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 8eca13e3e25d..42071dac0866 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,12 +1,9 @@
 AUX apparmor-2.11.1-dynamic-link.patch 391 BLAKE2B a5326bd6d84b5ebe4a61067490b25c39a326c139437d73b3db5928332776b795b2405b4a1f6ee0b3aee3f496589b2d00b47cd4bba41f044c60fc8ad5d1a86102 SHA512 d0ef56293b556b0af74201321b01de5c763763ecfba8dac930f35c6f733667f148c59295c78edfab9d835893f5518a42aa38f16de7464e218fbd57727726713c
 AUX apparmor-2.13.1-makefile.patch 884 BLAKE2B 4400b00ab143c0ea3b1c14f996131fd023b66c01e694dcd9306d6e00f561f72a608df7a26e3692a8e851b0c91a227eb84d96fb5145b19535ee50ac61c37ec811 SHA512 c324d1dc2101e073df2bc6c3696396becb45e5c25e4c1d6797145554e0499c79353d3a2ad2cced18f42bb1cc315f8590ea2c1b7ee9a3882d5c483380f7c86c6d
-AUX apparmor-2.13.1-syntax.patch 849 BLAKE2B 0332fa52c54ddf80da27267af76489c178415ea91798e66328c5688082e845f72d73af3091d790dc1a12a17578f542cf35d3be4bacec6e5c744c07dc379a86ee SHA512 b3bbb34db43e1505fee5442bc794ca7fa3300074aaac5b3531201847050137805897041bdb4d15efe3dd44e09145e7d36a898a381b25542439e6c3b5b28343b2
 AUX apparmor-init 1284 BLAKE2B 3329dadd3343ddbd9276b0a22a401d1cac6bea94abbd5bad897d9b9760742c1cc30dab5136d9a90e9f3068b6879d95d70376f5dec5fe1d13313dffc89a631fbb SHA512 4ee4747ec98a0828beb690bf5e01bc112d958bff4c68d60fc0cbb9f0707bd8daecc011dba3916aa6e6368f460eedce7f2ce42aad9ccea49a5d898dcae3d01148
 AUX apparmor.service 281 BLAKE2B 3d1ecfdc96ee2491e75e92dc3aae7c2aeeeef3bf6a7ae86f354126fd044e2da316303b3ba63ad6dbc747d59d423ea8e4df0f131090d0d7b405e0d303b3c32a71 SHA512 f6ba92053a93db0654a4290eb358afae4d7669cb89a02242544576d951fe57437c3570d92ac89ce4e9fd96c04c121f44523dd6bb136d58fea11424064375df31
 AUX apparmor_load.sh 84 BLAKE2B 05195286287d5cdf56a7f67e18073f75625cbfb1c9283a22c72ff60aa4a3fe4129b81702801ddd4045629558a022f084906464f8bb5325f31d43680c626a5ede SHA512 72bd10fdd32879854ee044941636d530453488596bab7aa6785b109f6cd7e2f822e9ff04b43c7c4265b2f42de13ec7f6649f9a58fed3d93b51dd1a2b541be3d7
 AUX apparmor_unload.sh 85 BLAKE2B 1559999897e288f452850080166dcdf67d15bd3cfa57f30aeddeba29bce2e1896126e8e4c82b41dd403f94d3f8ae9128448b0c5431c418ff82fd65df370653b5 SHA512 18a46176d043511af33fc77917e85dce5cb5deb30d2d86ea5261313a72c385b96c87fcd1fece9e555b6c424305d420876430a0a8fb11a5ec5edfef30f80dfd8d
-DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017 SHA512 e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7
 DIST apparmor-2.13.3.tar.gz 7384974 BLAKE2B fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346 SHA512 137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141
-EBUILD apparmor-2.13.1-r1.ebuild 1486 BLAKE2B 0e20d08d76f1b799e4066a26f9aec5371293210ce052b43798daa8bddb0bd1c8a7339a8a75a8eebfb05cdaf3318d33dbe1d11db90356779f2cb5c9831c060c19 SHA512 90642a5a2a97d6ab64ccc3bb071c8d62c9c47996b8ef22582d54c11702f8bc996d440099a17b658385c9ad4c318b9ed120cbec469ea34fb392fa9f748b7d20e6
 EBUILD apparmor-2.13.3.ebuild 1502 BLAKE2B 10ad8cb49e3f216b9b97b3bdda55d308a9bb02691f541ac04bf05622a1978fdd98279da6c17b58a521f54242c460611d3e38537cf3b24909208b78057600656f SHA512 c17454f6d83c328591a65205fa1a69a0b55fcd537174e676f09ae05222b5cdf0e657214c759ccd4bb538749e65c21c1bcb77187c91f0762d845c98a6756ff67a
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-apps/apparmor/apparmor-2.13.1-r1.ebuild b/sys-apps/apparmor/apparmor-2.13.1-r1.ebuild
deleted file mode 100644
index b14dc3e44205..000000000000
--- a/sys-apps/apparmor/apparmor-2.13.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RDEPEND="~sys-libs/libapparmor-${PV}"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-tex/latex2html )
-"
-
-S=${WORKDIR}/apparmor-${PV}/parser
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.13.1-makefile.patch"
-	"${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
-	"${FILESDIR}/${P}-syntax.patch"
-)
-
-src_prepare() {
-	default
-
-	# remove warning about missing file that controls features
-	# we don't currently support
-	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
-}
-
-src_compile()  {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages
-	use doc && emake pdf
-}
-
-src_test() {
-	emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
-}
-
-src_install() {
-	emake DESTDIR="${D}" DISTRO="unknown" USE_SYSTEM=1 install
-
-	dodir /etc/apparmor.d/disable
-
-	newinitd "${FILESDIR}/${PN}-init" ${PN}
-	systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service
-
-	use doc && dodoc techdoc.pdf
-
-	exeinto /usr/share/apparmor
-	doexe "${FILESDIR}/apparmor_load.sh"
-	doexe "${FILESDIR}/apparmor_unload.sh"
-}
diff --git a/sys-apps/apparmor/files/apparmor-2.13.1-syntax.patch b/sys-apps/apparmor/files/apparmor-2.13.1-syntax.patch
deleted file mode 100644
index b09d7800deca..000000000000
--- a/sys-apps/apparmor/files/apparmor-2.13.1-syntax.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3bf11cee3eceacb7f3ec177fb676ba36f373d369 Mon Sep 17 00:00:00 2001
-From: Christian Boltz <apparmor@cboltz.de>
-Date: Sun, 14 Oct 2018 18:10:46 +0200
-Subject: [PATCH] Fix syntax error in rc.apparmor.functions
-
-This bug was introduced in
-- https://gitlab.com/apparmor/apparmor/merge_requests/230
-- commit c974dd0d071149213892f03de0869b860705bda0 (master)
-- commit 9987a7ec9c0fc7fd9ac6831152dc77fb477fd04a (2.13 branch)
----
- parser/rc.apparmor.functions | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/parser/rc.apparmor.functions b/parser/rc.apparmor.functions
-index 516edf11..9edded52 100644
---- a/rc.apparmor.functions
-+++ b/rc.apparmor.functions
-@@ -128,7 +128,7 @@ skip_profile() {
- 		return 2
- 	fi
- 	if echo "${profile}" | egrep -q '^.+\.new-[0-9\.]+_[0-9]+$'; then
--		return 2 ;;
-+		return 2
- 	fi
- 
- 	return 0
--- 
-2.18.1
-
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index ccb1e9ddc156..ad75cd2d6eb8 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -4,6 +4,6 @@ AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f
 DIST attr-2.4.47.src.tar.gz 343692 BLAKE2B af4d509f156cb2e693f0faebf1a6cfb4a27cbdd3fd7f8b436cc01419c905ff9ac36214ada2ca8269e49c2e276917b1178dcda97050cf25cecd65382f22bdf9bb SHA512 2a333f63655758298650cf8f89c175efdc0112dcc4013e8d023e2a9a69f177e4bcb1f1d10b6666d6f2027dca4dec0833d54749952ab153d28367e1a72e6e2831
 DIST attr-2.4.48.tar.gz 467840 BLAKE2B 8fa6a5013b927850868b6913d026f23f116b75da3925d5da5eea007e14f5d9e309f98290b7ffaa6c62f620ff8f3ec7bfb3a1fcb04f3c0c072fca5feacaf804c0 SHA512 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923
 EBUILD attr-2.4.47-r2.ebuild 1723 BLAKE2B 4ba215c8b35326cb4a607fe63e23e14262ef345c1f28bc9ac3ed2b9db80450adc365be791ff7391bd607c7a3d9ea0e0d77a931aeceaf3b4c61a86277e5488789 SHA512 34c2badaa57b539b0009747354bc2ba23a8498e86e12b802fd6dfc6ac7bd5f424b544ae1783ce6361b2635880d7d11d1b7b09ee76ad65ad32675dba5137b588b
-EBUILD attr-2.4.48-r3.ebuild 2353 BLAKE2B 293779e6b076e73c2eda3ad51d5282cae7e5b1b1615b660afb8583a7ba820d1b684ef19a42b0f9c65f605f93795b5f349c6b5d2752d825b512b40e15def115d4 SHA512 4943e67eb6843ea5f4cd525bd79c2d959a8318d84727e0dc9ff77928347784c552767f593abac4f5c2a6f4d30d887f7625c497ad229aea8f7cbde7b66c732205
+EBUILD attr-2.4.48-r3.ebuild 2345 BLAKE2B 592df35ac9c11125147fb976df4abec28f7bbd9958b9498b200b65a11c6c0cffb92c0a794b504f5fc8f417e64d694349db4a00154cc91a6c3da2f6405cfedfd7 SHA512 963c3acd407a09fd34facd48ba6a26294c1bd913a4e0ddf79fc23b7690b236f2f8c14a9a631e52179e9a3d8bd2349f716a26a6ef84ac5ea129019f190eb5a928
 EBUILD attr-9999.ebuild 2433 BLAKE2B 2cdb707a357043c004bb7ed38d7ada460eb713bf021163d2fd1f7c6ea37b1ced3559853a4db8cc1eaa83bd08ce00290028bc8f1d280eacad3c922e9d4da6cb75 SHA512 56be1524c72945cfd459c5e7736bd7e7e015bdcf4ece19abe0ab2445d2b5b2655535debc31ecc7e2029324c0aae213bb8b45b387d9f5e853a094082ede82a6c4
 MISC metadata.xml 336 BLAKE2B 228b1ca58194e3cb6b68721379b55f53c2676973b7fb626600ae4f1d5da4899d7d4dd6e5211704ff6f64f601fc456b4335c4f01233768d2512058ee63af60668 SHA512 0e68e3406c4e54082edd2b2be1fe8b5a2a73457331b133635c5b5ed9e0afb0fbeea2101ff17a0fae0be47c4e535af9cd084f1abc9c85fda05c18e2879a72d0bc
diff --git a/sys-apps/attr/attr-2.4.48-r3.ebuild b/sys-apps/attr/attr-2.4.48-r3.ebuild
index c5ed52072cc3..1878b434ec2c 100644
--- a/sys-apps/attr/attr-2.4.48-r3.ebuild
+++ b/sys-apps/attr/attr-2.4.48-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug nls static-libs"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index 3a879b8d9d16..28dbb3de80e2 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,5 +1,5 @@
 DIST baobab-3.30.0.tar.xz 765760 BLAKE2B 7003507e0923eedd709db8f3934c341215decb77b300b6660a334f6c23dfa6d83476d3c0a0ef3d76a5104a1add0759f7e268e13bcf00f69f51ae5b9986bdefc5 SHA512 3fa1c20e6e3a654d3dfa11b8f0a7e0dea77cc8ab88ff65a4471cd467d3cb3a7d2d39521be1718f3f6ab32984b9331332574f87f5fcaf13c1aa8cf93bd081d7e0
 DIST baobab-3.34.0.tar.xz 454960 BLAKE2B c9e695074711442418bfd9c9c1453feeaf573429f1d9a03ef6c542d581d39c5bf1cb14d98025cc522705b1f8649150f418d39c05cf06f77f5900780eb058f67e SHA512 e821ba445c65742e92580e12be9b82ff352c6a2a8a58bab7fba97b01a120a948b06e35459196f16e9eef347cc6c5aeacfd563e86d78c758099fbab2ecfc4aa0e
 EBUILD baobab-3.30.0.ebuild 745 BLAKE2B e665f3ffcfb7ddde241158137489380c020266c0bcff06e95177ecfbe0c116c2488ec45425ccc83ac5b05f3da73b0c835d6dda88f5149b74db03a611757c635e SHA512 cdd6edbba9f034572bfffaeba76d7ad1117ccd0cb4fb98bd43315f58131b0c501f6626a5bfb8bbd5042406733cb6f22f625c8acef761b377936a7b3b297f90e2
-EBUILD baobab-3.34.0.ebuild 747 BLAKE2B 23d1dfb2fdec7a489281bb219a5fdfe39db5e2d67e65eb7c197d8e6c7bea2b8b12bc24e9776696166a894afdfceac16b7ffebab60ca3d50e7339527d7cc81d98 SHA512 a8eecd6be0a59b71c3a528b8a64d558f844cc2fa04b790e66b8a42c6cfc0561dc021dd6373fb2ac89694e1e4853269512914931f4d67619f5db127406e018afd
+EBUILD baobab-3.34.0.ebuild 745 BLAKE2B e665f3ffcfb7ddde241158137489380c020266c0bcff06e95177ecfbe0c116c2488ec45425ccc83ac5b05f3da73b0c835d6dda88f5149b74db03a611757c635e SHA512 cdd6edbba9f034572bfffaeba76d7ad1117ccd0cb4fb98bd43315f58131b0c501f6626a5bfb8bbd5042406733cb6f22f625c8acef761b377936a7b3b297f90e2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/baobab/baobab-3.34.0.ebuild b/sys-apps/baobab/baobab-3.34.0.ebuild
index 18f030f292b9..bc167557c800 100644
--- a/sys-apps/baobab/baobab-3.34.0.ebuild
+++ b/sys-apps/baobab/baobab-3.34.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index b0e4853174d4..43be9daf26e0 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,6 +1,6 @@
 DIST baselayout-2.4.1.tar.bz2 31307 BLAKE2B da26f7fbeefa5efecb6e5d9ded6c2bf3148cd1fcfc6ebb86535f5a9c086c4bb55f6a8420a3c0d0f7008251637f3e4653db875ec427745d039f753008d2f21be2 SHA512 e505ad81834aafb574ffee9bc1fce216c1c8c7fa11b0095580f87a37e4b9efb057ee78db7cd5affc64f05d5dd0592c671304414c119b37d86dfaa1e7b84ce7c1
 DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b5f2dbc72e75f027b0c23a5db9a386c53e756e80240f36ad4d63e3fe421bf9510c18321d7a31fda140ad47b2860 SHA512 5cad5faf56871ae951120643e29db0c39fea6dc845b4755382bd469eca32639ec6cd0cd046d3c439a7cc607b18770036f9c256260d35beaffb094e23cb13740b
-EBUILD baselayout-2.4.1-r2.ebuild 8557 BLAKE2B 425c7eb6be215972842ad755db18bb89bf0c5533cb88e22b781ddaf1d204eb4031499d9df40ca61a4e5cacc7c8530b71c877b39a0331b7678c1e702e3ef05265 SHA512 e32d2b81562e0896353b703449f815e6ba38d3543e374c5b6eff0bcee944c6fe30389c216f0b1487537ef9fb74b3be65700a0f86ae4c48b95ee440e0cad5f835
+EBUILD baselayout-2.4.1-r2.ebuild 8550 BLAKE2B f96e18d47426ce743b9b1d74690039b4755ec3fbfc6d8ff2e82c67c3378daf909ff1fc3fe32cd646c2f9ade84021b01ca9c2fadd5e7551c682ba9f0fe182c6ab SHA512 f4d9363f7f6e3d39cf774929393bb037dee80763f2f48ff3f9b90bd91a383a7eae77e7bbb3631ee846214668d1ac3fb111e2e58efa9ea7df233d0287902318b5
 EBUILD baselayout-2.6-r1.ebuild 9545 BLAKE2B 018f68469c3fce5752b2f7b54616f8dfa4405c6d19f6aba7498727725076f80e98daf246263c21f83bbc73d47d7b4289ed8fa286f2dff89035e9288e0e6f77c0 SHA512 3e3dab5d84a9b3e7122a1b10dede03bab1c142b2c10ebddb14ea866a238412ef9db6c533a7e28db10c42dd9bb2eae7051cc9355d0458c5020d33cb6cf0edb64a
 EBUILD baselayout-9999.ebuild 9554 BLAKE2B 7ecb4fd167c0633379b69480a33fe068ffbf096b860f65b15210c3d20a3ad642f7f99c4949c243c63c4a7b3e77fd764a61e8bb2cfe0e70e3388c0caeea30871b SHA512 68722948665e4eaf90f808c9a768611fddc8dd689d9e7e74fca587108b787f1e2ac0669cbf6b3b04fa8752ef28a151110dee0dc1ae88f627bc9bac64a6ad6309
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
index 195fe1e39f60..d6f3e81d5ed6 100644
--- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
@@ -130,7 +130,7 @@ pkg_preinst() {
 	# Also, we cannot reference $S as binpkg will break so we do this.
 	multilib_layout
 	if use build ; then
-		emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout || die
+		emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
 	fi
 	rm -f "${ED}"/usr/share/${PN}/Makefile
 }
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index 37e37488a1a6..37ff142bcf0e 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,5 +1,3 @@
-DIST bleachbit-2.2.tar.gz 1100913 BLAKE2B a16e63a2533f9d9c385d384e2fd65dbb32a8f064e769f99e8a8cab9c4069cc7b21e6896c5fa8d02d8204e8c93da8a5f66605601eb44ecc354d41f1a6d9fe2d0a SHA512 c7661cc64358a6420768c3ee1a6ec97d2fd4f0bf67b393be045ef79cef8b3f8cc273a51a5dd7c79d89b8a14cd1357f7714fc860addc9ae74af48bd8d427b3a5a
 DIST bleachbit-3.0.tar.bz2 562646 BLAKE2B 4acdd5469ac1b36ff149231ad0b1b2e4e85a54a81c24c7751ceeed569526b905c1cc6be5201c4fb6929eb48e0553f0b27016de2584ee2f702492cc3fe659c2f9 SHA512 0d61f0b183c0d453275913741020c54c2915be9df45be706203e2278b125f4a02c75865117a7a2d587a034caa9bf109b2f498a4d522cc103c3879cc4a5d4854d
-EBUILD bleachbit-2.2.ebuild 1192 BLAKE2B 0bfa92eccb8cd0a08b482870ebfc68bbe09c576d2cb6d2001ca57ed458ef7a3b8e6f9fea3cfd1db07a530363042d3db40bf96e96ad03fd08fc39ed18f6ac9116 SHA512 ce6a55df1b36909d55ef369b4ad61b5097cd3a86702dc9c5606b78386ddbdd90a8048a3d0aedf82955fc025907bc7698949fcf10b00e47ea65a40ea597b327e0
-EBUILD bleachbit-3.0.ebuild 1190 BLAKE2B 642f70fb6e5c6f5ea90cd5ae7436c9e0d804f87e074834e8afb61aec48327fb5a2b19cde9a83b60abc04cbcd306a52475cf7b5a038251d494a9e6262dd0e2091 SHA512 ca819060cb117596b026cd44c102b786964e54a9fbbd61933c98aed6d5e06ec6a9de53bdb86009aa4964a978fa8b550f692fdf3547a0fa992f97d0a559f720ad
+EBUILD bleachbit-3.0.ebuild 1188 BLAKE2B 80de495f6744ef7fe7f4003e095b5bc42909dc4e415702f95d49ebdec3296e8d3fe3238ae521938875e49f1bc2e3fcef0a39c1226a95ecffff0664c7c57ceb1c SHA512 d3dc01d9679e378cc4c4e4b4b782be0a367b67a19a6dc130944bdadcb6995a9244cf7eed9d180b7a9e9f32ab32996bc6f3a8326c22e5886431e9a22824aed846
 MISC metadata.xml 526 BLAKE2B f55f30792d579d5fc57553b3aa8a8f97d450778a1813c53e82a0fea4cc01fe3039d249ed89c8097a973c1bd923390e3bd1b85ae1a1d2386ab3373a9baae08623 SHA512 d2179dee28e6bacaa540039b726eb5ab47b87abc73a5c86621de3230f3d6355d082e8189c9e167871fb8c15975815341ce02bbef80195b984728c3b1b0652bf1
diff --git a/sys-apps/bleachbit/bleachbit-2.2.ebuild b/sys-apps/bleachbit/bleachbit-2.2.ebuild
deleted file mode 100644
index 79c60771348a..000000000000
--- a/sys-apps/bleachbit/bleachbit-2.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit desktop distutils-r1
-
-DESCRIPTION="Clean junk to free disk space and to maintain privacy"
-HOMEPAGE="https://www.bleachbit.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+gtk"
-
-RDEPEND="gtk? ( dev-python/pygtk:2[$PYTHON_USEDEP] )"
-BDEPEND="sys-devel/gettext"
-
-python_prepare_all() {
-	# choose correct Python implementation, bug #465254
-	sed -i 's/python/$(PYTHON)/g' po/Makefile || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C po local
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript ${PN}.py ${PN}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	emake -C po DESTDIR="${D}" install
-
-	# https://bugs.gentoo.org/388999
-	insinto /usr/share/bleachbit/cleaners
-	doins cleaners/*.xml
-
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-}
-
-pkg_postinst() {
-	elog "Bleachbit has optional notification support. To enable, please install:"
-	elog ""
-	elog "  dev-python/notify-python"
-}
diff --git a/sys-apps/bleachbit/bleachbit-3.0.ebuild b/sys-apps/bleachbit/bleachbit-3.0.ebuild
index 78e8425c75ed..6129e74e6df4 100644
--- a/sys-apps/bleachbit/bleachbit-3.0.ebuild
+++ b/sys-apps/bleachbit/bleachbit-3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.bleachbit.org/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest
index f79daae99bbd..2c812ffa1b37 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -1,5 +1,5 @@
 DIST bolt-0.7.tar.gz 188158 BLAKE2B c51588ed746fd2aef15c79c278efe73e78ed8a029d2234b7a6ce717a6a3287ad0e9db82f93661c552a6a35c76a0e16a2712681f45e53f876b3b4f5bd839005b3 SHA512 6786f701501cc2680fac52cda7cdfe37971044abcf058b5c83bfa9f1d0a0381ba00e3377cfc97fcccf53760a2eafc1f8f6d0754f0e121d94201711ad8e40a135
 DIST bolt-0.8.tar.gz 219317 BLAKE2B 9d76f3630d7f690c96447a894e54095deb7a19e46f2b02d7fbd9e584376d6b1a19391007a3a80e293adc8c9de6470279b587807d08006bbc12c7179bf0501e40 SHA512 0fdbc026178a4ca6a8c53aa46933d1c411eb04e350955f8b10c7faff814576d0796dd28e56b968648e549c79cf5fa13d43970d797595af0f66457abaef8ace09
 EBUILD bolt-0.7.ebuild 908 BLAKE2B fb4535d186c3aa48a7caf760bf56ef767748c054275aeaf69b3e2ef482f1de9679786395948057ae2239bb69de2ebbacd4947e2ef6f00e5d7984277b8003437e SHA512 4f32f424fb48ea8189183d668cd9bca8759b58621282251b4dd4f86808131baf6ee8b311ec4ad5da3eb50533e99b824b2c281226b608092e24dd5d765302721a
-EBUILD bolt-0.8.ebuild 908 BLAKE2B fb4535d186c3aa48a7caf760bf56ef767748c054275aeaf69b3e2ef482f1de9679786395948057ae2239bb69de2ebbacd4947e2ef6f00e5d7984277b8003437e SHA512 4f32f424fb48ea8189183d668cd9bca8759b58621282251b4dd4f86808131baf6ee8b311ec4ad5da3eb50533e99b824b2c281226b608092e24dd5d765302721a
+EBUILD bolt-0.8.ebuild 913 BLAKE2B 2ceb3d92ec71103944f10593aa0ea9c6881210f3da180af0a44283021df0a744816c569fdd7b8ce87c8764fd7a3d5288af2a0dd9efdeddeee9c7dcece671d533 SHA512 16af133d2c20ef18759cac989ceb1c1e0a7821622113853e910fd1f6d7441449630a2f2c650c869b37142c609c43af28e2b88553c5555f4d6120fa319c7c9527
 MISC metadata.xml 387 BLAKE2B 9c5d99308a9bf4340ad48310dc9cc5f67ad7db1683f54794f025b90667dfb2f178b25c1d9a3d0fa0a7fde249ea8bf40cb608265e96aca30e547f3e2e536b91f0 SHA512 16060e68e59d82a6a556bc0149f5e365a4092b14edadeb09dfad8278b19e28e0d1835fcb24a2f335809d1ec910c788cc69d579d7aaaba9ff32b4090a904c7706
diff --git a/sys-apps/bolt/bolt-0.8.ebuild b/sys-apps/bolt/bolt-0.8.ebuild
index 28823c01d33e..6e3dac6aa8cf 100644
--- a/sys-apps/bolt/bolt-0.8.ebuild
+++ b/sys-apps/bolt/bolt-0.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc systemd"
 
 DEPEND="
diff --git a/sys-apps/cciss_vol_status/Manifest b/sys-apps/cciss_vol_status/Manifest
index f0e4c5e166ed..7d1cdec9ceaa 100644
--- a/sys-apps/cciss_vol_status/Manifest
+++ b/sys-apps/cciss_vol_status/Manifest
@@ -1,5 +1,5 @@
 AUX cciss_vol_status.cron 646 BLAKE2B a35f73a527e21c62e9b1214d2b962f115f64cb0f385fec04eab60aaef6ccb16cd5d8dcdef32d8a93c11f35a45b8e2891c3946da40b406645e757763db90f5d5f SHA512 658004668f6d1914c1526e07113eaee9a24e8d1945ab378a27537e9fd421e5b39eeb5f56610d59bebcbc6d7b2addfce65fee697b6877d164775b696930591a56
 AUX cciss_vol_status.cron2 1611 BLAKE2B db62a46e933357537132405e862b96fe0d3a8fe9f078982e797be8897d09f2c6310abbd6de1472d8401ebeb33b7ec9cd3f13a060933539816d051115df52df42 SHA512 b0ca78c96dad516abe49be96a1ca0956a5dcc5f721bd5088422da9327a783e5483798f96d2f4eb9bd8484fd07c94e86305be7a88ba0b503f5771634b31a7ac68
 DIST cciss_vol_status-1.12.tar.gz 120346 BLAKE2B 8094f7b421c8c3f003f38cef380eb14c6778b750a62a5b8b94df955f87c0a77b1b7dfa9df16d6bb10f4955b6961b022b871fc39d143717b8024ec40fdb3b819f SHA512 f9fa8b98bd42810932f03f514b4b8c6cea690378f065a6c9788ddb78612c7ca2aa9a7fefa8a40634cfe247600fb6d3f11f0b687fba77d1423087a2b319773d69
-EBUILD cciss_vol_status-1.12.ebuild 580 BLAKE2B a1f1ab65cb6df0d1e8a4aee64af16a32c6389eec914e821ea94eda01ceaed3a32a7502a5b3582006f960edcf2afe308f7a7009bcddf002b36503ba133833b020 SHA512 fa5fd162ed1cbfc5bff8c20f16af222d6c923bdf37dd1ec8b04c8c998d3dfee0507b7efbb2dc5e95b9196d02dc2b2b1cd7b9b827c7127c42e27eb24918fc28de
+EBUILD cciss_vol_status-1.12.ebuild 555 BLAKE2B a3e2182d2c187caa1786e6f26552a4cd201a665cde8df998f262d370f8e4c763b766a16de8169b2f9f7a4ace13d666aa2645e54e92d15fa17a2b3198abdd937d SHA512 3140528e61bdee1aa6cf7b78f9d16936a0114d18e223cb607ffbd5161daef8742fd164318bbf82db6e67e88f9bfa5e3eec717e21ec38aa9993eb19398e7d3c63
 MISC metadata.xml 402 BLAKE2B e69409b303a34d9e6ac1f7ddf96eb9cda2a9d233adf718ec546f723714d78a0960ad4b43eb1945a56aba6af12b5934f0a45693b23a8914c491a67fb2f2c2eb00 SHA512 346a18ccc25fd45f14252b81a275cc1d3b18568d9a2b8404a7b80c53f05a36d8af0926ef50fca2b92b693d38deec31419f1a1d284a8f4b8506ea8f8cc149062d
diff --git a/sys-apps/cciss_vol_status/cciss_vol_status-1.12.ebuild b/sys-apps/cciss_vol_status/cciss_vol_status-1.12.ebuild
index 7b55e244be5f..4aa99c221aa3 100644
--- a/sys-apps/cciss_vol_status/cciss_vol_status-1.12.ebuild
+++ b/sys-apps/cciss_vol_status/cciss_vol_status-1.12.ebuild
@@ -14,7 +14,7 @@ RDEPEND=""
 DEPEND=""
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Install failed."
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog NEWS README
 	exeinto /etc/cron.hourly
 	newexe "${FILESDIR}/cciss_vol_status.cron2" cciss_vol_status
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 465c0a04baa6..8b3d6485830f 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,6 +1,6 @@
-DIST checkpolicy-2.8.tar.gz 66243 BLAKE2B cd4b5ead13606df9888260a15d982eb43d59c659a6f021a18c598657b2a07de5e70a9eacee6528855f26256d26b27bd8bec27b95a7366cf2e44ba5d426369582 SHA512 d1a52dffefcc8f9f879214290f01beb5f4978f1764ab6378ee03a62ef924206b9a6f6a512001ae556034ababcd3a0043d455f5aef66b5629a4f152cd2c9f0b7a
 DIST checkpolicy-2.9.tar.gz 68735 BLAKE2B 092b7b67ea952be6a829529249f0b209c31245490f263b248cb0208d9f1f4ec922522791c6555c0b913b56b8a0037bfde54a3511940f0be287f13e3a193c8f26 SHA512 8dafdd871c5fd32023883149c74891279c386cc87d70cbfc6f0a8dcb0406f17f1158f9078c1b35892a0f0edcb6b5208a031594ab80898eec016ad765ad046e03
-EBUILD checkpolicy-2.8.ebuild 1187 BLAKE2B 1114b1ac3e3591dfc7b1d68d3ddba13e693283e0cf1cf11f8947e49c62b35e520ac85fc0c014b335d31642585c3dc7385b6812964d2d6f329d9fe9913f1e0d50 SHA512 9e2e4cefd22c41bfe102048f88d84883238c826cce1fd186bf4ad0a95d7cbfcde3be1db446f9aab23859e72292efb919882681a2bd984d3b3696d1f9595d32f7
+DIST checkpolicy-3.0.tar.gz 69037 BLAKE2B 30b8a5e19e02472d1cf256636c70f95739098514ef9d630ee5e782085bd09ff58b4ab6b8c97e9fa652e8260211a7803d80eb765e0fd2f1dde9c328682078d3c1 SHA512 196d24638ec7fc88d427637e2308c7a0c5a3d4cc88c372a5f5dc61d6c1e2f895e308b8e06ee9e47d340d65a1b2d4486dc4decfa6074594dda14e46f1308ded89
 EBUILD checkpolicy-2.9.ebuild 1167 BLAKE2B abc8401583d733530e3673cfa96c3059a8c3041578754fe745fb7850bbf92b852cac3458cbd0bbd550589e9830087d36c8e408d094be02a74d6ff396646deee9 SHA512 739189cf5e8d475e2eb3db2a3c323b32e03d4fff9b7684da149fe1d8470666d2359ca91470578ec0aec8b2f6d0c8e865c16016a0187b8eb2fbd0b8a62a2bce66
-EBUILD checkpolicy-9999.ebuild 1169 BLAKE2B da040fe75e5781f417358ba7f94048df9571ad6729ee80fe25d3daf7dfa596cf4ca04b4dd32984c3858ffd549c0f0ac36b8a595f3261d915f808305b80629e05 SHA512 5bf62badf49b4c33268b56660e0d9ac86d3fc8372311fcf27021691361da519c43269eb1e62bd46eb8307a59019793ba71a706303c3973c7290c2abb2a246a1c
+EBUILD checkpolicy-3.0.ebuild 1169 BLAKE2B c592aea38a067321e299b0655a43aaceba2f066d16ab4d4350844ff17bd154b94e1791bd39f7852d890cf46b6891f2f19503848fa9dde3952f44594af6c77d0c SHA512 77e5b9c8156efceabaff0583551ec5cda9c0b5041ce110ed9031d6bc8b7ea934f18383be2c79ccd93525471e71c13dcab6ae257cc9ffd4a56f260c9804c72108
+EBUILD checkpolicy-9999.ebuild 1169 BLAKE2B c592aea38a067321e299b0655a43aaceba2f066d16ab4d4350844ff17bd154b94e1791bd39f7852d890cf46b6891f2f19503848fa9dde3952f44594af6c77d0c SHA512 77e5b9c8156efceabaff0583551ec5cda9c0b5041ce110ed9031d6bc8b7ea934f18383be2c79ccd93525471e71c13dcab6ae257cc9ffd4a56f260c9804c72108
 MISC metadata.xml 308 BLAKE2B 9147e4199ebd94dc7cb5d04986bae70ecc5bedf765fa6295546b894df249fa074c66e96a7d788295d912f49e9b0c5c305eb404c98d9b04646ab12a7597d4877f SHA512 e07f79eaa348cc35ebb4eac966f6b59ff87cde6c2b9694ac996da971c45aed834f34b8a9325b205fdfe590d7add0d46013cc551af166a9ca2ca59e0feffbc9bb
diff --git a/sys-apps/checkpolicy/checkpolicy-2.8.ebuild b/sys-apps/checkpolicy/checkpolicy-3.0.ebuild
index 38200e9cff45..5be101d66c6b 100644
--- a/sys-apps/checkpolicy/checkpolicy-2.8.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,7 +6,7 @@ EAPI="6"
 inherit toolchain-funcs
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20180524"
+MY_RELEASEDATE="20191204"
 
 SEPOL_VER="${PV}"
 SEMNG_VER="${PV}"
@@ -19,8 +19,8 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/checkpolicy/checkpolicy-9999.ebuild b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
index 76dc1f3e8240..5be101d66c6b 100644
--- a/sys-apps/checkpolicy/checkpolicy-9999.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit toolchain-funcs
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20190315"
+MY_RELEASEDATE="20191204"
 
 SEPOL_VER="${PV}"
 SEMNG_VER="${PV}"
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index b569224d1e26..3152564c6927 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,7 +1,7 @@
 DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
 DIST coreutils-8.30.tar.xz 5359532 BLAKE2B b66ccd112a6c2c8b90e58ff1c3371e7f5827937035769329885e5bdae197466189f3715720b8f8cf0b5047fe16d6c86984dcee994117c2d3c7b8dbd597027255 SHA512 25bc132c0d89ce71c33e417f04649c9fcfce6c5ef8b19f093b2e9e2851bfde9b5a31e20499d9c427332228ba54b88d445ddb445551e1944bb8f5cbff5ffa4eda
 DIST coreutils-8.31.tar.xz 5410140 BLAKE2B e3ae6be8edbe9df9164b4c9ac8bf14dc23b147fa665f20669e18ac4c6e45ba839dc0dc99e05670eb006d22133475a4a717a5f40b00ebaedfd6e1fbab887674d5 SHA512 ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af
-EBUILD coreutils-8.30.ebuild 6140 BLAKE2B df4b9ef9f15d0e9a1b4129ec69ec6e3bb7f94e3f1d558bdde741d3fe2f989e1b1b96be4b68b070929ccb0fbbe514ef2e4f561de60d9701b9776cb0cf2764014c SHA512 2a5922014839d073dea81dcee72f8aac98c60cc6c1349649b58d9368b6f5a84b412bd3f410c9d9b6d1e7e9645cf9791cfb52d8794c643b67c0d04c61c7f43492
-EBUILD coreutils-8.31-r1.ebuild 5687 BLAKE2B 93bf45bece6caee0ec2c92e2ed61e2553f35aa205b31b9b1ea431c9464aaefee05a7d72a07b15a5d06bb29d963446e128b743c13c506855842046f3ebf41dc2a SHA512 34e965aafc739ee7574dc5c5fde9ffdd50797de7eb8cbc4febbfaa68796480b5b126ab29077c47b6413dda1e529dee51214986702d287a2eda8aa7e26b8273a2
-EBUILD coreutils-8.31.ebuild 6156 BLAKE2B c0c93af4b9b00143897b49100005312c383b6675526b92cc0bb997a790bb3d63f51d3d484c26acc23cf45ff6eb8b1679ddff2288e511c88e60beaaa3a5cb5abf SHA512 f5e02a0c6571865d329f376dc88a88c1ec1580d0b785b59ed53093736946a091a2859b429a57fb3a2efb58029b7a04385578c20add6e915d99146353a967da24
+EBUILD coreutils-8.30.ebuild 6167 BLAKE2B e4b40c7572a2da27f3f0ec3a61c1e90c5103a3e1c12d625ea94734c848f8c6ecaeba919d10650ac9f90bccef72a1479a025ae209b289605f3a3941fbdd248795 SHA512 c3483c8830bd72367f36f6331034a2fc1c3f472fd9a623af64481be76098f4bdbe2f2942104b42f8e4ebf4438da599b9898a6783a8c14fca6fc28ffd24ff49fc
+EBUILD coreutils-8.31-r1.ebuild 5714 BLAKE2B 370b6baa0ac298cf278cb0e4b26522b28db33a415553a091635cc9b0cfcce30568a324f4024037270eebc64702dbbb82b70c6eb5be0f4f9839c9ecdc437fe2e3 SHA512 3bf58f4dfc1c6a1cc6cbdd9a722dabb82dcf15b180cbb8a2cf7de40244101c5373e4255baf850beed7042763488c3d308dcc6f7070565485b3c70f6d597e1cbc
+EBUILD coreutils-8.31.ebuild 6183 BLAKE2B 87b09524c998b56393923939336c2b982108ecd72d83f586a5379ba1d6ac58c3255e6ebda378bf7510e397482e4a2a8d23945c42fb67a23817013c4033f6645e SHA512 175f58a9ca47cbd8d40dc21c33326731525d232b4b60097aa5de6bfc89479bb2d02ef02b1fc1c873d83a4a0832b9f7bea19c5144fe495cfebe55d1efb006029d
 MISC metadata.xml 958 BLAKE2B f66e780b413255fcde84ab0114e0be6d285963be305cf67bf170243d491e2677dae0e6d33eee5660dfcd6672b55cae383651f878feceffea5085aab31c83b7b6 SHA512 3e4c60dc34a3b6a74392e45bee5a075126728ccc278d61985124780f24b387ef75934c0c0bb4f647e96916d289a5f0c3eccd5411546758c67d703638af87c044
diff --git a/sys-apps/coreutils/coreutils-8.30.ebuild b/sys-apps/coreutils/coreutils-8.30.ebuild
index cffb6d4a9a00..9ae4f449d03d 100644
--- a/sys-apps/coreutils/coreutils-8.30.ebuild
+++ b/sys-apps/coreutils/coreutils-8.30.ebuild
@@ -18,6 +18,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr"
+RESTRICT="!test? ( test )"
 
 LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
 	caps? ( sys-libs/libcap )
diff --git a/sys-apps/coreutils/coreutils-8.31-r1.ebuild b/sys-apps/coreutils/coreutils-8.31-r1.ebuild
index 4b4527d15146..2d9f4afdf1ea 100644
--- a/sys-apps/coreutils/coreutils-8.31-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.31-r1.ebuild
@@ -18,6 +18,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
+RESTRICT="!test? ( test )"
 
 LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
 	caps? ( sys-libs/libcap )
diff --git a/sys-apps/coreutils/coreutils-8.31.ebuild b/sys-apps/coreutils/coreutils-8.31.ebuild
index 4748ab387195..11bcf3e5b620 100644
--- a/sys-apps/coreutils/coreutils-8.31.ebuild
+++ b/sys-apps/coreutils/coreutils-8.31.ebuild
@@ -18,6 +18,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr"
+RESTRICT="!test? ( test )"
 
 LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
 	caps? ( sys-libs/libcap )
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 79b97802b9fe..ef4da053e33f 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -5,5 +5,5 @@ AUX cpuid-20180519-makefile.patch 1618 BLAKE2B ee25815c8f60b77b0e8866100d9076741
 DIST cpuid-20180419.src.tar.gz 82301 BLAKE2B 6905c0946fb9a930c67718067923c8c238031539c95704664160efde8563b0f56aadf3132abc9833310846802f97330edff833b47c006a4f46fec49358b56e31 SHA512 c8e30e45df7be5bdbff7e449b447b4542326a112f563c114c67cc80764070f3f3815ff4f80ceb57360828061bc9fd5f2f24f8e53ae4db47781f36db32141c951
 DIST cpuid-20180519.src.tar.gz 84784 BLAKE2B 87098145a378081d296f0473f9106e7c5b6654c2bd63d385dc27e293079adf3a527801fa644000ede53228e087e9e9afdf807a3c8d9cc8eb93826f01a5a89e9a SHA512 565738c41777669e750a2ef2e122ed0568de5ac8cc2584fa5047ba66d42eb5c3324b283bda25605e055d85402a4e2d109bc6d033ccd34243caab728465792669
 EBUILD cpuid-20180419.ebuild 652 BLAKE2B 8d13819ec16878fe33fe6398349e72b0e81296128e29bd966a105ca42c835acd7f5f4507379ddd3489186b33daefe3e45c9668ad1a3bd21261ad77587122a655 SHA512 1c69a30c3500d95a1930017b20c6ba3c2b8aeb63d09d75ddf0c0c136b241a27bbcc546544758a0e9b4d079eaf34232a493949ef01713d68182f2d0333dae2db9
-EBUILD cpuid-20180519.ebuild 642 BLAKE2B 76ca6e052ce0424e38a8c8e6c89ee125f8ef1535e65099d804154a35a6daa251d369dcec7c0b655ae29d7df65df0142533ad255af5ad411ec5b731ad422d50ad SHA512 882e91d630d6d2f054c9b31b93f95011b9463aa416f3946b51b42ff5222ba57e17c24b789bae6e914262a77055b7b4f179f5b2603d67eb8294555ffb7c690325
-MISC metadata.xml 756 BLAKE2B 7065a1bff2440d5e5380d5a57a65901a1ead05016faef52e3f9999c91976c57f994dc4add3e3d46193337bce134732bc33b21b12a7ea69055bb3a8ae654571bc SHA512 0e8a9c2a2ce2c6647b22f71761d2c64a5aa722d59d83b2c34210b7b5913c491ed91f99941095e8a05a326f39eba71a61729d914388348e5dd0637ba9e2c856cc
+EBUILD cpuid-20180519.ebuild 640 BLAKE2B c4800406ac7f031a9206013f968a945a5625a53523b9abe577d76189dd5cb4e2dff85f77af7142594c49fdd35c51450f4c65c806c11c05578f3393dfe419458e SHA512 ac7f070dc1f1df53607a705d193897312af921b61a3d9358420996ecbc112e0ecf533d3d11ecce5bbb247b1d9090d0592dcf2bf22031e86ba624e490913a9469
+MISC metadata.xml 637 BLAKE2B ffd825f4b6e67bff67d861d85f26fe2c3054fe7e8d0433c82faa5f5e8a1c2b75b24284b33ff4cbb9ef4ca97061077f04ef968652ff08adbfa97fa479a0cd6105 SHA512 e7b082eb434cc930af77168e31cc83c1aedc1de4d8e5f431e84325aa7c52cdd180f60aec2487b11c3c31ea6596f9caab32a44a6eb60845a5b0fc64e71c1aa799
diff --git a/sys-apps/cpuid/cpuid-20180519.ebuild b/sys-apps/cpuid/cpuid-20180519.ebuild
index 045dbac2f81e..5150f88eecac 100644
--- a/sys-apps/cpuid/cpuid-20180519.ebuild
+++ b/sys-apps/cpuid/cpuid-20180519.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="dev-lang/perl"
 DEPEND="app-arch/gzip"
diff --git a/sys-apps/cpuid/metadata.xml b/sys-apps/cpuid/metadata.xml
index 2cd77ae0f5fc..9695f9b2cf8c 100644
--- a/sys-apps/cpuid/metadata.xml
+++ b/sys-apps/cpuid/metadata.xml
@@ -6,13 +6,9 @@
 		<name>Johannes Huber</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		CPUID dumps detailed information about the CPUs gathered from the CPUID instruction,
 		and also determines the exact model of CPUs. It supports Intel, AMD, and VIA CPUs,
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 72d0b1d19e9d..385fb4acc590 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -4,5 +4,5 @@ AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2
 AUX dbus.initd-r1 852 BLAKE2B 8a574a3c2839f0b082067a87f2713348b0c25c47cb6c29db9e67af5d83cfe01fb6ddfd0413893048197d5478021528d9a8c2e8944545133e6eaa650d97c6dd98 SHA512 e5a884269b777b4cfe889dde2bf1f2a6ea8eb68ef044668887946a95960342283386815adedd116d2d668be51ba229714a5a5ec49a2cc1a813f384fc899e30c9
 AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
 DIST dbus-1.12.16.tar.gz 2093296 BLAKE2B 46c4f0d384d76dffd31c18a2d2df03d0658479d8f5b2d14b1db2bf0941fecdc023307ec035e3f977fde570a9f6493bbabd020ac2cd81b0577597e355f5a72522 SHA512 27ae805170e9515a8bb0fba5f29d414edc70e3b6b28b7b65bbea47035b8eafa9ac4820cdc92645be6035f6748f8aa45679e1ffc84ba74a64859a3056d318b9bb
-EBUILD dbus-1.12.16.ebuild 7802 BLAKE2B aff1774dfd719b43276b1cc3f0186c24c27841708ba04a9c77c1dd9c42144a559e353b4a77be70eeb5b1487b5608f4afe38cca5c7b2a567ef160e34b534851e7 SHA512 23742bbac4c225f564241c0decc782a00c9f9c527300ca873c254263e97e62e8fd48dfde800bd1df5a162be14854691b778b12b7b98f8e54484b1afa0901fae2
+EBUILD dbus-1.12.16.ebuild 7829 BLAKE2B 57cc96b05985fbbd376cf899f8e5ebe9a86f6a0cf1f484c533483468133559a9f9a6249f16477d775efe703e08c9e40b56d0b3c380ee314315419e7cd10b954b SHA512 b99fe368708a48969d22652cf0e306d791269063b09a1dcb028ac702520161eb88da882fc01cd16247f5af95f865c32cffe20df6d9ae9f4da2994fe840ca6a47
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.12.16.ebuild b/sys-apps/dbus/dbus-1.12.16.ebuild
index fd7c0d7139d4..f4be11b25cea 100644
--- a/sys-apps/dbus/dbus-1.12.16.ebuild
+++ b/sys-apps/dbus/dbus-1.12.16.ebuild
@@ -14,6 +14,7 @@ LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc elogind kernel_linux selinux static-libs systemd test user-session X"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( elogind systemd )"
 
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index c28f370aa248..33b564bd3011 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,8 +1,10 @@
 AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3ecc7a1a8587af5d56ce3ffde76608ffc7d5cde099fede8b4da76247ccabd7060b0306d2311db716b12e0bd4fb6062ea782fd2dd3d SHA512 05ffb53243a178e91d67066a30039e9ccc21caabe7769e8920548c615b6d9d23959125f2fc9073cc70ba3f3502df7d780db59e4768e7add2682af98079bd6bd4
 DIST debianutils_4.8.3.tar.xz 159292 BLAKE2B e655741f42594ff12b4f349331da57ec09073802c9778594619686c93fc3061cf5248ac8e9e2c1b391eb49dd572f3033b1db206ff43f373b17caf7f3c835111f SHA512 468b8f001c0338f166cbc2fe25079edc5feeaa38dce2f5c7e6724c691d6cb35f4843e987695e33ead557bb11887e78ff8a5e3e1f52a266a0f32fb978fa643897
 DIST debianutils_4.8.6.3.tar.xz 156672 BLAKE2B bb87e04ca80a04c8841f04c877acedb0b953d815193069bb601d17907101bb6faf11bea99251a13a7c3b9ea6fa5d27daba264ea6924e542d9b574c87b3ffbebe SHA512 c38d1d351de69f270924f05755501d90cb7245c8a3154f91ea8e38978052ffe2ec016d4400c55e2f7d31358cfe134a40c5843a33836900d7e69cce9ee8ace98e
+DIST debianutils_4.9.1.tar.xz 157516 BLAKE2B b2c8927e37448f4e45f19b4a7d2977198d2c610a203a2c8692a0592c8c8319c5dc42050b83435cb7381e30cc653911083b76717a53ac908113cc7388a4155167 SHA512 b442950febe6df9e15ec04a6fec0ee8be12d3eac38dc3f9331438d871e3382f4e0f599da0eaeff0e7e9ba0fa5136ce3c3b51c6718e4d7f11c1675f745052a9b1
 DIST debianutils_4.9.tar.xz 157104 BLAKE2B 885f37b17eba7d20b2d76a0fb1afc6ccc2d9d4926754b9ce15928f3675eba4a38fec2e9b718d61684122f3c0dc17eba0aa06677e41ac641870ffc87442353951 SHA512 4e8726cf5744dca144535883c473a04884714afd50e501a140197fee9a9a78bd9596fcc1763e71b2baf6367bc38a8111016ab5ed35f4d4e98ccc78be697ca963
 EBUILD debianutils-4.8.3.ebuild 913 BLAKE2B e0549e48cdb31b2b1b12b03b6462aedcc5a8f31b380528781dc9ed4b81af87444436b4af6a33e5277dcefcdde2e0a2330ce46257f7680d20f70c6d86b37efdc5 SHA512 bfbca6bfdfc573d9a7845986c9df41023b198d4a18924e393055cf261daee2097d244239b5433b4ea9002e2ccc9a581b096e42706d36a147c05c99c6c27d9fd7
 EBUILD debianutils-4.8.6.3.ebuild 910 BLAKE2B f970cfd3eb80c408487267b30546519495a55d9235a425b6515e77106c23cb993fa57846c7c255490b386e79ea64338d69cb943c1da4a3caf77517d359bac13a SHA512 8a31f8442f6bd38b0a2826c031d72d79df22e3a9b5228e71deae5495eed27895284e751ec322e5492a79db081bb487253985306a0593b86061ec5bb0297480f4
+EBUILD debianutils-4.9.1.ebuild 898 BLAKE2B 4bfa4e9ffdd8553d61774d73fe19a06c4d29e073ab3e907a92ff93eabbf8290187241eb788ddcc91c97f27c2151ba2361a4284579b70f70c6f2f1c5e89473ea0 SHA512 d5c25f98f3c07c757285d34f869a9057b487d1aa070768cde2289ede5e05dfcb54687f6b3e91552861263854ea0a2b58d5babe4265af56f71ef2ef56485bebce
 EBUILD debianutils-4.9.ebuild 910 BLAKE2B f970cfd3eb80c408487267b30546519495a55d9235a425b6515e77106c23cb993fa57846c7c255490b386e79ea64338d69cb943c1da4a3caf77517d359bac13a SHA512 8a31f8442f6bd38b0a2826c031d72d79df22e3a9b5228e71deae5495eed27895284e751ec322e5492a79db081bb487253985306a0593b86061ec5bb0297480f4
 MISC metadata.xml 355 BLAKE2B 9f0e6370bbf41d0180e561b2a747f2d3b9e400ea2f9396c059f0b03ad5293032554135573e5fc02f4d91b68d41bdb6722946662eb1c94ac10b1e0384aaeeeeb3 SHA512 967535ef4f2ce2ae377f05548d1cd15589b6e9ceb0b76c49a3ceec1d464aaff2aea43c98be4d8ffd7a8566f77dbce41a75d4b5dc489bc03b4f7562af656b3f84
diff --git a/sys-apps/debianutils/debianutils-4.9.1.ebuild b/sys-apps/debianutils/debianutils-4.9.1.ebuild
new file mode 100644
index 000000000000..bebf1792cc3a
--- /dev/null
+++ b/sys-apps/debianutils/debianutils-4.9.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="A selection of tools from Debian"
+HOMEPAGE="https://packages.qa.debian.org/d/debianutils.html"
+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 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux"
+IUSE="+installkernel static"
+
+PDEPEND="
+	installkernel? (
+		|| (
+			sys-kernel/installkernel-gentoo
+			sys-kernel/installkernel-systemd-boot
+		)
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
+
+src_configure() {
+	use static && append-ldflags -static
+	default
+}
+
+src_install() {
+	into /
+	dobin tempfile run-parts
+
+	into /usr
+	dosbin savelog
+
+	doman tempfile.1 run-parts.8 savelog.8
+	cd debian || die
+	dodoc changelog control
+}
diff --git a/sys-apps/dstat/Manifest b/sys-apps/dstat/Manifest
index a71fcfae0228..dce7c5f47aba 100644
--- a/sys-apps/dstat/Manifest
+++ b/sys-apps/dstat/Manifest
@@ -4,5 +4,5 @@ AUX fix-collections-deprecation-warning.patch 899 BLAKE2B ec02bf38b8c40f8f018ba6
 DIST dstat-0.7.3.tar.gz 135583 BLAKE2B c846a06b6039e49944d43cc36178fed74fd4e0e3a1a4418dbe0e5987763995eb36dff0245cfa7107d446b8ac2ea500e13980f87e97aa8e5b8d566ee188be1639 SHA512 db37cc8bb7afd235ae9088e76c4defaa4d76651b111fbfdcd0980bc96376de20d57964912799a413397a79651730503bdeb8fea5cb97ab4d6d81632f528aefd2
 DIST dstat-0.7.4.tar.gz 139992 BLAKE2B c8226358956687a4f64e248ef539b431b9e394e87986366f9941df2e86f0dac3032261ec2ca9c816d3bc89afabc352bc8bc80f9ad3eaa6118fd16bd7b0f1e68e SHA512 d100223887ebd83d0fd1259436f39419a85df9002556abcfc8e4195aa63be73d85707dcd5c4fb56a979b29131485dce6e97c177fbfca08dc50bd0f92b15cc6f5
 EBUILD dstat-0.7.3.ebuild 865 BLAKE2B 60f79ac34d777a864ad9aaa154346323b7818e219833ff152597cf1f148f60439e19430e303b0ca3fc66c69538fde1d3744d91246fe5779644a73c77558fe52a SHA512 b4462000fcd9ff5554f6e3c5571997e0db595613efb13eaf7fe2a722a79e5115046039fd09ecac7578b661c6aec15a4180ff53f87dee51e17b3b9e11f95cfbe0
-EBUILD dstat-0.7.4.ebuild 1172 BLAKE2B a1c254ba09260da9fb94f23a45ed5b44f5424834c1452deb2fd55bb2a025dd13eccc2fb002ed5d66267874a868248d2f71d67811a70ecf016c336a0d18a64a84 SHA512 9591bffb3ec35fabdd3bd425c4a31300c0bd123f819318b84b77df05f6ff2bd6d22038c3fc4c919fe86076e2dd476689b60a2c6ace7f075f9a61d3de0d0fd096
+EBUILD dstat-0.7.4.ebuild 1166 BLAKE2B b5978c06f2ca4e89f6966fb4454c221519b15c8f35630b4e456e8696d4c2d50e4a1f58da7760d78cf03890c548c9367193e78eaf44681ccd5725121aed61afd3 SHA512 af9c40ee325c6907eecc4dc3b46071fe21f3e142addd05920ed9c8d4d9c1772228a190319f6414b6b209a395e9d972d3df2c7a1459cb3845de050178e1a4dfcb
 MISC metadata.xml 867 BLAKE2B 11beeb2f2c4f397a0be3f5c97351be3d0ad6a3d54132c8a354ee405ca429d99b0d8983ca844e4d07d4d25d3be2642f6b1c4cd47068d91bebf89b5637ea86a7ef SHA512 751ac86ff9b2aa7435743d9fff4d44a1c34a9e6bbd568c3637f2f32564723c45d8de84840b90372cd809a6d9edf7ddd706927e24d6611583ea33d7be17eef1f9
diff --git a/sys-apps/dstat/dstat-0.7.4.ebuild b/sys-apps/dstat/dstat-0.7.4.ebuild
index 3c7300ff8da3..205434328b2a 100644
--- a/sys-apps/dstat/dstat-0.7.4.ebuild
+++ b/sys-apps/dstat/dstat-0.7.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dagwieers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples wifi"
 REQUIRED_USE="wifi? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index 3096ea0a25ce..c360e6b579a8 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,5 +1,5 @@
 DIST ed-1.14.2.tar.gz 91773 BLAKE2B c09ae263e08e07ff1b3411bfea2bf39d7c56364c2c66359ea1447176b42dd0df85464eae7326b983dd64f1d344e25214ef9427be52f5fcc9c57473ca1dd02a44 SHA512 e7638a07d6bdcedc2e00686a6677075fd7b8becebfd7650e60794bcb0d317a8611c7acd90420c952cc6c4beaede250eabff304d27585e190985b1f83e5930057
 DIST ed-1.15.tar.xz 67924 BLAKE2B 89a5614e528f974853d8c23060b77a872ae34675f6898b713543109d3a21d0d42b4d07fea5e86e842a34619617d342058ebb82655088320764295422f700fdc4 SHA512 b723353d4f2a1e719b79cb210750596c723be87c282ab96285524eb707d5ae15c242b2d7b0a282ce2ebd0aaf221cd2be41897e79f8fc17f10e9e318a9be487a0
 EBUILD ed-1.14.2.ebuild 904 BLAKE2B 7082d93e7f0b4d25de048276203d0a7f86ded0523102a2ebdb6cfe09fc3ed095e54e833b5acfd8f8246c1e40b3915b01b0794b686fcdad98d7cbf5a66d3103b0 SHA512 5b9a117adaba19625076775d724ddb85830c974bafd748b03bf0ff71559ab8d44bee7f2a08f3df712f16fb9fa12a273417eff473e2059884361b4e9433c424bc
-EBUILD ed-1.15-r1.ebuild 945 BLAKE2B bb2f7a6d24b312becce52795593c486930a65be5b872747f6f099962a13c2585d92a9bfae297f94fc6d0a05551c52c98068a030e6b609a2227b0695f81ffb181 SHA512 06824d4d8399429f54872e972b62418a892ec7fb5a4cd81a0d1793be7b04b64b9b5ca040f55a08e63223e7cbd31d6c6c0d20fbfcf65af97bd357d99bfc93bb2b
+EBUILD ed-1.15-r1.ebuild 942 BLAKE2B 6dec1af6c4b3b21874740f6fb52492fcf6a981bb6c5838904a886ac4fc7e584104c643ab2477f0274e13f7c4da7084dee78c7529eff2cfad3c6d5b7283af8630 SHA512 e09eb537edc7cc9635b409ce104cfa64f49e45acdfc0d8068ae071cb9314a4cb563be8852eaab04866dee878dee5225bd36b73f4bb82502a880dc1ba49eaad8e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/ed/ed-1.15-r1.ebuild b/sys-apps/ed/ed-1.15-r1.ebuild
index 95fe9691666d..b6fd0d2170a4 100644
--- a/sys-apps/ed/ed-1.15-r1.ebuild
+++ b/sys-apps/ed/ed-1.15-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/sys-apps/edac-utils/Manifest b/sys-apps/edac-utils/Manifest
index e179fea95345..36148a2483f2 100644
--- a/sys-apps/edac-utils/Manifest
+++ b/sys-apps/edac-utils/Manifest
@@ -1,3 +1,3 @@
 DIST edac-utils-0.18.tar.gz 285909 BLAKE2B 7d2662daf94c4ff796760b4863837861015397016bb79202baaa194608b61450d6749981cec621571267ac818a09af758167d2d768513e7d5bf7e763aed7ee51 SHA512 5c81b11c28e8fb3198f2d656171493877393024d9e31233c252d358d8029aa83065e7b66ea87d742518f710466c9ba7dfcf57a1641374ce169cf95fd379101fa
 EBUILD edac-utils-0.18.ebuild 1072 BLAKE2B af78cd06b62a759d5ea5355a76b76d9ca98f1589a75200e42d6c36b1dc7119bdc0b16a0d1ced90322b2eef4394734f97b018e7b47d36d1211fea6c21de9b43fa SHA512 e5721db1b985127cf7423d71494b722e157a1d76d3891e217ae29555cea82fddd7ef9ce0b551425f508141dbc2b3d03fb8bc8f662c58ea2c14b0e9d16efc3273
-MISC metadata.xml 342 BLAKE2B 809bc5970bcec8fa54767406dee65a45bb8d1e10efeb5105ed39b5a6b771d0b821d020a68950e54f22985663bf9dc02586300a74f5ce90f31f4885f95c8bc9e1 SHA512 d11d055d89b95dcd5fe62b514053918f3bda64a737cff22935bc74d0dd8506112599ed503275741dff8edbd4ecab9ee81a4d6aa33add6ef63b059d84f59c4e4a
+MISC metadata.xml 254 BLAKE2B 1392a93224819fb2dcdf8e7842fad36812de4dcee5e7424e55932c71885354ee8e308b407a8c7ff5f22b3fde199c17a83c2fc743f0f56d8d21e92dc5b3a43252 SHA512 ef70b7addb82535bb76effbc086b2e94c868c0eeefd321bed35d554f4117007ff5dba431561b16e90ff42a23011568b877959d9d59eac6c7c59642ed9d46bd91
diff --git a/sys-apps/edac-utils/metadata.xml b/sys-apps/edac-utils/metadata.xml
index 3ecfedb65827..0d757f0cc8d4 100644
--- a/sys-apps/edac-utils/metadata.xml
+++ b/sys-apps/edac-utils/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>dev-zero@gentoo.org</email>
-    <name>Tiziano Müller</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">grondo/edac-utils</remote-id>
   </upstream>
diff --git a/sys-apps/edid-decode/Manifest b/sys-apps/edid-decode/Manifest
new file mode 100644
index 000000000000..c640517af892
--- /dev/null
+++ b/sys-apps/edid-decode/Manifest
@@ -0,0 +1,4 @@
+DIST edid-decode-0_pre20191207.tar.gz 56644 BLAKE2B 85869293a3f47558f0e1c7dc22e482299cfa19ad62bb4801aa03f303a7f4e63f4a8424fdd177fbc9aa510183283322d68b519e8436648d763e7b983e490a39e4 SHA512 bbbf98394409f6bb043e67be0a91b4aa0a596b3f10d5e8b033597fac723b98df3b57e5ecc591a5dcb768eb98cae8390474000fb67ca82cf25d617652bd835ba1
+EBUILD edid-decode-0_pre20191207.ebuild 690 BLAKE2B ff56c136cd30ee131d5e8a91886054ff6b497955ee6af9b1ef319e93ac19a8ce1ee96f5b181d29c8ec42416f5376fd4a8e485c0a56914ac8cdd174fa5d496c7f SHA512 a747f1bb0ca00d23c28c54aa57d48a2be1ef93199cf47ed146270ac6d196a2ff0a4fe86138d8f8adcb21d679eb7b169030f637e39a68a9b8f3e13edc8060903f
+EBUILD edid-decode-9999.ebuild 550 BLAKE2B 6e79eb700ebfe891bcd2f5451ecb80a27bcbb29af23d0126f5105f984372986c23527e7781b5f5db1737fd1c6c3efe8688e2de6c84e1515f7ad6cbaf7b783739 SHA512 c913ea25760f4ef10d56c1467f3de2a9c79bac6f0f25768989207aab8354dc0fa8903d100773fb81cfdc0118d8ae6762ab9436db11c0cfba7e270fbd17bc3d76
+MISC metadata.xml 646 BLAKE2B 37a3db350195905c7a4b420d0d2d2d4741cca1b3954d42620a9a411696a734702e145bde400c4d68997aedd0de45d418faacb1d132ab385f8454f7f5c0039260 SHA512 95293d61feeeca16b0341a5c5fad464db4fca0d2dcfc9b7f51cb3d2984f3ff4530d2938d80ecdf658fc2c784368166bc5fbd220787de6564938ee2171f1816e2
diff --git a/sys-apps/edid-decode/edid-decode-0_pre20191207.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20191207.ebuild
new file mode 100644
index 000000000000..782193f55c43
--- /dev/null
+++ b/sys-apps/edid-decode/edid-decode-0_pre20191207.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+EGIT_COMMIT="46a0691551e44d49a2c3951a7d944786131c97c3"
+MY_P="${PN}-${EGIT_COMMIT}"
+
+DESCRIPTION="Decode EDID data in a human-readable format"
+HOMEPAGE="https://git.linuxtv.org/edid-decode.git/"
+SRC_URI="https://dev.gentoo.org/~conikost/files/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	tc-export CXX
+	default
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	einstalldocs
+
+	if use examples; then
+		insinto /usr/share/edid-decode/examples
+		doins data/*
+	fi
+}
diff --git a/sys-apps/edid-decode/edid-decode-9999.ebuild b/sys-apps/edid-decode/edid-decode-9999.ebuild
new file mode 100644
index 000000000000..8e35fcbc1324
--- /dev/null
+++ b/sys-apps/edid-decode/edid-decode-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit git-r3 toolchain-funcs
+
+EGIT_REPO_URI="https://git.linuxtv.org/${PN}.git"
+
+DESCRIPTION="Decode EDID data in a human-readable format"
+HOMEPAGE="https://git.linuxtv.org/edid-decode.git/"
+
+KEYWORDS=""
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+src_compile() {
+	tc-export CXX
+	default
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	einstalldocs
+
+	if use examples; then
+		insinto /usr/share/edid-decode/examples
+		doins data/*
+	fi
+}
diff --git a/sys-apps/edid-decode/metadata.xml b/sys-apps/edid-decode/metadata.xml
new file mode 100644
index 000000000000..207a2c8a4f1d
--- /dev/null
+++ b/sys-apps/edid-decode/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		Decodes EDID monitor description data in human-readable format.
+		If invoked with no arguments it reads from standard input and writes to standard output.
+		With one argument, the file named by the argument is read instead.
+		With two arguments, normal output is suppressed, and the binary EDID blob is
+		written to the file named by the second argument.
+	</longdescription>
+</pkgmetadata>
diff --git a/sys-apps/edid-fixdim/Manifest b/sys-apps/edid-fixdim/Manifest
index 0d6884553814..ae2e5e2bbc3d 100644
--- a/sys-apps/edid-fixdim/Manifest
+++ b/sys-apps/edid-fixdim/Manifest
@@ -1,3 +1,3 @@
 DIST edid-fixdim-1.tar.gz 3236 BLAKE2B 4ae6954fa4c93f143be5e84f364f4b229054bd385aa0bc2ec85b4dfcd2eece8e5e3f1a4039188fcb3fe979f0de473b6c876c73e9ba642d0e10f8656d62c36d8f SHA512 614908e2ca94c97cb998f789ec383a72237c5be4544cf8b02d7754817bea90de87993acc11d917c1c5b54009ca8f41560e7468d97dc3f21b7e2891a36d4dbffd
-EBUILD edid-fixdim-1.ebuild 549 BLAKE2B 2c4f9ae19ed72ce0c5de38692b4245529d6f24e50d03cb678413cf55adc4aed11576b5ed6cee4c7f096d2bb30f1c05fd091f96359677bb59129aa16d9b65bd99 SHA512 360ccdfdd0d9f7f077844dd4bc125ad7bd5d19196620dd87bf517968e9aaefa98352579f25602e75f0cf20921cca0b4f605ea7ad730dd7eb5428c64879b80655
+EBUILD edid-fixdim-1.ebuild 534 BLAKE2B a24e479d84dfef905beac039fdaa85c6b72d214e6e891bb7e3a87f35652637f00329efa49926700263ed9a22afd64d361a30e762eac82048f9152b999cfbb209 SHA512 d9c236adcdfc31b1fb0c4b6dad02bbef4b12ac09d26074441c140e14b1cbe14ca52afdf115eca9625ced1a005ed142e5b1c2fc03e7792bd0185ab55d6164f3f2
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/sys-apps/edid-fixdim/edid-fixdim-1.ebuild b/sys-apps/edid-fixdim/edid-fixdim-1.ebuild
index d02cbbfe9821..4d90008faca8 100644
--- a/sys-apps/edid-fixdim/edid-fixdim-1.ebuild
+++ b/sys-apps/edid-fixdim/edid-fixdim-1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 inherit python-single-r1
 
 DESCRIPTION="Tool to fix screen dimensions in EDID data dumps"
diff --git a/sys-apps/elfix/Manifest b/sys-apps/elfix/Manifest
index bb482087d861..6c49ad8abc13 100644
--- a/sys-apps/elfix/Manifest
+++ b/sys-apps/elfix/Manifest
@@ -1,10 +1,4 @@
-DIST elfix-0.9.2.tar.gz 398758 BLAKE2B 22f8d9e85be2ae9bd906dfa6a1d8b7614f017686b4563ef7e97898a112a56cff59a8cb906ec957b7a111a5c9251a3de6b13dfb66ef9f732099ac610928d5321e SHA512 a7be30722abe7249ec42024d33b2bda00524cfb85da66b4511c5056efbdbfae1d3c2b42048bcf4d5cb7c0ae675f763b74a834d93a25b541ebac42fddcd2c6cf9
-DIST elfix-0.9.3.tar.gz 399533 BLAKE2B 7ff2099218de3352079564971cd2e3851a95820552b9057387b78945fb1a23d7b670591b174dc974ca2b0dcf3948546578a210687cbb16625dc5d638abf83169 SHA512 3395ce2e6d5e9fc9bdd93b58751cea33b5fb8e25e0a390e6261de6804cc54d4e1f91b4b5843fc45c9178d86d23e9932bf9d0f133a6d086607bf52ce16c65fd0d
-DIST elfix-0.9.4.tar.gz 399606 BLAKE2B 51b8b2f1c3cce306c7bc0716ad351bbf446a369a353bcd1b5faa41984dec37e08dbeeea87fa2425820af9f76d36209554b8e602338d01d0ad50e6d95e6079529 SHA512 f705f63b0ca57077f56e519a22ccaeb2e07f57c5269a6e498571a1799286f12098ccc9a92d2126b51b498447a098b0ce22d54c0d97c8c98d25426fe1e00c6e07
 DIST elfix-0.9.5.tar.gz 401722 BLAKE2B 184f8944c62412675819ca86f13bcf23039ebcf069df528267f3e4272859e6cc442a1e05a7a121d88987c282d7e2f513d02f28ce41a8e3c0c226b456fa256aa6 SHA512 e15ab664357796f3a63ac54912eb43ae659947088a10ef16aafcbdd713cc3670fb0319cb2b95a2d29092866d322ef69df1d63847dfc0c4ab2cdd49e6eaa4635e
-EBUILD elfix-0.9.2.ebuild 1131 BLAKE2B 6b23b4204cee8654d34140967e95d0f6e8d5340ebf12948a168c260fefc0dc8f5f8891564579c52d27b3a7b79cb260ae7bd2f008489e4d83d809874fa49c593b SHA512 0b2eeed50d4478894cf3e3d576fef84d725caca54da95e41e98698c4a1fa226172d9ae8fa2b343f59db2229aa5596a7fdb8266868a63667f548567d262a4d451
-EBUILD elfix-0.9.3.ebuild 1132 BLAKE2B f49fd5cfe798d82dc4f2629ff4b4a89ab009f893aea00f9afedc7b6967ba285108cc39408c9e87a9e3479288cffb0fc07e02fcbf555e5be04b2953531f2a89e7 SHA512 ad0ed8032bf426f47973dfb5e3952645f384b09f1f1cefa496725b80cfdaecd0b6d1c90adbe645580f6464339cd0fe4db314b9318dd8361e63f60b79554a45c0
-EBUILD elfix-0.9.4.ebuild 1127 BLAKE2B 77304b496841a74540cb10daedef9ed538ee2814d0e781dc23962e1c3aca6e556d79aaac59f54b0a91ac22da553c808b7ccf3d4737dcf7e7dd8e0c984a6b0129 SHA512 ae6de33cb4d494b432e7c3ad424f4a3762b68a3c98f94fdd2a512713feaf71855b61fed3b14547c544fccac95c093e03bbe40c1d139d9a34b8c06b5bf4d70ed6
 EBUILD elfix-0.9.5.ebuild 1127 BLAKE2B 77304b496841a74540cb10daedef9ed538ee2814d0e781dc23962e1c3aca6e556d79aaac59f54b0a91ac22da553c808b7ccf3d4737dcf7e7dd8e0c984a6b0129 SHA512 ae6de33cb4d494b432e7c3ad424f4a3762b68a3c98f94fdd2a512713feaf71855b61fed3b14547c544fccac95c093e03bbe40c1d139d9a34b8c06b5bf4d70ed6
 EBUILD elfix-9999.ebuild 1137 BLAKE2B bdd63adab9dfcbcef879b4eb35b15168533315f85de4098dc4477c6836615261e7c6a508c987a460c16836590ec26212fec6142b6b7f16985408c335314e8847 SHA512 00f937ff54b0e32255a6e59a3979340d70665b818a363d7c953c8b6aa7d79c6d55731ba23ee8b3e0a3ccb2f32f6eee2993df0879c5c51b60bfd77d740b5439f7
 MISC metadata.xml 496 BLAKE2B a26ee20b4388a77bf12e032c2091b534653874b6f0880775298da89286487d07709511d64e52b0240206d661f8874c55d4d87ce3bdc73e60e9a1432a232cf219 SHA512 b934fa247d4d5bb1d188de8bead5980aba83abe50423dd1e56c534b762b535faa242dbab58021e91bea43951542dc4f5885aff3754cc0957f01e86832bdd2c5e
diff --git a/sys-apps/elfix/elfix-0.9.2.ebuild b/sys-apps/elfix/elfix-0.9.2.ebuild
deleted file mode 100644
index 2bc81bd6ca54..000000000000
--- a/sys-apps/elfix/elfix-0.9.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/elfix.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/elfix/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
-fi
-
-DESCRIPTION="A suite of tools to work with ELF objects on Hardened Gentoo"
-HOMEPAGE="https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml
-	https://dev.gentoo.org/~blueness/elfix/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+ptpax +xtpax"
-
-DOCS=( AUTHORS ChangeLog INSTALL README THANKS TODO )
-
-REQUIRED_USE="|| ( ptpax xtpax )"
-
-# These only work with a properly configured PaX kernel
-RESTRICT="test"
-
-DEPEND="~dev-python/pypax-${PV}[ptpax=,xtpax=]
-	ptpax? ( dev-libs/elfutils )
-	xtpax? ( sys-apps/attr )"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	if [[ ${PV} == *9999* ]]; then
-		eautoreconf
-		cd doc && ./make.sh || die
-	fi
-}
-
-src_configure() {
-	rm -f "${S}/scripts/setup.py"
-	econf --disable-tests \
-		$(use_enable ptpax) \
-		$(use_enable xtpax)
-}
diff --git a/sys-apps/elfix/elfix-0.9.3.ebuild b/sys-apps/elfix/elfix-0.9.3.ebuild
deleted file mode 100644
index 01cb2e36fd14..000000000000
--- a/sys-apps/elfix/elfix-0.9.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/elfix.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/elfix/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
-fi
-
-DESCRIPTION="A suite of tools to work with ELF objects on Hardened Gentoo"
-HOMEPAGE="https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml
-	https://dev.gentoo.org/~blueness/elfix/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+ptpax +xtpax"
-
-DOCS=( AUTHORS ChangeLog INSTALL README THANKS TODO )
-
-REQUIRED_USE="|| ( ptpax xtpax )"
-
-# These only work with a properly configured PaX kernel
-RESTRICT="test"
-
-DEPEND="~dev-python/pypax-${PV}[ptpax=,xtpax=]
-	ptpax? ( dev-libs/elfutils )
-	xtpax? ( sys-apps/attr )"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	if [[ ${PV} == *9999* ]]; then
-		eautoreconf
-		cd doc && ./make.sh || die
-	fi
-}
-
-src_configure() {
-	rm -f "${S}/scripts/setup.py"
-	econf --disable-tests \
-		$(use_enable ptpax) \
-		$(use_enable xtpax)
-}
diff --git a/sys-apps/elfix/elfix-0.9.4.ebuild b/sys-apps/elfix/elfix-0.9.4.ebuild
deleted file mode 100644
index c5af80158a39..000000000000
--- a/sys-apps/elfix/elfix-0.9.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/elfix.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/elfix/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
-fi
-
-DESCRIPTION="A suite of tools to work with ELF objects on Hardened Gentoo"
-HOMEPAGE="https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml
-	https://dev.gentoo.org/~blueness/elfix/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+ptpax +xtpax"
-
-DOCS=( AUTHORS ChangeLog INSTALL README THANKS TODO )
-
-REQUIRED_USE="|| ( ptpax xtpax )"
-
-# These only work with a properly configured PaX kernel
-RESTRICT="test"
-
-DEPEND="~dev-python/pypax-${PV}[ptpax=,xtpax=]
-	ptpax? ( dev-libs/elfutils )
-	xtpax? ( sys-apps/attr )"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	if [[ ${PV} == *9999* ]]; then
-		eautoreconf
-		cd doc && ./make.sh || die
-	fi
-}
-
-src_configure() {
-	rm -f "${S}/scripts/setup.py"
-	econf --disable-tests \
-		$(use_enable ptpax) \
-		$(use_enable xtpax)
-}
diff --git a/sys-apps/entropy-server/Manifest b/sys-apps/entropy-server/Manifest
index c00ee3738c8a..88a994c742ec 100644
--- a/sys-apps/entropy-server/Manifest
+++ b/sys-apps/entropy-server/Manifest
@@ -1,3 +1,3 @@
 DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e
-EBUILD entropy-server-302.ebuild 805 BLAKE2B 11097be0364aad2fa4f58a5fc80aa44722aa139bc74524a6c772c306aed5459e1450a7b0eb7afec73d00f3fb301a5d33eab2e5bc72791e06f009ca1e2d55a012 SHA512 2651eb5451b27ee43a63cb9eb152ff42017887d89f3a44133e55010007956eef8cc7215b17a871d990198d748310e198dc79e7686c8c2ba66576810153bfca33
+EBUILD entropy-server-302.ebuild 776 BLAKE2B 13436e057e4de1a9cfe8bdff55574d831f8187da0530f53ad272cc733214bd477b431c22fb07af9c52b22a4017ee4417c462283b3c547bb74ac1cad69588373f SHA512 1c6d3d642b4b43389cab5b6ce62b3d52896dc4671d0eb45b0ae8906009514e9636cae9e1cd512a141b229519a0509ff4e649b422f48a16351583af7602f278af
 MISC metadata.xml 320 BLAKE2B ca21ea36322c6397cc3a57f84d8392006a14261a39c4cfe15da3434916deb3f44c087514f1f2e6658979daf1fa5593f50b920fe3b433e18ed74564cc34df1819 SHA512 a04e6b7dd069d705503948c17b83da870d918959a1a82cb67efcdb21df45bf8b3e3e43213ae2dbd584cb99516b99585a792d6d022d8fa2577fdc0b2f82ca0fea
diff --git a/sys-apps/entropy-server/entropy-server-302.ebuild b/sys-apps/entropy-server/entropy-server-302.ebuild
index c2eff7b2fcd9..cd447283274e 100644
--- a/sys-apps/entropy-server/entropy-server-302.ebuild
+++ b/sys-apps/entropy-server/entropy-server-302.ebuild
@@ -28,7 +28,7 @@ DEPEND="app-text/asciidoc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install
 	newbashcomp "${S}/eit-completion.bash" eit
 
 	python_optimize "${D}/usr/lib/entropy/server"
diff --git a/sys-apps/entropy/Manifest b/sys-apps/entropy/Manifest
index cee4a302a995..eed204e24d09 100644
--- a/sys-apps/entropy/Manifest
+++ b/sys-apps/entropy/Manifest
@@ -1,3 +1,3 @@
 DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e
-EBUILD entropy-302-r1.ebuild 3165 BLAKE2B 62ef56df52e0f1c499bc620b1f2b3d401b73038c5458b6478b55bc89a6b106b0b92a03c5ef4682a362fd40634297253da12175a90ff7654a9f23761f2a87f2bc SHA512 d9cbf3cf10f08912dc9bf872b3b13e6e95d8213fed5ed5ca5ab4f76e47bf735cdf0d5f54402158a0baa53587b9f7426666ea2db9543dd5a3461ab157a90e1083
+EBUILD entropy-302-r1.ebuild 3136 BLAKE2B 183542696051e20d2ce6cf2020faa76a78a98fd3efc258b74423f2ecc8454927a204d2c18d4147f81307375700c287753076cc25ad3b069e5b68f0c2950be175 SHA512 9a2b1e6ed5b44912a108c33b8ccf717914a262084d802952afd12f7460ee7ce3b6c8580a4c26e5d0cb183dde997987f813ca7b5677bdc8d82f1e0c1bf7d3e89e
 MISC metadata.xml 251 BLAKE2B 6092e9d1541af183e24d9f6d2eadb7e9dcac2ce623e0f0487448129cc529e6e824d327243cf04f7f4d32f39cf883b7918b3eb2e5d056e7568fbf6b52aea58bde SHA512 bb292278e0e82efd7370aa9e67eab1ec2c2779afbadf10c74fc4e909ea87cdd1ac1ae284c49ca8b910124010237bd19407338bf9290f718637b1a9a7c311a174
diff --git a/sys-apps/entropy/entropy-302-r1.ebuild b/sys-apps/entropy/entropy-302-r1.ebuild
index 0cd3b60c7998..a617ded3def4 100644
--- a/sys-apps/entropy/entropy-302-r1.ebuild
+++ b/sys-apps/entropy/entropy-302-r1.ebuild
@@ -50,7 +50,7 @@ pkg_setup() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" LIBDIR="usr/lib" install || die "make install failed"
+	emake DESTDIR="${D}" LIBDIR="usr/lib" install
 
 	python_optimize "${D}/usr/lib/entropy/lib/entropy"
 }
diff --git a/sys-apps/ethq/Manifest b/sys-apps/ethq/Manifest
index 0dedb945477c..b17677b3448d 100644
--- a/sys-apps/ethq/Manifest
+++ b/sys-apps/ethq/Manifest
@@ -1,6 +1,6 @@
 DIST ethq-0_5_0.tar.gz 15830 BLAKE2B b18326f1564d08f94500aa934838053a3b84b78f3d6fa90984c3730ac8922fbe3fd5141d5e9ff4a2c8db54bb8d2c2e493f5583f46b287324d4327583f29b8bf5 SHA512 989978e0dfbb553497f5325807f2d09e4e2842de9df5f5717e832312141adba3e99ef1d57dde4ac0fdd2919c9f5a0eadef5b5f76a300ab4ac7e881c8509fbbec
 DIST ethq-0_6_1.tar.gz 23475 BLAKE2B 04d933294ba432ed69108022b0a2b13c47537902f66c6969bbd5afca144a977a6215a2164cbefd975d0f599bd8503feca79ef9e38856d8c9e6943c2cd2c3f99f SHA512 72c38ecb0cb6c7d6f522d99f2a6ec08bd2c42065d5f83d86890706a52420006fcdb5774a1457a66ccd5e174113e09c2a4285d311af334616a01c32ad8753126d
-EBUILD ethq-0.5.0.ebuild 1107 BLAKE2B c16d86af32ff3ab46cd9be8eb731a5dbabd6543325d92ec92a55bf36c0f85c0578e509361761877fd3f94d5b988866b54af9cbd7aa25b80ad7d81bb07d0f5254 SHA512 0fea1c575876caadc05f3f85a30eb2cab3a9bdd8bd3b0c006445c0a7be996715382b363c6575bdb370097e724ea6784aeb68c2fbaeca687e2f3ce93d59ba7801
-EBUILD ethq-0.6.1.ebuild 1081 BLAKE2B 48cfd7dab07e4fe6d32620d1216bb3c8b976505fa898ee51da69609d29f70922a3955da43400421833d6fda22f3e8caac04ac72cb82cb16b5ffd06ef145d6933 SHA512 850513e913132a842b2a5ce44c3877420fafc3f3974028869d81f7e58bc673a785518a00984328dc53eb9070c79a67df8f4bf82d10658dac424f1fa8b53192bb
-EBUILD ethq-9999.ebuild 1021 BLAKE2B 0951c541021a76b564a18b97bf262e113f00195448ae6fbe6ffa9abed38aeed94fe58f71365aaba4d1f772202fd9b9e24a1a7844aa7a1ef8d36624bef62a1780 SHA512 84363ea2108c843b9caf0b4970bb2392e2656f2f1caa8c3a923a7b35aa6390062324ec7d3fcad553d1b339e2366a1d886e05e5c5bc846c158cf708b9aba080a0
+EBUILD ethq-0.5.0.ebuild 1134 BLAKE2B 28624d6aa8f9a8d19fbbbb08bdbea6436846f078ed761226b5a6b2bb8da977f524454c2128f7bc43619c52edbe26b787eea0b9ff5e2ca6bd98bc4bdde8d2963f SHA512 680a0d4041432264376a487034a5623713c24fd16c173b0dd58c91d22faf9c9c2f2f4cd7d1bbebf6fac389e5b9c17980d8339e9196954894ecd0a3825d1b3bd2
+EBUILD ethq-0.6.1.ebuild 1108 BLAKE2B b5a7190f422bc8550c3f28ea2cd0670500d0cae8825bb87b6f605b6684cd6c569156f93339972b430dc709a98792dae1ffa9e4ab16a646553f3b701b815f60c9 SHA512 f994c61f5ca592f26f5fa68c3fbe117429b55e470109cc5807ed656f256c69b4561decd5bd1b10b68c3bf645fee1c954d35f4a2e913cf4c97b89f165940ce304
+EBUILD ethq-9999.ebuild 1048 BLAKE2B a3128ed96ad614d415fd69d8b24a56991571d1f4c814e4e05eed7f7e7af69b71777ec8a56e5bf66cd4e507d96bbfd7caece1c1a8cdb88b56b225da0c57bb4d42 SHA512 04f9165e4af08224f2b6d9c3e04b68cf41b474e3bd74556ebf84c22e8928d5c53f882c589d0750d0567539177665543501974d8d6c1425a8a9de3c835e5ee34c
 MISC metadata.xml 627 BLAKE2B b215c0a1e6902bcab4f169740279965bb2b3b26e3bbd79e73aca34449942c6f49a5142758e1b726415f5094f737b86bc4f3625c94a2c575e14f00fbb140e7958 SHA512 c7d1186a0f354e9fa9d44569f7ab22e596d3b5dd996677d080da838f0f0274396fecf208751d7ff3e03123202391a4f1deed6c893310a64575d3a570094bc655
diff --git a/sys-apps/ethq/ethq-0.5.0.ebuild b/sys-apps/ethq/ethq-0.5.0.ebuild
index eaaf909be1af..937e95dba856 100644
--- a/sys-apps/ethq/ethq-0.5.0.ebuild
+++ b/sys-apps/ethq/ethq-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,7 @@ LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="sys-libs/ncurses:0"
 RDEPEND="${DEPEND}"
diff --git a/sys-apps/ethq/ethq-0.6.1.ebuild b/sys-apps/ethq/ethq-0.6.1.ebuild
index 71eae77cf755..b5718cb8f726 100644
--- a/sys-apps/ethq/ethq-0.6.1.ebuild
+++ b/sys-apps/ethq/ethq-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,7 @@ LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="sys-libs/ncurses:0"
 RDEPEND="${DEPEND}"
diff --git a/sys-apps/ethq/ethq-9999.ebuild b/sys-apps/ethq/ethq-9999.ebuild
index a64bcead00ae..59fa6fa3cdc7 100644
--- a/sys-apps/ethq/ethq-9999.ebuild
+++ b/sys-apps/ethq/ethq-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,7 @@ LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS=""
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="sys-libs/ncurses:0"
 RDEPEND="${DEPEND}"
diff --git a/sys-apps/fakechroot/Manifest b/sys-apps/fakechroot/Manifest
index 73a52ef3b60b..dfa57cafc52a 100644
--- a/sys-apps/fakechroot/Manifest
+++ b/sys-apps/fakechroot/Manifest
@@ -2,4 +2,4 @@ DIST fakechroot-2.19.tar.gz 492346 BLAKE2B 9ad9d6515756e867f5e936deec3f6a020f2d8
 DIST fakechroot-2.20.1.tar.gz 504343 BLAKE2B 73459895319c1fd6297ab455e0d15f4b9985f433d958598d8581a35268e4df0f631b39d026061fe5c00ec6b805f3bf4f5f261039b93176db460b6f936c0de1b8 SHA512 9ddc715ff5c550b700c2384284c9f0cf6c2a99353a06d8e4c3b8363f4affdf9a11757ed5d1c9b85c83499b3bec054544290508a20f2ee16d46e66dc824a924ed
 EBUILD fakechroot-2.19.ebuild 560 BLAKE2B b7ca8b03cf134d813ccf36ab31e8b183a8f02c2393abdd66081a82ebbefa2f2f3abd48c2d16a56a0f76b311226790cc9b494b535d64c390bb3a41a3f66078493 SHA512 c6159d2ebd987f2b58b392786d8cf438689d1170160ec3062baae1b4adb5228c3b0426cfbdce938846c5b0025eb61130b21d91577208b5dc22bde31b1583396c
 EBUILD fakechroot-2.20.1.ebuild 565 BLAKE2B a9f08da2069e74a5bdaefecacb714a720e4874d3346b3328b1e82bd22389e196f61200e2c0f504f156e92742026469225d9b583ec6d0044a9e83a1245633303b SHA512 e2ac3e708865d29fad990513e4924466c4d62c0e43cda6cda84ee4b8c4cd15c6d99e12a8b944ef52026eba2f7d4c3b12ead02e300d300f3bfb5b710a7cef3cf7
-MISC metadata.xml 299 BLAKE2B e6a00d68ef91b397077e718c8aad3656c28f0d9030f8c6a1b3526b91dfd16ebd4a74de24a77defdba7cd90e45cf30d4133f8f2bb7d3a284e515374e80f095aad SHA512 4577d40d586c7fedc2346dca9bfbc39fa8f65db7316d320beefdc1fbaa2bf7252dbab451ef3e53aa8fa6bc02bac0f1c34bf4bf8c7615948b08cef9c5bc8ca770
+MISC metadata.xml 249 BLAKE2B c28e86a35ce07ccc4abb7f53597931333d12ba3676c698252179744b361ff822b6346565d8eaa3d1ccd699569240dfd11387f8a80c456bdcec42707863e9377f SHA512 3a7a3d57ead4b33905b475bd13d7a4e6db1c9badcc8d5954d2a9fc4232146e8ace0fecff65c66070fa47ed989b5ee68b87ec5351daacc88d7c9c06f02c8d2b64
diff --git a/sys-apps/fakechroot/metadata.xml b/sys-apps/fakechroot/metadata.xml
index e20ccf3259f4..d715ee50dce8 100644
--- a/sys-apps/fakechroot/metadata.xml
+++ b/sys-apps/fakechroot/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>alonbl@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">dex4er/fakechroot</remote-id>
 	</upstream>
diff --git a/sys-apps/fakeroot-ng/Manifest b/sys-apps/fakeroot-ng/Manifest
index 9f53e7c687cd..95157cb6aaed 100644
--- a/sys-apps/fakeroot-ng/Manifest
+++ b/sys-apps/fakeroot-ng/Manifest
@@ -1,4 +1,4 @@
 AUX fakeroot-ng-gcc-4.8.2.patch 235 BLAKE2B c18f46d8149e7961d6b7c682e6662194f0ce533aae33b1a5fa6a37a95a297f2f0418503066a760834c86c76813758bb051582087953064cc4f039c23e866e664 SHA512 ad5e13c291c6fc9a8fa883cebfc25c14103b2c52c9b7309bea3dd6c46244b1af2278ddfdff98b2e18cf1c3cc7ba5b98097b6280e8761b757cea87ac107b31179
 DIST fakeroot-ng-0.18.tar.gz 207870 BLAKE2B d2e0eff8ec508bb5dcad89f51b80162b3a9fc769d24561cddbbeb83d02e9d6089c9252ad60a628f33c7a5c8d07c7e9db29a19247e6ee9106ff2e68a13ba4e3cd SHA512 8ece6830d229b92537d9c0a2eb42cb9ec4ae6b83453303004dded5eab0707b9ae8eaa2c71aac6ea68226c43cf08db6b0939a9422aab32948f5ecb185ee01d854
 EBUILD fakeroot-ng-0.18-r1.ebuild 382 BLAKE2B e88d9041ac1e27e82a8de5c9696e9f0fd7a882a18ee3a7cdadb7e0cd1b65bfe527955fdafe0318283fcf852542d4a3fce99dafb6697a2750e233f01e8aba8e8f SHA512 fa843fd4f63512c5ce5121c647a2f47ba0076a79e112adc04a376efec5b5681bde122aa8a69265f119a65cd557b95e001b5001a48e54029e5d7e8b6d8e6f79fe
-MISC metadata.xml 297 BLAKE2B 7e6507867c2ae966d2638be66ef76fe9cb53fd7af3357d984b0ba7db8fad9b799201902b2541e2cb05f613372c8f88a2a8413eb404842e5bebbf38b1190cc616 SHA512 1a65bb69a0463bc4528cedda94836703687ebfd7010164f7262a776e36dcad371de1342d222c2ffc0b1136f2b4bcb21b0c5be9096c1884d002167fdb4c8d4812
+MISC metadata.xml 247 BLAKE2B 24a8bfd530a18bc3d0653f60877ed6596ae507ce054da7912c7e58208efaa0466e0a0db061e57b35551cf8fb29dceee18ca5d139559dccf3f0eabb67ba8595a5 SHA512 622d7182502f0c19db9278d4607460c1a5dd932a8013f9bd97a9fce7acde6f7ef639ee89254d96ba752aa54f77d377481972f0a74ecca9ac7b4a4e6d74343761
diff --git a/sys-apps/fakeroot-ng/metadata.xml b/sys-apps/fakeroot-ng/metadata.xml
index 3d0f3bbdd5b0..0cfd8edb60fc 100644
--- a/sys-apps/fakeroot-ng/metadata.xml
+++ b/sys-apps/fakeroot-ng/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>alonbl@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">fakerootng</remote-id>
 	</upstream>
diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
index 2b9ce918438d..6a85c21732a0 100644
--- a/sys-apps/fakeroot/Manifest
+++ b/sys-apps/fakeroot/Manifest
@@ -3,7 +3,7 @@ AUX fakeroot-1.20.2-glibc-2.24.patch 1021 BLAKE2B 1f907d709be9819d4d7a9113fe17d7
 DIST fakeroot_1.22.orig.tar.bz2 338238 BLAKE2B b6cee7483ea7ec17747e638cbfefa565f26b3b00517f3ec90280f8ce556ce8efa3833accc07885365e20f80967a67291fadc27cd80766548cc86e2aa70c74c33 SHA512 193478d9ff88ca2ae69fe47b73b6c61aeb2ba3f2a9e7ed5d455022705857c6f34cdcbe2d3f614c4c4c9509368dc78b9a7b7aa56fb3b50bb3309448140abd796a
 DIST fakeroot_1.23.orig.tar.xz 298080 BLAKE2B eac3da8486d57266f0f6af0479f0fcec5aaf82f4707ad8f810f954373a31cf5f390ef57dcc71ba630a1d4a578df95ac9beda9c93b3c75adffcbc89860f442b69 SHA512 0984679207e6e340abf715d4b26a213f85420cd8c58f21e65eb069337a3bd67436c6f80168412c10b28701689ec63290f122a5ff5d44a57b2b166aa72799d036
 DIST fakeroot_1.24.orig.tar.gz 522497 BLAKE2B fb08ed6512a3e26538662ceb28a197b85fd4a05c37b543529df6880e01c64bd774037bed1230bf7d7fe0bde798364c2fd0fcfab257fff4d3e6ae9800c076a5b0 SHA512 b15db7bbfb03264f294fb3b42813e17758b43ef7f121e55a24af9ec30ff3f4ec8eb0392db88133e56f9728b3828f6c1432d1e5d2e881a69d083ad444b9177487
-EBUILD fakeroot-1.22.ebuild 1041 BLAKE2B b64d63b8148a5f39cad405c35d57d04f561be22a1c1215228fd78450140e274c5de1ac260f82e246147f8866c8c49708abc45f9942fe44e3016ebf67aac10862 SHA512 2abe6975c02acf769651759fb2892dd681ba2985ac6391f5e85bca84d699c92979ab50011ca0ce20e8ca690ec20bae6e999cfe1fa375817045ec7a0171ac1550
-EBUILD fakeroot-1.23.ebuild 1050 BLAKE2B bd2880d451c7d4f66c78ab41a0f019831ede057bb80900816a3f4cc76e2b47634a26477f62ce4549da9a4274eb5513d09ff4b7aa1d5288a7c39800edc490a89c SHA512 7a3f007f8073bff4679678320f07baf00f3c73dcec844ac722d960962b9a579fe6f4857495a2af3c57fffa40443f58b5b644a941d82f374d17ca6e7ad733d1e0
-EBUILD fakeroot-1.24.ebuild 1047 BLAKE2B adf9b6b877e656c6234f50532c1f6b027d5d2cdf1fcbacf55016a3cccd065b6c6064600b0a171246c78fa18b4eb5fecbc5d930ddbfb98d1e686a4e9c20c694e3 SHA512 1dda629c667a46322ced5d03df3035234593f97639926a38baca59cd564dbc1bbcc878c537b5064a4745faf4a2dcc11c3e7b9d7eb3c909c8ea24c5eee879cb4a
+EBUILD fakeroot-1.22.ebuild 1065 BLAKE2B 4d813631249762a7430342f3723fd7c2c1e06d73d90fce5cab7cd04c45710f18ebca06065429308c25452a9bf4bcb958925c6f8f515bed864ca736999890efc3 SHA512 9c40debc98412e04241df518cd89ac8ac71f13be48be21e467b81cea4e9267dbffffe055c74152bf9b59c6ad541b8c1509d98a89d755486294c03bfa64d67be5
+EBUILD fakeroot-1.23.ebuild 1074 BLAKE2B e0f810e84eae6eea778b7b23b8bd6e8cf9c83db4f9b58cd9e6705bb1811f8ac2f626959507865cd8b234577434a4e2aef6b77082b0422eac481e1e63a2907722 SHA512 76fe90adcfa947f794365bd641beb1d63ab76295bc6d5dc2541800c856594d61fe3c34aa1bb9c62e7463ed73986c59461cd8bbb5b421d493336ed313c2632904
+EBUILD fakeroot-1.24.ebuild 1074 BLAKE2B 5fed05940ea6f9b96e9c55d358339d01b5277d7e349399706d57f6c32cc431afa5395dbb6b84a415eb6bf82395615316ca5cd4d43eaaa6a9e846b0753727e764 SHA512 4cdf4722f803337aa923edbee68230ec2badde0c0cee46a5319c10c5141a3f771ecef4d5c7c089dca8cbcc55f5d2dc026325fd1ff737fe1f01036a4655e314c8
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-apps/fakeroot/fakeroot-1.22.ebuild b/sys-apps/fakeroot/fakeroot-1.22.ebuild
index 4ca2e7a5a9eb..2188878e4d84 100644
--- a/sys-apps/fakeroot/fakeroot-1.22.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="acl debug static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	sys-libs/libcap
diff --git a/sys-apps/fakeroot/fakeroot-1.23.ebuild b/sys-apps/fakeroot/fakeroot-1.23.ebuild
index 91ad0aff45d0..c0f5629f8051 100644
--- a/sys-apps/fakeroot/fakeroot-1.23.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="acl debug static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	sys-libs/libcap
diff --git a/sys-apps/fakeroot/fakeroot-1.24.ebuild b/sys-apps/fakeroot/fakeroot-1.24.ebuild
index 336e7ca459d8..791263fdb16c 100644
--- a/sys-apps/fakeroot/fakeroot-1.24.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.24.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="acl debug static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	sys-libs/libcap
diff --git a/sys-apps/fbset/Manifest b/sys-apps/fbset/Manifest
index 067c54b65cdc..c095d93b61f4 100644
--- a/sys-apps/fbset/Manifest
+++ b/sys-apps/fbset/Manifest
@@ -1,5 +1,5 @@
 AUX fbset-2.1-add-linux-types-h.patch 275 BLAKE2B 177b56c3989bf360609d3f4541537b279e6a57e3f83420c2f55edb472a5b685602dc73b852626232784afb044a79e0532cee0107ee2a4204b42cf68fbb820b2a SHA512 fb13052aed519da65e1197d81b1c583cae0c6528c362966caa3c65b324a115345745550e2589a92e0c8bab49215dd99252c14704dff71a2950332281ae83749c
 AUX fbset-2.1-build.patch 458 BLAKE2B 93340436783aed64145832fd491223a085a4497adfcfe44a7d3ed100171e0f4dfc608beda73e2659fe93dc9a965d0df47eaf0018a4e91087cabcd5482fbffdaa SHA512 97d8df2776c634ccdcf49433bb45e8e7d944e5d7cc34fe0f55085f76f0f5dfc216323a0f4e58d256767e83987dd73e96be3393bd727d791edd12f0b63ebed819
 DIST fbset-2.1.tar.gz 27721 BLAKE2B 3d078a41d178ed5347d3e8907fa4ff55c1971ccfcca3ac07ec251f7f2949b7133b4589628e349eb29c344e9a5969844b8bb3c423b329f99943a5a5f93e152d65 SHA512 7e0380760f77b0db7dcc128f6375a3ed8da4b8521d1926faba27812c5cb20e6f1a62f3a539591a81a6b7e7986940db4cd83e03d6de487e0ab7f0760ed1d21b28
-EBUILD fbset-2.1.ebuild 831 BLAKE2B 2ee17aa299c8376ae0d84432bcba1886ba0336f1a5e7c25df06bcb7499b11940769d3b612b17f948ef07243ea2a6e1e5d78bd58a3da4a33ae8aca98ba804e4cc SHA512 775c291e68bbc213f5f834d6d330b36e665eba635e326a1aad78ea060624943aa9dbd835a6745aaa2e2185ff909d6bc97eac66938bc0af0201500f8efb09994a
+EBUILD fbset-2.1.ebuild 787 BLAKE2B 75969d5373a07089e8a63d779442d2a616db1333a2268a497510e012638f3994274c89117a199f3b3170e161731422845280ed9a611a084657367ef184b3e73e SHA512 8c00f428ebd2028cef39e138d3829b91a5ef29c3b94fbf88a36542fdcfbbd66a792fb23e6b8f405ffacf5a460bc46e385f6c210f19e289f0cb9212c958db0731
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild
index 1c334fdbfb9f..387e1a904e25 100644
--- a/sys-apps/fbset/fbset-2.1.ebuild
+++ b/sys-apps/fbset/fbset-2.1.ebuild
@@ -27,11 +27,11 @@ src_prepare() {
 src_compile() {
 	use static && append-ldflags -static
 	tc-export CC
-	emake || die "emake failed"
+	emake
 }
 
 src_install() {
-	dobin fbset modeline2fb || die "dobin failed"
+	dobin fbset modeline2fb
 	doman *.[58]
 	dodoc etc/fb.modes.* INSTALL
 }
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 2d34e6491efb..7f0e43cf1fb6 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -2,6 +2,6 @@ AUX file-5.37-CVE-2019-18218.patch 1038 BLAKE2B 30622d39fb4006b07fabab70dfe6fc3f
 DIST file-5.36.tar.gz 875792 BLAKE2B ce1d98148e26c243982bb85357d440ab774fc42c526bca4dbff15c05247d2c15b54b030671a5590020fa5383c436204116f7817ec4dd33aa4387b059e4d7fe21 SHA512 3ec5e51ffb7a82defa74845a90fbc983f6e169fc116606049bc01ff6e720d340c8abf6eb7a08b9ac1099162a5c02deac3633b07b039d486344c8abd9052ca751
 DIST file-5.37.tar.gz 887682 BLAKE2B c5635e5de879af31cbef1c988275ab8620133909d146769b27a2f8eefa90871fad5fa75e66b9e1d77a6261e5d6dec315fb5a8ad587d8c214eaa0bc2e5a929fe7 SHA512 bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d
 EBUILD file-5.36.ebuild 3140 BLAKE2B 5dd07458582785009964253e23e2e52f1abf1ca163aea5b4c4a504fcc5d85443a3a865edfeeebb29b5be6c02db00eb010d91be1777072fc2f7b4713b95decea0 SHA512 261875b1a18aedea7ca70e54fdadb974ed40d8ef42852fa1b9f88860402fa7fa1ad27d36f52adf6390205aecab16b58d8c0464f1dcbbfb051a451bdbd32e6788
-EBUILD file-5.37-r1.ebuild 3203 BLAKE2B 6ab8dc308789831e0dcf9a2abb906c65c6b90b653eeb4bb29bc0d60c232144b649964b23220dfac5447fe17531ac3332bb3cb8f9e1d0039d176fc6904408ef9b SHA512 29c30606d76611ee1df79483b4734e59ef6cfc54c08373daa48049e763d0e8f9ada165007491dac5badc84722cb45737c624df6046e8c92d67edf7243387e080
-EBUILD file-9999.ebuild 3240 BLAKE2B deaea9fdf075c13ae9584fb37ad19193485118b9e4c5289b5fdf5bc365431a50df698b11cea463b4ce939d8534bd371fc0a64fac7f4b9b131c59054f79e035f4 SHA512 31da4beb4b69906ce21177453922c3e23a8580e0378135428f1e2ab8de1e34cce368dccebcecd6973bd5879351152156010d60982e393e1fcad632ddc755fb22
+EBUILD file-5.37-r1.ebuild 3205 BLAKE2B 65dadc39b86aa179867f6a97c84063336711d7ae9c95f83958603b0bf7dd0d0f66045dca3af430280e58fa802720491e34c540d7dca17c23866bb629b4602823 SHA512 2400a93f6ce6a35745c3eb0abcb7b27b55a64875a0b1d8a00602ec728fc82355ca585225c7bac79428bfb0d1e52bae464f28aa575435936a0407426c35909088
+EBUILD file-9999.ebuild 3242 BLAKE2B fa3bf513d110c9cd68a7c42c5456d16a1fb0fd1020c6e13baf149790760a288c759c918e2125e9009ee097b4de08708fb27968f61ef71ea26226566db7efc39f SHA512 a858823a85f8673a034fc2ed39a05b82246af8d92b7550f0f7ce02a2f59b7b3361a1c7941c07ceab56dd76d27174b49927a1ddefbb9b503f594302a0062e9bf3
 MISC metadata.xml 316 BLAKE2B 475092518eaf152f7e153e84a12c7089e665a5fc089045b6fa2d452eaf726566cade92c65ef19ba5cb205e586d161e90e514b60c8587699ca5c9885565ca3b60 SHA512 8b334ba7a606600ad0548ef0ab7aa809a8fda040104d1663bfe179828a831e621128145325aba158fccf94a7f9a3ca1c9164db979a85e639403a079f0deb622a
diff --git a/sys-apps/file/file-5.37-r1.ebuild b/sys-apps/file/file-5.37-r1.ebuild
index 12402b999dd3..f5cef9e2990c 100644
--- a/sys-apps/file/file-5.37-r1.ebuild
+++ b/sys-apps/file/file-5.37-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 libtool toolchain-funcs multilib-minimal
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 3d8cadd1f0ad..ed9dd421c39f 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 libtool toolchain-funcs multilib-minimal
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 70c433821f9e..2ae547500387 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -3,6 +3,6 @@ AUX findutils-4.6.0-gnulib-S_MAGIC_NFS.patch 2098 BLAKE2B fcc3687a42fe8b891718ac
 AUX findutils-4.6.0-gnulib-mb.patch 1005 BLAKE2B 0e08a1c35c8e66b2dcade10b33b53905d727186d2c9c13775b7364da9864e3bde74ee76eb060af5762eac5529754da84a094c4b570cdefce2275462b5a9f35bc SHA512 2bb4f15159e70c8bc9b6a7b36b290bd1c6d6e8b0ab484bd0b0127425efd27fb4a23585b0d43b437a8fb8b311e201c5cae5ef12f0142489b97fe63844145aabd6
 DIST findutils-4.6.0.tar.gz 3780154 BLAKE2B cae93c4e6bac93fa374ffba18ada95b783335fa7f9f9491cdd1848cd9bb6781a98e7b0ae3677c88bb3052afca2e90e066e072ee0f67c407cb7b087b49831d799 SHA512 41fcd4197c1efbd77f7420e5754e2cf9332dfef19f90c65a8fa1844bb4bc5d529c8393ee0ff979a054e9ac65ff71d7fe3921ea079f9960843412fc9a71f8afd4
 DIST findutils-4.7.0.tar.xz 1895048 BLAKE2B 5d9f1f2f6bc47415057f9139af3d28abae7be9f812a15bce6016a4478eb3206f35c9329f281fda892f614d017f4f5615003ad60b6a74996ebfad81b1f4b54bf0 SHA512 650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e
-EBUILD findutils-4.6.0-r1.ebuild 1939 BLAKE2B 9997b402698318bcd6b20b4c988f68b25f3c001c58134dc2221809ef81c5cf6f1572c37c0f41aa3325a95516dc1267e3ae63c09dbd8071c7dbc6b6a76dc19c50 SHA512 c5c574904a39c1b2fae69bba763f52108435d6a4519e3e5cf4ec09806d5227f735bad8635e5496c50528dd4eb2835ddcdbf5ddb0e9d3e6c9ad5ce626e5d4fac6
-EBUILD findutils-4.7.0.ebuild 1670 BLAKE2B 978995000c64f4afcda9a58c379c61367b1903f70a77b0e9270f19676361c2a4a64e3c13988fad027c5c0499fc68c126eaeec6150c724d333f3476badd0930b0 SHA512 4e0fa7c35235c1a8587221d5dac4fde225cfa84e17ce4daa08058af60238a0f677c56276928ca2c005180af70c29ac38ceabee43202b28d167fe0764a8b60dd5
+EBUILD findutils-4.6.0-r1.ebuild 1966 BLAKE2B 5f6d8fb48ee5e5741f1adec247408677682e1dc17727b2497b5ff5514f627f53811d25f37a0153fa95f077a6f9e61b83d621ce6973ca98fd693203df23ec3f0b SHA512 2d3993f24b9cf8d1d5c6f54a22bdc5ccf1676cbb22de20a019a493dca5eb251852fd5d4166372771d3eff9176b0bfbe1ed7428c3f538f850a0cd1bf4ff4e9c96
+EBUILD findutils-4.7.0.ebuild 1697 BLAKE2B 49d6c07cc7c46ae890b02024b3da3988eb8799c76424b70e4fad9439fb5b7f96e37f02379d2389670b4e9d032e1b67fd8f29f3dd06815a339f659db65fefc4c3 SHA512 d9da17baff77076fa00f9756fd863c8e4828810d405a430dafc0a6b9ac23294d369c17767d0381536db05a0b4bc2aec69353dbbced5779d7126ab732cbf36aa1
 MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00
diff --git a/sys-apps/findutils/findutils-4.6.0-r1.ebuild b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
index b6d13252c1e9..b6d494b7d91d 100644
--- a/sys-apps/findutils/findutils-4.6.0-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls selinux static test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="selinux? ( sys-libs/libselinux )
 	nls? ( virtual/libintl )"
diff --git a/sys-apps/findutils/findutils-4.7.0.ebuild b/sys-apps/findutils/findutils-4.7.0.ebuild
index 10d528fd7b91..e42dba38fb07 100644
--- a/sys-apps/findutils/findutils-4.7.0.ebuild
+++ b/sys-apps/findutils/findutils-4.7.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls selinux static test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="selinux? ( sys-libs/libselinux )
 	nls? ( virtual/libintl )"
diff --git a/sys-apps/firejail-lts/Manifest b/sys-apps/firejail-lts/Manifest
index b336da95319b..9efe45a80fb5 100644
--- a/sys-apps/firejail-lts/Manifest
+++ b/sys-apps/firejail-lts/Manifest
@@ -4,6 +4,6 @@ DIST firejail-0.9.38.12.tar.bz2 164962 BLAKE2B c89252548c70e347c6a841a8460501622
 DIST firejail-lts-0.9.56.2.tar.gz 934289 BLAKE2B ff8b27f57da90cd94d3ec9b83c8398b7c569b09008f61094bd9aca15e996cd7a4d559e87168228271ccba4c9fe8e1ce97fa5045596f950f3ac2d8593b9ea5838 SHA512 75edc0405fa3fd7f2f5d7831f7f4e838ed63bacadd7f9a869a1611908c716a333251b602ff0bd70e3f98627418e84541b26790d34e644f60d97e84e9c33f873a
 EBUILD firejail-lts-0.9.38.10.ebuild 734 BLAKE2B 2d3797be4ba77f171452cc2c8b13f4eb1e3a9ddda7461349c863342d9fbe51dcc6ac4a8118676a311bdd59b6ba34b080ae8fe7d17699713fd607c47ba321ff6c SHA512 182d12ca0dcb10a125f7feebe5ecb3d18887bdac555dd470aef6e11bd60a01a6ff3c33a00b6e4ca1adf5ca3de1e062eab59cb802b8ff6dac8e6726e117401ec4
 EBUILD firejail-lts-0.9.38.12.ebuild 735 BLAKE2B 9cc47a2b6a6538f8b61a3d5b6c4cbf9f4c6f4b505b04a8a7567006a8d54b84cd0288b1801aee72fbef0ab63cab90a6aeb7c92a9e5fe1a8bba738399e5cc77b26 SHA512 e0b340593f6b0afe5e04e4af2c1e7984f145dde6b363edd81c01e21fcaddba4b05165c35226ea3a65b938981ad898c977596652816f40541f871606134224ab9
-EBUILD firejail-lts-0.9.56.2-r1.ebuild 1238 BLAKE2B b0a897e953c6ef24cd1d1822d613ea6b8359baea67b8f3b4ce1f392ca666a4acbe843475124752b680daaf85f820d8f35bb3368ad7a06cee467a2c1dd0f62381 SHA512 d52904049477f591ded912b694263fe0f1776a48653c634072baa03469b7290f8866f452ad42dbb1cd0f7747f3d55e42f844205f5e4ecbc20c03b4b166016904
-EBUILD firejail-lts-0.9.56.2.ebuild 1175 BLAKE2B 2cf26b3011994054a66a9b64f273b32a9f200dd69cf7d4c1a823bfcde3175a48a1ba6e9835f862bd819a74b1ed6b67258ba0e282b76ba5e58d4ec36cea94a848 SHA512 a7e783dfdf09fa22dfc0f14f8f5538a21dfafb7d5ad3bd41ac2dcce460fac807ddb8e03818bcadd41048254f9a810f60a64aa85caf18aeb094f6c4f9aca256f3
+EBUILD firejail-lts-0.9.56.2-r1.ebuild 1265 BLAKE2B 7a150df0f3ba65bbff8debbc00e241bf544be6440113c3ee91dc8fe158dd4a1ac26c01cd05d89baddcd888a13f4a3883aa739fda8860a2140f13ca0f382ff9e3 SHA512 93bf9af9bfc214d6c91480a33dcdf4adaa950e55be69de1cd9541319913b07380468a10d56fbf7c17996d3b22a0fe53703fdce2f89c9c99185e638ab19316810
+EBUILD firejail-lts-0.9.56.2.ebuild 1202 BLAKE2B f125d620f1ff397190c20cb2735550524281caf0da113b11fbab9dc1fe23073705d4e3d263648eadf1f6c62fdacf613513419e8bf7a26fd104cb67efd175a8a6 SHA512 fe8af41b1991d61ff713c7a6df6b55c204fbdff0c2b4705a8a373ad04e6b4547c5ebb8991bee9c20d1e0e07935c359832bc4c86d92f0075f93854158d161f0ed
 MISC metadata.xml 1400 BLAKE2B 437e79721042570066912df3b69a81848ec3fa969eacf8a9b82140faef658b0607a97114426ec426c68cb26e7e76acd1c4be09c81f8f9e96bc67987f9a637302 SHA512 51128fc3ef400e9f80e2bf2ae87420c8187c33b4944827ed35fcb15d81c2213bde726902e77396f1d93331456e8bc94ab7b1386c80f46385c2a9553ae6a970c1
diff --git a/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild b/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild
index 831a680daa5e..0cd44b693c7e 100644
--- a/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild
+++ b/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="apparmor +globalcfg +network +seccomp +suid +userns test +whitelist"
+RESTRICT="!test? ( test )"
 
 DEPEND="!sys-apps/firejail
 		apparmor? ( sys-libs/libapparmor )
diff --git a/sys-apps/firejail-lts/firejail-lts-0.9.56.2.ebuild b/sys-apps/firejail-lts/firejail-lts-0.9.56.2.ebuild
index 58dc1df4e153..7ded7fe5cedd 100644
--- a/sys-apps/firejail-lts/firejail-lts-0.9.56.2.ebuild
+++ b/sys-apps/firejail-lts/firejail-lts-0.9.56.2.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="apparmor +globalcfg +network +seccomp +suid +userns test +whitelist"
+RESTRICT="!test? ( test )"
 
 DEPEND="!sys-apps/firejail
 		apparmor? ( sys-libs/libapparmor )
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 35474f4ca960..b6c322d9e057 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,10 +1,10 @@
 AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb
 DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab1891775ac121347653c06bf4403ab7f4a1fe160000a6195d360fe06d64c8971dd53c1538aeac40d155f59979a SHA512 a8d6a76ac59937547c6866d414e95a67779574901b0a15ecfde763f49b434b284be2ade1194179225785006e5f93836667469d08f32d4c87fc85927aa0bfe9de
 DIST fwupd-1.2.8.tar.gz 1911999 BLAKE2B 61a24ce24f778b96f7ad23496890f7a1d20c09e6bbd707f29d154992668d5c0a25cfd31b5d0d11519740e086c098cbdfd440fe9f5cab4dde0ac43fe6b438e911 SHA512 d603f9f4e5a4c0fc6abb0b75f7d884eff47fb8a16285aa545f7140fe98ce781d127ff3769f9c206bb3bfd084bbc5bf6abf9424f70e727ff79162416fe7881154
-DIST fwupd-1.3.2.tar.gz 2100817 BLAKE2B 49441603ac0934a10b730b82b4f86cbdac03c3ab9de6051af6ca0c5f3d610cda1a619b7f0af9de61de3bd926175cf37523f47cf3fe2743ae54e5327d5ae8a518 SHA512 5b302d0ba1eb10f3ec440ed1a5ad25b5a9398c7601dc2e058d0df57e16a2e3b65ab3b7e93a07300e3db21789909fc2a72feebab0271fa0669dd792f290506c1b
-DIST fwupd-1.3.3.tar.gz 2125604 BLAKE2B 4471d270ec7f99857dd811b2ba9d8f591a0787ee7ad2bf45edff90904483b8fe54483cde2722e7ee9afb426b17b4d4090f6935b3fa2712a277d058802fc2e9f5 SHA512 b8f0d88fa9c1c8219dd040775d76207f1be87294ebb5f38043b77a670a1601cc597a711f5635aa3d164a08ee0dd068dd22514acae96f6fc5ad20d35099d02f50
-EBUILD fwupd-1.2.11.ebuild 3768 BLAKE2B 5a9b07a619542ad0f4e778bbbc54928aa345fa3b6995ebc29c05c72e445a1a88fe5b03cd896f59c71346acb55aff00258ab2ec2678bd5895986514fbf427ce40 SHA512 aeda057c4dab66bf0bac38413cf8ff93e6036c902e8037994978925156dfda1d4f6d3431d33d54f7faca8d5509311e4b134848e5d71d51e2f6deb80165183943
-EBUILD fwupd-1.2.8.ebuild 3656 BLAKE2B 4f219b26d50bc3fd9560ec8684a3629f788f92f6b9fa15ef1d948302f40f6194191b4a7d0a9891a5b8d5973d75d575df3d48c27e49733f32a0c8454af0c621d6 SHA512 224bcb6a1b84676695992bdcdcb6d28892b8068ad4f4a09d5b7bad50fba77902c4b10d172e705aa703195f80a0b879cb8322c9f5bb08a9610c502432e6908c5d
-EBUILD fwupd-1.3.2.ebuild 3844 BLAKE2B 841247f22be46bc8fe07f2dfd7768027782262b8042ce7c09c0f16019266c4d3b9c48741f0f58700171a746b4aea4c4f0b1ff618913d2d619641f72d7e647af9 SHA512 9b7d7396dede2dad6fb7cb75f2528bd85ada0dabaaa6c87cd13ef7a6c01f376d32d098c17f833d77e79931c0ecf4abe46d07bfe615a7f55a99d26c450e1df4e8
-EBUILD fwupd-1.3.3-r1.ebuild 3961 BLAKE2B cd73af45cd3c45c8b98aadba4a12ddd6aca773a68048bea1330f09a73919c94eca3c7d9e375fa6199f30d0e9701cdf2ce29552de0d5c354a8be88767ffa0549f SHA512 7cee94266bb8d1f3c0ae9d9b447b6988b4f96231042eaabadd000765e13d4e0510a3bd0823cf1176a5f2a51a38b4c46da94981e5ba8f7eea258316070107e3e0
+DIST fwupd-1.3.4.tar.gz 2151009 BLAKE2B 3ea171d4a9498963b6082ae2e3f9b41edde862b84f3f506e403bc2dd6a08ec27ccbac6c5891bdf567860f43b008ccd36a7e6d40e72f2d252eceb913833372719 SHA512 00b6ba394c74252c1c7eba5e5e1fd92f234fb6db6de8bca69fbc578bf3b12790867b6adaef6c422c801d28990d390bbe8af67ab0f5bd3a744adbeb053708a254
+DIST fwupd-1.3.5.tar.gz 2164874 BLAKE2B aa268f3d94b3c7104cad5e80de81a724ba978e3da468cd2d44833656c5b0a95b1f720f5c7a0dd9812b8afce4c58e8f777e13ea2e1f4ce0b8b582ee3c731b744a SHA512 b1944b06bed9cb10ec90219235b168a76fcf6ff7b8938dfba36259f07efed71a755d7b91fcbe8f6fda00ac971bd5d4734a49e045005e2e1c32b49fc5b86c48dd
+EBUILD fwupd-1.2.11.ebuild 3793 BLAKE2B c5a9c015421ac2405f1b366869a01139f28caae2b7e57906e65493e38cafdbda7b170a53d5d49750dda0ede86b3611fd05a0031acef741d6eecc9889c4cf6c11 SHA512 9fb39992086689a325c1f931e1df1737e69689938e62f96e55177c3f582400546531b32fb3ae21e2a35c6f820bc72511d40a37932f9e462d7dbb01928c465d4e
+EBUILD fwupd-1.2.8.ebuild 3683 BLAKE2B 3c1626fe3945a7b838e79ab032fec7ef02fb78b03ddcefcf845f5bc300f4938eeabe2cdc668ff342d3ced5d64f1ef6c1136e05d84e3dac24f7c8df1351cc5b53 SHA512 f81515eb238834dbeb95c8906a8c33e79d2381c455eb07c8593d9e96d223ba5d319b40dc6df55f34cbbbb16d4c29572ea06c4d8b016aff770ae8362938176a0a
+EBUILD fwupd-1.3.4.ebuild 3961 BLAKE2B cd73af45cd3c45c8b98aadba4a12ddd6aca773a68048bea1330f09a73919c94eca3c7d9e375fa6199f30d0e9701cdf2ce29552de0d5c354a8be88767ffa0549f SHA512 7cee94266bb8d1f3c0ae9d9b447b6988b4f96231042eaabadd000765e13d4e0510a3bd0823cf1176a5f2a51a38b4c46da94981e5ba8f7eea258316070107e3e0
+EBUILD fwupd-1.3.5.ebuild 3963 BLAKE2B 70c276596e2e3907fb39ae5436878c9a933cfbf1e34ace19ae81a606a3c54b0069250340840c9508551c28df36c1074a9fba605c3f2561c51f8c67f8c0110c4f SHA512 afc01f9ea0b5bea531835bbe21cee21891dfe0ee446c03c022accff50c375967e47e9578b5ab5c7aa85d1fcf88e844501e0493a8d62f65d3299b65a77867099a
 MISC metadata.xml 1333 BLAKE2B 7978d7232cd10e4fd6d19684077dd1ba1a7db10c4869bfffcb7bc6410134da36572bccc21bd00ed29671513f3ea1323bec4dac15fdbb94e22adf523fdcd90fae SHA512 188a5b54787b8b41a0101ec580a59e0edebb94db65c4360bfc3dd108458a8ea80d43873a1109075bdac15beb77034d3a1d4d118a29235da6c74faed5111355f7
diff --git a/sys-apps/fwupd/fwupd-1.2.11.ebuild b/sys-apps/fwupd/fwupd-1.2.11.ebuild
index 0c63f4d6715b..31f15d07c13a 100644
--- a/sys-apps/fwupd/fwupd-1.2.11.ebuild
+++ b/sys-apps/fwupd/fwupd-1.2.11.ebuild
@@ -13,8 +13,9 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="agent colorhug consolekit dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( consolekit elogind systemd )
diff --git a/sys-apps/fwupd/fwupd-1.2.8.ebuild b/sys-apps/fwupd/fwupd-1.2.8.ebuild
index 9107999ee4a7..a1aaa0b451dd 100644
--- a/sys-apps/fwupd/fwupd-1.2.8.ebuild
+++ b/sys-apps/fwupd/fwupd-1.2.8.ebuild
@@ -15,6 +15,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE="agent colorhug consolekit dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( consolekit elogind systemd )
diff --git a/sys-apps/fwupd/fwupd-1.3.3-r1.ebuild b/sys-apps/fwupd/fwupd-1.3.4.ebuild
index 684e4c548a49..684e4c548a49 100644
--- a/sys-apps/fwupd/fwupd-1.3.3-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.4.ebuild
diff --git a/sys-apps/fwupd/fwupd-1.3.2.ebuild b/sys-apps/fwupd/fwupd-1.3.5.ebuild
index a3a5324b96da..410035b21944 100644
--- a/sys-apps/fwupd/fwupd-1.3.2.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.5.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 
-inherit linux-info meson python-single-r1 vala xdg
+inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
 
 DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
 HOMEPAGE="https://fwupd.org"
@@ -44,7 +44,7 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/libgpg-error
 	dev-libs/libgudev:=
 	>=dev-libs/libgusb-0.2.9[introspection?]
-	>=dev-libs/libxmlb-0.1.7
+	>=dev-libs/libxmlb-0.1.13
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
@@ -87,6 +87,8 @@ RDEPEND="
 "
 
 pkg_setup() {
+	tc-ld-disable-gold # bug https://github.com/fwupd/fwupd/issues/1530
+
 	python-single-r1_pkg_setup
 	if use nvme; then
 		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
@@ -127,7 +129,7 @@ src_configure() {
 		# Dependencies are not available (yet?)
 		-Dplugin_modem_manager="false"
 	)
-
+	export CACHE_DIRECTORY="${T}"
 	meson_src_configure
 }
 
diff --git a/sys-apps/gentoo-systemd-integration/Manifest b/sys-apps/gentoo-systemd-integration/Manifest
index 86d043268888..26aa6f2eeb74 100644
--- a/sys-apps/gentoo-systemd-integration/Manifest
+++ b/sys-apps/gentoo-systemd-integration/Manifest
@@ -1,4 +1,6 @@
 DIST gentoo-systemd-integration-7.tar.gz 64243 BLAKE2B 389c6627af6eca9b4a0854d35751a8cb45cdb2795c7b621e96e9d5bcc13a80fe1cb109c0cb2bfd9d33f7642fd08198a0afbd5b4e5956ea6ba8dc89cf4635d9c0 SHA512 cd47caa01d73da57998b6b37d89cbeb53fa722c7f4a31bb03d03762350490cde1db3ce06090df6b6ff25c1cafb40f6c2186efbd52156ebc6d078b4a59d6fef52
+DIST gentoo-systemd-integration-8.tar.bz2 53734 BLAKE2B 711f1f6603fa40e81fe32809a32f61486ab068b1f636502ac36d58e4c204b5f0d46f51a6624f134a457f246b520614213cf45cc5397de769b315e01e32720bcf SHA512 373892ca9ae8845673f9ddad74e0be0b71af944e109adf0d2ce8e54a9c24ffff5e90cfa92e74b7abc1e7d7b1598404258b90b549697bde28a1025a2d974e991f
 EBUILD gentoo-systemd-integration-7.ebuild 795 BLAKE2B 2c805a1b5ce121177976d0b617dca47124dff234dedfa506928eb850d5c040db89aee7b78d731535104118d074db65c634ebbe7b4e849c134e3a84307ca68671 SHA512 9c9e95d6f959f361db79972ff2eec3e3b5a07d42589d6e6756d77f937e1d5aafdd591c44fb866b361e8e67c67398acb5cdaeca37786b21d907f375d48275721e
+EBUILD gentoo-systemd-integration-8.ebuild 735 BLAKE2B a1d3366124cc457a5537ae08cde3d0005a9d5cf47f0015743b759e9f0f5cf550f31f6380d4b6f515a3f28812acf2d8a64a3f47ebad413a2609326c58757e1130 SHA512 8045e9fe159ccbb4640c69a0986cb46094bb7358e0b0ed6b6b1d262ccd01f6a9e4be9862fd0213cb1b26fcab005aaa5ebb30df80f47424ccc76d2001e2f6939a
 EBUILD gentoo-systemd-integration-9999.ebuild 729 BLAKE2B 24adcb67d253b61a09eee0df7ee78cbcafc01c3e60f5d114351204f456cdd4c138f5c27c311e72ef80e976458424266c2b9d979aa1c8022887e7b01936975841 SHA512 bd37d55941397bf4aefda23375d58892a480d4348548a543d5a0d5139acfba677082e4c14eb839a9e9b77952fb86dd32623e0b9f255a36cc32ad9327d32ce345
 MISC metadata.xml 355 BLAKE2B e2e7d95fe4d4f671d0b8a24bee9db8c458232ceed374b7ed902f724ca5971cebb81acc19fe62a6d53bf98cff4c7b999d3dbcf674426e46accda3d591d6009545 SHA512 b590b927b555441da6f665dbf637ffaa27651f074a62d1738959c5913f45ee648146f9054e07ade42d5f28f93cb350b43c94299a50506d01d446de22ebacdbc0
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
new file mode 100644
index 000000000000..9ad1ea02babe
--- /dev/null
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+inherit systemd
+
+DESCRIPTION="systemd integration files for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Systemd"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=sys-apps/systemd-207
+	!sys-fs/eudev
+	!sys-fs/udev"
+DEPEND=">=sys-apps/systemd-207
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ ${PV} != 9999 ]] || eautoreconf
+}
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 5704a9279185..854e51cefc9a 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -2,5 +2,5 @@ AUX elogind-support.patch 4363 BLAKE2B 060db5cb921d8b51d7eb3acd76186649b3d3887eb
 DIST gnome-disk-utility-3.30.2.tar.xz 1665896 BLAKE2B 9000dc8e95f27cccdb3a13b84c527c740f801a58b0f3f1a384ae1415eeed330f5f81f284f190d110dca0f5dcfb9316262491b715c2b2cd4f67813587046b5b42 SHA512 59228fa923b7b1e89e8ce8d96920b6f452bc6ae62c203261bffbc584a2ef231e1d2006db8ddbd15f1f7b4ee14aeae54b85520b89bfd3e1450d42c423d987f2dc
 DIST gnome-disk-utility-3.32.1.tar.xz 1370900 BLAKE2B 4986169bff7f438b4a9dc9fe10ea69521c41afaa268bfebdf195ff3fedc14e0d8204e66b258c71f599867c0279c781ca5ceb175381dcc8004c41d97be92ebf46 SHA512 80c4e2fb1ca6136579203c3df73da4c8ef7d496ab73166096768d72b3473d11e9ae199d4aa1878c49ec4280ea98d2136e084a03bba50c2728be4c5e4d508967c
 EBUILD gnome-disk-utility-3.30.2-r1.ebuild 1632 BLAKE2B f36dafb6a302d27b8e21a5f63206ef2cdece04c8c1545a55eeabc94bf1654db154db91be27775735d1539abfd7218d9c6d05ac4795ed1cef73995a00282108a7 SHA512 6328bb987abe301bddd1a08230345893a9b48a5092e89db5d1349007fdd7adc9c6d251025f2166a2d55b92f63dade7960d1671bbcb0152ec5482cb6a247263c7
-EBUILD gnome-disk-utility-3.32.1.ebuild 1634 BLAKE2B 388e0354042f5558be4711ace90bd29947cc9aecd0bb84668596318e457c2997f6104f7835b42ea721457b7f09b784efe075dfaa5425a5fa83275f0beb445893 SHA512 0124df37cd56cd62afcb2802c831e67b853c32ac7df0c7615971be1ea8d186afee8514a6c8529c806f0fd8a03e529718482f388d4f8dbf87483d97d2b14b53f1
+EBUILD gnome-disk-utility-3.32.1.ebuild 1632 BLAKE2B f36dafb6a302d27b8e21a5f63206ef2cdece04c8c1545a55eeabc94bf1654db154db91be27775735d1539abfd7218d9c6d05ac4795ed1cef73995a00282108a7 SHA512 6328bb987abe301bddd1a08230345893a9b48a5092e89db5d1349007fdd7adc9c6d251025f2166a2d55b92f63dade7960d1671bbcb0152ec5482cb6a247263c7
 MISC metadata.xml 597 BLAKE2B 6a1f81b2d7758158e8469a0544ce2ca45af42d24379391870b55fd97fd6dd963228136329af658851ecead1c14bf5a92658e6fde18223842451a9d85ccd628de SHA512 40904280037c0754d3481458bf024f83382e65122188f8fece8cd361cab57e01dfbc7b85da631b4265aaa6107567e376f4291e9f6e60e5e89bc747908c8e496c
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.32.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.32.1.ebuild
index fd2f998c9c94..a5810d668f9c 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.32.1.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.32.1.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="fat elogind gnome systemd"
 REQUIRED_USE="?? ( elogind systemd )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.31:2
diff --git a/sys-apps/gsmartcontrol/Manifest b/sys-apps/gsmartcontrol/Manifest
index caf0fbb9bd37..01ea6aaba32d 100644
--- a/sys-apps/gsmartcontrol/Manifest
+++ b/sys-apps/gsmartcontrol/Manifest
@@ -1,5 +1,5 @@
 DIST gsmartcontrol-1.0.2.tar.bz2 695445 BLAKE2B cccfe2d96eab050fbcc2b99107e6a962a75c6cce492d64e40cab371f7d23cec6eaf6df7682cc0a43a8678152be3425ccd6eeb6f8743bd1a8e2edb7f4624d4238 SHA512 a9dd037fc4223afa762408bc34325fb31947822250efe32ae97b88e836c5bb68d8354d7605925b2ab7c834764ea473a14f2cd1f234577ef76730b02ad9a8b701
 DIST gsmartcontrol-1.1.3.tar.bz2 677998 BLAKE2B f444dd29602f6934b440650e57d5d981a3b9823a905ce3c178109b230e6536edd4f38ed0762872b38186774127a164feb7363bb45cbd80e9c0b34398c1a06092 SHA512 7a8bb79875a53d742923fc8ff8336d7fbbdaf2e1b1f64296840557997125d4dcfea9a93a5e8a834003d592083a180ee85ca0e29d3aecf0eb475a3d4fed460456
-EBUILD gsmartcontrol-1.0.2.ebuild 985 BLAKE2B 6ba808f9716a9b89bb394f98c289a38c8c0108893139a5ea41b43200a404d831fe73102f1ff808c8aee1310e77f6a63aa39192c0d880cc920788de0de7996938 SHA512 d94227eae7f6e3b7ddc5c728efdbf4ef1994de75dcd7596dda6a80591e8e55769aa9dbdca98003031efaab58ed7d4e4cccefa17bf1585ab2938deca86be7532b
-EBUILD gsmartcontrol-1.1.3.ebuild 982 BLAKE2B 28b241d2dab6972d8203e1a4622f35f5f9c74d6fd83479e2571ccb277da25f9c28701bc0b9a505ab03ab7c06a87dc3cfafb58d6c45f668a2762be03e3c96a91f SHA512 99143012593566e3b7bec9fd7a94f4a8ee3a81e29ac274280a0f72a6a897a89cc6f45677d9800a06eaf74dfe08c07871a7318bc5b49ccf648730395d443d1294
+EBUILD gsmartcontrol-1.0.2.ebuild 1009 BLAKE2B 68fbd4e99795031f6d1124cd756f30f271746a7546ffdafb0d9c0d765292e3415e163edec83d6d692fd21ce29aab2d3fcc2db0e38817939d561458a28e21037b SHA512 a05864d911a09af9a435d3c132e5aae57eb8a458fcb818a18d4d4040af55467b620aa35a8b8a202acc3dd32fe9722a0c1afc474b223dae5a8f934a9daa83f97c
+EBUILD gsmartcontrol-1.1.3.ebuild 1009 BLAKE2B 68fbd4e99795031f6d1124cd756f30f271746a7546ffdafb0d9c0d765292e3415e163edec83d6d692fd21ce29aab2d3fcc2db0e38817939d561458a28e21037b SHA512 a05864d911a09af9a435d3c132e5aae57eb8a458fcb818a18d4d4040af55467b620aa35a8b8a202acc3dd32fe9722a0c1afc474b223dae5a8f934a9daa83f97c
 MISC metadata.xml 340 BLAKE2B f4f46445999e4db825f8d50018a9c6a8c8ee431340653e1c78519e60eaf4316b2e8387fa67aebdea0fa814f92433f65872b78028f746d9367666a158411ee8ad SHA512 f769fe192e485692a86f1ac75f8de07be0a8f5c2ddd7d3ea0a526d271881746417e01e09e765e3160f7d8b516d9240b5bb09030dc18ea9551192fbd8df5b4cc3
diff --git a/sys-apps/gsmartcontrol/gsmartcontrol-1.0.2.ebuild b/sys-apps/gsmartcontrol/gsmartcontrol-1.0.2.ebuild
index 06f8b94bf918..66da4d4c59b9 100644
--- a/sys-apps/gsmartcontrol/gsmartcontrol-1.0.2.ebuild
+++ b/sys-apps/gsmartcontrol/gsmartcontrol-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	dev-cpp/gtkmm:3.0
diff --git a/sys-apps/gsmartcontrol/gsmartcontrol-1.1.3.ebuild b/sys-apps/gsmartcontrol/gsmartcontrol-1.1.3.ebuild
index b5b1c6d82126..66da4d4c59b9 100644
--- a/sys-apps/gsmartcontrol/gsmartcontrol-1.1.3.ebuild
+++ b/sys-apps/gsmartcontrol/gsmartcontrol-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	dev-cpp/gtkmm:3.0
diff --git a/sys-apps/heirloom-tools/Manifest b/sys-apps/heirloom-tools/Manifest
index 3e60ecea71ba..44efd1399599 100644
--- a/sys-apps/heirloom-tools/Manifest
+++ b/sys-apps/heirloom-tools/Manifest
@@ -1,5 +1,5 @@
 AUX heirloom-tools-070715-major.patch 464 BLAKE2B 7fa6c9feee0bdbda9199791369ab3565250960f08e42b4a7b8b3e9afbe0af8bf08b1c3766cb69a3f822435e1d691036899419f3cfccf8e1657483adf0197fd51 SHA512 65659c579f99c85187b001be0fea5b04e4e0b319a1791e9219127b2fdab7bb0e390d15b4f76a43d32c37695a6255e1e30ebb5274eb824535a50c6d2b429b856c
 DIST heirloom-070715.tar.bz2 1000080 BLAKE2B 8719e38b7e260b0ecb9d055672e0097954eee31acd6cde8c582f82055a3b7f66511bf3c876309d0e74a8c29ac334b58ed81c56df26d1b9c065994bd353affd20 SHA512 0b30b0f4c4c92a10ee2da263ea44666f445d96bac86ca4afb7bbb50d8278986e4145a7bcdf3ed9f75611bb956e93e16fc0e19874498ce3ae1a00e6fbb4f910c9
 EBUILD heirloom-tools-070715-r1.ebuild 1362 BLAKE2B 5f101f00c501378b7d30f57805bf86a26e796059570754d21995d166a329927fd4ff6ef87b8c08dc395dfd74058697841b481667846858e2d8db5b4037ccf1b6 SHA512 04db878021350370f7f92dc55a954aa3568a3b5087d1e1ac52ff79d55f05373c7c651e9cfb8bb13ea3a0dcbe305bc4fc3fc58a2fa08260583a181c106d8eee5c
-EBUILD heirloom-tools-070715.ebuild 1020 BLAKE2B b2e9d684c14a6fc6683cf9303387fdb0a035f648a289e730b8e6712bfffea4b426fa063235487ed833216e755b21b10490aac5c78f0f9d21c3d0d8c399913b68 SHA512 b44ea6c70d266452aec9f0f899305b84c8b87a75a11050c7c139899d591faa4652939a1db76bd4d6827cf040de8fcbcd94243255c0ddb9af9133270dc0d4bb4d
+EBUILD heirloom-tools-070715.ebuild 1007 BLAKE2B fde4796592e2929ab553f88dd1df6aa3a79dc0d7a75a3d4f15d89ddf8f863332d72576b08b20e9af808595c80718fa6720bded25e94db43716e6cab9744417e6 SHA512 bddb8d5891fb50001b78aeb80174bba71a17b772dcbf29e30cf2c05f9d74cea72bd529f8cfc740a2e7df3af21675b15df096186c4112a7291067b988e7fbe131
 MISC metadata.xml 325 BLAKE2B 083bcce163b0fba94ccbabdf2eedf1e9681c26d079438db220c0af26ba3a36169302476853bb42165e436bd8466678ce9f46f95d01df39e6e541d6c65d13d969 SHA512 54940bbe65218aceba90442526963ae60b9132d253d71d672d6e7fbef47de99b50249925b39702d0a1f1283cc57ccf91dfe9dd1dcfb88930176752ad46742d62
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715.ebuild b/sys-apps/heirloom-tools/heirloom-tools-070715.ebuild
index dbf4b1181691..00037ab30d24 100644
--- a/sys-apps/heirloom-tools/heirloom-tools-070715.ebuild
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715.ebuild
@@ -25,12 +25,12 @@ S="${WORKDIR}/heirloom-${PV}"
 
 src_compile() {
 	append-cppflags -D_GNU_SOURCE
-	emake -j1 ||die
+	emake -j1
 }
 
 src_install() {
 	# we don't want to strip here, so use "true" as noop
-	emake STRIP="true" ROOT="${D}" -j1 install || die
+	emake STRIP="true" ROOT="${D}" -j1 install
 }
 
 pkg_postinst() {
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 1462ebe6305f..d93c22fdeddf 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -2,7 +2,7 @@ DIST hwids-20190316.tar.gz 3312959 BLAKE2B d9f4c7170979c404a69ca0b51903af34db01a
 DIST hwids-20190818.tar.gz 3407208 BLAKE2B c2a0098cba4a34210461a2781f325a95f18696c1917ff3a1c26a2f56383e9edd087ab6b3a1a173a92df829fc250cf460d915a98298f9c38a71396bf232916245 SHA512 74086f96152482af3c9caabc729f34d193cc619aae88d44aa0472d674b7533ab806b13243c95bfa04417bdd40e3bb7069b766c2c0824f19d0c62385b043a01c2
 DIST hwids-20191025.tar.gz 3443988 BLAKE2B 0352f1568d7ceeb2c599d789f96a3175703f3c86240188beb9a080eabb6e7659aeeadf193f15050519fb64c58ee8d8832919cf6922b5017861b32be543235a03 SHA512 6f637ca8c4d6b1261c5c2eccd8d1a64ab750f4c36f3d435b50b75949c15e571d83bc61dd6a14e777b53d383d7d02c34f616cc6a62d005db3d965b33b4121deca
 EBUILD hwids-20190316.ebuild 1712 BLAKE2B 9fbc8b26eb0e11df3397863d80798284a67f263fba66575a34b27368c914ad14037ab8580d436f76900d635e53a05dbe566447971ea250d9bc6d25fa4c80be0f SHA512 2a984901b8ee9bf2a1ac5d2d1fd37ed76e7362c07736fe882ec29e474c6a6736871a91b1908a0f4d6cd04a72d06f06fd811f69e889ca0eaaf1200d8fd4e0a159
-EBUILD hwids-20190818.ebuild 1700 BLAKE2B 2b55f48d6f9686de4ac33b9d9f2daf0a57b5ae8fd08bcee25b5c6dc907754e6b2f7a960bc112db74213b194d0f6c7a39172afd5a61ad58a7de7f48fe24f6ee55 SHA512 bee79d34872109cb1b7aa4745b359ca382758e164bcd4fdfd60e2121430c7439312dad09d8ade1d65ed28fe1016983e8ab4b820348cf387646342b47dc4a4e23
+EBUILD hwids-20190818.ebuild 1687 BLAKE2B e2401b36e40f0a7358ccbcf33d7ee501e0fad00162915195f8432611b61af4d48d737effcfa3c94319747de453cc92c6a6218140afbeec6604f185fcd06f8d31 SHA512 872df00684890ea1e19141e9981b0400c90a0c3c3950d7bb5d422d10f44b6f8c2eee6d16f24ea6be6a42b9dfe7c88034e2fd663b11afe6f0dabe8a7174e2667d
 EBUILD hwids-20191025.ebuild 1700 BLAKE2B 2b55f48d6f9686de4ac33b9d9f2daf0a57b5ae8fd08bcee25b5c6dc907754e6b2f7a960bc112db74213b194d0f6c7a39172afd5a61ad58a7de7f48fe24f6ee55 SHA512 bee79d34872109cb1b7aa4745b359ca382758e164bcd4fdfd60e2121430c7439312dad09d8ade1d65ed28fe1016983e8ab4b820348cf387646342b47dc4a4e23
 EBUILD hwids-99999999.ebuild 1700 BLAKE2B 2b55f48d6f9686de4ac33b9d9f2daf0a57b5ae8fd08bcee25b5c6dc907754e6b2f7a960bc112db74213b194d0f6c7a39172afd5a61ad58a7de7f48fe24f6ee55 SHA512 bee79d34872109cb1b7aa4745b359ca382758e164bcd4fdfd60e2121430c7439312dad09d8ade1d65ed28fe1016983e8ab4b820348cf387646342b47dc4a4e23
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20190818.ebuild b/sys-apps/hwids/hwids-20190818.ebuild
index 81079882934b..62fd46e5bbb1 100644
--- a/sys-apps/hwids/hwids-20190818.ebuild
+++ b/sys-apps/hwids/hwids-20190818.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 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-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 63183d17bb03..c6549aef8229 100644
--- a/sys-apps/i2c-tools/Manifest
+++ b/sys-apps/i2c-tools/Manifest
@@ -1,5 +1,5 @@
 DIST i2c-tools-4.0.tar.xz 79972 BLAKE2B 982e4139ed0e2111f9e082d0690fcc0f86f97a433e292e9464b41991f14a1f90147a3612172bad6880f0df6896612e1dea0ae7bf6f459758b2cff45fb35a5dc7 SHA512 ddf86c357c101388193581bc40285089e6ab5e8d870f8aa5d594acc7ecb8596fbd30501e147b88bdea0200b1be88bc0a374356c188d1bcb067bf8e254e3dc51e
 DIST i2c-tools-4.1.tar.xz 83576 BLAKE2B 0a9ed3bb335b61f6c17a6b6c705502ff008b4fb8bab6a5fde63163a32528b5214d92affc4b8d6cca29676dc7ba82dfa84be5f14943b7e81c8612a7d9419ac628 SHA512 83262bcfd94c2adf74517cc50095dd78221fa4d16a62397245d4a538de7463272abf4f6727024be8ab1ca8ecbfe647af85ba2a553e5b5e68a53e50dfcad20248
-EBUILD i2c-tools-4.0.ebuild 1458 BLAKE2B ca1012e7a8c01d614a1cd1d9d4842085e78611c4325dbfe46baedd8f80594e458d4628b97e26082df8eae3d8dda64e02ec3a463c070328212cf7655d2cf9003d SHA512 c8614ef33fca72d3f69eb687a15d62dcd9a23440ea976a73766a499abd7db9e316db11e508356a12a40eff40021aeca88a773ff70512cabcd87fa29823d538f9
-EBUILD i2c-tools-4.1-r1.ebuild 1984 BLAKE2B 996ddb5df273a1e1836bad0c4df5176b203ee11f6aa40d135542708d21bf13ac78e0e5b356e24c6451e37d397a6b9b3fabd102366bfdf8b8b454c0acff4b6e55 SHA512 cc57b871e0f9bed5aa2cc13187d043a982b240c0d59c319e1b499899c5e48d063331d11eb4e371ef01e36c4ba4bc16d7c4b39c0bab812770ef05a2285a5ae9ca
+EBUILD i2c-tools-4.0.ebuild 1435 BLAKE2B f59c1de2694a342df01955fa3ffa2f71a96df1f86b09326e500b260dbc3ba82bdac1326c0863694abf2d19529587e77bc6fd1137fafd8b00434b70e1aa7d006d SHA512 b0986e3b0a27a3e1077a15f9557090e06ddf49b968677a33f04de83644b3043bc01e20b90e9be4c89d6646c9f469a971c38d4532d5136c0429836c558a78d4e5
+EBUILD i2c-tools-4.1-r1.ebuild 1965 BLAKE2B 2237523b6353de1af38567826b84b31f5d501d1404e95938b67c62459df2e9b1ca1b475c732315f4fb2f5468bebb1b9e6c379c577cd24267cd5481f0ca2a08f8 SHA512 d208241b151aaabe45160508855e11a639c58f151f36d61479ae5903728c423711f3cef557dc7413585be23fc9e5566239affa4a2d30307ceeaf99907696b4af
 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 209116293998..63df295b3125 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="!<sys-apps/lm-sensors-3
+RDEPEND="
 	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"
 
diff --git a/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild b/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
index a2f0af908f46..687930ef6f3f 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
 DISTUTILS_OPTIONAL="1"
 
 inherit distutils-r1 flag-o-matic toolchain-funcs
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="perl python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="!<sys-apps/lm-sensors-3
+RDEPEND="
 	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"
 RDEPEND+="
diff --git a/sys-apps/ibm-powerpc-utils-papr/Manifest b/sys-apps/ibm-powerpc-utils-papr/Manifest
deleted file mode 100644
index 607e5067a9df..000000000000
--- a/sys-apps/ibm-powerpc-utils-papr/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX ibm-powerpc-utils-papr-1.1.0-remove-doc.patch 425 BLAKE2B 8e0d6401c27ec6a2a82688d483ff511ae733c7ef3cb6c1a04ffea2a3900d6a7d1c9f6b0af8b2136065d553813cbabd5d8cde3568d2bf83a0385391c47651d1bc SHA512 d8cf48b58c1516c685d6e3a4c65f5f920f711f37bb4974d149918c853e94fc66c7ecda3356c586e7c21e3b0ff4926ce4530f222f82172b922d357fa715f3f57e
-AUX ibm-powerpc-utils-papr-1.1.0-removeinitandvscsis.patch 662 BLAKE2B 1dd3ec5b0f94eabe6453bb566dc3fbad7078a9978ea2ba4d045e05aaf6f520bf9041fcba70f1d498576289e9ee82b655e2081c7916aa288b4579245a0b0b264f SHA512 7d27ed954dc95c2ed5cb46efdca1159a019ac9a32f728576e0552e57f40b9a6930823d4055ee6b7560f733271f42b1291164723406b2b7d6525c941f795b9885
-AUX ibm-powerpc-utils-papr-1.1.6-removeinitandvscsis.patch 949 BLAKE2B 64056eac24c8c859d1ce08cd75f4305910e803c378593b99efb19eb9b83ea64174c1bb15501ac49279ac8a699074dfedd84b4a507d8f6d8343faac20e58aa653 SHA512 c862078fa6778f8f74615a3867ac91c85f0b4eb0d4a499c24fb9f40809bd7c3eabe74c97d47d1bbdef902ab398144d9030b7ec9bda88dbd9dc706dff44f886b9
-AUX ibmvscsis 1674 BLAKE2B 35275773582c68f649e91d62e5a3f6c18e8eaf6a8b396cd74747284b7a650892d4c6e63bca9a2a99daa54da21dbdd8eb9dc4a07786a01906cd5369893182283d SHA512 130f9a13a425e0af489eb135e48d8f77e0af6a6321ad080c3638a3c122a3f25bee4d9da1f8cea2d4acb234f35f67e4696ed40a8ae818be811912aa77351d3ac8
-DIST powerpc-utils-papr-1.1.0.tar.gz 202321 BLAKE2B f9cb5f125c5445f74157de37ddd21a3dc2d8e9ae6d63ae24f96aa1f7e232975046fb743684f5f490e49bd1e79dcb94d3ad6885ed9563105645c0f39808bfdba4 SHA512 4d222373c1bd1a9cadf74110ed0423bd099309d27b6e0f2e3c2d04adda02ad76611c3605954ca67a5a5e869d93241ef756c76b49d6207fc0a68a8eb7cf088a4a
-DIST powerpc-utils-papr-1.1.6.tar.gz 231283 BLAKE2B e3ec0bc26e3285dd4351657a832167420719cf13fb644985e64c40e2f3c31ad51672c84a7e0c415b11c5030c00a740a63e48eb62b422bc97f67d9ab7f33f52dc SHA512 e6c532276a4ed6749ee43af539a07be80777674927d2dc9eb65d95a9b57aa0b902e5fe2be65947f9fedd6e060a44657769c6f9faeae49a78cb4803d038f56377
-EBUILD ibm-powerpc-utils-papr-1.1.0.ebuild 1379 BLAKE2B 6af08ae5e3323cce30295a9989d6b1c6b50af0db845dcf91717cfd91fce9b111ba21bea913357eb577a40f08a47d05a7e26d8012e2d2997660bb6cc44e4e8924 SHA512 6478f14630f31f8fa988c3989523a12027f7de0f4dc127fd9a466a1dbbb8b697f5f8615c1acff14a6d5c63b60944f73d2e26487b1015b30f505e3a94a9d38232
-EBUILD ibm-powerpc-utils-papr-1.1.6.ebuild 978 BLAKE2B bba6a40392de5ed3bca56a609df3a93922266f0054b1b69c54721038c50e48c8456b8e031dd6f34a42d7152880f0daacd73076be2a535da365d830ce859b8cf4 SHA512 984b1c2a6f33d05f5399406a521e954654cfe0445f04ada8194e5322144e45ac8fa82e9e2547e5beeef76f328ef477843ef0842041ffb69b078400fa0e8ec730
-MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-apps/ibm-powerpc-utils-papr/files/ibm-powerpc-utils-papr-1.1.0-remove-doc.patch b/sys-apps/ibm-powerpc-utils-papr/files/ibm-powerpc-utils-papr-1.1.0-remove-doc.patch
deleted file mode 100644
index 8a2c27f0f8e8..000000000000
--- a/sys-apps/ibm-powerpc-utils-papr/files/ibm-powerpc-utils-papr-1.1.0-remove-doc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- powerpc-utils-papr-1.1.0.orig/Makefile	2006-03-28 16:07:24.000000000 -0600
-+++ powerpc-utils-papr-1.1.0/Makefile	2006-04-19 14:53:25.000000000 -0500
-@@ -20,11 +20,9 @@
- 	@$(MAKE) -C doc
- 
- install: all
--	@$(call install_doc,$(FILES),$(DESTDIR))
- 	@$(foreach d,$(SUBDIRS), $(MAKE) -C $d install;)
- 
- uninstall: 
--	@$(call uninstall_doc,$(FILES),$(DESTDIR))
- 	@$(foreach d,$(SUBDIRS), $(MAKE) -C $d uninstall;)
- 
- rpm: all
diff --git a/sys-apps/ibm-powerpc-utils-papr/files/ibm-powerpc-utils-papr-1.1.0-removeinitandvscsis.patch b/sys-apps/ibm-powerpc-utils-papr/files/ibm-powerpc-utils-papr-1.1.0-removeinitandvscsis.patch
deleted file mode 100644
index a6bb9278f8a9..000000000000
--- a/sys-apps/ibm-powerpc-utils-papr/files/ibm-powerpc-utils-papr-1.1.0-removeinitandvscsis.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- powerpc-utils-papr-1.1.0.orig/scripts/Makefile	2006-03-28 16:07:24.000000000 -0600
-+++ powerpc-utils-papr-1.1.0/scripts/Makefile	2006-04-19 14:53:44.000000000 -0500
-@@ -4,7 +4,7 @@
- 
- include ../rules.mk
- 
--SCRIPTS = update_flash hvcsadmin vscsisadmin rtas_dump
-+SCRIPTS = update_flash hvcsadmin rtas_dump
- 
- RCSCRIPTS = ibmvscsis.sh
- 
-@@ -12,11 +12,9 @@
- 
- install: all
- 	@$(call install_sbin,$(SCRIPTS),$(DESTDIR))
--	@$(call install_files,$(RCSCRIPTS),755,$(DESTDIR)/etc/init.d)
- 
- uninstall:
- 	@$(call uninstall_sbin,$(SCRIPTS),$(DESTDIR))
--	@$(call uninstall_files,$(RCSCRIPTS),$(DESTDIR)/etc/init.d)
- 
- clean:
- 	@echo "Cleaning up $(WORK_DIR) files..."
diff --git a/sys-apps/ibm-powerpc-utils-papr/files/ibm-powerpc-utils-papr-1.1.6-removeinitandvscsis.patch b/sys-apps/ibm-powerpc-utils-papr/files/ibm-powerpc-utils-papr-1.1.6-removeinitandvscsis.patch
deleted file mode 100644
index b8a31df485b5..000000000000
--- a/sys-apps/ibm-powerpc-utils-papr/files/ibm-powerpc-utils-papr-1.1.6-removeinitandvscsis.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- powerpc-utils-papr-1.1.6/scripts/Makefile.bak	2010-03-21 15:11:49.590571690 -0400
-+++ powerpc-utils-papr-1.1.6/scripts/Makefile	2010-03-21 15:12:48.107232396 -0400
-@@ -4,7 +4,7 @@
- 
- include ../rules.mk
- 
--SCRIPTS = update_flash hvcsadmin vscsisadmin rtas_dump
-+SCRIPTS = update_flash hvcsadmin rtas_dump
- 
- USER_SCRIPTS = amsstat
- 
-@@ -18,13 +18,13 @@
- install: all
- 	@$(call install_sbin,$(SCRIPTS),$(DESTDIR))
- 	@$(call install_bin,$(USER_SCRIPTS),$(DESTDIR))
--	@$(call install_files,$(RCSCRIPTS),755,$(DESTDIR)/etc/init.d)
-+	#@$(call install_files,$(RCSCRIPTS),755,$(DESTDIR)/etc/init.d)
- 	@$(foreach d,$(SUBDIRS), $(MAKE) -C $d install;)
- 
- uninstall:
- 	@$(call uninstall_sbin,$(SCRIPTS),$(DESTDIR))
- 	@$(call uninstall_bin,$(USER_SCRIPTS),$(DESTDIR))
--	@$(call uninstall_files,$(RCSCRIPTS),$(DESTDIR)/etc/init.d)
-+	#@$(call uninstall_files,$(RCSCRIPTS),$(DESTDIR)/etc/init.d)
- 	@$(foreach d,$(SUBDIRS), $(MAKE) -C $d uninstall;)
- 
- clean:
diff --git a/sys-apps/ibm-powerpc-utils-papr/files/ibmvscsis b/sys-apps/ibm-powerpc-utils-papr/files/ibmvscsis
deleted file mode 100644
index f993fd392930..000000000000
--- a/sys-apps/ibm-powerpc-utils-papr/files/ibmvscsis
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-#
-# This file is tasked with testing for the existence of the ibmvscsis driver
-# and configuring the ibmvscsi server properly as indicated by the config file
-# located at /etc/ibmvscsis.conf
-#
-
-DRIVER=ibmvscsis
-SYSFS=/sys/bus/vio/drivers/ibmvscsis
-CONFIG=/etc/ibmvscsis.conf
-
-depend() {
-	need logger
-	provide ibmvscsis
-}
-
-checkconfig() {
-    if [ ! -e ${CONFIG} ] ; then
-        eerror " ${CONFIG} does not exist."
-        return 1
-    fi
-}
-
-checkmodule_load() {
-    # The existence of $SYSFS indicates that the module has been loaded or that
-    # the driver is at least built into the kernel.
-    if [ ! -e ${SYSFS} ] ; then
-        ewarn " Module ${DRIVER} is not loaded, attempting to load it"
-        /sbin/modprobe ${DRIVER} &> /dev/null && return 0
-        eerror "  Failed to load module ${DRIVER}"
-        return 1
-    fi
-}
-
-checkmodule() {
-    # The existence of $SYSFS indicates that the module has been loaded or that
-    # the driver is at least built into the kernel.
-    if [ ! -e ${SYSFS} ] ; then
-        eerror " Module ${DRIVER} is not loaded"
-        return 1
-    fi
-}
-
-start() {
-    ebegin "Starting vscsiadmin"
-    checkconfig || return 1
-    checkmodule_load || return 1
-    /usr/sbin/vscsiadmin -start &> /dev/null
-    eend $? "Failed to start vscsiadmin"
-}
-
-stop() {
-    ebegin "Stopping vscsiadmin"
-    checkmodule || return 1
-    /usr/sbin/vscsiadmin -stop &> /dev/null
-    eend $? "Failed to stop vscsiadmin"
-}
-
-status() {
-    checkmodule || return 1
-    /usr/sbin/vscsiadmin -status
-}
-
-restart() {
-    stop
-    start
-}
diff --git a/sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.0.ebuild b/sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.0.ebuild
deleted file mode 100644
index 04d747ed2130..000000000000
--- a/sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-MY_P="powerpc-utils-papr-${PV}"
-
-DESCRIPTION="Utilities for the maintenance of IBM PowerPC platforms"
-SRC_URI="http://powerpc-utils.ozlabs.org/releases/powerpc-utils-papr-${PV}.tar.gz"
-HOMEPAGE="http://powerpc-utils.ozlabs.org/"
-
-S="${WORKDIR}/${MY_P}"
-
-SLOT="0"
-LICENSE="IBM"
-KEYWORDS="ppc ppc64"
-IUSE=""
-RDEPEND=">=sys-apps/ibm-powerpc-utils-1.1.0
-	sys-libs/librtas
-	virtual/logger"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/ibm-powerpc-utils-papr-1.1.0-remove-doc.patch
-	epatch "${FILESDIR}"/ibm-powerpc-utils-papr-1.1.0-removeinitandvscsis.patch
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Compilation failed"
-	dodoc README COPYRIGHT
-	#dodir /etc/init.d
-	#exeinto /etc/init.d
-	#newexe ${FILESDIR}/ibmvscsis ibmvscsis
-}
-
-pkg_postinst() {
-	#einfo "An initscript for managing virtual scsi servers has "
-	#einfo "been install into /etc/init.d/ called ibmviscsis. "
-	#einfo "Before you can use this daemon, you must create a proper "
-	#einfo "/etc/ibmvscsis.conf file."
-	einfo "Support for the IBM Virtual SCSI server (virtual disk) "
-	einfo "is not included in this version of powerpc-utils-papr. "
-	einfo "When the ibmvscsis function is generally available in  "
-	einfo "the kernel source trees, it will be added back in."
-}
diff --git a/sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.6.ebuild b/sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.6.ebuild
deleted file mode 100644
index 19f2a4f32884..000000000000
--- a/sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-MY_P="powerpc-utils-papr-${PV}"
-
-DESCRIPTION="Utilities for the maintenance of IBM PowerPC platforms"
-SRC_URI="http://powerpc-utils.ozlabs.org/releases/powerpc-utils-papr-${PV}.tar.gz"
-HOMEPAGE="http://powerpc-utils.ozlabs.org/"
-
-S="${WORKDIR}/${MY_P}"
-
-SLOT="0"
-LICENSE="IBM"
-KEYWORDS="~ppc ~ppc64"
-IUSE=""
-RDEPEND=">=sys-apps/ibm-powerpc-utils-1.1.2
-	sys-libs/librtas
-	virtual/logger"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/ibm-powerpc-utils-papr-${PV}-removeinitandvscsis.patch
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Compilation failed"
-}
-
-pkg_postinst() {
-	einfo "Support for the IBM Virtual SCSI server (virtual disk) "
-	einfo "is not included in this version of powerpc-utils-papr. "
-	einfo "When the ibmvscsis function is generally available in  "
-	einfo "the kernel source trees, it will be added back in."
-}
diff --git a/sys-apps/ibm-powerpc-utils-papr/metadata.xml b/sys-apps/ibm-powerpc-utils-papr/metadata.xml
deleted file mode 100644
index 5eb05198076b..000000000000
--- a/sys-apps/ibm-powerpc-utils-papr/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ppc@gentoo.org</email>
-	<name>Gentoo Linux PowerPC Development</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-apps/idle3-tools/Manifest b/sys-apps/idle3-tools/Manifest
index 1f7801ae81cd..51bcaaa19a6b 100644
--- a/sys-apps/idle3-tools/Manifest
+++ b/sys-apps/idle3-tools/Manifest
@@ -1,4 +1,4 @@
 AUX makefile.patch 951 BLAKE2B 945ce0da10772695815b4ee6620dc27faafe232f696e3a11fa2e3f172b8e51095dfa2e034fa8f870871f9f0bc000b9aa7a1ab22659f6b0641b6223e5f87524e9 SHA512 544dfc040211706ca15272625ac95c876749670a6d7919e37651bb076bf7911682943ea621c6022e7a216c8fbe434f9fc74c44e3c737489297541bf2d8d29d3e
 DIST idle3-tools-0.9.3_pre20120123.tar.bz2 19842 BLAKE2B 09095a1382e116c6171cf38c2d9cbdba32e38b3890f5169ed966b707bcd27f70e78efaef8c3500499fc261347c1cc228a8b39d910d719451cc11cc40fcb71b1a SHA512 309a6e500b71d64d569729f44b597fd218f983b9018373a4871a62137b32bd540524b757648fe9e873d949de772f26428cb82d16b367212e6d1fb592aa7bfbf1
-EBUILD idle3-tools-0.9.3_pre20120123-r1.ebuild 455 BLAKE2B e7b2c2155b3ddaa923528571b955a9b2a7f186912a708afb184244d8ad6de779736dd52ee5b963ea77584b5c040866893322ecbf67ab5c3e35b4fe983108b068 SHA512 f4da1ed3a4aa03fa3a7bc46d0d0b56518dde42e0cca17e1c4bcd1cd9585e455d595b8f85dbead196f57e4395f13e6236df6e98ba0940bf434fc22172bde6313e
-MISC metadata.xml 952 BLAKE2B e4123a25039cf4653b5e0818fde19ad2827923f013b0ca8c345f2ed204b9e0a38e49da2185c42b8507b5c053801f84ebce62ce4efd91d7bfdd302ebbe5c94632 SHA512 a7e419e6421ab02ad87c430ead433738aa3043249deb164e51b81674661fd4b8edaf9da11b679cd098373f5cb627a95979525c0bfb8d60ab8b691fd541e3a061
+EBUILD idle3-tools-0.9.3_pre20120123-r1.ebuild 464 BLAKE2B 01a717fc75f0acefd8a7fc70cda1b434e8073925681631c4884b14ed0a97838a7320eb7aa17cdd301eaa1fb60341b33390c0180e77d834781d145f87f806378f SHA512 9641e7f542f37522db50b24012209fbc62c69e687e8ff2cc6d714e93cc1f13912034373f2f789dddc8669dc3e9618d13aad8af40edbd38a99ed885a065cb2833
+MISC metadata.xml 833 BLAKE2B cb117d8459aa4414614df0b297c3bbf7fa6826ab4a1a1029ef8aa631e4673ddf9f8acd2270f2fc4df7ca82af18a7b6f2a7f92509da2f396190b3417efecfb11f SHA512 489ab2cbd8c800a227c974d9c5601ae6e3f99cc32edb048bfe1b52221dd78253452e394d681cdd69f5dde4f328dee0cd163a92f67385c6e21f89b94ede5c56b4
diff --git a/sys-apps/idle3-tools/idle3-tools-0.9.3_pre20120123-r1.ebuild b/sys-apps/idle3-tools/idle3-tools-0.9.3_pre20120123-r1.ebuild
index 40e2616b0351..ac7e897740b2 100644
--- a/sys-apps/idle3-tools/idle3-tools-0.9.3_pre20120123-r1.ebuild
+++ b/sys-apps/idle3-tools/idle3-tools-0.9.3_pre20120123-r1.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Set, get or disable the value of the idle3 timer found on WD HDDs"
 HOMEPAGE="http://idle3-tools.sourceforge.net/"
-SRC_URI="https://www.bl4ckb0x.de/files/${P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/sys-apps/idle3-tools/metadata.xml b/sys-apps/idle3-tools/metadata.xml
index 6d8e89f781f0..e6ab1d062d74 100644
--- a/sys-apps/idle3-tools/metadata.xml
+++ b/sys-apps/idle3-tools/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		Idle3-tools provides a utility, that can disable, get and set the value
 		of the infamous idle3 timer, found on recent Western Digital Hard Disk Drives.
diff --git a/sys-apps/ipmicfg/Manifest b/sys-apps/ipmicfg/Manifest
index b1ced268a6a2..f952a83faba9 100644
--- a/sys-apps/ipmicfg/Manifest
+++ b/sys-apps/ipmicfg/Manifest
@@ -1,3 +1,3 @@
 DIST IPMICFG_1.30.0_build.190710.zip 1886457 BLAKE2B 5a303ccedda2ffab8d599e68feb1e23faeba0cca7d2fdb224c29440a11a12114cdf536e3f9e5544c1f929fdf8aab0846db51ff2935b20b70b7c3cf7a0fa82bfc SHA512 bad76fd5bc07a9bafecbc02c9a0fc26310b4894c6c365f3c53f1a900244b634317bf59f43d8fa230af866ce6e7f537c7f902b38bb1d4ff5a8546de4fe94043f4
 EBUILD ipmicfg-1.30.0.190710.ebuild 1329 BLAKE2B 8ec41b98a6392ba47f17bb2feeb9bbd89625e58c0fb03959819233885302ba0cf60cd6648b21df0f44144d94747d1af979cf67c77e6f01e39b95e52ef285c7ff SHA512 9dd9da61b0f4a35e9ae22509dcce8ea581a478437c4d4d92ead540748528b2a40d24bd9eb1bea3f633168f20967314003a20cf1d28c40f7c7d85ba37d59f2618
-MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
+MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/sys-apps/ipmicfg/metadata.xml b/sys-apps/ipmicfg/metadata.xml
index 54d5423c4060..3e3880cf1051 100644
--- a/sys-apps/ipmicfg/metadata.xml
+++ b/sys-apps/ipmicfg/metadata.xml
@@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index 73185bb37b80..e798e994db93 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -4,8 +4,8 @@ DIST ipmiutil-3.0.6.tar.gz 1692679 BLAKE2B dcc02dbb5467b824005dbc95c8f5231b2e275
 DIST ipmiutil-3.0.9.tar.gz 1697688 BLAKE2B 93ed8865cae1cea0ea4f7de4683f4698e3f75e9190cc7e0af1832ca44a08f52aa149393761f1ede3994827db78841061d54058bbe4178b5930accd3a4c225ba7 SHA512 c2c0a516216a46a52621159e665a77d96cf81f385fc9cf19877e72283be3e1a4dad5a4826454727b71576c22cc4de3c73ff428d26f35bf496c7dc1511305cda3
 DIST ipmiutil-3.1.3.tar.gz 1698835 BLAKE2B a540a4522a22f98ad47c89e59f371e5304583cfaab348154dee366a058d78ca6d6ecd6003d8b49c08e8247d38254f7abf48ee05672ddd678566d40a66f63c912 SHA512 bd1f95b59583a07a5b6001b40e59269f25eb63b69e33f7fad6dd40136e1ea7611e647eb5ed2e2a9746944bde2dc2a3aa2def44238947693d75d9ca48697e1b99
 DIST ipmiutil-3.1.4.tar.gz 1693730 BLAKE2B a45de6e33110ae95b19a76be4c70a40025a9b6cbb5faa4555ff8d0b1c0445afcdd839d361052aadf31674b4be8db2c6c7087507727f74123809106b442bb1b8b SHA512 e76f3efbd5a15882607f9f141fe1298bfc80a3bc04f616bb0525c4546f19846616ce5aecc4aba658bcd01678724c05f770f893ba3dac91f5fe9c6cabd2acd579
-EBUILD ipmiutil-3.0.6.ebuild 1334 BLAKE2B 01ed4959fbefdc4487df779d5659a4b9d05893b536da58f1a828e435cf34a4938e2d05ae69568a728b0a91ab6380f040d6ad27b506ba8901f0d191f4ab7241c3 SHA512 a565e97bf6a0875a50033736a8172527f3a745e0ad45ff3d44eb985576e0d597585261bfbce779d552a6d0589ceadf6c453abcb9864e0ecac2867b9ceeacc18c
-EBUILD ipmiutil-3.0.9.ebuild 1431 BLAKE2B 80a5a7d78fdc0862346cc3c208110f5e934d2f4361e38fcf5572e90584ed931e24539891994318cd51895aa002e93cb0357cb2b9a9d3c6a661782df87c1be185 SHA512 7a600b99dcc43ea953c5bb37cbb5b313fd13714378a97d4159248f44ed2076e3ba783f6b326309744bbc4c599c09349fadd97a57f406988d0579950cd5265491
-EBUILD ipmiutil-3.1.3.ebuild 1461 BLAKE2B c0af26a98214d7ec3b6abaa86ed39a33b0a7f1c9e9b6deed89054179148c7197f92cca199f72b0b038144ba1d7ba8d4c83caa53025cba13cf151b97e29c42833 SHA512 444b4bb91e57f3288c15f734a7b88a40559625648af995b0d4d209662cb0c1e09382c0cab8f69132bb236bbeee0cbdd605769d709c554489419a8e7386652cfd
-EBUILD ipmiutil-3.1.4.ebuild 1540 BLAKE2B 3d6c4d4ef714a6bdd3c092c190c3f0d5cfdbcdcbbb8d8156a73341f6754b60831964c302bd4b3b7bf9ca61e8b300306fdce68f44a701be7018d0954be6e9b0f3 SHA512 1b741ffabc2000b5a53abbbec81ae538866449668bed2201258a129f7ffe84bbf073334f1760d2f65464a532cbd4511a7f5782d9e0428e67674bb9098e5ea98d
+EBUILD ipmiutil-3.0.6.ebuild 1304 BLAKE2B a1ce20853a9c2e29fe289bba096bbfb74beac4009630e9e7a36af13c69b98a0a48a0c86db4516fb179e5b8887576e832d1a81a921fde56c559906dbdfbfccea7 SHA512 a13dc0bd8546e321c84e942c9137d6e8f64e5df99c7a3aa41b090c116ad352aa631d51c7078e2c063004e20e10e86b3b26473ab209a81b9fca99776226812cbb
+EBUILD ipmiutil-3.0.9.ebuild 1401 BLAKE2B dd45a5580ccc8aad7f329985bf3fe6e3d68a95a54bf345cadfec84cf77fc6b65c073b8a31ececa88d7caa0dba94cf0bbeb882aee6cb13e56c496818a291d5074 SHA512 a8dec8237051be08002fa96517a8a322e213e08bd04f18249d2ee174d892cb4bd49d290d3f4f9b8e3ff5b73a1f3b05d4b1129699de8443b3834278e301a855f9
+EBUILD ipmiutil-3.1.3.ebuild 1431 BLAKE2B fda36080e5844588b7a89623b6f92486361580ed5eda666c821e6ef10cd00da24a3beecdc419f362c2abbbcc754d061ddcd37f66fa574d2bd3ec69c2f86d3037 SHA512 6dcc5aba9441276c1ddf851abc95dd6108d255a02355dd3eb7189c28aba30ee3076e1a388400305f723f8e80be5d5bdbe1047132262369aafbd0ea14f2b029d5
+EBUILD ipmiutil-3.1.4.ebuild 1510 BLAKE2B c4a90296c9b33c038b1f5f17a3a9cbb7fe2a6e3f251c23e331b6cc02d11b4034cea12de2855fea38b05698c4b229b589436d055c04bc0f675ff730781b19b99d SHA512 dc3bdcb34a6158bbf67f46ac740b109f899b2a6458d31ac732c07783ba73c7dc0086c239d306edec785ad3223e4096fc08ad944cce2bd63f8c521da1ccfa5180
 MISC metadata.xml 337 BLAKE2B 5f04801092c5d0cf4166c36b508c4cb27e3a08f53f8f86d968d01d1d6911c6dd9cff78d70ec5c9bb60e6f3a028b7e5db1b629a9ba7961b3d729accbc6b62f9c2 SHA512 85f9992b8c7fddbffe99cba761637a897e7ba68f70762f882c039c6492feefefa6bd1ca38fbc73d0a214d04ddb07f5f0ea2106552e4133736d4594e43fae4845
diff --git a/sys-apps/ipmiutil/ipmiutil-3.0.6.ebuild b/sys-apps/ipmiutil/ipmiutil-3.0.6.ebuild
index e157b5eb274c..7f746df64c56 100644
--- a/sys-apps/ipmiutil/ipmiutil-3.0.6.ebuild
+++ b/sys-apps/ipmiutil/ipmiutil-3.0.6.ebuild
@@ -39,7 +39,7 @@ src_compile() {
 	# and it doesn't even work.
 	# Please check on each bump if this workaround is still required.
 	pushd lib/lanplus &>/dev/null || die
-	emake || die "emake lanplus failed"
+	emake
 	cp libipmi_lanplus.a .. || die
 	popd &>/dev/null || die
 
diff --git a/sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild b/sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild
index ac6d2f9004f7..670520a6b9cd 100644
--- a/sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild
+++ b/sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild
@@ -40,7 +40,7 @@ src_compile() {
 	# and it doesn't even work.
 	# Please check on each bump if this workaround is still required.
 	pushd lib/lanplus &>/dev/null || die
-	emake || die "emake lanplus failed"
+	emake
 	cp libipmi_lanplus.a .. || die
 	popd &>/dev/null || die
 
diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.3.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.3.ebuild
index 426199d3e70b..e05227de53b1 100644
--- a/sys-apps/ipmiutil/ipmiutil-3.1.3.ebuild
+++ b/sys-apps/ipmiutil/ipmiutil-3.1.3.ebuild
@@ -40,7 +40,7 @@ src_compile() {
 	# and it doesn't even work.
 	# Please check on each bump if this workaround is still required.
 	pushd lib/lanplus &>/dev/null || die
-	emake || die "emake lanplus failed"
+	emake
 	cp libipmi_lanplus.a .. || die
 	popd &>/dev/null || die
 
diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.4.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.4.ebuild
index 4eefd0cd1de8..a8fbfd6eff87 100644
--- a/sys-apps/ipmiutil/ipmiutil-3.1.4.ebuild
+++ b/sys-apps/ipmiutil/ipmiutil-3.1.4.ebuild
@@ -43,7 +43,7 @@ src_compile() {
 	# and it doesn't even work.
 	# Please check on each bump if this workaround is still required.
 	pushd lib/lanplus &>/dev/null || die
-	emake || die "emake lanplus failed"
+	emake
 	cp libipmi_lanplus.a .. || die
 	popd &>/dev/null || die
 
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 2bc2590bf3f0..d1399c0d4cfe 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -6,12 +6,12 @@ AUX iproute2-4.20.0-no-ipv6.patch 1334 BLAKE2B 612fa64a897fe8c601aca529a09508cc8
 AUX iproute2-5.1.0-portability.patch 1117 BLAKE2B 8e3a2f275ffb774a30165f46d85ad01f7cd3a932085519255f661dd898462ccb5e8f11c2a57e015d6c19d8c917c82eb76f4b9c779ff91b4cfb7b874fcdda3088 SHA512 5e46e5870e41c15213f04582f40bef18c081f5058f8b530c844fab4f42f56935386f461f0d46f33d17352eebd79a167bb9b6f1edc93bb62b805283cc3872f4f9
 AUX iproute2-5.2.0-fix-sys-queue-h-on-musl.patch 2579 BLAKE2B 86e81152b51a2566060469d4585ab092be0f5a62bad11a24e086bf2cdea78db7494dc5c4692e3c71ed108732ad3a59e444c423eaffd356c919ca82445de75f6a SHA512 9b0875781f20c0a3773d9c0b0f051ce455fcbf3cedb92a411ce9c873f162ca6b25ea8c564fa971d7c56e6e3effa3a9cb0a3057518a16de264b100b7b73a7d64c
 DIST iproute2-4.19.0.tar.xz 720408 BLAKE2B 2d0ece5dd8f1beb7912d025c269a9edd2ecd87aea04971a28eca9f9b7ea82d0e4aa397c9338c0cb6cb463887678a541a5407644e82244ffbbae0eb8f6ac088e8 SHA512 47c750da2247705b1b1d1621f58987333e54370d0fff2f24106194022de793ff35dfd67fd1be127ce019008705702092d31dac49abf930a7c0dc5c7e7c0665b8
-DIST iproute2-5.1.0.tar.xz 722412 BLAKE2B 06330b636d661df5e2128a87bb63455bcbb5c8cda0faab96928e2068bb23b3bc3b2e5a0daa68d2d112e66fa58d7b3360791c7d5a0d679fc01cecb3ca9ad8ea4d SHA512 5c8319b040bd0ba98cf1225b2a77efafc662741344c53877ee38cf108ca01906b03328e4f9b00b7557e301c6e64bca4e42e92af477b4d657bcbff5120c0c4e87
 DIST iproute2-5.2.0.tar.xz 729540 BLAKE2B 72d082b4f39b6b9f0040149ea14d3c5c6d999eb4955b708ef49a3276f3c574eab757e2c81f10a11e2ce5f709c7849bbf6556e40c7f261fc72d498046f73eade4 SHA512 82bbeae29d98129d822c95ff7523186569e32c66132b8d781d501d61f396b04d122e3d13057dd4236455264008e5bfac7cb63c325908fc1c46d416cbde6ac7e1
 DIST iproute2-5.3.0.tar.xz 742660 BLAKE2B e2152eb6c7d443f54bad0aec0cba23656c1defafc53f10130b63288f070e6e77c27a78a3f9bf6f6d14be3490eadd583a779f5d44ec23d16535e14abe04feb848 SHA512 c20ce477cb3ec24194ea56d3d9037795e26975ffde188b63ba974a0aa671dd169f356e9446bf43dc56523e01c0bafa442b91d83da9b2302daee18e237f2f3157
+DIST iproute2-5.4.0.tar.xz 741328 BLAKE2B 8c7b74aa64526180e793165eb3d0f1ee07d4589fa982aa91e4e0775595c096d73677e85bb7f073cbe14e6de6b166d31efba94554f8c7df3320b168341818fcba SHA512 26d1230e10d9ba4466edd3fe95cb6f595df691eeb27b87ae845ceb9da09fe11c2e0daa8d67187121320413f9ee7131fd426182055eb285be7c4de558d9e47051
 EBUILD iproute2-4.19.0-r1.ebuild 4386 BLAKE2B edf0b109425c96b752459c0483ff5a3969e8bcb0cd0011d24e886084e6b4354d21f4f8575c9786136698e10347513c8a9fd1bcf2cb99a88851d1117eba19c39c SHA512 5a76cab28c2d9351c107717cadcfa1439d19f9dc6e4d9aa0498f6678f04362bd327eff16c3460caa74cb02a25e06e6654011c66bac9c27a0def2b18f7560e469
-EBUILD iproute2-5.1.0.ebuild 4436 BLAKE2B 020def1d432958b593d7086707c8ab70b517731cbda5ecea7d276cca68168831b2f7d1f9e10426d790d30a0f7c4631a7b56f9e0b8e6b3f994576be6b01139607 SHA512 b095e0ae75f06ac4cbe3af525d9756d6dfc5c54b1b662bdd23803ade0d9754702af616a646b41fb92cd5f9f46c1149eac56706d889204b7181fdb64173b5506c
 EBUILD iproute2-5.2.0-r1.ebuild 4480 BLAKE2B f7f2bccba971e15cad8250925623c48f3b28589b0209d13ebaad645deae58abbcfda5bd92c6f77277239c3b8980f975dc0c5b3415c4012007173e9faba5937e4 SHA512 ea32ede9b3c3368b8d98a9cf7b99dada170cb37ec34732229f07253295f61c0aceca6c4903ed987295078ed11fcf44c33ab5aecb41e6e96258cf064a7ceacc85
 EBUILD iproute2-5.3.0.ebuild 4436 BLAKE2B 020def1d432958b593d7086707c8ab70b517731cbda5ecea7d276cca68168831b2f7d1f9e10426d790d30a0f7c4631a7b56f9e0b8e6b3f994576be6b01139607 SHA512 b095e0ae75f06ac4cbe3af525d9756d6dfc5c54b1b662bdd23803ade0d9754702af616a646b41fb92cd5f9f46c1149eac56706d889204b7181fdb64173b5506c
-EBUILD iproute2-9999.ebuild 4391 BLAKE2B 80ea005a28636d8d9af168ea30a995384be217ef19763f9a35e12f2606a4c1cd030800e19f3ca2d7f548a2d26c1781cd6f4ffe51e678198a2bc693967b2982d2 SHA512 930fab14b85b89d960737f188046e3937280fac97d7a0795581905af9ffab0979cdee0edbb4bc2e246744d905561b37e8852f86f02167c8f0a6b53baa98bd712
+EBUILD iproute2-5.4.0.ebuild 4436 BLAKE2B 020def1d432958b593d7086707c8ab70b517731cbda5ecea7d276cca68168831b2f7d1f9e10426d790d30a0f7c4631a7b56f9e0b8e6b3f994576be6b01139607 SHA512 b095e0ae75f06ac4cbe3af525d9756d6dfc5c54b1b662bdd23803ade0d9754702af616a646b41fb92cd5f9f46c1149eac56706d889204b7181fdb64173b5506c
+EBUILD iproute2-9999.ebuild 4436 BLAKE2B 020def1d432958b593d7086707c8ab70b517731cbda5ecea7d276cca68168831b2f7d1f9e10426d790d30a0f7c4631a7b56f9e0b8e6b3f994576be6b01139607 SHA512 b095e0ae75f06ac4cbe3af525d9756d6dfc5c54b1b662bdd23803ade0d9754702af616a646b41fb92cd5f9f46c1149eac56706d889204b7181fdb64173b5506c
 MISC metadata.xml 672 BLAKE2B d27b6af84b177e8b12f64470dbac0e8fdcf45091681ced6d5ebd02414849c221e608a6a4bb8ce6aae305475e086cf140836b943a9e5380f10c368ac359397a98 SHA512 d71c5077fcf769520048a46b0fdd3563b974b65afdc68eb73fc0816d2c87dd9a73bca72e25d7e8f3c9f2ceb23c473bb92a1a92d8d5f43a7e15f965669226f0a2
diff --git a/sys-apps/iproute2/iproute2-5.1.0.ebuild b/sys-apps/iproute2/iproute2-5.4.0.ebuild
index 9d1acf39062b..9d1acf39062b 100644
--- a/sys-apps/iproute2/iproute2-5.1.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.4.0.ebuild
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index 737d166cc0fe..9d1acf39062b 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -47,6 +47,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
 	"${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722
+	"${FILESDIR}"/${PN}-5.1.0-portability.patch
 )
 
 src_prepare() {
diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest
index d27beff0ebd3..f4e68df58629 100644
--- a/sys-apps/irqbalance/Manifest
+++ b/sys-apps/irqbalance/Manifest
@@ -1,10 +1,7 @@
-AUX irqbalance-1.4.0-configure.patch 2370 BLAKE2B 235d7a6b2fe7f49cb9ae7d98e0c991fea67c712aa430975b49967133441e213336ca94d8c788297984cb6d5343b82a1ec4824c9667c7a3d8e5dbced444055144 SHA512 70b7510df8f0ad61eb3b432f7fcf4ec8e3408ba7a7397b47a6052a3e9be3a4bbffb0bc1f9b0eb3b7eaad783e548f2f81fd195fa9a93d937e73a9dec80c549374
 AUX irqbalance.confd-1 577 BLAKE2B 2744f203cb1d20ec44bec2f4cd2adc92209575a4742c601f45780cc55ff44434248987c31faf6ae2205ae02b2ecfdbd914f271169cb345e403f41376e3bc48b8 SHA512 90e7ed187b4dccd6f6c4383ba54d6e1aed1645240e44aaf02db1b70b56594b1a828644d671e6db91212417981b1d5e53d1ecfd4b366496dbcb484d1064d7d24c
 AUX irqbalance.init.4 524 BLAKE2B 473ee234adf186f620ec022cf20d61b3aaec368611659ce29be47e1038a0d54e4c353264326353cfbca9e43486e4b9bff17086c8484357512dbd9dc74997ff06 SHA512 3b438b142915139d403f6162271e00807db6f0e9432798b3f2955e798dd58ecb07a6c8920cc85032e65cc5a6d4c16fc65402119d6334920ea6715c4f918f6cbc
-DIST irqbalance-1.4.0.tar.gz 53431 BLAKE2B 35271fab011cb917e5472079025f88df45142b0622d94570f62ef7cce7f2a4e9c9c0b77a79121afa5e7edf4510707c7ace52e894b2af44a5a26b543160f481d0 SHA512 d95909c5e86efa452d0d440df0335b398bd2bf973d6a84e29068534f8c4dc033df90913bf507a6d1b7cdab11b288bafbd2c88b4e476f04e32d5f4c89efe4f7d9
 DIST irqbalance-1.5.0.tar.gz 55150 BLAKE2B b111e9fd4cfec968b261f6ae8a6876d15845849ebf28d7304fd8af3bdeb93b8b9a626888c5728b69925f02a5e472c3512f5862726c6ae9a4d378c46ebcf39069 SHA512 343421fd533d7d161fd05a0edfadaddf1da6ced854a19e9f10ea6c12b97b2ef1629aad855214d9700d31d056bb816bf3ec90cdf7c643a1b6e8af1de5befa64f5
 DIST irqbalance-1.6.0.tar.gz 55310 BLAKE2B 67589a40541e9034a0ac09d60a2293dde7a0cf524620794e25b60b4d78f2c91270252f6cebc2c91c66aed105536a211d51aeb29305fc1235112d96b714dc80bd SHA512 ce89dc41eb3aab5950a56b4b1c817aae5e87eaa84bc69bf88618caf53386513e488bb0b4724a600ae175c96be509367cfc418c7f85531007f80e02f7de549b16
-EBUILD irqbalance-1.4.0-r1.ebuild 1372 BLAKE2B 1e12173e698ea23c7b1a7f76b189d96f9dd5ce8227c6b3a9880602651d84f329d7c8cace2026645e31843b163956880b9fb9058da653341d34b7169ba6536b95 SHA512 336cf37b2def1d788592c40ad1e5aafc124e01a0ecfc5d3ed62bd43e7ff9e1bd1c5dfdacdc65dcca254ec65aaf4db0d5af825796c2a33f19ee56b63e00c69080
 EBUILD irqbalance-1.5.0.ebuild 1322 BLAKE2B b7c9fdaeef6a657caa89f3f1cdd641b55c82657bfb8a81d9cb7ec16387c5bc0e6629f655fc675f7485931a5480276aa56d959e81d22ab11c51343e54a7f29f02 SHA512 0557b7a96c9a1b23ee82e524b90d9253699cd2b3c31b566db027838cf7b33b01b55ebfd3a8bd49ee9001110e2aca6058cbdf2604f56f5311ce5143c0b360a7e6
-EBUILD irqbalance-1.6.0.ebuild 1312 BLAKE2B 15b955847573ae02a71f155b51581319f602692f02a5b1a7336635b186f70c4947328e1ef72397fe43c0e4042288f9afdf60c7cfb63d5311978aad55823860fa SHA512 5c318b5baf762149b5084f89eb3c04e2051536fbb2110490e43e6f89015de6444891197f22f9b5be48638053d47d5c1d3af784d78f0cb28551ac38f7c5e2b074
+EBUILD irqbalance-1.6.0.ebuild 1309 BLAKE2B 6ea42f237e543cc39a7327be36cb390af4db3b45d68548026526c66ce979116246f34e08232f264a5f072cbda70bc0605d24186d2e9fd92c2112a1503f9a6bc3 SHA512 4e8b97047793e1cbd5775978062b050be83eba0eb4694b4018ec233fa69f2db9d99b32b020d2f373c8c186d2be112695b0e11e9501d402e4f8431f0bbae7ace9
 MISC metadata.xml 546 BLAKE2B 9c510c79c069672f2fdd1ccd7d2bd08917b692779904237650fbf8262bed2a6a40af805179d9f265534e761f074cb4d533fe89e46533880edae9c30f9a118a7f SHA512 6510fd0c07b1b59b79037b05a482554b3934c8d19acc8f4d54058ac5bc605c5adde426d3c12b7f618dd87381435467ecbab7baafcfb27166981f83cb56b72a04
diff --git a/sys-apps/irqbalance/files/irqbalance-1.4.0-configure.patch b/sys-apps/irqbalance/files/irqbalance-1.4.0-configure.patch
deleted file mode 100644
index 6008e45126c7..000000000000
--- a/sys-apps/irqbalance/files/irqbalance-1.4.0-configure.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 8ad74cdabac37599d20a985e6a456b1faca92df8 Mon Sep 17 00:00:00 2001
-From: Manuel Mommertz <2kmm@gmx.de>
-Date: Mon, 9 Jul 2018 14:08:35 +0200
-Subject: [PATCH 1/2] configure.ac: Fix --without-caps option
-
-irqbalance links to libcap-ng if it is installed, even when useflag
-caps is disabled. This is an error in the configure-script, which
-checks for the wrong variable to determine if the user used --with/
---without for libcap-ng.
-
-Downstream bug report: https://bugs.gentoo.org/660782
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index f6c60da..19b148a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -65,7 +65,7 @@ AC_ARG_WITH([libcap-ng],
-   AS_HELP_STRING([libcap-ng], [Add libcap-ng-support @<:@default=auto@:>@]))
- 
- AS_IF(
--  [test "x$libcap_ng" != "xno"],
-+  [test "x$with_libcap_ng" != "xno"],
-   [
-   PKG_CHECK_MODULES([LIBCAP_NG], [libcap-ng],
-     [AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])],
--- 
-2.18.0
-
-From bc56dbd4eead9ad19ff1d84dc8810123c96503c0 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 9 Jul 2018 14:11:44 +0200
-Subject: [PATCH 2/2] configure.ac: Fix --enable-irqbalance-ui logic
-
-Before this patch --enable-irqbalance-ui disabled compilation/
-installation of the ui because AC_ARG_WITH is used wrong.
-The third arguement to AC_ARG_WITH is _action-if-present_ which means
-that this action gets triggered once the --enable option has been
-submitted to configure on command line no matter if it's enabled or
-disabled.
-See also https://autotools.io/autoconf/arguments.html chapter 3.1
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 19b148a..75c234d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -43,9 +43,9 @@ AM_PROG_CC_C_O
- AC_ARG_WITH([irqbalance-ui],
- 	[AC_HELP_STRING([--without-irqbalance-ui],
- 			[Dont build the irqbalance ui component])],
--			[with_irqbalanceui=false], [with_irqbalanceui=true])
-+			[with_irqbalanceui=$withval], [with_irqbalanceui=yes])
- 
--AM_CONDITIONAL([IRQBALANCEUI], [test x$with_irqbalanceui = xtrue])
-+AM_CONDITIONAL([IRQBALANCEUI], [test x$with_irqbalanceui = xyes])
- 
- AC_ARG_WITH([systemd],
-   [ AS_HELP_STRING([--with-systemd],[Add systemd-lib support])]
--- 
-2.18.0
-
diff --git a/sys-apps/irqbalance/irqbalance-1.4.0-r1.ebuild b/sys-apps/irqbalance/irqbalance-1.4.0-r1.ebuild
deleted file mode 100644
index 4b61bf9bc3c6..000000000000
--- a/sys-apps/irqbalance/irqbalance-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools systemd linux-info
-
-DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system"
-HOMEPAGE="https://github.com/Irqbalance/irqbalance"
-SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="caps +numa selinux tui"
-
-CDEPEND="
-	dev-libs/glib:2
-	caps? ( sys-libs/libcap-ng )
-	numa? ( sys-process/numactl )
-	tui? ( sys-libs/ncurses:0=[unicode] )
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-irqbalance )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-configure.patch"
-)
-
-pkg_setup() {
-	CONFIG_CHECK="~PCI_MSI"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	# Follow systemd policies
-	# https://wiki.gentoo.org/wiki/Project:Systemd/Ebuild_policy
-	sed \
-		-e 's/ $IRQBALANCE_ARGS//' \
-		-e '/EnvironmentFile/d' \
-		-i misc/irqbalance.service || die
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with caps libcap-ng)
-		$(use_enable numa)
-		$(use_with tui irqbalance-ui)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/irqbalance.init.4 irqbalance
-	newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance
-	systemd_dounit misc/irqbalance.service
-}
diff --git a/sys-apps/irqbalance/irqbalance-1.6.0.ebuild b/sys-apps/irqbalance/irqbalance-1.6.0.ebuild
index d2cdd3beca3f..fec100e24229 100644
--- a/sys-apps/irqbalance/irqbalance-1.6.0.ebuild
+++ b/sys-apps/irqbalance/irqbalance-1.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="caps +numa selinux tui"
 
 DEPEND="
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 39004913cf92..c62edec26f34 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -3,8 +3,8 @@ AUX kbd-2.2.0-cflags.patch 990 BLAKE2B 2512eccfd4e2eea843e176951f6e6fa1f74d2fd28
 AUX kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch 982 BLAKE2B 6a52de79d927cb67420a257d5becbe50027c838878e1baecf860e30feb59a1913101e1f650974c5bca08f579c1dd4312cc60f77c12a6c860281b3fcb0fdbf072 SHA512 caeef9531f8bd926c655a7002b4b96b9d49aa94b7d7e063347d920bc869751059fbcf4578338bbb9e910f936b62485bbe51713d4956577dcd6828ad075b4f6ed
 DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f
 DIST kbd-2.2.0.tar.xz 1115220 BLAKE2B d4218f3a8f9212d16e8a14011f0e136f6aebd18f13f8d5da2bd63296e0aa857fc5e7fe927200345fca3b723bc879f87511b02c152824a73ae5743cc8175991e6 SHA512 5f407c20739487e423e8390e429d30838a1a69a0a50db083803ce56da919e25ce480b63fd1bcfac9eb362095f17e575783b09eaa55e26b442bfa3ed838e04f13
-EBUILD kbd-2.0.4-r1.ebuild 1513 BLAKE2B fa37325a1f47b100a555c06e23801624718ef7836776c6a3ecf20a1aa8d0c903a532bd6ba14167bb08b2c301bf7112902c635516b54b03235f50dd457a8352aa SHA512 4599b339c637ca2178b0d74897a9d01d318308d295cc4a78d99a9d28029f45b829c348f97e4b4439ba5f6e4712649f00797ab784b0cdb9df716c8f47c035f2db
-EBUILD kbd-2.0.4.ebuild 1347 BLAKE2B 9b9a8d7e7f8bd1ffebde7b161e84e37eb6882a140094e2f8dbdf16bd98f0f57e24b36788099b2e1cc90d0721a19af93a4afe7cbef7c218cfa09169524438b815 SHA512 3f236ba39469df1198216b512fef5088d283490a232f30f0ca25417b1fd6bd510ec81fdb691f63d4dc3ee2586f71c153c9712a4e47815da65174f4fb9a9189c9
-EBUILD kbd-2.2.0-r2.ebuild 1582 BLAKE2B ace4e733faccdcda2c7917a34382063edb5d0d3fdc098a3b4e3d7a8354a5afc8e32e195e0c5680fb18e13b4527c92924dd37e3969773ed0ea95b826eb48650ae SHA512 1789413295e88a0ab6876dd67dfd499225015fdf8e9a858279ac2e4e232a1e76cb9f74dfd23399d4db6270fda9f0db273a1c082b38ee496c4106c9079edd5e6d
-EBUILD kbd-9999.ebuild 1497 BLAKE2B 134e34073bee151e064eec0dbcacdf0f86db5cfd844669bb9f105d09dc47df0326229965312e7ad297aa61586e1bea8418165962f1700ed1c5a47ce0a546207b SHA512 79d64d95f5a3e22c44c9d93cca1444e6fd0794bbee0fe89bb848c96f301f264253b9e22d0ba17e4fbae41b372487a178dea1e06a2691d7cfb34e8b3992dd3988
+EBUILD kbd-2.0.4-r1.ebuild 1540 BLAKE2B 9e41eef250e5ffd8889c06bcb20d8e1c70c34bb4926661a590fadbdf7ee4de88183260655d3af27e517ffaaed94f156fc1ff3567240231c976d0f0d3e95d7f30 SHA512 0944c535ff19384acb55f70f8a6ef56dca4e49438466215ac17024228708ec0f6e9dc950dfa236889dc83c2c750e40de73a011a63d2f9922dc18bb3823155955
+EBUILD kbd-2.0.4.ebuild 1374 BLAKE2B 144aa60d2ea38b74356c8df057e135d6dfdc4f7d693f0cd0a5ca301212a926f98656bc9f6b64bb57cd1630d767f14c6c3cacf775fcb31e4afee7dc88d978ac14 SHA512 b2de336c6d3a4d13a0c819b3b02295154997e47db271bff09c354319ce016d938d4ee43f62b0583b4a8975e6fcdd28c475b8e7de42ac4557af43fd3efcc5a8b9
+EBUILD kbd-2.2.0-r2.ebuild 1609 BLAKE2B c59f2bbdb279c7bea12c76e49f0ba814028a11f53810b254ec4c5984dc1109705c229ac72e3e9273d9437ddd1f99885aaf9bad66e44fa09d727db55ea48a5092 SHA512 031ef06c5c216a8300c482b168f65490e9204477a4a696f60d8909cafc796fe908bd718bb4a0d64b4f491be26cce3544f8a522d70089ae63b7e56936d1b20225
+EBUILD kbd-9999.ebuild 1524 BLAKE2B c3b992ed95e88346f0bc09fe3dcc31136e010b81d15beca23d68edd1a10a487a6189a5ca0f74a810aed7a89a208eddab5253763ac8cb797c7d6d045df7c68311 SHA512 04456ab7511de30f511e61cd491a101b17342f5f68527510cc89bdc57e55017841c8f8ddca9179b57ff940eaed9d26091f8d87a067c060400d79f165a5a04e7d
 MISC metadata.xml 321 BLAKE2B 608f4a02a31f6c1590d7c237516a00cefa06f641febb7b479b7b0a276e9b59c0b7a88bbc6f4bdaca942ae83b85ebad6c6e84097916315eb985ebc2d98a70b171 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641
diff --git a/sys-apps/kbd/kbd-2.0.4-r1.ebuild b/sys-apps/kbd/kbd-2.0.4-r1.ebuild
index 3be269cae6ce..58d6b6dfff53 100644
--- a/sys-apps/kbd/kbd-2.0.4-r1.ebuild
+++ b/sys-apps/kbd/kbd-2.0.4-r1.ebuild
@@ -20,6 +20,7 @@ HOMEPAGE="http://kbd-project.org/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="nls pam test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-arch/gzip
diff --git a/sys-apps/kbd/kbd-2.0.4.ebuild b/sys-apps/kbd/kbd-2.0.4.ebuild
index 87cfa64484eb..9dde0feca4ed 100644
--- a/sys-apps/kbd/kbd-2.0.4.ebuild
+++ b/sys-apps/kbd/kbd-2.0.4.ebuild
@@ -21,6 +21,7 @@ HOMEPAGE="http://kbd-project.org/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="nls pam test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="pam? ( sys-libs/pam )
 	app-arch/gzip"
diff --git a/sys-apps/kbd/kbd-2.2.0-r2.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild
index da63a90d2cef..19c32fde0fff 100644
--- a/sys-apps/kbd/kbd-2.2.0-r2.ebuild
+++ b/sys-apps/kbd/kbd-2.2.0-r2.ebuild
@@ -21,6 +21,7 @@ HOMEPAGE="http://kbd-project.org/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="nls pam test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-arch/gzip
diff --git a/sys-apps/kbd/kbd-9999.ebuild b/sys-apps/kbd/kbd-9999.ebuild
index 06fb77295c43..85d244167140 100644
--- a/sys-apps/kbd/kbd-9999.ebuild
+++ b/sys-apps/kbd/kbd-9999.ebuild
@@ -21,6 +21,7 @@ HOMEPAGE="http://kbd-project.org/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="nls pam test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-arch/gzip
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 495ee563d856..38f01767a3da 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -1,21 +1,8 @@
 AUX keyutils-1.5.10-disable-tests.patch 1214 BLAKE2B ac79e98a45b02575433e3604a04b1597a386b96f45d872f175dbd36d134d9aa5cf44f0dd4a3a4b9bea38c9986a85a9d60b45f7f4a7576d19a6a5c369bea1ce4c SHA512 dda49b7c3aeadcd7d4e52d304ecf60fedbb84d02a11d0a641dfa4d563c6f6fcc2c577b46eb688c159feaf0be32c0aff4470adec5d1c3bff544d5dcea47162cbe
-AUX keyutils-1.5.10-endian-check-1.patch 796 BLAKE2B 1860c4fdb076a34127be13546007832d4b4b6a23e2033f39cdfafd84207c96d854df199a8831d7e11e0a17aedb16193483a7470d7449f11101f0a6e268f668ed SHA512 56c22165fb69c24381384e81e2927f01054cf6ba7c781c02d0891b6d55a405d63aa542d846a809a7c0ea1ae29d2b44d711890d72ce1fb18eb6146adc0ad1e9d6
-AUX keyutils-1.5.10-makefile-fixup.patch 798 BLAKE2B 42dec4f0a6b8439a631e1dbe319a893379e719b640ab2908da28f251bf837efa5d1b85d2d265250cd8248f4c3b24a02b99e0afd021ec2f203bcee4c071eeb244 SHA512 76b1eb98157f2f45b9acce9fd99f2fb10d592cfe61463075a8f6b963ffa2ab97f44aa3e5a3cc7bacaf53d08f51e81225506324edb6d3fa7d5c51954fce783e1e
-AUX keyutils-1.5.10-silence-rpm-check.patch 605 BLAKE2B 7f18a8e8530fc7ca13522bb1cfe3066c980cf9a0dab4d390a28adbd0e34fdf5011de5b14cbfedb26f3c99d6e7cdd7f3b85d29ffd64e33da2df4e7752a8989e26 SHA512 4d9f0c177be36b29fc9e23f56b964d47d4dda89c80f78c4a46c5725614816934b656dc83cf4b6920df72eaf0b9c4fe10825c7cca8fb4363277aa45befa816fa9
-AUX keyutils-1.5.5-makefile-fixup.patch 879 BLAKE2B a4c5fe84445c638e126dc017a2caf05e97803d83a21706cec4ca116982f2111d54acdcf76cff63684dd50bbe8cdd38fbde1b18b7c73f82a8d943a1558c3d377b SHA512 d3628be5cd759fd59e3fb07897db2f23615cc4b2b12d537438c4c186e5588d8d7c22438fdb26003be29ace4910db24a889d4e35550b74a91958a4fcb4bc654c0
-AUX keyutils-1.5.9-disable-tests.patch 1146 BLAKE2B 8f4206d5c46e735e51172cc470c52c0f1326d392c05fdb2c5a8885e79e3c9108336ffaff778b0953a274c161e0bde4a4f23048c5e12e220ad996b916711be638 SHA512 cae4f6457587328efba4d391726d8ca61a7d4a2ca0fbf2b8eb6ccfadce53240ad9cb44137dc178efe7cfa78bef48d6d84fffd7af07cee15a949f5c62eae493e2
-AUX keyutils-1.5.9-endian-check-1.patch 1254 BLAKE2B b4416a587c208f7e8926c205a0a565495e7508df5245466bcd8abc4f7a19214626da759d0321d7db1d51f2e4553383d5475749ea8f9f6d58ad8749762f56d6ad SHA512 95f05393186546ff3b28e14184c8da6d507085e687e6921470bcb433a925b56dfc7b806eaf63a552552d0cad3a73294614f990db583e3a6b89ff973ffad1dce6
-AUX keyutils-1.5.9-endian-check-2.patch 1131 BLAKE2B a5fd6fd62dd94be2bb23b3b60cedd1b8d6d3b06bdd32fcbbdcbdbc08150484eb6122271f20432bad3fa8697e626676c329ba08bf23d4a31788949b0c2bf7aede SHA512 9604b79b1d85bb1c56f5ca261f7f72fe84176fff0a098ce2fa35bb0ab5b325a7613f3e37f5f27ff1e9269d5779d77715baa0bd74a0d4f0b7c9bb1aa27b84b214
 AUX keyutils-1.5.9-header-extern-c.patch 1154 BLAKE2B df4ecd72145c8634b2ea043e45e05ca95374234a0aa2babf0eaabfd429997c96099f6698d33104ad45cb9e90a83316a2db93b0f73b9138be7618591bc1b1e235 SHA512 f6e91c6eb9785ff8e661fc80ab275a3a35d87cfc73ab9cc45195734aaa5126e5ddc219dce8a78834869b67448a730265f2b72390f0b517dedf6c729bf22d828e
 AUX keyutils-1.6-endian-check-1.patch 1152 BLAKE2B 7614e1b72ae012f1d3126a2edfd26b17bdc80621c4197c3f7a2e47c3cdb9fd703fe92adfb5da419775d4b4bb334ffe7fb57e26645a8fc201568f070b11cdd923 SHA512 f7d5423173c0e65080931653604d9179a9c6dbc4e22c7e62b67685d444e81b33a2a61d26906e47987521a61e28c199fe4ab4fc7f9ba8cacd2faf00bc443259c1
 AUX keyutils-1.6-makefile-fixup.patch 756 BLAKE2B 8e4e187859933ca4359adff5307bba833cae1a5e4b7c6975fc88e6848ba76ee30e0c59a42ee2110b9874da5db8e60880265f93798abe55f6a12e71346a6b01de SHA512 4becdbc7b1a68b3e6e8e32b2d08005e435f838d02a3406757216717ec82712f181ff0a32397c995b36264469e29cf39fe9311a762e62427f4507f94418c9400b
 AUX keyutils-1.6.1-silence-rpm-check.patch 594 BLAKE2B b2c44db4cd57f07eb2450bcd8ff4c259ff9ef8ce775f350765cc20bd9b990a2eadedd60745e1c3c31e682b12af0d945b9422f8c2a989f72ccdc56b67b60f8244 SHA512 cd6b0472475089e522c796a33eb1dffe8a6fcf4e3a515d4e379e46b4a82c8b92216ec00fe9a6f4c88e318f6e397aca625040537eed83e0ce30278b9e810fedc9
-DIST keyutils-1.5.11.tar.bz2 87644 BLAKE2B 1a601b7036bcfe69b6272ae2b4fad44cbb22877aa94722fa26460f8addf105ff8898e851ad7c4f28bc755f7fe293c74bc70cffbe877978e462bc21c428c9a11d SHA512 5f0dc5d5ceb673cf0ba71d3a0b525d09adc8d501a795372aa3dc29215ef393cb8577c72051cecabdb9a46dca4fcaa11e629291fb857290872475a7e445f47d43
-DIST keyutils-1.5.9.tar.bz2 74683 BLAKE2B 8d5133dcc4c1f40e634fcd6584f3e2e56a0fd4ff25ded41c5f94ef3193ef7240ff4a24ef1c5beba6ba835195605a77126bf77aace35a1b4acf025160a2082dcb SHA512 d4ee1dabb87844e18bfd8d094a5bc9ce792c96720b71e77961b6c36bb1addb9acea2a7004ddfba1d09b167af908368162312e5c3656b22a6266955bb57b887e2
 DIST keyutils-1.6.1.tar.gz 119065 BLAKE2B b0c65d8a1ee8cab1ac712820a8bf073777eacd558ddd007fa0fd50467d1de86cff238c1c0e6b33b5ff4da7dfd7e2fd673ce5706c39780e1a4fbee7d9653f3bc9 SHA512 a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2
-DIST keyutils-1.6.tar.bz2 93973 BLAKE2B 250275852d13fb5f77786350e64175c9c0909d1a7e44750e44b09f79217acb9c40536bd61e15d1abdfe36b9e161832f4c59f11b73915d457356a273ad4999990 SHA512 ee50da165099ea26904066d24b27c5165cb1eb78df6768cba3a534aa318a5c8d926ec6e5322a38c8cedaa768cd79bdcb26ef918aa8447df2e5dfbbe7b8f200ff
-EBUILD keyutils-1.5.11-r1.ebuild 3820 BLAKE2B d929dd8276d16e2f2cd38f6e815bf5fa63c43e20699ab69523d291ff88e2bac54386d7db45626564b50205f3e3943185a1066f9af1fc781bcef437f739cae244 SHA512 390277040f96c6ccd9b7d8a329e66c09fda691762e8c479e4f6c18cba6a02c718e139c9ea074ec678f4c7bc0e8b3f5d66e4a5eb758c93e02ecbb468e8cc3f6d4
-EBUILD keyutils-1.5.9-r4.ebuild 2986 BLAKE2B 75f613871ba022cc24deebd12dea2cb0dee06db56477c96693c59b65fa4f63c33c212af624ac73bc4ad1c34aadc12783867821300cde0b2d49426e31401ac42f SHA512 bf13e04b7e089a1cedbd3a9f12a941066043352ad66128d6ba7a02149ff0e54b2030e81c93556f805fd2d5b286df121e20ecff7d06bd02d1a5852321b83558aa
-EBUILD keyutils-1.6.1.ebuild 3854 BLAKE2B def1bd28c663309d7741660db52de2eda58492903c65d92a59cfb4278861f86f9980f90cc78d6b3b0eb882877e5efa69da1d1f8f64dcaad3014b6a7c74036803 SHA512 c585bd4a530b98916c91cdfa8f44f9908b5fc3b9177ba72143c222299351503b268d65e643c8f0b2d9680fab9d52742a9d33a37ade62829aaae0bc28b0ba5f69
-EBUILD keyutils-1.6.ebuild 3805 BLAKE2B 9bfc8ac3ae965220f36b021b4dc2373e911387097aaa7f828334fa661964577a23bb6cf97818f7225f38de279d16b7d1fad8e96131482288e885e094e14d5402 SHA512 c35a43569ff5bfced26b1be0813d4f6420c12268af2be95294b5dbf53a0ca87887668f4aa8dc733d81ddc40f012cd179806c84697e82581f3f594ac4fd6b4018
+EBUILD keyutils-1.6.1.ebuild 3881 BLAKE2B a4d2e8b5706b3f7cf6d9536a1e6a90c81c1590860244e4a132a670efa24211e822ec6aa469851be226c7d52b4575cf0c0b11ee1ff3d8d3b32593ec5b322e141f SHA512 40f28d6f85afc9a248b7d8e467bfe7e2e2feb93418f4800d3bc3680f702116b18b86e0a79468df27f5ee99e0f238722e97f879eeee060c16caf799c08e2ff9ff
 MISC metadata.xml 424 BLAKE2B f4eb452bb90bf6b62f39d726bae137111c6fca619076888bb475bd2fb042e23db8f5d94240901d36a0c2f15a5774728429e2db2689dbad9ef4bb6d54b0a19b1f SHA512 211515865fbe17798b072bde0c699b67ec10e0716bad11224a3f1e00a729feea67b015cec4e8d870fa708179884176ee0799aee6d237cb4f2798f54a28c8042e
diff --git a/sys-apps/keyutils/files/keyutils-1.5.10-endian-check-1.patch b/sys-apps/keyutils/files/keyutils-1.5.10-endian-check-1.patch
deleted file mode 100644
index 99cf23fbb21f..000000000000
--- a/sys-apps/keyutils/files/keyutils-1.5.10-endian-check-1.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-fix regexp match against `file /proc/$$/exe` for -fPIE bash
-Now that bash is built with PIE enabled, keyutils' check for endianness
-fails because file no longer returns "executable", but instead returns
-"shared object" for file << 5.33 and "pie executable" for file >= 5.33.
-
---- a/tests/toolbox.inc.sh
-+++ b/tests/toolbox.inc.sh
-@@ -13,10 +13,10 @@
- echo === $OUTPUTFILE ===
- 
- endian=`file -L /proc/$$/exe`
--if expr "$endian" : '.* MSB \+\(executable\|shared object).*' >&/dev/null
-+if expr "$endian" : '.* MSB \+\(executable\|shared object\|pie executable\).*' >&/dev/null
- then
-     endian=BE
--elif expr "$endian" : '.* LSB \+\(executable\|shared object\).*' >&/dev/null
-+elif expr "$endian" : '.* LSB \+\(executable\|shared object\|pie executable\).*' >&/dev/null
- then
-     endian=LE
- else
diff --git a/sys-apps/keyutils/files/keyutils-1.5.10-makefile-fixup.patch b/sys-apps/keyutils/files/keyutils-1.5.10-makefile-fixup.patch
deleted file mode 100644
index c37cca0dbfd7..000000000000
--- a/sys-apps/keyutils/files/keyutils-1.5.10-makefile-fixup.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 19b92eb56ca53cb4967e7bd27e3bc5e3b0e29736 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 16 Mar 2017 09:55:42 +0100
-Subject: [PATCH] depend on $(DEVELLIB) not -lkeyutils
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 824bbbf..8ce3a13 100644
---- a/Makefile
-+++ b/Makefile
-@@ -167,7 +167,7 @@ ifeq ($(NO_SOLIB),0)
- 	$(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
- 	$(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
- 	mkdir -p $(DESTDIR)$(USRLIBDIR)
--	$(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
-+	$(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
- endif
- 	$(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
- 	$(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
--- 
-2.12.0
-
diff --git a/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch b/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch
deleted file mode 100644
index dafd7de8dd91..000000000000
--- a/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Hide
-
-> grep: /etc/rpm: No such file or directory
-> grep: /usr/lib/rpm: No such file or directory
-
-errors.
-
-Bug: https://bugs.gentoo.org/656446
-
---- a/Makefile
-+++ b/Makefile
-@@ -245,7 +245,7 @@ SRCBALL	:= rpmbuild/SOURCES/$(TARBALL)
- ZSRCBALL := rpmbuild/SOURCES/$(ZTARBALL)
- 
- BUILDID	:= .local
--dist	:= $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm))
-+dist	:= $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm 2>/dev/null))
- release	:= $(word 2,$(shell grep ^Release: $(SPECFILE)))
- release	:= $(subst %{?dist},$(dist),$(release))
- release	:= $(subst %{?buildid},$(BUILDID),$(release))
diff --git a/sys-apps/keyutils/files/keyutils-1.5.5-makefile-fixup.patch b/sys-apps/keyutils/files/keyutils-1.5.5-makefile-fixup.patch
deleted file mode 100644
index ff4bcfa94d85..000000000000
--- a/sys-apps/keyutils/files/keyutils-1.5.5-makefile-fixup.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Raw patch edit based on:
-
-From af14e945bd617bb82ebc4c6c8d4fb948d715f16a Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 2 Sep 2011 13:30:30 -0400
-Subject: [PATCH] depend on $(DEVELLIB) not -lkeyutils
-
----
- Makefile |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 9e3fa9b..46695d1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -91,7 +91,7 @@
- 	$(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
- 	$(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
- 	mkdir -p $(DESTDIR)$(USRLIBDIR)
--	$(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
-+	$(LNS) $(SONAME) $(DESTDIR)$(LIBDIR)/$(DEVELLIB)
- 	$(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
- 	$(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
- 	$(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh
--- 
-1.7.6
-
diff --git a/sys-apps/keyutils/files/keyutils-1.5.9-disable-tests.patch b/sys-apps/keyutils/files/keyutils-1.5.9-disable-tests.patch
deleted file mode 100644
index 0a5a02b3a484..000000000000
--- a/sys-apps/keyutils/files/keyutils-1.5.9-disable-tests.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-disable tests that mess with system wide settings
-
-https://bugs.gentoo.org/519062
-
---- a/tests/bugzillas/bz1031154/runtest.sh
-+++ b/tests/bugzillas/bz1031154/runtest.sh
-@@ -11,6 +11,8 @@
- result=PASS
- echo "++++ BEGINNING TEST" >$OUTPUTFILE
- 
-+if false; then
-+
- # we need a reference time to scan the audit log from so as not to pick up old
- # results from this test.
- base_date=`date +"%x@%X"`
-@@ -81,6 +83,10 @@
- 	fi
- fi
- 
-+else
-+marker "Gentoo: skipping test due to system wide modifications"
-+fi
-+
- echo "++++ FINISHED TEST: $result" >>$OUTPUTFILE
- 
- # --- then report the results in the database ---
-
-https://bugs.gentoo.org/522050
-
---- a/tests/keyctl/padd/useradd/runtest.sh
-+++ b/tests/keyctl/padd/useradd/runtest.sh
-@@ -40,6 +40,8 @@
- marker "UNLINK KEY"
- unlink_key $keyid @s
- 
-+if false; then
-+
- # add keys with huge payloads
- old_root_quota=`cat /proc/sys/kernel/keys/root_maxbytes`
- if [ $old_root_quota -lt 65536 ]
-@@ -76,6 +78,10 @@
-     sleep 1
- fi
- 
-+else
-+marker "Gentoo: skipping test due to system wide modifications"
-+fi
-+
- echo "++++ FINISHED TEST: $result" >>$OUTPUTFILE
- 
- # --- then report the results in the database ---
diff --git a/sys-apps/keyutils/files/keyutils-1.5.9-endian-check-1.patch b/sys-apps/keyutils/files/keyutils-1.5.9-endian-check-1.patch
deleted file mode 100644
index 18344b94940e..000000000000
--- a/sys-apps/keyutils/files/keyutils-1.5.9-endian-check-1.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-patch from upstream
-
-https://bugs.gentoo.org/426424
-
-From f0d9a8c15f1525d0404077f32fddccb606a61bac Mon Sep 17 00:00:00 2001
-From: Tyler Hicks <tyhicks@canonical.com>
-Date: Mon, 24 Feb 2014 18:52:41 -0600
-Subject: [PATCH] TEST: Make endianness detection work with file 5.14
-
-The 5.14 release of file outputs an extra space after [LM]SB:
-
-$ ./src/file -m magic/magic.mgc -L /proc/$$/exe
-/proc/12755/exe: ELF 64-bit LSB  executable, ...
-
-This was due to the elf magic file containing some trailing spaces in
-the 5.14 release.
-
-Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
-Signed-off-by: David Howells <dhowells@redhat.com>
----
- tests/toolbox.inc.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh
-index cbc49e0fce23..fe3c7f71299a 100644
---- a/tests/toolbox.inc.sh
-+++ b/tests/toolbox.inc.sh
-@@ -17,10 +17,10 @@ includes=${includes%/*}/
- echo === $OUTPUTFILE ===
- 
- endian=`file -L /proc/$$/exe`
--if expr "$endian" : '.* MSB executable.*' >&/dev/null
-+if expr "$endian" : '.* MSB \+executable.*' >&/dev/null
- then
-     endian=BE
--elif expr "$endian" : '.* LSB executable.*' >&/dev/null
-+elif expr "$endian" : '.* LSB \+executable.*' >&/dev/null
- then
-     endian=LE
- else
--- 
-2.11.0
-
diff --git a/sys-apps/keyutils/files/keyutils-1.5.9-endian-check-2.patch b/sys-apps/keyutils/files/keyutils-1.5.9-endian-check-2.patch
deleted file mode 100644
index bc96dae464b8..000000000000
--- a/sys-apps/keyutils/files/keyutils-1.5.9-endian-check-2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-patch from upstream
-
-https://bugs.gentoo.org/426424
-
-From ce92e974b8ecff19cf430b7b58a09b8190645b5c Mon Sep 17 00:00:00 2001
-From: David Howells <dhowells@redhat.com>
-Date: Fri, 26 Feb 2016 10:07:00 +0000
-Subject: [PATCH] TEST: Fix endianness determination
-
-Endianness determination was broken sometime after Fedora 20 when
-executables switched to being DYN objects rather than EXEC objects.  This
-caused the output of file to change.
-
-Signed-off-by: David Howells <dhowells@redhat.com>
----
- tests/toolbox.inc.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh
-index f2463c57b40e..5ac23ffc04fb 100644
---- a/tests/toolbox.inc.sh
-+++ b/tests/toolbox.inc.sh
-@@ -13,10 +13,10 @@
- echo === $OUTPUTFILE ===
- 
- endian=`file -L /proc/$$/exe`
--if expr "$endian" : '.* MSB \+executable.*' >&/dev/null
-+if expr "$endian" : '.* MSB \+\(executable\|shared object\).*' >&/dev/null
- then
-     endian=BE
--elif expr "$endian" : '.* LSB \+executable.*' >&/dev/null
-+elif expr "$endian" : '.* LSB \+\(executable\|shared object\).*' >&/dev/null
- then
-     endian=LE
- else
--- 
-2.11.0
-
diff --git a/sys-apps/keyutils/keyutils-1.5.11-r1.ebuild b/sys-apps/keyutils/keyutils-1.5.11-r1.ebuild
deleted file mode 100644
index d133ff0065c1..000000000000
--- a/sys-apps/keyutils/keyutils-1.5.11-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib toolchain-funcs linux-info multilib-minimal usr-ldscript
-
-DESCRIPTION="Linux Key Management Utilities"
-HOMEPAGE="https://people.redhat.com/dhowells/keyutils/"
-SRC_URI="https://people.redhat.com/dhowells/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/1.7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static static-libs test"
-
-RDEPEND=""
-DEPEND="app-crypt/mit-krb5
-	!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.10-endian-check-1.patch
-	"${FILESDIR}"/${PN}-1.5.10-makefile-fixup.patch
-	"${FILESDIR}"/${PN}-1.5.10-silence-rpm-check.patch #656446
-	"${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050
-	"${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch
-)
-
-pkg_setup() {
-	# To prevent a failure in test phase and false positive bug reports
-	# we are enforcing the following options because testsuite expects
-	# that these options are available. I.e. testsuite only decides based
-	# on kernel version which tests will be called, no feature checking.
-	if use test ; then
-		CONFIG_CHECK="KEYS"
-		ERROR_KEYS="You must have CONFIG_KEYS to run the package testsuite!"
-
-		if kernel_is -ge 2 6 10 && kernel_is -lt 4 0 0 ; then
-			CONFIG_CHECK="${CONFIG_CHECK} KEYS_DEBUG_PROC_KEYS"
-			ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
-		fi
-
-		if kernel_is -ge 4 7 ; then
-			CONFIG_CHECK="${CONFIG_CHECK} KEY_DH_OPERATIONS"
-			ERROR_KEY_DH_OPERATIONS="You must have CONFIG_KEY_DH_OPERATIONS to run the package testsuite!"
-		fi
-	else
-		CONFIG_CHECK="~KEYS"
-		ERROR_KEYS="You will be unable to use this package on this system because CONFIG_KEYS is not set!"
-
-		if kernel_is -ge 4 7 ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~KEY_DH_OPERATIONS"
-			ERROR_KEY_DH_OPERATIONS="You will be unable to use Diffie-Hellman on this system because CONFIG_KEY_DH_OPERATIONS is not set!"
-		fi
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# The lsb check is useless, so avoid spurious command not found messages.
-	sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die
-	# All the test files are bash, but try to execute via `sh`.
-	sed -i -r \
-		-e 's:([[:space:]])sh([[:space:]]):\1bash\2:' \
-		tests/{Makefile*,*.sh} || die
-	find tests/ -name '*.sh' -exec sed -i '1s:/sh$:/bash:' {} +
-	# Some tests call the kernel which calls userspace, but that will
-	# run the install keyutils rather than the locally compiled one,
-	# so disable round trip tests.
-	rm -rf tests/keyctl/requesting/{bad-args,piped,valid}
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export AR CC
-	sed -i \
-		-e "1iRPATH = $(usex static -static '')" \
-		-e '/^C.*FLAGS/s|:=|+=|' \
-		-e 's:-Werror::' \
-		-e '/^BUILDFOR/s:=.*:=:' \
-		-e "/^LIBDIR/s:=.*:= /usr/$(get_libdir):" \
-		-e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
-		-e "s: /: ${EPREFIX}/:g" \
-		-e '/^NO_ARLIB/d' \
-		Makefile || die
-
-	# We need the static lib in order to statically link programs.
-	if use static ; then
-		export NO_ARLIB=0
-		# Hack the progs to depend on the static lib instead.
-		sed -i \
-			-e '/^.*:.*[$](DEVELLIB)$/s:$(DEVELLIB):$(ARLIB) $(SONAME):' \
-			Makefile || die
-	else
-		export NO_ARLIB=$(usex static-libs 0 1)
-	fi
-	emake
-}
-
-multilib_src_test() {
-	# Execute the locally compiled code rather than the
-	# older versions already installed in the system.
-	LD_LIBRARY_PATH=${BUILD_DIR} \
-	PATH="${BUILD_DIR}:${PATH}" \
-	emake test
-}
-
-multilib_src_install() {
-	# Possibly undo the setting for USE=static (see src_compile).
-	export NO_ARLIB=$(usex static-libs 0 1)
-
-	default
-	use static || gen_usr_ldscript -a keyutils
-}
-
-multilib_src_install_all() {
-	dodoc README
-}
diff --git a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
deleted file mode 100644
index dfe742f2070a..000000000000
--- a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib eutils toolchain-funcs linux-info multilib-minimal usr-ldscript
-
-DESCRIPTION="Linux Key Management Utilities"
-HOMEPAGE="https://people.redhat.com/dhowells/keyutils/"
-SRC_URI="https://people.redhat.com/dhowells/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static static-libs test"
-
-RDEPEND=""
-DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
-
-pkg_setup() {
-	CONFIG_CHECK="~KEYS"
-	ERROR_KEYS="You must have CONFIG_KEYS to use this package!"
-
-	if use test && kernel_is lt 4 0 0; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS"
-		ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
-	fi
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.5-makefile-fixup.patch
-	epatch "${FILESDIR}"/${PN}-1.5.9-endian-check-{1,2}.patch #426424
-	epatch "${FILESDIR}"/${PN}-1.5.9-disable-tests.patch #519062 #522050
-	epatch "${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch
-
-	# The lsb check is useless, so avoid spurious command not found messages.
-	sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die
-	# All the test files are bash, but try to execute via `sh`.
-	sed -i -r \
-		-e 's:([[:space:]])sh([[:space:]]):\1bash\2:' \
-		tests/{Makefile*,*.sh} || die
-	find tests/ -name '*.sh' -exec sed -i '1s:/sh$:/bash:' {} +
-	# Some tests call the kernel which calls userspace, but that will
-	# run the install keyutils rather than the locally compiled one,
-	# so disable round trip tests.
-	rm -rf tests/keyctl/requesting/{bad-args,piped,valid}
-
-	# Delete man pages that are included in the common package now. #612640
-	rm man/*-keyring.7 man/keyrings.7 || die
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export AR CC
-	sed -i \
-		-e "1iRPATH = $(usex static -static '')" \
-		-e '/^C.*FLAGS/s|:=|+=|' \
-		-e 's:-Werror::' \
-		-e '/^BUILDFOR/s:=.*:=:' \
-		-e "/^LIBDIR/s:=.*:= /usr/$(get_libdir):" \
-		-e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
-		-e "s: /: ${EPREFIX}/:g" \
-		-e '/^NO_ARLIB/d' \
-		Makefile || die
-
-	# We need the static lib in order to statically link programs.
-	if use static ; then
-		export NO_ARLIB=0
-		# Hack the progs to depend on the static lib instead.
-		sed -i \
-			-e '/^.*:.*[$](DEVELLIB)$/s:$(DEVELLIB):$(ARLIB):' \
-			Makefile || die
-	else
-		export NO_ARLIB=$(usex static-libs 0 1)
-	fi
-	emake
-}
-
-multilib_src_test() {
-	# Execute the locally compiled code rather than the
-	# older versions already installed in the system.
-	LD_LIBRARY_PATH=${BUILD_DIR} \
-	PATH="${BUILD_DIR}:${PATH}" \
-	emake test
-}
-
-multilib_src_install() {
-	# Possibly undo the setting for USE=static (see src_compile).
-	export NO_ARLIB=$(usex static-libs 0 1)
-
-	default
-	use static || gen_usr_ldscript -a keyutils
-}
-
-multilib_src_install_all() {
-	dodoc README
-}
diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index d6bea1f56a1a..b69a471cf390 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
diff --git a/sys-apps/keyutils/keyutils-1.6.ebuild b/sys-apps/keyutils/keyutils-1.6.ebuild
deleted file mode 100644
index b09c313644d6..000000000000
--- a/sys-apps/keyutils/keyutils-1.6.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib toolchain-funcs linux-info multilib-minimal usr-ldscript
-
-DESCRIPTION="Linux Key Management Utilities"
-HOMEPAGE="https://people.redhat.com/dhowells/keyutils/"
-SRC_URI="https://people.redhat.com/dhowells/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/1.8"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static static-libs test"
-
-RDEPEND=""
-DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6-endian-check-1.patch
-	"${FILESDIR}"/${PN}-1.6-makefile-fixup.patch
-	"${FILESDIR}"/${PN}-1.5.10-silence-rpm-check.patch #656446
-	"${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050
-	"${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch
-)
-
-pkg_setup() {
-	# To prevent a failure in test phase and false positive bug reports
-	# we are enforcing the following options because testsuite expects
-	# that these options are available. I.e. testsuite only decides based
-	# on kernel version which tests will be called, no feature checking.
-	if use test ; then
-		CONFIG_CHECK="KEYS"
-		ERROR_KEYS="You must have CONFIG_KEYS to run the package testsuite!"
-
-		if kernel_is -ge 2 6 10 && kernel_is -lt 4 0 0 ; then
-			CONFIG_CHECK="${CONFIG_CHECK} KEYS_DEBUG_PROC_KEYS"
-			ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
-		fi
-
-		if kernel_is -ge 4 7 ; then
-			CONFIG_CHECK="${CONFIG_CHECK} KEY_DH_OPERATIONS"
-			ERROR_KEY_DH_OPERATIONS="You must have CONFIG_KEY_DH_OPERATIONS to run the package testsuite!"
-		fi
-	else
-		CONFIG_CHECK="~KEYS"
-		ERROR_KEYS="You will be unable to use this package on this system because CONFIG_KEYS is not set!"
-
-		if kernel_is -ge 4 7 ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~KEY_DH_OPERATIONS"
-			ERROR_KEY_DH_OPERATIONS="You will be unable to use Diffie-Hellman on this system because CONFIG_KEY_DH_OPERATIONS is not set!"
-		fi
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# The lsb check is useless, so avoid spurious command not found messages.
-	sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die
-	# All the test files are bash, but try to execute via `sh`.
-	sed -i -r \
-		-e 's:([[:space:]])sh([[:space:]]):\1bash\2:' \
-		tests/{Makefile*,*.sh} || die
-	find tests/ -name '*.sh' -exec sed -i '1s:/sh$:/bash:' {} + || die
-	# Some tests call the kernel which calls userspace, but that will
-	# run the install keyutils rather than the locally compiled one,
-	# so disable round trip tests.
-	rm -rf tests/keyctl/requesting/{bad-args,piped,valid}
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export AR CC
-	sed -i \
-		-e "1iRPATH = $(usex static -static '')" \
-		-e '/^C.*FLAGS/s|:=|+=|' \
-		-e 's:-Werror::' \
-		-e '/^BUILDFOR/s:=.*:=:' \
-		-e "/^LIBDIR/s:=.*:= /usr/$(get_libdir):" \
-		-e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
-		-e "s: /: ${EPREFIX}/:g" \
-		-e '/^NO_ARLIB/d' \
-		Makefile || die
-
-	# We need the static lib in order to statically link programs.
-	if use static ; then
-		export NO_ARLIB=0
-		# Hack the progs to depend on the static lib instead.
-		sed -i \
-			-e '/^.*:.*[$](DEVELLIB)$/s:$(DEVELLIB):$(ARLIB) $(SONAME):' \
-			Makefile || die
-	else
-		export NO_ARLIB=$(usex static-libs 0 1)
-	fi
-	emake
-}
-
-multilib_src_test() {
-	# Execute the locally compiled code rather than the
-	# older versions already installed in the system.
-	LD_LIBRARY_PATH=${BUILD_DIR} \
-	PATH="${BUILD_DIR}:${PATH}" \
-	emake test
-}
-
-multilib_src_install() {
-	# Possibly undo the setting for USE=static (see src_compile).
-	export NO_ARLIB=$(usex static-libs 0 1)
-
-	default
-	use static || gen_usr_ldscript -a keyutils
-}
-
-multilib_src_install_all() {
-	dodoc README
-}
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 72b759dbb743..f50f09f7688b 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -3,6 +3,6 @@ AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52
 DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252
 DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865
 EBUILD kmod-25.ebuild 4924 BLAKE2B d7fbc42a9d490d10c0fca9e590c7e0cf8520ee7bf80d780d33a08af22e46fea044725d3ec2e5c49f0520d17721f97130e06212d823972aea9387c2b3cda80d04 SHA512 3fa591487100ffe314c1a7f34d598cb1188c89893462a57f6b497baeaf702af6a154b4d36967304fcba144aaa92ad0897613eeed4e33b5d802a06444cb88f803
-EBUILD kmod-26-r3.ebuild 5101 BLAKE2B 502f84192e011dc541eefbfb70f0302c4c0c6a176cf589e735a06c5e0a539c8b9b765e7410bb997e8b88df1563fd950605087b2d5a6b06ed2ac80a786857edf4 SHA512 c65c9044a4fbbe294d4d6654777cc4b95903ee30afc3314457ba7ad3d553e33d0c4bada80086a1e7956500fff7f65e346dbc72e9f3826bd7db894541e2d518ca
+EBUILD kmod-26-r3.ebuild 5099 BLAKE2B ff5537121ba86c2330e90a1cdd72792004db00406561c1f857a8dea5898254aac380b586a02acaee9765b131e5e4eb3894d9f1a3970132becef8be23ab763c5f SHA512 3e307565d986344541463840821727ea3d3b289c686eef04ceaedd2be6bcd5eb52538b92d14de86bbb8b178d7214e10231cb9d35b064cb590880e4dab8c57494
 EBUILD kmod-9999.ebuild 5044 BLAKE2B a8db971037a2c312826f62fa882a1a1e7665b15067fadf0a8017c38ffe25083ba64fa26c3cbacb74498b4a8b9c210076a159a80e3b0b1a7a5cfe63054c70e5f9 SHA512 dbc278ce5db407abcfa1b125f0c9ddcb868ee88765febdc96faabb6527ab21f40d7edba7a3a0cb8165b5624d19641442dd548ac469b0292aa423201f93fb0067
 MISC metadata.xml 612 BLAKE2B 9459d066baed069ea60ef5fb72dd5a63a9980f041573aa24d67995a69539b468c31be12c96cc2dc396183c8b98064f8d30dbcc7cca346318c1f2356cb3037879 SHA512 4cce069924c603b69f08c37d83379af6889678106df5d4aa62d758138973277ab6b79ed021939bd8cfafefd27173404b7c155ba8ffa89efb9bebf458327be36f
diff --git a/sys-apps/kmod/kmod-26-r3.ebuild b/sys-apps/kmod/kmod-26-r3.ebuild
index 4c0380e44bde..2e7ab7e1654c 100644
--- a/sys-apps/kmod/kmod-26-r3.ebuild
+++ b/sys-apps/kmod/kmod-26-r3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 	inherit libtool
 fi
 
diff --git a/sys-apps/lcdutils/Manifest b/sys-apps/lcdutils/Manifest
index b99dc2590bef..60f97949a755 100644
--- a/sys-apps/lcdutils/Manifest
+++ b/sys-apps/lcdutils/Manifest
@@ -1,5 +1,5 @@
 AUX lcdutils-0.2-include-stdlib.h-for-exit.patch 1165 BLAKE2B 0a3f425a53c21a3613c5151e77836b254ce8aa8cf876703df3fbfb61310b5f223bce1e77f9d83c3512d18a5bc3f11e389433d1adfc2de5eb59e48f21ef782f98 SHA512 3356faefff0c258025bc76abcdb188a47558ed83c613be744fd5fd245f63fd5eb60417738d68c75971b5ad523e047b06c5969d0e8be28b9e9beb3aa4f7e667fd
 AUX lcdutils-0.2-makefile.patch 446 BLAKE2B c268c67bf1ec0cba97b46ba12112103d81ad32e3463871539dfffd5cc6caf5422c1ebf4064604ed3adb0883b87b12c26f2bb0d8b08d3da33bdb9d6f708fc9538 SHA512 ee811308e5045eeee2f99536473294d9b7fec852b1d578dfb6c9fdaea0c250c2f59da740d9f6be52234ecb4cedbf38ff49886e388d350d93fd97ea92177c2dfd
 DIST lcdutils-0.2.tar.gz 10819 BLAKE2B ea493a49cc1d121b1edb848645f189b4996463e0616dc418e938658767cb56b4ca3982bda0d7349eb303b88ecd3015fa2d8c178607ad14311ca5a0af57a2305b SHA512 ea7140b7b27aade66d025b4c4c7441a2357d03f5081f67ccac8175e709e8f20bf800208a72675eacfca1af8329c01b9e8b1a9bd910bf858bcbdb8aff3c2169f4
-EBUILD lcdutils-0.2-r1.ebuild 525 BLAKE2B 6ed005f8034ab40c78b291e436573580c79344582c63821dfa128e1c4db6db9ade9a89b55ba7da6efcfa5b31d96468f8296dcbfda1e10aff9cd4ae59de33b0b3 SHA512 0feca5c9444e3812261be7a9d5feb22314cb7fc43282fb8c9205f7790fe3e94ad357f285e16284bf9c0c2d1c74d115838ee955b599da34b19ce649d57712032d
-MISC metadata.xml 621 BLAKE2B 4d425917eb908ab4412f462a205cbd7afdc5e723e7a7792c9f4285153c6dd2eea0f1a93e84240ea785dd1b0b96a2e389a9151b12cfffd2db4d1be5c9047d3753 SHA512 7ae20b14fc6b1186a82f543a5683d61e211004d651c8b558c7a374ae4bed2878fdc018a35b5b77d363ebf97b5f328929d2154231d14c2b5b0609e378af29c8cb
+EBUILD lcdutils-0.2-r1.ebuild 524 BLAKE2B f0a5bbbafa1bf826557c89742ddff5e198c223396f1fffbaf2550a0c26618ee3e8d74c471961cd5a3605b2ddbb96e16cf1a49b73d4a407dea943943fbc65143e SHA512 72b0fa43a6f95d15d42e50ce3f2f12adfa1bf29002efcaea713bf91dd464e13f4b3d6100a83474fd9d28a4b554d96f2a33f966712a2dae20274c2518077712aa
+MISC metadata.xml 502 BLAKE2B 25eba5b5cc653c1bc5082a116a2db31db8aa1e4651d47681700de16b5014b303e1e2930508e4b3b23ea455c9b71f756adfbe873ead33ceb0b486a72ca801a3f1 SHA512 d9cb0a5c9c77d87ef2ae037d41041d6c3c21b34c296bf42604c12e1c89f314ea92b89877ff29dd6dbed54b8b90e69e3075405e5989b74657257ba2e6383cae5f
diff --git a/sys-apps/lcdutils/lcdutils-0.2-r1.ebuild b/sys-apps/lcdutils/lcdutils-0.2-r1.ebuild
index 885e05c28b42..b19562bac8fa 100644
--- a/sys-apps/lcdutils/lcdutils-0.2-r1.ebuild
+++ b/sys-apps/lcdutils/lcdutils-0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.debian.org/~pm/mips-cobalt/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~mips ~x86"
+KEYWORDS="~mips x86"
 
 PATCHES=(
 	"${FILESDIR}/${P}-include-stdlib.h-for-exit.patch"
diff --git a/sys-apps/lcdutils/metadata.xml b/sys-apps/lcdutils/metadata.xml
index 542e1c857301..10d7fad7105d 100644
--- a/sys-apps/lcdutils/metadata.xml
+++ b/sys-apps/lcdutils/metadata.xml
@@ -2,14 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>mips@gentoo.org</email>
 		<name>Mips Team</name>
 	</maintainer>
diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest
index f13e815d2dd2..5ed48b82c6f0 100644
--- a/sys-apps/likwid/Manifest
+++ b/sys-apps/likwid/Manifest
@@ -1,6 +1,6 @@
 AUX likwid-4.3.1-fix-gnustack.patch 1014 BLAKE2B 68ac831c96f826156238bbb4178c4923cb869a2757928af12f788a01067fb129326fec0c7a98b073f504f0aa8234d42dcd9fe7cdb0185b8107a6db3962cfbc08 SHA512 ab12e2ebebfca5c87b1ad2c89c5073aaa6987e8d440cfdfffc107233fc5b66c6562f25fdbd6720df3c1477becaaa3c3ac470fa4f99ac15bb78ea09fa06460a4b
 DIST likwid-4.3.3.tar.gz 1579433 BLAKE2B 9ec468bba009dec860b24c9c55c3d6023ffda3ab0985d835796686ba52d1d3372b2bfce926cf229388978de34e1ab0b41d8d27c88623c51c3e8ff1e9d674906b SHA512 ae4d68e238bc40e4a4ab5df628561c9bb7a0ef8727d5779dba2c32fff0be1dd333532bee7e4c197e5fe286de81d35b863ef09f4bc8b9f9145360e6e461f3d94e
 DIST likwid-4.3.4.tar.gz 1584829 BLAKE2B dcd1c3a0c5e549dc3d22bb98120339521e270da55460f5af9f2fe04849af0fe1ac4d9b881883a4efc3695ceb087d1afad5bcc55b55543199d2c33b0f5012cc68 SHA512 f1ee930a98d160728078a81a2cdc798ec62ac484545ced937131e6a6443e5ac23b8e597d31c7b1b9f67c1169e1c662c366cf1098158cb467d9f7ff12946b08a2
-EBUILD likwid-4.3.3.ebuild 5583 BLAKE2B 88aceb31971bb97444abd86c40c825842f758f1ec52d85176c802b0211217b427b6d470fd63e00a255ac38e94c3ab4de59fe9af65918b35a2fa69353af83fb06 SHA512 63164046373be52f1eb05256afe6cb11947a4e7ec89392101efad31431152276bfce64dce78f13143baf97393a28f2e9f1e44596e875d2debf9e11d28ad19049
-EBUILD likwid-4.3.4.ebuild 5583 BLAKE2B 88aceb31971bb97444abd86c40c825842f758f1ec52d85176c802b0211217b427b6d470fd63e00a255ac38e94c3ab4de59fe9af65918b35a2fa69353af83fb06 SHA512 63164046373be52f1eb05256afe6cb11947a4e7ec89392101efad31431152276bfce64dce78f13143baf97393a28f2e9f1e44596e875d2debf9e11d28ad19049
+EBUILD likwid-4.3.3.ebuild 5527 BLAKE2B 611309f785721f1165dfc2bddfe2239a5eb0ca3ee0203bdf682ad9548df908c1a3a4d89067bd6e23350d9b72ef59d452e2a6035d0f56bbe6b9f075a5283a1807 SHA512 42470c479de12fb3176af290559c595fd30488c790ceba97bb1c619b2ca4f010f9895f75e6206cea50b442c583070b568eda741e9d702cc253d37f550b01a88e
+EBUILD likwid-4.3.4.ebuild 5527 BLAKE2B 611309f785721f1165dfc2bddfe2239a5eb0ca3ee0203bdf682ad9548df908c1a3a4d89067bd6e23350d9b72ef59d452e2a6035d0f56bbe6b9f075a5283a1807 SHA512 42470c479de12fb3176af290559c595fd30488c790ceba97bb1c619b2ca4f010f9895f75e6206cea50b442c583070b568eda741e9d702cc253d37f550b01a88e
 MISC metadata.xml 333 BLAKE2B bb0321ece26d2e67d8c0cce9895247e8dcb84d72ca1b0186f066e639805e4006d9a8288403042c6fd96fd02489b554eb208843eafe436140f6e352121e5b1806 SHA512 bc44f5e8d86426c7fc32dc2d75c42d85a456c69cacccc1f44dbb8c561defb1748dd665fcc916d3a6577766a3d7bbd0944fa73f7df04b2d17b3fd3353929fa2e2
diff --git a/sys-apps/likwid/likwid-4.3.3.ebuild b/sys-apps/likwid/likwid-4.3.3.ebuild
index eba012a63dbd..ef60b4927a7a 100644
--- a/sys-apps/likwid/likwid-4.3.3.ebuild
+++ b/sys-apps/likwid/likwid-4.3.3.ebuild
@@ -136,8 +136,7 @@ export_emake_opts() {
 src_compile() {
 	export_emake_opts
 	emake \
-		"${src_compile_opts[@]}" \
-		|| die 'emake failed'
+		"${src_compile_opts[@]}"
 }
 
 src_install () {
@@ -146,7 +145,7 @@ src_install () {
 		"${src_compile_opts[@]}" \
 		"${src_install_opts[@]}" \
 		DESTDIR="${D}" \
-		install || die 'emake install failed'
+		install
 
 	use fortran && doheader likwid.mod
 
diff --git a/sys-apps/likwid/likwid-4.3.4.ebuild b/sys-apps/likwid/likwid-4.3.4.ebuild
index eba012a63dbd..ef60b4927a7a 100644
--- a/sys-apps/likwid/likwid-4.3.4.ebuild
+++ b/sys-apps/likwid/likwid-4.3.4.ebuild
@@ -136,8 +136,7 @@ export_emake_opts() {
 src_compile() {
 	export_emake_opts
 	emake \
-		"${src_compile_opts[@]}" \
-		|| die 'emake failed'
+		"${src_compile_opts[@]}"
 }
 
 src_install () {
@@ -146,7 +145,7 @@ src_install () {
 		"${src_compile_opts[@]}" \
 		"${src_install_opts[@]}" \
 		DESTDIR="${D}" \
-		install || die 'emake install failed'
+		install
 
 	use fortran && doheader likwid.mod
 
diff --git a/sys-apps/lkcdutils/Manifest b/sys-apps/lkcdutils/Manifest
deleted file mode 100644
index 3865a1ae34e6..000000000000
--- a/sys-apps/lkcdutils/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX lkcdutils-6.2.0-build.patch 725 BLAKE2B 876ec51bb2445b00b710049bffd196ac71839a0206d5b9a4e3f8f3598c49a9129f6ea649dca9f58eee88a3b71bba2f54435c72cd81fe09a1441731d7ee071bba SHA512 12e9830013052364371cf6702243cbb95b929857507891e58d855529e9c2fdc4ad646fcc6595f6fabf2417941eabdb74991c8bbf04786bcabb237d19e9b35945
-DIST lkcdutils-4.1-1.src.rpm 1502922 BLAKE2B 94544e552bef448241b3bf345b817734f9a82c0aae4d983b08266fa287727ebd159fd9333dd0045f87b39075dc67935ac5d32488e91b076c42b01667f5df8188 SHA512 c7cd2aa8292bac51116f098d07c80e0a3c89fea95e769bac33358cb6c70b8b0d98f8d8115de6c96c4c70c4dbca5f1e467cf383619579cb9db96785762101f495
-DIST lkcdutils-4.1-dhv8.tar.gz 8227 BLAKE2B 2c322dc155328e0190a8f19300eb01e8488b7de9adb0393d2c7dd3aad3c1072593115fc8905767b5c84ae5667cbe43bbf56f14a584b7b2ef8922eaf254a1615f SHA512 a16885802a937c16c33a70fc29ed5304cf610e01b10b7da331f474143bffa84fffb3e3d34d8438e63da0af9a43383de1eb4ea779c81508465b28463432526074
-DIST lkcdutils-4.1-savedump.tar.gz 21626 BLAKE2B a99c997a7116a5808e10cc1b8aa85b123ace69d11daa3dcd9090b7411865446dc8fc50ca7cb24cf7463ebd29a283d939610b2d005a290be8342d261b3f0142f9 SHA512 00620d8e438b512005c9d9c19743595c5c0d0a5563c4833aeba597cd77b9e17d3c46f28fc2df6c53dc8f1200c3a88c7bd67f0007925337f0c81b975971e511ee
-DIST lkcdutils-6.2.0.tar.gz 2967595 BLAKE2B 8f58d3ce688ca207a21b94a6c3438034926fdc72f1cbb24caa63472a9971d7b6ae21d1f72452157b75cbafebda8bd62f781a11acd155d5365d032cb7a90f36d6 SHA512 963f095448b28526f9db88efb77a32e7c05accfea3af175048600727dd8cce02a47743a5e4fbd5f359f8dff41538d4c90c201bdee5cb9c2ae90973f6377aa20b
-EBUILD lkcdutils-4.1.1.ebuild 1853 BLAKE2B e1a3587fb4b5a3fb69d62c63a8e988b7828e4a73b7a6b064b026c407acf801f92685a4b7d7b84a3cb1b08ae6f7202beb49c39166a014ec7c6add0991e5439bb3 SHA512 bfd06d494ad70ba257ada33b884f495ef219c3099cbef632cf8f41f37f1150a1cf81eee14546b236241916335f9051d3b6ac52478da412796747222442a9f6ee
-EBUILD lkcdutils-6.2.0.ebuild 660 BLAKE2B bedc47c1a69680dc49a00b593f29b31d45814bb25f14cee0c1044e30cf4c536fe718c2602b880dd80e6086d406581c3a18c8072926be1dfea92856560ce54906 SHA512 bd48aca04d9d4a8267e03c3b7939b42cef7b77944cf69f9c68ea2e9d06ed2b7bdef629d31977f5ff6479056804ddaa4581905d040dadcddf71a01818967e905a
-MISC metadata.xml 290 BLAKE2B 320dd10901e23177315eeb9ccfebc0fb113ce4aebcda3c90ada08b94d00579af040905c5a493c83175be11e9fe44f077b17b0225f2aa21e748e1d498309618f0 SHA512 c56bd2e7b716591ab6c6d36b3531659578018f200f17af1d9098bb89e8a67e75df759ba72814ac269b01bba1b208447a4ac5bc55ef849073c676e8bf09ca0cbd
diff --git a/sys-apps/lkcdutils/files/lkcdutils-6.2.0-build.patch b/sys-apps/lkcdutils/files/lkcdutils-6.2.0-build.patch
deleted file mode 100644
index e8330074d9bd..000000000000
--- a/sys-apps/lkcdutils/files/lkcdutils-6.2.0-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/libsial/Makefile
-+++ b/libsial/Makefile
-@@ -53,7 +53,7 @@
- 	./mkbaseop > baseops.c
- 	$(CC) $(CFLAGS) -c baseops.c
- 
--mkbaseop.c sial_member.o sial_op.o sial_stat.o sial_type.o y.tab.o : sial.tab.h
-+mkbaseop.c sial_api.o sial_member.o sial_op.o sial_stat.o sial_type.o y.tab.o : sial.tab.h
- 
- lex.sial.o: lex.sial.c sial.tab.c sial.h
- 	$(CC) $(CFLAGS) -c lex.sial.c
---- a/libklib/kl_savedump.c
-+++ b/libklib/kl_savedump.c
-@@ -24,6 +24,10 @@
- #include <unistd.h>
- #include <linux/stddef.h>
- 
-+#ifndef offsetof
-+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-+#endif
-+
- static int kl_check_type_dev(char *);
- static int kl_check_type_dir(char *);
- static int __kl_dump_retrieve_reg(int,int,char*,int,int);
diff --git a/sys-apps/lkcdutils/lkcdutils-4.1.1.ebuild b/sys-apps/lkcdutils/lkcdutils-4.1.1.ebuild
deleted file mode 100644
index a0df8d83992c..000000000000
--- a/sys-apps/lkcdutils/lkcdutils-4.1.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-MY_P=${P/4.1.1/4.1}
-DESCRIPTION="Linux Kernel Crash Dumps (LKCD) Utilities"
-HOMEPAGE="http://lkcd.sourceforge.net/ http://oss.software.ibm.com/developerworks/opensource/linux390/june2003_recommended.shtml"
-SRC_URI="http://lkcd.sourceforge.net/download/OLD/4.1.1/lkcdutils/lkcdutils-4.1-1.src.rpm
-	mirror://gentoo/lkcdutils-4.1-savedump.tar.gz
-	mirror://gentoo/lkcdutils-4.1-dhv8.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="s390"
-IUSE=""
-
-DEPEND="app-arch/rpm2targz
-	dev-util/byacc"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	ebegin "Unpacking lkcd distribution..."
-	# This is the same as using rpm2targz then extracting 'cept that
-	 # it's faster, less work, and less hard disk space.  rpmoffset is
-	# provided by the rpm2targz package.
-	i="${DISTDIR}/${PN}-4.1-1.src.rpm"
-	dd ibs=`rpmoffset < ${i}` skip=1 if=$i 2>/dev/null \
-	| gzip -dc | cpio -idmu 2>/dev/null && tar xzf ${PN}-4.1-1.tar.gz
-	eend ${?}
-	assert "Failed to extract lkcd distribution..."
-
-	unpack lkcdutils-4.1-savedump.tar.gz
-	unpack lkcdutils-4.1-dhv8.tar.gz
-	cd "${S}"
-	epatch ../lkcdutils-4.1-savedump.diff
-	epatch ../lkcdutils-4.1-dhv8.diff
-}
-
-src_compile() {
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--datadir=/usr/share \
-		--sysconfdir=/etc \
-		 --bfd_version=2.14.90 || die "configure failed"
-
-	make || die "make failed"
-}
-
-src_install() {
-	make install ROOT="${D}" || die "install failed"
-	# not needed on s390
-	rm -rf "${D}"/usr/share/sial \
-		"${D}"/usr/lib/libsial.a \
-		"${D}"/usr/include/sial_api.h \
-		"${D}"/usr/include/lkcd/asm/lc_dis.h \
-		"${D}"/etc \
-		"${D}"/sbin/lkcd* \
-		"${D}"/usr/man/man/lkcd*
-	# broken configure script...
-	mv -f "${D}"/usr/man "${D}"/usr/share/man
-}
diff --git a/sys-apps/lkcdutils/lkcdutils-6.2.0.ebuild b/sys-apps/lkcdutils/lkcdutils-6.2.0.ebuild
deleted file mode 100644
index 61b01c9546e7..000000000000
--- a/sys-apps/lkcdutils/lkcdutils-6.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Linux Kernel Crash Dumps (LKCD) Utilities"
-HOMEPAGE="http://lkcd.sourceforge.net/"
-SRC_URI="mirror://sourceforge/lkcd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~s390"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_compile() {
-	./configure \
-		--cflags="${CFLAGS} ${CPPFLAGS}" \
-		--lflags="${LDFLAGS}" \
-		|| die
-	emake || die "make failed"
-}
-
-src_install() {
-	emake install ROOT="${D}" || die "install failed"
-	rm -r "${D}"/etc/sysconfig
-}
diff --git a/sys-apps/lkcdutils/metadata.xml b/sys-apps/lkcdutils/metadata.xml
deleted file mode 100644
index ecf6bcd691f2..000000000000
--- a/sys-apps/lkcdutils/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>s390@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">lkcd</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-apps/lmctfy/Manifest b/sys-apps/lmctfy/Manifest
index f16e02e04c01..2c3d3efb7b7b 100644
--- a/sys-apps/lmctfy/Manifest
+++ b/sys-apps/lmctfy/Manifest
@@ -2,9 +2,9 @@ DIST lmctfy-0.2.0.tar.gz 2291473 BLAKE2B 1cfa587476215e6cc75f8b31e8c0ff7be342d75
 DIST lmctfy-0.3.0.tar.gz 2305226 BLAKE2B 77b0e0c15d46f66fda59da799e37fd37fb70b53b25a13cb0ac3a484bf90ee0e6e4d57e5de13e06954336ca1611db67fe6dfc7a7a8cb9fa6ef7a615209229629f SHA512 9083af2d2b9ea34e6dbb911a24cf7b8a7fe5aa3a0f464d20115db86b5abac530d24122079f97ea2ef98bf4fb20a3980e598d89f38b570ba796665b0af08339d5
 DIST lmctfy-0.3.1.tar.gz 2312481 BLAKE2B 253f177879d85c131c21e2d9e9d2c651e7168ee9d55294014627dd522f3789759db5e8d8c82e189386621a1ada9854922bf0e8525c33f5b237e85c49da51c3c1 SHA512 ab9f2a065a49fae00b540c0592d9356022ba14e0f9dc681731e0757c259f3632a9b34b5fc629eaf2d0943d59e7747af06cfe59a64f447192e8c196a9d41b9522
 DIST lmctfy-0.5.0.tar.gz 2447650 BLAKE2B f40126ccb16b43921e39c23b82ee81a982e97c8bcd7e316568a313e3dd854cc0995f18aba7f6dd48418c3754a3ab92516b2c896136d00006d162044e6f6cd0e6 SHA512 638472b3e8cc98e7ff7ecc48eb0f58fb6a74600db22b7a1962ac3fe137d3549233f3f3b0c97f5783dff6f1851f9c3f9b0607fedea91cb23c1124ed8e2b54aea1
-EBUILD lmctfy-0.2.0.ebuild 782 BLAKE2B 41b853344ed26979b0cc505e03bb9984932bb022af03c7874c88c4ad6eebefee419dd84a77f3f39d70e8fb168ab3b58af279505a6deaa1b32e34618bab95b561 SHA512 3405792698ff33024a602c9bbf2e4294b3e70fc72aba65489e3a59cf596be8984ff7f6827a33f40e07293f9a51d83e927044c2f0637c6f774c86863cec7dbbd4
-EBUILD lmctfy-0.3.0.ebuild 782 BLAKE2B fed672b90ec37b7e7a5196be8575cd8e6203d74b01e98d9067cd495c064e35a868fce376e7ffb38d6f15f9eaacd1cec7fb8a5ca7f00454998064029a8d53e438 SHA512 ccf8b9730a8ce292c4e3d6277a53b109d5e9a3f344c12834f8d4c3278f3b7091cbb534b66a53da0c5f0b37ad4330fb02eefcc817ede312a4d87c00af699f9315
-EBUILD lmctfy-0.3.1.ebuild 782 BLAKE2B fed672b90ec37b7e7a5196be8575cd8e6203d74b01e98d9067cd495c064e35a868fce376e7ffb38d6f15f9eaacd1cec7fb8a5ca7f00454998064029a8d53e438 SHA512 ccf8b9730a8ce292c4e3d6277a53b109d5e9a3f344c12834f8d4c3278f3b7091cbb534b66a53da0c5f0b37ad4330fb02eefcc817ede312a4d87c00af699f9315
-EBUILD lmctfy-0.5.0-r1.ebuild 733 BLAKE2B 859a4fb5556079e3f0ea29ba417631c07e276d267cc9ad58dd8db51d5d613bf6b728be4a2dbc03746e66fdcdf56ccae917858eaf082f7e0699304dac5a4715c6 SHA512 9891b55522b9d07c26466614cb6ae3406533019610de2325c3b2fd1e38bfcc956d351778973456d417715ed847ee1b213690bce4677e7d15b23dc033db46ee11
-EBUILD lmctfy-0.5.0.ebuild 687 BLAKE2B 12dd446c48ff067c4ebb2650252f444d2a57644f74bc555a0e09454b4828bee78a325dcd25ed20ece8941edd6600cfc694b328da4c641e1e9a85fd4ad45ee722 SHA512 0d5d0bafc8b51356bd74a2b29877f338b9abe447187dd4c49a26d919b81f9d7ce143513fa8e095e79e8a50c0269f8c159306229ce061c438a5da925ccd035948
+EBUILD lmctfy-0.2.0.ebuild 774 BLAKE2B 1ba959ab51e1b66cea9d3c7c9567a80092794d55a4c43d65498b3c27be7089866236b95c3defa3a2ad7533b3fc45c850ec8bb5a2d60fe6455b9f8db43f48eed3 SHA512 47be9401ea7fae211b5a53d8b3c5e7e6825d3723730b932b9b9b2092a65a27847c4ed70aa6c6051130baf22199182e5b6903ed47eb3203c00d6aa548a3b0c5ee
+EBUILD lmctfy-0.3.0.ebuild 774 BLAKE2B 1ba959ab51e1b66cea9d3c7c9567a80092794d55a4c43d65498b3c27be7089866236b95c3defa3a2ad7533b3fc45c850ec8bb5a2d60fe6455b9f8db43f48eed3 SHA512 47be9401ea7fae211b5a53d8b3c5e7e6825d3723730b932b9b9b2092a65a27847c4ed70aa6c6051130baf22199182e5b6903ed47eb3203c00d6aa548a3b0c5ee
+EBUILD lmctfy-0.3.1.ebuild 774 BLAKE2B 1ba959ab51e1b66cea9d3c7c9567a80092794d55a4c43d65498b3c27be7089866236b95c3defa3a2ad7533b3fc45c850ec8bb5a2d60fe6455b9f8db43f48eed3 SHA512 47be9401ea7fae211b5a53d8b3c5e7e6825d3723730b932b9b9b2092a65a27847c4ed70aa6c6051130baf22199182e5b6903ed47eb3203c00d6aa548a3b0c5ee
+EBUILD lmctfy-0.5.0-r1.ebuild 757 BLAKE2B f0d2fce9e00442751506b2363824ff67aaf1758639146b8370fcd74aa08280812e317614f6ae73a09f9981c40551897471307ecb56673a34bb9b3d58ade7527b SHA512 7a6d014cd5e6d282cca9e1b3fd8e2b17c02afab6e2226160bfb9a78172443a9e0347a1d6d7834600bf729ccaa9b244931c34541707558ad277f97441af1fd647
+EBUILD lmctfy-0.5.0.ebuild 711 BLAKE2B 10ca9f8c29e157c057350f985b9d613d532be3cf15d115c1c4a149102a34759704bd18f906a6d367e01a9434e7a48455f158e375b4320987f11f73eda1767abc SHA512 784d3db8af701cfc5453509ba919a7b4379596ca6dc357487797ef6deb8cde267e1acaac631b284fb2da7e8bffaf73230934b5d8eec6ee70a9c1f53ed9a89a34
 MISC metadata.xml 335 BLAKE2B ea4fa6ebfc263db5fb52d6f5a30f46799eb5c7488287b7d77ac34a6d791d8e53576424a21b346c67185f293bc689787744287223c43fa8eeee6e5d157bb500e2 SHA512 ae6e68f29f452d34b44b2afb53623f3fe0fdcc76d32d5aa7c5f394cb7f1caad288b320ccf3f1e628a4f42ce8a7f789fd4e8216d07eb539ffec7954632ea68c5c
diff --git a/sys-apps/lmctfy/lmctfy-0.2.0.ebuild b/sys-apps/lmctfy/lmctfy-0.2.0.ebuild
index 7dc9a7fa21f8..a239974b055b 100644
--- a/sys-apps/lmctfy/lmctfy-0.2.0.ebuild
+++ b/sys-apps/lmctfy/lmctfy-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ SLOT="0"
 LICENSE="Apache-2.0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/protobuf
@@ -30,5 +31,5 @@ src_install() {
 	# silly upstream!
 	mkdir -p "${D}/usr/bin"
 	cp "${S}/bin/lmctfy/cli/lmctfy" "${D}/usr/bin/" || die "Failed to copy cli binary"
-	dolib.a "${S}/bin/liblmctfy.a" || die "Failed to copy library"
+	dolib.a "${S}/bin/liblmctfy.a"
 }
diff --git a/sys-apps/lmctfy/lmctfy-0.3.0.ebuild b/sys-apps/lmctfy/lmctfy-0.3.0.ebuild
index 34bfaef96ae1..a239974b055b 100644
--- a/sys-apps/lmctfy/lmctfy-0.3.0.ebuild
+++ b/sys-apps/lmctfy/lmctfy-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ SLOT="0"
 LICENSE="Apache-2.0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/protobuf
@@ -30,5 +31,5 @@ src_install() {
 	# silly upstream!
 	mkdir -p "${D}/usr/bin"
 	cp "${S}/bin/lmctfy/cli/lmctfy" "${D}/usr/bin/" || die "Failed to copy cli binary"
-	dolib.a "${S}/bin/liblmctfy.a" || die "Failed to copy library"
+	dolib.a "${S}/bin/liblmctfy.a"
 }
diff --git a/sys-apps/lmctfy/lmctfy-0.3.1.ebuild b/sys-apps/lmctfy/lmctfy-0.3.1.ebuild
index 34bfaef96ae1..a239974b055b 100644
--- a/sys-apps/lmctfy/lmctfy-0.3.1.ebuild
+++ b/sys-apps/lmctfy/lmctfy-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ SLOT="0"
 LICENSE="Apache-2.0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/protobuf
@@ -30,5 +31,5 @@ src_install() {
 	# silly upstream!
 	mkdir -p "${D}/usr/bin"
 	cp "${S}/bin/lmctfy/cli/lmctfy" "${D}/usr/bin/" || die "Failed to copy cli binary"
-	dolib.a "${S}/bin/liblmctfy.a" || die "Failed to copy library"
+	dolib.a "${S}/bin/liblmctfy.a"
 }
diff --git a/sys-apps/lmctfy/lmctfy-0.5.0-r1.ebuild b/sys-apps/lmctfy/lmctfy-0.5.0-r1.ebuild
index 76093fd584cc..b55a5841ffc9 100644
--- a/sys-apps/lmctfy/lmctfy-0.5.0-r1.ebuild
+++ b/sys-apps/lmctfy/lmctfy-0.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	dev-libs/protobuf
diff --git a/sys-apps/lmctfy/lmctfy-0.5.0.ebuild b/sys-apps/lmctfy/lmctfy-0.5.0.ebuild
index 525a157e1df6..26f7f25c22ba 100644
--- a/sys-apps/lmctfy/lmctfy-0.5.0.ebuild
+++ b/sys-apps/lmctfy/lmctfy-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/protobuf
diff --git a/sys-apps/lnxhc/Manifest b/sys-apps/lnxhc/Manifest
index 90140ac1b00a..9531042852dc 100644
--- a/sys-apps/lnxhc/Manifest
+++ b/sys-apps/lnxhc/Manifest
@@ -2,4 +2,4 @@ AUX lnxhc-1.2-ifconfig-path.patch 654 BLAKE2B 6872b7412c63a1ca3e4d63831269c5a770
 AUX lnxhc-1.2-usrlocal.patch 1455 BLAKE2B 8d154c43ba460a09366e0b7d93c4fb69309682a49a1346b94c4410e4b49098718c9bfcc3a8a1c5df9ce2dcbef485f65f28d6e6bea08920904dc7ee70ce25b444 SHA512 43be5d638f46caee028802e8675621a7e6ec8499f4490ed1f9df167a8b9b82a3002bac5a28ab3116507eb0eccaad33d865cb64f6cbc4b134717541cd2424087f
 DIST lnxhc-1.2.tar.gz 360869 BLAKE2B d92321f02be65ea8aaacdc55d19c480031c03d162e80207b306ef70f512917c506a27075e9326ff4be67e1ddc233096fdd44cf0ab06073a6b29ff8255f49ead8 SHA512 200ab6443c3b8f4dd99928d2f18b31e8e05c1f9c1f976052017a643430ed87fa08a399e9e8430eafb2925126bd2d90fc4f65ce1c220d6100b71c31fc0505aab0
 EBUILD lnxhc-1.2-r1.ebuild 481 BLAKE2B 4896345dceb4e2ff3b6f47f5114d344c82d24fb8241ba68e23d1ed5fd9364121fd451e72ff211f7fb0613a4815d2432cdbb9673fe7a83858e4c3f1e441a3d524 SHA512 e82e4ab73e589b07a471d855589ef686d29b19d5d60cfe3650cc0ac9679da204a8f8782ef3b0484ab09a6c5fea522e8944761973677b12819ce727a2e826eb5f
-MISC metadata.xml 323 BLAKE2B ca0d389221e8f6f1b5a2403596ce3e14344062fb4b2c49f4891ef2f1f77c9215faeed9ee5509fe66c9c5da3c5fe14ba217e7b5e22772ac950beb9bf9bdf20868 SHA512 d6afbaade4f09d103a0a40e30079e402df15cc5f1f452bd0b10b2d5ecda328ff1d057c9a931869cccc15381c1e1abfbb37cca942179e51ce6a562772c9ca6698
+MISC metadata.xml 242 BLAKE2B 869d8b0b4c7fa3b941911743f4a3c17d6a2c608cdbd3ae4cc1e3a84a12282f5197c263d99d1c5836f64c3868ad986d22d40e98f9083e24a8de41da5e305c8db5 SHA512 24a593f580269cba11ab3b8b83d8199b577480e448bbfe04cd2ee49da165537423dc4d38f9f2366a44605c8c70ca43ade3140da5718cc2cad01fc549d217f9c3
diff --git a/sys-apps/lnxhc/metadata.xml b/sys-apps/lnxhc/metadata.xml
index 36bfe2a121c5..8ee14e7cb171 100644
--- a/sys-apps/lnxhc/metadata.xml
+++ b/sys-apps/lnxhc/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>creffett@gentoo.org</email>
-		<name>Chris Reffett</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">lnxhc</remote-id>
 	</upstream>
diff --git a/sys-apps/man-pages-posix/Manifest b/sys-apps/man-pages-posix/Manifest
index 503a48704d63..88646cd86bc6 100644
--- a/sys-apps/man-pages-posix/Manifest
+++ b/sys-apps/man-pages-posix/Manifest
@@ -1,3 +1,3 @@
 DIST man-pages-posix-2013-a.tar.xz 930736 BLAKE2B 4d496a4ea7bcf9f101a9b5c31eaa437317e872d9d266c202a1fcfd16d9b2fa71f968c3653bc9789ba18916a93802736e795c43bb3f87324397f49aed0f6d1556 SHA512 e6ec8eb57269fadf368aeaac31b5a98b9c71723d4d5cc189f9c4642d6e865c88e44f77481dccbdb72e31526488eb531f624d455016361687a834ccfcac19fa14
-EBUILD man-pages-posix-2013a.ebuild 777 BLAKE2B 06052c91fecdc43892ab281d239029dc750d5d5f75f210fc918dc67add4e3b30f3df8624aa6a07c6818c68864d81bf0fda93c2d27d714fcf55ae31b695469148 SHA512 bf9efb2518d7ca45b90b299c1488a39d398c11172631cdd8f3558ea898b3958531401e7422b27ab6fb4f465cef5239adf996c66d9d5960346796b0255b39f556
+EBUILD man-pages-posix-2013a.ebuild 770 BLAKE2B c74230150b0e53ee08be57f4ed5926ec375a5254d7d8c75a9cdf64304ef211cd75f3485648f2722a0301b81747b5421b3842b6b4df77eca370c2cc08d04df41a SHA512 4f6db39c3775041f5012f1a8bd4eaaa6a12af78397f0fce02efb16948d5100cfdf7190e1420f6bf56d6d5edcf4d6e17da3e7b2fedfea043f449fd1eef7d1cd14
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild b/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
index 743f17c98a2e..822c0fcb1ec0 100644
--- a/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
+++ b/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
@@ -27,6 +27,6 @@ src_configure() { :; }
 src_compile() { :; }
 
 src_install() {
-	emake install DESTDIR="${ED}" || die
+	emake install DESTDIR="${ED}"
 	dodoc man-pages-*.Announce README
 }
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 81bf3b1a2b51..f5223b429fde 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,8 +1,6 @@
-DIST man-pages-5.01.tar.xz 1662512 BLAKE2B e2b77aea38eaed44fcefbfc21a59ae3f972901a055d3491effda286f0ef7cd8d1e32b4a610707c5ba8ad18ac7d5ff81df4927f7c68c99f54753af49b40c07f17 SHA512 0f95198e230fe28da2821c931f0078adf67bc4d92434b4da5e67dcfe3b462fd22b3268b7c0b9385603f0bfa7aa273c97ae152edd2b6f6975b9199b6e73e1f457
-DIST man-pages-5.02.tar.xz 1668616 BLAKE2B 91fb6618e13d25c1ad81ac5f6acc20ac0075b0e33b5ecfc271a4a4abcfffb37e4f22dbd15128a3a54ea2a7ed03c0374b907998da15dde90f4b9fb0da7ebf0947 SHA512 424d382f69611e29bd512ad166db7189633dea92b9d57466480a88cc69e83e6f364e16d4303efea19f2252bc9681c14158d60eef79c4cc4be41185300b67a4fd
 DIST man-pages-5.03.tar.xz 1677908 BLAKE2B 54ba60a0ef772259fe8facf9e8d36155b16a3c990adb7bcc63e57bdd969d1853e6eadbc3d21186c23730c65dd7cefe497819921b9b5c8622bee74f656430723a SHA512 e7e0d1952abe75dd2503fd7bd7fbe34532ef22b70d82f299099e38e08a92604df0f23ed83267b57ca6d9d90e697651c46f6a95c1a077e3f193ba89f6293af7be
+DIST man-pages-5.04.tar.xz 1684044 BLAKE2B 61b73edfe0d1f93f20b17e935f73c8c0ae778219f59f9b4739e1574b4b9aea5d83cd856f77b58cd2fdc4cd19ddc9a61cf2c7dd504461e9ac3b9a1d59574a2c1c SHA512 723c67eaddc2652dc36fa698d08473dbc8e17f4351b2c391064b80d637ec7e5cdc1b20ee4e542d95f441331c7b773899cfdeeeb7a2f599c64d6eac5c586b7cbe
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-5.01.ebuild 1676 BLAKE2B 4183d24483964dc5643ba650d5fe5ccd5c6b79ae3832d84e05da2a43f937e2a28f7da68e1855fe9215ed29896f5388bc0a04530ddb2377fb92ae01a0195d51b9 SHA512 7a6a68a2da452e52b01e68abfdc816f8f20f91aa4dd3e73a02ffa61553a80af52b931a9ed75c15aec760d95506f0b5ebbb492a6f0d1109722c54f3d6ad91ed2d
-EBUILD man-pages-5.02.ebuild 1689 BLAKE2B d9db2f9657322288831ec4d9d04b013107f9348c2de8feeab5002f2161735e293bed5f2ab0a578b44d08d40ad740e631f444bbf8f6917b8c93aa47808fb7e49a SHA512 3f82f173b0b381f53ff577c9d5772073192482ffcea694ca501779528f3b22eefdd31077027fe2e4eec0cbab0e033ed8348293859eab6abf58cda2426a338c7b
-EBUILD man-pages-5.03.ebuild 1689 BLAKE2B d9db2f9657322288831ec4d9d04b013107f9348c2de8feeab5002f2161735e293bed5f2ab0a578b44d08d40ad740e631f444bbf8f6917b8c93aa47808fb7e49a SHA512 3f82f173b0b381f53ff577c9d5772073192482ffcea694ca501779528f3b22eefdd31077027fe2e4eec0cbab0e033ed8348293859eab6abf58cda2426a338c7b
+EBUILD man-pages-5.03.ebuild 1676 BLAKE2B 1433a18e13e90c9c0e0b95fbf6304ba4697c634ba668afa461fa9c5cdf9c925e72d7220ebc76376b4b0fce71433969c8bfb3db60f1f61c4d7aa9a31ea92e067a SHA512 cba63d2b4fc77c4bae06adbbfadf6b71c3ea6fdae6dfd1dd8e8c881c24e8c8cbc883e1067f65437b9e8f35b29c88ce539a94ba001292a0a8fd95b1afc8b08b02
+EBUILD man-pages-5.04.ebuild 1689 BLAKE2B d9db2f9657322288831ec4d9d04b013107f9348c2de8feeab5002f2161735e293bed5f2ab0a578b44d08d40ad740e631f444bbf8f6917b8c93aa47808fb7e49a SHA512 3f82f173b0b381f53ff577c9d5772073192482ffcea694ca501779528f3b22eefdd31077027fe2e4eec0cbab0e033ed8348293859eab6abf58cda2426a338c7b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man-pages/man-pages-5.01.ebuild b/sys-apps/man-pages/man-pages-5.01.ebuild
deleted file mode 100644
index 8572a75e3a49..000000000000
--- a/sys-apps/man-pages/man-pages-5.01.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_PATCH=2
-
-DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
-HOMEPAGE="https://www.kernel.org/doc/man-pages/"
-SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
-	https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.xz
-	mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
-	https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2"
-
-LICENSE="man-pages GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE_L10N=" da de fr it ja nl pl ru zh-CN"
-IUSE="nls ${IUSE_L10N// / l10n_}"
-RESTRICT="binchecks"
-
-# Block packages that used to install colliding man pages #341953 #548900 #612640 #617462
-RDEPEND="virtual/man
-	!<sys-apps/keyutils-1.5.9-r4
-	!<sys-apps/attr-2.4.47-r2
-	!<dev-libs/libaio-0.3.109-r2
-	!<dev-libs/libbsd-0.8.3-r1"
-PDEPEND="nls? (
-	l10n_da? ( app-i18n/man-pages-da )
-	l10n_de? ( app-i18n/man-pages-de )
-	l10n_fr? ( app-i18n/man-pages-fr )
-	l10n_it? ( app-i18n/man-pages-it )
-	l10n_ja? ( app-i18n/man-pages-ja )
-	l10n_nl? ( app-i18n/man-pages-nl )
-	l10n_pl? ( app-i18n/man-pages-pl )
-	l10n_ru? ( app-i18n/man-pages-ru )
-	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
-	)
-	sys-apps/man-pages-posix"
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	emake install prefix="${EPREFIX}/usr" DESTDIR="${D}"
-	dodoc man-pages-*.Announce README Changes*
-
-	# Override with Gentoo specific or additional Gentoo pages
-	cd "${WORKDIR}"/man-pages-gentoo || die
-	doman */*
-	dodoc README.Gentoo
-}
diff --git a/sys-apps/man-pages/man-pages-5.03.ebuild b/sys-apps/man-pages/man-pages-5.03.ebuild
index ea909f0780a0..a9922828cd45 100644
--- a/sys-apps/man-pages/man-pages-5.03.ebuild
+++ b/sys-apps/man-pages/man-pages-5.03.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE_L10N=" da de fr it ja nl pl ru zh-CN"
 IUSE="nls ${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/man-pages/man-pages-5.02.ebuild b/sys-apps/man-pages/man-pages-5.04.ebuild
index ea909f0780a0..ea909f0780a0 100644
--- a/sys-apps/man-pages/man-pages-5.02.ebuild
+++ b/sys-apps/man-pages/man-pages-5.04.ebuild
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index eb209978c173..faa66a85252c 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -13,5 +13,5 @@ AUX man-1.6g-echo-escape.patch 630 BLAKE2B add028d6c6bd11590b3f69f989aac874e6695
 AUX man-1.6g-fbsd.patch 366 BLAKE2B 882b3b3048e3dcb4f64f38e94d7603ae577038dce6636d6b2cbcb76a96b1c54427ddff737429e9e464fc50d0956cf9a9da86c0689bb6ebd8ae84d5d8f15727a6 SHA512 4019267584b1350b2c9da9aa1851a2e4e96f271265d189ecd677206be20dac67cd212b2887f844f43c10d96076a76613a12e53f3b29a185ec62ed4bff4c5a502
 AUX man-1.6g-xz.patch 1848 BLAKE2B 6a0855eda72386a0f48e715e9ba620b3473b3aa854c42fabd93bc02b7c9cd44fbd07f2608257fe953bdfa9b02e8fa35876d651ba5aab99937fe42325fcfb7b69 SHA512 6a883fa800a6d3b11c76a70e1a31c0736d380271c9f21315863ddaca9529e3d613b587724287fb94bab2b0d97215f6ccb3f1438a5c5e339e5a2edf872c92515c
 DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b
-EBUILD man-1.6g-r1.ebuild 3738 BLAKE2B 28a71635c4b70a6daee0e116074676cd5a2cddfdad5e9974dfb64c524197c4f57a39a682306ba34d370d8043b60b4f03eecb944693b2c04a671e81e60a8c66c4 SHA512 d5cf3d9f235481e9f60e461916acb5efa8ff7926dd9ae04628a2667b5b6bfae5557c5a2ec506ceae03c91916ce831448f01be07bdebda60e46387eb29afdda3d
+EBUILD man-1.6g-r1.ebuild 3709 BLAKE2B 6147c64d6582b3b101f1c6b366b8259e5e6b8b702e7e00592c20bf510272c99eff51494e809da69c3077731a4dfdf3ed297808675d7f583ad25135a42d2f292f SHA512 d31ac787da3b821129f04a00be3ac10f8f85392051f6a198e9f06a151baf166b8bb3524d75c140986261a8c866f6192517a3833d293557cb1d83b6b0ae992b97
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man/man-1.6g-r1.ebuild b/sys-apps/man/man-1.6g-r1.ebuild
index 77a3f91809bf..098628c40d4b 100644
--- a/sys-apps/man/man-1.6g-r1.ebuild
+++ b/sys-apps/man/man-1.6g-r1.ebuild
@@ -90,7 +90,7 @@ src_configure() {
 src_install() {
 	unset NLSPATH #175258
 
-	emake PREFIX="${D}" install || die "make install failed"
+	emake PREFIX="${D}" install
 	dosym man /usr/bin/manpath
 
 	dodoc LSM README* TODO
diff --git a/sys-apps/mcstrans/Manifest b/sys-apps/mcstrans/Manifest
index 95aa8484f374..d084b83707dc 100644
--- a/sys-apps/mcstrans/Manifest
+++ b/sys-apps/mcstrans/Manifest
@@ -1,7 +1,7 @@
 AUX mcstransd.init 659 BLAKE2B ef74c438407efa47a066a18a1ba8d7cad2b13240fbf39d83887dda37a9c2c53c49a27f4ebe00451baf01be59fcd9ed4e47d095e925387fd2032e4e822672d466 SHA512 de97bb70286bd2b772ac6e98346ffcb96dcad95925ebb3bb44e6ffd4cf22b88d27aea103c89973f0fcc6334c98a9399d077e9cd52eaf7da70c5fce3da96ef3a3
-DIST mcstrans-2.8.tar.gz 41385 BLAKE2B 08cdb2588ab2cb48824816fd3eb578a77bfb6696f00fac7b808250ae88a5c85ae02824f047ac6cd6f3653d4b8550352f3570b63969ebfef5b396478ef191b97c SHA512 b20b369fea926ed55db4e454e82ef842fd39a8194190c9feb063b36126f6334f9d3401ef1c3636c03230a813c69648b5efbcc35b163387495175cde80dd6bd39
 DIST mcstrans-2.9.tar.gz 44451 BLAKE2B e73121351a5d3a09c4754cd0fc6bcdac4b47e3f99d8bd2c40ee9b2bb510095a41721d0dae0d3edb56c36d9e9ef72ece4c69a01298c7f34fe96ccf4883372b1fd SHA512 25a37c6dd7fa23b0599d7e92da78805e1da1605c998edf00777113c8467b1703f634223dff57627337da51e565cf2d1e475698a5a2310966f1f6dcf6687671d1
-EBUILD mcstrans-2.8.ebuild 1132 BLAKE2B 05f10514a2be3196f0d6c64c2288af8252ef151f3c9b6d0bc1ea39ab2f5d9213164de8bacbdcf0d298f9e917654819e5df5bf80d72cc3851669c9d6e743c1582 SHA512 e328c1d9aa6d5b63594bf72b9899fa2ddbb8fa0c9426b1025d0a5422b2087ce6de33b353a4542dc83bb317b75bd3d858f584bb508e762d1a48299884ef10005e
+DIST mcstrans-3.0.tar.gz 44570 BLAKE2B 82358f6564e42ebfa50647892b35e4788ff9b8636eef3c776dbc6cefff7532906479b5826c1f515d2994611f62100a2622a5cce130bc7dbb4db3afc2167ec072 SHA512 02d9754daf1f85941cc8eea934931b6963d1a2133f6f313a2c7fc6a485687add434d587eeac96bfaf2b490c8e1cea34514a7689f880ebb49ca59ebf9b8956eba
 EBUILD mcstrans-2.9.ebuild 1112 BLAKE2B 28e4b4e11895e7ddc472808e950074ecf831e96fccfb72528b6d946498b96163a0472409cbe1bb6232a84890f95595fede1866a7bf87b5357dc664b1c887f99e SHA512 50d08031a4443b91d3819ab7e49e1e8fbc2dd28bf5fa612d65e080572e732c1832ae2ff173f46b6183d7758b2ae5efe8eebd883c6a8d128170e9ebbfce5f41b0
-EBUILD mcstrans-9999.ebuild 1114 BLAKE2B ab7b9d59f3f91046298d0b71b48aa2bae4f95dbfbe0d92a99ef70c363c65324a054e9fc2246a1af7b262c72680001c18234c02a069229f0dc3f0af9caec8cfd4 SHA512 f91fe4784ed5783e886549b6f5cf33e466a15a6d18e74abe13b70bec8b7ddd679a3804e10868ddda3c959c035acc8fd1f347371134440dba193575c2911eacc7
+EBUILD mcstrans-3.0.ebuild 1114 BLAKE2B 4f51cb48990d1dc67cf3e93c78725659f5c722152c911e6732f86fb6041fa97bfe9933e2963df9dd594dee87baf1c824e470347bbf4fb5d56b958a6769ecff81 SHA512 1d892b89f50cd6f0765ee071c6eb6e447cbdd46ad5391fd62c0fd6a848b62e4d3cadf7b441d4fdfc922a1c796017883e18bd380f4fb39046430867359ca6b534
+EBUILD mcstrans-9999.ebuild 1114 BLAKE2B 4f51cb48990d1dc67cf3e93c78725659f5c722152c911e6732f86fb6041fa97bfe9933e2963df9dd594dee87baf1c824e470347bbf4fb5d56b958a6769ecff81 SHA512 1d892b89f50cd6f0765ee071c6eb6e447cbdd46ad5391fd62c0fd6a848b62e4d3cadf7b441d4fdfc922a1c796017883e18bd380f4fb39046430867359ca6b534
 MISC metadata.xml 451 BLAKE2B bf8e87dcdd8c3dfbb33728600b986bf96e2243a9e9916db87ae4b4d69508f6397915929b24c4b7381d711a7754987402f0abd8ee8217621479d6970c91922189 SHA512 9d1f5669661c1fe232b18517a954640350c8f0c606d3ca91e429f53790532bfc9b73d7c18e575c4055d3ea7ba4a5ade632d1814700ed1d3d000fe5ebfa065744
diff --git a/sys-apps/mcstrans/mcstrans-2.8.ebuild b/sys-apps/mcstrans/mcstrans-3.0.ebuild
index f6bf04c6353b..e68d520f4372 100644
--- a/sys-apps/mcstrans/mcstrans-2.8.ebuild
+++ b/sys-apps/mcstrans/mcstrans-3.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20180524"
+MY_RELEASEDATE="20191204"
 
 MY_P="${P//_/-}"
 IUSE=""
@@ -15,8 +15,8 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/mcstrans/mcstrans-9999.ebuild b/sys-apps/mcstrans/mcstrans-9999.ebuild
index 1fb74df9e673..e68d520f4372 100644
--- a/sys-apps/mcstrans/mcstrans-9999.ebuild
+++ b/sys-apps/mcstrans/mcstrans-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20190315"
+MY_RELEASEDATE="20191204"
 
 MY_P="${P//_/-}"
 IUSE=""
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 32cbece7f78f..711278eff761 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -2,7 +2,6 @@ AUX 39_memtest86+ 1610 BLAKE2B a27eed85f2678e84faa3d4a025d7e53bdf9018b095b9c7590
 AUX 39_memtest86+-r1 1702 BLAKE2B ba73cef5d026a242ab3e5ac54a98cf289ceedfbe174a9d2109cab785e0b0fc9b9e59aa3c80d276255cc8c18bdc3567f02e644652512e194e3c555436d42be8e3 SHA512 ef2d86bd902f44905921880c630a85d3c9763bea3b79211f64346f1f55a5f31ed0b20a80f9f0c3914de1f33b7bd7d3471762f17065183ced185de52d34f2068f
 AUX make-memtest86+-boot-floppy 2499 BLAKE2B 1076e5d3e3a139c46c684f7ed29658cd815525e56fae03eb4dd1e36fda0c751a1aa78c891d040aeee979f8b79a8b0db8453e4e26f2efd9963e7bfa10206b5c86 SHA512 28649d630c4624573a5cf4279f6207cf44707978d8a18f2c614997f641038f2da731bb5c3b26066812a5c02d926c40020e74820b1a4eb2b4732a76686c52c260
 AUX make-memtest86+-boot-floppy.1 1165 BLAKE2B 974a5c70009031517bbeaa06155a7da411ce1823ed2b7dc31a1843618058cbcd1c1a51f9c9012dddd843579b588c619c6448e65ae369ba2dc6441a991bf8d9b7 SHA512 8b5b6397e50cf4d48aeda31de4c1f72493e97db52ff45966716df8f9b0fbbd8d4ed71e289c0113ef53fa52a7ea6df4c107c63ca70f90c951dd085c05b64db147
-AUX memtest86+-4.20-hardcoded_cc.patch 1222 BLAKE2B 603879ad2f1a6dc7bd2d603c59fa60f924d651cae9d5d6ec8083811f300945014eb6fade69f834fef42b071954bfbcb175303b971a70e5f253a9febb15680ef0 SHA512 ae15a6505af65ed176464f30f3beeb78a62799fb4f945e2003598fdbfcf54b75cd859afd868e9a1e9e4cab729411f072bf0a40bd296b9d770f6de140de14c7f1
 AUX memtest86+-5.01-gcc-473.patch 1308 BLAKE2B 7796745ddc5a11ea14958d762201873e7d8ab645aaee9c96804c6f0e94bb8b341a4db2d1434ad9b7365f486c097b8ab4cdcaff01114344abd5a288c456fba722 SHA512 94427ae0b78c9e24a8f4db6285a04ec468d17b6b4bb26550abb006a9fa37b52c871cb4cfb0fb2489e373b0ea9748106938f7fb4ad0f31968e151e37294199a55
 AUX memtest86+-5.01-hardcoded_cc.patch 488 BLAKE2B ad978b2c1a15dfefc1f56953be62d7943953351b3c291a392cffecaca2757e4aba46961570077761fa2796a81b4d1d5b8341527245fe9beb52f9c135efe7c713 SHA512 ccd348f253aece4530051c54f94d1ca3185cdf98df928807fed5ab6be8632828d53049b3829a6f147103ed05a5a482a8e273cec17bd1d539d06cb56a3fa53721
 AUX memtest86+-5.01-io-extern-inline.patch 1183 BLAKE2B 2d86cec1bca2fd3f1f71fd0a1a704447e356d77aa0e84ed7da199daaeea89d3abe7cae3b222a99d8f36f45846a8a779f3955cba6a59d64cc103908916b5edcb9 SHA512 c307d268d2e3fc0c4517f627eea0c53679cb6f76cba06bb822beb2b6121e0ce0bdbe59539ff5fe716f0fd0083fa987d8a44d2999b888ccc05f8d3d9d693ded0b
diff --git a/sys-apps/memtest86+/files/memtest86+-4.20-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-4.20-hardcoded_cc.patch
deleted file mode 100644
index 2eb750c8dd93..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-4.20-hardcoded_cc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naurp memtest86+-4.10-orig/Makefile memtest86+-4.10/Makefile
---- memtest86+-4.10-orig/Makefile	2010-06-24 00:27:22.864634431 +0200
-+++ memtest86+-4.10/Makefile	2010-06-24 00:28:42.402478590 +0200
-@@ -8,10 +8,9 @@
- #
- FDISK=/dev/fd0
- 
--AS=as -32
--CC=gcc
--
--CFLAGS= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
-+CFLAGS=-Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
-+CPPFLAGS=-m32
-+ASFLAGS=-32
- 
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-       config.o linuxbios.o memsize.o pci.o controller.o random.o spd.o \
-@@ -47,10 +46,10 @@ memtest.bin: memtest_shared.bin bootsect
- 	memtest_shared.bin -o memtest.bin
- 
- reloc.o: reloc.c
--	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
-+	$(CC) -c $(CFLAGS) -fno-strict-aliasing -fno-stack-protector reloc.c
- 
- test.o: test.c
--	$(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding test.c
-+	$(CC) -c -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -fno-pie test.c
- 
- clean:
- 	rm -f *.o *.s *.iso memtest.bin memtest memtest_shared memtest_shared.bin
diff --git a/sys-apps/miller/Manifest b/sys-apps/miller/Manifest
index 05a79a3330f9..a20a35ae0af8 100644
--- a/sys-apps/miller/Manifest
+++ b/sys-apps/miller/Manifest
@@ -1,3 +1,3 @@
 DIST miller-5.3.0.tar.gz 4940072 BLAKE2B 2e34ae010d409877040a60b08dd615f32e6945ca3bf97c078c89b9d2811067fa4bca2403f8ad239f8245e050acb10305d351b1db4177541a4fa9ed9a4bc1396c SHA512 4c557d97eb1cda2e52093fa097677602491895dea3093776a03af56114022b8c0917df9fbf26071d4d1a3c1360f520c82e33b32635c7b4207fa62869ab564712
-EBUILD miller-5.3.0.ebuild 1016 BLAKE2B fbbfdfc552c7f119da4681db84efceaaefe13f56a4976e496e5667329da23ff9bb3ccd57af8a64446293dc522d270832978ee821c95bd36c88b05cc2dd227792 SHA512 34eba5b23e58d594551bb3c3f88875be5ab925ac5c19f6f5e72085d461bfcb40d5c13a4a76ab27cc4cde4b28a85904405da3ecd8ed08f983a369dc69b6ce1657
+EBUILD miller-5.3.0.ebuild 1043 BLAKE2B bd9aba828d1e446d70ef561f9930eecf7ffb02030c03d03c779122d7e0d6362f8ddb7bde63a609b253aa5be45fd384c81ad272279e5835cb2ed573422b83faba SHA512 28594f3915eaa1e7bf01405db64a14551d476eae0ece718bf5c7c1ec36a78cddc037c04ceb500a599ab69a6bb4b2ab109e9720e6a1e31a7a216637a823764be2
 MISC metadata.xml 245 BLAKE2B 183034a40812aee01ddfd5d59eac1d2d1d42d281575fd5a3c900bd96af21cad81f9262b41f81c39f34dc60078ffa3db70149f8d50ecb09cb6003ed8602ab3ecd SHA512 b7b2cb8f6f35a36afa6a90e1d66747c2bc3e26a202483ec1d5c32346e75a738ee59be158af291a18c55140486d519c159492d12e3d25134ec20cc03fd7627cad
diff --git a/sys-apps/miller/miller-5.3.0.ebuild b/sys-apps/miller/miller-5.3.0.ebuild
index 863789ce5ce6..1412928d0805 100644
--- a/sys-apps/miller/miller-5.3.0.ebuild
+++ b/sys-apps/miller/miller-5.3.0.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="sys-devel/flex"
 
diff --git a/sys-apps/minijail/Manifest b/sys-apps/minijail/Manifest
index 24f6e85e6c6e..c6a03c01f9ad 100644
--- a/sys-apps/minijail/Manifest
+++ b/sys-apps/minijail/Manifest
@@ -1,4 +1,4 @@
 AUX minijail-9-makefile.patch 1589 BLAKE2B d2b253f769e79c179fce51b858ce9b7b70dec806e7f3f330928e5befc7a6fc12e4a09e5fca0e29404badbab2f389bb4c9385d0ecc555610d3b45df272c5d34e1 SHA512 38a3afe8c17f591e8172ad6725f04d5a898ee3ec3a97ee99c6118c1c12189061906a442b95243e7907031c194f0477c3bdbc6d96df4923b43487f60ededa403b
 DIST minijail-9.tar.gz 118700 BLAKE2B 7d2959d5dd71bd9d8d8a0b7c278dab66771740f73acec20f19502da33990ca858796b4734676ffedc404cef72eee8c419c669ba7092ac00cbafa2e410564aba2 SHA512 6d05fbe8615f410e8314045d11f7a3638f563f3311f7d52b5a0c47cad8692d11b0a7db4fbb45141b56453a9beb0de7683d58e5298f0a27029aa017539bb48717
-EBUILD minijail-9.ebuild 1664 BLAKE2B bf24144705af04455679a028b4dc2f57ef9d5c3720957ee93ac29b88c547adde9bf057ec87c53c0bb3ffdb02d6464e65985a7f125c8e29d4d666f8453b7160f2 SHA512 39bd30383281af95df050e1585b74974a86891bbfe9e4d7204f4d00dcb138a8aae65f156070dc934227ccbb7276935a0277acd3310238eec694b3263e47bb6ff
+EBUILD minijail-9.ebuild 1691 BLAKE2B 09b11a3b5c8a898c8d4b76daaa79a70cd83fc64860349df50e03f4460170b772d94ac8c7f0e4cc5f9a4fbe1f4bb9f9be9e21e83a61e7ce94ca1a2626e87dc16d SHA512 c6a0292b154fe643628b82858ccd5e6e3ebb1d82fa3744d2463286d78b15fd249e678d941031c404d7158286dab3c141d6775c4018fb87835358e0c612a7eddb
 MISC metadata.xml 301 BLAKE2B d5f9282d8aabde609103f044f2d3716395795229a7651e0c0f34df9c3995593633cf13d515fddda390096403bd1f52ca286a9c6f8fe287fb5af575b333b2146d SHA512 e88cdf0fc48e93ef15d4048015fde4939955cc48a437c9cc4f8f5053e3af4524206ee4ee3b11067fce6f0defc511484b1ba2b4afde82c9684d9df4e4750b9599
diff --git a/sys-apps/minijail/minijail-9.ebuild b/sys-apps/minijail/minijail-9.ebuild
index 3daec8d2d3b5..a11b63da62ab 100644
--- a/sys-apps/minijail/minijail-9.ebuild
+++ b/sys-apps/minijail/minijail-9.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+seccomp test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="sys-libs/libcap-ng:="
 DEPEND="${RDEPEND}
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index f0489b5130e2..f30cf2a821a7 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -3,5 +3,5 @@ DIST moreutils-0.62.tar.gz 93711 BLAKE2B b8d8cf7c83c3a9fc6a3fb1677954520dcc884ba
 DIST moreutils_0.63.orig.tar.xz 80468 BLAKE2B 39efa522c5bf9b982b70c1180f622a7d5a489cabbeb741f2a1a0674dfe9907ef85bccccf9f9cc4ae8d3c81442b1513f0692c070b4c00f052135528dc0e47eb6f SHA512 71bd5ec4d265dff708db372189146acb067c4edaf62888755d245ccb3f4b5bb54f6c31bda68991f78c27ab231de8ea7126f947834f3604b60d7142d0357cb66b
 EBUILD moreutils-0.61.ebuild 1478 BLAKE2B 92147d9ede5c7b0aabf8e33c132432a240a093e0a9eab2df89e51f34da0f6409885239c4663b9acac2536d21c2cfb994bafc80b0370f3265dfd7836f09125648 SHA512 2837b8041fa09763834a3ac0698bd6a16d246e9d58e1bc7957e2a527f85f0cfed145df81838c3e5f5f90521ac2e84acaeaa4b599befadac86e435cbc23d871a9
 EBUILD moreutils-0.62.ebuild 1511 BLAKE2B a978a0b7539b353d9f5f8e015a884a92b91c79a296f74cb757599ebabc651e225c37a85c985f36f76f50f5d1a9713c1377a8c16566ef7b3f215e68b5530418ad SHA512 984edea18c99ca61c8e621c6f1e55a54fe9ed247d16dbe63cc16056a807f78c419b0ead508b70117e2b150ca058577d857f7dd8aeaaac00acb4bcb9086038660
-EBUILD moreutils-0.63.ebuild 1448 BLAKE2B c88b1a5a7f2ebada0cd3b420984e2245673a0cf4c4ca70e10ac7c7468267e585422e3da834367fa4f82487343b5acd1239e68bdc22aa52911f9087a0eb4392a1 SHA512 8e8c2a2ff905e4bc83f23e9b182e67e07ecb8e8db6fe1b7c076bd600a00847e8ec7da8358a0bcb3194b38109a15ad4db718362a45a7fe9b20743a17ef41f209e
+EBUILD moreutils-0.63.ebuild 1446 BLAKE2B 5f30e43ea111686b13e95274432781855407aa0f8ec89d9ad628110a2d274901d29571f22f75212b717d0ac01e4d5ff3e8340edee87d2d0487742651b5f55761 SHA512 d23bb38c207477ef572576c85ec285f4eb67d8b89ff004dba2786a9da4328fe289064e8268945e7706ce549d0c2e4b0ce6e41dbcfaaedbd600fe806385c04038
 MISC metadata.xml 237 BLAKE2B ceac7f98433ef3d26c4e5c452f2c41f30625ed0209982872213cc4917ad45d1dc64077b5adbc7e2aa14a86feb86a218a64d5f4d1829534b452516ffea6d6fe48 SHA512 38f6b51bed4a582dfe6137eabd3929e59232bfc626f6661cf936b7d00959d75591cb77ac900e1ad1d20c9a13097a2c08e39442cf5e6201dccfd2cfcfb5d989f7
diff --git a/sys-apps/moreutils/moreutils-0.63.ebuild b/sys-apps/moreutils/moreutils-0.63.ebuild
index a52e8ef948fe..d0df8cd6e4ec 100644
--- a/sys-apps/moreutils/moreutils-0.63.ebuild
+++ b/sys-apps/moreutils/moreutils-0.63.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 x86 ~x86-linux"
 IUSE="+doc +perl"
 
 RDEPEND="
diff --git a/sys-apps/onerng/Manifest b/sys-apps/onerng/Manifest
index 59f88890cfc2..04482c038b72 100644
--- a/sys-apps/onerng/Manifest
+++ b/sys-apps/onerng/Manifest
@@ -1,3 +1,3 @@
 DIST onerng-3.6.tar.gz 108126 BLAKE2B 717fc2b795aa991fdca28e2032da0a7729c487cb684361799421f806f60ae4cb70e8d29cd72de2eec9bdf38e4bf1d530261fc19bfbee6e95360a7648b8a45858 SHA512 d2f2bceb458e1441c4321526e5477ecb26df9f84e8554df723b97c3f09ad4c04149ac844bb88a182abf5350566cd5762c35137ba3c6b71685671a69ba12ccc58
 EBUILD onerng-3.6-r2.ebuild 798 BLAKE2B 8ae98a9026fc1d4b6b0ffe78f82d8e92dde9c5a454f91151de70c6776b8527bd4ace89d2ecb48e1ecf63c2e34d1008fc595a376fb65c926a175dc2a065adf1ae SHA512 ceefdb8e3ab41994d57df626c11530ea373d50a343a1f61adb3551894217d76eee48b01491685f1c63efdb5879d4ae6b8ab26ba9603bff28cdbee09d5e3b15d8
-MISC metadata.xml 834 BLAKE2B 8aba260b830ee41c11c1e843ecfd3130768366ab46a89b838b8c846c48699e0e570d99005d775d8560f4de179a4cf6ef0833294ae1699faabb550a1c0862585c SHA512 8fe1f05b03c98ee95f3fd6d81cb52165d96a6a8385b9c988a667f9b0f714875bb3bc291706ee5e53daf022c2cbd4d16f52bf4e7abfafa94d9cd0481ebb58fc1d
+MISC metadata.xml 715 BLAKE2B 2d4b842c0ea11b2633764e385898ce8df514a289b482c5e528b962ce00d97289abbd666acc367b1f170f95b785409712950b44b284a550fc796a3017fdbd10a9 SHA512 4f004de8fd56338d850d2fbcb4c8bd94f695f55b2c16eff687f1985a22f86094b4f01f63599029f52d0056a8e6f214f7f0396413093ea8cd01970be29d0092ee
diff --git a/sys-apps/onerng/metadata.xml b/sys-apps/onerng/metadata.xml
index 15d83cebdc64..31129996a1e9 100644
--- a/sys-apps/onerng/metadata.xml
+++ b/sys-apps/onerng/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		OneRNG is an entropy source / hardware random number generator (HWRNG),
 		designed to be connected via USB to your computer. Entropy is collected
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 9aa50db8c5d5..af2bff7b4e18 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -4,5 +4,5 @@ DIST openrc-0.41.2.tar.gz 245302 BLAKE2B ab80dc4f3a7c2c464fe64cdfa7fd31363d5a9d2
 DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646
 EBUILD openrc-0.41.2.ebuild 5249 BLAKE2B 324f3a9e2a9753a79dc547f7615478d05f8500582638646b5ca71b235fbbdec4b54adf20a1e9ffd07ec572e1880f7d5854d35503172325a4817b2b070a60c70e SHA512 296a87cf7bf0476f51b1a2410ff1e69f9275b2d3e319a268e211cc2e3d96e8e58fbfda47c203d8cb5d46cc4ac4dcdc4b2a39193dc299ef4a9478319b1d32489f
 EBUILD openrc-0.42.1.ebuild 5362 BLAKE2B f54e7d19eb62bc7326dafd03c6beba37ef00c9a0a9e78b5735e5b08694b3c7da0eb6a9eb17f2825976f0ff12904ead87744e96489ea398d74b100e0cd393899b SHA512 c573bc86ded84c6ff4f4349663b4dee73689a496ab35ca81518bc83be162d10087d790c114e992ce975a5bc19e76d3d7e8a78e0db1c44868a60d8cec6d70ec3e
-EBUILD openrc-9999.ebuild 5362 BLAKE2B f54e7d19eb62bc7326dafd03c6beba37ef00c9a0a9e78b5735e5b08694b3c7da0eb6a9eb17f2825976f0ff12904ead87744e96489ea398d74b100e0cd393899b SHA512 c573bc86ded84c6ff4f4349663b4dee73689a496ab35ca81518bc83be162d10087d790c114e992ce975a5bc19e76d3d7e8a78e0db1c44868a60d8cec6d70ec3e
+EBUILD openrc-9999.ebuild 5025 BLAKE2B 1d41d1b9f89a5d84a80728f01be9f18b7506fd008bc00e096f9c70493434796429b8360e94532ec8adc99b3f7ca6016bb63f7fdbb25ceda95cd7e6a94113dc0f SHA512 74c80635d4760fc100065e64c826650d8047133ed92f9748e2dcebe4224d8cd1947d1b22739c50fde56bd0236aeef7aaeeefb31222605c170c435edf6d3aa8f1
 MISC metadata.xml 706 BLAKE2B 1d6a4937d577fff7db7fd64617328ca49faccaa61749adabc411a215960ee06c1af32499be697921012eee34f5c680295e46f545099f06393965a17c0d0d034d SHA512 d5d669cdcf8707689c855cab678031c6e9b1e33e4b931c7d80bbe2ad442aedabef718018466f0cb15bd8a329292a0de844935f9332611f3fb334b57d14aa39c1
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 3e6f63ea18b9..b8f8498162b4 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic pam toolchain-funcs usr-ldscript
+inherit flag-o-matic pam toolchain-funcs
 
 DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
 HOMEPAGE="https://github.com/openrc/openrc/"
@@ -18,8 +18,8 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux static-libs
-	sysv-utils unicode"
+IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux sysv-utils
+	unicode"
 
 COMMON_DEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
@@ -76,7 +76,7 @@ src_compile() {
 		MKSYSVINIT=$(usex sysv-utils)
 		MKAUDIT=$(usex audit)
 		MKPAM=$(usev pam)
-		MKSTATICLIBS=$(usex static-libs)
+		MKSTATICLIBS=no
 		MKZSHCOMP=yes
 		SH=$(usex bash /bin/bash /bin/sh)"
 
@@ -108,14 +108,6 @@ set_config_yes_no() {
 src_install() {
 	emake ${MAKE_ARGS} DESTDIR="${D}" install
 
-	# move the shared libs back to /usr so ldscript can install
-	# more of a minimal set of files
-	# disabled for now due to #270646
-	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-	#gen_usr_ldscript -a einfo rc
-	gen_usr_ldscript libeinfo.so
-	gen_usr_ldscript librc.so
-
 	keepdir /lib/rc/tmp
 
 	# Setup unicode defaults for silly unicode users
diff --git a/sys-apps/osinfo-db-tools/Manifest b/sys-apps/osinfo-db-tools/Manifest
index 653015d273fa..bdfee28bdc54 100644
--- a/sys-apps/osinfo-db-tools/Manifest
+++ b/sys-apps/osinfo-db-tools/Manifest
@@ -3,5 +3,5 @@ DIST osinfo-db-tools-1.3.0.tar.gz 456012 BLAKE2B 5c29581f4947caf4ee06f435891ccca
 DIST osinfo-db-tools-1.4.0.tar.gz 519089 BLAKE2B 2c2e0cdbcd0a795f8deb09727b8b971748f5d0ecc08449238d3054cbd947a0f6059456d4e9feadded47cd0e0aaa87132f1bec7524a3183115dd459eca989d1b0 SHA512 f4813f948551f630cc9936986abc3ef4455647ec529b353dc4fee71f8071beeebac0a2ee1988cede92ea3635bca9bedd400ac9f275e3f5592ff50236d97cfb91
 EBUILD osinfo-db-tools-1.2.0.ebuild 837 BLAKE2B b6ef18efa3f75872bc3ce03e134b3b2e37cf8192bff0fb2cc8e14bc51033a7917233acfe87c9029dd151ef70b5ffca6501ce703feb369601dfe45d780d8442c0 SHA512 8ed562896a204d14fd3d421ec64ac75ca5617f53b1b35f1e99cd18da86eb232fe108bdfe99d4adac99fcb2b954f8ccce4c2a3a784b71877514bedc42ea1b8fa2
 EBUILD osinfo-db-tools-1.3.0.ebuild 856 BLAKE2B f88cce749dcb0a174a2ccb44bccf87288c8d1312355cad4cf966fb0222a7a66fa4deea2182a650050a41f30883420ae72f6e36441c5eaff800763dc8e7fa6aa6 SHA512 6564edefd5f04a60a1c2cd4e1684117155c271843bd1c0e002cebe636cf8a004eb9bdc1cb3cc156989dfe482b0d5c1970f3efa807ddc10734c8f2f923b03cd94
-EBUILD osinfo-db-tools-1.4.0.ebuild 859 BLAKE2B f10102e3647b3886a5f38bb0c93e2039f708d362911a1895b6f7053ffb262bf6b19deaac7c8896bc2425b488f758b6e5e67f8a38723307aa244c81ee7b5731ee SHA512 347a9ba28c4749a5e8f2d6038edcd305ae8a5065d9ee5ac0641cc6de0c761aaed60769292be401979f3bbb4f4f8d3a2677238f81e0c701c7d099b2b80996b6e7
+EBUILD osinfo-db-tools-1.4.0.ebuild 856 BLAKE2B 038ba8148b42ea03985e3f898b791876a87b30080f369f228d61d74f65a0f013bc2c9b321f2b12357c2a4d4140a6aa11270019d1f9bdb3ec892dd62732a774ec SHA512 17aacd592fd949ffec601cf416b3f07fcc3562b6cb1ad5562cefa94b861959364f72da470133defe109c4aaca3f0dd497479339511933affb9ccd3ecb201e6fa
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.4.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.4.0.ebuild
index 12671de923d1..212f158f0ea5 100644
--- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.4.0.ebuild
+++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # Blocker on old libosinfo as osinfo-db-validate was part of it before
 RDEPEND="
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index f143b02e8ae2..8582f3e31292 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -3,5 +3,5 @@ DIST osinfo-db-20190304.tar.xz 83024 BLAKE2B a0ad9a24f7dd07dc672b2106bf9f767456b
 DIST osinfo-db-20190319.tar.xz 85668 BLAKE2B 9e1d95379c659dc325a0fa5d7d8e6abc6c486839cbf42d78e0964583f19258f2e6669e685bc09cd13f17ecd04cc3d1cf3188d862d12d2825636a76d9d2999b8f SHA512 fb06adeaf639e71b02bec30dafbc405e903d490cd8038d4fe94de63c4d0bb9f617a469e59d11fd4dfc5c1c0d9a6094b888ce5867634c0cbe501e5195316a8e75
 EBUILD osinfo-db-20190218.ebuild 668 BLAKE2B 0e4e429414a0a894b5dacf340fd5ce5be4dd7aa60d86c6c1508f7b60af03535831b9b8c55ff470f8ddaad5526425a5d805cc4fa17db2fd5aa880a73c9809e8c5 SHA512 b2ef8af5554474858ace472c8e7230cac8bf77efc45c6ecae37642eb719e3d5bcaeff6a52580bfd8d840c288e38455242ea8ea756cb6eb7eaf68c6521cd4618f
 EBUILD osinfo-db-20190304.ebuild 671 BLAKE2B a50dd6a39f6f582e400ec534a0d8d28f60d850131dde1787b356059a7a8c95530d70fc77c8336ef6da24c6888ad4054574a2a661bb045f6d8a3936a5fef0a957 SHA512 222ea69587a39969f785e84cb346f6e4db2c73f09867b5d10f0b142997ad1ebdd38e88c3154a06476fbaa758589a720039cc036cd865e1e0abe80db3f6a2f1bc
-EBUILD osinfo-db-20190319.ebuild 671 BLAKE2B a50dd6a39f6f582e400ec534a0d8d28f60d850131dde1787b356059a7a8c95530d70fc77c8336ef6da24c6888ad4054574a2a661bb045f6d8a3936a5fef0a957 SHA512 222ea69587a39969f785e84cb346f6e4db2c73f09867b5d10f0b142997ad1ebdd38e88c3154a06476fbaa758589a720039cc036cd865e1e0abe80db3f6a2f1bc
+EBUILD osinfo-db-20190319.ebuild 668 BLAKE2B 0e4e429414a0a894b5dacf340fd5ce5be4dd7aa60d86c6c1508f7b60af03535831b9b8c55ff470f8ddaad5526425a5d805cc4fa17db2fd5aa880a73c9809e8c5 SHA512 b2ef8af5554474858ace472c8e7230cac8bf77efc45c6ecae37642eb719e3d5bcaeff6a52580bfd8d840c288e38455242ea8ea756cb6eb7eaf68c6521cd4618f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20190319.ebuild b/sys-apps/osinfo-db/osinfo-db-20190319.ebuild
index 063c9afbf192..e74d64604535 100644
--- a/sys-apps/osinfo-db/osinfo-db-20190319.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20190319.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-apps/pcsc-tools/Manifest b/sys-apps/pcsc-tools/Manifest
index 4c2675ec9615..36641b533c63 100644
--- a/sys-apps/pcsc-tools/Manifest
+++ b/sys-apps/pcsc-tools/Manifest
@@ -1,4 +1,4 @@
 AUX smartcard.cron 319 BLAKE2B fac8c4360b802de32ff5b0fc5c2ef41aacc28186001ee6f4f3a1cd878ed75cae3f7f78aaad58580d11a695b3fd624fdd412669c743b951818de1aef6d9d4cdf0 SHA512 cb34e75090ff0fde349b81867383ed776b4c89672039f42426e27d2fce77ba0575827d2627b82fc9c435d6091b26e7c2a0e51dbcd1bdd1c883b8c37000ed516e
 DIST pcsc-tools-1.5.3.tar.bz2 267564 BLAKE2B b060e6fc923c6274d38c364325c367f793acf2979f2410c92857cce7483ebbb59db07657bc27be6d5a799f7f85da45782c4f1a9bbf7c450b43d533dce54755e7 SHA512 da5b362b7a3a6d47dd309ff217e6dd8af29298501db5e898ecd68762020ce62fc982132205f9bbee159a7d7eac549fdb8f25395416bb52bc0d0c888a5b0fa1a0
-EBUILD pcsc-tools-1.5.3.ebuild 1430 BLAKE2B 4899052408ba0a6b6a4939b849844b7b45cf49d6a44ddae49132992697d3d09bbcbf7cf54755127c6c2ed9dce3083a56ae069a6f59305d525a634c1e1691f210 SHA512 b1c64b74ce15c4ec044ddafcd673d26a43dcfe79df549b59306317e34b96ddc936321105c3821635cfb232daf99ae73f1d51556dd6607cd72689e3615d91d057
+EBUILD pcsc-tools-1.5.3.ebuild 1336 BLAKE2B fe07dace5b90ceb41a558c203ca11c05b17170dd439980bf8def4a4a243eacc00df56ea8a1dae0538175d240adbfe65b09581c7531aab9e25993e717aef73350 SHA512 d1b36fc8b0a79ce95f0854beb7dd1e0354ae5e30010d7dafe12a9d657d1480028bae6864b4390a54a70c9dd4c26c072e3ca3f531fd903e955d29b0a1b52d716a
 MISC metadata.xml 470 BLAKE2B b07602c76c26d4dd8468930997a52e1768a1e45aa5294a7e27995c9129f700b658a2b8afd5b73829b21620e6349cc04505a54c37166d2078a1ed250f172c2bcb SHA512 bd45fbe04b4a3e8b1501d3807f879dc1982288a10d4d209d01690e2ad1a2fbb8a475721961835717a2925e127e26135639bf6bb1f35e147595f9e8e619481079
diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.5.3.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.5.3.ebuild
index 9bbbd54dd2a9..490d6c2f740d 100644
--- a/sys-apps/pcsc-tools/pcsc-tools-1.5.3.ebuild
+++ b/sys-apps/pcsc-tools/pcsc-tools-1.5.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils fdo-mime multilib toolchain-funcs
+inherit desktop toolchain-funcs xdg-utils
 
 DESCRIPTION="PC/SC Architecture smartcard tools"
 HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/"
@@ -24,11 +24,6 @@ DOCS=(
 	README Changelog
 )
 
-src_prepare() {
-	default
-	sed -i -e 's:-Wall -O2:$(CFLAGS):g' Makefile
-}
-
 src_compile() {
 	# explicitly only build the pcsc_scan application, or the man
 	# pages will be gzipped first, and then unpacked.
@@ -59,9 +54,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	use gtk && fdo-mime_desktop_database_update
+	use gtk && xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 0d674141bea5..f4426f676299 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,8 +1,6 @@
-DIST pkgcore-0.10.6.tar.gz 645141 BLAKE2B 16723dfae157c809e53f8607bd72ee178ac23280c1eea2f73af4864521aa4c5d7026972e85ab0ca92d3d714819ee24e86a3154ed2ed7f5d619ac7863b58c3436 SHA512 c5221cc7a72f5c3ae76ad1ce59a6b46f8b066991df9766f59b08d8514b6bb5336d8bef217c343d97ff764eb7b3614197f7613d5dfac52360603298dc06f6d7ea
 DIST pkgcore-0.10.7.tar.gz 645474 BLAKE2B 3c311967cd2b4e29a45fbf4f2af9207c20f2401780fc3991c726917d103d6e59e951172280c212c7dd46db33defbfd6aad1a55da4d02484b8963ab8049b86c6a SHA512 91910c9b7ec02396e1e0ff2a23a18757749fea635e3e294131d736eeee8d67bd58e9b5f1de7440e50d926291dd3ed36dc7381a29f7ac9b58c27cf4f3fc49ee45
-DIST pkgcore-0.9.7.tar.gz 592202 BLAKE2B fa16380e89ad2fb2a05d8f08387c3cfa2203b4e6faad3fc4758d572eb08d6c64f781eef8c2d56151f1facec3a202325d4c4a271a1a3ced88df7371f2af75dbf3 SHA512 cb996fd35a8e4e73acfacf1942d498932ec092a282397bd41df72eea26b6d08c15e01b96ece8ebb6876e84281d85d4f8ef81e1f2ef107adff1b984ee592d6a6f
-EBUILD pkgcore-0.10.6.ebuild 1422 BLAKE2B 94c02312eca2b999086c8a7e2ed8cf043999e7d85b663f809f93769545205ee29bfca48f21065612ab9f2b37d3aace43654cbd7ffd742a9cc6493a0b247e0801 SHA512 d107b6261344fee23f37f4fc2ca1ab7c552b0d587edc64e679a564d9b1f8c3e9beecd6ac0a9d71e488dfdc0c3d34f362a215c6d03d0df4e442ae2c70ca06fcbb
+DIST pkgcore-0.10.8.tar.gz 643637 BLAKE2B 191f0c0bfcc0eb6b684001ba4c06393f6010ad2171b0be695c1aceeae3973717c7bc59bb5848d85797508fdbac5645cac228df7d6b9bc9aebcc98ca69243e533 SHA512 607b921b05c833a0c199abbfc4a4afe282935dc6e67904f9cc0588bdd4b2e872c1cffa5ebf0e6aad04912b362c67dc2b29794c3be5410dd019797b447a0ed3d5
 EBUILD pkgcore-0.10.7.ebuild 1422 BLAKE2B 94c02312eca2b999086c8a7e2ed8cf043999e7d85b663f809f93769545205ee29bfca48f21065612ab9f2b37d3aace43654cbd7ffd742a9cc6493a0b247e0801 SHA512 d107b6261344fee23f37f4fc2ca1ab7c552b0d587edc64e679a564d9b1f8c3e9beecd6ac0a9d71e488dfdc0c3d34f362a215c6d03d0df4e442ae2c70ca06fcbb
-EBUILD pkgcore-0.9.7.ebuild 1490 BLAKE2B 867dacbb663e06ddfc7595da418bf5b71a5481972317496a9c93ca00ebee64233abec8790304c1b10097ba6b2444fc01f1713803b09940608cd1b4535ccfeac5 SHA512 362e413b8ea9d0bcefdfeeb66272ce9e922a2461ac158977634c33a9b9fb672b6ac6741223feb43c82ba393dc8b8274a7825781c4f3a8790b6f1da7dd75731e7
-EBUILD pkgcore-9999.ebuild 1422 BLAKE2B 94c02312eca2b999086c8a7e2ed8cf043999e7d85b663f809f93769545205ee29bfca48f21065612ab9f2b37d3aace43654cbd7ffd742a9cc6493a0b247e0801 SHA512 d107b6261344fee23f37f4fc2ca1ab7c552b0d587edc64e679a564d9b1f8c3e9beecd6ac0a9d71e488dfdc0c3d34f362a215c6d03d0df4e442ae2c70ca06fcbb
+EBUILD pkgcore-0.10.8.ebuild 1765 BLAKE2B 9267ff91ad85183fcf1995ac992274fa973e5af3e4d1ab0a5ca23cabb75d46961077efc681e04608e906a6d4347f21d1bd8033c7735875cb4d95dd92ae79bf04 SHA512 fc19ae2dcd82b8bce61deec015d30ee1f1e568c0904da57563cde371d507b68271093e118205ccd2e3264b0038325013074cc24a1aa3b38d113d214eb2df5313
+EBUILD pkgcore-9999.ebuild 1072 BLAKE2B f814ecdc97009cdeb305f0cbeb8e4e2103bc4be665c8af78831fc765a3c2c36a8ac48ae2c0e26b4d3779df1191fde759e6f02f79dc7f180fca150eb530c6f5a6 SHA512 60586c9c8c6cd46eb47ba294fcc501dbdcbab67cf70c6debdf0420eaccfff6d59c6cbbd53c9246f54163b02c94d910523b5763de32f5a3d46d415cc6e326064c
 MISC metadata.xml 409 BLAKE2B 42709aa3a13109a21d1cfa0db9ef758216a2e902d68a10f0db14b4019464a702ef0c91079d0856f9389a2221886bbd3d5d5480ca99efc708543d198d00b7ed3e SHA512 ec04202f105a62a697511c7a89dad118b3618fdce4044c25648492e1557a95b9e29c01a08fca21e106273485471af98c52a6db6b2a40605a67a632938faebd29
diff --git a/sys-apps/pkgcore/pkgcore-0.10.6.ebuild b/sys-apps/pkgcore/pkgcore-0.10.8.ebuild
index 670df92a2cf7..7351db9305d0 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.6.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
@@ -26,19 +26,33 @@ RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.8.3[${PYTHON_USEDEP}]"
+	RDEPEND+=" >=dev-python/snakeoil-0.8.4[${PYTHON_USEDEP}]"
 fi
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	doc? ( $(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/snakeoil[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	!doc? (
+		$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+	)
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
+python_check_deps() {
+	has_version "dev-python/setuptools[${PYTHON_USEDEP}]" || return 1
+	has_version "dev-python/snakeoil[${PYTHON_USEDEP}]" || return 1
+	if use doc; then
+		has_version "dev-python/docutils[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+	fi
+}
+
 python_compile_all() {
-	local esetup_args=( $(usex doc "--enable-html-docs" "") )
-	# only build man pages for live ebuilds if doc USE flag is enabled
-	[[ ${PV} == *9999 ]] && esetup_args+=( $(usex doc "--enable-man-pages" "") )
-	esetup.py build "${esetup_args[@]}"
+	use doc && esetup.py build_docs
 }
 
 python_test() {
@@ -46,6 +60,7 @@ python_test() {
 }
 
 python_install_all() {
+	local DOCS=( AUTHORS NEWS.rst )
 	esetup.py install_docs \
 		--docdir="${ED%/}/usr/share/doc/${PF}" \
 		--mandir="${ED%/}/usr/share/man"
diff --git a/sys-apps/pkgcore/pkgcore-0.9.7.ebuild b/sys-apps/pkgcore/pkgcore-0.9.7.ebuild
deleted file mode 100644
index d48195c029f8..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.9.7.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-IUSE="doc test"
-
-if [[ ${PV} == *9999 ]] ; then
-	SPHINX="dev-python/sphinx[${PYTHON_USEDEP}]"
-else
-	SPHINX="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-fi
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="=dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND=">=dev-python/snakeoil-0.7.3[${PYTHON_USEDEP}]"
-fi
-DEPEND="${RDEPEND}
-	${SPHINX}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )
-"
-
-pkg_setup() {
-	# disable snakeoil 2to3 caching...
-	unset PY2TO3_CACHEDIR
-}
-
-python_compile_all() {
-	esetup.py build_man $(usex doc "build_docs" "")
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install install_man \
-		$(usex doc "install_docs --path="${ED%/}"/usr/share/doc/${PF}/html" "")
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	python_foreach_impl pplugincache
-}
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 670df92a2cf7..09021519bb70 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
@@ -19,35 +19,26 @@ HOMEPAGE="https://github.com/pkgcore/pkgcore"
 
 LICENSE="BSD MIT"
 SLOT="0"
-IUSE="doc test"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.8.3[${PYTHON_USEDEP}]"
+	RDEPEND+=" >=dev-python/snakeoil-0.8.4[${PYTHON_USEDEP}]"
 fi
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
-python_compile_all() {
-	local esetup_args=( $(usex doc "--enable-html-docs" "") )
-	# only build man pages for live ebuilds if doc USE flag is enabled
-	[[ ${PV} == *9999 ]] && esetup_args+=( $(usex doc "--enable-man-pages" "") )
-	esetup.py build "${esetup_args[@]}"
-}
-
 python_test() {
 	esetup.py test
 }
 
 python_install_all() {
-	esetup.py install_docs \
-		--docdir="${ED%/}/usr/share/doc/${PF}" \
-		--mandir="${ED%/}/usr/share/man"
+	local DOCS=( AUTHORS NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
 	distutils-r1_python_install_all
 }
diff --git a/sys-apps/pnputils/Manifest b/sys-apps/pnputils/Manifest
new file mode 100644
index 000000000000..ccfd31f9addd
--- /dev/null
+++ b/sys-apps/pnputils/Manifest
@@ -0,0 +1,4 @@
+AUX pnputils-0.1-makefile.patch 836 BLAKE2B 4ad883a208c9799ef94b238aa8ec3e0fbecf92a99a73ee413a9ef56a8e131262c8c4125c141974afe22914955152294ca6dbd0acca87246612e04916e0a19411 SHA512 5833c8a35244784fc30a55b4ba53da463222576ba3cc9c15accf25ec0850544d5a863252fc9718ca832550708237f0f7edaf94a278f17c7f04728b24a6c9b9df
+DIST pnputils_0.1.orig.tar.gz 16991 BLAKE2B 699e55dd62e90ef0f5dde40f34c60d1b0d2e47c0cfdd06a82dcb739fd952181a74e7ec5fb90afe2bf91f5c997e9cb6dc7da2c4a1454f9f858e5d28ba324ab1d0 SHA512 0f3b612f29b6c6c79221d9f5e27163dc7766159eeb16c2e1b494305cc4c6c50e9c12cee7c1be9bf12642c9adc568b622822b34d9f5f6a421d2b8f6f784fa62ba
+EBUILD pnputils-0.1.ebuild 526 BLAKE2B 16cd83ab677482450979f7b57d453bfb09a4e8406f962f4209c300ba36c4979c722c2dac198644c6fe879ccee1a5a13c25fc68bdaa3fc611bee65bbdc1f0b80d SHA512 51658aefd122e7dec8dd993e026b0fae3d2d17e1c2c0d8efe13138d74a848cd52ee6094cd20fa1d3455d47b14207a42332e4f12183b8d4400567ea67fd708389
+MISC metadata.xml 461 BLAKE2B 518f40b53b66ab4ca7d3b4b25530e7f6b59aaf3d6b4f70ba5ef622685b42d9145cd0f4a5a29b669a1c72c9257180a207973bcfdd5da9a3b1c8a0ffdfcda08aeb SHA512 d3f31b9ad193ab5cfbf59e6de58c4e60deac59e824e86c92c5fc5fc3d71a1a6086a6af7cfad8e1f243d625f37e4034fd255bdb2b71281b4fba05631c5d033479
diff --git a/sys-apps/pnputils/files/pnputils-0.1-makefile.patch b/sys-apps/pnputils/files/pnputils-0.1-makefile.patch
new file mode 100644
index 000000000000..2b158908b5b9
--- /dev/null
+++ b/sys-apps/pnputils/files/pnputils-0.1-makefile.patch
@@ -0,0 +1,24 @@
+--- a/Makefile	2006-07-07 00:54:10.000000000 +0200
++++ b/Makefile	2018-10-27 02:19:51.000000000 +0200
+@@ -1,4 +1,4 @@
+-CFLAGS = -O2 -Wall -Wstrict-prototypes
++CFLAGS += -Wall -Wstrict-prototypes
+ 
+ VERSION=0.1
+ DATE="July 6, 2006"
+@@ -12,9 +12,12 @@
+ 	M=`echo $(DATE)`; sed <$< >$@ "s/@TODAY@/$$M/;s/@VERSION@/pnputils-$(VERSION)/;"
+ 
+ install: all
+-	install -m 755 lspnp setpnp /sbin
+-	install -m 644 lspnp.8 setpnp.8 /usr/share/man/man8
+-	install -m 644 pnp.ids /usr/share/misc
++	install -m 755 -d $(DESTDIR)/usr/sbin
++	install -m 755 lspnp setpnp $(DESTDIR)/usr/sbin
++	install -m 755 -d $(DESTDIR)/usr/share/man/man8
++	install -m 644 lspnp.8 setpnp.8 $(DESTDIR)/usr/share/man/man8
++	install -m 755 -d $(DESTDIR)/usr/share/misc
++	install -m 644 pnp.ids $(DESTDIR)/usr/share/misc
+ 
+ REL=pnputils-$(VERSION)
+ DISTTMP=/tmp/pnputils-dist
diff --git a/sys-apps/pnputils/metadata.xml b/sys-apps/pnputils/metadata.xml
new file mode 100644
index 000000000000..661b9770ac51
--- /dev/null
+++ b/sys-apps/pnputils/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		This package contains two tools for interacting with Plug and Play BIOSes:
+		lspnp - list PnP BIOS device nodes and resources
+		setpnp - modify PnP BIOS device resources
+	</longdescription>
+</pkgmetadata>
diff --git a/sys-apps/pnputils/pnputils-0.1.ebuild b/sys-apps/pnputils/pnputils-0.1.ebuild
new file mode 100644
index 000000000000..23a40d5a8fa6
--- /dev/null
+++ b/sys-apps/pnputils/pnputils-0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Plug and Play BIOS utilities"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://archive.debian.org/debian/pool/main/p/${PN}/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
+
+src_compile() {
+	emake CC="$(tc-getCC)" all
+}
+
+src_install () {
+	emake DESTDIR="${ED}" install
+	einstalldocs
+}
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 69d5fe8a1e59..3ec2863a3302 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,8 +1,8 @@
 AUX policycoreutils-2.7-0001-newrole-not-suid.patch 351 BLAKE2B 84a67799662e6df3aeefafeda3a70e011856313beb4ac28e37312e7a53219b0a2d224a4be650200b537a39a58858c443e2b3253c1ebab617aaa6acf95b7e68fc SHA512 41c37a0711011ebdaafee01b357438ac3219b34b6c9e6ebe182c863d61c899e4819ae71bd9adf4b52bee37750c99b5b1cd40c6a92f119899bd227251d37ccd99
-DIST policycoreutils-2.8.tar.gz 2796775 BLAKE2B 36115cc2faf72a4b647312f8faaf4762d7f2fb56bf0531ccadeb46b100c9e577f3148fe6890925d3fed94ac22803dc61729781e54bd0ddeb1539ccce2ec2a29b SHA512 2b4a70836fd8727a16b8f8d4afcc39c9461ab6f5bc1ba5ce5833d41150da921ebb3c9bdbd1cfa7dd31fd382ba18b5433ca9b63bce58bd290db81fa9bedfe29f3
 DIST policycoreutils-2.9.tar.gz 2819360 BLAKE2B b0af912e3b4fb2c9598b10ce413c8ffb3f5972a4d5d59270cff40abe8d4e385e0664e24a4f533a95ad2d1657644f3368213f955ac63d9f8c46a661417b07c8b3 SHA512 d8356115671ba66de05f1c13193ab47fab69cc4d09603a92171ed40afafc084dd191591bf336b7d722de637378ad09622ebb6eca85c06063ca9ddd6db10e02a2
+DIST policycoreutils-3.0.tar.gz 2818089 BLAKE2B 6e4aa6d6eecf809efaefccbfa16c44050242d129f496594763aacbb9aaeca23d92b27d30a6f9ae0e49513adc0a1bd58499253eb9ffc003547387c04aa643b462 SHA512 d8d25db48c1caef69228e87d7ebb2c0f075e44e4ff6bf18a26af341d948b81375b33945128cd0410ffebc64ca478fd19a207295189c716c95e6a3c586e9f053d
 DIST policycoreutils-extra-1.36.tar.bz2 8830 BLAKE2B 6d98e41ea379d3e95221a6e53d8a8b144e4e15ca5581381e76a529dbbaca304d5587b30419797c8c70cbd7c2b2588e5ecd62adcf97294e429950899c1c318346 SHA512 c6a18e6fb2d65f51dc55b88907f23241f2fbfc033d3d2888b109596d9ed31d509b2c93456727ea4d1f98544831afb15c449ff72d6aedf93b9e474b27817f7fb3
-EBUILD policycoreutils-2.8-r1.ebuild 4862 BLAKE2B dbff43351a9f28024e65116e37631d296aaa1e3fdbbb032db0037b6e61aa2072e1a572af8e58285d11b39cdef4fe0b6caf87269725512f9c367b246625bea26c SHA512 895260220b138d5c3ce16ade4cd7c16e8a27f435fdeeae84b83d2a4e2fe4015db78f7dcb69deac4b178bc7b4bb4bfe0370cfde763c9a10b26ca7ca7b63fe54ab
 EBUILD policycoreutils-2.9.ebuild 4845 BLAKE2B 1f8e54dcd6f27e41eefa74c6e1a49f5decb96a6c60188abd45723100cbc9aef819c1c18f7af128425b039cc3c75126f1625a940654ca4b1c8801d44fdc8f5f4e SHA512 49f7e7f03b004b303860831b80d89f1d6348a331f63ef564a15d21ef1ebf0fb1971a7f577649311c1216a223b618e16a002812f0adde340583d15f74951f7f7b
-EBUILD policycoreutils-9999.ebuild 4847 BLAKE2B 26adcb0b780d5fe63567dd844c3af85d8d675f99db4f30879adfb934f019a576e081d8f9028f815335c91c33aa8b69a04af3d01786d7632a00879294f2a541e4 SHA512 ceff596c71d37377a10bb351c48786774bef004305fc8f711c197f97c3c17037d2600d4a6abae30e3d97628e1467c9864b7f378179aa07575dbc00143aebcf80
+EBUILD policycoreutils-3.0.ebuild 4747 BLAKE2B a41a836f4ce4be833f9f17b0cf7c4b6f34044715ade2539051c1399f63c0deac1cf93b177b03db7c924bbf53b88a7aee19b471b421b6134c12503acf37db720d SHA512 39029289d4b1d76a64947bd0d164b13dd48e17da41086b3753de6d1483076ae8cce522fe22196bae14efc92647040f79f4c573fbe3b55196dee43ffedd56aa95
+EBUILD policycoreutils-9999.ebuild 4747 BLAKE2B a41a836f4ce4be833f9f17b0cf7c4b6f34044715ade2539051c1399f63c0deac1cf93b177b03db7c924bbf53b88a7aee19b471b421b6134c12503acf37db720d SHA512 39029289d4b1d76a64947bd0d164b13dd48e17da41086b3753de6d1483076ae8cce522fe22196bae14efc92647040f79f4c573fbe3b55196dee43ffedd56aa95
 MISC metadata.xml 1117 BLAKE2B 0ec558cea900ec5f25cef43a76a5c0436562ca9d43cfa23d9251ac4e8eb22f0154ca577f061f50762559be9b567faf5dd7ed994c59308ba140f2fe2b8a5d1ad0 SHA512 1f8703b31ced13b4e15311ecc9d4e03c085eb580e61394e8781744a9c33794e0f10144617415e69b703f5716ca5fd15ad6db14fe93a95c9b5d46c429542beac5
diff --git a/sys-apps/policycoreutils/policycoreutils-2.8-r1.ebuild b/sys-apps/policycoreutils/policycoreutils-3.0.ebuild
index e34dd69e7451..44d6a9a3dbe8 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.8-r1.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-3.0.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
 inherit multilib python-r1 toolchain-funcs bash-completion-r1
 
 MY_P="${P//_/-}"
 
-MY_RELEASEDATE="20180524"
+MY_RELEASEDATE="20191204"
 EXTRAS_VER="1.36"
 SEMNG_VER="${PV}"
 SELNX_VER="${PV}"
@@ -29,9 +29,9 @@ if [[ ${PV} == 9999 ]]; then
 	S2="${WORKDIR}/policycoreutils-extra"
 	S="${S1}"
 else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz
 		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	KEYWORDS="amd64 ~arm64 ~mips x86"
+	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
 	S1="${WORKDIR}/${MY_P}"
 	S2="${WORKDIR}/policycoreutils-extra"
 	S="${S1}"
@@ -54,9 +54,7 @@ DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
 	)
 	audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] )
 	pam? ( sys-libs/pam:= )
-	${PYTHON_DEPS}
-	!<sec-policy/selinux-base-policy-2.20151208-r6"
-# 2.20151208-r6 and higher has support for new setfiles
+	${PYTHON_DEPS}"
 
 ### libcgroup -> seunshare
 ### dbus -> restorecond
diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
index 463a7f498dc8..44d6a9a3dbe8 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
 inherit multilib python-r1 toolchain-funcs bash-completion-r1
 
 MY_P="${P//_/-}"
 
-MY_RELEASEDATE="20190315"
+MY_RELEASEDATE="20191204"
 EXTRAS_VER="1.36"
 SEMNG_VER="${PV}"
 SELNX_VER="${PV}"
@@ -54,9 +54,7 @@ DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
 	)
 	audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] )
 	pam? ( sys-libs/pam:= )
-	${PYTHON_DEPS}
-	!<sec-policy/selinux-base-policy-2.20151208-r6"
-# 2.20151208-r6 and higher has support for new setfiles
+	${PYTHON_DEPS}"
 
 ### libcgroup -> seunshare
 ### dbus -> restorecond
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 4e1094625b25..e08304ae1180 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,15 +1,12 @@
 AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
-DIST portage-2.3.66.tar.bz2 1023966 BLAKE2B dc378b714101b287fa33defeb778e586da83275cdc2d0bc7a98e9f2ea568568313d6a2767f693f3111fc41f0c6f07451315021186a1719bd52520da327c103d6 SHA512 f8642237e0127d9838c6e91430a19b8886295f8ce6b18cf915d6eb63204c7a8c65783f1554eec90b7ce7d0b613ef4206643eec8751b0594de1dcb4ede4491779
 DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545cccca0f516a5724e331e SHA512 20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045
 DIST portage-2.3.76.tar.bz2 1033462 BLAKE2B 1be0641337cd7d2a55f8aaba6f84bbfa7182503050e669fb28cd00e4de13cce31ec6e33cc2794e372d1a67b7d2f27e6bb85969f720f2ed449c619598b708b903 SHA512 e7774cf89e3865cb1ca5465fc961b452cc8529ccf09e86b7ebd16cca049f1efb527dca9aba892392d5909283cf12930117b1d33fa58e1e429f4408cf50181921
-DIST portage-2.3.78.tar.bz2 1037439 BLAKE2B 7f6d41feba299d2ae81a09ead816bb5695f93cf96f9a16fc4f7c865ceeed7cc5cc3ff5ad92b21a8b03a6ecbee462271a054adcb05c82ff079160d78531f21aee SHA512 a33ec04b78c6e2e13dad80a43e6da6855aa91aa385a4d6f4b97bacc3af49e3e165e1b7183194e51cd7c4db0bba29200d60378197713c961601f84569f239b3e5
 DIST portage-2.3.79.tar.bz2 1038675 BLAKE2B 7a6cff28fa1d4b54607e9416914ab534d250718b082a9789a36be057933867a8a3befd7c99d404b058f67b92c6ee975323c37251fe89d3e3e46865daf0fea25e SHA512 23101644185fb7c6eff12f015d442599b3af744f7b13dcb630f47a7f27c1392c46bd4aa5fa32d403dcf058cc3cc1d56cef00fd8c34dda811388eb268761c0797
-DIST repoman-bug-685482-fbebef9677d6.patch 3350 BLAKE2B f715267e2731c1ec7c780aa9c6cffe1f848b3ad050273646579677a0522483df6fef844ffd87fb22f7dad53f1ec60221acd0d81a813569baf768ba62a6c1921c SHA512 0e44625aeec7c239d7db8fdcf6a13313f4a8c1275e0e474cc2f05e5476d86214881cec2917d816c8b63f69d508c0bfa69e6a8e05b614b405463c998a4fb7ce12
-EBUILD portage-2.3.66-r1.ebuild 8231 BLAKE2B fec9217335b6ecf5dc4a9a2517abb5a3a854d19f0ceb5d28fda4c39e37e39b1a780b90ef1dfc734ebcc7d07cc9f8d14592fb70c320c6c182362fe17ee78219f7 SHA512 13d1d9155cb02fbacb27319f15feaaba8cc2330cff12b0529c357540e9cc3f60bc6897b14c03e1eca5c59bb3b4c1c478577ab7ef9d2a04087b4091ba7cb595c2
-EBUILD portage-2.3.69.ebuild 8088 BLAKE2B 8e1eaddb5a399fb98c4a6119f406a2154a7a4143df50719ba6441d2d49d72a6b7498c8dea66cd260518d926808824b14409ebf771640817d0046a79455701f0a SHA512 fd511c30175607c354b756a5e72582e4c6484fadeec68ef1af7b1104476b6d1ce2657d07d6f02536d6620c728a8b2b103e31ca39f4876e94a44a7f76c96cc12d
-EBUILD portage-2.3.76-r1.ebuild 8604 BLAKE2B 0cbb22bc20cfb3c9bda0809b3c3ca308d693ec65f790aa5170951f868ae17662f50f7d9f12b706600b6139a01f3189088935061fcd429e5d5d8a6264663bdeec SHA512 8f22668e737df00f88bf87ff7fb14906181345993d2fadb145aad363b407911c7c8fe5bf1aac82407713f4a289e3b2c905c0750121b14d13579a98879a11ed4a
-EBUILD portage-2.3.78-r2.ebuild 8752 BLAKE2B b699e718a1cc50b5796b80822116e864e816a9628ceae5a86543399d897ab404f9ffd7e8870a55dfd5b9e363e24ede50e7376066b6608341791cc17b1e8533de SHA512 1933b88b7cc6ac2d51ee535a40d4d8e2c165163e0fcf510a6ad844f25c08ef882b38e04b7182df2745cf5fbc1a13572cbf29b41b6ca7f1edb23fe9f398bd28da
-EBUILD portage-2.3.79.ebuild 8105 BLAKE2B 5f1f0b94aba3fbf2b940c7996874feca98a206d02e19ba2c248980c38cd1e6a8df905c5dd8988966613eec0f7345c1a1a40952b41eb7a1c1a6f6d1a6da333932 SHA512 507deb786b8739522b688a5377316c4397ada98e3b05308be0258bafc0e7d691d527048e4330f2db7e457650199189fdd76698d3cdcec67bed024adf1ee0a5e0
-EBUILD portage-9999.ebuild 7909 BLAKE2B 1116fee5fe17096e2a5b33cce164c6dd8e1f7a8cb04716e0218d001df4a09e957541b8267f0bf92e2b7f80a868aa0aeb081a4f83d8fa9529e619e682b8f4b480 SHA512 8b0b42bf555c092fc43aedc3c38f9eb78f7ea77b315dda867aacaddae4f7eba05434accfad2aa91e4d1a31d9ebeb9453483d3a5d6e5cdb785bb4c30ef6aaaa79
+DIST portage-2.3.81.tar.bz2 1041978 BLAKE2B 03c032204dcc4725bfbf4d2bf605a8f2a24bfbd854d7c74e0697e25ae4e10831ec19e3c1252d2d1a5921cdf00801fbbc6fcf60a2d64076cee96f427e49b1ee37 SHA512 ce0688eab181243cf4e8dd2a7e2e5bc188e6323331ffcf8d6ee970073bc634bb5566afebef7570fff711ad1ae9a4484df9a602db523d3398ca6ad29d633f0824
+EBUILD portage-2.3.69.ebuild 8116 BLAKE2B 9f3cdde8658a1a2a79a40b3761caf628d01ccb31e5ea1362f51b2d3e94e94a500b266e956346da701632b725d9de71b8723f586cacab0eb807edabbe082148d8 SHA512 2de3f919fe7986557523fe7b1c0c48674ab971804fff1815d0506bc4b98990e336ac20a252ec7738205e8ea2e75ce0302b29b249d002657e15a3fe40fa42ffeb
+EBUILD portage-2.3.76-r1.ebuild 8632 BLAKE2B 4a6cbdab3f0a8e119e809ae382f1b6c87d5a76efcffeeaecafaf462f733c352ea1c71f14dc4eed390d8f4f2695641f2cf7249dbab11d17a15cbdb55b2ff3191b SHA512 74d1a8ab52e0684975a99923416a0546125d1f62534dd3a5fe823186841397f9347fc4dd94c7f63cac15c8abe7d504ec966a958a403f15b0f55ec3add0eb20e4
+EBUILD portage-2.3.79.ebuild 8705 BLAKE2B 7ac051695bf9baed4f6ddce870d09900e5951841261673250b0ffd2d60f1c4aee9864834af3ad11c392a92c92fb09d2295ed1ba5bbfd486a7d6323b75f2b52b0 SHA512 da2ce712f6dac53cba323ba4eef726a1a043ef181bfa61b26da88c33d49ea2c240728fd9ab14adec08520d6e096a536665496cda9a65da96d432ac8d20eef845
+EBUILD portage-2.3.81.ebuild 8716 BLAKE2B d7a399e135e7c258d43fcd2b33e682c3e7c48c8b9b9bc0805618d2e0bbfd502f314b72e893f8ae31f54939927e356c269e53c91c05df0e3fe18ba1d7b737f020 SHA512 98ac4f313d8477f444a22e8b13238f41b3753b148c33ec16ebe3a1e9fae7797e7e07638834e6860794d1ff079323a0cb81ce45cfb9fc596131c37468158f75c1
+EBUILD portage-9999.ebuild 7947 BLAKE2B ba9c171e912a3d1f89eb38fbcd11f5beea58f3d4ad4ede1f8ff4637c0e5275571320aede796689de7eab3148549158428abdc44473919d9c759a1ed9f70f6cc4 SHA512 ade3426cad5bb1edca686aaff9728e2f9f6279ea69f8694b34a83825894b369981a375cee9d9f5d10cb779daaebcc65d7895b0a909df53d17e9152fd8cafc107
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.66-r1.ebuild b/sys-apps/portage/portage-2.3.66-r1.ebuild
deleted file mode 100644
index b7031ec44e2f..000000000000
--- a/sys-apps/portage/portage-2.3.66-r1.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_5 python3_6 python3_7
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 epatch linux-info systemd prefix
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
-SLOT="0"
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_5} pypy)
-		rsync-verify? (
-			>=app-portage/gemato-14[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	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 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=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-admin/logrotate-3.8.0
-	!<app-portage/repoman-2.3.10"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	https://github.com/gentoo/portage/commit/fbebef9677d63db70f1c68b197e58b041ec6ac61.patch -> repoman-bug-685482-fbebef9677d6.patch"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	epatch "${DISTDIR}/repoman-bug-685482-fbebef9677d6.patch"
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_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 use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		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 ! -name etc-update -print0)
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use 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_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use epydoc && targets+=(
-		install_epydoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	python_setup
-	python_export PYTHON_SITEDIR
-	[[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
-	env -u DISTDIR \
-		-u PORTAGE_OVERRIDE_EPREFIX \
-		-u PORTAGE_REPOSITORIES \
-		-u PORTDIR \
-		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# 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/portage/portage-2.3.69.ebuild b/sys-apps/portage/portage-2.3.69.ebuild
index fbbb9c85705c..854c01cd6e53 100644
--- a/sys-apps/portage/portage-2.3.69.ebuild
+++ b/sys-apps/portage/portage-2.3.69.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=5
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=(
 	pypy
 	python3_5 python3_6 python3_7
diff --git a/sys-apps/portage/portage-2.3.76-r1.ebuild b/sys-apps/portage/portage-2.3.76-r1.ebuild
index ff8abf53e72d..28afff0ae724 100644
--- a/sys-apps/portage/portage-2.3.76-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.76-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=5
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=(
 	pypy
 	python3_5 python3_6 python3_7
diff --git a/sys-apps/portage/portage-2.3.79.ebuild b/sys-apps/portage/portage-2.3.79.ebuild
index 8e7b92e07cce..42d64562857c 100644
--- a/sys-apps/portage/portage-2.3.79.ebuild
+++ b/sys-apps/portage/portage-2.3.79.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=5
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=(
 	pypy
-	python3_5 python3_6 python3_7
+	python3_5 python3_6 python3_7 python3_8
 	python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
@@ -16,7 +17,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
@@ -258,4 +259,14 @@ pkg_preinst() {
 	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
 		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
 	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
 }
diff --git a/sys-apps/portage/portage-2.3.78-r2.ebuild b/sys-apps/portage/portage-2.3.81.ebuild
index 4a73b9ccc466..a7197349654d 100644
--- a/sys-apps/portage/portage-2.3.78-r2.ebuild
+++ b/sys-apps/portage/portage-2.3.81.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=5
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=(
 	pypy
-	python3_5 python3_6 python3_7
+	python3_5 python3_6 python3_7 python3_8
 	python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
@@ -103,15 +104,6 @@ pkg_setup() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
-	# Apply 0299aedef74e47c0a68acf7905d8714c9578f125 and
-	# 1ca5b822133171b131cef3dc15dc43583893ad6b for bug 698046.
-	sed -e 's|rsync -avP|rsync -LtvP|' -i lib/portage/tests/util/test_getconfig.py || die
-	sed -e 's|if os.stat(download_path).st_size == 0:|mystat = os.lstat(download_path)\n\t\t\t\t\t\tif mystat.st_size == 0 or (stat.S_ISLNK(mystat.st_mode) and not os.path.exists(download_path)):|' \
-		-i lib/portage/package/ebuild/fetch.py || die
-
-	# Apply 26fd7ffdd5b74af3aeedf0e6a87ac6b3d1243848 for bug 698474.
-	sed -e 's|if "local" in custommirrors:|if try_mirrors and "local" in custommirrors:|' -i lib/portage/package/ebuild/fetch.py || die
-
 	if use gentoo-dev; then
 		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
 		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
@@ -267,4 +259,14 @@ pkg_preinst() {
 	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
 		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
 	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
 }
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index e7c1e8c638fe..04544afb66d4 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=6
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=(
 	pypy
-	python3_5 python3_6 python3_7
+	python3_5 python3_6 python3_7 python3_8
 	python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
diff --git a/sys-apps/qdirstat/Manifest b/sys-apps/qdirstat/Manifest
index 68a1d78bf322..c080bed29ccc 100644
--- a/sys-apps/qdirstat/Manifest
+++ b/sys-apps/qdirstat/Manifest
@@ -1,3 +1,3 @@
 DIST qdirstat-1.6.tar.gz 6398935 BLAKE2B dba15df3f9dd34276ee38ccdd97d1b8158596198b22a807b4d0a68c7d33d146a25ef5b987c4a6e3dc16df421422ddc0cad2e9f60a80493ac668bcb023c15c31c SHA512 8d1350bc8995dac2de90a32ca5ddaac47a317c7e7044f39ed87a7b2e208cda0b84f04c147f7a2414d7a0c5c731479847a879aedcf5781ca772fbfa8fa360cc77
-EBUILD qdirstat-1.6.ebuild 923 BLAKE2B 9e5bdbe90dfefa0ea8325a5189d7fc53b8fef84626c451417a5be962635e676bf109ea0af6cb329a86994c360bdb32b151c12b90ec86ae6aa361b1d9e0a73d91 SHA512 a4ea881bafb0a6e32ef4c0acb5c0fbce101a055487d1e08df244d335abe5ca1515da97db87bb8ae809938515eec16fc27ee3d9c25db6a8ae4d72baf574755f0f
-MISC metadata.xml 1003 BLAKE2B e6505926df58cfbc8aa44cab182f5e08ac6afa121e072c0fd44c32f4405706c39b86f50e778dc37d7ec43a4db4a22d32b92ea8f1487251036286ae002574c663 SHA512 cd813d8f11cefc14ffebd1bc574de8deb5922af780f6e580b3402e8e57879d9e42fb974cbd1d9c699946ea66df6deb6822bf54285a68721dcd7893c6be1d4a59
+EBUILD qdirstat-1.6.ebuild 921 BLAKE2B 49357e923dd3fb8d9b022ea42c3aa6cb55e583caa6bd8800e1f45985e197aa144a436004974070b03757dff548dfdf6803261ecc33bea706cb4b3650ae3107d8 SHA512 a83e63e5b5102ccc790bf7098c43366aa3e6daf0d80fc435969c0157f56ad8e916885a581053d1c64d920673e1e0f06ba728be18de8744285a6efc424eb0a2ce
+MISC metadata.xml 884 BLAKE2B 933c44173db730e6bca26e358a4863cb4952c3c7795f02d5906643dbdce06d7e72a97eb6fcd8096b491b4153296d3fef72a791e3333864ca60ec80e07b7a9d2a SHA512 6816ceea9a785936cbd688f512d16270bdb0ffca89339c85a1b7616d45e83df537aaedc575c97d27e863e71f2992462efe90528444357997b923041bb0bb3853
diff --git a/sys-apps/qdirstat/metadata.xml b/sys-apps/qdirstat/metadata.xml
index b73ce0a34ae8..74e1c925919e 100644
--- a/sys-apps/qdirstat/metadata.xml
+++ b/sys-apps/qdirstat/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		Qt-based directory statistics: KDirStat without any KDE -- from
 		the author of the original KDirStat.
diff --git a/sys-apps/qdirstat/qdirstat-1.6.ebuild b/sys-apps/qdirstat/qdirstat-1.6.ebuild
index 3a907d9e667c..1033decd52b1 100644
--- a/sys-apps/qdirstat/qdirstat-1.6.ebuild
+++ b/sys-apps/qdirstat/qdirstat-1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shundhammer/qdirstat/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-qt/qtgui:5
diff --git a/sys-apps/renameutils/Manifest b/sys-apps/renameutils/Manifest
index 56a2d2381c1a..8933b2696488 100644
--- a/sys-apps/renameutils/Manifest
+++ b/sys-apps/renameutils/Manifest
@@ -2,4 +2,4 @@ AUX renameutils-0.12.0-autopoint.patch 250 BLAKE2B f8fb26fc51762e36db1d0450a8c8a
 AUX renameutils-0.12.0-typo.patch 659 BLAKE2B a32f67a159e5c213d09d6a70a5b46ba527b618f897d4845efd2b5e12b0c973534de4adcd1f47a2d25a11c081e0873ba9e9bf8ed7bbd54ad44934cc00b1559761 SHA512 0c8a84ec8cbc40c5f51e0a0066ae451ce2f44a2a7d13f73429c60a90dbf02ba0982f00280b16e38125763eeabc850d03f9c8c6f35bd924bd4fac54be85d7ea7d
 DIST renameutils-0.12.0.tar.gz 954114 BLAKE2B 7c65138d9a6de355a72f8e07a6d9b8c1921a8925f7662a26521dcbb37862161ea866e24246cf2a2b3e4c2910231242883bfcea2acef9dda48556faa1d385baae SHA512 8aae157e6ead86a2fbf970ecdb27d6067c2d35c04058ead9a3c0af3d99d466d37d8c4f1da0562ef2bea9cf9bd5f8de4d14340906427df421dba1a5c234c63bd6
 EBUILD renameutils-0.12.0.ebuild 598 BLAKE2B 455ae325bbbddd0365ad6fc928c7dadac33bdcc34403ab3ff75e0ce329cd3f76ce2e1c97b4e2e816f582f6f1ad333a71679f249d34d4c93950540ed91c620453 SHA512 a1c9fd745cece602cebcc908485716786a1f75f918730e956cf769c536b10ee24d5c03bca15d503ded0c3feca06aad76fd4bab7d0b730a88b8d96bcab2b553d9
-MISC metadata.xml 215 BLAKE2B 6e36e81450d220bf29486c16018e496f7520fc0888896ebb5e7707c4a035115dd33d5cfcb8e62aa23be1bbfb789b0584f76dab476ff1c6dcc0dba4aa365c817f SHA512 f4081fcee65474c60f6ddd9c4f113e5f3222fa4f1b0b420dccd825409d62fd3664d2b6a8259a790c792f3e63bb0c63a9a0ef3c7461951a282bd7144a299258f3
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-apps/renameutils/metadata.xml b/sys-apps/renameutils/metadata.xml
index 586ba1531e9e..6f49eba8f496 100644
--- a/sys-apps/renameutils/metadata.xml
+++ b/sys-apps/renameutils/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>dev-zero@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest
index 87a529ae11e8..3b1d54607296 100644
--- a/sys-apps/restorecond/Manifest
+++ b/sys-apps/restorecond/Manifest
@@ -1,7 +1,7 @@
 AUX restorecond.init 650 BLAKE2B 507c65c11f756d5cf11045ba75d40a39a9fb6a527c9e0406247e8d2d06a41ec977110bdb9c77f4a75d97fc179bf507b0fd58b962c1976eff57a743cf019c684a SHA512 ee0ff9bfe542124eff0217dbf9cc2e00586b4577e0eee2bfa67946f78a97fe009c6e5c337e8ad68e1cd9af2f69ec3ce3acba9157b4d53c2fdeeb01f9e0aa9d0a
-DIST restorecond-2.8.tar.gz 17740 BLAKE2B ad873acbbb7c56c29a8523a42dc053ea79036a15bed71b47a690d01d4012394b5ecf74ae75b27affb4007d754935ec90246f22ef3e0b9611556ec7baf59670db SHA512 5d72336782c3ad095746f8e6fa67e36448e5e76ca29586d8fe4962c64e505fa95c1458e8fc8f7d5bd589fff71b4be3758fb0cee3dacd2ccd0bc8476423e2540e
 DIST restorecond-2.9.tar.gz 18893 BLAKE2B fcdae1a4ec489f3f581212cdd3c13c5561feac3ee758f354dca75c97938c62b9ed04aedbd4b3b5cde09a5887247389262718145620d0b9749e364d1614f57241 SHA512 6de9dd4c6b8e5d8275221aba5df27437998f635cfe83a5da75de479e260ceea884a36253eb873a8d71e1a77ed67544d8657fb75fe409af1f630052ce73ec5d8a
-EBUILD restorecond-2.8.ebuild 1165 BLAKE2B 7834d473f312d93be8885bfba2cd3930268bb7a056b6d968253f70259d959699a7246436ed8810e41ade5c24e312b0a9c86a8c078df652bfe032cde7ec03b2c5 SHA512 9f488cf1e460aed3c48e5e453bde2940a6132dec29e5ee599a21928543bd2549c21800603129a0847c5c85071216144c87b45543abbc57f6658e03f3976c2852
+DIST restorecond-3.0.tar.gz 18797 BLAKE2B 354477ea9f57cc27c14a2648b99b32c45ac6d4e32caeb0fb108ed8f40a2e2e04101e2658d0107a1f2741717c242ad80b2e14db03488ab62b88eeb8b1a9ac0dd4 SHA512 f75088f72a17f1f7550ef67052202cea1fd9cf1bb1eec0355f4a0641ba25097b289f629df328ee79aec00f8361cbc6df10efc4a5af2f0b67f9922ceaf92aa956
 EBUILD restorecond-2.9.ebuild 1145 BLAKE2B af99619a522615ebd01935b687f24c45d512510522bd725eb66b430c6b7d46086cc33634db109dc9f08f165f82e8bf059d34cdd4414ab9873298a52020d9730a SHA512 d6de5a092b1241d43e2b4663441e93568fa463444d41b032245e157c7994d072e318ac217a8e252549994bb72acdbdfb36453d51966707c18dd628fa5b7d4126
-EBUILD restorecond-9999.ebuild 1147 BLAKE2B 5e8707a3636dec5a806ec1584bc1ca7031567a3e483f48dd086bcd3e67f707252bfa31a6ae89edc25612791a56ea197af5f4ae68c9985639b35d686b53caab0c SHA512 64c5273d79a410b428891504d1ea8e9b163ed43d7a6d18a4eb87a4c9a63cd827a999d4ed89ecb4410a33661c276e6fc7e65a4268ac375c3c280678515bb3cedb
+EBUILD restorecond-3.0.ebuild 1147 BLAKE2B bc1d5af33c8feab8e444dfa10e8403dd68eafc7fa82869f904ea19a00341a192afacb560ec527530405ebfdc6715998d4540fad80d6faf8a30a36ff91a4db415 SHA512 06f29b5a6d9b23e2d09b5881310fdf627799b35d65644c91616d45f89baeec02412a47964cf0ce07d1da2d4887211ea2c55401eaab777394b69c015c3ba10b0b
+EBUILD restorecond-9999.ebuild 1147 BLAKE2B bc1d5af33c8feab8e444dfa10e8403dd68eafc7fa82869f904ea19a00341a192afacb560ec527530405ebfdc6715998d4540fad80d6faf8a30a36ff91a4db415 SHA512 06f29b5a6d9b23e2d09b5881310fdf627799b35d65644c91616d45f89baeec02412a47964cf0ce07d1da2d4887211ea2c55401eaab777394b69c015c3ba10b0b
 MISC metadata.xml 460 BLAKE2B d0de63ca5ac8e0c1c061f418ea9dba5472644626bbc5799499ce70ff0c2d1c7e49b023e3855cc7c767e78f5fb6f62429f5aab59dd272d9a906dbe026895e2e46 SHA512 0e4910de5e3932eb2914ddf4ef3250ae919885428337b1939f6827037a4dc5a75b13c97531c7b81748b1c90e3eb2b10a4671c76ede69749dbd1955bc67b5ca0a
diff --git a/sys-apps/restorecond/restorecond-2.8.ebuild b/sys-apps/restorecond/restorecond-3.0.ebuild
index 81f376e3f14d..efe40fb0d733 100644
--- a/sys-apps/restorecond/restorecond-2.8.ebuild
+++ b/sys-apps/restorecond/restorecond-3.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20180524"
+MY_RELEASEDATE="20191204"
 
 MY_P="${P//_/-}"
 IUSE=""
@@ -15,8 +15,8 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/restorecond/restorecond-9999.ebuild b/sys-apps/restorecond/restorecond-9999.ebuild
index b63423494d5c..efe40fb0d733 100644
--- a/sys-apps/restorecond/restorecond-9999.ebuild
+++ b/sys-apps/restorecond/restorecond-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20190315"
+MY_RELEASEDATE="20191204"
 
 MY_P="${P//_/-}"
 IUSE=""
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index b02355529046..d31a06a20224 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -18,6 +18,6 @@ DIST rng-tools-6.8.tar.gz 53769 BLAKE2B 2a10a5639c5b1f4506b2c2cfb0185d16b5b604bd
 EBUILD rng-tools-5-r2.ebuild 1144 BLAKE2B 071f7d226fb3c5585be712206d4397c248501e1fb54122c01119444472b8888e7bc95cd21bfc7663bca9c0d40364361b012ef7dde824718918c6e8334436c74f SHA512 dfdbc4425a776b799c873948453091c4cfb674a190626b0d5035d872e31deb9255850f73f73e4e9f664c3e8d72ea316aff9dc0f8a0e70d5d676449aaf81e0339
 EBUILD rng-tools-6.6-r1.ebuild 1409 BLAKE2B 20dfe5ef85122bd102a654c3ef95ae651c18116721d0b42478269cc6e3941c449081325149337a215dc6e250296d298d21ac4eaa8052b53b2055451b777c803f SHA512 91710d9bc23534b1e4930a24ab609816838938ab54e4627748c6eab5c36a615ba6baa681fc46dff9bd15c0b75e6cf181f1383528e14bbd811106d23d55153492
 EBUILD rng-tools-6.7-r1.ebuild 2143 BLAKE2B 0a0da05d43c4763da8c42c1d5ed39287878fd1c24dafe7d37f4002bb6bd08293ba0fa80189210a19a83ab5c5c6914a0e0205d497f1f88d59f2cea997ceb00eb4 SHA512 14e9cd49419ba51d6df5be4134f6bae33aae463a6e19faa6220023f1ba80c9d971c442ae52ca248d85828eb395fa60e5ae41fb95d85e4364b15e99709d36a286
-EBUILD rng-tools-6.7-r2.ebuild 2172 BLAKE2B 0b4a427915180a8aad92816d74470b1f77eb742f1130df682d5743a71eaf871c118f3a48523b05b36632ccf6766c33f8680eacda7000b443c7fc32df460d55ff SHA512 c1954f2eef54a321e7e0321835a62d63beaff4d7c734e9c929532679ff055e51bb5478252c91ca35554d5962f5badae44c390808ae19d301c4c985b6a7cfa057
+EBUILD rng-tools-6.7-r2.ebuild 2171 BLAKE2B f637ce1fc99a932b980ac2b811978cb4e943a0d71c14e567447b0372b276c086c1b30066074820cc5c1566b330108ebc39177855f06b15b5c8572ee4ffa94226 SHA512 44b9ed0930514d8b2e1a44b185b3601b955441ee23babcd5b42e149af32dc6177ed39529c729f374802c07688ce7350db74163c628168876ebdd0af7bcf853d8
 EBUILD rng-tools-6.8.ebuild 1835 BLAKE2B 7d78bef80be7e07da0792566bd96ca306984557f7eecb6940ae75b3ca75cbfb0590a3ed0f89f7b24a29abf65a836939577b75e4840f14896ce49ecd20ab1d785 SHA512 0efb9570fad17b1fec65c455bce367ef50062ac4bb5f764ba7f61734d5ff865386ee89f3871fad751226569cc424b6d38de4b236aa03de4a483bb0a793f04162
 MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64
diff --git a/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild b/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild
index e496621e1c70..f76d6bded44f 100644
--- a/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~riscv x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~riscv x86"
 IUSE="jitterentropy nistbeacon pkcs11 selinux"
 
 DEPEND="dev-libs/libgcrypt:0
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 2dfa089ea725..0b68337637ac 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,7 +1,9 @@
 DIST s6-linux-init-0.3.1.1.tar.gz 25955 BLAKE2B 46e8e88c9c48fd00819cd0f437eea7ca6a5c08751aa3196dda24a8d3a22fdb14270ae99c74134ab0e123dde65bf3cc86c7916a157e447a72428db9b3870ffe3f SHA512 b8a44e09fc6770e91f1ffeed3267bf5fb83cf857653727d52773674db5942fbbc010355bdf24e456d2b2df5a1ac72888b78b2ec502c0d42770af58aaaec00648
 DIST s6-linux-init-0.4.0.0.tar.gz 26744 BLAKE2B d56ba8def4e4a0158721fd9b9c4f19aa2e13e615e7e598fdced2b7c341820f31830c021d9181792bfd324e70163fed826c691a80fbbb7ae6f30be46eeb6330b9 SHA512 5b53d3afad28b476d366d649f9989de79adaaa3b7d255323bb121a6f8e6fef051306cd6368ddcc3745b6472bf4ac2ccb7f4088f6addeb6d52ebc40e703dcbb44
 DIST s6-linux-init-1.0.2.0.tar.gz 47666 BLAKE2B 95b092d624db23c0a31a3af8d381e471221f7e7608cad4b49e07ef1e12f6526532e912bd75ef9dd739e14dc1ca99f4aa80e8923ac31beee42828cdcc9c71030d SHA512 1140434b07bf85956382a43bc8f58fa32cbefc43e40a48825b9e938d7950d988585e872667b79ba1bd44f0befb69202bcb7347c0e722ab5d20dc9304cd1be843
+DIST s6-linux-init-1.0.3.1.tar.gz 48888 BLAKE2B 0633b66840396029686c32e13223527436db118a59abab5800d59c0baad8788c0dd4ff5e97704f680fce2182a64212394dc6a8e7dab6ae8028dbd8cfbf72dd4d SHA512 71b380ff0eaa1d297bf6af5a1c979efdf34d10ec1e440fd1ee3fcab8ddf2c5d7c903d151986ecb5f01a9e0135bedc8021e5fbf82a3fd66abfebcb5e3cbf19242
 EBUILD s6-linux-init-0.3.1.1.ebuild 1472 BLAKE2B b2d10b719f4668df01bbf241390d6203cf489786e0129e4076336a5a5ef6e44de370749313e06e008984ea78b0f07014d68288fb33912902bee21f2bfb59c887 SHA512 57607c57abc5adb22a22c1aa3d24545d591d83c9a7bfb87931a394229fd4ace887b5a5e859983c5b30fb6d08d151bc76f6cc88b69d31154d218b258221aebb89
 EBUILD s6-linux-init-0.4.0.0.ebuild 1472 BLAKE2B b68c06f32c2f3482ba1f4bb38e70bc0fcde3d8523d74c77867811231e1126e26a042bffc3aa7b6a98e1d39fbf3d37f4a39f604e02e397d085a43e85a795ad58f SHA512 2cdfdb084ab008bd5ae29b63eaca26be3e8d6e40520e2d6c266f4072cf98709872ef0d79bf39d22a62a144c50c413e95eea6016ec3999286b7db75ea1d50a0a9
 EBUILD s6-linux-init-1.0.2.0.ebuild 1670 BLAKE2B 8232e58ef6708936d98b6b3ed12ca25155174c7307cf7dd5cdd245625a89d74f2361ee2cbba1f5811f509c1fe2591343f6625bf51b3b481ade8fb9f86fd777d9 SHA512 ffef1f4e994d727ec80bb23fe2f2fb42b2950010753d83ba459071984c8880f5085bb083c623f39289a93604231014d9d8a02cf0faeae923477915e0f5fe513c
+EBUILD s6-linux-init-1.0.3.1.ebuild 1670 BLAKE2B 44ebba5c2c178321335dd0d9ace64c3b9c0afb759058f5e4dd753e6f70e4a3e973aa6598d4165588b7a188b7c7316cea76993a44f2f6daa38efab3d928a2815f SHA512 448bc4a1680f3c01dec7c8841d38e5f70c7deeb3f8640e11100b66604fc9b1e38541cd9355f1e270498d68e66052341db038e2bb80d66169a46aa08c278cff43
 MISC metadata.xml 716 BLAKE2B 5c64e105fb653ff7705fff6ce4f233f11d0609eb0e6d154272bb8ddad00aa12d90a5bf37b5d6ea4e093d5d15d40d0936820b8e5789a4a94fb02aad6e77c68272 SHA512 866135f814d842aa697d455d2e154f2525f8e1f533bf9e7fcf4cfcbaeec429a13b7f4c33e2f4f714a0f513a3c5bb0a6983bb1f273fc42c8043e35e27299b5ccb
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.3.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.3.1.ebuild
new file mode 100644
index 000000000000..e8370a330209
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.3.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs +sysv-utils"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-lang/execline-2.5.3.0:=[static-libs?]
+	>=dev-libs/skalibs-2.9.1.0:=[static-libs?]
+	>=sys-apps/s6-2.9.0.1:=[static-libs?]
+	sysv-utils? (
+		!sys-apps/systemd[sysv-utils]
+		!sys-apps/sysvinit
+	)
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/usr/$(get_libdir) \
+		--skeldir=/etc/s6-linux-init/skel \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/usr/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/s6 \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		--enable-shared \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	if use sysv-utils ; then
+		"${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die
+		into /
+		dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
+	fi
+}
+
+pkg_postinst() {
+	einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
+	einfo "for usage instructions."
+}
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index ec09497b06c5..a0ed61b82d52 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1,7 +1,9 @@
 DIST s6-linux-utils-2.4.0.2.tar.gz 40832 BLAKE2B 24ce6d51aacfcaeeb8531931a0deac4e2430f627907157022ed6378e7058afcc946f1c620bb3758e43a1911db517dd46e65a43f338c446e61711b000d6751523 SHA512 4b0c8f1b65b8eb47f3aa7aa365d20dcd46fc144e166f78825ee53aeb789e009b2716a826efa1e92e86e8fe86421efc6ae07970ce421c6913f0b1db679eb6117e
 DIST s6-linux-utils-2.5.0.0.tar.gz 34976 BLAKE2B ccbe5a24c39d32a6d3e9c1ba09c76c278ed33e831ba9d124e30615204f4084823efd13500b2b2a0efa0ddd703996ec3a47ea66a2b5c1f832d8003cffccf6b773 SHA512 0433fd7863135629d2ab849db34c77f0cbc146f7a84833fcb9263d49ed8366f370f0513bb055990e40a17dff69a1b83a741b1bac2fc8d159d866b45a6b81bdc9
 DIST s6-linux-utils-2.5.0.1.tar.gz 35273 BLAKE2B 61ba3a8ee1fce5357d4c3e71b442ade2277adf6b0560646b78cab3b922183ff15478190a3c4b3a7cce88f13d3836711b81f2c37bc7e545012708ee25f7b036cb SHA512 bc4693486299d1027b6ce908684fe2c66b8173b17baad3bb35a660f1d42f00e48ae56c762c17d162c7be978f7246a9ac5218a5c93c0b93f24b5dc881782329d5
+DIST s6-linux-utils-2.5.1.1.tar.gz 35513 BLAKE2B 7b5e613b3ec7a8104cd53ce2a6db921994ded9d890baee022d16f98f461a71804d16122f303ae66f32d3766325d566c80e04e27fda60a61d1f624eb5a65ae178 SHA512 59c58c4d8e13b7a6e0215f21978f8ac2ac54fc3685884204ea1f011f2a882b9381a9686cbb24c9e566e322c14174dda40368c308e37e9c44f6a1687231d108a2
 EBUILD s6-linux-utils-2.4.0.2.ebuild 1149 BLAKE2B 9bde0a49a4d14c1be0642e590f568a0ab15c7a29f51480779f96ff25799494f73e268d6ca9e8ccbd82c3259b6df1dba770d29f94459b9c4d2fe97b1eba27eab1 SHA512 bfd9bba07e7071baa00df31f5980952f6312b370d4f9762650afb1dfce909f8d6d50029bd7d7d78f2cafafc8ac7e3162bdc31c68b13d610394730be35ebc429a
 EBUILD s6-linux-utils-2.5.0.0.ebuild 1111 BLAKE2B 929e7af3a4579360a9eae8292c1e8ea840b7d347f3c350b44e5699674bbc7e0c86ac4d7e5a8bb68e2232882cea8e93f94e104b0875b339d22946575d3a0c3b5b SHA512 cff3803a8525bd6760d8c1a3fec8aedb945b68a70228d30cd235a5bdb914d436979759cdba79c12606d58e29319754968510e4f1e8167421139810b9d32e1f09
 EBUILD s6-linux-utils-2.5.0.1.ebuild 1001 BLAKE2B 6e51048a2b8a083a9c6ecba5e7a8b468b6658c5d131aa502f5e8c608afef6a6a925df26598ea25fdf81944dc907a45141c28ba75f1feed0db8f5027da2f289fd SHA512 7d153190ebd07dd9a6e907cc96a748e24edbd8e75d5eacde8153bb5d4acee5d4ac3d048f93c92bed51ca77a6db0bd9f6dee634c9c9edf90baad7fa3fba5f4c69
+EBUILD s6-linux-utils-2.5.1.1.ebuild 1001 BLAKE2B 8edd153ce678780a00bd117f705a87fa4cedab230abeb264849c070371e58d7d3fa1994e80081c8d92910f9b01fa48f1ed29d8e4f4e51742aa488c6d11d4b74e SHA512 ac74fa279c62cc0befb15560d2bf104eea0a8881cc3aa60874b830466eafa295bd1b683cda01b338e2475201f158d8666217ffd67cc237c1889503ce498d2774
 MISC metadata.xml 578 BLAKE2B b561feef1f9d63bdacc7129cfb8d3c10731717f22eac65c85053e138ce52c2e8e0cb6cd36cfe132b52d082f610c0c2b3864bf0964f3f8e68eb0be474d67a0a2e SHA512 76ae04f79a98469ed522cb1f0a8b1088c85cfd2d06801b2d53428f08ac0bea6545e815884850e01661b4225d0d40206dc7d96dc479d258e3d64f3372d87cfcec
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.1.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.1.ebuild
new file mode 100644
index 000000000000..0b6a0b68b301
--- /dev/null
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Set of tiny linux utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+RDEPEND="!static? ( >=dev-libs/skalibs-2.9.1.0:= )"
+DEPEND="${RDEPEND}
+	static? ( >=dev-libs/skalibs-2.9.1.0[static-libs] )
+"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/usr/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/usr/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc)
+}
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index 39ebf10bb84a..adf35ba9cf6f 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,7 +1,9 @@
 DIST s6-portable-utils-2.2.1.1.tar.gz 47138 BLAKE2B f5519fbedc2599c0b9366bbff38a9438cb4cdf3b770dfec6e519f8857bd77a3bea172284318df224104fe7003af4a68cadc8089d77c98ba4da85eb59d59819f4 SHA512 fba7a4d1f5e0c969dc254775f28c02f1b8673ead28022962175bd605125dc56012cfdeb177037c322780be93a5191a5292a47cb26cf5d466bb5eb081fa5a9657
 DIST s6-portable-utils-2.2.1.2.tar.gz 47446 BLAKE2B 31093828bbff8d7ebd68e9b9024abff802511d6def436b6c4a42e127fc8ee84544a3e590db2e59d76f2ab407b29edbd462725d8f6c8b4923b999809c58126c8f SHA512 697356a1bea6a0d9ca2dc995667fb2c3ab0e0ec72f9cba9f64a3b745e17ff85793be4b9a3bfcb8137938b732195fdabd2ffba5cef26f86f3ad2705907c6a8ab4
 DIST s6-portable-utils-2.2.1.3.tar.gz 47619 BLAKE2B fc9c7a77f42bb64bdd1cd1cfd23d9e0aa0a208451d28d7b76b67a91aa93eebc75148604877af16f102b27581d81549c1fd6e9bf8ff6f62ad3bb9e344191c3886 SHA512 6640027e65a19417461e1e9c778d276d6ceb3f95ea5c720dd21b0d1755bb8f1a218cd9f42effd6ab6034889cc415ab935b4583b6696c2a96351417d9a8f4d7b0
+DIST s6-portable-utils-2.2.2.1.tar.gz 47874 BLAKE2B e1a9677c304d256f8a890da9c35716b513971d506e705db847e71355f7e10a49c3b4a3cdec220513964429db2faaecce5dd3c09d94fc71d19fada6f83f7619d9 SHA512 2e74befec59ae6d3f27cb5f2bb92db23af484043e4d5e53e4816d75927059af6698614a4c3ce7ed7e380a88d5bbe88e41dcbc97eb607a10d7a3e46b8a36744ed
 EBUILD s6-portable-utils-2.2.1.1.ebuild 1165 BLAKE2B 2606b82a595387a09d74f1295ca6bf89428f339f55827290cdbaa185adb62982247fc61346adc75025c0d0312d0292c7364105cc787b550e52bac09dc4e9db1d SHA512 e29fc657d3088c4d160a0526ed09d6377d777ee3b9c4c5ff23db7eeb174e0ed52f14f08d7a02e3a72249391d0c91f038e1d348763071ed100a200b4611ccc5f3
 EBUILD s6-portable-utils-2.2.1.2.ebuild 1127 BLAKE2B 2b392e393616de97b9cceb711a5e9af725f580a66d9c945513f95724735b46c3ab83287b836b4915813b344cc66fe459ca50d1b7979792132fd1b8afc80ff9cd SHA512 456b6f9cbcccef87307f1fec2ec2302acccca5d362b81e56b1dbab1d32488391275959c9bfac9cb1e7b997c8e6fb1e8d8403cc63b55ab65fba78ea60ae88b260
 EBUILD s6-portable-utils-2.2.1.3.ebuild 1012 BLAKE2B 9f4d5751b9dd487f2ff35452fec88f33e54ecc9712dc9ed8cde0185620c06bb8ee99ab982ca141ddb52494c86880a1a6176a8637dc1851cd276ba2f90531f453 SHA512 9d4700fc09c15238d0a8d6662ce0538268fd9d6471400d4e1c595a9221f59bd8871a76325af162f2607a365938f9690985307ef38ef7160fa9da732ac047322a
+EBUILD s6-portable-utils-2.2.2.1.ebuild 1012 BLAKE2B 56f98bdec67327b48cb116f3ff1277032a9104b619ea9987094dd252f07589932e30418f7beab8d73cfef5fe59da8331b94b6eea10c304dda53ac13874cf4651 SHA512 efea2a361175ca896ff3ba4653149d43c703c8aa9481c817ecb4497b558cc6df8800cac5bc19b6dbf4d0c94b4f3519898b864bcf53ef36b588cf6dccecaaaa58
 MISC metadata.xml 578 BLAKE2B b561feef1f9d63bdacc7129cfb8d3c10731717f22eac65c85053e138ce52c2e8e0cb6cd36cfe132b52d082f610c0c2b3864bf0964f3f8e68eb0be474d67a0a2e SHA512 76ae04f79a98469ed522cb1f0a8b1088c85cfd2d06801b2d53428f08ac0bea6545e815884850e01661b4225d0d40206dc7d96dc479d258e3d64f3372d87cfcec
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.2.1.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.2.1.ebuild
new file mode 100644
index 000000000000..e414a001fc50
--- /dev/null
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.2.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Set of tiny portable unix utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+RDEPEND="!static? ( >=dev-libs/skalibs-2.9.1.0:= )"
+DEPEND="${RDEPEND}
+	static? ( >=dev-libs/skalibs-2.9.1.0[static-libs] )
+"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/usr/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/usr/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc)
+}
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 0e789da25a43..4f5c594cf33b 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -3,9 +3,11 @@ DIST s6-rc-0.4.0.0.tar.gz 96417 BLAKE2B fea4cfbadd82e8e775e4ba2cc1168fc3932f2f23
 DIST s6-rc-0.4.0.1.tar.gz 96491 BLAKE2B fe6aa6e2ed868cca6d76928571d561784012ded476825501bb137798c644495a06c2b08c752198d6e985f48fe34404868fa24d49785ff42610e1dd7314ee8088 SHA512 f4e4105dd51eb9dfa4ba45d3f85970d763c70eb5e276de818d9b2c75db9153d3000dd7579ca8e7c4bf814b05bcbcde1dd9b363c57c6507f1cc5af7898049fba7
 DIST s6-rc-0.4.1.0.tar.gz 96840 BLAKE2B 07a05ab7f69a821c677d569051dbe4c22c4e774540866fee6acb91853195a7138965869698cf33eb8d02d183f55e8945beacd567fba742a0bf092cb6e65a7c89 SHA512 12bb1136bc1222e09f115118b631dd5ce7d8155151b1e57427ae932db7654484543dbf5b12f442708ca9defe51d44bba9785caf0a9857847a1f3acb375301e92
 DIST s6-rc-0.5.0.0.tar.gz 97247 BLAKE2B 5b38029c78a6910278819c6616cebfa1dfc4f11e8ad4e9b376e576a30ccdf881520212ef0c2c9a4ee4218c0b9a9751fc6855701ba0126bbf682c054ff2a7cfb7 SHA512 3fa084dd4eb489a8279135760d8051b74176994161cd989f038bef59b8abd6b8bc8c48a6ad2d2e7860627ee749d4abf6cda98857c7052f1097e9591a97355a18
+DIST s6-rc-0.5.1.1.tar.gz 97648 BLAKE2B 9c5363fafe19b970e61d5b6bdef1880b1085f4fea67c55485b6dc5c12ce857dd8828cdedd6880808fdb6d664af63ccac1884262f337b12f2a2ea4b2392016aea SHA512 88e6ad4f09501eda231e3bbac58e9dafc925ff4b2c2a845c9796f3c1519834901f0126d751705b00ecd71173e208085bd68c5ae221a7074da8254d2b71e8a772
 EBUILD s6-rc-0.3.0.0.ebuild 1619 BLAKE2B 3746812cc4b8c852ae97dad2b9e28e7b84713f98a08df1fd11660507f4810357d8cd1e4798ea246440206fbf4ad1ac452f773f0ac1442e27a4897b4d084d4db3 SHA512 30767d3accaed63968c91dba9d4d4eef80eef838cb2505a84cbc75ce8e966a0f5fa60a24942921a3bdec524f49e22148fd012c1212f206010dd8ef7061956f3c
 EBUILD s6-rc-0.4.0.0.ebuild 1866 BLAKE2B bdb83058265bfbeca41faf995b796c042f7b4f2f27816cfe6b6039e88ecc6b1f81db18337925673cd82106ce950c4d2ca533614009fb4e18d35072a562764bc0 SHA512 c0c00a6a58ea33ba062a41e26911875c944d77ff20875f8569542d17fa0e075fbe05e0018f92eab6671cd20d2ecfdcb9de0a64f1fe27f785b97ff8b0c75f6027
 EBUILD s6-rc-0.4.0.1.ebuild 1866 BLAKE2B 85c17232f071f38901f70e762f74ef89dda79d75f506b99321467f408978d23bc1bd568911357c2e5a76da03681e62ab62e58f5df95df961caac4b4d10a448f3 SHA512 30168528ecf7f8ab574c981f57fddc37d8b10b0f7985e789ecf3baa1f6f63575018aa7bf468f1439804db32f1b608b727c8d1bc7a79ef105c1abb5a3beb13035
 EBUILD s6-rc-0.4.1.0.ebuild 1671 BLAKE2B 610a7c4282a400632a26529f9d426e371c2b7c846ab06d021839797131ec3555084783e697d1247fb40494ea753d0f5ab71da60ae3a629baabe9a1e87583ca9e SHA512 f6a038ad6168aa2338ec492befe8fe8eb6d566bc9c46e87099f472b04d62b68d91527176b4aad3f4658ad9705d17855f693fb1a0101061b0bb9e8326872cd8db
 EBUILD s6-rc-0.5.0.0.ebuild 1491 BLAKE2B cab89c66165305a92494a0bbd1dda32d7a10b1559e9cd4b9c7e869733422833b11b872383d4311dd444e993e0650a071ae87dbbbe60ff8ff5f6a5e501aa16e21 SHA512 f47f93080b5d3bf1ab8001b20d45cea34bc4b0fa86d34dcb27b07f63fc49bccdb3fd69af649a7419e52d4e381aebb39a640cb3f56767f68044aca8b12fe0a2e2
+EBUILD s6-rc-0.5.1.1.ebuild 1491 BLAKE2B 165a756e77a0df7585de298f715c6aa57112f025fce0daacdad0ce348bd297010d21e27488c81c0acb719d1723acb6417d7a15801f3d912947d6d6bf8288e183 SHA512 d6a433d0be0d444e01cdffb82b269369423e1046fa088608df19d1dae26078b2149dcaf7b504b860f535fe4f1f95f633dc693c79ad85190e0a3e7cb852c156ce
 MISC metadata.xml 578 BLAKE2B b561feef1f9d63bdacc7129cfb8d3c10731717f22eac65c85053e138ce52c2e8e0cb6cd36cfe132b52d082f610c0c2b3864bf0964f3f8e68eb0be474d67a0a2e SHA512 76ae04f79a98469ed522cb1f0a8b1088c85cfd2d06801b2d53428f08ac0bea6545e815884850e01661b4225d0d40206dc7d96dc479d258e3d64f3372d87cfcec
diff --git a/sys-apps/s6-rc/s6-rc-0.5.1.1.ebuild b/sys-apps/s6-rc/s6-rc-0.5.1.1.ebuild
new file mode 100644
index 000000000000..bef467c011f0
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-lang/execline-2.5.3.0:=[static-libs?]
+	>=dev-libs/skalibs-2.9.1.0:=[static-libs?]
+	>=sys-apps/s6-2.9.0.1:=[static-libs?]
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/usr/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/usr/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/execline \
+		--with-lib=/usr/$(get_libdir)/s6 \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		--enable-shared \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
+
+pkg_postinst() {
+	ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually upgraded!"
+	ewarn "See the upgrade notes at ${EROOT}/usr/share/doc/${PF}/html/upgrade.html"
+	ewarn "and the documentation for the s6-rc-format-upgrade utility."
+}
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 6b18f7ff716b..0878c54628a7 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -4,10 +4,12 @@ DIST s6-2.7.0.0.tar.gz 198303 BLAKE2B e835fd25c75a25d3f39ed59098911e65441e3fcbb4
 DIST s6-2.7.1.1.tar.gz 204738 BLAKE2B 5a322fb992197b921f12fbf1e5bdec7cf1797a2bec81b72faf1eb2bf94c8f46392f9eb494de58d05b6df43daafa5b0abb3947c3c1a0cb5aa3cd83a56ccd45370 SHA512 59b0a611eaa0bbdeae3133a182e933e14806151d3b8d44c7f4258a63693cf2fa487fce91a4ea37527ed0f52f211a5391b3fcf6202773b0a80d6ce7f3de60ff79
 DIST s6-2.7.2.1.tar.gz 207088 BLAKE2B 233413e3cd400af291c20fc1b82e4a803be50eba9854fcbbe917715afe3a9c51467795f620a2596ab067dc7dbb4edcd09177c208bfcaaa7b3b0f392f49c49ff3 SHA512 dcf032b812ce955c2276af36aa93138debcfa9e429e79af7b8da4f1e98b21e7b658564024c713fef45ffee03704d78f7618ad4b890de0bd3defa51b4689d3790
 DIST s6-2.8.0.1.tar.gz 208122 BLAKE2B f24981b1f29566ae23b8a41a20a119918798ba96fad7e4e62be7d03096dfcbc44de9ea6832c166f541aa8c36bca92819dbe2acd4c46e83866130817237056aa2 SHA512 03478aed129c1e50b34e0b75d7ff50bd84f62eadee862b6227c4313153d47776e7cbeae728d63209773b91931a2abc8372bb7db4953762807d0ed3d305efd23f
+DIST s6-2.9.0.1.tar.gz 201404 BLAKE2B 206bef034446753b32b19eca96b1399209e0480b785f43bb8ccfb0eb9db5d1305155de74405d851cbaccbf5ef07ef1c4d2358e0e47f33928397201417b6f3b92 SHA512 5beb6170e4a457a0a307cbace67369cc35f6fd79d13ece2e82a3ebbdb4b032304eba8124be3e45b4db921863eaa02f51472c1365b0da000eef0868c11514dfff
 EBUILD s6-2.1.3.0.ebuild 1284 BLAKE2B 805f6f16a33b6a150ef75c2c3775c715598694b13d68dfb930a438df946ed1d0ea3c668024ed963997f2667883765dbe0814ade890b80c8c2ccd35ac2bb5e7c4 SHA512 f5f2e6a032852380cd2991cd09c09f4c55d498c42b33af819893f3f81335db221827e5400633d99f18502d0fb9e8965728d7ce32129f1736aee049c498bcf193
 EBUILD s6-2.6.1.1.ebuild 1508 BLAKE2B fbfa323712511650c38cfce93faf3c4408791ca887ba7a77e4c9b4022b36cd42ee719b8691bfe8976db608ff4a7822753fabd78d51f107b77ee84d117fc55d10 SHA512 194af6e8227a1f63e5285af765dcb43ae3c06e07daa33c83718e73077d3a3848e1edddef3acd49e48618e2ac10c240bb60313338248a1fc6395b326064cf6a6b
 EBUILD s6-2.7.0.0.ebuild 1508 BLAKE2B e04f58311a19ea1ed6088b46f7919296a234efd09d07bd77207f1d9432183c57081072974b4c720a40f57af0dfb8ebbd447f47ca862c89e8f612b825a43bfe25 SHA512 ad05a4ed4e5c0f98c52cf9a3b37c33de5025cfa04b3d240f7a8487b86637f4317ae6cd10d835f18734326bd3e47d1777d91c860dc2020f16e5d9f888172323b3
 EBUILD s6-2.7.1.1.ebuild 1508 BLAKE2B bd4df2ccff6fbe2e72e4643c33a1a37e6d008ada08f5f0806faa8c14905cda8e0e7e00b3d52da57dab5ba58428ded71d4b188b2b714a37ef015b424433ab8cea SHA512 fa2e5517bc36bbd43a56e35a960aacf13ca0d39bfeec82feb17dc0479c8bdc24b636f38a54d302149a816dc18e8f3fa1250e526bd8b8c890db01bf473fa3e5e2
 EBUILD s6-2.7.2.1.ebuild 1356 BLAKE2B cdd91b51bfe13f668b319b39ac60d158c866321066ccb25af78fa70ad0ed1d624378cfd9769c54439f096f6606ca6edacb9c4955b7f021656f47f24bab0a9ca7 SHA512 33afe19eac96603b5c5a856a437b7c15fa86cec7dc074749e69e4f7e93c32a49ba03f810ab2e14335f7ccb4d5d0fde7c241be3c6b21b0751a8ed34a347ff74a8
 EBUILD s6-2.8.0.1.ebuild 1184 BLAKE2B 03ba7fcba1419751cc10219cc1554068a608d928df9104f373809b712da9d38d2be866301621da719d3e0caa4d916b0e66bfbc82e0c4c4504ac05e20b745e25c SHA512 ae40d2c7d92877039de0ca63e3d38fffeb1726d634280b0898c119647eb14870d028e87e6cd3589c9dc12dbeb27aa2895e726230c06e65231fffdb50305b7912
+EBUILD s6-2.9.0.1.ebuild 1184 BLAKE2B 2efc249add48ac861e56017ce27eba5cfe5d3bb11a5b345c677269ae73e8a1f0d6090ec1bc39e2a0eafe2518bd838c66a95e6b595439a3929badbc19aa51977b SHA512 299f09ccc8be432fe0c71ff3ca900f0ff05345911bed83040fb8c03a1c0a2596274eb5b2fa45947a40181b567a8e92f3045b1f7b2d9bb065119262d1683e769c
 MISC metadata.xml 743 BLAKE2B 51cce1b0cbf5b0a026853d24c760d20cd8a82baae31bd4c7dc67af31933beaec632d8937dc8236ae2fec3807ffdc748f82cdd50a025179659ac3e3854f209006 SHA512 7391141506e39054d73b3ef9a336feaef887896603db105d493cfa50fa7dad721c8b0aaee16efb10be5aaa0561f2db19987de1431ee79e312cdb04e7edf77b6f
diff --git a/sys-apps/s6/s6-2.9.0.1.ebuild b/sys-apps/s6/s6-2.9.0.1.ebuild
new file mode 100644
index 000000000000..154f800e40b6
--- /dev/null
+++ b/sys-apps/s6/s6-2.9.0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="skarnet.org's small and secure supervision software suite"
+HOMEPAGE="https://www.skarnet.org/software/s6/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-lang/execline-2.5.3.0:=[static-libs?]
+	>=dev-libs/skalibs-2.9.1.0:=[static-libs?]
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/usr/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/usr/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/execline \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		--enable-shared \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index 0bb07002a929..a86f5a98cb08 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -1,6 +1,6 @@
-DIST secilc-2.8.tar.gz 175893 BLAKE2B d1e588c82d8be68efb66abbcedf28b3f99ac58edf58df238d970243b7a9c94109fcfc6958907fd4f614381e9ee4e248796b556a37a283d6f0e602a98349c1dd9 SHA512 70b92802af8bdfbeb458ccaaed74e00e8a1edfcdbb48a0b422cf1e98ce467db1a586c800574ae61b0fbf006330c603b44d022091d7bcb6b0963ef1b1c6e547c1
 DIST secilc-2.9.tar.gz 175885 BLAKE2B 0a5fd0adb70ce80574148ac035dcb8c5c80f6779a6a0c696eaba26cb6c4441e58eb161600034102dcb34c87099357bfc66015d245cf2fd49b56e65d782fc8aac SHA512 c552ce65fc23bef1a93b3dc485369d64ad19a3f30707b95d0dd488d1766ab9f5e75884b79e6464997eaafee119193a1fdd5ff8228aee0fa902e426eefa14a4ee
-EBUILD secilc-2.8.ebuild 922 BLAKE2B 6a6a35a5da397a04f27c69f9f709961290a10c83c544db6ce42e9b5339e80b98ec9e92ec0e6c1dd3c54ac26e767060e07d79eb042d9abe5d064bf2559ce00308 SHA512 67d657753cbe856e9c6afda6fbb1928366acae73d81af547f5bc2838dacd94d3e5bd451f67e79113100049fe13fe6fd0219e3fc5095bb34a4f5751df9d69b28d
+DIST secilc-3.0.tar.gz 176060 BLAKE2B dcceaa72f3e34777f0d4a6a05de073e4f2dc53b7577c2a52d5b5ab5e10d394ad85817985e683c9af241cf6bdc9a549d52142477281000e19ff66063f440b4b3a SHA512 e82d973c99b95a7f34060ce10a7f39802c3d6d428a52992efd8551da7bceafbdf9f81262d9aa2ad9d22a0704959de525c5a2de21fd96651277fab433ef340225
 EBUILD secilc-2.9.ebuild 902 BLAKE2B d21e16c113f24dcde2db43a79ea5c6618f55e5ee24e8bfba4006b44b092760ad9b3240d72b8847e1dbe2a3cad581a9a0d08540c9bac70528ac7cfad14f6b7578 SHA512 77304add0be53344872bbd68e91da6e1d5747b58d1b5af4ce47a42377f82e02bcc3df46477dbb169a1bd053a2f0a5548a30dc46bb74fbd6e636caec970eb6363
-EBUILD secilc-9999.ebuild 904 BLAKE2B 6ac9759cceb0cfebae9471c7caa39dbabdee53331863bf602dcc63f509e715311cc55854657a0998b5fd1c371c05f7d40b79552d29287ac0ec7afd85fbb295ab SHA512 24577cd2ced50ce9d4203e6219bc74b73a0bbe62eccac4c698264431eef6a43daa165054e01da94c1b8bf7bc2ccbb919e43dbfe1bad4c7fd7f766e1683ae6f46
+EBUILD secilc-3.0.ebuild 904 BLAKE2B 6ea3358375744f292c9da27734a7fe8ee9bcc0f18891e935f6115a38c6bbbdbbb1c17cfad70a9abbac5b5ae96525f80a4ca1db661db19ed44a30d94db5aaf268 SHA512 2f1a785c16007f1fe3fa843b697a6652af0830c84d32be69cc101ac049f59443dd1967ac06be850c574c5ee737b20930a69d2bd05c31903129dcc29d4855b8a2
+EBUILD secilc-9999.ebuild 904 BLAKE2B 6ea3358375744f292c9da27734a7fe8ee9bcc0f18891e935f6115a38c6bbbdbbb1c17cfad70a9abbac5b5ae96525f80a4ca1db661db19ed44a30d94db5aaf268 SHA512 2f1a785c16007f1fe3fa843b697a6652af0830c84d32be69cc101ac049f59443dd1967ac06be850c574c5ee737b20930a69d2bd05c31903129dcc29d4855b8a2
 MISC metadata.xml 517 BLAKE2B 69224c0360ff5acd98dcd493463266090ad17693588e91a434e412460352594673563388b52eba5313c7a9aa3b745d916f089805fe88ba8270cef1528f1fe13c SHA512 457ff97de6f9c6992a025588a5af5692abfc38a7df8537de2006ac841989a9b7e566b796b16d304252ad03cf66f205dd3a4fb0218281fd551c430c58b9039310
diff --git a/sys-apps/secilc/secilc-2.8.ebuild b/sys-apps/secilc/secilc-3.0.ebuild
index a54a310c99dd..d920dbb0436b 100644
--- a/sys-apps/secilc/secilc-2.8.ebuild
+++ b/sys-apps/secilc/secilc-3.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 inherit toolchain-funcs
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20180524"
+MY_RELEASEDATE="20191204"
 
 SEPOL_VER="${PV}"
 
@@ -17,8 +17,8 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/secilc/secilc-9999.ebuild b/sys-apps/secilc/secilc-9999.ebuild
index aead3f36a435..d920dbb0436b 100644
--- a/sys-apps/secilc/secilc-9999.ebuild
+++ b/sys-apps/secilc/secilc-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 inherit toolchain-funcs
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20190315"
+MY_RELEASEDATE="20191204"
 
 SEPOL_VER="${PV}"
 
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index 5db3a1fc0bbc..d00b3eebe900 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,6 +1,6 @@
-DIST selinux-python-2.8.tar.gz 2068101 BLAKE2B c28f12e4bd453955148a6ba82fd28621d1a4600f872ac63d97372f2e0153091adf1cf871f89765dd300bc6b7b2d610b96f87e3fc5accbfad713ed8a0d8f76f5a SHA512 e695c11122f7f8105b75d1ef98355fd2b82b40d93c2fd9e733dcd95d4d7c392f60b646df81203c43ad2a0e8447f9901083007e1572b78e17368ad2764ffa1aad
 DIST selinux-python-2.9.tar.gz 2100185 BLAKE2B 8aad58264197dbf23dfa286ba6530150ca6ae1ddaeb1a58988c05d0b122420cfd7e9be2a1cb7082d73cd41f03c4df00ad81a0fb746b075db24e63f62f86a1bf1 SHA512 1138661128635004fec04dc5e39f035680b5f21beb1b79f3328690a1b93a3984d522a02724af793340112a5e647d363dda8a7d3536de959b34ffd69aa396254d
-EBUILD selinux-python-2.8-r1.ebuild 2572 BLAKE2B 4a598884f05c149fdfb8ad60665600e7b995b090823232dc563668b852bd878d27036dc4a5619d117bebfb919870942490d43830fb850cffee14e7b119a0fb08 SHA512 ce2ce8993193438bfb74d186a2bf359b80518057422afc9d5a63c233f142312927b9eca2e033037f23bf8b934a72f275b5314707fa10c7c7955a4e1c20bb4b72
+DIST selinux-python-3.0.tar.gz 2100098 BLAKE2B 6949911020139378e9bdcc2b7c01c067ddaf71394a0a143a096d5708c5e7caa468b12826965c02af0b994f35d26c573187bf67c8d1ce75f5e8a31a1fb0fc6562 SHA512 743df60a643477465e4355880c56813ea8539415ea7c9631fb9b7cd7969a37cce572a6a94b785065d92baf9d7b6c753daa5d2f9709df7c9203c7effba46d58f2
 EBUILD selinux-python-2.9.ebuild 2555 BLAKE2B 70d88cf417951b6a0ca45fd199a1f58ebac34bed9900d001e96d4243583c39cea4c91fc33b1d78abcb70f15a865c1c8086855dfe6b066b25989e7d8f3cfbac90 SHA512 522c8bd6fc462e036f38cc9812ffdebf2abb1af87c903ffa0012a5d52066476be5a24f0f274a8586c6ab5d36f7e90055c21dcd76677d56c5c62688671c7f6234
-EBUILD selinux-python-9999.ebuild 2557 BLAKE2B 1eb76dfc5459e5918ec524a4daf64f4038e9f5d0eed94f2ae63ec33cd897f358f60c37a95ac2fbd5c1135294bd747c8d9a5a232d7c4de617b3d49c92752fafd0 SHA512 acfb0805be77ba5a86174dafae73e57d057a0d2bc7c8734a5bf0268f15cdec02db431d5ccd9f60f3cb19fbf08731d0132257b66935452d9310c221500372c938
+EBUILD selinux-python-3.0.ebuild 2561 BLAKE2B 290232771dd5124ba7d2f0b25c9c7e8372f5533b189f381b76c092d81309b2dce16821ab11f29df040d2e4b5a16ddae14148a227695d51be314e1ad5802b7de3 SHA512 e3a5ea35cbbe382f7d7ef233a6afb845639d7789896119efe8dbd3508967d94ffb71b9cf28fc0a468a4d529fa2d942f945c7ea8622a0e4217c79249ae831ddb9
+EBUILD selinux-python-9999.ebuild 2561 BLAKE2B 290232771dd5124ba7d2f0b25c9c7e8372f5533b189f381b76c092d81309b2dce16821ab11f29df040d2e4b5a16ddae14148a227695d51be314e1ad5802b7de3 SHA512 e3a5ea35cbbe382f7d7ef233a6afb845639d7789896119efe8dbd3508967d94ffb71b9cf28fc0a468a4d529fa2d942f945c7ea8622a0e4217c79249ae831ddb9
 MISC metadata.xml 557 BLAKE2B 40a5075b9313be98cc5566696ebdf42dfa77814d2c5907832c06b8f846cb902023949bca3aa1b37a03a756649c6025f5f91357c0f6c73292b864396ea1c118cd SHA512 248d0177b4794bd342b35ce901f91a67227f1d8b256f6a56f06b3d424e94dbfb48b8500623bdccc2e0650402276cc1e50d1a7f475e2b04505ec0d4b4f2b590fe
diff --git a/sys-apps/selinux-python/selinux-python-2.8-r1.ebuild b/sys-apps/selinux-python/selinux-python-3.0.ebuild
index 76d7035f05ae..6dca5e8b459a 100644
--- a/sys-apps/selinux-python/selinux-python-2.8-r1.ebuild
+++ b/sys-apps/selinux-python/selinux-python-3.0.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
 inherit python-r1 toolchain-funcs
 
 MY_P="${P//_/-}"
 
-MY_RELEASEDATE="20180524"
+MY_RELEASEDATE="20191204"
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
 SEMNG_VER="${PV}"
@@ -25,8 +25,8 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
 	S="${WORKDIR}/${MY_P}/${PN#selinux-}"
 else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~mips x86"
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/selinux-python/selinux-python-9999.ebuild b/sys-apps/selinux-python/selinux-python-9999.ebuild
index eb75834f5ef4..6dca5e8b459a 100644
--- a/sys-apps/selinux-python/selinux-python-9999.ebuild
+++ b/sys-apps/selinux-python/selinux-python-9999.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
 inherit python-r1 toolchain-funcs
 
 MY_P="${P//_/-}"
 
-MY_RELEASEDATE="20190315"
+MY_RELEASEDATE="20191204"
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
 SEMNG_VER="${PV}"
diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest
index 25c89219d13f..fbd707221bd1 100644
--- a/sys-apps/semodule-utils/Manifest
+++ b/sys-apps/semodule-utils/Manifest
@@ -1,6 +1,6 @@
-DIST semodule-utils-2.8.tar.gz 12536 BLAKE2B 93a2f8fee887eba72b009071549a687fe86045344979e31493b3f17041ddf3f31c29ea3c754a31f6029847798dfe26d63b02fadc1042bc68aa414050b283d208 SHA512 13d79a22115f5448dafc5202dc3dec66b9ad826051d61d7c126defe823407959511db35713d97c7dfe9e79de96193fec91a10b98c13743e06a1213f5734f4ae7
 DIST semodule-utils-2.9.tar.gz 14259 BLAKE2B f72630c520504596171ac6f678b1fde2bb8482b620f0d8f6374c59b85d634ee8c407e3e4b268dae4d6cecfa2749b26f8808dd56f7c5391e7d1ba11f4a8a789e5 SHA512 688f1fcb34042b837019302debda76847691657709130b99bf937a85774a0ae69d789ee82b0633a4d2dc661dc6d0a1706a878ac681317df2abe68418bec3f952
-EBUILD semodule-utils-2.8.ebuild 997 BLAKE2B 90d4e8740267ebc4f9e6bc3453dbe70ebbab54fb9025665c79e46df829fe8df4a754beafab46ad13b32273fa4dd527014ad47692e4858eff85672391dcd9c02d SHA512 689ec194b0852d3eb75f0f618a1cf4db0927718d408e4040a5240b874548169d326ec17be7233f78313ad4c5c8f12e5c02428aaccef12170e8ba3efa2afefdd3
+DIST semodule-utils-3.0.tar.gz 14263 BLAKE2B 119f40b34184e2cb0719e6a34ffb026f23c172f74d8ca3812220785381fabc5c3761865ec3b211f03f5c96b9ae0081341a661c2be78198171b09c99b37bb0716 SHA512 004e8f02f7e7e6f016b2b5a1a7720a87409d77d0040f7df830cf73808c9f8e3d87b41a7cea273420909971ce8bcc6540d5a46bd25be8c032b12257b4861e1769
 EBUILD semodule-utils-2.9.ebuild 977 BLAKE2B deb8b71bd36deb5b50e05578d31ede94a40c5e8c81070af3b55c83f82e17e5cd320a09ab6816a1aae945a431d3827773150c14bbe2b32743e59f544ec6dfb678 SHA512 4d817a11754753080b233110e1f24fa832427fb366ba39462959e197f724064b335e848aa47b1fcbce235627b7691b61c527e5b7e7e8410d81c0e2c84f811701
-EBUILD semodule-utils-9999.ebuild 979 BLAKE2B 883ffc075aab31c03f87630580fc008ebf5849a0ade11e16a0c73a275da09b55d4fd146f49eb817434fca8b57e5ba2922ee3b97a4491662ec22cc57331958167 SHA512 f1e4f5909b1b0781e7573139e3f80f46694bbfefab40bc12357eadc51624e4e3b56de4a58bc5fd397567787957492e17be79af9ab7835babbef02125accc52b8
+EBUILD semodule-utils-3.0.ebuild 979 BLAKE2B 4d791f07229bcbd588085aabb6217a817542805a4e1a9dcf3481202cddd7fa165c8bd6572c685ff96626320af65463452fcc19e14beec7b1d64634578b4a90e6 SHA512 8ba50ac799bd408a9bc0d4e896a14bcb90aee3469695dfb108b70607e885c6a2c488b9c700f7b9d8e3866149721f61f6b8505d7a3fe913f664ac8dfcab1e8f24
+EBUILD semodule-utils-9999.ebuild 979 BLAKE2B 4d791f07229bcbd588085aabb6217a817542805a4e1a9dcf3481202cddd7fa165c8bd6572c685ff96626320af65463452fcc19e14beec7b1d64634578b4a90e6 SHA512 8ba50ac799bd408a9bc0d4e896a14bcb90aee3469695dfb108b70607e885c6a2c488b9c700f7b9d8e3866149721f61f6b8505d7a3fe913f664ac8dfcab1e8f24
 MISC metadata.xml 521 BLAKE2B 5785152e6b947a78aa09c12816bdee5f0c93e718d0a3cb9244b1b769dab19bb057db91c49179990d06e8cfc6bac692b5223ddf2137ea043a13ee58c41b2ade1d SHA512 e15b382ddf7059ff9c82887d636522dcc993e580e715d4a822106ed27c7fdb75b32e96c8c32a34cbdbbef4ad0f9c49bfb7c7420ea97852fa82e7740c4044a689
diff --git a/sys-apps/semodule-utils/semodule-utils-2.8.ebuild b/sys-apps/semodule-utils/semodule-utils-3.0.ebuild
index 2d1aad84d516..dfe7c8bdc466 100644
--- a/sys-apps/semodule-utils/semodule-utils-2.8.ebuild
+++ b/sys-apps/semodule-utils/semodule-utils-3.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20180524"
+MY_RELEASEDATE="20191204"
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
 
@@ -17,8 +17,8 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/semodule-utils/semodule-utils-9999.ebuild b/sys-apps/semodule-utils/semodule-utils-9999.ebuild
index bf80b21dfc42..dfe7c8bdc466 100644
--- a/sys-apps/semodule-utils/semodule-utils-9999.ebuild
+++ b/sys-apps/semodule-utils/semodule-utils-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20190315"
+MY_RELEASEDATE="20191204"
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
 
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 2d49d84cee30..de0ba7aebde7 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -2,9 +2,12 @@ AUX default/useradd 96 BLAKE2B 64b694bdff7f901e19ac21695e3b2eebeb5a03683be5a01e3
 AUX pam.d-include/passwd 144 BLAKE2B 95e159c70416218950ad5cdc41c83b52f8d2ec042d35c9908ca400bd57dcb234fb7691aa2a5a7646a379553aa6dee0dd96ee569aa492d7f20774e991a90f8602 SHA512 31611a08d97cd2c129f18d451a555ff6c781f91603c77fc0c66ff406b5fa4a97db19ae4ce104816a6324529d10e131de0d5329646bdab2abc8dc3ee5b82b057f
 AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085cc475fa09c47cb008b41a7a00a7de2816b2c5cb2f48452d1b07523be35f8dd29026736ba8fbd3ae3d7c56 SHA512 d07611c350d0d6f3386db5080c80a84e4135cf33e44fd3a390cb1092e034f9bd2a69495fadd4bda6ede9962e9658e77f2c8e12d3189cdcda6c7b3c607336f0c3
 AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d67cd0daddf8ee05debf447d091530517a855078bd53ce28c87045643b2b8c467dd09caad06a4eb0a6568c271e6a42b49a54dcc SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d
+AUX shadow-4.7-optional_su.patch 3683 BLAKE2B 084151a48182f2b46830f4bcbe46234f753c169614d12f582acc93bed8c5ce69d8cd6bfeccb9936f0dbcb76efe947ae36e415fd659ffd4ee51c64d3270c33e6f SHA512 7f60622470d77b28d603d85b7873cfa01896f8368a09491fd1a0eac93aa6e763638cb279392b6a787b6be39c961566732aa1057b096480f397a50e1e2b10672c
+AUX shadow-4.8-revert-bin-merge.patch 305 BLAKE2B 2fb6407ed60251b3367931c2c7eb9b2bdaaff565ff5338fb6ffddc9b618963e7835925c07fea0cbaeeee90a03b7e0c571f0e1b9e1844fe9397f4e74672edb080 SHA512 bd821f6af288ac4a3cf9b0de30753626db90d187ece7d53ee7e0d6b7c61dbfecda84bd9ae60958120cc8ddce48055878c9daaa668dd88392bb70b73c7ad4fb01
 DIST shadow-4.6.tar.gz 3804282 BLAKE2B 268c90e7daba138827aec6039f428f52cdcf7929743fa1f49f801cc669de7456ec5a69531194cdb29f051ce7d0b2f1e966fdf2513a9fc8f7fbdeb29d786a509f SHA512 36358333e7f03ef558772f3361bc5851a7d7fd3d85c993a6b732e37304b8068b2893d55607b9bfe8b8eed616a687264f947ff66cefc74ea1a48ba9396d464714
 DIST shadow-4.7.tar.gz 3833335 BLAKE2B 8e030d3dcc5eb76332ff76aad8e9141edb4ae660f56dd3b420968c538d3022a72ab620710b9274b9afb44f497399f5c4ceef339b7d2c52106b9b8368ff127654 SHA512 9b134dc90d8fb39bc72db69ddb78cef6263921c8a2f00abc00ac796bf468ac18393399920eec14bd2a78b814a06fc18eb6f5685ede13fe222fc66b2e411cbb01
+DIST shadow-4.8.tar.xz 1609060 BLAKE2B 9d0b515e40f45c0baf420ef7ffaf5b6dd7989b26c93fc6dd610876263ac22e61fbc2821649d347c28055ae84f64cd5ab5c2435450c55339c80b4ae5062ccc44f SHA512 1c607aec541400fc179d6cbbac7511289c618ab2ce6ee9d7c18a8bfda00421c62d4b9e58aff52b5f82d485468e7db955c186ea0faad9a08003ffc01bdf2ccece
 EBUILD shadow-4.6.ebuild 5363 BLAKE2B 90361141986d5b78eee02f022665073d2af2970949a5406b9aee09b5a7abd7aa8397048596275daa3bba4547380764f2c5ff26d634cbf03f8c387274f016282e SHA512 95c2ab76e365f10cf57277708dca5a5b96b24f1d527cd86d1ab5209f04f51251b3eb123473c77558223ae8c08310af13d2f8fe6e7314f69055933af8a9001074
-EBUILD shadow-4.7-r1.ebuild 5280 BLAKE2B a50d1cbf84e8b5c1bf78ddd209da6d8754256c98cb10bf15af8b2eaf5291796f2ef5970bd5b775930ed164d571a02525e71433ac988e6855cd3355b226300e1d SHA512 1f86e9b1d2a6e2810bd4f9a2f9b8520953b26e9d2732a7ba4e47b81dfd9d99dcf28df19ef5b965803553e3b3e914fe2b3b7233a02fa5f40e080ae5409160cdad
-EBUILD shadow-4.7.ebuild 5345 BLAKE2B 185e09ffdbcc8c14117d79c4a5a6f39d6e1402c71524f73828acaf8feb678ca8cd3b3a5d05178b8e2b98dad16fe90eaaca30fe809e1e68fbd592c3f228dc6813 SHA512 ad37ab6100fce2c3db53f2e8d73f6be77a5afec76cd16b2b74cb2efb7b33b9d7f9af49309efc672df09b334bef4938d18232f9cc61b4b1ceb6215a7fb74dce2f
-MISC metadata.xml 425 BLAKE2B 363f3a5caf1aaf0ddc3852f11191d8c3b9168ea1196ebba22c235942c23411dee2197715a2a52f513323ed845b96c7bc58ce59e5f609449fad5b6e807960ff82 SHA512 23577cff767bb0330e95f0390e3d5b5c2c43096a7103f38a9b91755d443a1f68b6f933d9e5c61feb37926565fb00e00c0b2b2dcef54270d69a77fdd78b143abb
+EBUILD shadow-4.7-r2.ebuild 5794 BLAKE2B f7a8dde2cac49657be337c7e226e6341c764ee0ed9ab1aa6e9d2bba96eb1f903c9fdb63c77152f5fd1ed1a4493fdd16a87ef6a01010c493650deb0a05da9a8e3 SHA512 9965f73207d382ca980fc996978ea6db7520b343029c61ae0d192ef4cb77dafe89e42142dcf561648c224415d1d696bcc865bce0544744e77579ba62a928e80b
+EBUILD shadow-4.8-r1.ebuild 5822 BLAKE2B 83b25419543bd8f7905822f73971ae4f024cedd451d608d1f8568079ff05cb673b74cf8056364bca8c5af8a9c364e79bd149ec063b3cd3aedcc63c30a43cb943 SHA512 ef1e8110e27c67a5ff1ab766ddfeef9c104d1d2f508cac5589486353183465e41e4f24253b8542486ec1ef5015c119cdddb054e98a82618d1b94b3d3e560d23e
+MISC metadata.xml 562 BLAKE2B 7ea54e53f53a91898e5cb5975e9f1aa37639b0ca887213e389c85e0b46cc2dcdf6a1a80795ecd3a74ecc1c4b76d600af563b8d26ce618de1030914ae04f4b152 SHA512 35e207e3d5e3de3f93c8c4a580ec7109bbb778d2d424eef76c5c6b25f8b47d68480a55e9d2b15f9be4f27a273443d6220752337eb538dc05517c0c5a004722e7
diff --git a/sys-apps/shadow/files/shadow-4.7-optional_su.patch b/sys-apps/shadow/files/shadow-4.7-optional_su.patch
new file mode 100644
index 000000000000..472846460776
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.7-optional_su.patch
@@ -0,0 +1,130 @@
+From ddb0553b2e559fd431fe8b460c37cb7fef8c06ee Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 19 Nov 2019 10:57:06 +0100
+Subject: [PATCH] build: Make build/installation of su and its support files
+ optional
+
+Enabled by default
+This is necessary because coreutils and util-linux can also provide su
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac          |  7 +++++++
+ etc/pam.d/Makefile.am |  7 +++++--
+ man/Makefile.am       |  5 ++++-
+ src/Makefile.am       | 10 ++++++++--
+ 4 files changed, 24 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 67625564..5629df98 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -286,6 +286,9 @@ AC_ARG_WITH(sssd,
+ AC_ARG_WITH(group-name-max-length,
+ 	[AC_HELP_STRING([--with-group-name-max-length], [set max group name length @<:@default=16@:>@])],
+ 	[with_group_name_max_length=$withval], [with_group_name_max_length=yes])
++AC_ARG_WITH(su,
++	[AC_HELP_STRING([--with-su], [build and install su program and man page @<:@default=yes@:>@])],
++	[with_su=$withval], [with_su=yes])
+ 
+ if test "$with_group_name_max_length" = "no" ; then
+ 	with_group_name_max_length=0
+@@ -313,6 +316,9 @@ if test "$with_sssd" = "yes"; then
+ 	              [AC_MSG_ERROR([posix_spawn is needed for sssd support])])
+ fi
+ 
++AS_IF([test "$with_su" != "no"], AC_DEFINE(WITH_SU, 1, [Build with su])])
++AM_CONDITIONAL([WITH_SU], [test "x$with_su" != "xno"])
++
+ dnl Check for some functions in libc first, only if not found check for
+ dnl other libraries.  This should prevent linking libnsl if not really
+ dnl needed (Linux glibc, Irix), but still link it if needed (Solaris).
+@@ -719,4 +725,5 @@ echo "	nscd support:			$with_nscd"
+ echo "	sssd support:			$with_sssd"
+ echo "	subordinate IDs support:	$enable_subids"
+ echo "	use file caps:			$with_fcaps"
++echo "	install su:			$with_su"
+ echo
+diff --git a/etc/pam.d/Makefile.am b/etc/pam.d/Makefile.am
+index d967eb95..38ff26ae 100644
+--- a/etc/pam.d/Makefile.am
++++ b/etc/pam.d/Makefile.am
+@@ -6,8 +6,7 @@ pamd_files = \
+ 	chsh \
+ 	groupmems \
+ 	login \
+-	passwd \
+-	su
++	passwd
+ 
+ pamd_acct_tools_files = \
+ 	chage \
+@@ -29,4 +28,8 @@ pamd_DATA += $(pamd_acct_tools_files)
+ endif
+ endif
+ 
++if WITH_SU
++pamd_files += su
++endif
++
+ EXTRA_DIST = $(pamd_files) $(pamd_acct_tools_files)
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 3f040e05..8b64feba 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -41,7 +41,6 @@ man_MANS = \
+ 	man1/sg.1 \
+ 	man3/shadow.3 \
+ 	man5/shadow.5 \
+-	man1/su.1 \
+ 	man5/suauth.5 \
+ 	man8/useradd.8 \
+ 	man8/userdel.8 \
+@@ -54,6 +53,10 @@ man_nopam = \
+ 	man5/login.access.5 \
+ 	man5/porttime.5
+ 
++if WITH_SU
++man_MANS += man1/su.1
++endif
++
+ if !USE_PAM
+ man_MANS += $(man_nopam)
+ endif
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 34690ced..06ee9545 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -23,12 +23,15 @@ AM_CPPFLAGS = \
+ # and installation would be much simpler (just two directories,
+ # $prefix/bin and $prefix/sbin, no install-data hacks...)
+ 
+-bin_PROGRAMS   = groups login su
++bin_PROGRAMS   = groups login
+ sbin_PROGRAMS  = nologin
+ ubin_PROGRAMS  = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd
+ if ENABLE_SUBIDS
+ ubin_PROGRAMS += newgidmap newuidmap
+ endif
++if WITH_SU
++bin_PROGRAMS  += su
++endif
+ usbin_PROGRAMS = \
+ 	chgpasswd \
+ 	chpasswd \
+@@ -52,8 +55,11 @@ usbin_PROGRAMS = \
+ # id and groups are from gnu, sulogin from sysvinit
+ noinst_PROGRAMS = id sulogin
+ 
+-suidbins       = su
++suidbins       =
+ suidubins      = chage chfn chsh expiry gpasswd newgrp
++if WITH_SU
++suidbins      += su
++endif
+ if !WITH_TCB
+ suidubins += passwd
+ endif
+-- 
+2.24.0
+
diff --git a/sys-apps/shadow/files/shadow-4.8-revert-bin-merge.patch b/sys-apps/shadow/files/shadow-4.8-revert-bin-merge.patch
new file mode 100644
index 000000000000..08382fcb9500
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.8-revert-bin-merge.patch
@@ -0,0 +1,15 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 97839741..ff153d92 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -2,8 +2,8 @@
+ EXTRA_DIST = \
+ 	.indent.pro
+ 
+-ubindir = ${bindir}
+-usbindir = ${sbindir}
++ubindir = ${prefix}/bin
++usbindir = ${prefix}/sbin
+ suidperms = 4755
+ sgidperms = 2755
+ 
diff --git a/sys-apps/shadow/metadata.xml b/sys-apps/shadow/metadata.xml
index 623e134e2752..908eabb59f33 100644
--- a/sys-apps/shadow/metadata.xml
+++ b/sys-apps/shadow/metadata.xml
@@ -5,6 +5,10 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
+	<use>
+		<flag name="bcrypt">build the bcrypt password encryption algorithm</flag>
+		<flag name="su">build the su program</flag>
+	</use>
 	<!-- only for USE=pam -->
 	<upstream>
 		<remote-id type="cpe">cpe:/a:debian:shadow</remote-id>
diff --git a/sys-apps/shadow/shadow-4.7.ebuild b/sys-apps/shadow/shadow-4.7-r2.ebuild
index e560d827c464..f3291b9c2c01 100644
--- a/sys-apps/shadow/shadow-4.7.ebuild
+++ b/sys-apps/shadow/shadow-4.7-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit libtool pam
+inherit autotools libtool pam
 
 DESCRIPTION="Utilities to deal with user accounts"
 HOMEPAGE="https://github.com/shadow-maint/shadow"
@@ -12,51 +12,60 @@ 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 ~riscv ~s390 ~sh ~sparc ~x86"
-IUSE="acl audit +cracklib nls pam selinux skey split-usr xattr"
+IUSE="acl audit +cracklib nls pam selinux skey split-usr +su 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 )
 
-DEPEND="acl? ( sys-apps/acl:0= )
+DEPEND="
+	acl? ( sys-apps/acl:0= )
 	audit? ( >=sys-process/audit-2.6:0= )
 	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
+	nls? ( virtual/libintl )
 	pam? ( sys-libs/pam:0= )
 	skey? ( sys-auth/skey:0= )
 	selinux? (
 		>=sys-libs/libselinux-1.28:0=
 		sys-libs/libsemanage:0=
 	)
-	nls? ( virtual/libintl )
-	xattr? ( sys-apps/attr:0= )"
+	su? ( !sys-apps/util-linux[su] )
+	xattr? ( sys-apps/attr:0= )
+"
 BDEPEND="
 	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-RDEPEND="${DEPEND}
-	pam? ( >=sys-auth/pambase-20150213 )"
+	sys-devel/gettext
+"
+RDEPEND="
+	${DEPEND}
+	pam? ( >=sys-auth/pambase-20150213 )
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
+	"${FILESDIR}/${PN}-4.7-optional_su.patch"
 )
 
 src_prepare() {
 	default
-	#eautoreconf
-	elibtoolize
+	eautoreconf
+	#elibtoolize
 }
 
 src_configure() {
 	local myeconfargs=(
+		--with-btrfs
 		--without-group-name-max-length
 		--without-tcb
 		--enable-shared=no
 		--enable-static=yes
+		$(use_enable nls)
 		$(use_with acl)
 		$(use_with audit)
 		$(use_with cracklib libcrack)
+		$(use_with elibc_glibc nscd)
 		$(use_with pam libpam)
-		$(use_with skey)
 		$(use_with selinux)
-		$(use_enable nls)
-		$(use_with elibc_glibc nscd)
+		$(use_with skey)
+		$(use_with su)
 		$(use_with xattr attr)
 	)
 	econf "${myeconfargs[@]}"
@@ -111,6 +120,9 @@ src_install() {
 
 	if use split-usr ; then
 		# move passwd to / to help recover broke systems #64441
+		# We cannot simply remove this or else net-misc/scponly
+		# and other tools will break because of hardcoded passwd
+		# location
 		dodir /bin
 		mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
 		dosym ../../bin/passwd /usr/bin/passwd
@@ -174,12 +186,15 @@ src_install() {
 
 		# remove manpages that pam will install for us
 		# and/or don't apply when using pam
-		find "${ED}"/usr/share/man \
+		find "${ED}"/usr/share/man -type f \
 			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
 			-delete
 
 		# Remove pam.d files provided by pambase.
-		rm "${ED}"/etc/pam.d/{login,passwd,su} || die
+		rm "${ED}"/etc/pam.d/{login,passwd} || die
+		if use su ; then
+			rm "${ED}"/etc/pam.d/su || die
+		fi
 	fi
 
 	# Remove manpages that are handled by other packages
@@ -210,5 +225,10 @@ pkg_postinst() {
 		fi
 	fi
 
+	[[ ! -f "${EROOT}"/etc/subgid ]] &&
+		touch "${EROOT}"/etc/subgid
+	[[ ! -f "${EROOT}"/etc/subuid ]] &&
+		touch "${EROOT}"/etc/subuid
+
 	einfo "The 'adduser' symlink to 'useradd' has been dropped."
 }
diff --git a/sys-apps/shadow/shadow-4.7-r1.ebuild b/sys-apps/shadow/shadow-4.8-r1.ebuild
index c0735c920ae1..181e391ab249 100644
--- a/sys-apps/shadow/shadow-4.7-r1.ebuild
+++ b/sys-apps/shadow/shadow-4.8-r1.ebuild
@@ -3,60 +3,70 @@
 
 EAPI=7
 
-inherit libtool pam
+inherit autotools libtool pam
 
 DESCRIPTION="Utilities to deal with user accounts"
 HOMEPAGE="https://github.com/shadow-maint/shadow"
-SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-IUSE="acl audit +cracklib nls pam selinux skey xattr"
+IUSE="acl audit bcrypt +cracklib nls pam selinux skey split-usr +su 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 )
 
-DEPEND="acl? ( sys-apps/acl:0= )
+DEPEND="
+	acl? ( sys-apps/acl:0= )
 	audit? ( >=sys-process/audit-2.6:0= )
 	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
+	nls? ( virtual/libintl )
 	pam? ( sys-libs/pam:0= )
 	skey? ( sys-auth/skey:0= )
 	selinux? (
 		>=sys-libs/libselinux-1.28:0=
 		sys-libs/libsemanage:0=
 	)
-	nls? ( virtual/libintl )
-	xattr? ( sys-apps/attr:0= )"
+	su? ( !sys-apps/util-linux[su] )
+	xattr? ( sys-apps/attr:0= )
+"
 BDEPEND="
 	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-RDEPEND="${DEPEND}
-	pam? ( >=sys-auth/pambase-20150213 )"
+	sys-devel/gettext
+"
+RDEPEND="
+	${DEPEND}
+	pam? ( >=sys-auth/pambase-20150213 )
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
+	"${FILESDIR}/${P}-revert-bin-merge.patch"
 )
 
 src_prepare() {
 	default
-	#eautoreconf
-	elibtoolize
+	eautoreconf
+	#elibtoolize
 }
 
 src_configure() {
 	local myeconfargs=(
+		--with-btrfs
 		--without-group-name-max-length
 		--without-tcb
 		--enable-shared=no
 		--enable-static=yes
+		$(use_enable nls)
 		$(use_with acl)
 		$(use_with audit)
+		$(use_with bcrypt)
 		$(use_with cracklib libcrack)
+		$(use_with elibc_glibc nscd)
 		$(use_with pam libpam)
-		$(use_with skey)
 		$(use_with selinux)
-		$(use_enable nls)
-		$(use_with elibc_glibc nscd)
+		$(use_with skey)
+		$(use_with su)
 		$(use_with xattr attr)
 	)
 	econf "${myeconfargs[@]}"
@@ -109,6 +119,16 @@ src_install() {
 	insopts -m0600
 	doins "${FILESDIR}"/default/useradd
 
+	if use split-usr ; then
+		# move passwd to / to help recover broke systems #64441
+		# We cannot simply remove this or else net-misc/scponly
+		# and other tools will break because of hardcoded passwd
+		# location
+		dodir /bin
+		mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
+		dosym ../../bin/passwd /usr/bin/passwd
+	fi
+
 	cd "${S}" || die
 	insinto /etc
 	insopts -m0644
@@ -167,12 +187,15 @@ src_install() {
 
 		# remove manpages that pam will install for us
 		# and/or don't apply when using pam
-		find "${ED}"/usr/share/man \
+		find "${ED}"/usr/share/man -type f \
 			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
 			-delete
 
 		# Remove pam.d files provided by pambase.
-		rm "${ED}"/etc/pam.d/{login,passwd,su} || die
+		rm "${ED}"/etc/pam.d/{login,passwd} || die
+		if use su ; then
+			rm "${ED}"/etc/pam.d/su || die
+		fi
 	fi
 
 	# Remove manpages that are handled by other packages
diff --git a/sys-apps/smc-sum-driver/Manifest b/sys-apps/smc-sum-driver/Manifest
index fa58f8edb0a4..04b3d9772fcc 100644
--- a/sys-apps/smc-sum-driver/Manifest
+++ b/sys-apps/smc-sum-driver/Manifest
@@ -1,4 +1,4 @@
 AUX makefile 298 BLAKE2B 58431440f52821bf8f1a6070075eace33f173dc1cbe19722c033cc6525b2ae4a6890aec2870f68b282368c9722b87796a14b53d364ce3e7002dfac452480e74e SHA512 862b6a2ae684da3b864eacef8b645c27ef4a6ccc4f577ccc9c5d88cd0426ce66a6462bcaaf01bdd0082898f7e3801cd6a00bc1c702af83faf7ca31b9de1c14e9
 DIST sum_driver_V1.6.0_20151201.tar.gz 1423921 BLAKE2B 76e2439148749b708a51e0d9c95545b53762f03793e6b2ea6e63e9f79aaad77432f728e94713e0cfd4085e8b090b6e0ff8e779e2627764e71794453cb7e02b49 SHA512 809fdf164e29aabde74306d966de7e07488d8dacc01963b56486477f23bdf3a469d059bc5d302aedbfd4b8dc854a82357747add2626cc22d0ab3898c7bc0a625
 EBUILD smc-sum-driver-1.6.0.20151201-r3.ebuild 943 BLAKE2B 1c24eee001edb3e38528d07adc76ac7afa8b8e8fbcffb5c10c16f1b6b2f0997ad0c3c6f96ca614e2bfa14dfc4514d95836b1c9e62f767560087bf3d512ff2399 SHA512 cc243884ae3ab64d0eb6abcfed56c8f2ee852b13d24facdd5907139a961473a7a79f5a3f0ccf594c5ee691836259f8f03bff1b4f84effc00152115ed6e0a6ddf
-MISC metadata.xml 602 BLAKE2B 6bb453de4cd9a7cd7f52648c2994ac056bb756a8851659bd4075341e5d97a6cd81d056ef54cd4315ae25d6821ac684bafaee12d7928d7a998724e87af57cf05f SHA512 27d229c5f3ea94fb7098f4659edf321b048ecdba0624a41cfc53cec5b3d3c975914fc599494ebb03ae5dc8ea29993a23e90a9b7be76505cb7dcdf8ab1e3d9b5e
+MISC metadata.xml 483 BLAKE2B 05700b3332f81f8a53b82a02445e38d56f8b0acc47d97e076a5b61ebeec2b0dab3d0f9f1c1af6918368da82b2ae5f3f6c0bce808738bd5885e54debba00afebe SHA512 e3da2424e8433f449b9a713a19bd8ce3492c9d80f7d523e68ec7647348b98d163df27b2eb2ebda199f965c4b827ee3dd6e40e726c44ab5d262d408218c7b7492
diff --git a/sys-apps/smc-sum-driver/metadata.xml b/sys-apps/smc-sum-driver/metadata.xml
index 3720c27565ed..1e4e3f71251c 100644
--- a/sys-apps/smc-sum-driver/metadata.xml
+++ b/sys-apps/smc-sum-driver/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		This is the kernel module for the Supermicro Update Manager (SUM).
 		It's needed to access specific low level elements, like BIOS.
diff --git a/sys-apps/smc-sum/Manifest b/sys-apps/smc-sum/Manifest
index 2dd9b75c3f8d..feb77a1aa61c 100644
--- a/sys-apps/smc-sum/Manifest
+++ b/sys-apps/smc-sum/Manifest
@@ -1,3 +1,3 @@
 DIST sum_2.3.0_Linux_x86_64_20190808.tar.gz 8783572 BLAKE2B 92abe3cd246573c107aad5ce76334d5d53d4e5067f6c74c70b8c078910047a6d5254427de89b649b9fdc75832d43fca319a16f4143a486966beb9074b90cb3fc SHA512 83d8e619cd9ad838b681dbee294d6c19741add0994678778c2e7519ed354e447799a5b12676bd9f3ba0ecd8976258b4a11fe4e2e988276ac1aa0353020201ef2
 EBUILD smc-sum-2.3.0.20190808.ebuild 938 BLAKE2B dbf6feb7af9cc2881e67389772fd80e23bcd23ac2754f7103dbe174311cf1784163198ea45e834bed2c8f7d98163442632dc1d66c80b00cb2b9709894f079e58 SHA512 1cabeed843808fab62fd9de514cbcd551b41e63f737895bf8de485d64558e4b574765f83eddb4481e56c0e9602fea37f3c3445446c1c0a270f8401fa9ff54a4c
-MISC metadata.xml 1216 BLAKE2B 4681e4113f5505342e467ba4bd775c4d7fc2ba548d560f7c2bf6e4a4505f9b42de46fe3a0672bea4e3ee69a25af565e76242af8f41df29186c349f404cb029ab SHA512 23ad5c95fcc33a114bb525f7ca6fd6b8bad4580a00ee1e693535d5026a8ef55f48da9620af1ae8c4e61ab285fd92ccbf36d42046c27e00436bd844eb0a9678eb
+MISC metadata.xml 1097 BLAKE2B 2614ed1fd32c33675e1e78fc069670ec2b156efc376beecead2ebc2d7212e918f0fdf923d90f9d6db61a1c672f565701c2fff812e801a6ed955d299506653cf6 SHA512 cebd02c5e048668caf78a5bfc19114ebef9fd55ae9c25adb8c61275b847d7311ae38ab1825b029770bc191b65b334eafcddcbf1c50825c234542e1454b78e730
diff --git a/sys-apps/smc-sum/metadata.xml b/sys-apps/smc-sum/metadata.xml
index f8c11efe2d37..80a8eba76e4c 100644
--- a/sys-apps/smc-sum/metadata.xml
+++ b/sys-apps/smc-sum/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		Supermicro Update Manager (SUM) can be used to manage the firmware and configuration
 		for Supermicro X9 (Romley), X10, B10, X11, B11, H11 generation motherboards.
diff --git a/sys-apps/smcipmitool/Manifest b/sys-apps/smcipmitool/Manifest
index 3712512cfad0..b3a5177ada34 100644
--- a/sys-apps/smcipmitool/Manifest
+++ b/sys-apps/smcipmitool/Manifest
@@ -5,4 +5,4 @@ DIST SMCIPMITool_2.21.0_build.181029_bundleJRE_Linux_x64.tar.gz 119034481 BLAKE2
 DIST SMCIPMITool_2.22.0_build.190701_bundleJRE_Linux_x64.tar.gz 77421471 BLAKE2B fffb158364c7d8a71bd3e1c81ac6e0822cbaa00470aa2df14e34663b92d4c2641d01ab18c63b251e696624e3988ec5bcee97d72e3788b2f77e43db682e568077 SHA512 ea68816e3ab294862b5b6927305283f4204364ed9b319e3be577bc49bf47f767b89e05475e11269b426f73385148c10cf0109715708497737db393846cf10ccf
 EBUILD smcipmitool-2.21.0.181029.ebuild 2209 BLAKE2B 0cb30302e5cd7bbf9d0205dba7605d5a124ad5a54b538580b878c9111d24f61d9805011c8513a292525163ababc8f522507a484bafce3a2d26cc38a772bee1ea SHA512 a73f9d575679c44ad14092356ad53e4825690b4a3fbb32b5678cd7441e64d8bf80823d7e04939e1a9008c170f597f59483b758ebd3fcff3c3fc9a2628ff8ddc0
 EBUILD smcipmitool-2.22.0.190701.ebuild 2013 BLAKE2B 9f46e27eb0c35bfa99cbb4797cd08a542aca163ae699364a1f6a3161c4a1baff5fc6ede1e5a2ca3f5b993415670d125ca30bb8c01529426ab7acb81daf2f51bf SHA512 5b9613df9f9e3de9b536a4a3cdaae3f5013145f70fb7ef937d76a724e99d06f35f412ac9af896fc3479865062275bcbe19f7017a3330a8cdf6126a80f6614404
-MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
+MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/sys-apps/smcipmitool/metadata.xml b/sys-apps/smcipmitool/metadata.xml
index 54d5423c4060..3e3880cf1051 100644
--- a/sys-apps/smcipmitool/metadata.xml
+++ b/sys-apps/smcipmitool/metadata.xml
@@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/superdiag/Manifest b/sys-apps/superdiag/Manifest
index 484f625d63d6..b502b9783058 100644
--- a/sys-apps/superdiag/Manifest
+++ b/sys-apps/superdiag/Manifest
@@ -1,3 +1,3 @@
 DIST SuperDiag_1.2.0_20190711.zip 4826479 BLAKE2B c0ffaf59ab1cbbe406a907938bf028844781533516dc6b0f2c2ee8144395da48a43e5931ef65e6990c97cfb887dd086d7535260319721b534e3b66135c37c680 SHA512 24ac9224a302e4f61a56015476b5c5fb279a057acae97e12c1e8e9271a8f410337f6182d5204d531927b0004ccb76b65c784c91be2c3644d0f30db0c8eca4c6f
 EBUILD superdiag-1.2.0.20190711.ebuild 1684 BLAKE2B d570b13d31a3be75381fa3dc3facb3932a768862f0c74403d72c1ed055c9395979eea8fb66fc60b4de639848cf1dc25a497613aaffbf5ba32bceabce4b629ca7 SHA512 767e626430a3df45362efd793f35e35f473f618a077940b63e9ac448ef863864d83b758bf5e2b063e6964ff2e3b006c04da885adbf531fd1f7c64cbb3678380f
-MISC metadata.xml 1029 BLAKE2B 13723c78dd32c1f8c2109f857e6c4920416847a759dd2676060468cfba802cadd87d5ebf90deae548f04b71e1bab00e8f4f6668ef8bb5487c504ce3823bfc708 SHA512 48410f21f790cc13623ac9f0812b205b017b57a47d82b8af11a9b9fd6a3d83b8d761205d6fe919c3d1fe637ff8554c17fee5af9754c4d978e0d3f52e749eff0e
+MISC metadata.xml 910 BLAKE2B 59eaa7f51cc6c2c733b62b5f5bdebac5737b3af580fb8afe91f6f5b96e5cb49e66635b182d204a6536141aad275307d0e580ca272ba8d5020635c9c96f9e106b SHA512 e066b98f13d3669a2dd97a38b454c20ec59f5e40ad95fcad43e29bb6baf6958091517f95d94380c2ea2edd41b057f284b687267422bf01da62628f07ca255e0d
diff --git a/sys-apps/superdiag/metadata.xml b/sys-apps/superdiag/metadata.xml
index c8ab6cc03ab4..417a39cf570a 100644
--- a/sys-apps/superdiag/metadata.xml
+++ b/sys-apps/superdiag/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		The Super Diagnostics provides offline the capability to determine
 		the health of Supermicro server's components, including CPU, memory and I/O.
diff --git a/sys-apps/sydbox/Manifest b/sys-apps/sydbox/Manifest
index 5b7519a0291b..110b5539f130 100644
--- a/sys-apps/sydbox/Manifest
+++ b/sys-apps/sydbox/Manifest
@@ -1,3 +1,3 @@
 DIST sydbox-1.0.7.tar.bz2 480350 BLAKE2B d0e079148c997d6d452017a374d7795a79a8519cdf2c2f5f6f30c9fe4bd3cc8a579881de7bd1611615f18a8fc0bbd88e519cfbabc8e0e05009705a41ab6822f5 SHA512 b14d0cc6929aa705380dc2710e772054e07ca52c2990a71cac42d1111c90baf22253e168e1fe20eaf94ccde4d1ea1a3c1c26e4b9dd292f20a1028dc78a4e80d5
-EBUILD sydbox-1.0.7.ebuild 662 BLAKE2B 9bdc3dd77f3018e06889836325df7fc14dd156a91a0b2dabfcd3eb002135dbe439364466318f63f5bbe331d8eacd92a558f7aae50c202e8664cc230cb104f6eb SHA512 4b39dc76375cc8dbca4c7c5a2a60a921fa5fa21df4712462e17dd4ce31939ca6eef50519ee18356bbc49cf8673c0453f11fd0962a3d06c1e23c439f498ed8305
+EBUILD sydbox-1.0.7.ebuild 686 BLAKE2B c7ea29886a8decd7f5a5189503cdbbe3f81944ca1d121d5fae77a3046a9ace1317008ba07454335a6ef2fa2963657046d9ace575ea9f9311afa4c08d0bc8b69c SHA512 36d41c04dc069566ada300ab6f9398031149f1cee8288c38412750bafa607254cf22b919061c2cd2d9a972a7ef5b6ed19b349b0a00c67dbdb09f3c23b0904fd1
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/sys-apps/sydbox/sydbox-1.0.7.ebuild b/sys-apps/sydbox/sydbox-1.0.7.ebuild
index 951a50fa3a49..20a823ec7181 100644
--- a/sys-apps/sydbox/sydbox-1.0.7.ebuild
+++ b/sys-apps/sydbox/sydbox-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="debug seccomp test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="sys-libs/pinktrace:=
 	debug? ( sys-libs/libunwind:= )"
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 98ef0fb7ac29..9f45950f17be 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -13,9 +13,11 @@ AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e336403200580
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
 DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
+DIST systemd-244.tar.gz 8445963 BLAKE2B 19751fb9c058a079694ee1b991259fd3f1fa30ae98ca38bbe8caadfc5628db7848c7f742a1b11781fbd67f911adda917d7a4da1dddb63064907f86f47e5a3256 SHA512 08f260fb15b5eb273faafda826dd9154e9a02841b4c5911cc1c7e1445072ad51389f8cced7b9acf112737c20fd56b2fbf48b3f914733c934c774d38a23b616fb
 EBUILD systemd-242-r6.ebuild 14157 BLAKE2B eebb763acfe83ff486867663b3485605730725b00aa7e802624ba8f04bb64e4c4e269f617ab37b5322cd29d878aa4a604919993a9767ff99be4db325503d0edd SHA512 66804d5aa53ec07c841d0d6f6bf6eeb3e610b90f43e449f84550a67a8ead10bdef34a43df2839710e4f62410c94c72478cbb4b0ab3aa4d184d58628b50f94ad6
 EBUILD systemd-242-r7.ebuild 14195 BLAKE2B 96ca4520a2eaeca5c970adad294080b06c4e928b8369f52f55e7099116864ef76c38edc387c2315654213a98dc502fb7db9d6067c9baa9462ba204d18ea9ab42 SHA512 56bcdb8ecc8cca4e68708f7b17d57592d62ccf43dc4144505251d06f8763d1e9260a1c97547d2b7889119a1e81e890061d5e73786d552c6acd7175d207ca132f
-EBUILD systemd-243-r2.ebuild 14508 BLAKE2B aa8246f50f4c6c75965a66df4e1dbe7fafc741256f71cae3b35b91c25186fc5c79415cddcc58430d0d6e2e89ad7ddc41b93e9302f930859ad4e2f87da45d68e7 SHA512 124e41692fb8ac22c92b2d0d64e85e0fa27616853bb20bb67b8c5bf7167f51e796686fd1f6ac4067896717af11a8cec8bc08f8a51e348a6a9730f0ad096f8988
+EBUILD systemd-243-r2.ebuild 14506 BLAKE2B fbca09a3218b2015535c6e84287449749e86ba294f1db4c96940596f7dda54dd96d5aef3fe556e9c27b1189a55a7ff3c896cbb5bcf5cc0ac251d5a1485938391 SHA512 2f61f619ca7afb9f8c89fb7dc8fb135fa04ee67a3094a30222a5bbb75269eff4aa9926f22e6c93119ab317fc19aefec76e2677c0cde5ae9865037b8ce12fef82
 EBUILD systemd-243.ebuild 14255 BLAKE2B bcdf5056bce2710f3c088dfdb686c001816ad5fae721c06153d0eab50ae610f49b6449f4d6b4cb0abe0546f38f76a169569886b0f2446d3248a6d8f0b4c1216e SHA512 b8459206cc0395c6755ffe74cee27e48913c979204dbb794c659ad7c2cf8005d75ff4dda5984f65341cf04b7370a8a3d83718b8f9dc7c9fc1958203f31338a52
-EBUILD systemd-9999.ebuild 14481 BLAKE2B a01bcb68d3642c895ba67dd0aa2b79b5ee897423c2ecb32ff17a95ab0e5dcbfb0098b27b3e7fa710004b012708c0b79982b9d0bf7a6bb7602e36ef250a297be7 SHA512 4ca46d3ae151b793bc8609289df63701cccb3e608e9254f315af4873b79ad6c7cffbb74dd6e8f7da782f0156ce578059b96b0f359508ef5f28a6f9e5444440c8
+EBUILD systemd-244.ebuild 14457 BLAKE2B c26538d4869e2771d3a6181299d4b12f601e8f636eb964c2dbc7f75caca4679b0bd6ea45af037ed6427b7d8c851b018a345298d6d0bf7536c719353d16d5d30e SHA512 dc3debcda12b171cd99e137a0a63ba5506900a5bf39621ed64d0423eebb2b512efce9059167746171e17e63a1a35a7953be7e4b3a9406c4b9afd70cfed03e840
+EBUILD systemd-9999.ebuild 14457 BLAKE2B c26538d4869e2771d3a6181299d4b12f601e8f636eb964c2dbc7f75caca4679b0bd6ea45af037ed6427b7d8c851b018a345298d6d0bf7536c719353d16d5d30e SHA512 dc3debcda12b171cd99e137a0a63ba5506900a5bf39621ed64d0423eebb2b512efce9059167746171e17e63a1a35a7953be7e4b3a9406c4b9afd70cfed03e840
 MISC metadata.xml 2144 BLAKE2B f98da35b929799e76331e0f4957f175db15fd8766542058520aeeb1cc762f46c4e3c4d40b1dd21da50a3416807359c383e323e17de175a1439d7faa4bb4be0af SHA512 6e5847187232637a1de5f0d8fad2d6ad0515d537206ea3a7bd2ccd9f17e67789f5c80ebf295554aa135325f2e4260217de6e9a6a7f21dd70945a94ebfc3bf0de
diff --git a/sys-apps/systemd/systemd-243-r2.ebuild b/sys-apps/systemd/systemd-243-r2.ebuild
index 1b32293a17b8..7a34238c668d 100644
--- a/sys-apps/systemd/systemd-243-r2.ebuild
+++ b/sys-apps/systemd/systemd-243-r2.ebuild
@@ -11,7 +11,7 @@ else
 	MY_P=${PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 PYTHON_COMPAT=( python{3_5,3_6,3_7} )
diff --git a/sys-apps/systemd/systemd-244.ebuild b/sys-apps/systemd/systemd-244.ebuild
new file mode 100644
index 000000000000..c9bb54c4b819
--- /dev/null
+++ b/sys-apps/systemd/systemd-244.ebuild
@@ -0,0 +1,498 @@
+# Copyright 2011-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	!<sys-libs/glibc-2.16
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( net-misc/curl:0= )
+	dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
+		>=net-libs/gnutls-3.1.4:0=
+	)
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pcre? ( dev-libs/libpcre2 )
+	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= )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	acct-group/adm
+	acct-group/wheel
+	acct-group/kmem
+	acct-group/tty
+	acct-group/utmp
+	acct-group/audio
+	acct-group/cdrom
+	acct-group/dialout
+	acct-group/disk
+	acct-group/input
+	acct-group/kvm
+	acct-group/render
+	acct-group/tape
+	acct-group/video
+	acct-group/systemd-journal
+	acct-user/systemd-journal-remote
+	acct-user/systemd-coredump
+	acct-user/systemd-network
+	acct-user/systemd-resolve
+	acct-user/systemd-timesync
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? ( !sys-apps/sysvinit )
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-auth/nss-myhostname
+	!<sys-kernel/dracut-044
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-apps/hwids-20150417[udev]
+	>=sys-fs/udev-init-scripts-25
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	sys-devel/m4
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.patch"
+			"${FILESDIR}/gentoo-generator-path-r1.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+meson_use() {
+	usex "$1" true false
+}
+
+meson_multilib() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		-Dsplit-usr=$(usex split-usr true false)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Optional components/dependencies
+		-Dacl=$(meson_multilib_native_use acl)
+		-Dapparmor=$(meson_multilib_native_use apparmor)
+		-Daudit=$(meson_multilib_native_use audit)
+		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
+		-Dlibcurl=$(meson_multilib_native_use curl)
+		-Ddns-over-tls=$(meson_multilib_native_use dns-over-tls)
+		-Delfutils=$(meson_multilib_native_use elfutils)
+		-Dgcrypt=$(meson_use gcrypt)
+		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		-Dmicrohttpd=$(meson_multilib_native_use http)
+		-Didn=$(meson_multilib_native_use idn)
+		-Dimportd=$(meson_multilib_native_use importd)
+		-Dbzip2=$(meson_multilib_native_use importd)
+		-Dzlib=$(meson_multilib_native_use importd)
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dlz4=$(meson_use lz4)
+		-Dxz=$(meson_use lzma)
+		-Dlibiptc=$(meson_multilib_native_use nat)
+		-Dpam=$(meson_use pam)
+		-Dpcre2=$(meson_multilib_native_use pcre)
+		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Dseccomp=$(meson_multilib_native_use seccomp)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		-Ddbus=$(meson_multilib_native_use test)
+		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		-Dbacklight=$(meson_multilib)
+		-Dbinfmt=$(meson_multilib)
+		-Dcoredump=$(meson_multilib)
+		-Denvironment-d=$(meson_multilib)
+		-Dfirstboot=$(meson_multilib)
+		-Dhibernate=$(meson_multilib)
+		-Dhostnamed=$(meson_multilib)
+		-Dhwdb=$(meson_multilib)
+		-Dldconfig=$(meson_multilib)
+		-Dlocaled=$(meson_multilib)
+		-Dman=$(meson_multilib)
+		-Dnetworkd=$(meson_multilib)
+		-Dquotacheck=$(meson_multilib)
+		-Drandomseed=$(meson_multilib)
+		-Drfkill=$(meson_multilib)
+		-Dsysusers=$(meson_multilib)
+		-Dtimedated=$(meson_multilib)
+		-Dtimesyncd=$(meson_multilib)
+		-Dtmpfiles=$(meson_multilib)
+		-Dvconsole=$(meson_multilib)
+
+		# static-libs
+		-Dstatic-libsystemd=$(usex static-libs true false)
+		-Dstatic-libudev=$(usex static-libs true false)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	meson_src_test
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/{hwdb.d,rules.d}
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+
+	gen_usr_ldscript -a systemd udev
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+save_enabled_units() {
+	ENABLED_UNITS=()
+	type systemctl &>/dev/null || return
+	for x; do
+		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
+			ENABLED_UNITS+=( "${x}" )
+		fi
+	done
+}
+
+pkg_preinst() {
+	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
+
+	if ! use split-usr; then
+		local dir
+		for dir in bin sbin lib; do
+			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+				eerror "One of them should be a symbolic link to the other one."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${EROOT}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ ${ENABLED_UNITS[@]} ]]; then
+		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager"
+		systemctl daemon-reexec
+		eend $?
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 0bb00e81ae53..c9bb54c4b819 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -36,7 +36,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	acl? ( sys-apps/acl:0= )
 	apparmor? ( sys-libs/libapparmor:0= )
 	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
 	curl? ( net-misc/curl:0= )
 	dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= )
 	elfutils? ( >=dev-libs/elfutils-0.158:0= )
@@ -243,7 +243,6 @@ multilib_src_configure() {
 		# Avoid infinite exec recursion, bug 642724
 		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
 		# no deps
-		-Defi=$(meson_multilib)
 		-Dima=true
 		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
 		# Optional components/dependencies
diff --git a/sys-apps/tas/Manifest b/sys-apps/tas/Manifest
index e689351fcde8..39593aef8f90 100644
--- a/sys-apps/tas/Manifest
+++ b/sys-apps/tas/Manifest
@@ -3,4 +3,4 @@ AUX tas.initd 422 BLAKE2B af394bb87952d7e5ddb20e3b688372f7e526ebde59a3862112a8c7
 AUX tas.service 162 BLAKE2B f9f8d8f9e8dbe1b6aa6e7c531cb69b3e6f39e563cc64f2630a0db2b48cc0425806b166f39d7b2dc356c55b4771da7023ab5c0f10dd2d2857beaff7699fa1a0a7 SHA512 53a6ad9f0d42b26f2a2e9462a5f14a31e4bbde4d8badf7beb9e96e2a916d81ccda96be9bad80fbcc1a8f9e4a72ac5cfb1e13112785de8fe978823d97de145efd
 DIST TAS_1.5.2_build.180622.zip 12434740 BLAKE2B 9017aee7512b6d467d2922dc9db3f3cc58046beb4f48838748ac806da1c0c84f99984e2b29867a36db4bcb58a90f3e23c29dbfd8d73e1049cac4bf82ac88d021 SHA512 166483fe514f09c2fbfd27a05072f0bfa0d2cc8f92428451e055ddd9fbc24dfa3e912de224775d16dbb8880391c79ddc2ee9ff55c1e31e0fcf2daa3b05eb7d60
 EBUILD tas-1.5.2.180622.ebuild 1592 BLAKE2B bb9283f667558351830f427b499685769c8d2c14ffe150189e75c35990d94fa11a355b5df24dddb82683aaea6aeede6a13827ac5ce1882434f1c051a2f0aa1fb SHA512 9f83615cad5fe5c83441609020cdd715ecee5a5635b303457256cf8082a3b9887c5ba50189add216d2e9ae6e50080605a208f34bb2639b9aa0a0814e69432015
-MISC metadata.xml 990 BLAKE2B 249221c6f6a6f24fd3ff7834b598a7fe358c5131c317716be168bbcd5818802fc89d55289163b7bf068e2779654d5b8598b5b381e708d7f416e18080a9233634 SHA512 bdd7210ceda97b24e38eb2734118e06dc5c49ba1d11f4af14e05511341570a8cc58eeb53b0af8b99187473499a99e25ac10ca6e0abf9c1e959fac863e90760fb
+MISC metadata.xml 871 BLAKE2B c8666715b4e9c7704f8f5464c95a9a3411cb4f97fe6631eccb4bb2a1ae70c987e858a4d32d3f6eef3ddc77d4ff1d8e441877da198e17f47fa65bec7bd915a565 SHA512 6b9b63a492af33946ac54c3a46fb6c27a48e8bd65472e10ab79510722a5a7bcdbd6cbded8f8182773e7fbd478e99d2a520a968e080996aa567289aa14ffe01ed
diff --git a/sys-apps/tas/metadata.xml b/sys-apps/tas/metadata.xml
index 51cf888b9566..8f17e1d6ff33 100644
--- a/sys-apps/tas/metadata.xml
+++ b/sys-apps/tas/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		TAS provides server usage information at the OS level,
 		that users could monitor on a system through the BMC/IPMI.
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index 1432c905f44a..68aaac8f74df 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -5,6 +5,6 @@ AUX tcp-wrappers-7.6.28-no-external-malloc.patch 317 BLAKE2B 4436d7bf54e13b038e8
 DIST tcp-wrappers_7.6.q-22.debian.tar.gz 41730 BLAKE2B 2e507269b14e5cf3e1a599b4cdae40c2900b098a1e40fc1b74e6b5565183fc71e25306e8dd0863fb16e6e52a6c471aeccb73c0b7c42d6f3f98aa9f95274583fb SHA512 cee45f265c34ec1c4e9e81d54be636dcd9702964f9cf5bb076f72d6772d2dbc638d2ef366560b51c24a216724807826bb3b7bf9d5d0f5c0923b71de7d0b002a8
 DIST tcp-wrappers_7.6.q-28.debian.tar.xz 36104 BLAKE2B 209fd9730785db8afc8ebec581f7132cfb4352f8807d2cea4715daf5c11aa08a92cf084ab1ff31222f5b265f032286ce2dcf49a238e9dc5616161c400fce4f08 SHA512 2c63201937737c19b4e5ca97dbc0ede9fc2d3b8fc344f8854a7d2afc0109ccb9ee52af94ba8a8498da910336a4f473825daa7a0cca26a0d93e1078e67abe16b0
 DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac
-EBUILD tcp-wrappers-7.6.22-r1.ebuild 2488 BLAKE2B 415682abadefb906c805fff37dff6425c6c6f514dee6222c3d82fe0835e0807958c695a1fc03af6f000ab3d97e497f0f767f67569192d35e25313c21b1e5141e SHA512 c923cc3b9eb6fd2f1bec4482eacc9b30b85fe67a3b8e9954aa551b51dc21d8a972a3db348d5a4442e427328b30720e014ad5089e6bce0fb2382e115a3afa69a0
-EBUILD tcp-wrappers-7.6.28.ebuild 2440 BLAKE2B 8c7342963ff88c62d5f99a6ff4e07bf52fb04ae4f64db2e1b36e60d17333e0b7248b2620cfff0a2cddd5daa1c6809feaae9accc2ee9461efeb1d88dfc4085849 SHA512 4d5aaa1799a677669ca90b5fcaf2fdf6fdc3818db3abde9d9af063564ce4d144559969d598b5156f708921e743a32a1da72400a4909ce0af8f1d4a03d9bb5de5
+EBUILD tcp-wrappers-7.6.22-r1.ebuild 2481 BLAKE2B ca2398c6189e04d8803770df14f08c5bc4f7bee3fea566a1ac3bfb7baee5940c86ac9f7a19471a08c7dd16db4bdec021619bad54d81d37bdada64fd298cfa510 SHA512 e2004fd06aec6a258a4e212b3bc03e8d57afb3116e9e5c30b788c0511bdd0386dd7f2c46c3569c9c8d2a78196454f96bf5c3cdd9829a2664889d09ad89aeb84a
+EBUILD tcp-wrappers-7.6.28.ebuild 2433 BLAKE2B 117a9df98d313bd007607e118f3092f9d0dd2c63b42e15a1d2b0e3450b7cf149e1bae8a5476f263c9fadc7f5e8e2ed8a71b8c41ac00a6147f03bcbfdf72a36b0 SHA512 1955bf38d73d5a8122fbb33dac48f46e79ac12d72c7deb7a9fe4092a5d0a8d8feebe983409b62c487393c6dfb41becaf7f54d201891111dcbf3aed15b7fc37de
 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 0129109fb5b9..b3131aa342ba 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
@@ -50,7 +50,7 @@ temake() {
 		RANLIB="$(tc-getRANLIB)" \
 		COPTS="${CFLAGS} ${CPPFLAGS} ${mycppflags}" \
 		LDFLAGS="${LDFLAGS}" \
-		"$@" || die
+		"$@"
 }
 
 multilib_src_configure() {
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
index 406bea3c32e2..bcec6bbb9ec4 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
@@ -51,7 +51,7 @@ temake() {
 		RANLIB="$(tc-getRANLIB)" \
 		COPTS="${CFLAGS} ${CPPFLAGS} ${mycppflags}" \
 		LDFLAGS="${LDFLAGS}" \
-		"$@" || die
+		"$@"
 }
 
 multilib_src_configure() {
diff --git a/sys-apps/the_silver_searcher/Manifest b/sys-apps/the_silver_searcher/Manifest
index ef297ad78f81..f0687c0c7b19 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1,6 +1,6 @@
 AUX the_silver_searcher-2.1.0-lzma.patch 16900 BLAKE2B 80b7ed6ca050e155c07236c318e1acba7c701880c441e2701146bf289872c353308d791e7f36a85106a901c416725d108e6c9012bd5c0e77adde00dd831df97c SHA512 51067853b604d7f2eb5272dbb960888d70002d58a61dff5c4748031d92a61b6b06aa02b09e29babac47e7fff872bb51fbe8929ac2d3fdef0a6ddbb29ffb18052
 DIST the_silver_searcher-2.0.0.tar.gz 160093 BLAKE2B 1955772c6f71cf7839270cdcaf73f917a69966afa69e781a81ff1926946d9e61a7229e5eb4981b21879b6d2ad46232563285b083de77b8fbf42d3070792b26bd SHA512 2587b9958fadcf5d95bc472f901904edb0d3d9bbc652dc6bb3801b77e7dfa744a97869bed4699776cc3fdcd7b0319fcecbe4b08ccfda617d1c2aa4ea8e9f990d
 DIST the_silver_searcher-2.1.0.tar.gz 163139 BLAKE2B 0112489e9e8c965708f2526aa5141bc700cb86bc1bc5a63ad9b2505234595f673b6e163546fdec7e5066d00789042ab1acdf02db926170bb823112847f304944 SHA512 9b49b1666bbb915b122eae45dbe5dbdba18539257b59f1dee9ba9ec86dbe73c7c8ecde1eff9d3e06951295685161fc4594fcdbfa5d19d7b466f2a7f95021e631
-EBUILD the_silver_searcher-2.0.0.ebuild 897 BLAKE2B cad19264a03f7c682ba59e47dca17d0c0def14f283cfd81ee59690f131e48700f4adb36798fa483773a95d01cfc87b5adf5d98257224883a31677683ffe7d5c0 SHA512 41a9a129e15a31f3629f83a44b6f4373f2c0f85d8ced54d4f748c805ca0ea8675a7c9d754c5e7fa2a75dd03504c5d6afc324cd784aef721a6a78498ccd87f1f3
-EBUILD the_silver_searcher-2.1.0.ebuild 969 BLAKE2B 83b32f1a81ae5eb63492bedb0d78980b079c778b346ecb4a3ef61639d45126f5735242a5bfb422626b2fb2d6ee302e7a5adb53542e666972b3cf50015ff3c519 SHA512 decb768407cbb038ef06c98bddc5fad188ce0d5b86c88a4d41110568f56dc9f027be9d17caf76dedc9c77a075b1bd95968492802200983ae1993ba3f94591273
+EBUILD the_silver_searcher-2.0.0.ebuild 921 BLAKE2B a894dcf2551666d64fe272312b66d471467d19c75f3ded366639aec84064c96b4f42ec5e2e0c561d75c328642bf877fff767171272400987ef80dce8844fe150 SHA512 1b44f0ff304973c569e994972c1a2d0f81c2be0393f7883f3125b8f217360462cfb6c133a79cbb45a9766cd1ddd1f29ce4d598321c1fc02b094136bc24f297b4
+EBUILD the_silver_searcher-2.1.0.ebuild 993 BLAKE2B 3b0cebde2a8b2ea61587d5bd01acc580dbed12182e1a037113d398b5f962bae9175f888f0463bdfefcc76e77ce44894c576bd70b74e2ced5818e310b1d8ddc8e SHA512 5cb04b75de6b34bc2b26ec738084fa606287967211cc9890bcc55ec3506b995afba9dd53e5419e3af611400bb2198e69cf32172b8d9dd0227877d9b6bc086cb6
 MISC metadata.xml 263 BLAKE2B 3d3cb735ca3d3b8c9ea8ca6b1d9adcb3739a33cce36af48db9e95b673c5e1d7b749148ceb39c57c74819d18f33f510abc41354c0c0c2a502afd611e3a2b0ecdc SHA512 96e459d527c00e92aab5ea5ebe3d078d8b505a3e9d9ab92878132f58d82cad6b1d3199d95cc96bb67ed9a9ea05a06ff31666feeac0fd2bcb71f2035d5e00eee5
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
index dbb2622af385..21b02d12de35 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86"
 IUSE="lzma test zlib"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/libpcre
 	lzma? ( app-arch/xz-utils )
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
index fcf0eba32492..f8bf1e852265 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="lzma test zlib"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/libpcre
 	lzma? ( app-arch/xz-utils )
diff --git a/sys-apps/thunderbolt-software-user-space/Manifest b/sys-apps/thunderbolt-software-user-space/Manifest
index d22f68233bbf..7a1bc1d82d31 100644
--- a/sys-apps/thunderbolt-software-user-space/Manifest
+++ b/sys-apps/thunderbolt-software-user-space/Manifest
@@ -1,6 +1,5 @@
 AUX thunderbolt-software-user-space-0.9.3-cmake.patch 521 BLAKE2B ca7756afc0504e0d9df159da7db7e6d334e271fcf404f0700e66454de71cff17cb0b32970cab0569582a32a40739eefb82ae64ea9cccc5657588b9b9ea11c149 SHA512 b34a3833eaf772cb07540199a2096af88cc02aacefaf45ac0a8f91abcbedb0e499c587a5e241fb5f7cbf334a4aee80cc1416aa775bc69480e3a5bd3497cffa9b
 DIST thunderbolt-software-user-space-0.9.3-tbtadm.1.tar.xz 1160 BLAKE2B 2710f2acea71a7301a121a564bc7625c73b7c983622f9d50f544836facbda7c8cbc29055c81706ec0d8fe5aaa8d254872f9c9740b2b9235642b1264380ad17c1 SHA512 3a5b5e5bfc6b7e2a0f2cd09428e315d6895a217bfda7faacd3817e85b3201192f6dd6b26d10071721164bb9c49731aead1d8249ad6652fdba9d38074fcb74907
 DIST thunderbolt-software-user-space-0.9.3.tar.gz 22186 BLAKE2B afc614d0d2f7de3c23988e08c0053d24a04be51d22986497e3863b76ad59f1a8a9e2ab323210df27a3fa2f07ab05122666a3c6bfde146250f0854b2dfb6748f8 SHA512 b8bcb31d864376c644f9813abf2d090cc3239271df8a8e71ff7d5e398e993d4d01e94ba5fc1bc13d7dd0fa861b4b918a6df0724ca43f54a5e706ec67f3c7846b
-EBUILD thunderbolt-software-user-space-0.9.3-r1.ebuild 1051 BLAKE2B 10d32c2155a18813ee8ebefe52ce6ed1b49815e7ebe095b2051827f49f26a441b255273338605b751b5ad02bfdbc5e75ff099c3b1bdbad1fcb29fc178fab038d SHA512 4e48506afed59f2ca0b92b52a6942022da8cdf9f27be539b6b521ddbfa93b65d5837e476bafb1d55a2bef676f54aa92f363eae16cc044bb86c819daeb20203ce
-EBUILD thunderbolt-software-user-space-0.9.3.ebuild 730 BLAKE2B 065c2025f3a2de5c3e337b4677ba5452b5a1d431c216ad923acc656a8c7f9f0372f6783da4456f2975c3d62193963ff0ed6b5aa916f9f5933b78ca133d050ce8 SHA512 7f454e304a976c2efe4364e579c455aabab22b0ceda17ef12a911b40d57705c3fdc99461c40c939dbe717318fab7ff79695699806c02afd4dc23e7c3c410b746
+EBUILD thunderbolt-software-user-space-0.9.3-r1.ebuild 1049 BLAKE2B 9d32b18873b52ab1ecebccdbb0f554f081916ad8036cc2f4b8d29d046fb2ed41631a80dbc670b23e6de15774a7aa671e47c2f8cd2b945e926de057588535fdf9 SHA512 856c4a1bc7badc869a2dd77e8fc5118e142be66b23682bcdcccedafadbfafc26fb627405561f7c9137bfc757f64375d01cc6459238c27d6af332fe12dbd5d55a
 MISC metadata.xml 554 BLAKE2B 0ccaeead65893d20860bfb9e81f00aff2959c23e2e1754ab67342b0c4b027ed255d249f1b03146f98677933dae84982e01fce130b276785471b5a730fe2d2998 SHA512 70ddc8c30381a7a2288f1aff50eb932ef418bb72ac0f7b60e15b4846133ddff8b3de77bff9e4bb40a336f5077c1bc1dca9c574eb5fa3a53c0f3f083511b185d2
diff --git a/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3-r1.ebuild b/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3-r1.ebuild
index 0496ffa0cdae..a1d2016e4d4d 100644
--- a/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3-r1.ebuild
+++ b/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/intel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # man needs app-text/txt2tags which is dormant upstream, so it is shipped pregenerated
diff --git a/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3.ebuild b/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3.ebuild
deleted file mode 100644
index c557cb821474..000000000000
--- a/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils linux-info
-DESCRIPTION="Thunderbolt(TM) user-space components"
-HOMEPAGE="https://github.com/intel/thunderbolt-software-user-space"
-SRC_URI="https://github.com/intel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-app-text/txt2tags
-dev-libs/boost
-"
-RDEPEND="${DEPEND}"
-
-pkg_pretend() {
-	CONFIG_CHECK="THUNDERBOLT"
-	ERROR_THUNDERBOLT="This program talks to the thunderbolt kernel driver, so please enable it."
-	CONFIG_CHECK="HOTPLUG_PCI"
-	ERROR_HOTPLUG_PCI="Thunderpolt needs pci hotplug support, so please enable it."
-	check_extra_config
-}
diff --git a/sys-apps/timer_entropyd/Manifest b/sys-apps/timer_entropyd/Manifest
index 6820e9cdb449..bc8c9638be06 100644
--- a/sys-apps/timer_entropyd/Manifest
+++ b/sys-apps/timer_entropyd/Manifest
@@ -1,5 +1,5 @@
 AUX timer_entropyd-0.1-syslog.patch 833 BLAKE2B f7b3aec1bd30185e8f5e8c5efded4c30a39fa7208ee6396a69b1e93053f3c5efc1904c4006b6e1989976b213edad29974e037650552b5c219ec119c7ae746946 SHA512 93eefcd75c2c61515d8304f13d196022d76a8244c9b74764247d330e518a2c06fd93e6c9859cde7d6be2ae7e50c05f9e45d5a0c68bf2aa057821b52f588187c7
 AUX timer_entropyd.initd.1 236 BLAKE2B 281b56e70175419ffe5bec4609ce75a48982103353ca88f866e5bd11b0a59cd771fd0ccc9d80466d105de93d467afa0c7ea37c0b9cab90a3d5e89888af73b451 SHA512 78f0ef265ec514a781e9c53d4938a56fd83196c4e923882aaa368c40545f59196cd74aa63be08d500db083603ab871434365583b23932e284fffcf7a4f897f1d
 DIST timer_entropyd-0.3.tgz 8329 BLAKE2B 96af82883eeb5a136e1f059afb067b6df46e5940fe0da5b4c161047c0e4e40a9885454e3faa926b864c2db64cb6b481d5dfed7d8ba4f28d5c8691959e41d26d2 SHA512 bdfedb594ee32daf7fb961a703842ca3479de158fc19bd75664b183e44bcf2ef3e74645cc6097f340834933db6f9133710df7d433ac062b2375494de5c052dcc
-EBUILD timer_entropyd-0.3.ebuild 977 BLAKE2B e83c7c713ff80acc198e864cfcceb41d81cac8b6dc08eefaa923a78c34025dd71e39d7a7d032d134431ea1cc38ae952bc539864fd996151d427dc35025d2efa1 SHA512 a83aa2cfb589c04f2903844a9c4bd2f5fe735e23bd4f8d9db8797c8f698f521b9d634f1007a1f59c88aa39cb6db933e3ce0cafeccb9c0dd63cd1d840264e799e
+EBUILD timer_entropyd-0.3.ebuild 963 BLAKE2B cc42719a877744205c872a2bad1907f1f4bb03989e15187752a36edd383bd27e819eb1137c5d1de71acf550f54724402823b0818e57a388473ed6a8b6bb35199 SHA512 b5fc76e7357e03d2a510f4d1ed9e8f44075507005a0942503f03d512be33b4c8c4ebc4c6f580dcf9aef59c4ee01da977045a957a1b6c4b98bd42794fcbd4f713
 MISC metadata.xml 359 BLAKE2B 1e5b2d1f60ba4e6380b3411f9ef4b0bbd0dcdf4a078bd4624a6359aec49304691b3c03d2c214f5661f75af82d02460ead441e117fac1dedfa8890977ec2411b1 SHA512 7f1472a20512fa60f4d81005efc7ef659176109e7b19c17db63ee4dead3e4c5a03c8e8b1ad1bca2124cf94776e6a41fccfbc4c15e42b6ad42591a9210602624e
diff --git a/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild b/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild
index 1509f4f394e7..041a72467d56 100644
--- a/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild
+++ b/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild
@@ -25,14 +25,14 @@ src_compile() {
 	use debug && append-cppflags -D_DEBUG
 
 	tc-export CC
-	emake DEBUG= || die
+	emake DEBUG=
 }
 
 src_install() {
 	exeinto /usr/libexec
 	doexe ${PN}
 	dodoc Changes readme.txt
-	newinitd "${FILESDIR}/timer_entropyd.initd.1" ${PN} || die
+	newinitd "${FILESDIR}/timer_entropyd.initd.1" ${PN}
 }
 
 pkg_postinst() {
diff --git a/sys-apps/tomoyo-tools/Manifest b/sys-apps/tomoyo-tools/Manifest
index a036a6e54441..63c883c26c3a 100644
--- a/sys-apps/tomoyo-tools/Manifest
+++ b/sys-apps/tomoyo-tools/Manifest
@@ -1,4 +1,4 @@
 AUX tomoyo-tools-2.5.0_p20130214-warnings.patch 814 BLAKE2B 10a9966f726a47058388773500bc06bc6cebbdcf90eaaca5ecf8b2c1159618843645e55663892a5897c6741794b49cacf823a1fcee5e0e67e9a5c7e27ec3b892 SHA512 947caa5ce7f2c80e7e0b40042b09568c4fed731b530cf70c1fa24fa0f1a382dd41443f3db82a6aa6444c0ebcd25fd7de657c0f1990d69579e4645f3efa561e10
 DIST tomoyo-tools-2.5.0-20130214.tar.gz 210892 BLAKE2B fc9435c5b4c97a58d6e3b00cfa5b82e08732c0f6804a819e99872fbcf64e3e831f33766c23e0ab7d8767e0c806d8e2f7c18280ebedb198684c386e8c7c8bb637 SHA512 1ba6f6b3a3d4e644e6ee742beb64b09c6d527f130b1fe6d09a2e19760ced26f540ac8cc1e6f83fddacc3ef8844c3c23425191e4e0098c8b72b5ba3086adc9dc4
-EBUILD tomoyo-tools-2.5.0_p20130214.ebuild 1429 BLAKE2B 7af9be27b88056a29cc7ecf614260894147d5262f64fb7e64fbd4d7cfab33a5fb17aac961580b2f7567f15301e0af25b5516b3c207a52a6616ca5fd9b35345d0 SHA512 842044f79e9cc812ec202629046fff0c148fd7d4a1c205c9a2b6a39a18008e4f5d9169f9b513e076051b41d7dd0287d68212a557b8f657ad0355e3bd40bf2b2a
+EBUILD tomoyo-tools-2.5.0_p20130214.ebuild 1422 BLAKE2B 86254dbc931dbc0f1a69d71d3fd106e35e0fb09286e6fd097b3d98057b4d8a38f0a3a32dceb04f49fa2b042c64fe162af13c051da3d91c03da4eed7773a76fdf SHA512 7ca85cb6d9b9bc5108364d18e3d131e47c1e02e0e4248ff1c197c1570ed2e7ef9be5825628b5640158b7f4b371e3fb4a6d229bfe9e735582abcdf140be450bf2
 MISC metadata.xml 295 BLAKE2B 457d2e30395637e99931ce1dcf07a60d3c255b8e56ae338f0aae4489d6314ab4d147af16fb7c5976fbc3329625f0cd82d281918c6dc7f05db71b3b19ae5539ea SHA512 bcad45a60a3abfcb3054f0c82a733ccf5e0562f796cdafe414d2fb6e95301371591b1032404d83365d4a39a60bb1f3b2dd81d6a85592f72cced041cf36393ff1
diff --git a/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild b/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild
index 581fb1868f8b..998598543f43 100644
--- a/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild
+++ b/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild
@@ -49,7 +49,7 @@ src_install() {
 
 	# Fix out-of-place readme and license
 	rm "${D}"/usr/$(get_libdir)/tomoyo/{COPYING.tomoyo,README.tomoyo} || die
-	dodoc README.tomoyo || die
+	dodoc README.tomoyo
 }
 
 pkg_postinst() {
diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest
index cc6ad6d6edc7..a10a9e240db2 100644
--- a/sys-apps/ucspi-ssl/Manifest
+++ b/sys-apps/ucspi-ssl/Manifest
@@ -3,9 +3,9 @@ DIST ucspi-ssl-0.97.tgz 112640 BLAKE2B ead9a3d720e9aee8855039ce3873f30d9766ad78d
 DIST ucspi-ssl-0.98b.tgz 112640 BLAKE2B 3b970525f8c3f9511daadfc2fda3840566e679b885acd3c17b0d1b2a775d837b59e9ccbbf5543614440366bedd8c24ba5f8f1c4d6b94877c7ef92d3859fdf652 SHA512 c9f6749048059f870b5221296ecb01d4b5c57c1d8c8b3574c67926b60569bce983f257afacfc3383b1b9a60d55b470a5a1548d2c19b0a505b953171a83cee12b
 DIST ucspi-ssl-0.99.tgz 112640 BLAKE2B da1974f59d2fece5877f645f5843311eadd509bfb715576a56b59bc79f6f9954eca9bad88bb36b055aa939d533a8b95b4fb3d3ae9ebde1081bcd6a51b60af5b4 SHA512 2fd29d0f6b31b54f2b53206c6ccd0cf35c759834f34aab26d2a883319d33ff2257163150fc85a2e450c7bd81ce7bbed7b59c4013d71a35a9b3446a6338cb406e
 DIST ucspi-ssl-0.99e.tgz 112640 BLAKE2B 6db975f412723da1c6c76ff1040c27001c2d5b2b0c8bb3199f37226c31cf1e48f629aa1f8234319c844f2ccf8001d6d9ffd7700da2ae57b6cb22177cfc1e56f8 SHA512 231ef75eedc4f52f46c1f7d6f44feac54069d859da206f9ea874d3a8082dead1be310cc4b7da1148564847b5b452b691718b7ba8076a03145e2002e9250182aa
-EBUILD ucspi-ssl-0.94-r1.ebuild 1225 BLAKE2B c890ea7730ca96f53e2679984dd1d0e7ee1506319f8096f4e0b070f984477cbc33ea24cb999a6445c4d24fd9460cc4de0c4874ab7ea23ea565a9fe24446d79f1 SHA512 c2a2851a8ebe715a04f83f5f7c603cf83ddb26dad09bd95251d382eeacd3767e6873206dd43c6afd054cfc13f140b877956a502a0fd83e05a15d7e48b752d7e5
-EBUILD ucspi-ssl-0.97.ebuild 1295 BLAKE2B 859641da7181758911e2a6c547ed891efaa47773e3960a4642d57aae22d9449b97a49a0b785849b779ed33942dd55e05c7e9a58a52122c12104d6bed71abf6d9 SHA512 9957821d0df9d5f20ee03cd0bdd27ab7223f6da141ba772e66ba34c76b403d8477d2a8c2c149a1833c05090fdeeb19f84c7b67773cc859dfbabb5c4bc3ede94a
-EBUILD ucspi-ssl-0.98b.ebuild 1265 BLAKE2B 90fb913d07e65e02f756bfbe08d5cccbec178fa2bcea00ff55042b034ccbf4def87abe4d4e05ed1f4c8061466f5054988c4c411c89bb0f1ea2519116ca777afa SHA512 cf70f84f5020fcbdea56cc5385c24e0510bd8ed761c5b6f70c9edb0baf585caab7243a1df94b497f40cba69330afa71984d6d6ddc7c114dacd673c354ca897f2
+EBUILD ucspi-ssl-0.94-r1.ebuild 1218 BLAKE2B f60436d8f0b4e6d25fd9d4aeb196974c01616db7b13ea60fba704e4f105308e00ab521e9dc72ace2e3a5504badc6cda24d486f19b9e976b4b777e32118a400a8 SHA512 4222d84b50567e9b40e9ea01716df7adf4f0565c0d315b617cddfb081557ff0b6370fa62211e17b0c27813ef8a3f5e37298e136e801013cb67b9d096a63aeef4
+EBUILD ucspi-ssl-0.97.ebuild 1288 BLAKE2B 04547e2c33643974879c126960bc208bac7d007bcdb2d81017ad5c44e2de85d8acbcfa90d636e76636044439a9aef25522efcd49a3f42f16d1c07126c4126e6b SHA512 810f075191c27a986a7957628558be109a81fc261482b3436d3209579874b60d30ad86bcce623ae6177985f857f6349e391826ded239d6b462ce399cc690ba9a
+EBUILD ucspi-ssl-0.98b.ebuild 1258 BLAKE2B b19e32a1fd08baef65b4172f0f61f5410465990eca943c5226209969ca1535c9d55399d35b45a754ef6586ebbf93f1e6df7f295e6b9968bee9bdb657d8224086 SHA512 53060ce9afd145f825b0f1a49a97bb919dc9e8392a87247d78a4b21d8037c5d6be1d5c0dcd301c73ce4aba262c426a0802e7a7f0a47a2bb58524e3f674d95abf
 EBUILD ucspi-ssl-0.99.ebuild 1258 BLAKE2B 63beb1bad75b6df9b7da52bef64bf9ed8273b761e82c081d8d42fbd697509e7656aadf48634b00070751ef1ae8709797a98f29d5f1c9b7082ae50d6a082c9416 SHA512 2b80055256cd96865211c288e37fe7edd7f2753a00a3730c145e49454764ca9d65ef37d67b8405606ee14f290967ceef1e84a54c1b5d3fb5f714ff33ab29b495
 EBUILD ucspi-ssl-0.99e.ebuild 1561 BLAKE2B effac81d17b0a11f979c08ae77e66c550903d2e6fca2ea2352b4f68d165cf0783a1020d6d27f716688c824cc9d3d843e208ffb48568cf68fe5067a8274993661 SHA512 d677de122e4fa7af5bcd7ceb9fd9f3969e6d27e26519072347427e1420e1aa5c7e1e9371b6c23fb5966cd541fd83f62f19ac0f42f1ab850f389706ecdd1b6df3
 MISC metadata.xml 749 BLAKE2B 3b6d6b29627fdd626bffc49b35d559c21436b0e31fb0ea037f872a5f3bcd114902ef91eb2c4be5d78100b16622c8b8cabd745fd82cb41570085b70ae6c4f9c8d SHA512 3e9e1026800839e5ca908831406d77e5aca076edfaa62588c9b966767d690ff6ed1c396ee3cb2457259c26b10e5160a10ac38f70a0be1cad0bf262adfd661366
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
index a840f03132d7..5d5ac164b3c2 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
@@ -48,6 +48,6 @@ src_compile() {
 src_install() {
 	dodoc ../doc/*
 	doman ../man/*.*
-	dobin sslserver sslclient sslcat sslconnect https\@ || die
+	dobin sslserver sslclient sslcat sslconnect https\@
 	use perl && dobin sslperl
 }
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild
index d76d76649ae7..4aedc6d67c98 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild
@@ -52,6 +52,6 @@ src_compile() {
 src_install() {
 	dodoc doc/*
 	doman man/*.*
-	dobin src/https\@ src/sslcat src/sslclient src/sslconnect src/sslprint src/sslserver || die
+	dobin src/https\@ src/sslcat src/sslclient src/sslconnect src/sslprint src/sslserver
 	use perl && dobin src/sslperl
 }
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild
index b2959f43d85a..b02355b0c476 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild
@@ -52,6 +52,6 @@ src_compile() {
 src_install() {
 	dodoc doc/*
 	doman man/*.*
-	dobin src/https\@ src/sslcat src/sslclient src/sslconnect src/sslprint src/sslserver || die
+	dobin src/https\@ src/sslcat src/sslclient src/sslconnect src/sslprint src/sslserver
 	use perl && dobin src/sslperl
 }
diff --git a/sys-apps/utempter/Manifest b/sys-apps/utempter/Manifest
index 651ad70e6b7f..4b91c27971d4 100644
--- a/sys-apps/utempter/Manifest
+++ b/sys-apps/utempter/Manifest
@@ -2,4 +2,4 @@ AUX utempter-0.5.5.6-fix-build-system.patch 1168 BLAKE2B c513d18115a7a78e2c4d381
 AUX utempter-0.5.5.6-no_utmpx.patch 666 BLAKE2B 9ee0c3634b87ddd50d50f81811f749f615e4fad8dc27b9fc97cc1b61ffdd64eb5045910457547b2cbc245c593490ab354e3a7f5a5965a8aeebf330c6b32d4889 SHA512 4cdc7616f1b886b74fa39272f502fb9eb303047c93be57122ba32517f49a0274e4f7e02b25ead9dd9b60584610a576cb2d78c6350350b3d8364ccd903c3dafcf
 DIST utempter-0.5.5-6.src.rpm 21099 BLAKE2B a4a8c53ab31d53ec56d60a16e5c1d3a0a2ec6c73c3c3025c15dfc389da75f969545392b46976017cfcde1d9f9ca974b14786bbf39709aebdda890df13a7866ed SHA512 81eeac830631922f2d1b2099a559b60bfd21818b38a524d3c5f61aec143b3e70e95a9ccc300f649dd81f515837fe3befaba6b93bb2e22767e71eee7acb711655
 EBUILD utempter-0.5.5.6.ebuild 1178 BLAKE2B 180449c6cdfad5122e9a73538a5eabdc2c1d720fc66d97e926d1f3c720cb7ca2ae387123f10b1ed3acf4b9ab1b73132fcaa4e83715610355e3f387816ae28a45 SHA512 4d575c5df427cfc522934c23464154c40af12c54d1e7baed46c52e3d34ae252d1305c6408a990d40dab8bac1338865d5f243d7bce8e6ead232b8fad0aa7d0778
-MISC metadata.xml 344 BLAKE2B 090f0e14a3a7fec427cbffa3abc85b6caf242a4f471358ba0614a23682a183a2ac93fd4d6695ab0059b0c7e5573d8429ea4600506050753e2ceca3c1217c394a SHA512 77307533cb1ddb71561957493f7062330c1748f62ab1381f369c5fb864f0e2a6608cfa5c86005b816c2a9a2523bb9a2264c807f1d6c31a5e2bb6177876b94ed9
+MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/utempter/metadata.xml b/sys-apps/utempter/metadata.xml
index 910808b6e1f8..56c124413057 100644
--- a/sys-apps/utempter/metadata.xml
+++ b/sys-apps/utempter/metadata.xml
@@ -5,8 +5,4 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 7fa52669e218..269902b27fed 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,15 +1,11 @@
 AUX runuser-l.pamd 188 BLAKE2B 4fbd934c05386732b32281fdfac19153f01e0610868f3168026fbc4eb828ed1fe177677939958322fb074a95c8f64bdbaea42a4e9c039ac86dee0154ac96242e SHA512 86538adbd3d01c4b9e46fee00c38d298d2857fb1224461206425532404c212f03331308b74347c9af2e00583a3b50802085bdc6cb2bd393cf5e9d032e7290301
 AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254f90bf22f6bad7ad8d87cb6d7c95efb789dcbec01e266c3192e135a3a36d817ab47c6bc05e7a01 SHA512 a4c4d41078acdc7c7f1d1f1894d20d052d3d5a3c66d5680d7f76665e251c614fd76ca9678a27ea376147f49250c716a1b3b0c0afa9595bd74d26d2190d1680fd
-AUX util-linux-2.32.1-skip-oids-test-when-uuidgen-is-not-available.patch 1546 BLAKE2B 11a714486f7c6e4ca3d38adbf59231378ac94a5cd934816d93e46c73e8a9ff3f23909d88c39381b15d0beb4da8dd5c97af72166eec5822dc6a49b67a60eacf5f SHA512 5dfa5bb88e9e454a99c8ff5e8f76b9323729962aa9eba682a4a6ccfadc3af6068714ea3bf0e19abf5cc402dcafeb92057eaf4d25d5c292937d0cb94bbc8d99c2
-AUX util-linux-2.33-sparc-setarch.patch 2353 BLAKE2B 16f3c627096644da973152db4b29d09f6e76d5576d1e9513ae29ed76e1112d71327ceef31b915e58652f8ead0b506819a2c5a996bda0c3670035f13d1f9595eb SHA512 d9e2bbe4a5c0d41dc199406a27187107121294b9bd13794b7f48b558c2dfe3f16b0dfa11e7ef70b6072fd6464d2220f35a0ab032bf6b99e11740056751ec7aed
 AUX util-linux-2.33.1-fix-struct_termios-check.patch 1128 BLAKE2B 93d3722c44889d61596f125045a633865d088b8b9f2c1bfc828b90d1700dd2095e7c0a3220e40e6bef3db5f87fd828a018f9db9b774202f23722f460dce3a45a SHA512 eefdce290ec4a025e259d71a42fedb949e725ade512417800f043203418ccb9404673758a406a9ce5a144a5db8ee953122a4d0893f6d511e4f30a94482a20a6a
-DIST util-linux-2.33.1.tar.xz 4650936 BLAKE2B 9ee6bc1a1b800e8537f5552c28cf608f32e89c8ab716434a2de6b4b5e257c53065b9c11cd355f2ef759f69069071ef930790ecd55806deef300ce77f31e38e98 SHA512 94ada47e472b62a612c26fd5a5b7423e09366690a8a96f777191a5d920981eb0f224474bc2f128e827299bf60062770011332757e1551a8cd3764b5c70ae4ba2
 DIST util-linux-2.33.2.tar.xz 4707024 BLAKE2B fdeed0a236edd26d268bccca8cde2cf1b7ecbff521ede9fa26ea22c8e5cdfc380a416a168789504b303f1b569d163e41f6630ee28829be7f2b2129fa14c4fffa SHA512 ac88790a0272366b384b54df19cb28318014d98819d5d96aa05528ff17ab57a8c66d012a2f1b59caca4c5d4ea669e8c041e1123517c1f1c2d9960ef701aaf749
-DIST util-linux-2.33.tar.xz 4663072 BLAKE2B df601f6aa6dd1e77c722d5e7350a3b14c6099057487384eb8cd7adee8693711c1d24663f76682c958884559fddf61cc4b6d987bdca70f88e6cb14109e328e8a9 SHA512 5eb419607c5a2634117a604d425d6413763d1e48910acabc7e19d574a4c3fb0ceb34a68671a8e4fe396a4c6d611932082f77cd669d009e218bf64095da0d5689
 DIST util-linux-2.34.tar.xz 4974812 BLAKE2B d26b2f74d490eaee0a40d4c75a1a351ba165b4a52f9bbf6cf9d1afd7ae1382a3a3dfe41180584e97e9aaad6950f604cad928f30747590e3e1e669c8797689758 SHA512 2d0b76f63d32e7afb7acf61a83fabbfd58baa34ab78b3a331ce87f9c676a5fd71c56a493ded95039540d2c46b6048caaa38d7fb4491eb3d52d7b09dc54655cd7
-EBUILD util-linux-2.33-r1.ebuild 8317 BLAKE2B 90b7dad1760086ff082f60537d1f8256e5d06d15162ef27ad4cc81666232fb03acb87041a34aea90bcf2abe8d03c400c44bc3dcfb5f98bb9a88b3ee0d929e46f SHA512 6c5d569ed445119a9e57a6549bd17c4e340996512630c6a86c6abe954c9c5578378f812978da9ccea88327179b1dbf920d71737ef90c8f8587f703f8df949352
-EBUILD util-linux-2.33.1.ebuild 8586 BLAKE2B 9c4080b1fb2ebf7dc4f6b83d49479d6454fa5998de5d19be3e0cd68730c44e0f42f3464672c268789867da1cc09af4d3ab4fc6adb3147637d3ef59464bec4d65 SHA512 8eeb388692726297f50c335a0d6c54a3015f7b306053163d90f2a3c67454e8796cc380a9a4d68d12b5f5aaea88b1ba22caad0bf804a7c8add3775d6bd14c73c3
-EBUILD util-linux-2.33.2.ebuild 8581 BLAKE2B 5e7ee7b70f924b93bce2e454a9112a4b52e14ec4c91de1177bc14cb85ec2382e019908bbff2e781ce96b22f8197b35ecdfb67fa1bdea0b3e91da28417a00e366 SHA512 c7b7b7a27487207846348cfded3887045498d6e7dcf9ac712e5d92d4d723d717df7174443d98b3fe9cb6da6c2bcb1c6d505964673d219432b5b4061254fae76b
-EBUILD util-linux-2.34-r2.ebuild 8447 BLAKE2B 299b4e7b44ccfd4aa01caab9d9344d193f9c92387aaee79143ded79a2d353db3ab5e2feee59cbd605c9fe7b42c3702f505244abc4db161587b8708940525a1d0 SHA512 4baaa3aaf945514cff0b45940c1bb17eeea1e2206cb8d0994cbe378917d18616ba8255c5af79cd33107da70804f79b1a817f5a1eadb8afe381f46cfa0162f072
-EBUILD util-linux-9999.ebuild 8447 BLAKE2B 299b4e7b44ccfd4aa01caab9d9344d193f9c92387aaee79143ded79a2d353db3ab5e2feee59cbd605c9fe7b42c3702f505244abc4db161587b8708940525a1d0 SHA512 4baaa3aaf945514cff0b45940c1bb17eeea1e2206cb8d0994cbe378917d18616ba8255c5af79cd33107da70804f79b1a817f5a1eadb8afe381f46cfa0162f072
-MISC metadata.xml 1058 BLAKE2B 1e568d821c9af0470ce548d80959ce04d70fb4fd32215136335dbabf3f1aaa56c7b9ad481025f0014093e247a21c9ffb08ea133fbe77fe6ad520a37fecc055f4 SHA512 775e3da2951c79b284678ff4fe7efdf2f8297e9507f1640c7f8ca8ba24783ddaef9cde0f041a757dd6b1750636a6b207d71f92d58ef5b6d008960e7961eef026
+DIST util-linux-2.35-rc1.tar.xz 5125036 BLAKE2B 099c5ba1f8111b9ba006f77f2e650b7ff8e0607c0b8e9e59efe4d3b6f47a380b9c87ff28c71e312749ab6073cfa4ef1ac97953510a62fc9ea16ab0d42458ad6a SHA512 1ecf0b6868409dad4a2cc6e7fda708b8bea939f0c2a02b97068d114dac316a3d27c27542e2b220fc4ebef307d6c78b4f318685c1b7877429689f794cb2d4dc7a
+EBUILD util-linux-2.33.2.ebuild 8608 BLAKE2B 9eb0021764bf8b3165fc19a4b3783d1f1b5d2cc58f7ed20978e8fa03d0672d6fa171f1ad0978abc59df0c72601f1d3eb2436a32c980ff3eccccef57ea5cc714a SHA512 9deebde0f602c6eb539356f5b4be1eb32fba2416c4d8c36b3657a0daab607d9c30451644a3170343324c1d63fdf21b9a4911cc7c49baa5129cf337670069c789
+EBUILD util-linux-2.34-r3.ebuild 8629 BLAKE2B 86cd3984a447301749d70b91d3e0b5dfc74fc7c595551ea23f72c90468973821befe239157e6e6356597f0f535343908765d4cc1f47e2911c01d7308cf141fcf SHA512 7c72f77525dbf5ed217545d82994efbad5bb262b9ccd821debcb0c35635e00066d5f344eab61fbb40a158ec9cca834d09f2cf8b0e38de1c9bd902fad89e01bbf
+EBUILD util-linux-2.35_rc1.ebuild 8701 BLAKE2B b342903e4bc36fe2e6179eb0457654746eb8af6846209795699e69cf08863a3485683ffaa5bf0a67df78bd8fce8af834ef3e3064906ea5e02fee82cc6a924377 SHA512 6929033a0bf3eee76d636d4e2478c2c55f38352b43c67b9fba19253439ab9c7ad364aa5bb45f25b37068b1c4ac5bac4bf420b55998e57ebfb72c3f3efba1edc7
+EBUILD util-linux-9999.ebuild 8701 BLAKE2B b342903e4bc36fe2e6179eb0457654746eb8af6846209795699e69cf08863a3485683ffaa5bf0a67df78bd8fce8af834ef3e3064906ea5e02fee82cc6a924377 SHA512 6929033a0bf3eee76d636d4e2478c2c55f38352b43c67b9fba19253439ab9c7ad364aa5bb45f25b37068b1c4ac5bac4bf420b55998e57ebfb72c3f3efba1edc7
+MISC metadata.xml 1260 BLAKE2B c68fc8a1ab1ed6a5e8e8e09571adab4f0e6c539c7ce45434730d0bf7c039cb886b1a5273f0b41d5c00cd7188143aeedba9be70cd4eaa024f4e71503dc7f88e6e SHA512 701f00691c6fde1fcd3be15e9daa2c067f3b676b80a05d5131bf39ef111d652ede31bf2c45db1dffdfd81e523983a85ea96ed9b6ae0fd645b2203ac5c3afb508
diff --git a/sys-apps/util-linux/files/util-linux-2.32.1-skip-oids-test-when-uuidgen-is-not-available.patch b/sys-apps/util-linux/files/util-linux-2.32.1-skip-oids-test-when-uuidgen-is-not-available.patch
deleted file mode 100644
index 743dc89e2425..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.32.1-skip-oids-test-when-uuidgen-is-not-available.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 8f93c8c71d264e90bdcecf98c9ac372bbcdc53aa Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Sun, 11 Nov 2018 02:17:55 +0100
-Subject: [PATCH] tests: run oids test only when uuidgen tool was built
-
-oids test did not check if uuidgen was available.
-
-oids test was also calling uuidgen from PATH which could result
-in wrong results if uuidgen from a previous util-linux installation
-was used.
-
-With this commit we will check if uuidgen was built and make sure
-that we only call the uuidgen binary we just built. If uuidgen is
-not available we will skip this test.
----
- tests/ts/uuid/oids | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/tests/ts/uuid/oids b/tests/ts/uuid/oids
-index 3b005c5b2..77e010c1d 100755
---- a/tests/ts/uuid/oids
-+++ b/tests/ts/uuid/oids
-@@ -20,12 +20,14 @@ ts_init "$*"
- 
- : . > $TS_OUTPUT
- 
--uuidgen --md5 --namespace @dns --name "www.widgets.com" >> $TS_OUTPUT
-+ts_check_test_command "$TS_CMD_UUIDGEN"
- 
--uuidgen --md5 --namespace @dns --name "www.example.com" >> $TS_OUTPUT
-+$TS_CMD_UUIDGEN --md5 --namespace @dns --name "www.widgets.com" >> $TS_OUTPUT
- 
--uuidgen --sha1 --namespace @dns --name "www.example.com" >> $TS_OUTPUT
-+$TS_CMD_UUIDGEN --md5 --namespace @dns --name "www.example.com" >> $TS_OUTPUT
- 
--uuidgen --sha1 --namespace @oid --hex --name "525400fc0f5e" >> $TS_OUTPUT
-+$TS_CMD_UUIDGEN --sha1 --namespace @dns --name "www.example.com" >> $TS_OUTPUT
-+
-+$TS_CMD_UUIDGEN --sha1 --namespace @oid --hex --name "525400fc0f5e" >> $TS_OUTPUT
- 
- ts_finalize
diff --git a/sys-apps/util-linux/files/util-linux-2.33-sparc-setarch.patch b/sys-apps/util-linux/files/util-linux-2.33-sparc-setarch.patch
deleted file mode 100644
index cbae6c0f2631..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.33-sparc-setarch.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 3fa06e049012218d883d0e1251df86bafbc446bf Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 22 Nov 2018 11:03:35 +0100
-Subject: [PATCH] setarch: fix obscure sparc32bash use-case
-
-Reported-by: Carlos Santos <casantos@datacom.com.br>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- sys-utils/setarch.c | 28 ++++++++++++++++++----------
- 1 file changed, 18 insertions(+), 10 deletions(-)
-
-diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c
-index a733f7b3c..7c0a63fbb 100644
---- a/sys-utils/setarch.c
-+++ b/sys-utils/setarch.c
-@@ -268,6 +268,7 @@ int main(int argc, char *argv[])
- 	int c;
- 	struct arch_domain *doms, *target;
- 	unsigned long pers_value = 0;
-+	char *shell = NULL, *shell_arg = NULL;
- 
- 	/* Options without equivalent short options */
- 	enum {
-@@ -310,14 +311,14 @@ int main(int argc, char *argv[])
- 	archwrapper = strcmp(program_invocation_short_name, "setarch") != 0;
- 	if (archwrapper) {
- 		arch = program_invocation_short_name;	/* symlinks to setarch */
--#if defined(__sparc64__) || defined(__sparc__)
-+
-+		/* Don't use ifdef sparc here, we get "Unrecognized architecture"
-+		 * error message later if necessary */
- 		if (strcmp(arch, "sparc32bash") == 0) {
--			if (set_arch(arch, 0L, 0))
--				err(EXIT_FAILURE, _("Failed to set personality to %s"), arch);
--			execl("/bin/bash", "", NULL);
--			errexec("/bin/bash");
-+			shell = "/bin/bash";
-+			shell_arg = "";
-+			goto set_arch;
- 		}
--#endif
- 	} else {
- 		if (1 < argc && *argv[1] != '-') {
- 			arch = argv[1];
-@@ -391,6 +392,7 @@ int main(int argc, char *argv[])
- 	argc -= optind;
- 	argv += optind;
- 
-+set_arch:
- 	/* get execution domain (architecture) */
- 	if (arch) {
- 		doms = init_arch_domains();
-@@ -422,17 +424,23 @@ int main(int argc, char *argv[])
- 	if (arch)
- 		verify_arch_domain(target, arch);
- 
-+	if (!argc) {
-+		shell = "/bin/sh";
-+		shell_arg = "-sh";
-+	}
- 	if (verbose) {
--		printf(_("Execute command `%s'.\n"), argc ? argv[0] : "/bin/sh");
-+		printf(_("Execute command `%s'.\n"), shell ? shell : argv[0]);
- 		/* flush all output streams before exec */
- 		fflush(NULL);
- 	}
- 
--	if (!argc) {
--		execl("/bin/sh", "-sh", NULL);
--		errexec("/bin/sh");
-+	/* Execute shell */
-+	if (shell) {
-+		execl(shell, shell_arg, NULL);
-+		errexec(shell);
- 	}
- 
-+	/* Execute on command line specified command */
- 	execvp(argv[0], argv);
- 	errexec(argv[0]);
- }
diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml
index ed7b2cf02a02..d707189c1c8d 100644
--- a/sys-apps/util-linux/metadata.xml
+++ b/sys-apps/util-linux/metadata.xml
@@ -8,10 +8,13 @@
 <use>
 	<flag name="caps">build setpriv helper (run programs with diff capabilities)</flag>
 	<flag name="cramfs">build mkfs/fsck helpers for cramfs filesystems</flag>
+	<flag name="cryptsetup">Use <pkg>sys-fs/cryptsetup</pkg> to have built-in dm-verity in libmount</flag>
 	<flag name="fdformat">build fdformat (floppy disk format)</flag>
 	<flag name="hardlink">build hardlink program</flag>
 	<flag name="kill">build the kill program</flag>
+	<flag name="logger">build the logger program</flag>
 	<flag name="pam">build runuser helper</flag>
+	<flag name="su">build the su program</flag>
 	<flag name="suid">
 		install mount/umount as setuid so non-root users may mount/umount devices,
 		and wall/write as setgid so non-root users can notify other users
diff --git a/sys-apps/util-linux/util-linux-2.33-r1.ebuild b/sys-apps/util-linux/util-linux-2.33-r1.ebuild
deleted file mode 100644
index 6fe51861efbb..000000000000
--- a/sys-apps/util-linux/util-linux-2.33-r1.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
-	pam python-r1 multilib-minimal multiprocessing systemd
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU"
-
-# Most lib deps here are related to programs rather than our libs,
-# so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib:= )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
-	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	!build? ( systemd? ( sys-apps/systemd ) )
-	udev? ( virtual/libudev:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-	virtual/os-headers"
-RDEPEND+="
-	kill? (
-		!sys-apps/coreutils[kill]
-		!sys-process/procps[kill]
-	)
-	!net-wireless/rfkill
-	!sys-process/schedutils
-	!sys-apps/setarch
-	!<sys-apps/sysvinit-2.88-r7
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-2.7-r1"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/util-linux-2.32.1-skip-oids-test-when-uuidgen-is-not-available.patch"
-	"${FILESDIR}/${P}-sparc-setarch.patch"
-)
-
-src_prepare() {
-	default
-
-	# Prevent uuidd test failure due to socket path limit. #593304
-	sed -i \
-		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
-		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
-
-	if ! use userland_GNU; then
-		# test runner is using GNU-specific xargs call
-		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
-		# test requires util-linux uuidgen (which we don't build)
-		rm tests/ts/uuid/oids || die
-	fi
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	fi
-
-	# Undo bad ncurses handling by upstream. #601530
-	sed -i -E \
-		-e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
-		-e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
-		configure || die
-
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.${ABI}.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.${ABI}.c
-}
-
-python_configure() {
-	local myeconfargs=(
-		--disable-all-programs
-		--disable-bash-completion
-		--without-systemdsystemunitdir
-		--with-python
-	)
-	if use userland_GNU; then
-		myeconfargs+=(
-			--enable-libblkid
-			--enable-libmount
-			--enable-pylibmount
-		)
-	fi
-	mkdir "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-	popd >/dev/null || die
-}
-
-multilib_src_configure() {
-	lfs_fallocate_test
-	# The scanf test in a run-time test which fails while cross-compiling.
-	# Blindly assume a POSIX setup since we require libmount, and libmount
-	# itself fails when the scanf test fails. #531856
-	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
-	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
-
-	local myeconfargs=(
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--without-python
-		$(multilib_native_use_enable suid makeinstall-chown)
-		$(multilib_native_use_enable suid makeinstall-setuid)
-		$(multilib_native_use_with readline)
-		$(multilib_native_use_with slang)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with udev)
-		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
-		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
-		$(tc-has-tls || echo --disable-tls)
-		$(use_enable nls)
-		$(use_enable unicode widechar)
-		$(use_enable static-libs static)
-		$(use_with selinux)
-		$(use_with ncurses tinfo)
-	)
-	# build programs only on GNU, on *BSD we want libraries only
-	if multilib_is_native_abi && use userland_GNU; then
-		myeconfargs+=(
-			--disable-chfn-chsh
-			--disable-login
-			--disable-nologin
-			--disable-pylibmount
-			--disable-su
-			--enable-agetty
-			--enable-bash-completion
-			--enable-line
-			--enable-partx
-			--enable-raw
-			--enable-rename
-			--enable-rfkill
-			--enable-schedutils
-			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-			$(use_enable caps setpriv)
-			$(use_enable cramfs)
-			$(use_enable fdformat)
-			$(use_enable tty-helpers mesg)
-			$(use_enable tty-helpers wall)
-			$(use_enable tty-helpers write)
-			$(use_enable kill)
-		)
-	else
-		myeconfargs+=(
-			--disable-all-programs
-			--disable-bash-completion
-			--without-systemdsystemunitdir
-			# build libraries
-			--enable-libuuid
-			--enable-libblkid
-			--enable-libsmartcols
-			--enable-libfdisk
-		)
-		if use userland_GNU; then
-			# those libraries don't work on *BSD
-			myeconfargs+=(
-				--enable-libmount
-			)
-		fi
-	fi
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl python_configure
-	fi
-}
-
-python_compile() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake all
-	popd >/dev/null || die
-}
-
-multilib_src_compile() {
-	emake all
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl python_compile
-	fi
-}
-
-python_test() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	popd >/dev/null || die
-}
-
-multilib_src_test() {
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl python_test
-	fi
-}
-
-python_install() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake DESTDIR="${D}" install
-	python_optimize
-	popd >/dev/null || die
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl python_install
-	fi
-
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use userland_GNU; then
-		# need the libs in /
-		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	find "${ED}" -name "*.la" -delete || die
-
-	if ! use userland_GNU; then
-		# manpage collisions
-		# TODO: figure out a good way to keep them
-		rm "${ED%/}"/usr/share/man/man3/uuid* || die
-	fi
-
-	if use pam; then
-		newpamd "${FILESDIR}/runuser.pamd" runuser
-		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
-	fi
-
-	# Note:
-	# Bash completion for "runuser" command is provided by same file which
-	# would also provide bash completion for "su" command. However, we don't
-	# use "su" command from this package.
-	# This triggers a known QA warning which we ignore for now to magically
-	# keep bash completion for "su" command which shadow package does not
-	# provide.
-}
-
-pkg_postinst() {
-	if ! use tty-helpers; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.33.2.ebuild b/sys-apps/util-linux/util-linux-2.33.2.ebuild
index bd561c258265..bdcb82f80944 100644
--- a/sys-apps/util-linux/util-linux-2.33.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.33.2.ebuild
@@ -59,6 +59,7 @@ RDEPEND+="
 	!<app-shells/bash-completion-2.7-r1"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sys-apps/util-linux/util-linux-2.34-r2.ebuild b/sys-apps/util-linux/util-linux-2.34-r3.ebuild
index fcdde6fa5796..666d96fe4d15 100644
--- a/sys-apps/util-linux/util-linux-2.34-r2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.34-r3.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/
 
 LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="build caps +cramfs fdformat hardlink kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU"
+IUSE="build caps +cramfs fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
@@ -49,10 +49,15 @@ BDEPEND="
 "
 RDEPEND="${DEPEND}
 	hardlink? ( !app-arch/hardlink )
+	logger? ( !>=app-admin/sysklogd-2.0[logger] )
 	kill? (
 		!sys-apps/coreutils[kill]
 		!sys-process/procps[kill]
 	)
+	su? (
+		!<sys-apps/shadow-4.7-r2
+		!>=sys-apps/shadow-4.7-r2[su]
+	)
 	!net-wireless/rfkill
 	!sys-process/schedutils
 	!sys-apps/setarch
@@ -62,6 +67,7 @@ RDEPEND="${DEPEND}
 	!<app-shells/bash-completion-2.7-r1"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -168,7 +174,6 @@ multilib_src_configure() {
 			--disable-login
 			--disable-nologin
 			--disable-pylibmount
-			--disable-su
 			--enable-agetty
 			--enable-bash-completion
 			--enable-line
@@ -182,10 +187,12 @@ multilib_src_configure() {
 			$(use_enable cramfs)
 			$(use_enable fdformat)
 			$(use_enable hardlink)
+			$(use_enable kill)
+			$(use_enable logger)
+			$(use_enable su)
 			$(use_enable tty-helpers mesg)
 			$(use_enable tty-helpers wall)
 			$(use_enable tty-helpers write)
-			$(use_enable kill)
 		)
 	else
 		myeconfargs+=(
diff --git a/sys-apps/util-linux/util-linux-2.33.1.ebuild b/sys-apps/util-linux/util-linux-2.35_rc1.ebuild
index a657fb7e12d1..212d66fe2dbd 100644
--- a/sys-apps/util-linux/util-linux-2.33.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.35_rc1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
@@ -25,12 +25,15 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/
 
 LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU"
+IUSE="build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="caps? ( sys-libs/libcap-ng )
+DEPEND="
+	virtual/os-headers
+	caps? ( sys-libs/libcap-ng )
 	cramfs? ( sys-libs/zlib:= )
+	cryptsetup? ( sys-fs/cryptsetup )
 	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
 	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
 	pam? ( sys-libs/pam )
@@ -40,16 +43,22 @@ RDEPEND="caps? ( sys-libs/libcap-ng )
 	slang? ( sys-libs/slang )
 	!build? ( systemd? ( sys-apps/systemd ) )
 	udev? ( virtual/libudev:= )"
-DEPEND="${RDEPEND}
+BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	test? ( sys-devel/bc )
-	virtual/os-headers"
-RDEPEND+="
+"
+RDEPEND="${DEPEND}
+	hardlink? ( !app-arch/hardlink )
+	logger? ( !>=app-admin/sysklogd-2.0[logger] )
 	kill? (
 		!sys-apps/coreutils[kill]
 		!sys-process/procps[kill]
 	)
+	su? (
+		!<sys-apps/shadow-4.7-r2
+		!>=sys-apps/shadow-4.7-r2[su]
+	)
 	!net-wireless/rfkill
 	!sys-process/schedutils
 	!sys-apps/setarch
@@ -59,18 +68,10 @@ RDEPEND+="
 	!<app-shells/bash-completion-2.7-r1"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-	# In glibc-2.29+, a lot of changes were made to arch-specific
-	# handling of `struct termios', which breaks atleast MIPS.
-	# The below patch from upstream fixes this, and should be
-	# in the next release.
-	# See: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=963413a1adf6767ab17712097e288e1a346f63a7
-	"${FILESDIR}/${P}-fix-struct_termios-check.patch"
-)
-
 src_prepare() {
 	default
 
@@ -115,6 +116,7 @@ lfs_fallocate_test() {
 
 python_configure() {
 	local myeconfargs=(
+		"${commonargs[@]}"
 		--disable-all-programs
 		--disable-bash-completion
 		--without-systemdsystemunitdir
@@ -142,8 +144,13 @@ multilib_src_configure() {
 	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
 	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
 
-	local myeconfargs=(
+	# configure args shared by python and non-python builds
+	local commonargs=(
 		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+	)
+
+	local myeconfargs=(
+		"${commonargs[@]}"
 		--with-bashcompletiondir="$(get_bashcompdir)"
 		--without-python
 		$(multilib_native_use_enable suid makeinstall-chown)
@@ -158,8 +165,8 @@ multilib_src_configure() {
 		$(use_enable nls)
 		$(use_enable unicode widechar)
 		$(use_enable static-libs static)
-		$(use_with selinux)
 		$(use_with ncurses tinfo)
+		$(use_with selinux)
 	)
 	# build programs only on GNU, on *BSD we want libraries only
 	if multilib_is_native_abi && use userland_GNU; then
@@ -168,7 +175,6 @@ multilib_src_configure() {
 			--disable-login
 			--disable-nologin
 			--disable-pylibmount
-			--disable-su
 			--enable-agetty
 			--enable-bash-completion
 			--enable-line
@@ -181,10 +187,14 @@ multilib_src_configure() {
 			$(use_enable caps setpriv)
 			$(use_enable cramfs)
 			$(use_enable fdformat)
+			$(use_enable hardlink)
+			$(use_enable kill)
+			$(use_enable logger)
+			$(use_enable su)
 			$(use_enable tty-helpers mesg)
 			$(use_enable tty-helpers wall)
 			$(use_enable tty-helpers write)
-			$(use_enable kill)
+			$(use_with cryptsetup)
 		)
 	else
 		myeconfargs+=(
@@ -250,6 +260,7 @@ multilib_src_install() {
 		python_foreach_impl python_install
 	fi
 
+	# This needs to be called AFTER python_install call (#689190)
 	emake DESTDIR="${D}" install
 
 	if multilib_is_native_abi && use userland_GNU; then
@@ -267,7 +278,7 @@ multilib_src_install_all() {
 	if ! use userland_GNU; then
 		# manpage collisions
 		# TODO: figure out a good way to keep them
-		rm "${ED%/}"/usr/share/man/man3/uuid* || die
+		rm "${ED}"/usr/share/man/man3/uuid* || die
 	fi
 
 	if use pam; then
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index fcdde6fa5796..212d66fe2dbd 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/
 
 LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="build caps +cramfs fdformat hardlink kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU"
+IUSE="build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
@@ -33,6 +33,7 @@ DEPEND="
 	virtual/os-headers
 	caps? ( sys-libs/libcap-ng )
 	cramfs? ( sys-libs/zlib:= )
+	cryptsetup? ( sys-fs/cryptsetup )
 	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
 	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
 	pam? ( sys-libs/pam )
@@ -49,10 +50,15 @@ BDEPEND="
 "
 RDEPEND="${DEPEND}
 	hardlink? ( !app-arch/hardlink )
+	logger? ( !>=app-admin/sysklogd-2.0[logger] )
 	kill? (
 		!sys-apps/coreutils[kill]
 		!sys-process/procps[kill]
 	)
+	su? (
+		!<sys-apps/shadow-4.7-r2
+		!>=sys-apps/shadow-4.7-r2[su]
+	)
 	!net-wireless/rfkill
 	!sys-process/schedutils
 	!sys-apps/setarch
@@ -62,6 +68,7 @@ RDEPEND="${DEPEND}
 	!<app-shells/bash-completion-2.7-r1"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -168,7 +175,6 @@ multilib_src_configure() {
 			--disable-login
 			--disable-nologin
 			--disable-pylibmount
-			--disable-su
 			--enable-agetty
 			--enable-bash-completion
 			--enable-line
@@ -182,10 +188,13 @@ multilib_src_configure() {
 			$(use_enable cramfs)
 			$(use_enable fdformat)
 			$(use_enable hardlink)
+			$(use_enable kill)
+			$(use_enable logger)
+			$(use_enable su)
 			$(use_enable tty-helpers mesg)
 			$(use_enable tty-helpers wall)
 			$(use_enable tty-helpers write)
-			$(use_enable kill)
+			$(use_with cryptsetup)
 		)
 	else
 		myeconfargs+=(
diff --git a/sys-apps/vbetool/Manifest b/sys-apps/vbetool/Manifest
index fe66dcaaea5e..08d96b07e034 100644
--- a/sys-apps/vbetool/Manifest
+++ b/sys-apps/vbetool/Manifest
@@ -1,4 +1,4 @@
 AUX vbetool-1.0-build.patch 537 BLAKE2B e22826304e84fe21f577c3c7db754194103ca97a9b2647063469241f5c213182f4c80007823ef1caa6d79af1d313d560b1e06ebfaf757ec876a618117f2fbb3e SHA512 1b9b1b7471f09ec6dac8f535df1ea6bf09f8824f58c025b92e3e5d3e451a56e750e93836d03ee37e20f14868a9b75e97c548add36256412dfc154530c7a4be12
 DIST vbetool-1.1.tar.gz 182826 BLAKE2B 6b30eb468e55bedd766161e373e042b5fdf38fd2926bfc8aeb94404350864e835d41642f19be155fcf9a8fbfdc8b4e237e742cabd00626db5e8d17e7c7c5cf6f SHA512 09d8713516f074fe8e901ab3e24aba7e8b9ddf459b3ee3394b7604e4489a70a27c6dc3604cf1284c49233dba908f00da746c583562af2bc93b6df8ff413efd96
-EBUILD vbetool-1.1.ebuild 669 BLAKE2B 5c355f84b0e499c3d6335904d5f279cd30811db5c40b36f8f776801f48b5cf4cc19c719bdd4d6d17bffbcfd256675da4e1546f9cba38cdc2eb2da7736a0c6b34 SHA512 b382bb9a2bc2d795d6a4b33d8fe27c80251794ab7eaf0c72d82447aebb8b167762cea520e68ed7ea88e6fe81e24e3b5cdf85fc7d17b98df9f304776c181994f4
-MISC metadata.xml 309 BLAKE2B 9eebaf0a2c9bddec7b166ccc276008e70956fdcfbbfbb4c996f23cb09fde3047048e609b9a3c412d3bac383aeab874f505166be8b7362ed3d40387108cc4f604 SHA512 9068ab08a41974b1d807c0beb90e289c9fe22e70299c164d65d0a3e051a46964b91d77b5045df9f0dfdc7f23e1ee6d918819456f27b878890e343c86280b422c
+EBUILD vbetool-1.1.ebuild 668 BLAKE2B b13b2bb550daed41297ee4c806a1d5130e2e3e2a041c99fafd7980f7fcdb95638607b285bbb5a258d9ecd8a15b89aa63ceadac59f3c58b36af44e99d10bd8e10 SHA512 a598460e4af9587302d3dca73c14800403e7f434240eff658471b48c0617b6a03dff44b1b9dcc978168599cb22a164fefd3bfba6cc2a3e1e8a78433afba55571
+MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/sys-apps/vbetool/metadata.xml b/sys-apps/vbetool/metadata.xml
index a6ab4e944256..79d462e85571 100644
--- a/sys-apps/vbetool/metadata.xml
+++ b/sys-apps/vbetool/metadata.xml
@@ -4,8 +4,4 @@
 <maintainer type="person">
   <email>robbat2@gentoo.org</email>
 </maintainer>
-<maintainer type="project">
-  <email>x11@gentoo.org</email>
-  <name>X11</name>
-</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/vbetool/vbetool-1.1.ebuild b/sys-apps/vbetool/vbetool-1.1.ebuild
index fd6c4d5d9ce2..6001b998a371 100644
--- a/sys-apps/vbetool/vbetool-1.1.ebuild
+++ b/sys-apps/vbetool/vbetool-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit autotools
 
 DESCRIPTION="Run real-mode video BIOS code to alter hw state (i.e. reinitialize video card)"
 HOMEPAGE="http://www.codon.org.uk/~mjg59/vbetool/"
-SRC_URI="http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-1.1.tar.gz"
+SRC_URI="http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index 79609ad68b1e..7623aca785a4 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -6,6 +6,7 @@ DIST yarn-v1.16.0.tar.gz 1172930 BLAKE2B 1dbb754ae0af3b9666bb03057f587854407b358
 DIST yarn-v1.17.3.tar.gz 1240577 BLAKE2B a5b0fdd014928181da63a322bdc030e4aefd4033d27f49a37225aa2cb3199339dd06e9f74aaa442bfb4692b0470fda40102a41b52a1369c8b84282bae5bc46a6 SHA512 0a003ca3b9d165a42f99e17f581c76142edff56ff45f9f53d8868b62a80ca3aeb7ef07e9e66304b0cdd85e826d294b299e998324a97f8061619ea4beb0e37b84
 DIST yarn-v1.19.0.tar.gz 1242633 BLAKE2B 55aacab6e44c0a44f39ef9e116444043784272ab3d328f44e818cc45a94203f6e73a6d66f51dbdec46a0694890817dde3148be0fc3c931de79c0e2164f5e755f SHA512 40b88ca23f991e8da44f5ef1d6dedeaceea0cd1fbdc526b9cfb2e67a2d6a60cd528f7ef088816febb910707fa792c86c3b47f4dc89970a57e410a5209ec32b79
 DIST yarn-v1.19.1.tar.gz 1243585 BLAKE2B 01d19b9e2dabf40988b8dac9b3b48a43e7f15d0e4a3f75aad40afb8c811d6387bc476dbb7c6c841af33fe6010b98eaa4969b32cd590f9092b7552e8e9a152960 SHA512 8019df6cbf6b618d391add1c8c986cfec8aa4171d89596a54e32b79d79f640edb4c5b90814fa1bf8b947e3830be3b19c478554f7fd9d61c93505614cd096afc7
+DIST yarn-v1.19.2.tar.gz 1244018 BLAKE2B f88d0b6c5c3bdb6e02c0dd8c36fa981d35a0e46da143399dbbd8a39fac13669dc1b459f3ecd192c99d767fc477f54e61d74caeafaf9d1f0cdfdc4fba0b405fb6 SHA512 39d2cdfcafec03e2a75b8820350c0760ae9825d2e4496c5bc7a21877e588409eb10df93c08860a72405fc06c530660da125b96b3cdc89f38c50a652a3eda58fb
 DIST yarn-v1.9.4.tar.gz 937393 BLAKE2B 188e270b2a8b5b357b85101eda2552d675e3f41d30bc7b45266f34831cbcfc00feefe452c420f3aaefad7423c2af342d5fdb859ec6420faf689b680b5acda00f SHA512 1e3a908cf47a2fe46d7ce8db549b91cd0b3372c7c43c6b0029f1060b044a0a65e5bc3323f4ed6baf20bbbcb49ba358a6bb8f2691a591e4d3e8a01bc31372cb5b
 EBUILD yarn-1.10.1.ebuild 982 BLAKE2B e425900b48d8d8c3e0c892244c8dc9aa851dc8b52235156b1db04e2b5c96b6e30fab6b0466385a27a6ed509e8bdf75cf79f8242155739c9014b08625b1b45992 SHA512 5516aa40f79ddd130e55b5ede8684fde739e868cf885ecfadf6185b27588680f6c5f050aae5cf50d1617fb9ef912fc222390246418ec79bab32335b6975837f9
 EBUILD yarn-1.12.3.ebuild 982 BLAKE2B e425900b48d8d8c3e0c892244c8dc9aa851dc8b52235156b1db04e2b5c96b6e30fab6b0466385a27a6ed509e8bdf75cf79f8242155739c9014b08625b1b45992 SHA512 5516aa40f79ddd130e55b5ede8684fde739e868cf885ecfadf6185b27588680f6c5f050aae5cf50d1617fb9ef912fc222390246418ec79bab32335b6975837f9
@@ -15,5 +16,6 @@ EBUILD yarn-1.16.0.ebuild 983 BLAKE2B c2704e1e8d808e0092971ce0fb027c36f4b4d5e21e
 EBUILD yarn-1.17.3.ebuild 983 BLAKE2B c2704e1e8d808e0092971ce0fb027c36f4b4d5e21edd38740de3578156d13a0127db6bd5674af08ddba1e2ebaa54d85b4de13ad85ae9b412a9973f17c0e7f5de SHA512 367b7ce5e5b178d1f5678bee8a7ad0f1dbe87c0c10403d5d91ca96f0901d66f28a4ee66ee1093bbc43965b1759722a99d92b2f749b356daa635fcae3689678d4
 EBUILD yarn-1.19.0.ebuild 983 BLAKE2B c2704e1e8d808e0092971ce0fb027c36f4b4d5e21edd38740de3578156d13a0127db6bd5674af08ddba1e2ebaa54d85b4de13ad85ae9b412a9973f17c0e7f5de SHA512 367b7ce5e5b178d1f5678bee8a7ad0f1dbe87c0c10403d5d91ca96f0901d66f28a4ee66ee1093bbc43965b1759722a99d92b2f749b356daa635fcae3689678d4
 EBUILD yarn-1.19.1.ebuild 983 BLAKE2B c2704e1e8d808e0092971ce0fb027c36f4b4d5e21edd38740de3578156d13a0127db6bd5674af08ddba1e2ebaa54d85b4de13ad85ae9b412a9973f17c0e7f5de SHA512 367b7ce5e5b178d1f5678bee8a7ad0f1dbe87c0c10403d5d91ca96f0901d66f28a4ee66ee1093bbc43965b1759722a99d92b2f749b356daa635fcae3689678d4
+EBUILD yarn-1.19.2.ebuild 983 BLAKE2B c2704e1e8d808e0092971ce0fb027c36f4b4d5e21edd38740de3578156d13a0127db6bd5674af08ddba1e2ebaa54d85b4de13ad85ae9b412a9973f17c0e7f5de SHA512 367b7ce5e5b178d1f5678bee8a7ad0f1dbe87c0c10403d5d91ca96f0901d66f28a4ee66ee1093bbc43965b1759722a99d92b2f749b356daa635fcae3689678d4
 EBUILD yarn-1.9.4.ebuild 985 BLAKE2B 7b005c3aa6d5ac229d56eb115952f9280523a29d4ad94c52fd2d66b699199296d3819ad3add9e124c8be69fba103407ea1ea8b5e388a2f651f9ca0d8f23cd9af SHA512 8e5fe167f9067c05a25a8da3eac42a229898fa1e5de02beade97b25c4e6814717bf498c581f1e5113409afc34eba0d0bf70bb303a2a1b49497093b95f4d6a038
 MISC metadata.xml 545 BLAKE2B 223f9132b5cbabf71b64028e2fd75d4de88566b59069db3e1ebcf195cf3143e1c4c0f04dfa05d911a65f9d8ff29504385a9d8ed3001f66473e39ee2bca2417ba SHA512 f742b0908db5b89cd69b910497da75f129a0bc73b6068df891a4b8673d233b3bacc5347d98a872fdf8984f588c4991ae6c2b65ab60fbf81bfc5474402efae44a
diff --git a/sys-apps/yarn/yarn-1.19.2.ebuild b/sys-apps/yarn/yarn-1.19.2.ebuild
new file mode 100644
index 000000000000..6366d1485234
--- /dev/null
+++ b/sys-apps/yarn/yarn-1.19.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="Fast, reliable, and secure node dependency management"
+HOMEPAGE="https://yarnpkg.com"
+SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!dev-util/cmdtest
+	net-libs/nodejs"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	sed -i 's/"installationMethod": "tar"/"installationMethod": "portage"/g' "${S}/package.json" || die
+}
+
+src_install() {
+	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
+	insinto "${install_dir}"
+	doins -r .
+	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
+
+	while read -r -d '' path; do
+		read -r shebang < "${ED}${path}" || die
+		[[ "${shebang}" == \#\!* ]] || continue
+		fperms +x "${path}"
+	done < <(find "${ED}" -type f -printf '/%P\0' || die)
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /sys-apps
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)