gentoo resync : 23.09.2020

83 files changed, 495 insertions, 1645 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 8bc61c07c176..495c8c26e2df 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index 00aa8776e144..7c316ff15b9a 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -3,5 +3,5 @@ AUX accountsservice-0.6.50-loaded-state.patch 1579 BLAKE2B 40c5f1a641967fe24b740
 DIST accountsservice-0.6.50.tar.xz 384484 BLAKE2B 52c06ba85498f292204834f967211d8f0940786dc2ea3070124d3aecccd551375bfbc8fc31f23a2c3c86e23359294307656c3b927c4e819fc102d8626ae0dd82 SHA512 6e07cd318452b1cbedeacd729f0ebb200525caf1b09981abb2bac16fd90756a790ebec08aca0a0cea016f14ab27c159a68fe1332ef4bc636c5863b8c61040f64
 DIST accountsservice-0.6.55.tar.xz 97972 BLAKE2B aba3adfeb53e64455ce8e672b9db754bae4af6b4de0823cc021d0311a381ec40af04371e78f7c84eab7fb72356b26e22db78aad0343d57f65ea71a7742b51fc7 SHA512 c12e6a8e80f9b087f97238da4734d2d3a14a7c5cbd870a32a04b00116f176c818c39fb886f6dc72c3e93c136b0c2074ddf8f77e20431fa3bd54f138bea9d262d
 EBUILD accountsservice-0.6.50-r1.ebuild 1614 BLAKE2B 186817bfa9e51d665a856831cbcb537e3c671eea3f7eaa14d7549696720e6977e5b9ede900ec9656f916ebc809eb226da1e8210c9503b724db30462ca4592711 SHA512 fb1187baf22340be9c98adbfdc143288ef2e1bc4e08dfbc1c368e5718b398d6bd6f9816795760693b078cd3057d79c8ecb70dbb4581484296c761aff84088bcf
-EBUILD accountsservice-0.6.55.ebuild 1772 BLAKE2B 90eaf26e8b8fad4567f04cbec7282b5459e15a3062e1f11fc88c051901b364cd1c6e327078c2da3e83cf1edc76ec830a8185aa3af2323420e8879bb763e918df SHA512 396b1ecf75a5fdbfa3cb0c1dd7821aabf64ffb48fa525ce6ae7615c873c5b87c4e368b073b4ae5d2345ff78d24d5ff1100fe0cbf9af331c33494f3515e9ab7ad
+EBUILD accountsservice-0.6.55.ebuild 1770 BLAKE2B 11ebc342660ae9dd53a6578145d7603e2157368a219028ff2f77cff3fb08cdcf3ec8c47e9cba4ff600bd1e93695e75456bd0acaabfd1f7f23d439bfbf74da37c SHA512 25295434bc749323379277087aa16ef73c96d1f05db3c99f19365ec278b241aed1868551ad3d4b8253d93e5a848a51bf36dc35913ab3e7839887e5c64f52c9ef
 MISC metadata.xml 523 BLAKE2B 6117c5e7b8e0120bbae31e46c4d1e3709111638afa43c18d000c975ea0fded590ecb9404e10eca2542b5262cb122be9e34d140b6b3101ad69321cbc2f73a5890 SHA512 41c7b3374cfc02ddd842f13c25039abf016fdc110716cd9f308c4d9050a793c8506d6459c3604eae946184f3d08b2848d63b1bf65eb845f9a551c27debf1794a
diff --git a/sys-apps/accountsservice/accountsservice-0.6.55.ebuild b/sys-apps/accountsservice/accountsservice-0.6.55.ebuild
index 594f51a3a774..d9188e5e3060 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.55.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.55.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 IUSE="doc consolekit elogind gtk-doc +introspection selinux systemd"
 REQUIRED_USE="^^ ( consolekit elogind systemd )"
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index e74226782ae9..339d87bdc48f 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -7,5 +7,5 @@ DIST coreutils-8.31.tar.xz 5410140 BLAKE2B e3ae6be8edbe9df9164b4c9ac8bf14dc23b14
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
 EBUILD coreutils-8.30.ebuild 6248 BLAKE2B 3fd8d6648cb5d7ca2dda584a81d8ca154c96453fc73fe6fa35b97a525d2f98ca21fb3a8237c1bc27aa769e1f5373044789b8e51a34782c57dcd268ac278624ad SHA512 7b525a7d2cf84b5af61e7ae00c8c75715ff346881bba15085b0ca17b4ad4b0678adbabeabc53ff1797e7716ea36a02bebf28d6aaa0eee42abb4f62196f2cd933
 EBUILD coreutils-8.31-r1.ebuild 5685 BLAKE2B 8adcf7ff796153278c7c81075e81b1748ec29ec9dd79338d7db87fa92344131220b812049cb0abb847a842ed653501dd22e5d5edd520a7033b10fe8f421a4815 SHA512 9775562def55e2b4cbdaad3ce68058bd8c9a2e8db8bd175ad74fe8446fad49b494d5a654c1ce8faf248310441b1f88ede613bb1ef21938a0c1a07491455ba37c
-EBUILD coreutils-8.32-r1.ebuild 5801 BLAKE2B b12e1690fd010c3f69631379e404401cb3f5b5f50854e2c636dad043284c2dda842c9c6fa92406edd7b6bbddd46b2db4756adeb878066feb5c9f9c8c6842d464 SHA512 8c99875c09a0ad2e08aa45c61b6531f1baf0f015cb4af7371d86542d4fc93d0af8c67377a7de671dc3176333ec9fc0412443f7d447ca3c57b5c326096542c03b
+EBUILD coreutils-8.32-r1.ebuild 5800 BLAKE2B 6492cc21d79a188abe9edcd7502b676f8d854edf11d04e5bdd2c5c896a79c85bbfb3abffd2e809921226353d08eb7af3e72b3dd7a9d116c0b23c23e59bcdeb6d SHA512 99579514865e0931d9ae0590171f73aa9d47a30858dce5d1dc91b72833f96025a28166cdec80450afb40849ade7e6e2bfa4dcc75c9e09b00dd3f4db5a40293de
 MISC metadata.xml 958 BLAKE2B f66e780b413255fcde84ab0114e0be6d285963be305cf67bf170243d491e2677dae0e6d33eee5660dfcd6672b55cae383651f878feceffea5085aab31c83b7b6 SHA512 3e4c60dc34a3b6a74392e45bee5a075126728ccc278d61985124780f24b387ef75934c0c0bb4f647e96916d289a5f0c3eccd5411546758c67d703638af87c044
diff --git a/sys-apps/coreutils/coreutils-8.32-r1.ebuild b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
index 788e78ee045c..63b8e1f69406 100644
--- a/sys-apps/coreutils/coreutils-8.32-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/dstat/Manifest b/sys-apps/dstat/Manifest
index 052684fc64af..cdf9d5a45c53 100644
--- a/sys-apps/dstat/Manifest
+++ b/sys-apps/dstat/Manifest
@@ -1,11 +1,6 @@
-AUX dstat-0.7.3-skip-non-sandbox-tests.patch 705 BLAKE2B 3a20e75fd1aaed47d02066b7c889c13b4e1d8a2f8fd9772973d99736eb7cdf1fa9b8c04126beace166a6ac65de5de8743b904e9fa20d60a3aeae706f7ca41d18 SHA512 efa1c6a807efc7fabf8566ec446be94922e1fe78191101648dc066f107474f1b89c4c8cac51d6d1ba7d4b1061ce0358abf317761ce52199479667da1684f0929
 AUX dstat-0.7.4-fix-csv-output.patch 888 BLAKE2B 6aa25d7b7c2fed6986be55bf5802692ca6fd9d982d9b0a819983fbff3745c5aaf12667bd0e5cd2e385c8f4583273feff2744ba015b04fe1c8545b388ab828dc4 SHA512 4e68c320983c5e1851dcf6e51d2d0e1de92e084310fb650f0bf7ddae68d6b923f9a013003ca91f98f513e9ae135c1800582f214d70f65f5e8b5809e9bda6600a
 AUX dstat-0.7.4-skip-non-sandbox-tests.patch 661 BLAKE2B 31f98e58c8f23e3b6322de86bdddb83afa22b0b8bed48164378c6c071348ac2a37350b789985634017c1e338ceb73d7f9221d99e0b8b4b4d550f10d7840bde76 SHA512 0087d7fa2ce9388440bacdac52038433c1a7f0c5fd885027a4b18895c8f450cc7cae7610e6232e26393749f1b165c4ade5ee2a0e453c7e2542450f5a3d3100ac
 AUX fix-collections-deprecation-warning.patch 899 BLAKE2B ec02bf38b8c40f8f018ba6da523da24f9215dfd7c967dbfc2384ea16ab9b01489a7d69cd99d81ddb1222e75e6d070e40d435e1d12ad8ea2961e447721d9656bc SHA512 4164f61a1ef97f2a4962f84138305b68cdbc9fcc5c639fade7b580c9f9904d592af9e05982536cd2bea5581c30696a0308dedbe6f739f0094c319bc85d547fea
-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-r1.ebuild 1269 BLAKE2B bf9547eff38162ee495b8e8efe8c6180c8c983349d67452379ee32999d4daf5bc77f91db16ca6c2427ab995da6a8057fef81cc39a91ecb68931772dfeb8533f4 SHA512 90cfcbc53830b7b194992e81c81a1c5629111ab5619eb12645873284b8c0604c1dfc6023712ae15a0c9aedf9ac5f4d5bd47361a148d37609d66b419154456fe4
 EBUILD dstat-0.7.4-r2.ebuild 1301 BLAKE2B 19fadb404714fa8c5799d3aed439c37e6cd0c4acc92a6af29d578258c12e2c85bf414aebcd8fc0a26d2e61e8a66694e9eeddf32c0c228c5d6e4391c749b584c9 SHA512 bc0af1d11789d43acf3535d50eac0b3d602ee86686e75bfc53818592bd6f45c6130ee1b2786fb550d1d4e053bff2ba19ab2edea3151b24331c9d205d5a5f458e
-EBUILD dstat-0.7.4.ebuild 1160 BLAKE2B a2b25f7361ea74b2432efeaebeaf095e809c52c46b978d7fdca1c429c47e1ef5d2d77fcdbb19544d6524b2a8f349dc85882d1f323c62681794d15ffd4976a88e SHA512 ad500b7419422236bd4d09795eab2b13e524c0019a9dd11d340201dfa37f5edab781eb37bdf29f46ef734dcac489b467174eb9afc92f281f88a33714e3764f77
 MISC metadata.xml 867 BLAKE2B 11beeb2f2c4f397a0be3f5c97351be3d0ad6a3d54132c8a354ee405ca429d99b0d8983ca844e4d07d4d25d3be2642f6b1c4cd47068d91bebf89b5637ea86a7ef SHA512 751ac86ff9b2aa7435743d9fff4d44a1c34a9e6bbd568c3637f2f32564723c45d8de84840b90372cd809a6d9edf7ddd706927e24d6611583ea33d7be17eef1f9
diff --git a/sys-apps/dstat/dstat-0.7.3.ebuild b/sys-apps/dstat/dstat-0.7.3.ebuild
deleted file mode 100644
index 372d70a1fd0a..000000000000
--- a/sys-apps/dstat/dstat-0.7.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-DESCRIPTION="Versatile replacement for vmstat, iostat and ifstat"
-HOMEPAGE="http://dag.wieers.com/home-made/dstat/"
-SRC_URI="https://github.com/dagwieers/${PN}/archive/${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"
-IUSE="wifi doc examples"
-REQUIRED_USE="wifi? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	wifi? (
-		${PYTHON_DEPS}
-		net-wireless/python-wifi
-	)"
-DEPEND=""
-
-PATCHES=( "${FILESDIR}/dstat-${PV}-skip-non-sandbox-tests.patch" )
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	einstalldocs
-
-	if use examples; then
-		dodoc examples/{mstat,read}.py
-	fi
-	if use doc; then
-		dodoc docs/*.html
-	fi
-}
diff --git a/sys-apps/dstat/dstat-0.7.4-r1.ebuild b/sys-apps/dstat/dstat-0.7.4-r1.ebuild
deleted file mode 100644
index a5d6db02953c..000000000000
--- a/sys-apps/dstat/dstat-0.7.4-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-r1
-
-DESCRIPTION="Versatile replacement for vmstat, iostat and ifstat"
-HOMEPAGE="http://dag.wieers.com/home-made/dstat/"
-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"
-IUSE="doc examples wifi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/six[${PYTHON_USEDEP}]
-	wifi? (
-		net-wireless/python-wifi
-	)"
-DEPEND="${RDEPEND}"
-
-PATCHES=( \
-	"${FILESDIR}/dstat-${PV}-skip-non-sandbox-tests.patch" \
-	"${FILESDIR}/fix-collections-deprecation-warning.patch" \
-)
-
-src_prepare() {
-
-	# bug fix: allow delay to be specified
-	# backport from: https://github.com/dagwieers/dstat/pull/167/files
-	sed -i -e 's; / op\.delay; // op.delay;' "dstat" || die
-
-	default
-}
-
-src_install() {
-	python_foreach_impl python_doscript dstat
-
-	insinto /usr/share/dstat
-	newins dstat dstat.py
-	doins plugins/dstat_*.py
-
-	doman docs/dstat.1
-
-	einstalldocs
-
-	if use examples; then
-		dodoc examples/{mstat,read}.py
-	fi
-	if use doc; then
-		dodoc docs/*.html
-	fi
-}
diff --git a/sys-apps/dstat/dstat-0.7.4.ebuild b/sys-apps/dstat/dstat-0.7.4.ebuild
deleted file mode 100644
index 43f33c42343c..000000000000
--- a/sys-apps/dstat/dstat-0.7.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-r1
-
-DESCRIPTION="Versatile replacement for vmstat, iostat and ifstat"
-HOMEPAGE="http://dag.wieers.com/home-made/dstat/"
-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"
-IUSE="doc examples wifi"
-REQUIRED_USE="wifi? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	wifi? (
-		${PYTHON_DEPS}
-		net-wireless/python-wifi
-	)"
-DEPEND=""
-
-PATCHES=( \
-	"${FILESDIR}/dstat-${PV}-skip-non-sandbox-tests.patch" \
-	"${FILESDIR}/fix-collections-deprecation-warning.patch" \
-)
-
-src_prepare() {
-
-	# bug fix: allow delay to be specified
-	# backport from: https://github.com/dagwieers/dstat/pull/167/files
-	sed -i -e 's; / op\.delay; // op.delay;' "dstat" || die
-
-	default
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	einstalldocs
-
-	if use examples; then
-		dodoc examples/{mstat,read}.py
-	fi
-	if use doc; then
-		dodoc docs/*.html
-	fi
-}
diff --git a/sys-apps/dstat/files/dstat-0.7.3-skip-non-sandbox-tests.patch b/sys-apps/dstat/files/dstat-0.7.3-skip-non-sandbox-tests.patch
deleted file mode 100644
index 48eb542ed195..000000000000
--- a/sys-apps/dstat/files/dstat-0.7.3-skip-non-sandbox-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile	2016-03-18 13:03:22.000000000 +0000
-+++ b/Makefile	2018-10-02 11:11:00.344942941 +0100
-@@ -32,9 +32,11 @@
- 	rm -f examples/*.pyc plugins/*.pyc
- 	$(MAKE) -C docs clean
- 
-+TEST_PLUGINS=--cpufreq --disk-avgqu --disk-avgrq --disk-svctm --disk-tps --disk-util --disk-wait --dstat-cpu --dstat-ctxt --dstat-mem --dstat --helloworld --md-status --net-packets --proc-count --snooze --test --top-bio-adv --top-bio --top-childwait --top-cpu-adv --top-cpu --top-cputime-avg --top-cputime --top-int --top-io-adv --top-io --top-latency-avg --top-latency --top-mem --top-oom
-+
- test:
- 	./dstat -taf 1 5
--	./dstat -t --all-plugins 1 5
-+	./dstat -t $(TEST_PLUGINS) 1 5
- 
- dist: clean
- 	$(MAKE) -C docs dist
diff --git a/sys-apps/earlyoom/Manifest b/sys-apps/earlyoom/Manifest
index 29157012c2dd..ca5926f0265e 100644
--- a/sys-apps/earlyoom/Manifest
+++ b/sys-apps/earlyoom/Manifest
@@ -1,6 +1,8 @@
 AUX earlyoom 122 BLAKE2B 1e3e121135740b4f56f6929d1389cce42374db03713e7c5c6281a422f0f6ba02db3f04f8d9a72f19c8853795b4debcdf2ccffcdd4f095f425b620e931d51a8c4 SHA512 7dfd1c8aff690d2ed7137b250deac4135c48ca5fd04390468b3ea1569df81316f009e5c70175734c9f8dd21e46a13015905d3daaffe76d67eef936cda670e305
 AUX earlyoom-1.3-test-fixed.patch 1425 BLAKE2B 47231739b8bbb5a4a290266b85900dc18e8ef72d3dba8c20c8d617b06cc30c95d4c913e07e0e9a9e6fc6f095591538b8b37d7c72e7ac90f9b49f6a4706051280 SHA512 e906c6c4f7d835fb43f09d3c701a1d78b8c2d1e9642d1b7512a2e90094fe41b8f9a811da94af38f5442a976351d6cfd35557ef40a685466ea6ba80dcef5293a1
 DIST earlyoom-1.3.tar.gz 31399 BLAKE2B 3867540afb23493fbb532bcb72a5cfacca4ed297a053ff5e2c7e394bfa3640887e3e7c6430789bc1eda4b7a68680d8a74ab56b641fe9e5d4caa4406e2edb0667 SHA512 c5de742289e82c2098bd88c61dcb3e20eb022905a015b4894c95a4de3978ce18d794a9e7c17c97851ca9f8888728908f7bf978c014b3b69799bffa8b546d258a
-EBUILD earlyoom-1.3.ebuild 1000 BLAKE2B e08bb103093f341794f7b2217c3a4c58e3cc9787af17d79f40bb58f8c1580a22c932001d3999138708fb976c53eeeef55a0ae527eb3d14bf738a9028aabc9d28 SHA512 91b46600142a1dd6c1d75a712651a3ebd482005895709ea61a5de10ad1cced895be96cc5d7f13a2a56ea597227db8422c82c4a54067aa046ff8e0af91afe4d58
-EBUILD earlyoom-9999.ebuild 928 BLAKE2B b646e79ee9f63bdefd0911b1460ee8bf92b4f52413287184be5c607c1a86a374ca137e36f3e9ef928ecd33c0f789f807cda52ba6a697b87851bc326dae584c52 SHA512 cd53a996605505f9aa693839831c77f9c824f1a40766d0219e9eecacde041d6a864a60386654761cd54d0350d47ca3d5276daf850dd39c85afe42c1f5f5d14dc
+DIST earlyoom-1.6.1.tar.gz 48200 BLAKE2B 559ed59fa24cb05dbc74785eff06e1e4a2772b555fba2c67cda2651cf1c514e842f18cd085905d556e0bd1de238012385eae37953d90a6a5302f7a727be9eb8a SHA512 4f7e2053f6331c1a0c0163952067503da0ea4f09a5650ef4f4d2692530e04cd0841e4fd83fe593d54dc5361d51c86002d93fb9e6ae0f76d669646bd8de9f2065
+EBUILD earlyoom-1.3.ebuild 1026 BLAKE2B c2ba3edd30c90944e7a6dd1a41ec1fef4a186c66d567e9aaec5125feb46de80c78644fc38d5bb59780d7addcec63d0127b61b57bdaee7bf0ff504058a917d4d3 SHA512 d7dfa94f1ab30048a310a8eb5b0e11e4cb2cec2d8e92259628fd63460c274c84d7a1bc08045b1dc04f5d46132fa7c7ed3fd4d1d23156f7816a68834c03a98342
+EBUILD earlyoom-1.6.1.ebuild 961 BLAKE2B d301882263b9c070e014cc7a36b07c102b572eb6944bab310361a0308c2fbd65a721d01bd9463340019e445e6d758716757ba0dccc2d59ec8c6e02670ae965d9 SHA512 d4331553f6520f3151b200b93d0484be376ab20b1122c3c7e4d1363d7e919707475f5f0637f507d4e2fda64f332ba5054cedf5dd2aad3d441e7cb5122258d14e
+EBUILD earlyoom-9999.ebuild 961 BLAKE2B d301882263b9c070e014cc7a36b07c102b572eb6944bab310361a0308c2fbd65a721d01bd9463340019e445e6d758716757ba0dccc2d59ec8c6e02670ae965d9 SHA512 d4331553f6520f3151b200b93d0484be376ab20b1122c3c7e4d1363d7e919707475f5f0637f507d4e2fda64f332ba5054cedf5dd2aad3d441e7cb5122258d14e
 MISC metadata.xml 307 BLAKE2B e51a83c88fdb7b817981979a1de41249b2255900e6575eb555489bbc6e924e0bb0ac41d1c214279e0e4e87cba96eb4c0dd92b8dc591a1a1fa7f83e7b6fa9eda5 SHA512 28e7739c241e47e235f1cf897bf4fe5befbcdf783451906ed200c7fac9da0b57c24c6b79900493379709aebbd0a81b4999436d070ad2557cce3886a1efc4c806
diff --git a/sys-apps/earlyoom/earlyoom-1.3.ebuild b/sys-apps/earlyoom/earlyoom-1.3.ebuild
index 14280ec05712..cae1f13f3b86 100644
--- a/sys-apps/earlyoom/earlyoom-1.3.ebuild
+++ b/sys-apps/earlyoom/earlyoom-1.3.ebuild
@@ -15,7 +15,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/rfjakob/earlyoom/archive/v$PV.tar.gz -> $P.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 IUSE="docs systemd test"
 
@@ -26,6 +26,8 @@ BDEPEND="
 	test? ( dev-lang/go )
 "
 
+RESTRICT="!test? ( test )"
+
 src_prepare() {
 	eapply "${FILESDIR}/${P}-test-fixed.patch"
 	default
diff --git a/sys-apps/earlyoom/earlyoom-1.6.1.ebuild b/sys-apps/earlyoom/earlyoom-1.6.1.ebuild
new file mode 100644
index 000000000000..898c4fbac557
--- /dev/null
+++ b/sys-apps/earlyoom/earlyoom-1.6.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Early OOM Daemon for Linux"
+HOMEPAGE="https://github.com/rfjakob/earlyoom"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/rfjakob/earlyoom.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/rfjakob/earlyoom/archive/v$PV.tar.gz -> $P.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE="docs systemd test"
+
+RDEPEND=""
+DEPEND=""
+BDEPEND="
+	docs? ( app-text/pandoc )
+	test? ( dev-lang/go )
+"
+
+#tests don't work
+RESTRICT=test
+
+src_compile() {
+	VERSION="v${PV}" emake earlyoom
+	use docs && VERSION="v${PV}" emake earlyoom.1
+	use systemd && emake PREFIX=/usr earlyoom.service
+}
+
+src_install() {
+	dobin earlyoom
+	use docs && doman earlyoom.1
+
+	insinto /etc/default
+	newins earlyoom.default earlyoom
+
+	doinitd "${FILESDIR}/${PN}"
+	use systemd && systemd_dounit earlyoom.service
+}
diff --git a/sys-apps/earlyoom/earlyoom-9999.ebuild b/sys-apps/earlyoom/earlyoom-9999.ebuild
index b9059f99084c..898c4fbac557 100644
--- a/sys-apps/earlyoom/earlyoom-9999.ebuild
+++ b/sys-apps/earlyoom/earlyoom-9999.ebuild
@@ -26,6 +26,9 @@ BDEPEND="
 	test? ( dev-lang/go )
 "
 
+#tests don't work
+RESTRICT=test
+
 src_compile() {
 	VERSION="v${PV}" emake earlyoom
 	use docs && VERSION="v${PV}" emake earlyoom.1
diff --git a/sys-apps/edid-decode/Manifest b/sys-apps/edid-decode/Manifest
index d66f0c6d3848..99fe26f36673 100644
--- a/sys-apps/edid-decode/Manifest
+++ b/sys-apps/edid-decode/Manifest
@@ -1,6 +1,4 @@
-DIST edid-decode-0_pre20200422.tar.gz 88332 BLAKE2B 1458e9045adbdd20a95061460fc8a646e4f04428cd7d64b177b8b6bd4d67109f9ca6103227bf72280bb22718ae5fd4922a598114f811492435b45db1fd806100 SHA512 7ea4861b40e131a716322dfae50cc83b44d9a716a6272994cf66969d997f0fc330781ce763ce1fe8f08e22ba9d0d2d5394d6aa63686bc954f2296639bd2bc677
 DIST edid-decode-0_pre20200720.tar.gz 102525 BLAKE2B 57b296987ef890c9d4dd46d432730ffab5adfb758be4e1bcc7b6b5e34fc3fae42901da98c302c4a1742d39274b295b8b639012e4b848ed48ab0ee69cbc45b98a SHA512 4545c3a2263587eaf98cab0a3ec109659b50478b17e2ee51605ae53b1475761aee16f4c6e1549889016359cfce3de03cd907c3e801f12021e7459f25cebfdccb
-EBUILD edid-decode-0_pre20200422.ebuild 688 BLAKE2B 0d4cf39fcd6cd213cf2598b38eced501bdb962185a2657663355f4f5ecfb061b035ced285312bd8a2553cecdc3e3f933e07ffd779e08cdadb2a974baad86b3d5 SHA512 d0abef9e136ed9eeb28e79e9327d4740094be3d704137ac35e8c96d942925c43c53e33873a39f05e4f388d386690e0a1f0c43c60072f1b3bad1d941f3dbc1dbb
-EBUILD edid-decode-0_pre20200720.ebuild 690 BLAKE2B 61803f0af301c161c7ff8bd07cca19b0124ddec000cdaa726d654343ed2d6b30dcacf1b0672da03138c653a366f8ebf012e4617d781502e3e4ffe5fb03412832 SHA512 8850f45eb884bca4ca47c9e066a1093f2634bedd4390c10f25e4b766898decc4efe3201fa2c8e48e90c970d05c0dca98c4f2ce04c0f9ac83d0552e9094134c0a
+EBUILD edid-decode-0_pre20200720.ebuild 688 BLAKE2B b11228f8ae070655c7efd7542a9774b9e07a26c586b93124426524b6fb5ac955c3a31616b9e4fe8906a1bb8897d7914208b03049fad980b97d615aea13aa1c78 SHA512 8a64aca8fa837937dc44d47648d5747067feb7cc4070cd2ddd49f4bf6bce217d932641f98b1888bd97387d8fd70507962ed460a3724066fa971236bf4e93ed08
 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_pre20200422.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20200422.ebuild
deleted file mode 100644
index 3c3480be14f2..000000000000
--- a/sys-apps/edid-decode/edid-decode-0_pre20200422.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-EGIT_COMMIT="74b64180d67bb009d8d9ea1b6f18ad41aaa16396"
-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-0_pre20200720.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20200720.ebuild
index 99543090a86f..3685473eeacb 100644
--- a/sys-apps/edid-decode/edid-decode-0_pre20200720.ebuild
+++ b/sys-apps/edid-decode/edid-decode-0_pre20200720.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="examples"
diff --git a/sys-apps/elivepatch-client/Manifest b/sys-apps/elivepatch-client/Manifest
deleted file mode 100644
index b84aad3e16c5..000000000000
--- a/sys-apps/elivepatch-client/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST elivepatch-client-0.1.tar.gz 88031 BLAKE2B 6d60bc5539e9c2bd174dc77f34f061f0a351c7ae8026659dcdcab463d2b5fc8dafa35c0ca76ed2e591f6d49c1e58b66766898e7ce774297d053bd6def4378edc SHA512 c2e324f2be6d75ffe4b2f329875f6f81ba3e4657aa1c4e6514188d5269fd68f7d50b7d823281b1bb585804f84fda639931fcd349d168c169f736ee8613f9f451
-EBUILD elivepatch-client-0.1.ebuild 602 BLAKE2B 541656140dd4af75e8548a9e54f662ab31f812ef97cef393e10e82ac483f25673f2ded1c775eb2bdf552f881be4375c62d6fc84f18908d1c9307f892821b7d68 SHA512 595dd8556d01fae5fbd08088aec5c009263382995b3ffea79107db2890e5681555b740c384efccac74d287c7f3bacb0f846869ef475a6e0c9c7f28aba580148d
-EBUILD elivepatch-client-9999.ebuild 724 BLAKE2B 6712ade650b4e09f0fb97b51adfe0672439b4d5aa16163e96e4c9b653d5149023bfcd2e4498148578d62967777b651bb07941fe8ebad6330b3fc8c175d7f22e6 SHA512 1107df34889e9d8a1f8b9a00f144ad7f9f80cf26dea50a0cb757f800eb23c39f1ad8212f9291317336c6d5df47c62335e5e559466787e2a7494ad2d0ed1dc35f
-MISC metadata.xml 311 BLAKE2B e6ea1b04433934bf6df08628f644783f8fd80234e06fc8d1c692dd1ad1ba1c66ce1465c2871291ef7b18dd02e3803fefd31ce1615fc790c22295da47f3b42d88 SHA512 d53e458f4c2a4844c50d65b8c75f18cf637992dbe78b17dcf20a8a0f15113df8b89c197d2f11f6160fcca7db23669db009028deec039cbf32911e966e6210e98
diff --git a/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild b/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild
deleted file mode 100644
index 342b201d82a7..000000000000
--- a/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Live patch installer client working with elivepatch-server"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Elivepatch"
-SRC_URI="https://github.com/aliceinwire/elivepatch-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-admin/sudo
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild b/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild
deleted file mode 100644
index 70cc99090d40..000000000000
--- a/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Live patch installer client working with elivepatch-server"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Elivepatch"
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/aliceinwire/elivepatch-client.git"
-else
-	SRC_URI="https://github.com/aliceinwire/elivepatch-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-RDEPEND="
-	app-admin/sudo
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sys-apps/elivepatch-client/metadata.xml b/sys-apps/elivepatch-client/metadata.xml
deleted file mode 100644
index 56f9bdda8540..000000000000
--- a/sys-apps/elivepatch-client/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="person">
-		<email>alicef@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">aliceinwire/elivepatch-client</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-apps/elivepatch-server/Manifest b/sys-apps/elivepatch-server/Manifest
deleted file mode 100644
index bf327160a366..000000000000
--- a/sys-apps/elivepatch-server/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST elivepatch-server-0.1.tar.gz 11564 BLAKE2B 0b1a9c518ba51ffa4fcdf0d5d0202b182464d13123334583e8f647be4c8ff48c9d7471fcab8a18d2ddd27172928942e4645c75a1976b25a521c7f1caecedb0b6 SHA512 d469fbc32df7a586fa899c6e587832bd53c1984c97b973e3aad4f6bf62962846142938a6e6e5729fce39d3f7d486c5ed9fd9f484425d863a40a1199f170830fb
-DIST elivepatch-server-0.2.tar.gz 14198 BLAKE2B 1e48626dff5cf0ed5e7e3fb09dec54fc0e203be58646a62419df901c8b96964281250c613ef06cca9ede32ce7f4e384094892a79033afa0d20b133c54a4cc5c6 SHA512 1af4c6656b32491d82c0c98ed53a7184bea4a2639d6bf6072c3e8ae3f0d12c09284cdb6f96129b1ce848872946e14c6b83d3bbe6eb959cd5c918575ed42a621a
-EBUILD elivepatch-server-0.1.ebuild 767 BLAKE2B 4c891e7a28271bc7fce0c62093c0ad7d5c3d55d7851cc9b4ee718aa11d8425f8b132e3f8262930b83bfde6a70bf87b649bbd24ee1c073135db4852600410c569 SHA512 f291a3f96335855cb65c60ca3fe9f5be87ef31c65614e4df0625964f92fc6b80bc2dd5b1396edfb0cd91591d2a39604f6b19d9321672c15283444b74ccfdbe4a
-EBUILD elivepatch-server-0.2.ebuild 767 BLAKE2B 4c891e7a28271bc7fce0c62093c0ad7d5c3d55d7851cc9b4ee718aa11d8425f8b132e3f8262930b83bfde6a70bf87b649bbd24ee1c073135db4852600410c569 SHA512 f291a3f96335855cb65c60ca3fe9f5be87ef31c65614e4df0625964f92fc6b80bc2dd5b1396edfb0cd91591d2a39604f6b19d9321672c15283444b74ccfdbe4a
-EBUILD elivepatch-server-9999.ebuild 914 BLAKE2B 7a507a6fbff50363143f38dfb48c4062902b8cbd7fb8f2e2e919442be5be02e6ebfdab9452102df42d16af2eccd223a64d1e28f5e0b8263cf9c463ac88c1bae9 SHA512 83c2bb2b59a7d5d63ea3c3529ca6a8666e39fa4d8b5e618b0d409ed5e9fad6cbff71124c86c3ab4c984db785cb68abfe9559f9ce8eb26f82e82a5dec5b84ca27
-MISC metadata.xml 311 BLAKE2B 0394811b976f9903cfb643f6b556fe834d6b6f9a9b981e710dd64ed0128dcb1a69fe532c750c24103983a24c87bd5eceb81063fc1d3e606b46cce1bdf65930b2 SHA512 5add2dd39169c27b7688232595ceabd5e23a82d03f122d33d56cb19be11b3b98136a17437b0602adaccb7b61ee338f19df25e339a75ac362db072757106ea070
diff --git a/sys-apps/elivepatch-server/elivepatch-server-0.1.ebuild b/sys-apps/elivepatch-server/elivepatch-server-0.1.ebuild
deleted file mode 100644
index e4b44317b8b6..000000000000
--- a/sys-apps/elivepatch-server/elivepatch-server-0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Live patch building server with RESTFul Api for elivepatch-client"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Elivepatch"
-SRC_URI="https://github.com/aliceinwire/elivepatch-server/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-restful[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	newinitd init/elivepatch.init ${PN}
-	newconfd init/elivepatch.confd ${PN}
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/elivepatch-server/elivepatch-server-0.2.ebuild b/sys-apps/elivepatch-server/elivepatch-server-0.2.ebuild
deleted file mode 100644
index e4b44317b8b6..000000000000
--- a/sys-apps/elivepatch-server/elivepatch-server-0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Live patch building server with RESTFul Api for elivepatch-client"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Elivepatch"
-SRC_URI="https://github.com/aliceinwire/elivepatch-server/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-restful[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	newinitd init/elivepatch.init ${PN}
-	newconfd init/elivepatch.confd ${PN}
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/elivepatch-server/elivepatch-server-9999.ebuild b/sys-apps/elivepatch-server/elivepatch-server-9999.ebuild
deleted file mode 100644
index 92f5e5febf92..000000000000
--- a/sys-apps/elivepatch-server/elivepatch-server-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Live patch building server with RESTFul Api for elivepatch-client"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Elivepatch"
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/aliceinwire/elivepatch-server.git"
-else
-	SRC_URI="https://github.com/aliceinwire/elivepatch-server/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-RDEPEND="
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-restful[${PYTHON_USEDEP}]
-	=sys-kernel/kpatch-9999"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	newinitd init/elivepatch.init ${PN}
-	newconfd init/elivepatch.confd ${PN}
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/elivepatch-server/metadata.xml b/sys-apps/elivepatch-server/metadata.xml
deleted file mode 100644
index d7e109285f1a..000000000000
--- a/sys-apps/elivepatch-server/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="person">
-		<email>alicef@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">aliceinwire/elivepatch-server</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index db991f5fd845..3821ccc240f8 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -3,5 +3,5 @@ DIST gawk-5.0.1.tar.xz 3136004 BLAKE2B 1dd8a9bca2488f2d3c946406b01fcbdce0487922e
 DIST gawk-5.1.0.tar.xz 3154564 BLAKE2B a969b03f45e1d830d2b3760d75530de97eb521a35ac448cf441d7fd2d1a8c1059bd9240cb9571f58ef6ec122864ced3d274a07453c3138177deda895ac3433d9 SHA512 971e6a7617eb051d587984f64be2ff830e49eb60721c3401e8944401e3c3a7cd3334f0334b6e28bfc9283aaff15d83b0933f1fd77b0f8c7059068fa3f94c3cb4
 EBUILD gawk-4.2.1-r1.ebuild 2164 BLAKE2B 09cbe472e3e9d6bcd194c27ead1d1d96f4c7eed3e5fb5ab68f0301b33cff378424c4caa92aa910c14675294d504a22cfb30067b70eb78121be681c640a4396b3 SHA512 f26f73852c3c26f7efcfb69bf11b6738e0bd4a9e03b22df753477160285675e35654c38f6777551f8607f8680b087a91948d2089e83c00e7474ef8645952cd65
 EBUILD gawk-5.0.1.ebuild 2222 BLAKE2B e219e0676f2990b4a93f319f88971b5833d4df05e568b0fda47c607dc1889f90ece07ba64e67cd92f40dbd9c3184f45a4e8da83adff6bfaab08ef76cf8be2b94 SHA512 6f05586b66b986c7e0d65362afef1cc5aafb094242df50962fdcfc01e68decaef61b2f55e73b9b5ae88164a05e30ca203c83bfaeb19e7c9364e61c66871dd330
-EBUILD gawk-5.1.0.ebuild 2275 BLAKE2B d4ad442a95e7ec0fdc857b2fa2ff3ca8e2ff7a10bb6816181f6d0b9a20e345e7640b462e1d0ad6e18ceecb99af3fcda10b5e21f04588e1cde23b1478742c95ab SHA512 daa10f044c6f47adcd4a87c57b08ec211ec3ae3faa3d9790b5f555746c592ce38d05801375c15bbbbb3a02f33332da5de62ff305a6a1e31442e9a5bede680b54
+EBUILD gawk-5.1.0.ebuild 2272 BLAKE2B f51eca98812bd071d8c39e038d79a8add6ab4454487618bd3efd2c7afcee931f683f3f97ec0177d3ca637a8c28ec779172b5550e54ab999fe4517189ffa58d53 SHA512 0e9ff35e4c0fcaa6a9b15ef88ab50faa47e8a1b59b1347d37f07cbfa72bf6f0efd4bdf5738e3f579d900fff44aa771c99766b788071a874be03b0ae6df18e15f
 MISC metadata.xml 347 BLAKE2B 3b0515d5ca37d12fbced19fc573e31fee27137e618aea3db03395a6bdecd8ad89d0d231fd3bb566ee993704a57b090a32697016885456e386b2c33ec37761b64 SHA512 1150e37d64393f26ef81056ff25e9720a4bc82dd28c9cffd164d144bb6d2f660f802a31d5ebf4fd121a01b36a4a5073893ebec6b735d3eb570da36705d5f446e
diff --git a/sys-apps/gawk/gawk-5.1.0.ebuild b/sys-apps/gawk/gawk-5.1.0.ebuild
index 388309a2d3d7..9f25e76ed315 100644
--- a/sys-apps/gawk/gawk-5.1.0.ebuild
+++ b/sys-apps/gawk/gawk-5.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 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 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="mpfr nls readline"
 
 RDEPEND="
diff --git a/sys-apps/gcp/Manifest b/sys-apps/gcp/Manifest
index 622fdec919a6..67889215b068 100644
--- a/sys-apps/gcp/Manifest
+++ b/sys-apps/gcp/Manifest
@@ -1,4 +1,4 @@
 AUX gcp-0.2.1-gentoo-fhs.patch 431 BLAKE2B a779679ea6f7ee897b66ce89b8d209969012cee0c1f1840c8607b4d458b3f9ef9371f5612804cab8fadef84171c53677388c53f78aff5bc20b4e6d10e5cbc58f SHA512 9ddaf9f0635eae415ae99cefc37157cba0758a1e89c2f7cd64502991452eec323d63b9949ed9f834afe7340b53d423ce4efd6dffc346b694a6d94424ea18aedd
 DIST gcp-0.2.1.tar.gz 33098 BLAKE2B 9affaf87db722c1e35fe71acf93521753a4372d42bf33892cde8605b17972ac46f616177114c5ccc36fad64011ae881ecc9382c79311dbca93ebedd04e688526 SHA512 900e08554e8f87e9572c52381c83bdcd89f02cab4fbf51335ddb81796057fa8bec156cf3ddab8712ed2c55ca7d6d0e1c209939ccead9bf7693d76bf882807017
-EBUILD gcp-0.2.1.ebuild 618 BLAKE2B 0d170e88aae774ee31dcfbc9d2668e07bf128f8cd2bbeae5b1ee84fa042abf4997d814462a9dce91ab64c132b993744a5e78b548ff0fa7e84e73c11986396ddc SHA512 a70920141c65d7cec89746c8d84bf4d597d6580d4e3b8e94bc607931e036657580c554e103fc18a91621cdb1af7ef1ced3a989fde6a4d4521657d90b093178dd
+EBUILD gcp-0.2.1.ebuild 831 BLAKE2B aee4a85bc216370d869958811fbc5dcde64ab611ce5c4a28b64c502cbc3344b0730e7de983449a01fd5bcd30f20eb2af4f91be4ad8e593fc8d2d9af888dfb9fb SHA512 3f9f97c462d68a3e0443451f04078e290f612065b66d9b501bd5d5a6b8e0bfddac5f785df7908c1ea6f7ecd87a788dbb3f370b289c2a88451205eaac5d8dd31e
 MISC metadata.xml 219 BLAKE2B 96b35aca9e98ee4763a251a4dd9d63b7377c7183023f2ccda74cc76c7117fa885f518bebfad739d2e80f32dfdf4882e08012a94360666dd9cff26642e2df4513 SHA512 39ee913ff21c2aaa9f767872e2b49cb3cb982afab04d7b5045eda61368d63c2e3e1d637df59f7fb4ec4f95776e754615a260b37580cc9f18017a7c080955db77
diff --git a/sys-apps/gcp/gcp-0.2.1.ebuild b/sys-apps/gcp/gcp-0.2.1.ebuild
index 3425601feba6..a3cfc30ce969 100644
--- a/sys-apps/gcp/gcp-0.2.1.ebuild
+++ b/sys-apps/gcp/gcp-0.2.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
-inherit distutils-r1
+inherit distutils-r1 virtualx
 
 DESCRIPTION="File copying utility with progress and I/O indicator"
 HOMEPAGE="https://code.lm7.fr/mcy/gcp"
@@ -15,10 +15,22 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/progressbar[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]"
 
+distutils_enable_tests unittest
+
 PATCHES=( "${FILESDIR}"/${PN}-0.2.1-gentoo-fhs.patch )
+
+src_test() {
+	export $(dbus-launch)
+	virtx distutils-r1_src_test
+	kill -9 "${DBUS_SESSION_BUS_PID}"
+}
+
+python_test() {
+	local -x PATH="${S}:${PATH}"
+	"${EPYTHON}" test/test_gcp.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index 63de115db0be..3488d68e5ec7 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,6 +1,4 @@
-DIST gentoo-functions-0.12.tar.gz 11514 BLAKE2B 88f626a977b6f7b7cde2df452b91ef9570d29f3e6488d23859077b4d31a441dd0eb9cc473263e06a67dd90b714e24cbcfc09d4c4003f9cd29c8b7aeb0f3c91f9 SHA512 181e09216e1ed78f590e0bb50c60cfb0295bfeef335ed6c957ea7f2a1d6145d91c0a6dc4377bd6cd538fb4e5871e9a5ef8332d91bc91931792d5f05f62bc4705
 DIST gentoo-functions-0.13.tar.gz 11334 BLAKE2B 740e6d950b62b777e533d16b707cbf6f9ab0e9de4c92c5e755af186571539949017aadcd7d428b1e635f43052a575f89787b3e92087675b600a6b7350fda24a6 SHA512 61185197e1eb4155d0db9ba024dcb1b9eb0d272e3369f986668634012e35b57c3cdcd7beecd4714b9b48a0e44e8bb73472713949e16827aa05c055ec83d537dd
-EBUILD gentoo-functions-0.12.ebuild 835 BLAKE2B 8a36036b3bbc80261820214473955d90a06618b295535fc21d1937e6a1c30bea64805fb30ef1e07ea8b4d948abb34d317a668b3c6c0a076ead1da2428f2029b2 SHA512 f6b248792bc780986c247deff38d2bf5e58a659379a1394c7e46a7eb9ffa5d83e56d107b68bfeda3edc53e111e0c114d64084a79c63fb0b03f35f85ea7c70c25
-EBUILD gentoo-functions-0.13.ebuild 887 BLAKE2B bb543171729f4d301c83699996cdaa9730d92b7aa9ed800ae1c04e1ec8e267f6ab0f0fdb50cbad86987e4a18e60b04022f9f3ac0a726f3487410e4aa33364c67 SHA512 8a9ba47904051caa33f129c8edc43c13b5a5e57717ce9336b45e5860476f5cdeb30f2232467d0dbb320dfd129f7617e67a4be359e27e5c3bfbb8fbe71ec47f04
+EBUILD gentoo-functions-0.13.ebuild 886 BLAKE2B 7bb2051509bc332c95b1a2d6ee7d0aebe3ddfeb487559de756474cd96d46263b5af57389a16f53df1c673daaec4dd618e5140800c79227d18337980091dd1c9d SHA512 5ba8f91873a2ad75848ef3b443c0c7a99665df73dc2c20a61a1b64ef3ac38478bda80abd0e0e059ed9ad97fcfa1eb73d6318c1e68efe4e7b79859ffce1600fff
 EBUILD gentoo-functions-9999.ebuild 895 BLAKE2B 0e9cb57058a2d4141cd57c169ced43ee6f9afd33c0214e3303e01572b3667df7b5634a40ef78087b3e2333ada242f010f33042abd7e030848a3044a85a83d792 SHA512 dad2d0c9786786eca6dd55156599f1c2db030a15556ede83d03a170317f3f25d9226bba805575d82e46041759763e7972de05a6c34808e2b2e0ee6f8853701f2
 MISC metadata.xml 492 BLAKE2B cd68fc088438ae1171d801f7aeb93ac09a21dd2e628ab14c11e2f3f28fba3ad3653005d087ab5c44362b9b6fbc66b1c14256176c6f181313cbf3aa6a01c6739b SHA512 991fa3c3f302d26f4beb103c5dab1b943599aa83ca538b04a785ba608059471047061296d219b637a8b16185105c0ace8b0ff511ec2d94c840be27d96ac8e3c6
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
deleted file mode 100644
index 9ad6a1ebff8b..000000000000
--- a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2014-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gentoo/${PN}.git"
-else
-	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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 ~x86-winnt"
-fi
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="base functions required by all Gentoo systems"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-	tc-export CC
-	append-lfs-flags
-}
-
-src_install() {
-	emake install DESTDIR="${ED}"
-}
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
index 33f8915a041e..a6af72821bb5 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 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 ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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 ~x86-winnt"
 fi
 
 inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index da621edbc2c2..1b2bdabe21be 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,6 +1,4 @@
 AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b
-DIST help2man-1.47.15.tar.xz 202776 BLAKE2B 3f06bc254fc8e0e8884d9b8bd63b53f23ea4f9a9e1d16f7f7f2ba83ee052f35a85489ffad7b59bb41277ef68b22caa35790513115d5af43fb09cc8d5cdf4ebb0 SHA512 2ab835610545f37eef2d77887371378decbac622196426a3444c5fb495596371d0151a92c79d3e3040e93acf3dbeefbc431dac1e76a370fdb5063b43192545ad
 DIST help2man-1.47.16.tar.xz 203036 BLAKE2B 8e06c2c2e90adfc2ab8345908516b15ae50b02a7a9554d5d9beee4373b71c131aeaa0c148b9a988c531bbfe2149c25069af56a79101a4248b6c1adfeb734a132 SHA512 b427e60a9e3d2e805caf1ae84c337b09c7ca6f92b7ff14771f946c4a1bf7adf177df99b9c1c223ad76df99756005ababf5b548ff8e08d4746702ff7f8150b544
-EBUILD help2man-1.47.15.ebuild 1065 BLAKE2B 5b9e08ece924027563088cdcf9d0312f9fc200d3ee6e147cb7f5f0e279f8f1d5cf7533dc40e308a5fb146247ca1950673f5937621829216beada81061ca88f74 SHA512 fd52cabb54f98186e31eb20ef05eea28d89415bca7ae439fb36710d8047e2218841768ad9a3b6994d4ba50d6a1845977e5f554a12bc6b3c21dbbbaae374eee6d
-EBUILD help2man-1.47.16.ebuild 1066 BLAKE2B 1b62baa25c49ca724e3d0145b16f6cf545234c422e9b70bfe660fed0826803bceb083dd9f871274efcc5d9cd1b4ab4478c36d6e196a7e0f28652355e48b9cb34 SHA512 95af5d8c023fdc215eaba118a505e1d96cc4919294f0d73a0332b4c9443b033c198f466d66c8923dd56a993f7dc979ce23a307aaac694b8920d6facb6fe8c567
+EBUILD help2man-1.47.16.ebuild 1065 BLAKE2B 5b9e08ece924027563088cdcf9d0312f9fc200d3ee6e147cb7f5f0e279f8f1d5cf7533dc40e308a5fb146247ca1950673f5937621829216beada81061ca88f74 SHA512 fd52cabb54f98186e31eb20ef05eea28d89415bca7ae439fb36710d8047e2218841768ad9a3b6994d4ba50d6a1845977e5f554a12bc6b3c21dbbbaae374eee6d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.15.ebuild b/sys-apps/help2man/help2man-1.47.15.ebuild
deleted file mode 100644
index 0600e090e0c0..000000000000
--- a/sys-apps/help2man/help2man-1.47.15.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="GNU utility to convert program --help output to a man page"
-HOMEPAGE="https://www.gnu.org/software/help2man/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls"
-
-RDEPEND="dev-lang/perl
-	nls? ( dev-perl/Locale-gettext )"
-DEPEND="${RDEPEND}"
-
-DOCS=( debian/changelog NEWS README THANKS ) #385753
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
-)
-
-src_prepare() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i \
-			-e 's/-shared/-bundle/' \
-			Makefile.in || die
-	fi
-	default
-}
-
-src_configure() {
-	# Disable gettext requirement as the release includes the gmo files #555018
-	local myeconfargs=(
-		ac_cv_path_MSGFMT=$(type -P false)
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/help2man/help2man-1.47.16.ebuild b/sys-apps/help2man/help2man-1.47.16.ebuild
index cb87c560fb4d..0600e090e0c0 100644
--- a/sys-apps/help2man/help2man-1.47.16.ebuild
+++ b/sys-apps/help2man/help2man-1.47.16.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~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 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/iotools/Manifest b/sys-apps/iotools/Manifest
index 0864a5871147..648e9e64acc6 100644
--- a/sys-apps/iotools/Manifest
+++ b/sys-apps/iotools/Manifest
@@ -1,3 +1,4 @@
+AUX iotools-1.5-makefile.patch 351 BLAKE2B 756e8f49e137bebef521a3ac87b6da503e5c3331875afb33fdacdc81fffd2a24abbf4d568928e93ed64c3e219f3578676232993c8c83d84a97e61773644b4da4 SHA512 c1df3aa0f4c5b08af5d2dec14551eef122d274f0f6aa55446f488318b68e581b93226676134fc62dc6da37851eaee6ad110fbab926a7b720fca7f0701ac34429
 DIST iotools-1.5.tar.gz 23422 BLAKE2B 7d647a32e0289e6b85055252eb6ccf9bdb71b99ebdec7e0c1de0d60157c7401e462a07422e0dd25fb3aec42744be981cd927a4c359b577a764acef331bd42bbe SHA512 d298343ee814c8b7d8404bc6af4050df730e89963a7c53798b3d251e94fd2b13e04c36e6da7ec5fd4126ea3a961be26a937910f791844e1b1d5b7dc5aa638c44
-EBUILD iotools-1.5.ebuild 1896 BLAKE2B 74f6f32431484f95a5fcb3647f16bdd472d22cd124fa18838bfa3a66c0b3b9972bbc0a916760088c4ccf33273e3ae7f150dfdeac47dcfa832e28136c83acaf18 SHA512 befe48aa95a4d6d177d0fd2ea8a3e967bb37ae1f39bf4f46d5977304119ea35e3346d79c73ee1a475b48089b71e6b43d96e33eb78c79ab17921cef913657bdef
+EBUILD iotools-1.5.ebuild 1875 BLAKE2B f8014f9f5f6209d422cf084d5a4e865f89ba0389ac27a9ea41e1d1ee81114a2c65e94c318a81a653afc9997054754fe49a310be8b5a8507410e6e9d948c52a37 SHA512 29c7d1af5e5e949a4142e4728f0111bb27ea4e0a917e0ba1b28d6661680566ce9a3f49aa3d655702031542d89b4ac86fe1ce8c025c202fd1cdaaee1f26572c35
 MISC metadata.xml 296 BLAKE2B dd62d3a71a69f58d9c971d17dcc8f3859665b2ad03a6adcb2242c7c58ecd39924478d40f86c8727aa617d2a7957fb5991679d585c4f3ed24278925116789ef91 SHA512 97eee413fc6356dd0c9a7f0eb32bd9a6c9593a0632dc9975ee70b0ef903dfbc2f75538144c0914b70f2a74bcf1ab6ecfd08fb505403a9c5745c243feaf831c73
diff --git a/sys-apps/iotools/files/iotools-1.5-makefile.patch b/sys-apps/iotools/files/iotools-1.5-makefile.patch
new file mode 100644
index 000000000000..79d89f6f6d06
--- /dev/null
+++ b/sys-apps/iotools/files/iotools-1.5-makefile.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -33,7 +33,7 @@
+ IOTOOLS_DEBUG = -O2 -DNDEBUG
+ endif
+ 
+-CFLAGS = -Wall -Werror $(DEFS) $(ARCHFLAGS) $(EXTRA_CFLAGS) \
++CFLAGS = -Wall  $(DEFS) $(ARCHFLAGS) $(EXTRA_CFLAGS) \
+          $(IOTOOLS_STATIC) $(IOTOOLS_DEBUG)
+ DEFS = -D_GNU_SOURCE -DVER_MAJOR=$(VER_MAJOR) -DVER_MINOR=$(VER_MINOR)
+ SBINDIR ?= /usr/local/sbin
diff --git a/sys-apps/iotools/iotools-1.5.ebuild b/sys-apps/iotools/iotools-1.5.ebuild
index d508f1263e1a..01ade1d402f3 100644
--- a/sys-apps/iotools/iotools-1.5.ebuild
+++ b/sys-apps/iotools/iotools-1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Simple commands to access hardware device registers"
 HOMEPAGE="https://code.google.com/p/iotools/"
@@ -14,9 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="static make-symlinks"
 
-src_prepare() {
-	sed -i 's:-Werror::' Makefile || die
-}
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
 src_compile() {
 	emake \
@@ -32,7 +30,7 @@ src_install() {
 	# when cross-compiling will likely fail.
 	local known_cmds="and btr bts busy_loop cmos_read cmos_write cpu_list mem_dump mem_read16 mem_read32 mem_read64 mem_read8 mem_write16 mem_write32 mem_write64 mem_write8 mmio_dump mmio_read16 mmio_read32 mmio_read64 mmio_read8 mmio_write16 mmio_write32 mmio_write64 mmio_write8 not or pci_list pci_read16 pci_read32 pci_read8 pci_write16 pci_write32 pci_write8 runon shl shr smbus_quick smbus_read16 smbus_read8 smbus_readblock smbus_receive_byte smbus_send_byte smbus_write16 smbus_write8 smbus_writeblock xor"
 	case ${ARCH} in
-	amd64|x86) known_cmds+=" cpuid io_read16 io_read32 io_read8 io_write16 io_write32 io_write8 rdmsr rdtsc wrmsr";;
+		amd64|x86) known_cmds+=" cpuid io_read16 io_read32 io_read8 io_write16 io_write32 io_write8 rdmsr rdtsc wrmsr";;
 	esac
 	if ! tc-is-cross-compiler ; then
 		local sorted_cmds=$(echo $(printf '%s\n' ${known_cmds} | LC_ALL=C sort))
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index 17f93d061cba..67dcce7088cd 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -1,12 +1,14 @@
 AUX ipmiutil-2.9.8-flags.patch 712 BLAKE2B d084480396ee8e546c2027e95ce9c95940d1d844a0aaec7448d6eb4c750d3a4a964fa53118a2cc92897733ab99b9b1064ecf2f05cdd30282b803ea511386f1e8 SHA512 3caf226020e1fffc6c45cb549a066a034a58165415d5e325445f949042c1ac756b61949c78c30d0172983d95264a0ee2c9f829f1f5c8395e8fa1a48025f87dc2
 AUX ipmiutil-2.9.9-lib_symlink.patch 468 BLAKE2B d24e4e0183f46a3a97b9a9db754b4948446eda7504d81b3854cf8ae65eebdc2f279272ecf09736ff2966dfd477219e19a900cce8665f865bc22a8674ea863f2b SHA512 35912b578b3e61e899f97d2fc6cd6352ac04da638c64c252aa71138d9b7fd1b1de474f2702febfb85ab3f5371971be7a1922a1c6bbe5960c04be2b9171f0e75e
 AUX ipmiutil-3.1.5-fix-configure.patch 5817 BLAKE2B 3a953a03d495a453d99dae70ea29ed95e03ee5d4da6a1a2aab42bda289f43725fff9a5721d7a08538f9a5f35b36ae956e5da493a50301fdaf487a8aef05ca0ba SHA512 c1f2c13f1aafc4244b1a3cdf2da23d4ff9e982613063b2e8995c0003db6cb31e1facce9d590725f5e02789fcd62c3b334ce20e1b8815b99c002bc2f90d9fa065
+AUX ipmiutil-3.1.7-fix-configure.patch 5872 BLAKE2B 6058c5f3cd3d389dec152649098925d8fd4aa4dab22f11924cc006dba44eeb5254b7b5a10eaf202d496e7da4e71b69c984553fda730708ffdc0b7bacf0a46dfa SHA512 0d47df5c1599f16228819325c666b2ed9f0c85617af8ce6a0be5496403ae0ce8d5548302ad8b9315105ec8a1a54cd4b46636e5ee21539b813b35ed4fd78f86a2
+AUX ipmiutil-3.1.7-flags.patch 708 BLAKE2B 70b96d8de3221d11757ff54957be2153540da78edef549a627983e745064d503d38cd3b95c5640445c1c6ca8cf208d43781e486e1df481a409636dc8d6c4c9f4 SHA512 f0f34b10c65e3ddab56ef757085dcfbaceb1a8b745d8be72e0630fdf7b6da3fadd37f08a9eee814c140419b1e9dda9937690dac67b3f506f36f622076c8119bf
 DIST ipmiutil-3.0.6.tar.gz 1692679 BLAKE2B dcc02dbb5467b824005dbc95c8f5231b2e2758e7600231c1c3fc31c1207cff0540400857dd1bfa83fc8b033fe0277ab23c6013f110744bff57fe4bc7b89174f9 SHA512 0c47246b7aa6a060091745d36e33aae07e7907dcad5fefb1759aac62adf48316915ce5818d2f9241e24b73be13e54fbb57046234a69c60ce56f41a933915580f
 DIST ipmiutil-3.0.9.tar.gz 1697688 BLAKE2B 93ed8865cae1cea0ea4f7de4683f4698e3f75e9190cc7e0af1832ca44a08f52aa149393761f1ede3994827db78841061d54058bbe4178b5930accd3a4c225ba7 SHA512 c2c0a516216a46a52621159e665a77d96cf81f385fc9cf19877e72283be3e1a4dad5a4826454727b71576c22cc4de3c73ff428d26f35bf496c7dc1511305cda3
-DIST ipmiutil-3.1.5.tar.gz 1703583 BLAKE2B 5e96659387b3e11e5f7867156d0079e06f19676099e8ff2a212f7e28550f9dde2079a4d527439489e1a710d878e7eb79a68b0e11b531f92d986aa7687273d462 SHA512 a9bd4d99d5bcad8a9f64c3636d6774d09e1d4c20927a6803891777ba035ee3c114b06295185cf00fb0c5d4b4b9afd335fd19c06f64298130e42945dc5f6e8010
 DIST ipmiutil-3.1.6.tar.gz 1693461 BLAKE2B efc2b283d7655b8afb9d3d8da2e5458deea1c1b939f3ccdf2be0cdf3792ea60229099cce1b8e32f087972385feb01d604f1c63bddbfd031210d5acf8a6b1b9d7 SHA512 9bccfa2e0bba7f30e422d67f93ee6cff50c08cc8bceab5ba5bfd1b0a91e1af8a4a98a2eaa81364e8a1f38e0bd1ce6b99717d86957c6f689aa7329e7013f5b0ef
+DIST ipmiutil-3.1.7.tar.gz 1726396 BLAKE2B 7fa31f8aca61462fc08dd4fe420e27eecce2ee9fa5fb2676eb944e2ae6c09598aec5f06d59e4ed02faab077003b14085f944b6cf0b63f90b10f2660f363e997b SHA512 7522808e4a94c8627de0a95dde0e3eb463ba05948159b5181129b573ce8f9feba3543ef603c14e7cdcafcbd58ca5319536cc5534ea8191cce0ef9d33cc548274
 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.5-r1.ebuild 1574 BLAKE2B c76aa0b2c729a40215307e3d79b22da30c47cc098248b2702ab47eb0d5237a483b129465e04e3a77455aa76a922f507a91d0688d2f80248b7a5b8ce3424e1bf3 SHA512 ffe59ac7d8a5d49b8c40b655a91d32fb85aa4ff493b70d0504a553075192bc10111003bfe2e3fef14f57a488f1cfba0e4083d28e6294004c41654ff3a3159ff0
 EBUILD ipmiutil-3.1.6.ebuild 1575 BLAKE2B 16cb959c4a276eaaeefa96584c1915c3c182a9f03ea8c2269e1b6221f7bab84cb9433db59a3c293350ae9f473f48544008b52f569b9cc67170eebbdefee1d898 SHA512 6cca689fd814b1fb3f4939f1b8a34902c9ff4c41834053ded5cf7f051b134e0ce5c946b51da6b855ff8bcd828c9e7d55d1c79fd9eb32e50544db22037344c63c
+EBUILD ipmiutil-3.1.7.ebuild 1659 BLAKE2B 2c43307e31c6fe34abb3ee953a826d5069546ab9459ad45ab9588ff8a684619ea6f6a7f06827e5b735dc8226bcc922b41f1ca4f86c8283b47585351d5e1c1cf7 SHA512 0f4900a1069d2f29b848db879baaa30829122c49a6c5e027467261c908ecd31341bb89dfb1b04256c59df42811360d503a5060dd19a357ef9c5aa4d1074169a6
 MISC metadata.xml 337 BLAKE2B 5f04801092c5d0cf4166c36b508c4cb27e3a08f53f8f86d968d01d1d6911c6dd9cff78d70ec5c9bb60e6f3a028b7e5db1b629a9ba7961b3d729accbc6b62f9c2 SHA512 85f9992b8c7fddbffe99cba761637a897e7ba68f70762f882c039c6492feefefa6bd1ca38fbc73d0a214d04ddb07f5f0ea2106552e4133736d4594e43fae4845
diff --git a/sys-apps/ipmiutil/files/ipmiutil-3.1.7-fix-configure.patch b/sys-apps/ipmiutil/files/ipmiutil-3.1.7-fix-configure.patch
new file mode 100644
index 000000000000..16435dacd6b7
--- /dev/null
+++ b/sys-apps/ipmiutil/files/ipmiutil-3.1.7-fix-configure.patch
@@ -0,0 +1,184 @@
+--- ipmiutil-3.1.7/configure.ac
++++ ipmiutil-3.1.7/configure.ac
+@@ -80,40 +80,46 @@
+ #  fi]
+ 
+ drv_landesk=0
++LANDESK_CFLAGS=""
++LANDESK_LDADD=""
+ dnl configure for LANDESK libipmiapi or not
+ AC_ARG_ENABLE([landesk],
+-    [  --enable-landesk       adds landesk library support [[default=no]]],
+-    [if test "x$enableval" = "xyes"; then
+-	    drv_landesk=1
+-            LANDESK_CFLAGS="-DLINK_LANDESK"
+-            LANDESK_LDADD="-lipmiapi -L../lib"
+-            AC_SUBST(LANDESK_CFLAGS)
+-            AC_SUBST(LANDESK_LDADD)
+-    fi]
+-    )
++	AS_HELP_STRING([--enable-landesk], [enable landesk support (default=no)]),
++	[],
++	[enable_landesk=no])
++
++AS_IF([test "x$enable_landesk" = "xyes"], [
++	drv_landesk=1
++	LANDESK_CFLAGS="-DLINK_LANDESK"
++	LANDESK_LDADD="-lipmiapi -L../lib"
++	AC_SUBST(LANDESK_CFLAGS)
++	AC_SUBST(LANDESK_LDADD)
++    ])
+ 
+ dnl Configure ipmiutil for lanplus (libipmi_lanplus.a) or not (default yes)
+ AC_ARG_ENABLE([lanplus],
+-    [  --enable-lanplus      enable lanplus support (default=yes)],[default=yes],
+-[if test "x$enableval" = "xno"; then
+-	drv_lanplus=""
+-	LANPLUS_CFLAGS=""
+-	LANPLUS_LDADD=""
+-        LANPLUS_LIB="" 
+-	LANPLUS_CRYPTO=""
+-	LANPLUS_SAM="no"
+-	LD_SAMX=""
+-else
++	AS_HELP_STRING([--disable-lanplus], [enable lanplus support (default=yes)]),
++	[],
++	[enable_lanplus=yes])
++
++drv_lanplus=""
++LANPLUS_CFLAGS=""
++LANPLUS_LDADD=""
++LANPLUS_LIB="" 
++LANPLUS_CRYPTO=""
++LANPLUS_SAM="no"
++LD_SAMX=""
++AS_IF([test "x$enable_lanplus" = "xyes"], [
+ 	drv_lanplus="lanplus"
+ 	LANPLUS_CFLAGS="-DHAVE_LANPLUS"
+ 	# LANPLUS_CFLAGS="-DHAVE_LANPLUS -I${projdir}/lib/lanplus/inc"
+ 	# LANPLUS_LDADD="-L../lib -lintf_lanplus -L/usr/local/lib -lcrypto"
+ 	LANPLUS_LDADD="-L../lib -lipmi_lanplus -L/usr/local/lib -lcrypto"
+-        LANPLUS_LIB="../lib/libipmi_lanplus.a" 
++	LANPLUS_LIB="../lib/libipmi_lanplus.a" 
+ 	LANPLUS_CRYPTO="-lcrypto"
+ 	LANPLUS_SAM="yes"
+ 	LD_SAMX="../lib/libipmi_lanplus.a -lcrypto"
+-fi ])
++])
+ 
+ dnl Configure libipmiutil.a for lanplus or not
+ dnl Only SOL requires lanplus, so usually build libipmiutil.a without lanplus
+@@ -128,21 +134,28 @@
+ #fi
+ 
+ # strings /lib/libssl.so* |grep EVP_sha256 
+-dnl configure for SHA256, build lanplus with SHA256 support, uses later openssl.
++dnl configure for SHA256, build lanplus with SHA256 support
++dnl requires openssl-1.0.1 which was released in 2012/03
+ AC_ARG_ENABLE([sha256],
+-    [  --enable-sha256        build with SHA256 support, requires later openssl.],
+-    [if test "x$enableval" = "xyes"; then
+-	LANPLUS_CFLAGS="$LANPLUS_CFLAGS -DHAVE_SHA256"
+-    fi]
+-    )
++    AS_HELP_STRING([--disable-sha256], [build with SHA256 support (default=yes)]),
++	dnl action if passed
++	[],
++	dnl action if not passed
++	[enable_sha256=yes]
++	)
++AS_IF([test "x$enable_sha256" = "xyes"], [
++  LANPLUS_CFLAGS="$LANPLUS_CFLAGS -DHAVE_SHA256"
++])
+ 
+ dnl configure for EKANALYZER, build with ekanalyzer function enabled
+ AC_ARG_ENABLE([ekanalyzer],
+-    [  --enable-ekanalyzer        build with ekanalyzer function enabled.],
+-    [if test "x$enableval" = "xyes"; then
++	AS_HELP_STRING([--enable-ekanalyzer], [build with ekanalyzer function enabled.]),
++	[],
++	[enable_ekanalyzer=no]
++	)
++AS_IF([test "x$enable_ekanalyzer" = "xyes"], [
+ 	OS_CFLAGS="$OS_CFLAGS -DHAVE_EKANAL"
+-    fi]
+-    )
++    ])
+ 
+ GPL_CFLAGS=""
+ CROSS_LFLAGS=""
+@@ -152,17 +165,20 @@
+ SYSTEMD_DIR=/usr/share/ipmiutil
+ 
+ AC_ARG_ENABLE([useflags],
+-    [  --enable-useflags    include environment CFLAGS and LDFLAGS.],
+-    [if test "x$enableval" = "xyes"; then
++	AS_HELP_STRING([--enable-useflags], [include environment CFLAGS and LDFLAGS.]),
++	[],
++	[enable_useflags=no])
++AS_IF([test "x$enable_useflags" = "xyes"], [
+ 	   CROSS_CFLAGS="$CFLAGS"
+ 	   CROSS_LFLAGS="$LDFLAGS"
+-    fi]
+-    )
++])
+ 
+ dnl configure for standalone, with no lanplus or GPL libs 
+ AC_ARG_ENABLE([standalone],
+-    [  --enable-standalone    build standalone, with no GPL or LanPlus libs.],
+-    [if test "x$enableval" = "xyes"; then
++	AS_HELP_STRING([--enable-standalone], [build standalone, with no GPL or LanPlus libs.]),
++	[],
++	[enable_standalone=no])
++AS_IF([test "x$enable_standalone" = "xyes"], [
+         GPL_CFLAGS=""
+ 	LANPLUS_CFLAGS=""
+ 	LANPLUS_LDADD=""
+@@ -176,10 +192,11 @@
+ 	   # cross-compiling, so link with -static (e.g. Android ARM)
+ 	   CROSS_LFLAGS="-static"
+ 	   CROSS_CFLAGS="-DCROSS_COMPILE"
++	   # TODO: how can this be effective? Configure only converts Makefile.in -> Makefile
++	   # Configure does not convert Makefile.am->Makefile.in
+ 	   sed -i -e 's/^# ipmiutil:	$(METASOURCE:.c=.o)/ipmiutil:\t$(METASOURCE:.c=.o)\n\t$(CC) $(CFLAGS) $(LDFLAGS) -o ipmiutil $(METASOURCE:.c=.o) $(LDADD)/'  util/Makefile.am
+ 	fi
+-    fi]
+-    )
++    ])
+ 
+ AC_ARG_ENABLE([doc],
+     [  --enable-doc           build with documentation [[default=yes]]],
+@@ -192,20 +209,22 @@
+ 
+ dnl build libipmiutil with sensor modules
+ AC_ARG_ENABLE([libsensors],
+-    [  --enable-libsensors	 build libipmiutil with sensor modules [[default=no]]],
+-    [if test "x$enableval" = "xyes"; then
+-        LIBSENSORS="isensor2.o ievents2.o"
+-        SAM2OBJ=""
+-    fi]
+-    )
++    AS_HELP_STRING([--enable-libsensors], [build libipmiutil with sensor modules (default=no)]),
++    [],
++    [enable_libsensors=no])
++AS_IF([test "x$enable_libsensors" = "xyes"], [
++	LIBSENSORS="isensor2.o ievents2.o"
++	SAM2OBJ=""
++    ])
+ 
+ dnl configure for GPL build or not (GPL files: md2.h, ipmi_ioctl.h)
+ AC_ARG_ENABLE([gpl],
+-    [  --enable-gpl           build with some GPL code [[default=no]]],
+-    [if test "x$enableval" = "xyes"; then
+-        GPL_CFLAGS="-DALLOW_GPL"
+-    fi]
+-    )
++    AS_HELP_STRING([--enable-gpl], [build with some GPL code (default=no)]),
++    [],
++    [enable_gpl=no])
++AS_IF([test "x$enable_gpl" = "xyes"], [
++	GPL_CFLAGS="-DALLOW_GPL"
++    ])
+ 
+ dnl Does this Linux have systemd enabled?  Otherwise use sysv init.
+ AC_ARG_ENABLE([systemd],
diff --git a/sys-apps/ipmiutil/files/ipmiutil-3.1.7-flags.patch b/sys-apps/ipmiutil/files/ipmiutil-3.1.7-flags.patch
new file mode 100644
index 000000000000..7ef804bc11d3
--- /dev/null
+++ b/sys-apps/ipmiutil/files/ipmiutil-3.1.7-flags.patch
@@ -0,0 +1,20 @@
+--- ipmiutil-3.1.7/configure.ac
++++ ipmiutil-3.1.7/configure.ac
+@@ -170,7 +170,7 @@
+ 	LANPLUS_CRYPTO=""
+ 	LANPLUS_SAM="no"
+ 	LD_SAMX=""
+-	CFLAGS="-O2"
++	#CFLAGS="-O2"
+         SUBDIR_S="scripts util"
+ 	if test "x$cross_compiling" = "xyes"; then
+ 	   # cross-compiling, so link with -static (e.g. Android ARM)
+@@ -363,7 +363,7 @@
+ 	fi
+ 	rm -f $tmpc $tmpo >/dev/null 2>&1
+ 	echo $ECHO_N "checking compile fortify flags ... $ECHO_C"
+-	cfhard="-fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
++	#cfhard="-fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+ 	echo "int main() { alloca(100); return(1); }" >$tmpc
+ 	$CC -o $tmpo $cfhard $tmpc  >/dev/null 2>&1
+ 	if test $? -ne 0 ; then
diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.5-r1.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild
index e6ec34c06cd9..5bf9b0440aa6 100644
--- a/sys-apps/ipmiutil/ipmiutil-3.1.5-r1.ebuild
+++ b/sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild
@@ -18,9 +18,9 @@ DEPEND="${RDEPEND}
 	virtual/os-headers"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.8-flags.patch
+	"${FILESDIR}"/${PN}-3.1.7-flags.patch
 	"${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch
-	"${FILESDIR}"/${PN}-3.1.5-fix-configure.patch
+	"${FILESDIR}"/${PN}-3.1.7-fix-configure.patch
 )
 
 src_prepare() {
@@ -30,13 +30,18 @@ src_prepare() {
 	sed -i -e 's|which rpm |which we_are_gentoo_rpm_is_a_guest |' configure.ac || die
 
 	# Don't compress man pages
-	sed '/gzip -f/d' -i doc/Makefile.am || die
+	sed '/gzip -nf/d' -i doc/Makefile.am || die
 
 	eautoreconf
 }
 
 src_configure() {
-	econf --disable-systemd --enable-sha256 --enable-lanplus
+	local myeconfargs=(
+		--disable-systemd
+		--enable-sha256
+		--enable-lanplus
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
@@ -58,6 +63,7 @@ src_install() {
 	# Init scripts are only for Fedora
 	rm -r "${ED}"/etc/init.d || die 'remove initscripts failed'
 
+	# --disable-static has no effect
 	if ! use static-libs ; then
 		find "${ED}" -type f -name '*.a' -delete || die
 	fi
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 2392cdc833e4..b41382cb1f3d 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -3,7 +3,7 @@ AUX kmod-27-depmod-do-not-output-.bin-to-stdout.patch 1521 BLAKE2B 3b1f0808198f0
 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
 DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865
 DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c
-EBUILD kmod-26-r5.ebuild 5110 BLAKE2B 7a17d3e63a234fcbf1adc4d61406c36f10944889f53eb2291875c6a1fce46203e7dc56e53b49a285574a9b3752d51def60f9f064622c102699eed6e0009ce1cc SHA512 02a1dd9ffba6c09c379a685aa46278956727e7cb5c3eae7008e8fb01651b6119d7fde7220165a1eaedf3f70e764028935a6844a4655a3eab03661a19cebabe6d
-EBUILD kmod-27-r2.ebuild 5234 BLAKE2B 5f96f89a384f1a557f88ad9f18ee4590728aaa5deffb9b60c577de3fd2c6851480cb9a382283bfe9131e1e85ccf2839d1304ef78c7769dda5fcacdd311d49e34 SHA512 4620b08ac0dd513232abd07c68b9c3e017c413bb9f583810b44557629cb5a0e006da01805fa5243985cb7a4f7671cf2dde844ef3e6a477730b7136d5125ba59b
-EBUILD kmod-9999.ebuild 5165 BLAKE2B 0a3e691b6869c2cc05cddb19d1e3aa6dbfb6b7b0341e56d2679cab2905484978d3e8cc088354c00b339f22f13af98af645bbf390657119d2617a34deaa69fc71 SHA512 2e6e14eb5a4442e2509a5d63c9cb16a65687bae5f0e6189597358436cc5e12c3d9f6e70885d1f544a71ace56f9ad2231e61e116358e9f5063772adbdfb755f8d
+EBUILD kmod-26-r5.ebuild 5144 BLAKE2B d9e4f661d521e39d4d47376713c771b4f14f29138d4b4647d8b8bf47696911b9944f284634a575dac08029229e4924b2e7510a54b895848f53bf699fbab98adb SHA512 00a1c056e0736558c4f7d8469634582dd888869fa8afc6905abb8915a32f34da0b15ad91855f9925249de89bccd64de8e80479048807d34c82e05430ae4a6458
+EBUILD kmod-27-r2.ebuild 5266 BLAKE2B afde54209310e0bde96c8ce879722e362b5619457f701a9672d633184fad61ee96c4fb7580951b66e67f5d8775b1740746d87408cb9d4a15cb5c9cb7de08be8d SHA512 198282b58d2acc5021539f44004fa32043ef8c07f48759fe3e75609dd55598187665ae4d7b8a3ae26829ae1ae98d42735ad3bcda60da82dcc3642e753874ae8c
+EBUILD kmod-9999.ebuild 5199 BLAKE2B f9d18e2edf1ed8d921491e2f2ecbaea508c91b48598911677156ca31de9c595c4b8f91e8502a5e6549e866dcf968e6bc4d9114e475a11656bf428bf27f37d8c5 SHA512 04ae79bbe8a3de6e9dcfac81e9f09a5263d001adfaecf89911bd5d99c5fc0eabf817533bc792ca4bf244fd51b2b344cb83fc3dfff11cba51e309c30da40ee781
 MISC metadata.xml 689 BLAKE2B 51a8819951b28ef934c7de80176ef6aeeacb09ac073a7fcf056428ee2c1a0ad851119e680b4ef2cdd48a26541c2a3e16f6cb6606231a6ed542a00cfdb0e3b2d4 SHA512 4282ad5b89b14e8e50aad8779e68cca6eb2e1c876a3284b6782a221c0da2e79db871d1d23d686c8ac1532ea453faa1291ff596afff716431d0560460953c3aed
diff --git a/sys-apps/kmod/kmod-26-r5.ebuild b/sys-apps/kmod/kmod-26-r5.ebuild
index 0971ec42863f..53000bb3debc 100644
--- a/sys-apps/kmod/kmod-26-r5.ebuild
+++ b/sys-apps/kmod/kmod-26-r5.ebuild
@@ -190,7 +190,7 @@ pkg_postinst() {
 	fi
 
 	if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
-		if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+		if ! has_version sys-apps/systemd && [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
 			ewarn
 			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
 			ewarn "kernel modules to have required static nodes!"
diff --git a/sys-apps/kmod/kmod-27-r2.ebuild b/sys-apps/kmod/kmod-27-r2.ebuild
index 721f68de6d5b..25f444735245 100644
--- a/sys-apps/kmod/kmod-27-r2.ebuild
+++ b/sys-apps/kmod/kmod-27-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit 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 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 	#inherit libtool
 fi
 
@@ -194,7 +194,7 @@ pkg_postinst() {
 	fi
 
 	if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then
-		if [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+		if ! has_version sys-apps/systemd && [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
 			ewarn
 			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
 			ewarn "kernel modules to have required static nodes!"
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index c9e60cdc33f1..7a4f75e4ee5f 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -192,7 +192,7 @@ pkg_postinst() {
 	fi
 
 	if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then
-		if [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+		if ! has_version sys-apps/systemd && [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
 			ewarn
 			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
 			ewarn "kernel modules to have required static nodes!"
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 8d6685093491..26f4c5d9020c 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,10 +1,6 @@
 AUX man-db-2.9.3-sandbox-env-tests.patch 315 BLAKE2B d6f4835e9e32f8afffe6ab1a70ee664192db05fbe74013724fcdbe112ead2d4288f90be032777a58ee41515c23d5561ab9cde495a92aa9f74ee353479ef884e3 SHA512 d8840d45c3b115f51bb9b3fc11ece2fecadfe284cd7db29cd012ed32faed990b12a9920cf11282358e5dd27df4bcf3c1a0316116ecae58917ef3c65efb1eb22b
 AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a790661680775598fae21ef0776f04736425d511d48e97873d44b36a04d6ff41a53fceda0d8254482a4b53a SHA512 c2c7c05bcf241bb066c3ef98e33fb8c3b06abf92c20709f97c1e1e048d47aa4cf5ea412231a490008b3f1d87b284e381e611bb3275e8413ad031dac113112054
-DIST man-db-2.8.7.tar.xz 1839012 BLAKE2B 19b438b1083cfd838421f29ed053fe85686929bc9f2105fe399ea99622f138bca2c8888a17cddb9223362db2d5f9c4bb3669865ecf749fe845ea8e4223027f67 SHA512 9f9d6f3b776c0b35f95c179fb668f2dc3db3d3e63a162cfda98c5d126fe147f2418e1a1503037ebe28314f57d9b6f48b7f7674d611df14424973a866a61ff2d9
-DIST man-db-2.9.2.tar.xz 1885484 BLAKE2B 46778ebdecffcdefedd062e3f6a01a54054b57aa9636450dd148f62184b9bb919deb72e3b57b2fc75670fc2d8d274417f00994f7030fee913d572637e080b4c1 SHA512 47b63c074cf61c15f82230cc35a0062ab6ded8c3229475c6667a47ca518346d0555616c5b07bb01515b31bd80cbdc9870cd05ffff35097d013252401c6927002
 DIST man-db-2.9.3.tar.xz 1885840 BLAKE2B 6163660af60a2900220d7b1de74caa9cb9e5764cc5da20469a8fb08e19ee1948937916664fdc493b89da8fd829aa512877892245fabc00fb586c7754c0da3d53 SHA512 ca1c1214753483f6e22efe69a9df9852e0de01a9ad3b9950dcbbc9f38e6060100b98a84333256f8c734002e66e2fd6256bc017a31bd9acfc42002dca2c0f879b
-EBUILD man-db-2.8.7.ebuild 3458 BLAKE2B f3096c090cfe4f5d6926389d0e3e1d8d417c7cdfd0cee59d9d4182d9c1a602b8a2a4c57fd3b92e110e8a1e9c6c4922160fda8f24bf54fca20797defa6443af42 SHA512 3b38dfae452716e3a68e1ae6dd5c74ba92ab130e25c8bd77d9e5802e3cda8dedbf5c7e7af8613e0e62c9f337b0ddb2c1a6fd69058967d3ed774c639897278f9d
-EBUILD man-db-2.9.2.ebuild 4023 BLAKE2B ff89a69281aadbff8dda8687cb1466cd0b6216f705f946c5e44b4ea296e2460517dd12b6e1891bb56cbca2eff7ce252cd5314a9c5df1d4ca675a92e88241beee SHA512 f79e6ac596356ab4d8ed48d1c77a7ac7d5237fdc3893b6698a5df5e8d783684fff6a666228512dbec620e2ec783472c5211c924bd9d93398ed0825460e1028a4
-EBUILD man-db-2.9.3.ebuild 4078 BLAKE2B bee20a7fc9ab500671673f913c9d29f8b87213fc69ae4b3a39a602aba75d7775b08634bbe4124836a3ca95d89891a25dffc7624126b57431fc598471e092a7ff SHA512 de509488cd24634673a5b96302e03bc9459feede909affb743d676b1a1674bdf16357a73e7c3908a4787b5ca6907f90c5de9b374793d0cbf2cae98c4f2cb3c6a
+EBUILD man-db-2.9.3.ebuild 4077 BLAKE2B 19274e434d5fc98ce1df87ffaa49a884c633311d9d5a93c777bb54c074309d5e65c84bec754bf1381a41ee9c060aebf6fafcbad8ae2107fa7feb99f694147ae0 SHA512 a37207b489c41d6db34c31d7e5e6f7aaf269482d16bd9d3a276bdbb5efa30c62949acfd4b31cd990cd3b938b1baba57f9a5efd32f4a0f4175cbdd2bddad990c1
 EBUILD man-db-9999.ebuild 4086 BLAKE2B 94f5ae2c9873bc08e8262bdd049b48363d2c34be2336afbaafc245363b00a317df10770b062c4b011fffed0e2ed54ee666ecfd59feff6cf936608928ec174b04 SHA512 a674880552c2c18f41a0bcfc3a88a4bc94facb61b1e7eca746c3bb3fc5e30c1c0e350fa3ce622d0e362cdefd6f6d46258ff466975ede2f5a75420edb3cf7315b
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/man-db-2.8.7.ebuild b/sys-apps/man-db/man-db-2.8.7.ebuild
deleted file mode 100644
index c0b49d500cd2..000000000000
--- a/sys-apps/man-db/man-db-2.8.7.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
-HOMEPAGE="http://www.nongnu.org/man-db/"
-if [[ "${PV}" = 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib"
-
-CDEPEND="
-	!sys-apps/man
-	>=dev-libs/libpipeline-1.5.0
-	sys-apps/groff
-	gdbm? ( sys-libs/gdbm:= )
-	!gdbm? ( berkdb? ( sys-libs/db:= ) )
-	!berkdb? ( !gdbm? ( sys-libs/gdbm:= ) )
-	seccomp? ( sys-libs/libseccomp )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? (
-		>=app-text/po4a-0.45
-		sys-devel/gettext
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	acct-group/man
-	acct-user/man
-	selinux? ( sec-policy/selinux-mandb )
-"
-PDEPEND="manpager? ( app-text/manpager )"
-
-pkg_setup() {
-	if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
-		ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
-	fi
-}
-
-src_configure() {
-	export ac_cv_lib_z_gzopen=$(usex zlib)
-	local myeconfargs=(
-		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--disable-setuid #662438
-		--enable-cache-owner=man
-		--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x"
-		$(use_enable nls)
-		$(use_enable static-libs static)
-		$(use_with seccomp libseccomp)
-		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
-	)
-	econf "${myeconfargs[@]}"
-
-	# Disable color output from groff so that the manpager can add it. #184604
-	sed -i \
-		-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
-		src/man_db.conf || die
-
-	cat > 15man-db <<-EOF || die
-	SANDBOX_PREDICT="/var/cache/man"
-	EOF
-}
-
-src_install() {
-	default
-	dodoc docs/{HACKING,TODO}
-	find "${ED}" -name "*.la" -delete || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884
-
-	insinto /etc/sandbox.d
-	doins 15man-db
-}
-
-pkg_preinst() {
-	local cachedir="${EROOT}/var/cache/man"
-	# If the system was already exploited, and the attacker is hiding in the
-	# cachedir of the old man-db, let's wipe them out.
-	# see bug  #602588 comment 18
-	local _replacing_version=
-	local _setgid_vuln=0
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		if ver_test '2.7.6.1-r2' -le "${_replacing_version}"; then
-			debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!"
-		else
-			_setgid_vuln=1
-			debug-print "Applying cleanup for security bug #602588"
-		fi
-	done
-	[[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}"
-
-	# Fall back to recreating the cachedir
-	if [[ ! -d ${cachedir} ]] ; then
-		mkdir -p "${cachedir}" || die
-		chown man:man "${cachedir}" || die
-	fi
-
-	# Update the whatis cache
-	if [[ -f ${cachedir}/whatis ]] ; then
-		einfo "Cleaning ${cachedir} from sys-apps/man"
-		find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete
-	fi
-}
-
-pkg_postinst() {
-	if [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
-		einfo "Rebuilding man-db from scratch with new database format!"
-		su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null
-	fi
-}
diff --git a/sys-apps/man-db/man-db-2.9.2.ebuild b/sys-apps/man-db/man-db-2.9.2.ebuild
deleted file mode 100644
index 8ad0f47c8564..000000000000
--- a/sys-apps/man-db/man-db-2.9.2.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
-HOMEPAGE="http://www.nongnu.org/man-db/"
-if [[ "${PV}" = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib"
-
-CDEPEND="
-	!sys-apps/man
-	>=dev-libs/libpipeline-1.5.0
-	sys-apps/groff
-	gdbm? ( sys-libs/gdbm:= )
-	!gdbm? ( berkdb? ( sys-libs/db:= ) )
-	!berkdb? ( !gdbm? ( sys-libs/gdbm:= ) )
-	seccomp? ( sys-libs/libseccomp )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? (
-		>=app-text/po4a-0.45
-		sys-devel/gettext
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	acct-group/man
-	acct-user/man
-	selinux? ( sec-policy/selinux-mandb )
-"
-PDEPEND="manpager? ( app-text/manpager )"
-
-pkg_setup() {
-	if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
-		ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
-	fi
-}
-
-src_unpack() {
-	if [[ "${PV}" == *9999 ]] ; then
-		git-r3_src_unpack
-
-		# We need to mess with gnulib :-/
-		EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \
-		EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	if [[ "${PV}" == *9999 ]] ; then
-		local bootstrap_opts=(
-			--gnulib-srcdir=../gnulib
-			--no-bootstrap-sync
-			--copy
-			--no-git
-		)
-		AUTORECONF="/bin/true" \
-		LIBTOOLIZE="/bin/true" \
-		sh ./bootstrap "${bootstrap_opts[@]}" || die
-
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	export ac_cv_lib_z_gzopen=$(usex zlib)
-	local myeconfargs=(
-		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--disable-setuid #662438
-		--enable-cache-owner=man
-		--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x"
-		$(use_enable nls)
-		$(use_enable static-libs static)
-		$(use_with seccomp libseccomp)
-		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
-	)
-	econf "${myeconfargs[@]}"
-
-	# Disable color output from groff so that the manpager can add it. #184604
-	sed -i \
-		-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
-		src/man_db.conf || die
-
-	cat > 15man-db <<-EOF || die
-	SANDBOX_PREDICT="/var/cache/man"
-	EOF
-}
-
-src_install() {
-	default
-	dodoc docs/{HACKING,TODO}
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884
-
-	insinto /etc/sandbox.d
-	doins 15man-db
-}
-
-pkg_preinst() {
-	local cachedir="${EROOT}/var/cache/man"
-	# If the system was already exploited, and the attacker is hiding in the
-	# cachedir of the old man-db, let's wipe them out.
-	# see bug  #602588 comment 18
-	local _replacing_version=
-	local _setgid_vuln=0
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		if ver_test '2.7.6.1-r2' -le "${_replacing_version}"; then
-			debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!"
-		else
-			_setgid_vuln=1
-			debug-print "Applying cleanup for security bug #602588"
-		fi
-	done
-	[[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}"
-
-	# Fall back to recreating the cachedir
-	if [[ ! -d ${cachedir} ]] ; then
-		mkdir -p "${cachedir}" || die
-		chown man:man "${cachedir}" || die
-	fi
-
-	# Update the whatis cache
-	if [[ -f ${cachedir}/whatis ]] ; then
-		einfo "Cleaning ${cachedir} from sys-apps/man"
-		find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete
-	fi
-}
-
-pkg_postinst() {
-	if [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
-		einfo "Rebuilding man-db from scratch with new database format!"
-		su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null
-	fi
-}
diff --git a/sys-apps/man-db/man-db-2.9.3.ebuild b/sys-apps/man-db/man-db-2.9.3.ebuild
index 37f902d080a3..70728d703694 100644
--- a/sys-apps/man-db/man-db-2.9.3.ebuild
+++ b/sys-apps/man-db/man-db-2.9.3.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/memtester/Manifest b/sys-apps/memtester/Manifest
index 86388c8fa515..23cef96b4e2e 100644
--- a/sys-apps/memtester/Manifest
+++ b/sys-apps/memtester/Manifest
@@ -1,4 +1,6 @@
 AUX memtester-4.3.0-fix-gcc10-fno-common.patch 514 BLAKE2B 5b911fcd0ca63030e471f8e0e721f808ff8161d5cb14e51bec33bb61313154cab746880d162371a0a05b0c7fd4d165a90d5ad850f7d03139bdcdd7d5a24a5430 SHA512 ee0c21c40185fefe32d55c9f2b704db2b769189d6902369dc77078417fd7babdf6d2a6ba34dc4db2a8203bbe72148476d167550e8488477c4cd4a7bc221951f8
 DIST memtester-4.3.0.tar.gz 22113 BLAKE2B 564cb874ea8263e23049d99417bb75f4d9f6fe1bbc022b2f2043735548c97f0060e877079087e524738bda3f9669d0ec171fb3aa9958a2904d848ace87d1cd91 SHA512 045bcc73855706ff03e8ca65297a0d6e5b5ac02f99dae0f17cef1310b403efcb78d9a7295eca6d2de703b0a7b2f71b58a37f5a42040f01fc77a321a8d2205888
+DIST memtester-4.4.0.tar.gz 22801 BLAKE2B 36d97cce30f5f149dc666dd4a743df39ad6993ec82489f4e890bacf1d05de6405da26b2fcd08a0f0416d527ddcf586c77b30b87b19ce80885e80a65ed8b9fb76 SHA512 65b9bc7e81b020cae6cbadc8f47c0bb2837e62bdea24fda72696b22a6b3aad3752d96b00defface4b7397cef58ff6133a9f5794df0a483ec2a639a428177bf75
 EBUILD memtester-4.3.0.ebuild 787 BLAKE2B 732b507aea997202701c14d12521511ad0365835ac3925b5aa9e207f25fd7b50ebb93281e1deaf64ee9fd7c2ebf62a6d2a14501ba1a83ca13017cd2929833d70 SHA512 227695b1358e01bd9c3162673f8ad017481b8271f62e231a638e33f34806cb366f3369ce5a1e66c9befd5789e7c40cc231b585a30f348633502106b8220517ec
+EBUILD memtester-4.4.0.ebuild 726 BLAKE2B 329f63deeea2f3384018daebfbb7cfa67e1d3de2641e68d541fd91ec5de7fa5f96fbc298620bca7f4495fd01a1e9eda62b601e294cc562bec7289866627cd14a SHA512 81cebfa2abebf1af62a6ee6ba0f96363d5ceb58f8e4f68a47b1ee8425a3ae3b89272650ebba5c74a637d9d1a172968eda17194f7ae2a342d930f7bbee2c2e8e5
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/memtester/memtester-4.4.0.ebuild b/sys-apps/memtester/memtester-4.4.0.ebuild
new file mode 100644
index 000000000000..4be0e82a6fe2
--- /dev/null
+++ b/sys-apps/memtester/memtester-4.4.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="userspace utility for testing the memory subsystem for faults"
+HOMEPAGE="http://pyropus.ca/software/memtester/"
+SRC_URI="
+	http://pyropus.ca/software/memtester/${P}.tar.gz
+	http://pyropus.ca/software/memtester/old-versions/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+src_configure() {
+	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DPOSIX -c" > conf-cc || die
+	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld || die
+}
+
+src_install() {
+	dosbin memtester
+	doman memtester.8
+	dodoc BUGS CHANGELOG README README.tests
+}
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 3d9864995d47..9d387226f1fe 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,6 +1,4 @@
-DIST pkgcore-0.10.12.tar.gz 646922 BLAKE2B f3251b1a0d773e83d60f15598c2c5679a48a1e1dd81b82956ffb26ef72c25296903d64deeb0e91d95ae26832d0e08e3cdfcb68b95bbcd87acf8ed448a4f4ae56 SHA512 f6f900fc7f77a683c398c874c51eddb387f9aed572d5fce38f4856faa71f4f8e870b1bc276a87f15967733fa6ec7c8345f2d6b777897694537fa1e9165b1433c
 DIST pkgcore-0.10.13.tar.gz 647320 BLAKE2B ef80320a0a8d35ed68b1d77d52a3cfb2ffbadae2fe9f11efe3f42c68f55388074b5c4b2857f265f1add4cfe479cba9716d45afaf141d113b0874d409955269c7 SHA512 acc5ee2cc6fd0f897129f311e0484e28a1c8f374c5a2e56a29d228fee74b7be0cb6059171b743e0db35544b5b5779d35efcda21e46e65285653ba4155205281f
-EBUILD pkgcore-0.10.12.ebuild 1083 BLAKE2B 1df43065262419decd1770d5c746211bedbe3120f505cd6c21077d5a3c9ee9491561b91898deb878cfd0c69ff3fb1678d6bf658904a56abe1a3683201b8c461a SHA512 0ab3b254e4ecfec7eb20280ab69b1dd8b49c2e7bb1de79697dc08c9c1717ccf1b32091c42244c4009dc06cdbe845d82f988a2201980f90c9a634a5c1fe1a1ab7
-EBUILD pkgcore-0.10.13.ebuild 1088 BLAKE2B 058f81bf1ce501c7a2938077dd2a195143e92646a9da5fa02ea87826ce72e6c4ca4514b06e409dfa275e824b1877d1f8a9c069993cf533dde67a2f0c282e27c6 SHA512 4bb3bec4a2e6e8c22218467b283ffbf7b914092dbe09afd5051268e97258635a50c0bdb8780ebf548c482d8fa3043f0e8791fd3f3b67e1222f5123d743955026
+EBUILD pkgcore-0.10.13.ebuild 1083 BLAKE2B 1df43065262419decd1770d5c746211bedbe3120f505cd6c21077d5a3c9ee9491561b91898deb878cfd0c69ff3fb1678d6bf658904a56abe1a3683201b8c461a SHA512 0ab3b254e4ecfec7eb20280ab69b1dd8b49c2e7bb1de79697dc08c9c1717ccf1b32091c42244c4009dc06cdbe845d82f988a2201980f90c9a634a5c1fe1a1ab7
 EBUILD pkgcore-9999.ebuild 1091 BLAKE2B 0ec2dc4f6c16cbaf1994caa3b3db77578a95a972d719f7694b443d5b15d0f3b9a69897bd1dae8fa448e0f4083b8eb5d8906aed43c1136ebceb46242e96a0332b SHA512 108771ffbb3001b6f22b0d033b2391688c8afbc5ee5a7ce3114a9324f021998d0043089de4f7536f8fad0c89a9dd5a25f078ba8ca66a0ce2e9ce442d81bab459
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/pkgcore-0.10.12.ebuild b/sys-apps/pkgcore/pkgcore-0.10.12.ebuild
deleted file mode 100644
index 185be89d3ad1..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.10.12.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6..9} )
-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 arm64 hppa ~ia64 ppc ppc64 ~s390 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 MIT"
-SLOT="0"
-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.7[${PYTHON_USEDEP}]"
-fi
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.10.13.ebuild b/sys-apps/pkgcore/pkgcore-0.10.13.ebuild
index 688fe95a75e6..185be89d3ad1 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.13.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.13.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e8605bfa7aef..4de3f975d6ae 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,16 +1,13 @@
 AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
-DIST portage-2.3.103.tar.bz2 1051807 BLAKE2B 6a05997ea8b87627523642664956f822b76bbc41511659abfa6ede12b5f9ecaf9d253ac816b0e1dc6b6a118d9efc80593b429ef179d9d01200333585498d44d9 SHA512 e5595ca3b12c35fb696dd86ed2f1a72e56c7bc6955a63e555e1f0a795415473e38363541495496464bdc4192e2708c8bff4192bd0c7dad7a527fac96deec2a4c
 DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90d151bdb5d8615f6217a499c0f5d4c80813f2c753e7902cf34482df0725ad0b43a38707764c8be14aae9f7ca34f0bd8721f SHA512 6f1c5d7b42beb8078c45cccbad2bd65374b69af92521d9be3beb6784477ca5bcdd75d8e762b239e44e3121e6fe5e3a040c92c9b61521e4a9b1d6bafee10d4c88
 DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5
 DIST portage-3.0.4.tar.bz2 1042654 BLAKE2B 6f869b2eb24f9e590bf8e01172050105a1bd9ea88657db5893133b4620231a0ddcda871d6fcc10623f7f2ef809116310c76355263819be6c3734b0ca184d5fc0 SHA512 7a0c39cd4ed65aebd84ff8bbadba29760b3aa392a0d606c5b29a1112fd0845c42f74eebb0728a069b2b097a6eb7eec2d18af615fd9edcc38f1018ae6ff686812
-DIST portage-3.0.6-selinux-utf8-bug-741194.patch 2721 BLAKE2B 6f743fd32f72e18a029827ecbaf168d67cf5056a60ba89d00dd1ff7225f4a4ffa63dbb14310cf590553d47d4ac52d0899c5b48ebb799bed6dd76fc74a762e134 SHA512 108dd63d029bf296a26723e35f8c05ae9c5c81fd1b1f5398bbc310dd832b1af452865893e0c434b857cca12bd458dc1963dab689fab629ab7d48678472d9bc47
-DIST portage-3.0.6.tar.bz2 1045033 BLAKE2B 3c31252215069619bde15191fade18198e777f892e910ec6f5a9ebbc8569a56d219943ccbaf18517eae51f74d8c53047d4e0ef5675166b09e28766f940ad7391 SHA512 0ec6ca0470060d6a441fa48728f542afc97e49f93c8f2bd66ab51dda946f65a4bcc52e1f7b2afe19c040b4dcf05d4a2d8578cea2ab3526c7b8fa630670e8a98a
 DIST portage-3.0.7.tar.bz2 1045185 BLAKE2B 1fe5e13bbbfaecd1b850b29b17908fb2c2756d559b0583174833672b68a67cfc7e7080334729ee5295b646423ca3925284f42eeace0c0b79d02305a170aed5d9 SHA512 701f6bddb9255d5ac86ed6e73f869124925bafd09f7c2e458376b54aebf030fa7f0d80beda1626350755cc1e8a2b9c2636b3fde1105787f2d2a0f742a73cf5e8
-EBUILD portage-2.3.103-r1.ebuild 8291 BLAKE2B ac5cddcf0746e69bff1806884daf9222a42a58e2d8054eff5dea4920d836367a94164b8651812143ebce0287d38e05e7d4234fde7f246728d3f122e776258da8 SHA512 320f7430df2d4b787de635a5bebeafc17fb5e3b1ddf7a33077def1cb3cb3ff381a8b3b70c48605adc124bfd146a22b31bc8232500befafb94ad8184aa39f8dfb
+DIST portage-3.0.8.tar.bz2 1046968 BLAKE2B 662147c37a9e7b81030fadb4d6438b734ee57a9eb9bfcee80991d137a017aa3541565961282ebf8736db71aeb05532ffa139ff3a34a84bc9064cf74427acb666 SHA512 5f97870a11ecca30ffe8f463f87cd16a1edb52b44832c6eaba15cadcfde2b4f7edf963749e45c8043b45b38e53ee210dc913aa2d2432a2bd3928cc27c8765a85
 EBUILD portage-2.3.99-r2.ebuild 8482 BLAKE2B 9880361867a65a42c22b277e46fdf973d32b57679519dcce4728fe3297a6b55990a0cc319e161f3056f33c72979101e9b54168e01ef6a1a2bfdc6a92df042821 SHA512 c04cf3569d920a4e55da0eac94cbf93b5780d9b2eb3afa45c918fbae88c11a0f130aba4370b1897628a0f03fd24dcf573aad03164c4e9a786ec754f96cd0939d
-EBUILD portage-3.0.4-r1.ebuild 8528 BLAKE2B ede668363df0532550ed3dd81e20ea05d6f54a03a1a311e615d0551f38ea2f2be1f102b0b61a0e86285a420b056cad65e34aae2379280366bc6dc78e7cd8342c SHA512 f93f66512091d7005c2ed29db7837b6e6100bfcb8b08e878ff7e93e3411c18ddaebcad2938bf15a44d9b6919e8a1af5b3a5fff5cadbc5e8659759f5763ac4094
-EBUILD portage-3.0.6-r1.ebuild 8570 BLAKE2B b9fdec35e39640500f572f75c9408ea7444b1a5d7185eb549d535625fea57e3db7168265da5ec06019d85e13e74d373712253a723137764809a81e8db3cf0cf4 SHA512 31c2f663fe0294e5915b8ce628db69f965546fd1f4d45f6dd6491b39ae9915d01939445cc1cea33377afa281683f1e011e85a843f1c0f7b9bdf34518baaf9a64
+EBUILD portage-3.0.4-r1.ebuild 8527 BLAKE2B 631108e364ee22d284e334c5c641f4e807375ac75804a7c3099837d94a74f4c41cbbaf6ca365624516f858ee68c07b8551a3c1c9f1950f6352d0186db4bd28c6 SHA512 8ff2a857a31c283408b9d8a6f5d1a984c6299ccd1b7f8eaaff2e3b5f3b1dcc62f32bee8dbc1496a4a75e836f4772f91a295a23facb005d035c337032ed63d6a1
 EBUILD portage-3.0.7.ebuild 8386 BLAKE2B 31a02b0077c892cfa61726a716b5cca2349d731fe6e9480476512ad62e457c4b051ab1c0ec236f02728e6955f6f1c45d45c71b8302dd2e35b00cc662dbf2b9cb SHA512 b48ccbf8f975a22b7c61859ca239584c67cd0bc6bc718b2191ee66daabebb600e10f7e0bd5328b0fb3aba5077095fa823d824bb82f5b7dd944f6e319a005241d
+EBUILD portage-3.0.8.ebuild 8386 BLAKE2B 31a02b0077c892cfa61726a716b5cca2349d731fe6e9480476512ad62e457c4b051ab1c0ec236f02728e6955f6f1c45d45c71b8302dd2e35b00cc662dbf2b9cb SHA512 b48ccbf8f975a22b7c61859ca239584c67cd0bc6bc718b2191ee66daabebb600e10f7e0bd5328b0fb3aba5077095fa823d824bb82f5b7dd944f6e319a005241d
 EBUILD portage-9999.ebuild 7417 BLAKE2B 088bcba17cd3d8451e04fa5a2a5e71ea237cd976b9cabbe157822e14b58bf283e628227c1807d5eed2f88699476f312745540bbb5c15ab25089844d4436f9e71 SHA512 bb43ac625afdd22f52cf5d4c45be1512ee56d14cb4ded2cc0c0680d22869836290a09ac09e88967d3e54b6ffd21e0dd429c8cc7f64431617f11e6645d396a020
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
diff --git a/sys-apps/portage/portage-2.3.103-r1.ebuild b/sys-apps/portage/portage-2.3.103-r1.ebuild
deleted file mode 100644
index ecac7ed55c3c..000000000000
--- a/sys-apps/portage/portage-2.3.103-r1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 linux-info tmpfiles 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 sparc x86"
-SLOT="0"
-IUSE="apidoc build doc 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 )
-	apidoc? (
-		dev-python/sphinx
-		dev-python/sphinx-epytext
-	)"
-# Require sandbox-2.2 for bug #288863.
-# 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/zstd
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/findutils-4.4
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		rsync-verify? (
-			>=app-portage/gemato-14.4-r1[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	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
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<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
-
-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)"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
-
-	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} 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|' \
-			-e '/^sync-webrsync-verify-signature/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 apidoc && targets+=( apidoc )
-
-	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 apidoc && targets+=(
-		install_apidoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	dotmpfiles "${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
-	local sitedir=$(python_get_sitedir)
-	[[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory"
-	env -u DISTDIR \
-		-u PORTAGE_OVERRIDE_EPREFIX \
-		-u PORTAGE_REPOSITORIES \
-		-u PORTDIR \
-		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-	env -u BINPKG_COMPRESS \
-		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || 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
-
-	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-3.0.4-r1.ebuild b/sys-apps/portage/portage-3.0.4-r1.ebuild
index 55c691b6004f..c57a8412713c 100644
--- a/sys-apps/portage/portage-3.0.4-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.4-r1.ebuild
@@ -13,7 +13,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 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/portage/portage-3.0.6-r1.ebuild b/sys-apps/portage/portage-3.0.8.ebuild
index 5b2ae95fe1e6..28cd3d04cca0 100644
--- a/sys-apps/portage/portage-3.0.6-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.8.ebuild
@@ -82,8 +82,7 @@ prefix_src_archives() {
 
 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/a8f0e05d35b0ba2747827ce03dff42682192def8.patch -> ${P}-selinux-utf8-bug-741194.patch"
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
 
 pkg_pretend() {
 	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
@@ -94,8 +93,6 @@ pkg_pretend() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
-	eapply "${DISTDIR}/${P}-selinux-utf8-bug-741194.patch"
-
 	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
 
 	if use gentoo-dev; then
diff --git a/sys-apps/preload/Manifest b/sys-apps/preload/Manifest
index ec8f7e227198..d48171b5a7f3 100644
--- a/sys-apps/preload/Manifest
+++ b/sys-apps/preload/Manifest
@@ -1,12 +1,12 @@
-AUX 00-patch-configure.diff 554 BLAKE2B 73d5c0e5d54272f0498f461ac9bbef0434fce1cb315136955168dd70ab8a058180446fb654523be368197ac37f131d80eca7ebab233e909e7eb91262206370fb SHA512 08d0ec88d15812e9a495e3b5bef080539f088163d3ad3b390fc6f5cffaefbdf8a6ac854c9a24ec0962466afead1223ba5621566649fea6bb84d80bcecbc16c3e
+AUX 00-patch-configure.diff 557 BLAKE2B 08fa498954e6457ad82e6e71785940b243beec92f1e22ecf8adff8b9f19bc5d78baa2cd41213a1258099c2642bc954524eae7364c85d50cca95d2649bd75a01d SHA512 81388870cb61a5cc1d7b066a52c73d8478464e51e6926c63601442e6f93ac34eff603705d5bb01d4adcb012ca5c1363b1ff48d276720115fe39031f313e018ae
 AUX 0001-Early-restart-of-forking-readahead-children.patch 1900 BLAKE2B 53ce9538be78720e51ebcf894dd05780a02dc39c5c83b4af4785057e4b0b6da5a0a19243e15a34a19997fc2d818da113c70d81a9c042e7e15d6fbbd22799e093 SHA512 c24b22605e7fc020a5f2a069a65b2ffac9caae69b70d7e5925953f9e4a71992ca34f4701de7b9e975321ae3418a2d6a6bd952e162b8167891bc68128dbdc51cf
 AUX 0002-Create-short-overlapping-io-bursts.patch 856 BLAKE2B 64f61b1864cc0e4aa8dfe464bd36dc8308b99bec0b632b1e15e40992e0c5ff4b1f0b29c785d07936c9a7db6b7f17434148f07abdfca48bd08365ee47efd4a544 SHA512 ad9f8cc342e54cf36ade563351dec14d02bbcf1495f8dddae265a339531b623eeb3be100b6303670c33d588b2f0106d6162e74b449ec082e2f4257e2dd7b276b
 AUX 0003-Fix-wait_for_children-loop.patch 745 BLAKE2B 0e923e5227264e15323e5d41e65997a1f02e853c5a205fe3cba5c05a9ba802261e453c5e67c851b9914d0faa776ada5e3964564d27225921b9d91d3c778598b0 SHA512 32c107fde8d9afcf687e5e276dcb95006bc26fa0af6a1bc2223c80fbe9ec685d7952ae4e0452ed57c6edf3cffddc23fa0da4633c37f23c4450b5c68b3dbff274
-AUX 02-patch-preload_conf.diff 684 BLAKE2B 3f6a1ed6551dc015b6f32ad4631cac17955a64442736c865a3ccf2fa6ce86eea8b2d317e9d43a40479e0495891814b841d58e41e894f902292ef0e73aadbd59a SHA512 b5c6076cc4c97d917219d12d8aa30b3bc958085e2477b81c54449e2b4bc576fd86a1e01f64867933b1219842e3292e4861a1776486594ae3aa93f956fb919c9f
-AUX 02-patch-preload_sysconfig.diff 1297 BLAKE2B a97b0e815a2fab7508058de3b978864aa32edb03435bbc0985e6160be1aa8f8985e7a40031d467cfae803c6a5437102a69aa0605fb246b04390a6d78b6fbbe0a SHA512 bef0346e1b0c3fb15f9f1987a302cd0b349ce1898f387afaf6407833c2adfd3dfa985615840312d5cd09d22e330f072ab3a164cb3f7c9b356bfc51522fe924e3
-AUX preload-0.6.4-use-help2man-as-usual.patch 1170 BLAKE2B d887f3b410c03609af0263901d0772018c143d8a0bad33e3732d5b836fa6e645b34d5de3a2b3a84f37b513e6ddb27956779b16849013c1865212b88528c05e27 SHA512 cbd40b621974544f4737161a034f13d7d9e635822f7cca293ca93e7e5d7bb108260b02aa557e42fb43cbd48ca069bb19eb7946cb1f4fbf263dac84ac209de451
-AUX preload-0.6.4-use-make-dependencies.patch 533 BLAKE2B a52158e33778b7a12e3e87bfbc3c0c1ff4231b923c23f075f762a947628eb35256266ca1bdc5b0269e2ecedabd29be27c0ea7ebfe8a944e7c4d0e0917ba24e96 SHA512 060c96b9b3fe38eac79d6a39945ff4efbe7639804e97715a290d5397fff523fb8d483393305187249c61ac1acbc719f4e56bb7e5a3c1513e6384ca915ad773a0
+AUX 02-patch-preload_conf.diff 580 BLAKE2B 3e2e75da6a4c2bc12844d0ff7f10fbf40597b5dbb0652471129d8a8b0ea6cc265a07d9bd4da9358c7a4f79e6c1503a9315b72ef1c7a2f289ee705b3cb1239a20 SHA512 1b7dc7ef4062df4da232180c4a85d49c01f49d552e20e6a444fbf6933955ae47db9cc6332d3864b8f995fe5a90143169b0a93f68ee2644b654774a5c8fed67ef
+AUX 02-patch-preload_sysconfig.diff 1189 BLAKE2B e48709f2ca85358392862e76ebf005487d44dff5a3e29f6e0f6fa58752c78077173c8c43688fe7148952899c02b102772994bb4e15e41b16da60a1c9870b376f SHA512 46bead00fadea51449dcd06ce633d6725d234e6b1a2d8565a3b97306e46d00b18d66eaccfa3700f04a2498f6d65dcc0596f336b06b2fae0607d0c18bd44c4142
+AUX preload-0.6.4-use-help2man-as-usual.patch 1173 BLAKE2B 2b8e1363edddabd422fdadfc47318ad650c2413bfb040327549fe33b4e38267184902e759fa21d32422452091720791efc0190b9d1651b10f07a456768c02508 SHA512 0a8dedab11519555834f5daf9e843051598a0977080bb8bd23080e87009cfe4af3a8018071199542a2efeae55ce6a3ab0701c42465905629b2a23122251f395d
+AUX preload-0.6.4-use-make-dependencies.patch 536 BLAKE2B d19bd18e4f1411d0087a0b611c57e7f31d07d763f439b6ed7e28c6aa4fc7ce78b8573b60076fca0ee1da70bba1a7c2fe9d70cb67ab229b8b2f8a60787826db3d SHA512 0e8e42f5e03282bce68ec3c7c839175eb680ee471ea8cf22a362b9fe280a5197f2daa496465139c2ba8b6a76d733da5a910cf9f2137b3c09032ef6a8ee40ff66
 AUX preload-0.6.4.init.in-r2 1506 BLAKE2B 35622512e6321e8de7e40b41a37e25a4d4f628663050ec2c8fb4cb9220273017a4cf716464e1247d078b411773c451025e7ebe75d36055167f2940f544b60453 SHA512 0e6a058f1825f537152ddf1495dc4101f8add5ca4ce759c3cf6425025c19c5a4361d9abed447511b7d9f081c665d65d7d2f828c13a59ddfcb5f88e5529958e95
 DIST preload-0.6.4.tar.gz 140750 BLAKE2B 4992d2876bc7109d30551c16933c7b107e548d577faf2f78246bdeb6dfe16a81e09edce3a4f0ce15df346a28b81b730e246c7cba431b3d451ceaf6f48c8757bc SHA512 ffb533059b8c9cd171b0d02d52fc8c9bc45284fb16e12b9698ab74345d0e4f66cee61e17922074f7fbfaa90db254e473f815718fc72a689bb55346fcda9e823c
-EBUILD preload-0.6.4-r3.ebuild 1681 BLAKE2B d615b1f5ff1763d7e9b603e9c0746ac09b25b21e74dbf4553d4f08cf8074d115dc787f208fb261046f23ed114330757db278ebcb64b2b2238b17d6f8ff2372d7 SHA512 1fcb076e07dca79ce44945c576d8432408ddf4331f9e164a835a818f816b019a73930159064f26beadd90e263ce716d3c279e10c1da8f696ccb0aa24fcdb04c5
+EBUILD preload-0.6.4-r3.ebuild 1673 BLAKE2B 0e46d70daea3e06582f9c05e206fa5ef1a9890958ec2129b9f5fa5755f1d82d157cbdb4df62be95e44f0f9a145096aaa0580cdfe7012d78894daeb3361a807db SHA512 e1fd4cb7b4b2a41bcc73399ff6ebdb55639a0642cdc772082fd566d70c991474c0d5665b778b0a6360faf5850a24ef1da437524f652e83937417324e99594180
 MISC metadata.xml 528 BLAKE2B 2bb37590ea6a3b3fefea0be2a881f084fc1070cf510a75c34607b423e84366241292e14742c334d6489991f030b43553a425e5452c4d98335dd5b47b7aef1951 SHA512 4495fd96e629a729c9ff8cb13672204239091e8fac82b51bedc80e738481ef5c67fd88d4570e991de3a5d5226b1440529d88b5d43bc0a9e2cd803a4281279b30
diff --git a/sys-apps/preload/files/00-patch-configure.diff b/sys-apps/preload/files/00-patch-configure.diff
index 0fa5feb47b1f..17b0afc7d591 100644
--- a/sys-apps/preload/files/00-patch-configure.diff
+++ b/sys-apps/preload/files/00-patch-configure.diff
@@ -1,5 +1,5 @@
---- configure.ac~	2009-04-15 23:47:52.000000000 +0200
-+++ configure.ac	2010-03-29 17:59:39.000000000 +0200
+--- a/configure.ac	2009-04-15 23:47:52.000000000 +0200
++++ b/configure.ac	2010-03-29 17:59:39.000000000 +0200
 @@ -54,9 +54,9 @@
  PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.14)
  
diff --git a/sys-apps/preload/files/02-patch-preload_conf.diff b/sys-apps/preload/files/02-patch-preload_conf.diff
index 70055c3bbb0f..79011a1ce819 100644
--- a/sys-apps/preload/files/02-patch-preload_conf.diff
+++ b/sys-apps/preload/files/02-patch-preload_conf.diff
@@ -1,6 +1,5 @@
-diff -urN preload-0.6.orig/src/preload.conf.in preload-0.6/src/preload.conf.in
---- preload-0.6.orig/src/preload.conf.in	2008-07-24 02:02:11.000000000 +0200
-+++ preload-0.6/src/preload.conf.in	2008-07-24 16:32:28.565184094 +0200
+--- a/src/preload.conf.in	2008-07-24 02:02:11.000000000 +0200
++++ b/src/preload.conf.in	2008-07-24 16:32:28.565184094 +0200
 @@ -132,7 +132,7 @@
  # preload doesn't special-handle device files internally.
  #
diff --git a/sys-apps/preload/files/02-patch-preload_sysconfig.diff b/sys-apps/preload/files/02-patch-preload_sysconfig.diff
index 84308b6e14d8..7ca1a1313a00 100644
--- a/sys-apps/preload/files/02-patch-preload_sysconfig.diff
+++ b/sys-apps/preload/files/02-patch-preload_sysconfig.diff
@@ -1,6 +1,5 @@
-diff -urN preload-0.6.4.orig/preload.sysconfig preload-0.6.4/preload.sysconfig
---- preload-0.6.4.orig/preload.sysconfig	2008-10-23 03:08:20.000000000 +0200
-+++ preload-0.6.4/preload.sysconfig	2009-05-01 13:51:03.493828659 +0200
+--- a/preload.sysconfig	2008-10-23 03:08:20.000000000 +0200
++++ b/preload.sysconfig	2009-05-01 13:51:03.493828659 +0200
 @@ -1,10 +1,30 @@
 +# Copyright 1999-2008 Gentoo Foundation
 +# $Id$
diff --git a/sys-apps/preload/files/preload-0.6.4-use-help2man-as-usual.patch b/sys-apps/preload/files/preload-0.6.4-use-help2man-as-usual.patch
index 61db50692524..e0e1d3e439c3 100644
--- a/sys-apps/preload/files/preload-0.6.4-use-help2man-as-usual.patch
+++ b/sys-apps/preload/files/preload-0.6.4-use-help2man-as-usual.patch
@@ -1,5 +1,5 @@
---- src/Makefile.am~	2009-04-15 23:46:04.000000000 +0200
-+++ src/Makefile.am	2010-04-09 12:56:45.000000000 +0200
+--- a/src/Makefile.am	2009-04-15 23:46:04.000000000 +0200
++++ b/src/Makefile.am	2010-04-09 12:56:45.000000000 +0200
 @@ -54,23 +54,11 @@
  
  dist_man_MANS = preload.8
diff --git a/sys-apps/preload/files/preload-0.6.4-use-make-dependencies.patch b/sys-apps/preload/files/preload-0.6.4-use-make-dependencies.patch
index 0f41780c31e4..5d2b61c7daf0 100644
--- a/sys-apps/preload/files/preload-0.6.4-use-make-dependencies.patch
+++ b/sys-apps/preload/files/preload-0.6.4-use-make-dependencies.patch
@@ -1,5 +1,5 @@
---- src/Makefile.am~	2010-04-09 12:56:45.000000000 +0200
-+++ src/Makefile.am	2010-04-09 12:58:36.000000000 +0200
+--- a/src/Makefile.am	2010-04-09 12:56:45.000000000 +0200
++++ b/src/Makefile.am	2010-04-09 12:58:36.000000000 +0200
 @@ -8,8 +8,6 @@
  		-DLOGDIR='"${logdir}"'	\
  		-DPKGLOCALSTATEDIR='"${pkglocalstatedir}"'
diff --git a/sys-apps/preload/preload-0.6.4-r3.ebuild b/sys-apps/preload/preload-0.6.4-r3.ebuild
index 486415f63b80..97f7518dbe0d 100644
--- a/sys-apps/preload/preload-0.6.4-r3.ebuild
+++ b/sys-apps/preload/preload-0.6.4-r3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils autotools
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Adaptive readahead daemon"
 HOMEPAGE="https://sourceforge.net/projects/preload/"
@@ -13,20 +14,26 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="vanilla"
 
-RDEPEND=">=dev-libs/glib-2.6:2"
-DEPEND="${RDEPEND}
+BDEPEND="
+	sys-apps/help2man
 	virtual/pkgconfig
-	sys-apps/help2man"
+"
+RDEPEND=">=dev-libs/glib-2.6:2"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/00-patch-configure.diff
+	"${FILESDIR}"/02-patch-preload_conf.diff
+	"${FILESDIR}"/02-patch-preload_sysconfig.diff
+	"${FILESDIR}"/${PN}-0.6.4-use-help2man-as-usual.patch
+	"${FILESDIR}"/${PN}-0.6.4-use-make-dependencies.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/00-patch-configure.diff
-	epatch "${FILESDIR}"/02-patch-preload_conf.diff
-	epatch "${FILESDIR}"/02-patch-preload_sysconfig.diff
-	epatch "${FILESDIR}"/${PN}-0.6.4-use-help2man-as-usual.patch
-	epatch "${FILESDIR}"/${PN}-0.6.4-use-make-dependencies.patch
-	use vanilla || epatch "${FILESDIR}"/000{1,2,3}-*.patch
-	cat "${FILESDIR}"/preload-0.6.4.init.in-r2 > preload.init.in || die
+	use vanilla || eapply "${FILESDIR}"/000{1,2,3}-*.patch
+	default
 
+	cat "${FILESDIR}"/preload-0.6.4.init.in-r2 > preload.init.in || die
 	eautoreconf
 }
 
@@ -46,16 +53,15 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ "$(rc-config list default | grep preload)" = "" ] ; then
+	if [[ "$(rc-config list default | grep preload)" = "" ]] ; then
 		elog "You probably want to add preload to the default runlevel like so:"
 		elog "# rc-update add preload default"
 	fi
 
-	if has_version sys-fs/e4rat; then
+	if has_version sys-fs/e4rat ; then
 		elog "It appears you have sys-fs/e4rat installed. This may"
 		elog "has negative effects on it. You may want to disable preload"
 		elog "when using sys-fs/e4rat."
 		elog "http://e4rat.sourceforge.net/wiki/index.php/Main_Page#Debian.2FUbuntu"
-
 	fi
 }
diff --git a/sys-apps/qdirstat/Manifest b/sys-apps/qdirstat/Manifest
index 3cfcefee8dd7..453b5133881e 100644
--- a/sys-apps/qdirstat/Manifest
+++ b/sys-apps/qdirstat/Manifest
@@ -1,5 +1,3 @@
-DIST qdirstat-1.6.1.tar.gz 7708491 BLAKE2B e6a92f93c76de0f602a66409a2701cd06f1744ab67c3c829938695f1d59b7244998d3a6ddd9d6cfc6408db3ac98d355f4496348ebd198c93ea345b33414c3048 SHA512 fd4c6a3582184785d935e96e884cc3e2033e3ee174ea893816b14524c5c5c62923c5a8c5869969fb8b1d0e84bbffd9dc707a68bdb53898c55dfd14fe16946110
 DIST qdirstat-1.7.tar.gz 8057173 BLAKE2B 7de2d74933dcce190240569ca043faf76925592576016090498ae21d2074a79aa9b1313fa491c270d5a841238cb35007a85ca3de9c343a353b3de9235f9e5032 SHA512 9af03c110663eab0df48f69f7d949421feebfdca1299205d25a216587cf2c9e472cbe99ad98f3cd6c783be2b02e0308cdbc2f5549bf662b3061ff5e059317b01
-EBUILD qdirstat-1.6.1.ebuild 888 BLAKE2B da8431858fe360acbe63f7718543318e69e1baaf6db4f245b3bf702aa4c875739f95b1138fbb20d3a11e45eca732d77ccfad8ee15b5de5a34f32140819191f1c SHA512 dd7f0e026558f3a30cc01c076bb4651d019fe62bc31a5ffd1e98a53df4f3c823ead8328c6a2cc346eb5a0ecc3e201d5684587ef6489f4da3aebc257f15fe17a3
-EBUILD qdirstat-1.7.ebuild 890 BLAKE2B d5cfa2cb6e00b037ab1c4a4636a3762430d267679a84c136b27a0b96f8991fdd2bef3ab5f4da1877787abdc7b0f072307babf613bd990a233f79c9813951f294 SHA512 5d861861b1e133c032dacb7cae0e8a705136c118f4c25a5f2c037969de2f94f02344c301068b1c596db6c3b38fbab1c299dd9a8196883347fc9cb422ef9a0941
+EBUILD qdirstat-1.7.ebuild 888 BLAKE2B da8431858fe360acbe63f7718543318e69e1baaf6db4f245b3bf702aa4c875739f95b1138fbb20d3a11e45eca732d77ccfad8ee15b5de5a34f32140819191f1c SHA512 dd7f0e026558f3a30cc01c076bb4651d019fe62bc31a5ffd1e98a53df4f3c823ead8328c6a2cc346eb5a0ecc3e201d5684587ef6489f4da3aebc257f15fe17a3
 MISC metadata.xml 882 BLAKE2B 9ed3f6470fd94b9376ea810069b63aefae3a0347a7f46be4f1c7c17425082b4b464fc2a5e4b4246d0e6a7a0d0e88f74173593b94ef01721b85990ea59f9ad145 SHA512 606dbdffa7732dbafde3151554b62d7879de5861c0647d21876d6ce4198d63c9413256af2c380ca517e6b148f9e0ecee0c092aa6e3bb47bc972124043508edbf
diff --git a/sys-apps/qdirstat/qdirstat-1.6.1.ebuild b/sys-apps/qdirstat/qdirstat-1.6.1.ebuild
deleted file mode 100644
index 1417eaf6d6f7..000000000000
--- a/sys-apps/qdirstat/qdirstat-1.6.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Qt-based directory statistics"
-HOMEPAGE="https://github.com/shundhammer/qdirstat"
-SRC_URI="https://github.com/shundhammer/qdirstat/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-"
-
-RDEPEND="
-	${DEPEND}
-	dev-lang/perl
-	dev-perl/URI
-"
-
-src_prepare() {
-	default
-
-	# Fix QA warning about incorrect use of doc path
-	sed -e "/doc.path/s/${PN}/${PF}/" -i doc/doc.pro doc/stats/stats.pro || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}" install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/sys-apps/qdirstat/qdirstat-1.7.ebuild b/sys-apps/qdirstat/qdirstat-1.7.ebuild
index e4bae2ee165e..1417eaf6d6f7 100644
--- a/sys-apps/qdirstat/qdirstat-1.7.ebuild
+++ b/sys-apps/qdirstat/qdirstat-1.7.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/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 9833c0f65e82..711b957234e9 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -1,9 +1,7 @@
 AUX smartd-r1.rc 614 BLAKE2B ec80520e3c8762e39d89eadc63e16bb9d9d4f7dec84507faeba692cfcf106557047ce4ecb2756addff2800f75ae2d550e209a83d1399484f7c1bf1c7f7f859b9 SHA512 7a46212d2d76b335ac7470b51b44e40b1cdd4814e5db4a8a2f013803bb40ea5072fde64590ffd51754b03a6f80a43e835605a5bb3ac2c23e456633995191ec31
 AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6cc0ccba2baaff7cf48acffea0a4becb47d470c691855a046617d3f8e934eeebd54df7030ef4877 SHA512 ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437
 AUX smartmontools-update-drivedb 42 BLAKE2B d3a501dc6a3855bd665a16ce0f105269754a29450201f312369acdbf429c8e0c7c4162de8854ca945b2082cb734dbbbb1326df39e4fb1adf271f215329bd2105 SHA512 8ad70fc85ab67b7c32eda95dd37517382c2447862df08b810a54dcdedb1eb8148f3a0e29f402a54adff31d1e88d80d09a258ed9e1e13b597ab2a358ebeda0ce8
-DIST smartmontools-7.0.tar.gz 944925 BLAKE2B 41b3894efa05471bf358fca4ba87a765e3a54df68c9a617804a9e0853752c57b68fdbaa9d55fa1462a8fa7de1d6cb5630c66929dfe521be38b180944cb80acc9 SHA512 96e18a201182579f699d541539ce393e7bc2191e027cfdf7f87455a63da3a14451574f8fe391232047ac941ace453a017193d0a4987a4edb8f7ed9d5007f0512
 DIST smartmontools-7.1.tar.gz 971468 BLAKE2B de3e1b10997903cb9bf6107f1bd1be9587b66af08a94e368dc9ed3aa6d69ba93d6b41d1ba60076275603702d9d0b47b26e376d3c9f020eb18fde5af4b686485b SHA512 440b2a957da10d240a8ef0008bd3358b83adb9eaca0f8d3e049b25d56a139c61dcd0bb4b27898faef6f189a27e159bdca3331e52e445c0eebf35e5d930f9e295
-EBUILD smartmontools-7.0-r1.ebuild 4043 BLAKE2B aa6843fd2cd9786c924dea796f049d0a42f48ce729edc0943ec14e8423324b9e4e47c1bc7466eabb1229b4549986d5095eb9bd86e8c312abb759413205941ac5 SHA512 832a7a4c357a1cf035692bc86f5f4ddf16b86f4c218fa02edc49aa2c62020c7a2709329e81ccdd67dc84c430d286a5a53c02ced25bc021864fec806cb0f83718
 EBUILD smartmontools-7.1.ebuild 4043 BLAKE2B aa6843fd2cd9786c924dea796f049d0a42f48ce729edc0943ec14e8423324b9e4e47c1bc7466eabb1229b4549986d5095eb9bd86e8c312abb759413205941ac5 SHA512 832a7a4c357a1cf035692bc86f5f4ddf16b86f4c218fa02edc49aa2c62020c7a2709329e81ccdd67dc84c430d286a5a53c02ced25bc021864fec806cb0f83718
 EBUILD smartmontools-9999.ebuild 4050 BLAKE2B a8ce8d55bcf3dda65d4e31f71feedc4f867a985e74dccdb4da9aff8e7cbfc80db1bbd7aeacb3809f154507ac4aa05b40fde8e865182169733cdb6dd1fc3dd058 SHA512 b84bddbec5e896f9fa60600d5a60c142ec6b23482fbf8239bb74297eab20c231850aa2c63cfd6b2a3be29db7f278417d7eed72e0f43cf4556628a53d1051220f
 MISC metadata.xml 628 BLAKE2B 1998d18fb38795b682ec935d8e994a93176e6bff49db77adcfc6a168e297515b7ac6a121b1acbb0743182d7dd4696b898cf6a8eeda0a290e0c75598036ef4951 SHA512 86ac56fbb2b15c7c4fa4e80607b5a3ceefd7300ade482d6d6adaf8e22c7a95797e10b1a03aacb34cf07c02e7d0fbd8437954d1c94c395afedc1c61c24202e3d6
diff --git a/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild b/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
deleted file mode 100644
index bca8212f62bd..000000000000
--- a/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools flag-o-matic systemd
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://svn.code.sf.net/p/smartmontools/code/trunk/smartmontools"
-	ESVN_PROJECT="smartmontools"
-	inherit subversion
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
-HOMEPAGE="https://www.smartmontools.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps +daemon selinux static systemd update_drivedb"
-
-DEPEND="
-	caps? (
-		static? ( sys-libs/libcap-ng[static-libs] )
-		!static? ( sys-libs/libcap-ng )
-	)
-	selinux? (
-		sys-libs/libselinux
-	)"
-RDEPEND="${DEPEND}
-	daemon? ( virtual/mailx )
-	selinux? ( sec-policy/selinux-smartmon )
-	systemd? ( sys-apps/systemd )
-	update_drivedb? (
-		app-crypt/gnupg
-		|| (
-			net-misc/curl
-			net-misc/wget
-			www-client/lynx
-			dev-vcs/subversion
-		)
-	)
-"
-
-REQUIRED_USE="( caps? ( daemon ) )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	# The build installs /etc/init.d/smartd, but we clobber it
-	# in our src_install, so no need to manually delete it.
-	myeconfargs=(
-		--with-drivedbdir="${EPREFIX}/var/db/${PN}" #575292
-		--with-initscriptdir="${EPREFIX}/etc/init.d"
-		#--with-smartdscriptdir="${EPREFIX}/usr/share/${PN}"
-		$(use_with caps libcap-ng)
-		$(use_with selinux)
-		$(use_with systemd libsystemd)
-		$(use_with update_drivedb gnupg)
-		$(use_with update_drivedb update-smart-drivedb)
-		$(usex systemd "--with-systemdsystemunitdir=$(systemd_get_systemunitdir)" '')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local db_path="/var/db/${PN}"
-
-	if use daemon; then
-		default
-
-		newinitd "${FILESDIR}"/smartd-r1.rc smartd
-		newconfd "${FILESDIR}"/smartd.confd smartd
-	else
-		dosbin smartctl
-		doman smartctl.8
-
-		local DOCS=( AUTHORS ChangeL* COPYING INSTALL NEWS README TODO )
-		einstalldocs
-	fi
-
-	if use update_drivedb ; then
-		if ! use daemon; then
-			dosbin "${S}"/update-smart-drivedb
-		fi
-
-		exeinto /etc/cron.monthly
-		doexe "${FILESDIR}/${PN}-update-drivedb"
-	fi
-
-	if use daemon || use update_drivedb; then
-		keepdir "${db_path}"
-
-		# Install a copy of the initial drivedb.h to /usr/share/${PN}
-		# so that we can access that file later in pkg_postinst
-		# even when dealing with binary packages (bug #575292)
-		insinto /usr/share/${PN}
-		doins "${S}"/drivedb.h
-	fi
-
-	# Make sure we never install drivedb.h into the db location
-	# of the acutal image so we don't record hashes because user
-	# can modify that file
-	rm -f "${ED%/}${db_path}/drivedb.h" || die
-
-	# Bug #622072
-	find "${ED%/}"/usr/share/doc -type f -exec chmod a-x '{}' \; || die
-}
-
-pkg_postinst() {
-	if use daemon || use update_drivedb; then
-		local initial_db_file="${EROOT}/usr/share/${PN}/drivedb.h"
-		local db_path="${EROOT}/var/db/${PN}"
-
-		if [[ ! -f "${db_path}/drivedb.h" ]] ; then
-			# No initial database found
-			cp "${initial_db_file}" "${db_path}" || die
-			einfo "Default drive database which was shipped with this release of ${PN}"
-			einfo "has been installed to '${db_path}'."
-		else
-			ewarn "WARNING: There's already a drive database in '${db_path}'!"
-			ewarn "Because we cannot determine if this database is untouched"
-			ewarn "or was modified by the user you have to manually update the"
-			ewarn "drive database:"
-			ewarn ""
-			ewarn "a) Replace '${db_path}/drivedb.h' by the database shipped with this"
-			ewarn "   release which can be found in '${initial_db_file}', i.e."
-			ewarn ""
-			ewarn "     cp \"${initial_db_file}\" \"${db_path}\""
-			ewarn ""
-			ewarn "b) Run the following command as root:"
-			ewarn ""
-			ewarn "     /usr/sbin/update-smart-drivedb"
-
-			if ! use update_drivedb ; then
-				ewarn ""
-				ewarn "However, 'update-smart-drivedb' requires that you re-emerge ${PN}"
-				ewarn "with USE='update_drivedb'."
-			fi
-		fi
-	fi
-}
diff --git a/sys-apps/syslog-notify/Manifest b/sys-apps/syslog-notify/Manifest
index 704013c1219c..010074c8c53b 100644
--- a/sys-apps/syslog-notify/Manifest
+++ b/sys-apps/syslog-notify/Manifest
@@ -1,3 +1,3 @@
 DIST syslog-notify-0.2.tar.bz2 77178 BLAKE2B 6b4b723da297c12d26ab1fc169a5360552db5796e82359137de451d34a5914673052f46b066dccdf2ca3de4c1ddc03ecfcc445efcfbff2106f4d77735c8acf16 SHA512 724696d9ecfe34ebea5cd37d122b1151a376fc57d747b4f3bf35ab897a9afddd5565dd174c9c576ba10c8441cd57cdf48141d0dab5b35c5ab27e766d10d27b6b
-EBUILD syslog-notify-0.2.ebuild 979 BLAKE2B 374a385e0fbc6e04aa8dbc6bfc33a7860f29e0c7e80ce5bbca93ac639c291a93cf696ce2a86f5a7199605d5918859dbf37cebd8dfd8d1dcb108262aeba6c1f91 SHA512 61a887a00a2419f24ce278d7bb4a009595f146de8cb7a68047686140e744a4c9d397dfc7af21ab5ee51950e0d5690d1113b52ff38b348fa5fe12ee831d2f2e58
+EBUILD syslog-notify-0.2.ebuild 970 BLAKE2B ba01791884d8abc44d892d869f82c2e28bf7c128d1b64c9f36cccab6a792a240a2b5355cb86a2eff7c8fff5c2545bb1125a552ae5b23f6ff94eccc06923d7da8 SHA512 520d3acaae859c2448c814830d02d33bef57a43101d04b9787ba150bba7bca2932c9483c0086f48fc710d1442c098e9dc4f9e23af83c83ce47db3b0098966694
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-apps/syslog-notify/syslog-notify-0.2.ebuild b/sys-apps/syslog-notify/syslog-notify-0.2.ebuild
index 35fc40806b20..c77dd707397c 100644
--- a/sys-apps/syslog-notify/syslog-notify-0.2.ebuild
+++ b/sys-apps/syslog-notify/syslog-notify-0.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit readme.gentoo
+EAPI=7
+
+inherit readme.gentoo-r1
 
 DESCRIPTION="Notifications for syslog entries via libnotify"
 HOMEPAGE="https://jtniehof.github.com/syslog-notify/"
@@ -11,26 +12,29 @@ SRC_URI="https://github.com/downloads/jtniehof/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 DEPEND=">=x11-libs/libnotify-0.7"
-RDEPEND="${DEPEND}
-	|| ( app-admin/syslog-ng app-admin/rsyslog )"
+RDEPEND="
+	${DEPEND}
+	|| (
+		app-admin/syslog-ng
+		app-admin/rsyslog
+	)"
+
+src_install() {
+	default
+	dodoc HACKING
+
+	dodir /var/spool
+	keepdir /var/spool
 
-pkg_setup() {
-	DOCS="AUTHORS CHANGELOG HACKING README"
-	DISABLE_AUTOFORMATTING="yes"
-	DOC_CONTENTS="Add the following options on your /etc/syslog-ng/syslog-ng.conf
+	local DISABLE_AUTOFORMATTING="yes"
+	local DOC_CONTENTS="Add the following options on your /etc/syslog-ng/syslog-ng.conf
 file:
 #  destination notify { pipe("/var/spool/syslog-notify"); };
 #  log { source(src); destination(notify);};
 
 Remember to restart syslog-ng before starting syslog-notify."
-}
-
-src_install() {
-	default
-	dodir /var/spool
 	readme.gentoo_create_doc
 }
 
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 9271af6957c0..e4316c4d6cd9 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -5,7 +5,7 @@ AUX 0.88-protos-ipv6.patch 2127 BLAKE2B fbef8e74c8ea24246db9d09e26c4b3e4af50ce8f
 AUX 0.88-protos-no-ipv6.patch 671 BLAKE2B d0c052a53833d9034b92d6ace244aad487c30c17fec5778b9df474aed9de194e92061f496216c50667da41b9dbbf88c8ef439ebbdb0be3c4001fba16425ef3f5 SHA512 56557365c1951e437b6a6b0b8c80d865adc16e2d1fb464a85b367af2d43fbce99e64a6e5a6c8fd4aa0cff53025db6c1ed25458f96316b3c51189d20c5688c0ed
 AUX 0.88-protos-rblspp.patch 214 BLAKE2B aaa6b2ff1e2acd5caf753b4621bd0d662fb17ccd264bc780823961829395e53157efbbf91cb953043f6a0d8f370cffcc6b970dac0225dade03ddc324c218e3ba SHA512 f207ff2e03a0d2088b4a00ff224cc4678fbb2bee7289d6d9cc1b8034cdbc7013f3e94a336694ddf6ec599bc86c799caeb1e194f2e44598add909b9ffe37436f1
 AUX 0.88-protos.patch 12339 BLAKE2B 6998ab4d53f709df7d0c6052f7e17318c956ee19cdb40f3e293272e6103600b7de55d70b22d9d027983a997f0ad1de6d7472e6911aaf83af2d471f3fa70fc64c SHA512 af68c2307a1246d1854662a8ee2bcb60d40ff78b8619f62399739d252588152a896ca3955951908b635a5e04ffc17021c06a9b58eea95101afc8104f13f33fea
-AUX 0.88-rblsmtpd-ignore-on-RELAYCLIENT.patch 462 BLAKE2B 6110b577bccf0818de47f6fb357e8151c3d912816d0b8d51706e50b942768a2a93e5339e48713cd7b57e534e8838c4254e80cf94ee29f96c240bbcdb4f28befd SHA512 7570d0d59f90b55966070e2b63b53d4e354a5261de5b4297d8529a8abe2d337980e5f583c7dca5a73f94841be2456cbfdd06f52b3842042d24239ae9831b7555
+AUX 0.88-rblsmtpd-ignore-on-RELAYCLIENT.patch 392 BLAKE2B 14f87e385d673b79bfdab44f86cdbf6163aaa11771d1a28b0b6dd669712a60f4825a9f499f4376a39a947e3fc00d47a837ca65d70c763529817e3e7792bea38e SHA512 6d9229011dca513bd2524da52bea06fb6b18fc38ecb99c9885f04d8ebb1221d5df59398363d34d322592f68979eec3f7cd1c095cc88dfd31ee81a19105624fc4
 AUX 0.88-tcprules.patch 483 BLAKE2B 851f22f3064237c94c6e1939a2c3d46fb3e937afc8a7f139b0ff4e99894a16c33f96bcb87fc3a012249f145e74e1e4f6d067e6c63335271a7a8ab326742606ce SHA512 94f83a23de742695c77ea05cf88ef0a1215d6bade587951104b70693a1217c0a2e2e1dc519e4b1c5abad03324fb3d42cc13adb6f15c9455869d5ed6417db4f8a
 AUX 0.88-uint-headers.patch 3100 BLAKE2B b3ae425066a313b58cbd95a977b3dd08134b469f2b3393d2713a3b500af96b5556f9e1d458d39446aeb0dae2734b9553b184453d7f5ac780c796d5300437d5dc SHA512 515ab4a81a420697b955578986f544bec082ca42a4384d7795f26e197d6948ded810862d500536ce431e2e7e8dccc8874ffc38c0f1fdea193e9c9e843535f5f6
 AUX tcprules-Makefile 168 BLAKE2B a2fcda7ef405c4c588d7b97815f21e8188d7f0d8d28a8dd28e52c58aaa32d314c3c2ccb8bfc3b24948aed8a679af3974bbc0d446a0ad7eafc115d0a4c578b26c SHA512 b119ef421dee61a939cb05407481d5a9c109c88cca86271c045d27a5c1b22f2cb73cd28d541d17bca6b13ab6f50c568be95fa8d4554a11a7b29653947a006a18
@@ -14,5 +14,5 @@ DIST ucspi-tcp-0.88-ipv6.diff19.bz2 22632 BLAKE2B 8fdab5cfc82151adaf85d1ea611c57
 DIST ucspi-tcp-0.88-man.tar.gz 7562 BLAKE2B 8b6326665cb48dd37683a50f3fe4cb65eb2fe3c28dc90ed1461b5bd878e7a7713f01d654d7d93df63e3f7a113baa4b6abfb6eeb65fdfb820051192b36070eccc SHA512 e779d6d6b24a3af0edc362def229c657c704143e5f1dfba8d16d26b3e6bcacb9c8ceaabcccac61485a4719221c144bc0c36ebca5182985dca85a6d72101d4146
 DIST ucspi-tcp-0.88-rblspp.patch 6565 BLAKE2B abf13c4c7cc25d555c57e29e45ead89340f01c5ddee4cc27a7acfdfd51f1dfae441d3b82b79d792f6acbc78b4d82843f5af34f0a166f4b7eeee44711cd39b26a SHA512 f3212d9d3bb59ec3b1f2b2bd09a80dce1eeeaf082dea68f18350a3aef818ef221eccfeb4dc7afff5c3f9e59003ec40f5e37fff86a2a5ab3145be1fe81297c990
 DIST ucspi-tcp-0.88.tar.gz 53019 BLAKE2B 3327de31e225c851b43e40ae9d8c5e4d3b93e2c15ed6ef993ad9f4105d60f322c56797c45a37363258e7cd9a8d52a315d6a8d65686c5cd45d4be19781e40c233 SHA512 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
-EBUILD ucspi-tcp-0.88-r18.ebuild 2113 BLAKE2B aef5686acae0350e90d76ce242e431b7da8e65bd571fe6376134606e09474319d0e662ae90c0bbc1d2466db8bb6638cc184e7bff95e35c3ddb94a0cb0d063004 SHA512 f00b6bf180ee3c95802c4942f4993adffa6668c89e83b0d99aec2094e9eff00da4d93c23fa620326458e29fc6be07c173fc334ca6ff95e0f7d6b9b0365db1f78
+EBUILD ucspi-tcp-0.88-r18.ebuild 2091 BLAKE2B 3dd566fd5a8d3d82fde9fdc1080e8bad38f589dcde7cc31f0922ba0f18e5717ee860b18164456274bc3e107e7fb71fd72621397613db1522d7652c768b5df119 SHA512 788f9e2c05fd559ab024bc6f726d7dbfd349c6e3fb69df678986619dc75632feddc69a3e009f3b6522d5377e28e625219b823cfce7984f51dddbfbcdcc224e96
 MISC metadata.xml 600 BLAKE2B eee72034e2adba51553bf32dd54e0ec2026a97fd709cc828f28e22525dc66cbff4bdc8801f7c5b4fa655fdbd682ceeb71639f22094b96150cca02f7db538554a SHA512 8cc6d3b8383d604b971b5cfd48060d5190269beacd1060ca279cb5eb0defc54e36fd1972ccecdff5f3fa912ca0a80e177433226876ba72158e93a5a6c1cadffa
diff --git a/sys-apps/ucspi-tcp/files/0.88-rblsmtpd-ignore-on-RELAYCLIENT.patch b/sys-apps/ucspi-tcp/files/0.88-rblsmtpd-ignore-on-RELAYCLIENT.patch
index cd75a71000c7..ccf6341a4885 100644
--- a/sys-apps/ucspi-tcp/files/0.88-rblsmtpd-ignore-on-RELAYCLIENT.patch
+++ b/sys-apps/ucspi-tcp/files/0.88-rblsmtpd-ignore-on-RELAYCLIENT.patch
@@ -1,5 +1,5 @@
---- rblsmtpd.c  2005-01-30 16:28:09.000000000 +0100
-+++ rblsmtpd.c  2005-01-30 16:30:52.000000000 +0100
+--- a/rblsmtpd.c
++++ b/rblsmtpd.c
 @@ -195,6 +195,7 @@
  {
    int flagwantdefaultrbl = 1;
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
index ac0979eeb274..55e72e8ade08 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils qmail toolchain-funcs
+inherit qmail toolchain-funcs
 
 DESCRIPTION="Collection of tools for managing UNIX services"
 HOMEPAGE="https://cr.yp.to/ucspi-tcp.html"
@@ -12,8 +12,7 @@ SRC_URI="
 	mirror://qmail/ucspi-rss.diff
 	http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
 	http://xs3.b92.net/tomislavr/${P}-rblspp.patch
-	ipv6? ( https://www.fefe.de/ucspi/${P}-ipv6.diff19.bz2 )
-"
+	ipv6? ( https://www.fefe.de/ucspi/${P}-ipv6.diff19.bz2 )"
 
 LICENSE="public-domain"
 SLOT="0"
@@ -21,30 +20,29 @@ KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd6
 IUSE="ipv6 qmail-spp selinux"
 RESTRICT="test"
 
-DEPEND=""
-RDEPEND="${DEPEND}
+RDEPEND="
 	!app-doc/ucspi-tcp-man
 	selinux? ( sec-policy/selinux-ucspitcp )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-protos.patch
+	eapply "${FILESDIR}"/${PV}-protos.patch
 	if use ipv6; then
-		epatch "${WORKDIR}"/${P}-ipv6.diff19
-		epatch "${FILESDIR}"/${PV}-protos-ipv6.patch
-		epatch "${FILESDIR}"/${PV}-tcprules.patch #135571
-		epatch "${FILESDIR}"/${PV}-bigendian.patch #18892
+		eapply "${WORKDIR}"/${P}-ipv6.diff19
+		eapply "${FILESDIR}"/${PV}-protos-ipv6.patch
+		eapply "${FILESDIR}"/${PV}-tcprules.patch #135571
+		eapply "${FILESDIR}"/${PV}-bigendian.patch #18892
 	else
-		epatch "${FILESDIR}"/${PV}-protos-no-ipv6.patch
+		eapply "${FILESDIR}"/${PV}-protos-no-ipv6.patch
 	fi
-	epatch "${DISTDIR}"/ucspi-rss.diff
-	epatch "${FILESDIR}"/${PV}-rblsmtpd-ignore-on-RELAYCLIENT.patch
-	epatch "${DISTDIR}"/${P}-rblspp.patch
-	epatch "${FILESDIR}"/${PV}-protos-rblspp.patch
-	epatch "${FILESDIR}"/${PV}-large-responses.patch
-	epatch "${FILESDIR}"/${PV}-uint-headers.patch
-	epatch "${FILESDIR}"/${PV}-ar-ranlib.patch
+	eapply "${DISTDIR}"/ucspi-rss.diff
+	eapply "${FILESDIR}"/${PV}-rblsmtpd-ignore-on-RELAYCLIENT.patch
+	eapply "${DISTDIR}"/${P}-rblspp.patch
+	eapply "${FILESDIR}"/${PV}-protos-rblspp.patch
+	eapply "${FILESDIR}"/${PV}-large-responses.patch
+	eapply "${FILESDIR}"/${PV}-uint-headers.patch
+	eapply "${FILESDIR}"/${PV}-ar-ranlib.patch
 
-	epatch_user
+	eapply_user
 }
 
 src_configure() {
@@ -53,7 +51,7 @@ src_configure() {
 	# See also the patch above for generating the "makelib" script.
 	tc-export AR RANLIB
 
-	echo "${EPREFIX}/usr/" > conf-home
+	echo "${EPREFIX}/usr/" > conf-home || die
 }
 
 src_install() {
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 0e328397059c..f564b55a4a33 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,8 +1,3 @@
-AUX usbutils-010-fix-py3-support.patch 4251 BLAKE2B 46cb941e30da1b3b9f1a346bba5815485b6423578175b999a57475e6e2d917da9ce4a80943c74b84ce8488d6cbf1461010d4866d5e4813945e04d8b5aa0b5e8c SHA512 652824dcea10591ba74769703f60f49a3fb592e7cd5435756804c200cee45e9c9a818c6d6a4d3b315ba3b9e2dfa7314f94f870b2da768f6e887348b1aa5597f6
-DIST usbutils-009.tar.xz 309608 BLAKE2B bb5d7f756241377e81aa8f5b074bb0ba36bc778698afaebf7054cdb153149e4f3808a7b172019434756cae8b33410643cd6a03a36277f80ead9b0f4446385fd9 SHA512 e5936a42615690c13e618655fc5eb4f414d9a84f85b860eaeb3bcf737258e05d299b09d1c5388d50c718626036ec8cac5d670ad567ceadfaab85f401f0744a8a
-DIST usbutils-010.tar.xz 308344 BLAKE2B 5f0ba85564acaf60faad0e187e7ed5c870056cf80a1e1ae888fa498429a7a9e28eaced49047f8f793bad3c59f3b515557054860286b17d9f89f915d0db5943cc SHA512 8bc197307bc34b38c406c58c939be32f0b20ce9d3e7c977472fe4c3d47e791765432e381fd8d7393df621bbd4bf159ca24a08b22441770e7ae464e767f99a2e3
 DIST usbutils-012.tar.xz 98388 BLAKE2B a19d64edeb08bafe3e6a0d6be7cb5196cebb68623cfb5cd21941f109a3f3def774382bc6fe8b68398278e530417190030c8dd39ab982c088329c7acbb36cb672 SHA512 e26a60229e6eed5de670d6511dd1fa5ee3453cc5a848820531b46a1678b69378a2a45c29e24a218a8e7065c2c345356f03a2992f8298ddae6c8026d181f8de66
-EBUILD usbutils-009.ebuild 1140 BLAKE2B b2ab8316a9ba8533af0322eca801c939465dae972186d3ffb21cdd3ce351c6cc39264e113d095248df4509c489e1faed52e2f17477ddc71bd1924f4c1bce40d3 SHA512 c549f4aa39fa1755bdbd769647c27c33a7549b6c5540dc8271ae81106aaf5f245b25e72868b8d69389c1525bafab5b407c92053a944887ca8db7476caacae2d8
-EBUILD usbutils-010-r1.ebuild 1242 BLAKE2B 9cb5866ec3bcac85a2e3d90e24e231fa26e67f8b16c6ee25811c610d08d1775a3bb2be31478cccbfca6f1b47eb75844ab0edf5f3f8710416b530a9e0f2e7fc0e SHA512 1a39ed7991b7fca60df33a157e4d27f81acac49184bb7287579849e3bdba086f1187caa9bf6da63e2d85d8e0911a9803b2cfd6ab51f1027587dd0adc4e5d256a
 EBUILD usbutils-012.ebuild 1198 BLAKE2B f0952377a3e94cde2e205ad0d47c78459ec7a623230233fd6c8d49f3925e9a4c163892e798008879cb51a8b0df99957bd58e94f8ee5518715879011e419e1d27 SHA512 f55e68020504640468567e54cf41fe8c526135f73c16f6c8b6dcb214a550c8f76412035739ddd2f1d62d5bece2d8ef25cfa5ddecb20e3f3aedfb8a79cfe69dbb
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/usbutils/files/usbutils-010-fix-py3-support.patch b/sys-apps/usbutils/files/usbutils-010-fix-py3-support.patch
deleted file mode 100644
index c95bb7321b85..000000000000
--- a/sys-apps/usbutils/files/usbutils-010-fix-py3-support.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From a7c25eadbc998bf359e5b7dac03aaea8c30d2932 Mon Sep 17 00:00:00 2001
-From: Georg Brandl <georg@python.org>
-Date: Thu, 17 May 2018 08:51:27 +0200
-Subject: [PATCH] lsusb.py: fix up Python 3 conversion
-
-- Use open() and ignore encoding errors
-- Replace removed __cmp__ by rich comparison methods
-- Convert commented-out print statements, remove unused future import
-
-Fixes #68
----
- lsusb.py.in | 50 ++++++++++++++++++++++----------------------------
- 1 file changed, 22 insertions(+), 28 deletions(-)
-
-diff --git a/lsusb.py.in b/lsusb.py.in
-index 0f4d318..083b512 100644
---- a/lsusb.py.in
-+++ b/lsusb.py.in
-@@ -12,8 +12,6 @@
- 
- import os, sys, re, getopt
- 
--# from __future__ import print_function
--
- # Global options
- showint = False
- showhubint = False
-@@ -53,15 +51,12 @@ class UsbClass:
- 		self.desc = str
- 	def __repr__(self):
- 		return self.desc
--	def __cmp__(self, oth):
--		# Works only on 64bit systems:
--		#return self.pclass*0x10000+self.subclass*0x100+self.proto \
--		#	- oth.pclass*0x10000-oth.subclass*0x100-oth.proto
--		if self.pclass != oth.pclass:
--			return self.pclass - oth.pclass
--		if self.subclass != oth.subclass:
--			return self.subclass - oth.subclass
--		return self.proto - oth.proto
-+	def __lt__(self, oth):
-+		return (self.pclass, self.subclass, self.proto) < \
-+				(oth.pclass, oth.subclass, oth.proto)
-+	def __eq__(self, oth):
-+		return (self.pclass, self.subclass, self.proto) == \
-+				(oth.pclass, oth.subclass, oth.proto)
- 
- class UsbVendor:
- 	"Container for USB Vendors"
-@@ -70,8 +65,10 @@ class UsbVendor:
- 		self.vname = vname
- 	def __repr__(self):
- 		return self.vname
--	def __cmp__(self, oth):
--		return self.vid - oth.vid
-+	def __lt__(self, oth):
-+		return self.vid < oth.vid
-+	def __eq__(self, oth):
-+		return self.vid == oth.vid
- 
- class UsbProduct:
- 	"Container for USB VID:PID devices"
-@@ -81,13 +78,10 @@ class UsbProduct:
- 		self.pname = pname
- 	def __repr__(self):
- 		return self.pname
--	def __cmp__(self, oth):
--		# Works only on 64bit systems:
--		# return self.vid*0x10000 + self.pid \
--		#	- oth.vid*0x10000 - oth.pid
--		if self.vid != oth.vid:
--			return self.vid - oth.vid
--		return self.pid - oth.pid
-+	def __lt__(self, oth):
-+		return (self.vid, self.pid) < (oth.vid, oth.pid)
-+	def __eq__(self, oth):
-+		return (self.vid, self.pid) == (oth.vid, oth.pid)
- 
- usbvendors = []
- usbproducts = []
-@@ -107,7 +101,7 @@ def parse_usb_ids():
- 	mode = 0
- 	strg = ""
- 	cstrg = ""
--	for ln in file(usbids, "r").readlines():
-+	for ln in open(usbids, "r", errors="ignore"):
- 		if ln[0] == '#':
- 			continue
- 		ln = ln.rstrip('\n')
-@@ -146,7 +140,7 @@ def parse_usb_ids():
- 
- def bin_search(first, last, item, list):
- 	"binary search on list, returns -1 on fail, match idx otherwise, recursive"
--	#print "bin_search(%i,%i)" % (first, last)
-+	#print("bin_search(%i,%i)" % (first, last))
- 	if first == last:
- 		return -1
- 	if first == last-1:
-@@ -233,7 +227,7 @@ def find_dev(driver, usbname):
- 	for nm in devlst:
- 		dir = prefix + usbname
- 		prep = ""
--		#print nm
-+		#print(nm)
- 		idx = nm.find('/')
- 		if idx != -1:
- 			prep = nm[:idx+1]
-@@ -404,8 +398,8 @@ class UsbDevice:
- 		try:
- 			self.nointerfaces = int(readattr(fname, "bNumInterfaces"))
- 		except:
--			#print "ERROR: %s/bNumInterfaces = %s" % (fname,
--			#		readattr(fname, "bNumInterfaces"))a
-+			#print("ERROR: %s/bNumInterfaces = %s" % (fname,
-+			#		readattr(fname, "bNumInterfaces")))
- 			self.nointerfaces = 0
- 		try:
- 			self.driver = readlink(fname, "driver")
-@@ -421,7 +415,7 @@ class UsbDevice:
- 		for dirent in os.listdir(prefix + self.fname):
- 			if not dirent[0:1].isdigit():
- 				continue
--			#print dirent
-+			#print(dirent)
- 			if os.access(prefix + dirent + "/bInterfaceClass", os.R_OK):
- 				iface = UsbInterface(self, self.level+1)
- 				iface.read(dirent)
-@@ -532,7 +526,7 @@ def usage():
- def read_usb():
- 	"Read toplevel USB entries and print"
- 	for dirent in os.listdir(prefix):
--		#print dirent,
-+		#print(dirent)
- 		if not dirent[0:3] == "usb":
- 			continue
- 		usbdev = UsbDevice(None, 0)
-@@ -590,7 +584,7 @@ def main(argv):
- 		fix_usbclass()
- 	except:
- 		print(" WARNING: Failure to read usb.ids", file=sys.stderr)
--		#print >>sys.stderr, sys.exc_info()
-+		#print(sys.exc_info(), file=sys.stderr)
- 	read_usb()
- 
- # Entry point
diff --git a/sys-apps/usbutils/usbutils-009.ebuild b/sys-apps/usbutils/usbutils-009.ebuild
deleted file mode 100644
index 9b1b0feb95f9..000000000000
--- a/sys-apps/usbutils/usbutils-009.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="USB enumeration utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/usb/usbutils/
-	https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="virtual/libusb:1=
-	virtual/libudev:="
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	sys-apps/hwids
-	python? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	use python && python_fix_shebang lsusb.py.in
-}
-
-src_configure() {
-	econf \
-		--datarootdir="${EPREFIX}/usr/share" \
-		--datadir="${EPREFIX}/usr/share/misc"
-}
-
-src_install() {
-	default
-	newdoc usbhid-dump/NEWS NEWS.usbhid-dump
-
-	use python || rm -f "${ED}"/usr/bin/lsusb.py
-}
diff --git a/sys-apps/usbutils/usbutils-010-r1.ebuild b/sys-apps/usbutils/usbutils-010-r1.ebuild
deleted file mode 100644
index 59ef967cc21b..000000000000
--- a/sys-apps/usbutils/usbutils-010-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit python-single-r1
-
-DESCRIPTION="USB enumeration utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/usb/usbutils/
-	https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="virtual/libusb:1=
-	virtual/libudev:="
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	sys-apps/hwids
-	python? ( ${PYTHON_DEPS} )"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-py3-support.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	use python && python_fix_shebang lsusb.py.in
-}
-
-src_configure() {
-	local myeconfargs=(
-		--datarootdir="${EPREFIX}/usr/share"
-		--datadir="${EPREFIX}/usr/share/misc"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newdoc usbhid-dump/NEWS NEWS.usbhid-dump
-
-	use python || rm -f "${ED%/}"/usr/bin/lsusb.py
-}
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index 8405a5a73e60..7a7a6c2509b1 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,5 +1,7 @@
 DIST xdg-desktop-portal-1.6.0.tar.xz 453516 BLAKE2B 13ffcb21de6b61ddeb0782dcfc7b684287e54f94b9494b19589178594d1383a15048b8f9aeed7fb1260c3a2c967b267061d1db401085a686938c8629de8824c3 SHA512 7a0c702851762a55326142cb6b470205775284e0f749620ae6b648f216afcd684f8b20500339680b42812f628634344c9e826ab7cf13dd918fdbf733381d44ce
 DIST xdg-desktop-portal-1.7.2.tar.xz 468140 BLAKE2B 6f2e92f79424f79e778db9c1bf94555332f1f88ef42f84e477c8784be74ce8e2cf924f34da5e17d78359bd493370dcee62aec77f60c9df5cf3475d745f3e4d8e SHA512 fac64281e89d8bf17c6f1b3751c159d9ca6c2896b71bb83622411bf2dc9b7813974d19902c81c3576b325c98edf4dae22ccc3fe290e32f717730b6aa3afbdc12
+DIST xdg-desktop-portal-1.8.0.tar.xz 470692 BLAKE2B f21da5ad11dc2b1611983fdac87335b3c7e9c13222bbe3b90b276d75726a6f16d950a9ba62606aa31d52f57b8d076393ec0d48014b1623ab03dee23c524ed0ef SHA512 6d9760b41447af711d5937279b0031bcc88947e11204351accfcd9e6e19e498e9021675753185f92f7bd40336decc1895968796b1b71508c7caf5f6fc32a51a4
 EBUILD xdg-desktop-portal-1.6.0-r2.ebuild 1058 BLAKE2B cc38d747768e44535808c0b0b3305299a978eb73a62ab1864f967d80a38edd3ead4ee340a36345b955b1f1ff77a1f037c563c6ddc6c2eb5bd61eaecb065eaeec SHA512 fcabc1a7d2da0d0ddadd790156439d806608b0b8d917bb531c78e54ffdef745d20e7e7c61c61f606e1df6888ea17652c55afbc303b77cba3ec8c6ff2be849f49
 EBUILD xdg-desktop-portal-1.7.2.ebuild 1020 BLAKE2B d3f2a4342dec9eda78075f9f883256a89ee8a528dc767aab1cc69f2bff64cf59fad5f2c4dea30a4d0cfe24deeb7dfb6bd87a360fb68e3d923c3b875f53fd5837 SHA512 96249acb7fac64ac9f95d9ac280cab1beee6f7ce6abe5b2cce96ab9ae06dbaa3d98456c030cdec79d07b4aa60a13f14f8e06e563feb249e5bd4ef9c82ba5048e
+EBUILD xdg-desktop-portal-1.8.0.ebuild 1020 BLAKE2B d3f2a4342dec9eda78075f9f883256a89ee8a528dc767aab1cc69f2bff64cf59fad5f2c4dea30a4d0cfe24deeb7dfb6bd87a360fb68e3d923c3b875f53fd5837 SHA512 96249acb7fac64ac9f95d9ac280cab1beee6f7ce6abe5b2cce96ab9ae06dbaa3d98456c030cdec79d07b4aa60a13f14f8e06e563feb249e5bd4ef9c82ba5048e
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0.ebuild
new file mode 100644
index 000000000000..e217ed6874fe
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="Desktop integration portal"
+HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal"
+SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="geolocation screencast"
+
+BDEPEND="
+	dev-util/gdbus-codegen
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	media-libs/fontconfig
+	sys-fs/fuse:0
+	geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
+	screencast? ( >=media-video/pipewire-0.3:= )
+"
+RDEPEND="${DEPEND}
+	sys-apps/dbus
+"
+
+src_configure() {
+	local myeconfargs=(
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+		$(use_enable geolocation geoclue)
+		$(use_enable screencast pipewire)
+		--disable-docbook-docs # flatpak not packaged
+		--disable-libportal # not packaged
+	)
+	econf "${myeconfargs[@]}"
+}