gentoo new year resync : 01.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
commit: 129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree: 53bf797418ac5e9b99c41ca0382c87b82421e5de /app-misc
parent: 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)
93 files changed, 347 insertions, 529 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 9ad4b2078f09..cc33b050234e 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index 77580f309815..2e1defca0b56 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -1,9 +1,5 @@
 AUX anki-2.1.0_beta25-web-folder.patch 498 BLAKE2B 5a89ac454e8b4c551c7593bc8d428f9512d1304bd7fd5aa9380a301d92f10ca126a1a319c2ec831d1d5be99c6941c4307a2b674f0a15d2d554b1443fdf053421 SHA512 779806afd6c0eaaac149c89bbe8da2394630aa5a611001307808339f29237b4d7f3db7e1f66241ef67e179a5ab96d64371e1b198044cd9f88389d03a5c9d8478
 AUX anki-2.1.15-mpv-args.patch 856 BLAKE2B 02c80c096ee3971cb781ea57ba8ebd63037c37668d57bef8d63f7c551544cd1eec04d134a835af5c918992172493a3b2933b6652e6872da2fe6bd6acb1bf6886 SHA512 ed44a965978dcb2ce85eab99adff59610c51614673415c7e34d1acdc77fa46e05c6b5eba6a4c3fda07ef5b3d3d5d1c9d844276377daff2189cbdf808168dd402
-DIST anki-2.1.0_beta27.tgz 4127906 BLAKE2B b4f83cc30dc3e89f3ca17c03ba8dcfc9a487de43d8ac564d5dc83488e286c302816c8a8140aa764b596404194c5f3727218deec303ef201ccaef38b945d8b32d SHA512 50b4ece1361ecafdfe08dad04e9b622b1e8ba2224bfef7e4660c95f81cb8f525d892170548d741ff53bc19ff4c13863f488a71c31c8328511fea3203d2c345f1
-DIST anki-2.1.13.tgz 4248906 BLAKE2B 82a2a9a556cbf3596af22a73a2865815561cdd408b249443fc7e144734fdc2b62317120db71475afd7b0d4027f19e53c47437132028ef78b158ec3624f54a33f SHA512 921ef48b16c0c8c83b85523aa0a5b828210b210cd51fa471f57e9aa6777a1aced30c7e24084ef0c2f14c9d846a19091923d13faaff7ed9075860fc23f8ba1cd3
 DIST anki-2.1.15.tgz 4269571 BLAKE2B 00b351f5ffacb363642e02bf806bcd7c0d9446c9815a75328e7fa37c848b271b135510de17cc012e8cc96d8a52a183a49de84b6f85f562a370255bd36c6f866e SHA512 f3acfa6ff62d43fa461efddd81a8570304ada53b97bd494fdbbe0a0439700d7a52aa62ead31cbaed731be0df96a6cc845a7cf92dcf65f3080dc63282fe5941c3
-EBUILD anki-2.1.0_beta27.ebuild 2219 BLAKE2B 76dcaf2ceb91906c74149db1559499628b86ce8a3491109da81d02a8c3eff1ecc94a4eb5cf06ce01e10aca4a6b2cc53bf71c962e3d607d7062face38f1dec2c6 SHA512 4261913d808ec9dae0f26b799f0a96fc8d225202626d9ee590fe3634b2d10f74514ba1a00401cf055a153251b243698c8463a05204e8baf0d528aae07da637b5
-EBUILD anki-2.1.13-r1.ebuild 2317 BLAKE2B d14f2116c5f2358160e80dcdfcd109dc0dd3c968cac8e5e5ed5ccf0047b87ebae804f7e68e0368a1f0504e590631b37e9590c1bd92bf7d66493b2bc44ad23075 SHA512 22cc7c60afeb37590c74bb7710e418a8cccf7efee418788cc4de06483ff053c2b50ce461229e1577834d47ee4099647da1212ad3e31d8dd76c64986782c98150
 EBUILD anki-2.1.15.ebuild 2457 BLAKE2B c51071cb2410c942151aeffb04f498b28e1dc6b3f374484666d83fb762a17fe0f0348cdb4f060e89e4264a6ece122016f32197664f0505d489082193e5685b2b SHA512 2062b2838acf885efc66def7d51dca61c8991de4d319bb3de18ce89bbc7159c99f5a4674b31e03fba7688f372250ee2b2eb703cbbe84dc96fafc24640828afba
-MISC metadata.xml 619 BLAKE2B a41d6e72dccb367627bfc34855a7f2dc657021907f1940c837ea99f134bf30cccb84157c6eea96944fee4e4d5275c329b5721abcabfb31b3a572b86789cd0ed2 SHA512 8b6656964a3c2cee9761b278839f31546a3fe2a4efd500cd015658af3502b548888e939bbeee45ead9c88632ade12c7f0ed33fcf8cdfc6d0ac91de63ac8bb351
+MISC metadata.xml 454 BLAKE2B 9091c22ed14f19081bd47325f7a6382d0f813e5cdfb30cf9d491cf5ee4aae41e2840906763ef8a53ac78a6f14dc1ec94e78706a15e25ddeb473659e543e21442 SHA512 c5d4ee3be496c6d9bdd299d843a65f14c02761a1c041cd6526f90c187db1843b696ac4eb41dbf778b060def3fc27e51a3ee4d9cd533b320d470badf001189be8
diff --git a/app-misc/anki/anki-2.1.0_beta27.ebuild b/app-misc/anki/anki-2.1.0_beta27.ebuild
deleted file mode 100644
index 9b0a46164d62..000000000000
--- a/app-misc/anki/anki-2.1.0_beta27.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1 xdg
-
-DESCRIPTION="A spaced-repetition memory training program (flash cards)"
-HOMEPAGE="https://apps.ankiweb.net"
-
-MY_P="${P/_/}"
-SRC_URI="https://apps.ankiweb.net/downloads/beta/${MY_P}-source.tgz -> ${P}.tgz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="latex +recording +sound test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		|| (
-			(
-				>=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
-				dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}]
-			)
-			<dev-python/PyQt5-5.12[gui,svg,webengine,widgets,${PYTHON_MULTI_USEDEP}]
-		)
-		>=dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
-		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
-		recording? (
-			media-sound/lame
-			>=dev-python/pyaudio-0.2.4[${PYTHON_MULTI_USEDEP}]
-		)
-	')
-	sound? ( media-video/mplayer )
-	latex? (
-		app-text/texlive
-		app-text/dvipng
-	)
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/updates=True/updates=False/" \
-		aqt/profiles.py || die
-}
-
-src_compile() {
-	:;
-}
-
-src_test() {
-	sed -e "s:nosetests:${EPYTHON} ${EROOT}usr/bin/nosetests:" \
-		-i tools/tests.sh || die
-	./tools/tests.sh || die
-}
-
-src_install() {
-	cp tools/runanki.system tools/anki
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-	doman ${PN}.1
-
-	dodoc README.md README.development
-	python_domodule aqt anki
-	python_doscript tools/anki
-
-	# Localization files go into the anki directory:
-	python_moduleinto anki
-	python_domodule locale
-
-	# not sure if this is correct, but
-	# site-packages/aqt/mediasrv.py wants the directory
-	insinto /usr/share/anki
-	doins -r web
-}
diff --git a/app-misc/anki/anki-2.1.13-r1.ebuild b/app-misc/anki/anki-2.1.13-r1.ebuild
deleted file mode 100644
index 9c1a33eea458..000000000000
--- a/app-misc/anki/anki-2.1.13-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1 xdg
-
-DESCRIPTION="A spaced-repetition memory training program (flash cards)"
-HOMEPAGE="https://apps.ankiweb.net"
-SRC_URI="https://apps.ankiweb.net/downloads/current/${P}-source.tgz -> ${P}.tgz"
-
-S="${WORKDIR}/${P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="latex +recording +sound test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		|| (
-			(
-				>=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
-				dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}]
-			)
-			<dev-python/PyQt5-5.12[gui,svg,webengine,widgets,${PYTHON_MULTI_USEDEP}]
-		)
-		>=dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
-		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
-	')
-	recording? ( media-sound/lame )
-	sound? ( media-video/mpv )
-	latex? (
-		app-text/texlive
-		app-text/dvipng
-	)
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/updates=True/updates=False/" \
-		aqt/profiles.py || die
-}
-
-src_compile() {
-	:;
-}
-
-src_test() {
-	sed -e "s:nose=nosetests$:nose=\"${EPYTHON} ${EROOT}usr/bin/nosetests\":" \
-		-i tools/tests.sh || die
-	sed -e "s:nose=nosetests3$:nose=\"${EPYTHON} ${EROOT}usr/bin/nosetests3\":" \
-		-i tools/tests.sh || die
-	sed -e "s:which nosetests3:which ${EROOT}usr/bin/nosetests3:" \
-		-i tools/tests.sh || die
-	./tools/tests.sh || die
-}
-
-src_install() {
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-	doman ${PN}.1
-
-	dodoc README.md README.development
-	python_domodule aqt anki
-	python_newscript runanki anki
-
-	# Localization files go into the anki directory:
-	python_moduleinto anki
-	python_domodule locale
-
-	# not sure if this is correct, but
-	# site-packages/aqt/mediasrv.py wants the directory
-	insinto /usr/share/anki
-	doins -r web
-}
diff --git a/app-misc/anki/metadata.xml b/app-misc/anki/metadata.xml
index b4fe64e7501a..1126ffd44c53 100644
--- a/app-misc/anki/metadata.xml
+++ b/app-misc/anki/metadata.xml
@@ -10,12 +10,4 @@
 		(such as words and phrases in a foreign language) as
 		quickly, easily and efficiently as possible.
 	</longdescription>
-	<use>
-		<flag name="recording">
-			Enable support for audio recording
-		</flag>
-		<flag name="sound">
-			Enable support for adding sound to cards
-		</flag>
-	</use>
 </pkgmetadata>
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index 0b173fd1f8ee..da3e48f2a1a6 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -1,3 +1,5 @@
 DIST byobu_5.130.orig.tar.gz 761162 BLAKE2B 8ad45f3f8cba9435638aced30022e67e927288ac7f7bcea7d464d248a3fa0edddf4716bf782d790b8ea75d249e86f19acb76aa706c875f525f1b3b1ae9c47321 SHA512 dae3d0de3f1a65e5f3a647c1135ecf89261bf2518fea44bb49e00109ba5e1e5a8939206bb85d97f45fa01482438b3bfcb6f9ddd03dbaa1a8caca807f95b279cf
+DIST byobu_5.133.orig.tar.gz 761655 BLAKE2B 796cfe22ba60a8cfe41ca6570e4c7f265dd249e7767086341903da7862037f39b1f49434b6dae36d12d82df1ee34306b815ff3f8e703eeedab79cf02e8d86a7d SHA512 4c0ef7a3b483e48c57f3e97dae1c7c77084797016efb677b201f2b56c6b9f4b771739d9a6d9a4fb612203a22e9fa460db80fde30c837b102ad830b1b2919db6c
 EBUILD byobu-5.130-r1.ebuild 992 BLAKE2B 87f095dbecf5f1a47e21b583e38c31807f73f98f4db939d3f35053cb8ca623a3014927123a88b6302d9d2246035cab4c5977d9f682379b3ade1c244d6445fd51 SHA512 049f7a3e3c4ec7c6dfde3136e0f1a51e9cd3a94dc3a68fb3281c810e928f43d9301e94a997924e95f76ba23c305b00ee57b2878f6fee0aef3a4bd46aff69e401
+EBUILD byobu-5.133.ebuild 1142 BLAKE2B cd8c20c61ed7863d10e40caf47541c0682e6b618db6b3e6d56696710cea39e44513b4df77e5cb3f137a1a9dd3c47133f33781b4ff754691f194bd53346f14f86 SHA512 cada16979270c5d52de586849e3f19306a37226116c411670bcf14a75240cf67de18c10ce7ef07a1a72bbe8b8eb46ba3d6c09d6e055d900a5d5331c35289593a
 MISC metadata.xml 981 BLAKE2B 8e3ed29634279b4fec3b92e5b192e4aaea2c3d8aeb29d1e29f03220d32f3c522d27fdcf8aa2fd601fb647c8ec41e1d56e5d1cb32c635070b516592cffdac9499 SHA512 6056ce18301ef9147fce0922c07ef455c416d75b78e23bc0aca9154e1765f167ebffbafc8e330f4878f0b575483131d417354f14e392568c91ef04087cf87d0b
diff --git a/app-misc/byobu/byobu-5.133.ebuild b/app-misc/byobu/byobu-5.133.ebuild
new file mode 100644
index 000000000000..f3913e0aafd0
--- /dev/null
+++ b/app-misc/byobu/byobu-5.133.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit python-single-r1
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="https://byobu.org"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="screen"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-libs/newt[${PYTHON_MULTI_USEDEP}]')
+	screen? ( app-misc/screen )
+	!screen? ( app-misc/tmux )"
+
+src_prepare() {
+	default
+
+	python_fix_shebang .
+
+	# Set default system backend to screen
+	if use screen ; then
+		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
+	fi
+}
+
+src_install() {
+	default
+
+	# It's easier than forcing autoconf
+	mv "${ED}/usr/share/doc/${PN}/"* "${ED}/usr/share/doc/${PF}/" || die
+	rmdir "${ED}/usr/share/doc/${PN}" || die
+
+	# Create symlinks for backends
+	dosym ${PN} /usr/bin/${PN}-screen
+	dosym ${PN} /usr/bin/${PN}-tmux
+
+	docompress -x /usr/share/doc/${PN}
+}
diff --git a/app-misc/c_rehash/Manifest b/app-misc/c_rehash/Manifest
index 240101a9afba..d6621ead9066 100644
--- a/app-misc/c_rehash/Manifest
+++ b/app-misc/c_rehash/Manifest
@@ -1,3 +1,3 @@
 DIST openssl-c_rehash.sh.1.7 4167 BLAKE2B fc501a74aec82f37c4c967434df208ac38fc9f7385db6e0bc90fa8d8aef2e5f71b40f0a40d59e2f8e57e9e8883251e4f977759fb484f4b4b6def14967789b55e SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da
-EBUILD c_rehash-1.7-r1.ebuild 999 BLAKE2B 31290f6f00b80048fc76e3d6b4a9b5e16b5e867f145c019e82f7a6c5a9c3d32b6bf22fc966c2d7ac56394fb7a68cfdcc90ce874172c0005bdbeafe261595fcd8 SHA512 a6179384d7b37ceb32f89ae4cbf0ce967ce48600934a2822077517390280591585177948b979245a759e6ecbcbda662f899a7b8a79c12d0da0d58e7533a5988a
+EBUILD c_rehash-1.7-r1.ebuild 979 BLAKE2B 36a816e6596853df6f2e1a410eac180a7a0573abbf204a66257c24ef2edb7cc1b61c974c5c6c9152d927803bc92a36dcf83ab23312a11ed75e95e188ccc93d1d SHA512 4042a1a7f67b3fa3ad828f934e52af3e9bd096dec32bf4428fe42292d3c3cb62422673d404565c9fb587807c88d47122564caefd6d6ad3409e33e4911c6d117d
 MISC metadata.xml 339 BLAKE2B d4fe9d24a3b12ddea1d503e6998c510bdbce33677cb45c3deab9c4de28a0c88d592d1357e9e7b029ad46d043095cdfe00e747dc63c1feccb5fab6c14d4459710 SHA512 611bcd575733b05ac99027ea49a79c29fa969eeccf75b12cfda6e77a42b2241e414951b25b089eeac7fd2255d42872b38c68fc5d004880b5dfe7a89c73e8f64c
diff --git a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
index 04e92b9aa0e8..e300a275d947 100644
--- a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c
 
 LICENSE="openssl"
 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 ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="!<dev-libs/openssl-1.0.2d-r1:0"
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 577e376822eb..3bd7053ebf8e 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -5,7 +5,7 @@ DIST nss-3.59.tar.gz 82141516 BLAKE2B 74959b14ec42b4628dfc3365af00420cdbd41d2025
 DIST nss-3.60.tar.gz 82035831 BLAKE2B fffc0e26d58d4625be1b8b0123f248a0c7994b18868ece534ba4d60131dd4897d075d7b2dba672c31ccd333e0c18ea384e2aa2f495c23b5430d6d10b91922873 SHA512 6463b2da28b5d9f1f20d45f77a3179e2b93c874af5742c7fc51eb7c44cef93270acacf79174dc63905f227256cbcee23a36f98f1cfed10dd5c56ffc0a76e2695
 DIST nss-cacert-class1-class3-r1.patch 22503 BLAKE2B d2ba6b5c3675484dab5b6709478101a9dadc0baded3dbf891dcd04e5eb912079b87cdd17f893a0f539a2a53fb05357c6dd309fb624facac3b021c82c7424a91f SHA512 68906d2442986ad13ebf9cd97c26fac34af3efd5cfaacb3d7824adad966349ad796c9cec8dec44c46d5c571df88ce83aea02ce82e71da337aa4e1aeef58eda66
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD ca-certificates-20200601.3.53.ebuild 6033 BLAKE2B 8e441c0dab72a630718ed0ecba44a3bf9298f4aaf673a259ba36b796234eaacd0db21bb4956321567ba01a7efd39a9c552498eb15e0b90f179a112db2182feb8 SHA512 ae0ffe155f7600d00226e40aa5fc0241b43eee08f19fb8711d3ae0fbf6fe38325400ac9d02e9f32716651a014c4cec157918edd00874f48e71a64b7dc2a3377c
-EBUILD ca-certificates-20200601.3.59.ebuild 6042 BLAKE2B dc40f5b0a90206e59290932f62e514298b9bc25d9dc100843623a16651b436c38bfce700572a82d1eab3969e32167cce3aaf389600d882143017272f17d789f4 SHA512 7c7d391b234c77e7827b5ce1b49327b3b246930dbbb11eee781a9b5c85d35f6d96f2fc1c9e72d9c2192237315afec627212c1cccb281d93b5d7e887059c12b42
-EBUILD ca-certificates-20200601.3.60.ebuild 6178 BLAKE2B d8fb5b666a1d3dcd0903e72c6b442df05a6b8131e3f035e2461b99996fecfc32e75bfcbd8cd1ff9281f49dce63737f352821fbc1137a38659c2870158f00436e SHA512 2b3db98fb0b0bda4038962ef4f754c31e0c08fffc6c011c019cb3a0b9b9876458b3baff0cc458a0fbaeda7af6e18a3ec04a952a40bfe3b9e9c924dc0d5252c4a
+EBUILD ca-certificates-20200601.3.53.ebuild 6013 BLAKE2B faa5351293ce1f3513296f7ddb78d9e792b0c2014d7c6fd7caf9806ba41847c391c1f3e053d75eef911afec77e8a9ad0674f1ae076da8a27d94a5af50b45ca0d SHA512 71333e3446888cad1b28103d0f0b3e019657087542b617d06e6eb8f6510a28f9e897fbc36101b36fbf90b5c147abb69b78c4b7785bb49dfdb6f04bfdbb20fc7c
+EBUILD ca-certificates-20200601.3.59.ebuild 6022 BLAKE2B ce5dda068cfec8010c2fd5e3b6059b5a8413c8be83dd6a8503ce499876e0e5b4707d52c56c3f25fdd63a4c76a6104c4fcff60aa61e6c1231ce6887c112f0c6fc SHA512 f9a1660e7f4d619ea27ed04873cf276188457732da592ada20bb30d7bba330a532c302f7ccc9d23c0eebeb051ade99783ec8dd1309f85798e1a37e2bb024825b
+EBUILD ca-certificates-20200601.3.60.ebuild 6158 BLAKE2B 028f68912e1a5efd7f328ae0c450c2f57976624ef2dd09d8bd400ad07a3771ebc221e181c1780b92d1091ee1179c88e4ead6554e815f1a5aa350300639176b7a SHA512 16a449c49a40df8544aaca94c106c39d6742731ac79c07495096bdc50744660d648e7d516c83790ee1c6fc7d061cf6eef6b0910e6adba2a28b1c5a591bfabb8b
 MISC metadata.xml 436 BLAKE2B f37fed732b387ea5e778bb88c349c78127b0db613def815d75e5cc2b7a7dbd049131eef33617fe3139975bd0c6bb187cf20e98c27e3ee10c3928b394fe6f02ac SHA512 dade84534ac0e574b3d127a1dc367b2f206874500057662d6139a00dc30506e1d977e3020b8e983750a8ef243bcfb34e152391d12027d88f8c116d151090ed9b
diff --git a/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild b/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild
index eeca491e6532..29fd21b15267 100644
--- a/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild
@@ -59,7 +59,7 @@ fi
 
 LICENSE="MPL-1.1"
 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 ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-misc/ca-certificates/ca-certificates-20200601.3.59.ebuild b/app-misc/ca-certificates/ca-certificates-20200601.3.59.ebuild
index 59af3fcebb1f..6f0d209fd978 100644
--- a/app-misc/ca-certificates/ca-certificates-20200601.3.59.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20200601.3.59.ebuild
@@ -59,7 +59,7 @@ fi
 
 LICENSE="MPL-1.1"
 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 ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-misc/ca-certificates/ca-certificates-20200601.3.60.ebuild b/app-misc/ca-certificates/ca-certificates-20200601.3.60.ebuild
index 5a9c6f7d4b4f..635df13b5cb6 100644
--- a/app-misc/ca-certificates/ca-certificates-20200601.3.60.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20200601.3.60.ebuild
@@ -58,7 +58,7 @@ fi
 
 LICENSE="MPL-1.1"
 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 ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-misc/calendar/Manifest b/app-misc/calendar/Manifest
index b158df79d413..6d47924f9ce9 100644
--- a/app-misc/calendar/Manifest
+++ b/app-misc/calendar/Manifest
@@ -1,3 +1,3 @@
 DIST calendar-0.9.1.tar.bz2 65225 BLAKE2B b8ee591005d57fdb3e18412c9665ee3447f607224efad261ca0cf7a3dc88e94e8bfb8309b19996e38e7e18c26bafcaddc9ebf7d612ed25d7d1d159b63b7b6827 SHA512 c8f373ad06265720ab6ba1edb9066cb5474806d023bf0cb3a35876c5bad72de8bac8ab58c2b6d3a9f418d20d04b1811e256abce9296c9c8547c9b7f8005adfb3
-EBUILD calendar-0.9.1-r1.ebuild 628 BLAKE2B 2e0eadbd66b519d477128c6e43bbfa87ccdfc47600821b6a9ffd91463230fc9d9c681daf9fa86d47db60ae49c0dd51d1c9d5d4a2f8fa212ba16689f1e402b40f SHA512 7d8852a4029cf9ced79ff424a27f1a24c0cc8e103650102cbcc132e4807ed6de7db88898881e26f45cea992a5949eaf750f858f03d55dcf76c4a68b4f2801213
+EBUILD calendar-0.9.1-r1.ebuild 629 BLAKE2B bb237793524b58e2f2183762511d2882ebcbe6ecac8f821a8b850c2b2b6b04f5a93548c5321b252751f76a4af8523a4a6659d9ebe8d3c487ec0f8606d6093dfd SHA512 5b7ebe9433665945a8dddb70592829365ef302673d341873367db6c6960dc7614ca247922de1e88cc04153285c630b19574c36ea806e527a793e7f1f98a57045
 MISC metadata.xml 346 BLAKE2B 365bbcf4fca5fb793b4b9499b021c028eb13d1634d21a1c1627cd528c0fe77c195f7f789ee7cce987297ed8e8e20cc9937e83f6d5292b3878a25426488a3d691 SHA512 9fb15d47c1b5ea5eba7614339ed44e8812550589416f8fdb5aa02dfc899c95b782526577f97a24e024c0298e09af634b8a3dc27474755728d81866100c8d066d
diff --git a/app-misc/calendar/calendar-0.9.1-r1.ebuild b/app-misc/calendar/calendar-0.9.1-r1.ebuild
index a92c702aa224..139be2fac272 100644
--- a/app-misc/calendar/calendar-0.9.1-r1.ebuild
+++ b/app-misc/calendar/calendar-0.9.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://bsdcalendar.sourceforge.net/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 DOCS=( README )
 
diff --git a/app-misc/cmatrix/Manifest b/app-misc/cmatrix/Manifest
index 572865aac749..d88a6c58ff98 100644
--- a/app-misc/cmatrix/Manifest
+++ b/app-misc/cmatrix/Manifest
@@ -3,7 +3,7 @@ AUX cmatrix-1.2a-gentoo.patch 3034 BLAKE2B f882f43ffe02f966bad26f560bd9eefc726f8
 AUX cmatrix-1.2a-tinfo.patch 827 BLAKE2B acc326c3c70d3844ab9bd87751b590d357e8b29e5dd3f19381e8af69c78588b383982cdca292854f0bb95ce6fd829f34dabe22c61338ff35a187c3910e2f0df3 SHA512 cadf16edbdb2c43716de77b00bca725faa8802ab9cb6a4d5665bd20f3e1b0bf5aa5ac4b6d36c57573aa24985fe2abce4cef40b31ee288c1f13f87e31bab1922b
 DIST cmatrix-1.2a.tar.gz 74376 BLAKE2B 03319cecc8b15c441f36aa6c3267c4c0793855835c374e6fc45be731fd5907333ecf1f179b6761da8499a40bd199afc0c3c018949a325f5ca139c8a09662917f SHA512 a653a840378da87877bda1b48fc4087e7789b548e0f943ae15b81b5dc7a847aed28c69d2ad955bd467f38d6a08b0960349490b61c30260767e7d1560bb542d82
 DIST cmatrix-2.0.tar.gz 205640 BLAKE2B 3d38903b93853afc077c00308b84106664ec2ea3a31601ba7ab858f6571158182858de87392b5940725456bdd8c82232228451a4d30813e2c0a8bec99f285814 SHA512 1aeecd8e8abb6f87fc54f88a8c25478f69d42d450af782e73c0fca7f051669a415c0505ca61c904f960b46bbddf98cfb3dd1f9b18917b0b39e95d8c899889530
-EBUILD cmatrix-1.2a-r3.ebuild 990 BLAKE2B 8f301ac3c99e6def7994cdb3fc5f8401d57af05d09251385bbc722b9e70be54739f879c9d217a9a28139b7ad7e6fa6b7024e58b9de1d89727dc3c003f3d5b704 SHA512 719ed4360766f99c242fdbb0971bdcabf671ef3f742544b573248977af0e6b4f8a262f777e917a40e32476b67238b9c321fc7177d91aed47113710d14b99d198
+EBUILD cmatrix-1.2a-r3.ebuild 991 BLAKE2B 0af3a62dd77252d92cd992d0388ea3db2fcc7a6ba937dd41bb9e436f15d9cea813118c28a26772c2c49d6e913d19c9ff6dd9de401ad6b44cc42ca2a3f8c684d9 SHA512 bc2b9d9a3f3f48e9e33a3cf69d8074330d8799afabdd2fff792f198be1fcde5bdd62eb1163b2db9b8398fa672da5ef72a34468a45d1b38ad02cc68e93c152b72
 EBUILD cmatrix-1.2a-r4.ebuild 1065 BLAKE2B 4d5958b295a53f1d17a32338245d079298932262dde0ee4e0948bec0dd4e74f45532e7aa1cdb696811b93777248ce5cbad0a497d16d0544ba745b4571790617b SHA512 8c3228954bfa3c3a950c3da31695678712320d78eae77ffa55cda3609086e0a782b5016c1be64478343ff7657eb9ad9e48ebf695cdc82321a566c84c4e0a9b73
 EBUILD cmatrix-2.0-r2.ebuild 1034 BLAKE2B fae14e81d2d010a4e35ff92511a7dac28bd0a63767231cb95cae788e7813f1c55cebf42c70cd5286dbc37dfa3c254d151420f88875a690b51472a195e86402e6 SHA512 a2846ed4ee167404c4e3eaa78b05ab658a9402f6facb34862fcffeba3389a183ea0c5067f01e3bcc1b11334a2aeadb8f098149f70b47b71d6a55ecce203eff79
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild b/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
index 1599b0e536af..c684a70c88ba 100644
--- a/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
+++ b/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
 IUSE="X"
 
 DEPEND="
diff --git a/app-misc/color/Manifest b/app-misc/color/Manifest
index 852276087a18..bc0ccd7f0f17 100644
--- a/app-misc/color/Manifest
+++ b/app-misc/color/Manifest
@@ -1,4 +1,4 @@
 AUX 1.2-ldflags.patch 404 BLAKE2B e07b9c473e8b673d11c3837c6759c5beacc58fcf81ed1b9f0804d614fedc524983c237eb83be33182a384997f666842af554a950d26d8e7106f109ab5beee6b1 SHA512 44c774102cf9800b38d0831be640758a802cb2fdc2949036617ee23a47565944d514ecbee6532d2f426c766aef48814f362f7e0cb27ce8b280295af106426380
 DIST color-1.2.tar.gz 10040 BLAKE2B 1359f77e88c1c20d3643d6b00cad43fe5fbdb26d406d338132a5541668482c1a14e452ff502c10164f2d32d5c79b390328ffdad85012093d69fd767255f08fda SHA512 58f7d379bca3352b2e39eab83d2fa5891df86c45722541eb810becce813c8e866f28b856ed244a75b173f0dab5dbdc84ceb91d96175dcd2484e29abb98ba87ac
-EBUILD color-1.2-r2.ebuild 898 BLAKE2B 9abeb69b8fb38ad54b22ae7b91ca259297a16fba7785969af61507f5988cc9d7a1cd3489fca7843bc32df985e1322be315483d789db03eb86b19ed59032e3ea6 SHA512 20441f37076fc725194a79e6ca1a3a8583a832ecfbc35454ccea66dc3aa5b32d22eeb37e444ec492f11bb0e8fabc754eb0092b1986729b2d0340ed2ef486adfa
+EBUILD color-1.2-r2.ebuild 899 BLAKE2B 7efdd59c6cf0e4e18b589ba7afa21a677e722dd58f09a184109149e74010c0770790e383f41b9891820427d5acaa3ea7a3c0df855e0c23961b49f5df16b2d453 SHA512 c75640e77fb9fc4da78a9d6ef67bb67f598cf4bc6e8d301b9a1c83479ec5372c6b01f9d961e3569c39d8cfa1b6eb0ca4735d5ec478ba5e11beedb64adb129d3e
 MISC metadata.xml 588 BLAKE2B a751663c366701d7dccc560ea5e3961c5a2c428d98c341b8b74267c5bb1369c200fcf8c8f5c9d88fcd17ef072c3d98994501be12ff35445cb2c9397a44ec901f SHA512 eb169977c0c6512fc4a6bdd31083a0175bc2c5688f6eafc36807dd82494e2bea9dd263f3c2982ac059f50589cbcfbaf03b1e49eff20f7fc99c1f1b76c5f0fae6
diff --git a/app-misc/color/color-1.2-r2.ebuild b/app-misc/color/color-1.2-r2.ebuild
index ea4f2b0c52ac..1f428eea3837 100644
--- a/app-misc/color/color-1.2-r2.ebuild
+++ b/app-misc/color/color-1.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://runslinux.net/projects/color/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/app-misc/colordiff/Manifest b/app-misc/colordiff/Manifest
index e3ff7c1fdcba..5f02028b7df8 100644
--- a/app-misc/colordiff/Manifest
+++ b/app-misc/colordiff/Manifest
@@ -1,5 +1,5 @@
 DIST colordiff-1.0.18.tar.gz 21695 BLAKE2B 034e105d92766240d2f854efd44efe8c68d443803ac994983829be0e02fb4c6d087ffc76a626bf34832d30755c9be5d97c1c0e0629ebc1328d08d3d24002447f SHA512 53eb855b2554ca736146983adb522c8c06e4cfb9eb27bf9acb659c210b2af8101dba76ae392cf14db62fab61e3e5d3b664196c0f6432d47acdfa0846c799aa83
 DIST colordiff-1.0.19.tar.gz 21329 BLAKE2B 3137159aa9bb83d0813c18ef62936cdd7cfaaf9655b077fc7efd0c70b7f88157720f71166d9449dc9840762f09267c9baa81065a3bd7df15d322cba61c48a585 SHA512 2845c4b8229df317984ea93aa9d2e08b3bb39ba67b870a14f09dc19fa1e94b4fc8e4da9a7554d53934591766b3aa1696fdc62765ce95e55f50da219e44dae523
-EBUILD colordiff-1.0.18.ebuild 936 BLAKE2B d02f7bee2f06e05df8ea94539d9052d0ac95048d5b94901b9bdb34c81ded3c039192c8a995858501082f922c0dea0c371fa7feb805a065c807487a4c7ede2ccc SHA512 65d2e2eed05517b65449812096d8541d7b83ad307fbbf07e68e0aae912dda60132a7bbed3b576451322252ac725c1df45f820a75882354b500872cfbe07434c1
-EBUILD colordiff-1.0.19.ebuild 943 BLAKE2B 2214ea647f2c0284fb50e41281b0b5f95bb2d05905940f43030abd396a35aae133524f5f4aec6b5f7ada91c7dadf05b0a89764fdb8bd7afdd310802cb132b7ff SHA512 da25e13e6b949e885e81c4a3998679ef5f685c3a21eb0e23cdcf317694bd1dcddaa8d022b5e20b2c3a055335513452da58ba12bf1c460bb08dcd05eeb09b9fc3
+EBUILD colordiff-1.0.18.ebuild 928 BLAKE2B e55105e40817f31e66fbfdf3c9e26e9b6c15d0b9a0b195d162f02c1b3ecd76a5d97beb81e8dc898b825ae49e6e5818dcfb9363528068138f0e526f4406a95c91 SHA512 9f48a218d942a4ba8cfdc3e0b290f69097b4e313eea1af9a7ad969782d69e3adeb90ede465b2d7dc6f8c7549a9b9dedb157761a26e98c1c71266fb96747f104d
+EBUILD colordiff-1.0.19.ebuild 935 BLAKE2B b5c70958fd17beefab69c700934e58649b7a59c6d74b7db30052be6c0690193d01933b12ba39b4372a0f34b716c2bfe996d745295607ecee2b9b00a35c62b1e5 SHA512 d600b6242cbe919b217df4ed1fca0ff7f6d5e69450eb34f30723d47512ecfe57d0455af6466b55f00eae96ef5f3062940813cbb6ed848759cb3f1ad30b677b58
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/colordiff/colordiff-1.0.18.ebuild b/app-misc/colordiff/colordiff-1.0.18.ebuild
index 47466f9aec97..d28f942f6a48 100644
--- a/app-misc/colordiff/colordiff-1.0.18.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colordiff.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/app-misc/colordiff/colordiff-1.0.19.ebuild b/app-misc/colordiff/colordiff-1.0.19.ebuild
index d60e7888d2a7..7e48bf1d5b79 100644
--- a/app-misc/colordiff/colordiff-1.0.19.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colordiff.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/app-misc/datefudge/Manifest b/app-misc/datefudge/Manifest
index 458ecf0dda34..a2a17bac994c 100644
--- a/app-misc/datefudge/Manifest
+++ b/app-misc/datefudge/Manifest
@@ -1,6 +1,6 @@
 AUX datefudge-1.22-bsd.patch 2839 BLAKE2B 995dcdf0b03346ffc8dfa2b119ab9f2c2e4a9db1d56738cb152aead17d1ad079977e3ca0853ecfcb23cf9ee7cff10114e96d5d7201923861beaebe9d11d77168 SHA512 4ee404f54ecb4f7128fa77423f4773fc0e85120ef4f5335ad742b7b5eb7339cb6150241c943ce56967e451a97dda0461b62ff0612a542f4b88278a77ddcb6f43
 DIST datefudge_1.22.tar.xz 12964 BLAKE2B 2f76647a3f7c73e43ff6b4fd57d57d21cae75fd8bc304a5cab7c66d9798795e2386f6219a51d71f57e13463e88a3e518160d90ae01bae5253cbcb7c8a3acf763 SHA512 ed67d334ca8296ae1c7b5ee1efc6ec7aafaad0aeb9f0f0387245c2eeea94ccc59ab804778b93ab8b34a512b83a3ec81d10f341d4f4f22b4a07fccdadaefb6d8b
 DIST datefudge_1.24.tar.xz 14152 BLAKE2B c0a386193e6761abade4643e2f56520738baf4bb739d4c94cec3e47a8feb5ebdf32a6e8b4a0c3dbb9584136b9855abcc68f5134e082083dfb61e977ae45c0bc7 SHA512 cd548a7e8ff10189e101fa339b2845cdd19a59354e43b02cf47e466855ec192dc2084951f7663a94da56a580dd24524047651d8bcb41aa478fe94b24dffaedeb
-EBUILD datefudge-1.22.ebuild 973 BLAKE2B 9427b1f03d460a0d78989f8a9796e2b187c993287c9c2037cfe9515de95d2ec66e23fbcaa9af4d157d0ae7760a0dac9f47aef2ac4fb1a1a45f43ba4b303d53b9 SHA512 3aa437ab4cb0142b67e7a4b6ce4c66fe4afad4ac777cb6a4c42ea23bd1fd0781086fe4ed3219b16c1c4490cc822642b58dd40454f917483ed21397a7d930e8df
-EBUILD datefudge-1.24.ebuild 810 BLAKE2B 55294f79ba83bd410c71ca766a8a939d11dfa73f383e54f527d7edcc7a4c26fcb5006d0e4ec0427661aa8b85693b3621c54d9d318bd0831d8896f1bf0216fe7d SHA512 b224553e0ea12cfe0bbb443dd19a6736297045a886ee6046afd4c3832698dcca3755d42596181ea8c35f15bae51d6d76fd667c5981c70a0ebd0a093d8d5ab18c
+EBUILD datefudge-1.22.ebuild 974 BLAKE2B 621bb00cdf06bea72548400bae3a94e78c1afdcabb720932201deed12fceff671607f8bcc621c566842dff0ddc3a40d309b393e0a57d3d3fed5ccfe59dea6226 SHA512 00305886f016114bed70771f7565dca012269275c5ee5c99b6ad5607fe92d7c992c67980067c9c35e1b0fd25b5b27ac9136599530a846b3d0833e22114c7fa65
+EBUILD datefudge-1.24.ebuild 811 BLAKE2B 088015ad6828218c595b9159672196c143f793b54c0354b3f184ef08c434bdc0049b491ab5d2d94859e1b2cff6f52e044fc06f308931b2c5489bf37099b75347 SHA512 660d4639da75087b75f03f7bb75219d0fc65ba939743a4d3b9e09f307cca0ead98daaac21b16de078fe31408eaedf9736ba68ccad6ca7270a47d48cc3f878682
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/datefudge/datefudge-1.22.ebuild b/app-misc/datefudge/datefudge-1.22.ebuild
index 326ae6f60c97..7651807480f9 100644
--- a/app-misc/datefudge/datefudge-1.22.ebuild
+++ b/app-misc/datefudge/datefudge-1.22.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=()
diff --git a/app-misc/datefudge/datefudge-1.24.ebuild b/app-misc/datefudge/datefudge-1.24.ebuild
index ae3251a7d789..5448d62951c4 100644
--- a/app-misc/datefudge/datefudge-1.24.ebuild
+++ b/app-misc/datefudge/datefudge-1.24.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_prepare() {
diff --git a/app-misc/devtodo/Manifest b/app-misc/devtodo/Manifest
index d31605017de6..e2b369235c9b 100644
--- a/app-misc/devtodo/Manifest
+++ b/app-misc/devtodo/Manifest
@@ -3,5 +3,5 @@ AUX devtodo-0.1.20-gcc43.patch 217 BLAKE2B 9d8af6ddf3036120498fda96bc493b3ce5e48
 AUX devtodo-0.1.20-gentoo.diff 3744 BLAKE2B f80130ba310593442d92013a51186af2ec082c0c4cde25981432ccab76a77dad38197e8d84b9939d3ad78e6442196315b446d431daa675bb082e488723b86a48 SHA512 f2a6de30807c2ec718725491d92f4906c50b944eff389e15d17cb2982127112d443e08096b6923ca76ca720832afc1fd561bd55a327ffa435e1e21abda07abbb
 AUX devtodo.bash-completion 1424 BLAKE2B 10166a35074d1f501d76a0f60e383c6f6198242b4c22ae2b17468f887e2d6caa2466bbfae290d76cf8199156703591633aaa755298c7ebcd1274faa09656a369 SHA512 6139218a2bc4d06f2af23fc04247e8fa3d70eaf3affe326dbb8b1bbbb880f2534f1c1bf4c54079231bed7c1c64465705deb5a5cb1a0f4ca5415ccddae726b20b
 DIST devtodo-0.1.20.tar.gz 390935 BLAKE2B 1605fb6ae6f416ea9b7c072463aacedf7fe997a362b3188addce9c6fbdd9bf99f2f7d4524870fb09f0a0c29e9886011a8fae737388a3151ecc489f3fe4fec980 SHA512 58cff0455c735af4530fc9321d1eade8272dd5759eeb8a688a641c9be11830b87be116801e3cd1d90a27e070775fa00d7b4d6b3399eba7aad5c752bfda9c28fb
-EBUILD devtodo-0.1.20-r3.ebuild 1673 BLAKE2B 1edfe14498f5833c0259af46cf308ad85523b0f8412f5521cc32723811648b22f0bac874fb1a2b65b416ab049d572856ba94cc342b89bd8c36e2b882f5e577cd SHA512 9d06fa8df6514c81904a4b20e157c9faac7dd20bf221e423b878768b0b4339636bb19683b823416482b4a368abbce398792f1e6efb8e76e2b9d00171ebb681b7
+EBUILD devtodo-0.1.20-r3.ebuild 1674 BLAKE2B 365cf485650832eff62764df6c2123fd05a8ce5e6258aec725997eb62d6ea60d02a9ffafe28e056d5820996c522066f308cb104755a5b9b4528ce5f40d21da45 SHA512 39136e17534b8d3b7fd1313bbc6b57f60326867aab74a6f661c6ca39f9ae6c0f0a3300d694544b17c2772592f00d0cba5b793b72e92a190eb7b8eb44e2854312
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/devtodo/devtodo-0.1.20-r3.ebuild b/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
index 9df11c8be175..8e8653c62509 100644
--- a/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
+++ b/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/app-misc/editor-wrapper/Manifest b/app-misc/editor-wrapper/Manifest
index 61d54a0c1277..188a8e84e7fe 100644
--- a/app-misc/editor-wrapper/Manifest
+++ b/app-misc/editor-wrapper/Manifest
@@ -1,3 +1,3 @@
 AUX editor-wrapper-4.sh 402 BLAKE2B 1cbdc02b300968ad6d8e6b68dbc27507d92820373efd3101f85c170c2a1e7a9e3114558fb04dcf0ce91a5ea094781f1c50c2c92ead0421f9ac8e2dc24aaf09e0 SHA512 502f8018d3c135ac05081cb896cad0296cc94f636a2410562afd915d9e44be3c2d71db319a803f5453396ebc2509cce0d5b4c5affdca875a27de2b0da1101052
-EBUILD editor-wrapper-4-r1.ebuild 933 BLAKE2B 11ed5bfa29f4746c2730e828a212d90ae965a2fc6c62f5def440eba50b0ccdc4070835ec3afb6fea7f20954d9e57b59166aa26e052975bfe8ed4244938c33806 SHA512 a8ae9619af8b31835cd752000c7d078b8248e720a8efa3e762c0438927b8869dba4e3503dbe2b8c83c0c64d7a18b1fbdf03f836653929ce01e0238451f0417b9
+EBUILD editor-wrapper-4-r1.ebuild 913 BLAKE2B 4736a670f468e4dbc3102acd402786ea076929aa2a668dfc40d8f72680dac7aa1c49f1d49b3ba3e564544406ef1a8a3dafd40b08e33771c519f51604fe70d75f SHA512 abc1dfee5b07d08ad4d780c53672fe38e3c05d242948a7bf93e251cdd3ee240e503999902a506538328270ccbbe0d02e925e10c1edd518394da1e5056a170f4e
 MISC metadata.xml 367 BLAKE2B c144d95fdc55aafe6dfe786f325aea6756cb51e05b7b370392bf201e5daf827ddd5b0b755d5d37d6e2a06f7929af634223f2d33a1e0e0684677ca90464e5e4df SHA512 f566d335cb37d8d951e7b86e3f4a3bafa5ed2d1b270d5d730c6e9576230848e64849f7ebf0a133a7572847faf0c075f0158f125c3f29d941b598b46ca0c7f4c3
diff --git a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
index 4370535e247c..2db88c1ca428 100644
--- a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
+++ b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="MIT"
 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S="${WORKDIR}"
 
diff --git a/app-misc/fdupes/Manifest b/app-misc/fdupes/Manifest
index dbb5ba84b2cf..6aab26267cc1 100644
--- a/app-misc/fdupes/Manifest
+++ b/app-misc/fdupes/Manifest
@@ -5,7 +5,7 @@ AUX fdupes-1.51-makefile.patch 779 BLAKE2B de015e63777f64b2f798eb61314f71e3b66a9
 AUX fdupes-9999-gentoo.patch 426 BLAKE2B ec2b67101e35617fdd479c68df0b61161852d1895b2de1ff8ca127746b4b3deb5906f388a7f6030cd4ed95ff6781b648133ec50ab075039092b560581a89e690 SHA512 86482e46a6e2b3800f34122ef44ca830c065360fce5806962fcc49b2d9a6a76f65b52e89283e150ce5b885f038b70d992f753fecbb38694f2485a08e221f1216
 DIST fdupes-1.51.tar.gz 48942 BLAKE2B b2673a5601d0bc1d7bb0d312c3d4fbf67494916e9445fba6c46bccbeaa471ebc776b9deb18b323c6eebea4f231bdf1503af9010cbe83b6aae2a3efe479c3a49c SHA512 7cbc414f25427793317667b8d5494f7247a08ba402855929de77d1db01eb3dce41ea608f8dcca047c4a7856e02b10261982cf2acd7f6a79ab726b3009c710a8d
 DIST fdupes-1.6.1.tar.gz 20869 BLAKE2B 683b75b44ea4662e555a81405d6c9c291c7980b579c866ad953e18ad8c92beb37c2b6f7ca29ea4e40269ef751851dd8afbb77b0bffb5139bbfbcc0d41ab23a5a SHA512 6c6662b70068c2f48f4be64a6830c81a66852d650391d0756f20b9ac0df7d70c1a32918bd7cbd50e19de524d9ebc09ea338c19636e1807b071eb96b325e641db
-EBUILD fdupes-1.5.1.ebuild 966 BLAKE2B e68e295be16aa80d712fca947b259144d2a53bfb26629341b54699d9c1fa3547d4caae7713d15da3c2e75b21c3e241b10cc27cec6860d49ffea3a278d121eb78 SHA512 4d3eff880cbac6a6bbd94c5ad59ce229d8200deb2c8bae84bd9a89f5c346c49dd0f5787417f03d706271041d8752b4156a508cd977ed510c18f64820ae88ab07
+EBUILD fdupes-1.5.1.ebuild 967 BLAKE2B 4194d5858cc9f677391c7129a14cf654dbe8b85feb59a0b52d8247b09692433aa5be075dd2f5a1523c4b9e9eaa9d45900d9db3742a779ba5b7a3b17c44e45f3b SHA512 8138668d8cc7c9748075f13f6c384597accfe73ef1ca33d5ca547c67e19c4bafde2590515695a9d224ce95001ec7f11ff3d80eaaa4cb9d650d343e3091fbd41d
 EBUILD fdupes-1.6.1-r1.ebuild 781 BLAKE2B 5a06c5e3e377a4ff287b037b909badb8c796b0b903b88312202a1f153c35b185fd3fda4833f7e2b7807b424442fa4185a512c9a3c226abda55424b0bb1a9ea88 SHA512 94926bdd838eb754e4f59ab049f45e377ef9485c17970a67d8e52cc3ce9713e64a97261a0f93ddaa7e09b4a507b380c8af4566ed1c26bae0b99ef09c2f5895ab
 EBUILD fdupes-9999.ebuild 676 BLAKE2B 061f5b9146f1a815ae16a056ddc95bf0f8bbcdda0b22e704986018df8d178582cfba854205814d41a7587433200eef4e326edc21b27f2715d1f641366e568077 SHA512 f04df62de8ddd45ad72015f8d346f15f4b81c066be0ff53e0f301ff5eb370ecc74192e2e03265f3fe729059cd1d330623eacca57177b1d8b9e777f8a090608d5
 MISC metadata.xml 353 BLAKE2B 39808fa78e13623faaeb1acf023d3bba06fb38635f315144fe9f0713b209e5c31ba36073f03102bf55fbc216c00347cef077f4ddd9e5fe585104bbeac954ac46 SHA512 a918f701cfd176d6281ce0703be9ced24bba96090d0c6ed0647e20909cc420336506c943cd5e82050ebba4618dba28b8543afc9baa394c35e5bcdd3d7ffebb8c
diff --git a/app-misc/fdupes/fdupes-1.5.1.ebuild b/app-misc/fdupes/fdupes-1.5.1.ebuild
index 47746954021f..8202ea8e4789 100644
--- a/app-misc/fdupes/fdupes-1.5.1.ebuild
+++ b/app-misc/fdupes/fdupes-1.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/adrianlopezroche/${PN}/archive/${P/5\.1/51}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-misc/fdutils/Manifest b/app-misc/fdutils/Manifest
index 290dc7f13e8a..2f91ec084048 100644
--- a/app-misc/fdutils/Manifest
+++ b/app-misc/fdutils/Manifest
@@ -1,9 +1,10 @@
 AUX fdutils-5.5-superformat-snprintf.patch 655 BLAKE2B 635b89f3a3f20a6e255e56ed7e2cd306365a7b7bfa5047cb20d551919daffe4b956d53bc3896814d9aae84ab9586a98017c9e70df3101b5efd1f02d88173e1b7 SHA512 42d6fb5beed1548815c67921d74dcdef05e76c45cbfde08ba4265de29a58f26af22b1ea7bdd5b1b71a34f0268c7cdb9063652565c7856cd6503dd0425d56171a
+AUX fdutils-5.5.20060227-gcc10.patch 531 BLAKE2B ea8519a72d6bb103d267cd5d4e9d306d7962dda43e3916808b7cf050c269962963a1e3d249aaa7534ecf6d2ecb85d66ebe4783262b6db2d193bf4a87230a209b SHA512 8c9b14ad6f90eaf0507ad52cc5899664a6c0883900d76d03ce7641118650fcec8e8c46d6e0424a8257d1db16b7463c399774665d468732766307edf400826a2e
 AUX fdutils-5.5.20060227-r1-parallel.patch 607 BLAKE2B 2fc63e7a08071afbe90c891785fb3bedcc93bb7b47077eee1af6ca19a449df3ea4c9b48885f0a6d58d6a47d0397b35c21ca7ba1aa93f5fe42e9b0b9d81b220f5 SHA512 c3ef752ae6580816e3a451cbd1d56f169d71608c723d5a7ce77cd80db5021b7ea2c85c78dddc4219f9cf59b5995248c222bb39f746b72f7244ab0c998f3cf732
 DIST fdutils-5.5-20060227_20081027.diff.gz 6748 BLAKE2B a6d9bf332a777c6c09c85ea85adfaf02422ed2e459d3cb5248c5f6c122e11d39c1a426288d8b611f61ee5ed33ceb5695644f6fbf5421e7a0b1b9937c6a3c26f3 SHA512 979ad8116a5e0c82584a534095e60689d3920d16f0685a184619012d4146f89d6dce063d896668242bf10a6372579ad16ee3e2093e386ff430f265a23458750d
 DIST fdutils_5.5-20060227-6.debian.tar.gz 54489 BLAKE2B 4d0fbd1c9c4f115a9df3f7092e062173f6a8956df8d465bb0186f712f51f6ef9e4fc67c4c642cdf7ae7e9daa775d6657c4306f5837307a51daa0abcc12639b0e SHA512 db6759bd2b98ae65bca39cf5b09fdb250371e02daa7665d8d21f93c3ab968cfe345cecb20faedaf2600104b22e2fb4df6868860dac3ead0ffb28d2141c8d7149
 DIST fdutils_5.5-20060227-8.debian.tar.xz 48480 BLAKE2B 16de5a3b9f634c3eafbe9048d84c6ff29933e5b5ad878de79e6b03aac49ec44334e7e8e090ad0518bc83e8adb91dd19612850f0de7e28bc9d9c10663fd9a5252 SHA512 a55823c2a4defe1ebad5a92c96a85766520a744b75f49e9f99eb14ec2c0ec44f91a72437d070942a4603f7e337ed60c380f61635b4aba57dbb5ddc8d771d8b89
 DIST fdutils_5.5-20060227.orig.tar.gz 222915 BLAKE2B d76a4b30ab60ea081e333817af11fe3815e8e19149c643afbcb931dc670fa3893cb96bb6be2136dea10fea06894a02e7fd1ecc4500ca6dd786054bbdaea19262 SHA512 a25d23827b9178a9a54d0012ad20248072e07aa5798bb3661fd0412d2441239b7bbf1778b5e34acb1a09a25a76e44c1801b706a242ce3b2337c06757e0ac02dd
-EBUILD fdutils-5.5.20060227-r1.ebuild 1727 BLAKE2B d3d56facbd81c613526ab722d59fc9a11e5c4f17f6bdc3b49e7c6cb0b0a2d873e469abd02fc95fea5a0db6212771c742af2b5189f32ad5c878d8e225140d991b SHA512 6ac168d7f5b0ce3fec16c8f9027f4f9eaeb11e0d47f997c6215fd6c33ac62d56c0a24df7fddd160c09cb91b0e3dc035b2dafd4b3b62e71a33fd1b2c33dbe4833
-EBUILD fdutils-5.5.20060227.ebuild 1344 BLAKE2B 3e80aef85d10e768ba7a18aabc9e25e746adf1eb4ff7b4c9b7a340e3158159901bdf7c071abdb817afba9c805708bdd8ed3c2b97a668793929fa534ce65b69ce SHA512 52042b4a2d05e325a64cd85703c777af4c154d6e79e59ac04fb138f1798ccaa60dfc9f5312390a382214d41ef59dcd933bf40b8c369952747ecea8a4791d95e9
+EBUILD fdutils-5.5.20060227-r1.ebuild 1767 BLAKE2B 117b01b2c946b2385f7a3b76347de2bb58df31d5bfd9e54a0ca990e2e53e1e5231ca0ef1f908e6bd4cd01121d00254d57008da3142c014d51a2c3dde3b514a3e SHA512 a8abf363536ed5745809e2ce7b30917f69595a60805cc97882e2cccccd8248e4dbc2d8572fff57b552ba2a09a82b8283796b6db5242a70124df70f4184d0d99b
+EBUILD fdutils-5.5.20060227.ebuild 1381 BLAKE2B db59f53f90778a26c442908a13af1fffff8281c1d9383877b4fd2bbeeb620ee6a491f6452910d7767ddbf55016dec952d2aa0b8c18d5f315a0768f4baadb66b5 SHA512 75040032be4a0ffea770ff95c857ead59cf1b841c39e923e992e3350afdd98048239b9c8aa6462b34bcde911d61247a052a51d5d49ef66789bce134c7f14b6c1
 MISC metadata.xml 250 BLAKE2B fe89695d5dcb55e3a59fe901cba061e1b73e5d09cc72d362bb3ec127aecdba741ba23920096bfad7a39c43e35ffbc006fe84f3e50a34c91097a32deceeb91e84 SHA512 c599b09b9aaf744dfe13d0707adde7d3dfd1a8a411e937fcba25e65c6045792cdcf6ceb9004e3dd38b014c486c9f1334bfc898419f59806ec6abebfc71bca382
diff --git a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
index d234389a9e19..b0196c0d391c 100644
--- a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
+++ b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,6 +26,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-5.5-20060227
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-gcc10.patch"
+
 	local d="${WORKDIR}"/debian/patches
 	EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
 	sed -i -e 's:{LDFLAFS}:(LDFLAGS):' src/Makefile.in || die #337721
diff --git a/app-misc/fdutils/fdutils-5.5.20060227.ebuild b/app-misc/fdutils/fdutils-5.5.20060227.ebuild
index 1116db851a7f..632a26a8982b 100644
--- a/app-misc/fdutils/fdutils-5.5.20060227.ebuild
+++ b/app-misc/fdutils/fdutils-5.5.20060227.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-5.5-20060227
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-gcc10.patch"
+
 	local d="${WORKDIR}"/debian/patches
 	EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
 	sed -i -e 's:{LDFLAFS}:(LDFLAGS):' src/Makefile.in || die #337721
diff --git a/app-misc/fdutils/files/fdutils-5.5.20060227-gcc10.patch b/app-misc/fdutils/files/fdutils-5.5.20060227-gcc10.patch
new file mode 100644
index 000000000000..2bda41e11255
--- /dev/null
+++ b/app-misc/fdutils/files/fdutils-5.5.20060227-gcc10.patch
@@ -0,0 +1,20 @@
+Description: Fix ftbfs with GCC-10
+
+Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Bug-Debian: https://bugs.debian.org/957200
+Forwarded: no
+
+---
+
+--- fdutils-5.5-20060227.orig/src/superformat.h
++++ fdutils-5.5-20060227/src/superformat.h
+@@ -97,7 +97,7 @@ int compute_all_sequences(struct params
+ void compute_track0_sequence(struct params *fd);
+ int calc_skews(struct params *fd0, struct params *fd, int n);
+ extern int verbosity;
+-int header_size;
+-int index_size;
++extern int header_size;
++extern int index_size;
+ 
+ #endif
diff --git a/app-misc/figlet/Manifest b/app-misc/figlet/Manifest
index 9c00b1088dad..4028f2411a20 100644
--- a/app-misc/figlet/Manifest
+++ b/app-misc/figlet/Manifest
@@ -2,6 +2,6 @@ AUX figlet.bashcomp 1376 BLAKE2B a0e07ba26e97890bb0a6df473c609d40e68bd31a1ede536
 AUX figlet.bashcomp-r1 1214 BLAKE2B b2f521559b9f3f957d1fe060e72dffa3b2342f389e5c1791dadd94181ef215344de2d909cf4abd5de1beef7f03a637576401db68ec1d537b569a89e0a9bb3a6f SHA512 7140cfbacbd99f0f4e9463bb024ead73ea1a3f6ddf9cb5806134ab711e772f32c57e69596f63f125cf13941cff51f84ccdb9f0288ca8614c99b9f1890d3d3e69
 DIST figlet-2.2.5.tar.gz 233201 BLAKE2B 9d7a8b518ee91bd937d7fb81d782c894bc2a1738b696b03d948c1319e68aadde9ff1ea291ee77f9e79bdd950c68fe98c9e4539e7e76ef5f9e758c16b968966e1 SHA512 bb9610fd89a51dd3e65c485653fe1292f47dbca7cb9a05af4ce317f5d776bb346ae455aec07fc37c290f6658639920fd7c431c1135a0f4d456a21c0bd25f99fb
 EBUILD figlet-2.2.5-r1.ebuild 937 BLAKE2B 24ee90a610c28ed3fec048256774012785eda68cd4dfcc0d681d80799ff88b9a9bcd0948828f0be20a74e6bd115ec44ac9de78742397b5f9515a05717347a043 SHA512 55c09a2aa1e8c7a8449f53be03e98e709144224d68554e76b783f394cd0105f9c90be3b6c17a6287033a7ac379816a7fb32aa738c613db664c5425a3e9f04c30
-EBUILD figlet-2.2.5.ebuild 934 BLAKE2B e5479f3a0e0a066e17cf129646c2c42b3f74b86abece508563c4c49d5ee854a081d3ac5d2e569a01623f5a3939a27df0881c1328df8225d6b6d2b4fd79416e37 SHA512 1c3a768808eb9ad13ae8b107a3e91fdeb4ae0fc8af4472bd7fb29ae7d017d678cf5798e21c2f2807ffb610fc361d1b3cefceefdda4dc9bc05ddd5bdff19ff222
+EBUILD figlet-2.2.5.ebuild 935 BLAKE2B e0dc646df768bd7613bc0be8442b6f0132938cc14e5cddb2755dcc8ff493b8fc8fdb9e3a1b626562d80aed35e846096a77332fc7cc849b502f51d613b2f06896 SHA512 b454a61ccb81b6f6607bc4bdb134d9e443a00255b7d2959e060ba393dc4047accc9c32d94bb1343a10dc7f856310f7ec70bf2e2af6e6ad45713184e7c01bf310
 EBUILD figlet-9999.ebuild 805 BLAKE2B 9562e2503c2395d88e78e832c5ae1fb5fc2a49c83871cd868cda802138db038f685dcbe60ffe77d9cfcea7b75281fb5596bee641d8ad9da28167452b4a127302 SHA512 1486ee9197ebab6a17e781366037f5e8cd24ead017dd2c87de373321f18bf3e908e952f983b2e9be6bda7914e51938324e8fe257487ccb015cf180495b1c7304
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/figlet/figlet-2.2.5.ebuild b/app-misc/figlet/figlet-2.2.5.ebuild
index 40441e6e2721..42a155947ea6 100644
--- a/app-misc/figlet/figlet-2.2.5.ebuild
+++ b/app-misc/figlet/figlet-2.2.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.figlet.org/pub/figlet/program/unix/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 src_compile() {
diff --git a/app-misc/getopt/Manifest b/app-misc/getopt/Manifest
index 6af04a0178c6..9c0d9577a1cb 100644
--- a/app-misc/getopt/Manifest
+++ b/app-misc/getopt/Manifest
@@ -3,5 +3,5 @@ AUX getopt-1.1.5-libintl.patch 352 BLAKE2B 39cb63285b1124a2c8577bd52128e04e0e86b
 AUX getopt-1.1.5-setlocale.patch 323 BLAKE2B ee68f23549c402bdb91cd4475ee0b1d30d8254d5161874eb029ce7536b3679fe5f323590c86d28af2dec9c2c6ba8ac95b0a3ac6103cda13fe8349629c13c872c SHA512 1ceb4353355cd1af697b5d46bd58b092b8792a2add97fb8498bfa6e036487e8c811333b03d0461117f1c2c5e90a3f33cf773cb9b0732c753beb8d75345e6c36e
 AUX getopt-1.1.6-longrename.patch 3013 BLAKE2B 608ad737eaad184436a321797b5099bbe5a1436e812a40a2ee30aa7b80e86f360e9e3c18629ae96e5edd6d0090a74758b99699833052dee2db7e76bd055f2659 SHA512 7157f9bd2bc660519972898bd24f0f04f01196a54c44a3a3ba4b0fda0acfb9b13cabba7cfbd1e784e9f5b3c94f2955325f47933e5d6affcb1a0f740d933206b9
 DIST getopt-1.1.6.tar.gz 58926 BLAKE2B 839b9c1701c21425cbc6b68ab245eb693e0e575a0673f62e3cca8f6932485c1124f42710c0ebeb3c157ab89e56e02b251a99aca7a12723735c63f33443003007 SHA512 aa5476e729f33ddd3f32f38b2565da319fdfe034f11549218d5d9953e70dad764e0d9a82bb10efe4043c86ae87f944619b8a2f29a197f592bd855699961d8e10
-EBUILD getopt-1.1.6-r1.ebuild 1703 BLAKE2B fcde4e5494a8e99142c21b69aa9bf51c7a84b565c8736fd24d08b0c93f767e95bd4fde2afcc3e9575f8dc4596f861c1f2c7d9e53dd3f08379ee4261b988d03a0 SHA512 c803517a3a5bce8533caeb700e4bb8735284a74360ab8b71f7c208942b97f8535651f415a7012aa6ba2aa9ac20fa4248d783b1765fc947be292c0521e09b14e6
+EBUILD getopt-1.1.6-r1.ebuild 1683 BLAKE2B f131b4202452dfc4231594dcb3453e6ad12f1ff6ab99b98ca01f6ead8b80a4173bfec5b7f52e7d9bc3f558ee6b3ba9b23ebde39418f63b2c7a7b9796d6915556 SHA512 9cb51f3d915fc8fc17e829f86ddaae05531cfbf7941f894c2b501bee75512c4d1cb8021f3c0d1be7aa729cec2075866b1529488ea1a9a7c60189c7645c9bee20
 MISC metadata.xml 243 BLAKE2B d650658b3e248940751d20c9e517a011a34f8d99df54d5203162d67c21df384f507e44ed0c848c1adc99fae8d511e204129f2709f5bdc5d1b2c8e41120bbe6db SHA512 8489be9ea6eac385511b0d193b1b61fad9c8e0d4cb86fd711e6faf04e66b2c935ae64ce6ce0a044d036e76de6787e5d440d67f831e89261a71e74b645a0999d9
diff --git a/app-misc/getopt/getopt-1.1.6-r1.ebuild b/app-misc/getopt/getopt-1.1.6-r1.ebuild
index 25ec7685b004..0f5ba4d64925 100644
--- a/app-misc/getopt/getopt-1.1.6-r1.ebuild
+++ b/app-misc/getopt/getopt-1.1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://frodo.looijaard.name/system/files/software/getopt/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~ppc-aix ~x64-cygwin ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~x64-cygwin ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/app-misc/grc/Manifest b/app-misc/grc/Manifest
index c9026e31d671..ae6fb9d7684a 100644
--- a/app-misc/grc/Manifest
+++ b/app-misc/grc/Manifest
@@ -1,5 +1,3 @@
 DIST grc-1.11.3.tar.gz 45205 BLAKE2B 852f58145fe11ceab3e6222b61c18cdb18a09f0666f28df4b8b8a8bc42a22dd01ae7e2bcf6232a6aa0d1f42ac233148f694a0eafbd995fbd5d147e06480f7abf SHA512 abc756a21e039c136bbf9be1ef7c1890aa2415ac21e87fb7377c90ced1def2dcaf9ce5cce22edeac68db20f6d6ccea31a2ec57044a37ba200ff79273bf11d8cf
-DIST grc-1.11.tar.gz 43224 BLAKE2B 40fe050f1198dadd039ad91fedf279ad5e913e803a669335ee21158f7f9702f3fd65ee5876595b9a4ce46da2f7f3c2cc589bf7ea3e10d84c37b5f20677ed626b SHA512 abaa18aeebf9858369b639975ae6c9a33f3111beb783b4e86463ace70de1d660efc6c17b05020862c3b2f467310f0974443f96d4f91cd322a90731c4be49206c
-EBUILD grc-1.11-r1.ebuild 1360 BLAKE2B c9a615fdabffcca8a75928d50fa946a7ee00d82e3a8e809cfa7e31e412946c6310d954c7dd2f959fa9878622073d55445b2130159ecf199f6e3777ec5925d47a SHA512 0f47bd7d412ddd273e7d26d8f820a6fc3d0028dac4f8e26003fe323753b7323b2f98cc18a2b95a904ac15951d934dcbf450ba2222949f1b228035012acdd2d3a
 EBUILD grc-1.11.3.ebuild 1383 BLAKE2B fa7efd11c0a01be93f69b8575278c5670e2641c8ebfa13461f24445200b8f62d05e439c6de79c85d69e27c323c75a144c063db79e1c77952072eab08c7557adc SHA512 4357cb998c2b221f7ff8521120b4806b954b35e8e628435e8316b7a26b5d5fa48ae9fa178d8b8309d859b826ddb46e1f80479ef0e9e07251575655a1c7d7304f
 MISC metadata.xml 351 BLAKE2B b542ab1f09e03d0fcd473a1d364c557732f0ebd865398da2bf6b322987c0bf22d916d642dcb73c0c7c72d57f7eb41caa0aff1456b49dedb0895a5f5c31f3721a SHA512 39fabd038b08bc0fb057be0d211272b65d94cd9f1afedfd576138be1ddc1748fd673684b1c407649409f2834024cad324f78564348e9da570cde26be3282bc8b
diff --git a/app-misc/grc/grc-1.11-r1.ebuild b/app-misc/grc/grc-1.11-r1.ebuild
deleted file mode 100644
index 230957f48d84..000000000000
--- a/app-misc/grc/grc-1.11-r1.ebuild
+++ /dev/null
@@ -1,61 +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 eutils python-r1
-
-DESCRIPTION="Generic Colouriser beautifies your logfiles or output of commands"
-HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/grc.html"
-SRC_URI="https://github.com/garabik/grc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed \
-		-e 's:#! :#!:g' \
-		-e 's:3$::g' \
-		-i grc grcat || die
-	default
-}
-
-src_install() {
-	python_foreach_impl python_doscript grc grcat
-
-	insinto /usr/share/grc
-	doins \
-		contrib/mrsmith/conf.* \
-		colourfiles/conf.* \
-		grc.bashrc \
-		grc.fish \
-		grc.zsh
-
-	insinto /etc
-	doins grc.conf
-
-	dodoc README.markdown INSTALL TODO debian/changelog CREDITS Regexp.txt
-	doman *.1
-}
-
-pkg_postinst() {
-	elog
-	elog "Shell specific configurations can be found in ${ROOT}usr/share/grc"
-	elog "Be sure to symlink one to use grc globally:"
-	elog
-	elog "    ln -s ${ROOT}usr/share/grc.SHELL ${ROOT}etc/profile.d/grc.sh"
-	elog
-	elog "Replace 'SHELL' in the above command with one of: bashrc, fish, zsh."
-	elog "Afterwards, use '. ${ROOT}etc/profile' to activate grc in existing"
-	elog "shell sessions."
-	elog
-}
diff --git a/app-misc/hilite/Manifest b/app-misc/hilite/Manifest
index 2b7040157c2f..464fd552a3ac 100644
--- a/app-misc/hilite/Manifest
+++ b/app-misc/hilite/Manifest
@@ -1,3 +1,3 @@
 DIST hilite-1.5.c 2872 BLAKE2B bd6f89863100906a731008cc3c1b0480e3aa655119d73d651f425a2686ab0a861637f5818c671d453ce26fd831251699e6eb3b59d3e5b5938e2e1cb4de19a367 SHA512 571fb962e430d3c9e5494d802f529529a5bd0bf6dd7f398e7c55dd5a8effc568f9153edecf50d2e296b97eb20b2ddaa52c2214b9dd989449aff3b93a0547ad45
-EBUILD hilite-1.5-r1.ebuild 682 BLAKE2B 2e9f7fb7da4ee7b6c4fe4fdb5bc360031a56313628423a821af28dcc05218bae647fa6c796182a5929b9373d644496dbbc2a9af9768b4a2e8a44521bffc8bfc3 SHA512 57472ffe8e4182c561b5f42c8b81487fce09d30b50158f5d908d9966d008e4f3c025be143dd8fb223a43fd95c314c535b060b6d9b496be9b29e57a0c7d2e812b
+EBUILD hilite-1.5-r1.ebuild 683 BLAKE2B d8b98fcb440b955c650d573a0ae44bbe8e788217a290a5e295bb652b36ac9b2eace70ae7f7271e537d5b5e089d51f686492c33cc17d25e75e27085c2f8f97a4a SHA512 6555c255c99a83bf10f50bdf72ff166268007b18d87b7831af31a535be4619659d905db16d40fd55010049941ac202bef4adedc899667b32f014e7b73bfdbbf7
 MISC metadata.xml 341 BLAKE2B 95a2d672cce1e13ac46dfcc1661b556a241aafdaf9afdb2a5a84afd4ccc94bce8edcf5483f5deda7cb62a834be32be1f7a0fed38d26b96159e4477e668201df0 SHA512 792aa66d85af91677e5d075168e80f3c4d21a804047bcae76e685e612d0c57edf61167712639a5d3322d9f4c35d25b04b6ec2b8d1cd2150d396b8b4e95e8fcad
diff --git a/app-misc/hilite/hilite-1.5-r1.ebuild b/app-misc/hilite/hilite-1.5-r1.ebuild
index b8ee20d4bf43..59ee22306d2e 100644
--- a/app-misc/hilite/hilite-1.5-r1.ebuild
+++ b/app-misc/hilite/hilite-1.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.c"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 S="${WORKDIR}"
 
diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
index 04f830602809..de93c5915e73 100644
--- a/app-misc/icdiff/Manifest
+++ b/app-misc/icdiff/Manifest
@@ -1,6 +1,4 @@
 AUX icdiff-1.9.5-tests.patch 761 BLAKE2B a1e837489ea14ea0a2ee88dd23294bf9dc6368fa052b5bf888ca1a37401903717792651833e751a8711c8b865ce4a038615ad4c23f91586af6b46511d28dfb52 SHA512 c1587ce221b7c1e9191b429c1b16c84bdc698e889e5f3c0ce722442adcdb836f2b7f38c193163ba5bc210ef31da4a3e3afd90ae44d3ad285ebe563993125f8cb
-DIST icdiff-1.9.1.tar.gz 24387 BLAKE2B 482b128f03ac8af7e98db9b32ba7d9cf8bcd1a395eb50653a98ac186da26fea7933ee13f01840bb6c105e0f573a519a3e20ad83fbd8e513bfdd6c8c6d14b90c5 SHA512 f73108f6f3a4a2fc40e041bbe7b5934acd76684bb54a3fa544e9f146fd3c528528928378496f53ad92d649547ccc491a77296b6fa57e4534abb13d61c0df8d58
 DIST icdiff-1.9.5.tar.gz 31914 BLAKE2B 8d9b9b5104c3075addae2954b41c27ccebe3b4723b0e71ef88a214d7fa0ff7d8cb9ac52cada8ddec929d308a356daf37ef4463a52667f7e229a4a33d1d993e86 SHA512 f4c50da1e73a1af2fd63feabfd180125637a856a8757356eb3b48bbc21871f36a2c876acd2e2ba9d354c8f6e658f6e262fbbfd65fa4078d0adebc1353d87e40a
-EBUILD icdiff-1.9.1.ebuild 536 BLAKE2B d60063eca3c2d812a417176816040fd62b123aed33b5eb2516fa92ded176ccbf36ec19ee332afa071120cc864b5a18a4185b8619f8ed0d93360091c4f19506b3 SHA512 c9bc8e2fde7174cd30c30bd9ef64bc3f6a05f5b3011e7de401b2286743624fdc1f8c29992c7e75d52bef42b7653e63b808bb2afd14ce092e4af2f40a49d5b4dd
 EBUILD icdiff-1.9.5.ebuild 649 BLAKE2B f65c043228d2794185fdf83755067c9e775883ffcad4f966736ea5b32e2512c8a8b2474dc2eb57d1c8705299d7511d16d86b827fba6b00e654b6bbd43ac86ee8 SHA512 481e0674ecf0734c133c8fc94b48845ecc5ba7ff37d626bb427549492786fd6a9c65694a0fa29ab113ee47fb089f3eaf260b6003b9ec104551bbc71f96d25b44
 MISC metadata.xml 342 BLAKE2B f87cbd730938f6bdefcadea3d8c3d0635466b3e25597d1a5b8e7c85b6c8855698a19b29049c5b6e596696d15a91481527d16f83adc5c7ffaad39937d7bb9b951 SHA512 a897866e5d709999db69d3b1a4c8d1d1b15328970b27015f7549cf7b4fc6be688063f94fe31b0144227318c252e80bfd189fdf9f34dfdbf4dbfe0412e0b818ed
diff --git a/app-misc/icdiff/icdiff-1.9.1.ebuild b/app-misc/icdiff/icdiff-1.9.1.ebuild
deleted file mode 100644
index 970ccd6a9fbf..000000000000
--- a/app-misc/icdiff/icdiff-1.9.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="Colourized diff that supports side-by-side diffing"
-HOMEPAGE="https://www.jefftk.com/icdiff"
-SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DOCS=(README.md ChangeLog)
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-python_test() {
-	./test.sh "${EPYTHON%.*}" || die "Tests failed"
-}
diff --git a/app-misc/lfm/Manifest b/app-misc/lfm/Manifest
index fd90f94662d9..d2ea7092594c 100644
--- a/app-misc/lfm/Manifest
+++ b/app-misc/lfm/Manifest
@@ -1,3 +1,3 @@
 DIST lfm-3.1.tar.gz 88878 BLAKE2B 409b61d24de671db33c25ff78c039f690fb376fce7bf146c452a67e72d3b50d54b461994ae7a2fb9a17fb64fc94de83f58d5faa0bd960970a53ee5c42fc9c166 SHA512 9e6142c0d871fe19b4b82e5333e03de562ca87a7498bd7fb496cca27e0b42c56a33913f2a7eb46439447ab7adb4a87da44bfcc1548101e15703aaa21ec105af8
-EBUILD lfm-3.1.ebuild 451 BLAKE2B 4fcb8ad9bede7c22cda471cb1bc8395f9981ad279c380f2af4bcff746e50bcbfca260435719e1a218d9d23ec856233423b72ee5ba2c35e1cfcd0c3fa7cc7a509 SHA512 471f3479ba96298df8ad8c8ca8f06aefa4000ea28d23bece7f9d9440a176d4eb4df66e6a47cf38695d5e254239a8316eca853f0bc00d23171a3742e0e8479817
+EBUILD lfm-3.1.ebuild 450 BLAKE2B 99c077e2d7cf21c45e2ac1149434e32a9ec0464cfb22f31e4a362fe16bd2043d4c56d3c2df81654aa969cd3cf0b6944bf074c5f0026481a8491f9628219ef852 SHA512 c959191b3712c57cecda9b446cc8556e872ebe45e38bb6a71ecf09a3b9e48cf1f91d58e91361e31a1df0382449bf2edf22e7958900ac035beea9b7cc124dcdae
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/app-misc/lfm/lfm-3.1.ebuild b/app-misc/lfm/lfm-3.1.ebuild
index 29eb4f2afa98..16be760cb452 100644
--- a/app-misc/lfm/lfm-3.1.ebuild
+++ b/app-misc/lfm/lfm-3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="ncurses"
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1
diff --git a/app-misc/linux-logo/Manifest b/app-misc/linux-logo/Manifest
index c46039bc5c56..b20604b9519b 100644
--- a/app-misc/linux-logo/Manifest
+++ b/app-misc/linux-logo/Manifest
@@ -10,7 +10,7 @@ AUX linux_logo_creator 604 BLAKE2B f2956ddd3cf79488495262040b1756ffbbab5608a4895
 AUX logo-config 195 BLAKE2B 7ed5aa9a16ebcf27c73672bfc2e9256034c3c1b14c1d0d3d172b0292e658850a10c0cc8835e6fce224fd1664a85e6804f6d69c8fda5dffca257e0403eaa1557e SHA512 d58c60821d60d511f637d9abfd996b1420662df3bc5df8ce3ee2b3bd97974b4996a4a57ac18f8fdf5305cca3221244088d28e6d9ae5ee10d6df49f6247806469
 DIST linux_logo-5.11.tar.gz 103623 BLAKE2B 5790bae07a9496a690e0ef2d6426a68365c4ab91df058a31a5bffed38b8f3caac01b80ce49d52583f77632cc5e3061a20a5530437ca3508e823eeb88eb2e94cb SHA512 3c11d59eeb1ea613eb66d3ea5ef2d7c9ef906cb12430b9350570a6a1937ec174bdd974e6227358339c3fd2e0647a5066a0bea22289c4aa9bc8b03afb0033f114
 DIST linux_logo-6.0.tar.gz 117486 BLAKE2B 3340b893574f0c18561b208824cd80cff19c387d981af6ca63f56e691cebd2030e058ef367d91a999fd662592582da38b21a5a31f3f8364dbd87a43bd2c2b608 SHA512 ebd7513f90e79bb21acd984c671a1d1ce8421411d2b2948b01e6e08f7c9826184f9b9d528e0cfc814df8d8015d444a09c45025c344115ac9a6c2cff5743f03ad
-EBUILD linux-logo-5.11-r4.ebuild 2260 BLAKE2B 991a099bfe2644d2cdbc8a87bc6ad741bcaf957af788246bf9e9d80c0f4c40b013c8ab30b34877af053263b22d249266d6f2ed8d3681657c23ce1a9d43994d95 SHA512 9319f5f3d9db13737766bb2ab8bbd6a84c4a281106ff6d0f3ee171560b4201b23385797ee6ad1ce87f4017b79882cf98a32a7588ea2eb418b97bb0e52231e7be
+EBUILD linux-logo-5.11-r4.ebuild 2261 BLAKE2B bc8e64c3d10bf6efa6d8cb69f2117182176f3b48dbaeb33e198595a81ff7d1a48cec49be8ea6f8690db464d61138eca3c2cd12d29de1bd423eb7cb300295ab73 SHA512 becc70a568a70895990b8ff4259c1253124c9d9f38c5da0b1fba6c7ed3592f13f0cdf6916e42efa3c07445605c9394ef7c16fd374191af36631d4cde0febe4bf
 EBUILD linux-logo-5.11-r5.ebuild 2282 BLAKE2B beb00eaa05d1075dfae1ee11650e36e619a3c9773ac27d86e6485e2842af6bbf74957494aeaa31a310129e1af1338e32ed1bd8ba0aa88b9d546a48e02e9ff3e9 SHA512 c085b8f05f310098ef3effddc8ad3651fca8801d8d5ef6f0d62b205559dbc1ee4ec58402671e7fefb8dd76ea57a16c6889e5240d0c3a3a2d194078b674dab952
 EBUILD linux-logo-6.0.ebuild 2164 BLAKE2B 429e394ccb44b1d0359883405cbcd925ebb791418399bb5344a53380a300de6f7be2f96b125b17e54dca4f4f00e45db700e64346106b8e234905daef379818a8 SHA512 42212145ba364a016c4a7b551f2ba0fb04dd7cd60f4c7b4eac3ded055cd22391280c84b45c751585d6d4a1e643d18ae1ed6a7bce78bad7f1839c34c278805b62
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/app-misc/linux-logo/linux-logo-5.11-r4.ebuild b/app-misc/linux-logo/linux-logo-5.11-r4.ebuild
index e78323f95a05..7a01642f4e7b 100644
--- a/app-misc/linux-logo/linux-logo-5.11-r4.ebuild
+++ b/app-misc/linux-logo/linux-logo-5.11-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/app-misc/livecd-tools/Manifest b/app-misc/livecd-tools/Manifest
index bffdd8805b66..1aa5e16263ee 100644
--- a/app-misc/livecd-tools/Manifest
+++ b/app-misc/livecd-tools/Manifest
@@ -1,4 +1,4 @@
 DIST livecd-tools-2.8.tar.bz2 9991 BLAKE2B 4cee552aa384736a3c67b638d3a90efc64414c50112951a0021d84e811a836a803d2dd782f4e0af37e5ce02c7cefc0a06053d0debc3365ef7fe531f14903937e SHA512 66e74fccca4174352050a73b9b94f35084b76f6a768490d0d47ca2ffc590f32a53beb7f71d46bcacaf19a466cb5e3dc884cfd45de601c444326546b138d8300e
-EBUILD livecd-tools-2.8.ebuild 1017 BLAKE2B aa19d4a3360de7933a1e51e75c7151267a2fb0b3798cb3176bceb7829198fc1f11326a5d74ff5504419af4be518706155282af925c9c2edc13032df0f5019730 SHA512 44342e1a1cc4976b459e84cb7555ce92f37e97811d7465f3546a63046297dec07c9eadad8f4c42db0c92787f20c04cf1dfc210edf5b2ddca548014baa3494963
+EBUILD livecd-tools-2.8.ebuild 1018 BLAKE2B c9346c2fc8384c3e359cd3b852a3347d29cd2c2a6ccbba3c95275ab3579c2885b7c1fd67866fa5404496c3d573a3c9f41edc51f013370274cced77f0c36b0bb8 SHA512 196001176854559fef1ef16305d6474f0bb9435796583af18b25f468b8304950db470b477068db862cdffef0b781948ef9ee46b2807008876e6068e205544528
 EBUILD livecd-tools-9999.ebuild 1023 BLAKE2B fdf4ed97a881358baa903d620c9466d7b216e77af5f5da6713bfb7c1a526564381bb4d8424caa0118731cc3354a51d31a076b2132ce933b86b294e8d6d61fa4c SHA512 1bf0a83a0f52b0e1823a28cb3577771d8f0b8bb7235da01ce134eced8756e98c98d8f9e78316efb50871fe5bfdba0dab1adaf4de29e707af9479df5294a3134d
 MISC metadata.xml 256 BLAKE2B d02b5b33f7375594b6e77357966b74fd698579fcefce673bde9b7082e2a56a47b1b8824d5aa423ad7271113efc568997c476bc0106d147dbc1a198b201def869 SHA512 b301300f23bb631f440eef04dce17f16cfee618775d38013cfded6b0e8b806d772749578a39c43143104a1716d2cc6eefb3af7f6865d85da5b2cb6f1e78c7c68
diff --git a/app-misc/livecd-tools/livecd-tools-2.8.ebuild b/app-misc/livecd-tools/livecd-tools-2.8.ebuild
index 1a1442ff5e58..2105bbd658b3 100644
--- a/app-misc/livecd-tools/livecd-tools-2.8.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-2.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 32ccc7fefb90..b6a494ce3cfd 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,6 +1,6 @@
 AUX mc-4.8.25-alacritty-tmux.patch 429 BLAKE2B 2621145cb976e0f9c09abf1071752a2a89a7b143aedde63c7b0c447cb930f1647b0b8c63a96f5f69b6f7abf718ca3b7784e0fa5b30a507f2a8d32fa3923c738f SHA512 32e27a75c55b9044cb2d4c392974e5e9916f1e73755f578102c7826f97525c0410bcc16a1e8b9600d4facc8be7a90fbef4932ef622fb59dc7c1838ad448e5f59
 DIST mc-4.8.25.tar.xz 2488324 BLAKE2B 47047c85fbe3ce1c54b9a3477c35fb05d76b3688205bfd13db03844bb9d8b3e74498ef4d6b449cfcf79c0188687accd93602274b7e8c0cbffc5247d433e33272 SHA512 51913fd41df18b49498b97ad8e13aa4365cec24ab24169b1abe93209263e4cfea4b52e0faccaf934182c84e8eb5dc49336c885358b4b66c48d38900f890fde5e
-EBUILD mc-4.8.25-r1.ebuild 2871 BLAKE2B 5d9fc7fcdf3d9d6c3a7f8d31799d82d471f9259098724bc0ab0298c4888faa121f852035e1b95c2a7bfcdaf1072e09b380fa99dce47d456ab5b0313553cec16f SHA512 77b2f606b468b292ee958159166436e067cb082a6a5302b5271fc034ca97ba2eb35365f900f47c51503c4fb642a9e502cba1d2b8f0c47447d843ed302e458c64
+EBUILD mc-4.8.25-r1.ebuild 2867 BLAKE2B 8e04512c2845096098edc6f145aeba87e3a9fb81513e4afdcc096c14275786dad00b36f45e703f7218ad8ea74b253098677592397a774a379bfc0aab57717710 SHA512 5e441f5e8fe32be7853476923c62e260a8c8eab580fcd83d9fba4ba0276e38f81f1e1a8efa0eb52b015251dec244f1b31217d2cd610c1bb8b871a70201160943
 EBUILD mc-4.8.25.ebuild 2801 BLAKE2B e7d9bf37ea23557b49bb7862175aae72ec932ef1f03e965db0cddd86c97507adb826ea49dfbb6ea12f102b5558abc39f8d729cb99c6d51a9779ac238094ba02f SHA512 7aa941058c2b8236123787e527c37311245122a61d2524a35c5905807fef45accc4227e2475adba5b2bc1e9a9e6010a84afa603a301f1ea5ca7b628f599adb79
 EBUILD mc-9999.ebuild 3050 BLAKE2B 101a2fa59995345bbca727af306f2dc367ebb30028137f52bcc618235914e80fc8c2c8411fa859092a1fd1d4014c1d20b675f25f4a2d744f11db304c14b95e1f SHA512 ad30cbbe132a4e3ab2477e03fd4a4eaa2a518d3b237b27b90a37178288278211ff90af7a6d111442990ea055586bd181641ef8147e4e56b83aed4ef3263c4dfd
 MISC metadata.xml 773 BLAKE2B c7f3bb9bfb49c380a0493eabadcedec215df8696c5d52433aaccdffa0bf5ba3b89c77c291e19ed88c5ac29718e34eece1d3dabbc3ba6c1ec7862970f3900e204 SHA512 c5c0ca5a41a78cf746e14264b291f81ccffaa9c34a4149d27a9293cca8d304cb4844c07979b31218b250c3baeaccef2cba529c2ab43e81dc5552dca34ddbd4da
diff --git a/app-misc/mc/mc-4.8.25-r1.ebuild b/app-misc/mc/mc-4.8.25-r1.ebuild
index 636e8060c7d1..834105ebc361 100644
--- a/app-misc/mc/mc-4.8.25-r1.ebuild
+++ b/app-misc/mc/mc-4.8.25-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/mime-types/Manifest b/app-misc/mime-types/Manifest
index 0c70b86784c2..22571a18c877 100644
--- a/app-misc/mime-types/Manifest
+++ b/app-misc/mime-types/Manifest
@@ -1,3 +1,3 @@
 DIST mime-types-9.tar.bz2 15524 BLAKE2B 075f73f6d41a6b9100baf891378b12658c1370ac3aee8ba47cdb972cf30835eb2e9f6eb8a6314a7097dc5f90b091607519750860b065a2c4a822e26223925447 SHA512 066cea30c02a326e64680422b31aff0849c0a8c7486738f2edf339b88426c6ac5a365d4fa4c80c84df0fa4c39b5e13d45db314a1bf47ce369c132dd1c46130d6
-EBUILD mime-types-9.ebuild 591 BLAKE2B 9ef7940e4ed23c11d84dc131f94b5c55a5ee8b504f60e553401e32f68e333bc5734a2100806f0b608e53d0d389461e0abbd7298e542d9caa4724b188c794a883 SHA512 8a9ac4390005bd2b363fda77ae6498250f7d3b53785e0531f575262ed4717593a0d3343119bc127271d6de7579a5059e35e5467d73b612f62d8dfef09ae303de
+EBUILD mime-types-9.ebuild 571 BLAKE2B b0735dd64f659baa00a8e013a0af80edb71b99f13316fcf52d72712626d3bf18f1b7aa2cb009ea4c30a8cbd6276f80db3e528caa757b8954ea8c936e611d2706 SHA512 5a1387166e0e2c6299cb00c3281ee5652ca1087bb7c7ca941aa33741ed587146458732e1f44c84ff74509b99f229c8dd44d2c67e61bb72d5e8c3066bade9a87f
 MISC metadata.xml 243 BLAKE2B 01e59967c1ef8c4287aa399e0b64a651d273858118726001d0cc8c9450f219696f7827ede0f3613b0947613186bd98b31629a5dad3a9e67b0517b37d9e08843f SHA512 563d66eeb96298c8537589586287f9c8c6819985c37609ce4a26e0ecab1ce19192f99a73f63a4577193f90a371ff00ed2a15254a25be6061516b73d0c1141278
diff --git a/app-misc/mime-types/mime-types-9.ebuild b/app-misc/mime-types/mime-types-9.ebuild
index fd5c643f1077..c5dfb678b910 100644
--- a/app-misc/mime-types/mime-types-9.ebuild
+++ b/app-misc/mime-types/mime-types-9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index 2e761a526c1a..0aa9871890c3 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,10 +1,4 @@
-DIST neofetch-6.0.0.tar.gz 115538 BLAKE2B ec1a019c873a6c48ca150f51cfc76174b8df6af629530906a638f3f19fdae0e926cb7512b14c90aa9af6b6fb4652f2f6c72128535c2b833d307ad58e66af9c5f SHA512 2613bbc3bd50fb11fb511dd2d3d37f8e86891c9abab5f25e5956f4458c43abd555ff7d129a24f7e5ff4ed76f7c69235b696a77326bce11d81dd81eb414ab3a8d
-DIST neofetch-6.1.0.tar.gz 118346 BLAKE2B d9a08cf0b3f9164e8e42e25434d3e23e3c0ebac5e3fe3e770d7a2bde67b127078977fdb44fcc5e11703cafbe0f68332d6d7a4df8ced235d4dbd4a525afc171b1 SHA512 a68b5021d02d217ae5bc67f3d542afe4aebf1cc891f083e276b58847b1dff4419e036dbd7694b7c49c19c615b13eb54c22db3e69e6143c3f10f3fc1966a22a2e
-DIST neofetch-7.0.0.tar.gz 90892 BLAKE2B 7cee56b0b3dd49cfaddec99cd10594c5792a24dac54bae99af2bd5f13ac1a1f152fee917175a6ce911fc9b6eecb0e92cec287448f78ec714634c9fbff07a2e50 SHA512 84dde5b34b0defc24ac472efd4354483e0438c5bbed25f1f39cec53eeeee0a7d8f10dcace736b720f0e1dfbe55342ef3f5e866501bc62aee40a09bef90bf13b5
 DIST neofetch-7.1.0.tar.gz 95400 BLAKE2B 32368d461835d95ba8203c560b2f6733594966cbaf809d877a46c08675284288565e3a21b14d94900dd66b778dc975339196f182732e2cd8bc1ccc9e6da6253e SHA512 fe1013fb54585c15ba556054478a2c8c503120387e81bd16bfdfbb6f3a188ed4124585540abf43da9209cbbe0d7fb90d50914cd6620137d00f013cfb6954a042
-EBUILD neofetch-6.0.0.ebuild 637 BLAKE2B 5e6b83694bd417aefabc73221164f785bcb11de5bfc2865512349dad6c1c423aa9fdc49c805fb70a7ffd93ba08c41c116f028682a2515bb3cbfe6ea4c20d5ef6 SHA512 c2087360b880f6013e1a6a002a32665002318f06169ff6dbeb9907f62de0b76c81cb51f490f7ccb1bff2fd85a452cf064c23cac0db98d531dff9053d363d9765
-EBUILD neofetch-6.1.0.ebuild 646 BLAKE2B 603f174c94fd590bf63b5ab99c112831924b838a6ca2be34bfc8bcc4da6d800ac5e0f683b07c9aa4d5a050f9d7adff962302e3cb712ae739d458e3c91eb45dad SHA512 901681cf1a38b097f9a3e18ba42a95068e0041cb19d77bb060cb48aa80fd89bfd914e5002974d79883b5d025dd07ec496af09c2604adf6f43ee333435766d54e
-EBUILD neofetch-7.0.0.ebuild 653 BLAKE2B 0d40cc8f12b087114ca00f1710a0d557d1e970bda2a13ccd8f92fb696b804fde8965f85b71521e897b33fe79a18886e29959271a7a659b2e0cf64e46b660b0cd SHA512 eade9468c4c443ddc4edd8223bc80d68ce4751c8907f1785a64fbfb5db04886c49b3ef89e03b0dffd15336715fad54a97f18a945002a2ce169dedf7baf7a47cb
-EBUILD neofetch-7.1.0.ebuild 653 BLAKE2B 0d40cc8f12b087114ca00f1710a0d557d1e970bda2a13ccd8f92fb696b804fde8965f85b71521e897b33fe79a18886e29959271a7a659b2e0cf64e46b660b0cd SHA512 eade9468c4c443ddc4edd8223bc80d68ce4751c8907f1785a64fbfb5db04886c49b3ef89e03b0dffd15336715fad54a97f18a945002a2ce169dedf7baf7a47cb
+EBUILD neofetch-7.1.0.ebuild 651 BLAKE2B 77992a147b2dedde0d28eb14f3b10d89f607770f3e0c6b8a4da9814467b4af62e485ec30bce3829828218982f15d67d896e4036786e6b3687a19baa246e31863 SHA512 88bb1cb2ec51aa67916e6d23ceb74b98ee7b92c8b59011b5fb06f647ec83184d6be45f1d547783bcf810903effcfb207389e3470b88104a93c747d5a8fd450f2
 EBUILD neofetch-9999.ebuild 653 BLAKE2B 0d40cc8f12b087114ca00f1710a0d557d1e970bda2a13ccd8f92fb696b804fde8965f85b71521e897b33fe79a18886e29959271a7a659b2e0cf64e46b660b0cd SHA512 eade9468c4c443ddc4edd8223bc80d68ce4751c8907f1785a64fbfb5db04886c49b3ef89e03b0dffd15336715fad54a97f18a945002a2ce169dedf7baf7a47cb
-MISC metadata.xml 808 BLAKE2B 8f8f20ac1f262e69c525c9e626c64ea28ae3165982052dcf74fbcf76b8c362fe6407ddb5994d04dbff6f07ead6ad2c0e3bbe7f9a1a73bc194be30346a3f68c4f SHA512 9e28e51cfba1e7c648cc96d32c2c86a0341dc077457e9e62ce42d667f1a689407e65bf0b7d6df87526167b157b16bb7495752932036c9dff12052573c9f9dae3
+MISC metadata.xml 832 BLAKE2B c92c163b1e21732707fa19bcaf9bae3de4fb2affe29d8076cd36ccdb68e9f3409ac00db0b2e4bfaec02dbd15817de343ddd4b622b04aec83a05e1c3f87575a34 SHA512 8a81813a52396aa002730820d743f52baa96dda5e5ae8bf4c5058b80f04fcc7948e02839515a76d241b8064f77c02517806c1f1b94d8b59917c4fefcc8f8154a
diff --git a/app-misc/neofetch/metadata.xml b/app-misc/neofetch/metadata.xml
index 36155d9d6674..75a47774e2b3 100644
--- a/app-misc/neofetch/metadata.xml
+++ b/app-misc/neofetch/metadata.xml
@@ -9,6 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription lang="en">
 		neofetch is a script that gathers information about your system and
 		prints it to the terminal next to an image, a distro's logo or any
diff --git a/app-misc/neofetch/neofetch-6.0.0.ebuild b/app-misc/neofetch/neofetch-6.0.0.ebuild
deleted file mode 100644
index 102c239995d1..000000000000
--- a/app-misc/neofetch/neofetch-6.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~mips x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
-fi
-
-DESCRIPTION="Simple information system script"
-HOMEPAGE="https://github.com/dylanaraps/neofetch"
-LICENSE="MIT-with-advertising"
-SLOT="0"
-IUSE="X"
-
-RDEPEND="sys-apps/pciutils
-	X? (
-		media-gfx/imagemagick
-		media-libs/imlib2
-		www-client/w3m[imlib]
-		x11-apps/xprop
-		x11-apps/xrandr
-		x11-apps/xwininfo
-	)"
diff --git a/app-misc/neofetch/neofetch-6.1.0.ebuild b/app-misc/neofetch/neofetch-6.1.0.ebuild
deleted file mode 100644
index f3ecd1b3aa6d..000000000000
--- a/app-misc/neofetch/neofetch-6.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~mips ~ppc64 ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
-fi
-
-DESCRIPTION="Simple information system script"
-HOMEPAGE="https://github.com/dylanaraps/neofetch"
-LICENSE="MIT-with-advertising"
-SLOT="0"
-IUSE="X"
-
-RDEPEND="sys-apps/pciutils
-	X? (
-		media-gfx/imagemagick
-		media-libs/imlib2
-		www-client/w3m[imlib]
-		x11-apps/xprop
-		x11-apps/xrandr
-		x11-apps/xwininfo
-	)"
diff --git a/app-misc/neofetch/neofetch-7.0.0.ebuild b/app-misc/neofetch/neofetch-7.0.0.ebuild
deleted file mode 100644
index 2b82020241d3..000000000000
--- a/app-misc/neofetch/neofetch-7.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
-fi
-
-DESCRIPTION="Simple information system script"
-HOMEPAGE="https://github.com/dylanaraps/neofetch"
-LICENSE="MIT-with-advertising"
-SLOT="0"
-IUSE="X"
-
-RDEPEND="sys-apps/pciutils
-	X? (
-		media-gfx/imagemagick
-		media-libs/imlib2
-		www-client/w3m[imlib]
-		x11-apps/xprop
-		x11-apps/xrandr
-		x11-apps/xwininfo
-	)"
diff --git a/app-misc/neofetch/neofetch-7.1.0.ebuild b/app-misc/neofetch/neofetch-7.1.0.ebuild
index 2b82020241d3..1b5936a85115 100644
--- a/app-misc/neofetch/neofetch-7.1.0.ebuild
+++ b/app-misc/neofetch/neofetch-7.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~mips ~ppc64 x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
diff --git a/app-misc/pwsafe/Manifest b/app-misc/pwsafe/Manifest
index db2200db1c99..3e7c243d8f89 100644
--- a/app-misc/pwsafe/Manifest
+++ b/app-misc/pwsafe/Manifest
@@ -4,6 +4,5 @@ AUX pwsafe-0.2.0-fake-readline.patch 2667 BLAKE2B 297032d651ae485796fd4a21318241
 AUX pwsafe-0.2.0-man-page-option-syntax.patch 848 BLAKE2B d05bca68e0d8d224c059b4b949bf5fd590eede9840dafb03e6df37cd961d867db9bd5cb3be15fb804961fd51d2ba6196d035ab18622a4d19e0f6882b9d980856 SHA512 17697927e64e5bcdbc68343775732e1559dd7fe5c000b15fda9af7229f3c2c36bbd4ee3af3c652da9e8d0550acd1b5bb39a75891f5f40c37640ea089a5b6306e
 AUX pwsafe-0.2.0-printf.patch 1868 BLAKE2B 85ca5b70068dc50f6f650d766cf381dd2013640b45db0628df7137c5694a18783932e0effcb86f60b27a84aaedb77c25c86c281f4d05b357cea72961340a64be SHA512 7567e666f7dfb9c798aa2e6368ea1abf72f749c953da42bff7ef1b61aea6bf2faca96ef702ef9f7a9ceeece90999c066763006e549c5f2ec365cbf9358547449
 DIST pwsafe-0.2.0.tar.gz 127433 BLAKE2B abfcf36e3fc685100302b4dc7862cc8d8335e5dade40943cb0b7ef17b83dd2b75c36e3069d6bf759ba907e46adf20f3712af5223a8d8a586ae57e98ff6c0a3db SHA512 e8d3684f523f83def6317ef5561a02d1493685cfbda18707644bf335b7f45b1a548aae17a735838d9f6df345ddb17934607162a6e99348df625b34a9ad5f4cf3
-EBUILD pwsafe-0.2.0-r4.ebuild 1017 BLAKE2B 8ab2711772f5f83105c7456a19f829a2cec02d077a9fe890df142d580ebc9ad9dfc914b9fc0cd40c4e1803fa8ae55aa1d9899d2d163f68c28dc5be60b37bc840 SHA512 3a58950a8f72c0696cdee221c63b75536bde0f5095b609dd260442ef204675ee7f673ce4d7e2d94a40c1094ef34039d141126f402c952274a36672e28acd657f
 EBUILD pwsafe-0.2.0-r5.ebuild 1101 BLAKE2B 3d1dc24fd42c9ab1f9089c51ce0f8b7bbc40281fc268b579f0ca4cb61aab31d55a8e25938120862ee9a1d29a04976390c2744fed0141bf7bb746c29929d65e2f SHA512 28762ccc44bcfa5bb076e3de0bee12c47dbb20c923969e0f9b6e7fe8f817aefd7d78cc52ea2b160467d3b3d7cfb22dd97a0b3427d06c6aca1fbebe0522427822
 MISC metadata.xml 867 BLAKE2B b5a9fe61bf56a919e466f290917b0bdabc1fd36c493d95afdcee9afa21ca6a547169bb6f39a5a118a0eb25e478b8b487a1d7b37efc451fb4563f16db2a8c3b25 SHA512 e73ba53f01a694f4bc93857c94fd7e999295b3a8cf3990bd8e0699007131ff16bf1dcb64d946ea9832713bd960d68f5940e3dbe00786e5fa77de48b22c23cf2f
diff --git a/app-misc/pwsafe/pwsafe-0.2.0-r4.ebuild b/app-misc/pwsafe/pwsafe-0.2.0-r4.ebuild
deleted file mode 100644
index cd66440a6669..000000000000
--- a/app-misc/pwsafe/pwsafe-0.2.0-r4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A Password Safe compatible command-line password manager"
-HOMEPAGE="http://nsd.dyndns.org/pwsafe/"
-SRC_URI="http://nsd.dyndns.org/pwsafe/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="X libressl readline"
-
-DEPEND="sys-libs/ncurses:0=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	readline? ( sys-libs/readline:0= )
-	X? ( x11-libs/libSM
-		x11-libs/libICE
-		x11-libs/libXmu
-		x11-libs/libX11 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${P}-cvs-1.57.patch"
-	eapply -p0 "${FILESDIR}/${P}-printf.patch"
-	eapply -p0 "${FILESDIR}/${P}-fake-readline.patch"
-	eapply -p0 "${FILESDIR}/${P}-man-page-option-syntax.patch"
-	eapply -p0 "${FILESDIR}/${P}-XChangeProperty.patch"
-	eapply_user
-}
-
-src_configure() {
-	econf $(use_with X x) $(use_with readline)
-}
-
-src_install() {
-	doman pwsafe.1
-	dobin pwsafe
-	dodoc README NEWS
-}
diff --git a/app-misc/realpath/Manifest b/app-misc/realpath/Manifest
index 8791e52d7763..e45418c3281a 100644
--- a/app-misc/realpath/Manifest
+++ b/app-misc/realpath/Manifest
@@ -4,5 +4,5 @@ AUX realpath-1.16-nonls.patch 685 BLAKE2B 84e67f77ef5263e860dd74b665377279b81853
 AUX realpath-1.17-build.patch 1161 BLAKE2B cd5821e86f048bae80b224b8db2322170e40638fcbe2d4582a2f21ef6a5218a576528446422d8363ca2e6b4a7cf209de9ff355ab229a683382d095436a22845a SHA512 507df6759deaf43c7973c8d9bb1faeffc22003308cd2fc4f73270eac9ba347e605093f55110b5c86170597eba4f2c80ea7d15b5ccab4b3d0b75dcef09203c09f
 DIST realpath_1.18.tar.gz 17618 BLAKE2B c42cbade8022a0aaafbf012c5f4db899bdadac6d06743a64fa0cf58c0533e9574fe1389939d296986fc1307362399753f58650d9029bf240fc6dc980c17a59f4 SHA512 98daa53b7a6d4b40ea3ff9ea89b7cb97782dd53f031e41a228a5aa8d2a41ae7920cbc1e2213f568098496e5c25da1381f08fb939f8668733a3c391f744fd16ed
 DIST realpath_1.18_i386.deb 16426 BLAKE2B 934d4d61bda3ce069959f3cf818b8d0b206c95ef458487f12c8afa59014dc141dcdf0ebd18a9540dd3104358139ce7f9317aabd8027dca6883f55905cc198d83 SHA512 fb2062041f8089a5ff07f76a9833e9d8bbe9560d72d4d5803c9524aeb782f9f4a135921b9984432ccfa361edc785a0f33785377ddf031a07ed316861a00a6f37
-EBUILD realpath-1.18.ebuild 1905 BLAKE2B 9a1d6b65995913e45d4f4849f96b6022597529369c38184c710a1fe83f4eec0934fb5258b97dad2fdf994a9c89115a8f91a4f66743c0abb4d4e4b9fd16f03efd SHA512 2ebc0618b179a707f7eff362d29f362e9610c5f1beac2f7235cab5e457585057053ae59f11405314da112238d7ae054423060e0ee22e477036e9e29d40793ec0
+EBUILD realpath-1.18.ebuild 1894 BLAKE2B 0e4652b82a77a7bed57af8b41b252652135c14a864b8f298830c2203fd213c66e0ad8f1d23d99ef7e960540834768d76a5d94f42ccd0aa27654aacea7ff504fa SHA512 ab54eb33e0fbdfaf8b0e526211d719125812796b3716ddf44cb92a98b466d8795efe778593d4c654950fb20d7f9160d04af37595df7dd195d6e5d900e0f64c65
 MISC metadata.xml 437 BLAKE2B 57ad5c49f2a37e30ac6d2f4e4a169f3fca789aa45169d0b9acfb16ab2bdf714c0b2c32cc2c609dc96e6ba516991b667884714d4bb7fb74b9fb519ae3d4b32c23 SHA512 db21930053e4af656fc8043dd5f60b8a78010aacb019435076db21c201fe0bafb4e742e347c430026991ff32819cb30c9e17819a302dc927c2b513301b5d06a1
diff --git a/app-misc/realpath/realpath-1.18.ebuild b/app-misc/realpath/realpath-1.18.ebuild
index 8710e8c8fb4d..71ad4628058e 100644
--- a/app-misc/realpath/realpath-1.18.ebuild
+++ b/app-misc/realpath/realpath-1.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-misc/rlwrap/Manifest b/app-misc/rlwrap/Manifest
index 3972957fb0eb..a02f17be29a2 100644
--- a/app-misc/rlwrap/Manifest
+++ b/app-misc/rlwrap/Manifest
@@ -1,6 +1,6 @@
 DIST rlwrap-0.42.tar.gz 279608 BLAKE2B e8569d35cb0b8b3309af71122c1a48039fe559372648fe05c73f0a545c4efbae75aadaf80faa302033134cbd569ab90b9d314e2bd2c1bc387fd1434d39418245 SHA512 991885e75aabf0d43581d59f7c78f7f64c3f32072de08ff5796cba75c0716548d2186cbe2d739f3e772871e3586d036f069db73b2ee8a30b2f7985088d0f68df
 DIST rlwrap-0.43.tar.gz 313139 BLAKE2B d2aaf32abe69b0307321192542c88acbf5af00e23476e7205cddbc8c5adbab4c5a10090d8ef04e9adfc62209f37f101bfc3e294e634379844417c80540485532 SHA512 4a1440b2eef3a1664c6381eb09c19f4030de2c0ef4f1f3509f7d6e130d3c5e9c3ceb00fc6ea6052b22bbe1f6b162f72e0b47564df34ccecc5220f195c22e86a1
-EBUILD rlwrap-0.42-r1.ebuild 524 BLAKE2B a91644358950129e12d6b74641b874f8102d8890d0654ce54f106f4516dc76a689b6ab06c3d7dca573127120cdad72ec2f8262fb9ce2ee37f14e378d161075d4 SHA512 6f8cff5a06edb8e5c2dc6b1cc72aa8704eafa79d8014175955a8b387a8825f90768c111facfe6d7fd7de1af4d92146b2539efccd7e0f772285b793376b78c1ed
-EBUILD rlwrap-0.42.ebuild 624 BLAKE2B 41647de4c2b5e7732db0c76ddec7b43dc9b2f815600730a57ef1d6cd2c8cb6104d8bd625f4d4f676c252acd602b42af5762f208a147bbafc11304d45598ea0ba SHA512 c377ae7f3da1b4bf61b3ef0332e79e29f9a4e85dc48cbe48d95165f919249ba45c9152e3bf858d03513c3599f406cb509641d771f02cc0c951e794e29d6c65c9
-EBUILD rlwrap-0.43.ebuild 602 BLAKE2B 8cee19013278beb1c218ea6730fbf5e8e1edf8e581e921843010be140f55db2c2fb68dd682fe0a331fcb3dd184e7951996ef9ae2ae631819f3b5eb33a39cb221 SHA512 8778074bdf47a91d2de60d5da476eef60f0ce5a18a351582fb47e97313d9e7d94c9ca5105ff8c317f6bd88cb72a5c657b269048257bc11798e520a2f2b2e10bb
+EBUILD rlwrap-0.42-r1.ebuild 512 BLAKE2B 0eb0a3210d230feda602f691a1655abd98da71ca08f96ed1d34491f9de224b47c6b45051f9506fb7d1706a6c46ded69c3e399d2f7ae28e8ac6a3ee41b5669cf1 SHA512 9e9c1c9b8586d20f1bca1d5e107df96e0237e63edc910e079dca45a3f67c28db957e4fece10ca6a26669d3d72a979255fdd22ff97d5a1e6dd54f764425956d82
+EBUILD rlwrap-0.42.ebuild 612 BLAKE2B fc97e0399a54da67a5179382f8807d9a9c9c565cfeb1f301fbf2a7d1d4ff5ca1bd3083173a113f829bf6d6250636a7349dfe5c1efde43fa426011f55ac157cc0 SHA512 53b62b7af750fe625f62836e18af0f8cfecc26646c33a587b922ce20140222059f75efc3fba378b1e3171a1bfb2a2fc8800dcd22aa76837df3a985f09575e973
+EBUILD rlwrap-0.43.ebuild 590 BLAKE2B e734819dbe972055063296990f0a2e2f243c7189aaf05be6516317f02e70eac18653ea1b1c55e2e670cbb34f65e04deae2f89431fafc770dd9443b4f529960ed SHA512 05285c3661298486553dd3a876520285d999e57662d3c093ccb018f924d10bf7ddc06da9df25463c144f56c5cd1fc9b9240ff9ec87deb8a7a47303643711f056
 MISC metadata.xml 707 BLAKE2B cb970829cfc9eca1dc9dfc2cab28410f39c8a7ad2dfffb44d52e093653d43ff20f1a3b622aa6fe8c35091c79d45d1db1d4ab6244ad3d7d9c9083813dde4d17b0 SHA512 8f6da0c6c96533098cd750c1dc4cbae6d94bbf4a285561ba52a3fb1ab414ead6a4f1e1a600cd120cda4355a5c52365938921ee43df560015296f15528d79c8ff
diff --git a/app-misc/rlwrap/rlwrap-0.42-r1.ebuild b/app-misc/rlwrap/rlwrap-0.42-r1.ebuild
index ab1551ea5406..42fbc4afe628 100644
--- a/app-misc/rlwrap/rlwrap-0.42-r1.ebuild
+++ b/app-misc/rlwrap/rlwrap-0.42-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://utopia.knoware.nl/~hlub/uck/rlwrap/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~mips ~ppc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug"
 
 RDEPEND="sys-libs/readline:0="
diff --git a/app-misc/rlwrap/rlwrap-0.42.ebuild b/app-misc/rlwrap/rlwrap-0.42.ebuild
index 3d2669f8328d..affe9f4c10d1 100644
--- a/app-misc/rlwrap/rlwrap-0.42.ebuild
+++ b/app-misc/rlwrap/rlwrap-0.42.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="http://utopia.knoware.nl/~hlub/uck/rlwrap/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~mips ppc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug"
 
 RDEPEND="sys-libs/readline:0="
diff --git a/app-misc/rlwrap/rlwrap-0.43.ebuild b/app-misc/rlwrap/rlwrap-0.43.ebuild
index 1c8556e3799d..b2942ab6cbfa 100644
--- a/app-misc/rlwrap/rlwrap-0.43.ebuild
+++ b/app-misc/rlwrap/rlwrap-0.43.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/hanslub42/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~mips ~ppc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug"
 
 RDEPEND="sys-libs/readline:0="
diff --git a/app-misc/screenie/Manifest b/app-misc/screenie/Manifest
index cefb4b026010..483156c350e6 100644
--- a/app-misc/screenie/Manifest
+++ b/app-misc/screenie/Manifest
@@ -1,3 +1,3 @@
 DIST screenie-20120406.tar.gz 3437 BLAKE2B 354410d41e1aa9c6bcef3951f26aafcabf8e5af5ba4abd69627e62575127c1190abc78db4ee72552b02ad5cbcde0b6c910dfbb9191f2fd8444e57dff36d16701 SHA512 73e9c9cf53792c51785d45319f65559f5d8f1c97f8637d3c3262384eb1a3835f3ba380e4c9284858e163e8d2021938c2ef3ab50f2854d5f932e96847b9a4c153
-EBUILD screenie-20120406.ebuild 470 BLAKE2B 5c3c462d06b9a765933199fd2b6e4e2960f82ca92b6edb576943c1750ea8836e14f36cf6de67fcb1fe75c04fe7001888440bdadaaa7e7b47efc8714ff112cf0e SHA512 d17c4fc9133702ec702b0dd5f25270d099d220e0dbb198cab298069b1d01013790ab7f5dd99102827216ca366f431faf6077997f1616989fee34d092e1b5baea
+EBUILD screenie-20120406.ebuild 471 BLAKE2B 5f6a4274fc87aa6da519024e6d5c2b982ce7a629d42a936f4ecb5ada1da49c9d7b287b87aabf161f4d7b709352a0d320ee2f30acb427d99e6e69386e375d6836 SHA512 44ed5cf2a69b3505fcb2df0b8d16734604af455d7e651c90885ebc230668d1fcbf6eaacacb913e8c2c354d1f35cdbc3f27defabc3755ba8accd8664e25ddbd06
 MISC metadata.xml 662 BLAKE2B 0c32c03641dcd4c9bb279e3c17ba672258ccfa45ef03dcba773344bad57ed910372425d12debf1af02a15f6a9971e32ca0716b7260b8f641bc84e199c31c423c SHA512 7e94f65c55ea3e466d07eaee0f69f5669da66c02ef433b75c766bdaaf403a88e9124a96cddc6a8621278e36ac68e83cdb197410faf2adfd6255f87ab7469da25
diff --git a/app-misc/screenie/screenie-20120406.ebuild b/app-misc/screenie/screenie-20120406.ebuild
index ad452493da10..98f7088a8bfa 100644
--- a/app-misc/screenie/screenie-20120406.ebuild
+++ b/app-misc/screenie/screenie-20120406.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://downloads.sourceforge.net/project/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ia64 sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 sparc x86"
 
 RDEPEND="app-misc/screen"
 
diff --git a/app-misc/sl/Manifest b/app-misc/sl/Manifest
index 9912fbfda9d6..79702d3ad733 100644
--- a/app-misc/sl/Manifest
+++ b/app-misc/sl/Manifest
@@ -1,3 +1,3 @@
 DIST sl-5.02.tar.gz 5353 BLAKE2B dd8513bf22cf209fe69e28b4f3de5b11db6cdb8afe375fd32ef40c7b21b2ec39dbf2d71a260c13fd440219fb1209957beb1026d065628af45f6f2ebd0437956e SHA512 a4d18bc79d7e0eca7748b10226a6b2a85a7a01d636e4e9215bf524a7849bc5cb250034326e5a69f7423d79e40b92182fddc0e56e25df616edae06369c782cb26
-EBUILD sl-5.02.ebuild 950 BLAKE2B eac96277aa2b4629c5aae03616baeb754a047ddb8b599657884556dfb4fcb9560c17397823d27329c48c749639e601750b0333f60d5e10a43bc9882e4f7c27c8 SHA512 eb6d6489cfaa6678969805372eec3e987de7caf0a15601cacc2c51c6ed3df3c2e0c263bf76fbf26b43740401465beebb749ca6ecd28482a80beb8d15b6d5de71
+EBUILD sl-5.02.ebuild 951 BLAKE2B 380079532d539d86db6e90b7427e303e42684f7bb85e19f51d414aa7b12b446b07df42e4c35ceb7071379e8afa61c31055fd560e3d1c4b32068a51034a1d045f SHA512 a3a38c6c5954cbaf6e05f2d2cdb0d172d75254d1c301e6dc36aa0a6fbfbb2e5d6e36afd360a8d6ce7f897dfaaeee69b272c8cfd33a4df188d237f0960a808089
 MISC metadata.xml 607 BLAKE2B 340be599aa5fc6dbf2f9848c0514b15dde7fa7daf94006c97b39fa693002157472b6b653fc40de67bd8e6fe0f1c2798769790f5a7ebaccff63e4035b7a8255eb SHA512 7f3cdb880453bbea4ae1cc7932e640331ec88693dfac15ab059e6579648834a958e20e8d1396c1beab386247c95724abad199ec7cd607e5fd66c4fd519bb4a5c
diff --git a/app-misc/sl/sl-5.02.ebuild b/app-misc/sl/sl-5.02.ebuild
index 84dd9b3cc221..757ac7f1597b 100644
--- a/app-misc/sl/sl-5.02.ebuild
+++ b/app-misc/sl/sl-5.02.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mtoyoda/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Toyoda"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="l10n_ja"
 
 RDEPEND="sys-libs/ncurses:0="
diff --git a/app-misc/symlinks/Manifest b/app-misc/symlinks/Manifest
index 160e5bdaade5..d8bd2e8101da 100644
--- a/app-misc/symlinks/Manifest
+++ b/app-misc/symlinks/Manifest
@@ -1,3 +1,3 @@
 DIST symlinks-1.4.tar.gz 4942 BLAKE2B 983c16bd5dedbca3f3544756a1e5de4939eb31e871c72110224f7e63821cec69289d9a1e152081d9895230670b96ed813ef0692ea0922d9a52d5050ade723893 SHA512 d1efb1ca553cc9eb95f1d113e453acd22c9f0964eacec985c85c125de23ae9d636b9ced182c2673f455e5d897ad15a978a424170fce767ccc492443eac7f972f
-EBUILD symlinks-1.4-r3.ebuild 829 BLAKE2B 2957c2af80c0a506a8a61108f22be61c3959e068beea0bad18724ebf89168aa3a5dc5b9ca3d016fbea24527b59cfe92571c07b480895f5a25799b176c4ac6b85 SHA512 721f27b410de9bb7ba8c9f1ff8dd82b22c6f1ffc89c0df54d43d8675d11b10e1c28948154f8d10315982540af25f85b4e8629a67d7ba9b3988e755800cb6fd1d
+EBUILD symlinks-1.4-r3.ebuild 830 BLAKE2B 3feebce839e2449f839e8867fd2a25027c08ad6a9f5ea273ddf22dbacd3a9bfde8fec42d335ecf77971fe987ac16042f4d2141c8c107e935cefa0a1e2094282f SHA512 ce63229f8c2b53f168dc6192ff5fe29ab2e14cfc63164e5be3f33e36a24b1fd3ac3db058d30f40face450f2068dfea0ef2e5353d4e2cb351a17d766548122263
 MISC metadata.xml 631 BLAKE2B 426a6a4bb3909963d06f6e33a29a5944dc436f9951d77ba4e63f322b70d74243f317f3fd4fdfe35ee0d767f16448473177b2fa22edb8746f35786bfc988ff217 SHA512 69594f3511101cf9f9b3d172b0767a3b6de62a22157517ee8d55fd6dec41ff942c54563058eb0a3fd49f024ae331b143e177c026ab778dbc86f7081b6ab3051d
diff --git a/app-misc/symlinks/symlinks-1.4-r3.ebuild b/app-misc/symlinks/symlinks-1.4-r3.ebuild
index b755b9ef5d5b..25019d1e13d9 100644
--- a/app-misc/symlinks/symlinks-1.4-r3.ebuild
+++ b/app-misc/symlinks/symlinks-1.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ibiblio.org/pub/linux/utils/file/${P}.tar.gz"
 
 LICENSE="symlinks"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="static"
 
 DOCS=( symlinks.lsm )
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index d9857a6a0400..ef2cfd832262 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,6 +1,6 @@
 AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4d31b4f7a3f9bcf8d3dfa38fc186a603a90fe734b25781b9d517115c2b089648c29e4605fa9610f6dc311a SHA512 505d5ec4fa1d7844870c67aedccac3a147db1971464fc21d19319bb343fb6fd73b696e85298f8592e46900774b35b250cc53841b05514333c44c3e973bcdb860
 DIST tmux-3.1c.tar.gz 561323 BLAKE2B c6f688a854e128acffa140321a5dd00e4ca090ff79c7cbff15febbca6da9f7626c675fe1820b344637ff0fbe94ae6d0da7f111880ce5d74f97c4b6a90ceef802 SHA512 aad2e6457dd350369f245f711f1936a575d0588b72e660d10e7abc7d373da0d322903b451ad00b96a3e0e6847ca855673da6a4c5447cea91fa756edd23659397
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
-EBUILD tmux-3.1c.ebuild 1675 BLAKE2B cc2d5516ed1f0615223fe5d622a9ea68b4327fd5cec9aaf19f64f6494cbde2427ad8b3f9516e875f0518d4dad8841ea383f279db5aedcd16b7720768907125a5 SHA512 687419baa26269d72d99ac1a1b5a297ff8ee7a614fba0cb88dcc227f2ad66b9a1a974c937ff96abff071a6fc13844a89d146501e01cac3ac044cd3a71f3dd415
+EBUILD tmux-3.1c.ebuild 1676 BLAKE2B 9e2176ae445a18f3e83526dd915c0ffd6bed8bc5f382cdb646f21709bf29ad8e8ba82c4022b1cda794d02013efede30da8fcb4861605c17d7a82373ac8d96b2a SHA512 e4b4389ae8b6efb3f547a5fd1bdbb694acc016db939c29a6737bc50fbd7d35785dac34a4493883bdd948fd9de7913e9b747c04a76b64ec0f9897c10ae46ba6ec
 EBUILD tmux-9999.ebuild 1686 BLAKE2B 8735eceb5eac657eeacd268a2baf4142d28c47bc74d3006d9f4eff6a7370cf1b60c33e5de2365114ea5fbd60c5988501f67867dacc0f5fc3dc156106c20bb6a0 SHA512 63ea6967ca335e3b35487562de29e2044fbeac498764b9c312df74a8dfc2f669901761f816d8ec1f8eb0668fc77757c7c62393df663738dfd79e4b8e453eb48b
 MISC metadata.xml 816 BLAKE2B 57b1d27728b6fb3557e53a27bcd0f116fdcfe88175f3ceee0064beaeb14568852b15275051cd6ec8ea5cc3ce9efa7e1f084d74791b60eab12a5e6c835321deec SHA512 d459641a31d19297ef85b8dddcb487221eebd25e4f3d8d0e88c7c394654e9b60e58a60433c21b32ff24226f5c4d16e9e059b5af6330bd0698367019f0740e2e8
diff --git a/app-misc/tmux/tmux-3.1c.ebuild b/app-misc/tmux/tmux-3.1c.ebuild
index 45cd420cb8c4..3ecc0d17f466 100644
--- a/app-misc/tmux/tmux-3.1c.ebuild
+++ b/app-misc/tmux/tmux-3.1c.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index b000047aedca..d17689d07094 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -3,8 +3,8 @@ AUX uptimed.service 209 BLAKE2B 9f763df7f903aa9a2563041acad553906e0a69faf93280bc
 DIST uptimed-0.4.1.tar.gz 55162 BLAKE2B c281f922ed4fcf4f55571f1f1177451bf9f2e0fecfc87566610e1d24055969cd61543fcb0fdae4d0e6dc7a082c1b9013a08b72641d572a2475e9c7f5fd56deae SHA512 5dfe79aebab8c8daca3a3ec88d54e312446fc7cf8b54ef1414cbfcb3fb25053ef31235de4b42cb14fc7352965b77ca2875c753b97b4d61178792a5484715e23a
 DIST uptimed-0.4.2.tar.gz 55339 BLAKE2B 120a3b1d6dc9518f7051af4d7e0f1bcf455f7dd989687fa8f5a40f160f2912c21d09298bbb9c676af5387d96890a98acf3f21b60e046a9548a735ca10dbc4006 SHA512 a18cc8580a4dc7db7f4d97d70e25d76e7b98b9d328a0fa4ece4176d40fc26589149d63ffc9d2638cc35003cf485b43ae6e115aa1821c662d77f234eb3c4c0a4f
 DIST uptimed-0.4.3.tar.gz 55396 BLAKE2B bebea6559c436d2700df905b63fabd73b1c55463e8633409bc05cd16c7d110d8116f52e00d63879cfb2e0482f648bda04dcb5a1d5ff629699d2758dcc85ba53a SHA512 f9485224dfe7173bab135a87b047d749f9b61d3c29d50523126b585ae77e68837680fdb725a08fd7cad39f0b35b2da7a6923b8540700881f9638286ab5082260
-EBUILD uptimed-0.4.1-r1.ebuild 1572 BLAKE2B d671cc82a3e76873eaa2ae175208196157a4bb9fcd0edb0ce94ae6328ed399d2537709bb079bcaf156682161d7578a533e817b35e0d81cb9f5120f0bfce177b6 SHA512 cba8c853d8bae0720a8c9c8a90b9e2a6be75be297b6840ec04bc5f50351117941b95ff2c74e37e520ee5fece5d631e61c5f7031e39fbb9bec9aa693f62fd9ab4
+EBUILD uptimed-0.4.1-r1.ebuild 1573 BLAKE2B 0a3565d49f793f34ee7942032460cf363d0fecf4603b86e256c154c634a528b446a641559f25b41340f00755346839876a2b024e37236e3269a28ad41747010a SHA512 b8417df07778fe93a935a1217b26992846ecf7389046c3ddfe8ef4b76960e5d86afd48f6c623972d9d463dd04b6deb83c965ee3a55ee1c93007e62760f3f332d
 EBUILD uptimed-0.4.1-r2.ebuild 1603 BLAKE2B 2fe5cb29ef9c1cc6c77898bc79ef14be68d90c8576bd2764cc939d4bbfb5d59dd9bc990618b7bcaa953335ccb3699d4558f3b96717b39886d107729fb01bb0be SHA512 c0a42a785ae77e3b4b79c0f7fef99696553294d5e54472b85b9990a6d562e76010f9903f46513899a103cd56edb6ba84345cc61f9bb621925da70e7ae6058e2b
-EBUILD uptimed-0.4.2.ebuild 1604 BLAKE2B de9bb7230f1ce7d088ec8d8c14f1d11195f6a28b1e5e899b80bddffab300bf2f9cdb130833ed7028826662c9f11674b13e26a4475c724c080f74c563b899af74 SHA512 aef3c2466a5e9bba70f7384630b31cdb0d7c88d293955c26e0891e976c2404803008b00f8298f6a3e3e4bf192cb8d1fc8a4b36fa2ac39bcebaae9de1358c82dd
+EBUILD uptimed-0.4.2.ebuild 1605 BLAKE2B f66561abfb9ab1ffab3f6ed3ef7aecb923f3a4727c52c82427c919057f506b34233dec125821cfefa5b0ad015a722c9b56be76ebf4f90341fd8da58175f2b638 SHA512 5a6e71aaa998f1ebec32c35a0cc3862cde612a2928a6cb8257e3e4ef8fcf97ffa384ec4392f2834164a0e85161fa7638930eff599755481df4c33475a0704996
 EBUILD uptimed-0.4.3.ebuild 1610 BLAKE2B d0e7bfc42af1f58fbb2ad1af6be005fd1205d3b2a02ea54df3436dfa7c1433c5c251db06db0eb4318276272103ed2fc39757008c0890393ea41c58cb89568f64 SHA512 55a244d867c1c3fe7c6b59b075664e8d9dda6fb20f0445b59c19f3a5162deb027fa6743b02190ce7045f43c13b1e7835a707ef20b2d3d5f3c8e13f2cfc97b9ee
 MISC metadata.xml 343 BLAKE2B c84e06dd0bdd9ae4d3b36bf4795c51e9037c38401f8d3fadeb9853190e8291f82f370ac45afab0f79326c89dcfb359d139a08a490ca4f7418738f61d8d0d1f02 SHA512 59bdf10b3845f10cfbb9441ccd3ac6d8a7a85791f57acc2148ad334d0b9883d4d98b388bc93eacdec8a77ac885339e2aea368a9755bbda483132ec69c68a430f
diff --git a/app-misc/uptimed/uptimed-0.4.1-r1.ebuild b/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
index 4baa78134245..abc5e89c99e0 100644
--- a/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 pkg_setup() {
diff --git a/app-misc/uptimed/uptimed-0.4.2.ebuild b/app-misc/uptimed/uptimed-0.4.2.ebuild
index b5ad54d55125..889f23dba921 100644
--- a/app-misc/uptimed/uptimed-0.4.2.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-misc/utimer/Manifest b/app-misc/utimer/Manifest
index 21464f189e2c..43d61ca8298c 100644
--- a/app-misc/utimer/Manifest
+++ b/app-misc/utimer/Manifest
@@ -1,3 +1,5 @@
+AUX utimer-0.4-fno-common.patch 672 BLAKE2B 2a325b112f2be43780e5e60a134c305859055b5e1c0af11e4d2ebc856d97fb550835f99ea67ca118022a52ecee65ca190c567cf0bd8faf719c0e319007b71a1b SHA512 a52e79c326022d893692d6b79b5240a758186172608373c099d18a60b65d3d50343071c6936647c8be58c7959a959704aeee08e87cc5da8708b0735640a18374
+AUX utimer-0.4-locale.patch 188 BLAKE2B 57e8f72c6541e1b161186ee4043c4685bb9593cd257bac5c11d7b80beeac627e434c60ee434036af5154636af7fbcb763a1d7d20da5e0226f193d488372b8845 SHA512 8c5d8c614def996e147dc89acad2e5a844413a5e16845bf76dd44761a3a2ac510b148eb72db0ab2e34d4d4d7097c60f3dc245b0ac4f99cf22eb700791d4f69bd
 DIST utimer-0.4.tar.gz 144408 BLAKE2B c23178e8501034c491d5350ef5d6ec4c251dac982f453f0b99cf6b4aeca81132acaa6abd40981ae9f8054f00c27c8f05404d0e2cd806cafc130f0a8d3c23f814 SHA512 f1a375de4b4b5b0f478e208e055badb12a49524137cbd9626238bc5fc35cf3576e7a7c66759dd00a061d12dc7a0ad3ee6974abc8213f5f6f8e22c50eb2901032
-EBUILD utimer-0.4-r1.ebuild 665 BLAKE2B 6e2bfbf7a9d0f1aab60a8d5b69d1ea3727729a8b26c8e36f951da2315c86f890db1d3318f8369d1fd7b270c5911985da1c4acf24769025b83c6ba67701c1f786 SHA512 3a03b5be2a019b9319e16f903da9bafccb920a4d9cf8ad4a7ca9396d79adbba9fee1801c0abfcaf11389c8bb17b9d2e6500bd652c98e15e6c680b4d9529e3a23
+EBUILD utimer-0.4-r1.ebuild 613 BLAKE2B cd8164d4e0d22b5317fa0eaca07d2f330a4bba770bf7819c50d5916a8410e6352f763cf180c7f7b14fc13cee0c2a4815b9c14bb511372b1468649cba945e22a4 SHA512 9ba26c95372b88ffd991f11c829f0915a290cbb4f2b83f0dbb62eb0741a94325188d4bafb2c6cea77b149a70d2be365bf2ec7a851124a977eb681b5134f57072
 MISC metadata.xml 349 BLAKE2B 7c7669d3a1a33cea3684b7fe7d3cac9f45cb0c93c71a28314084c1b6a418774003afadfd7b8f204db91509c188fb46d6a43271ffc745d3bb933221cd4bf519c9 SHA512 36bc7a82cebaf4a6915d78a65a3d69f845b139a699bc9a6b1d0137749bd0e210d6973cdecb8d68d50363f60baa5ed14af59b53d1414149c1115261d94910acd4
diff --git a/app-misc/utimer/files/utimer-0.4-fno-common.patch b/app-misc/utimer/files/utimer-0.4-fno-common.patch
new file mode 100644
index 000000000000..a8386fe8e215
--- /dev/null
+++ b/app-misc/utimer/files/utimer-0.4-fno-common.patch
@@ -0,0 +1,29 @@
+--- a/src/utimer.h
++++ b/src/utimer.h
+@@ -66,9 +66,9 @@
+ #define TIMER_PRINT_RATE_MSEC  79
+ #define TIMER_CHECK_RATE_MSEC  500
+ 
+-GMainLoop         *loop;
+-gboolean          paused;
+-struct termios    savedttystate;
+-Config            ut_config;
++extern GMainLoop         *loop;
++extern gboolean          paused;
++extern struct termios    savedttystate;
++extern Config            ut_config;
+ 
+ #endif /* UTIMER_H */
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -36,6 +36,10 @@
+ #include "utils.h"
+ #include "utimer.h"
+ 
++GMainLoop         *loop;
++gboolean          paused;
++struct termios    savedttystate;
++Config            ut_config;
+ 
+ gulong ul_add (gulong a, gulong b)
+ {
diff --git a/app-misc/utimer/files/utimer-0.4-locale.patch b/app-misc/utimer/files/utimer-0.4-locale.patch
new file mode 100644
index 000000000000..68acdd471a39
--- /dev/null
+++ b/app-misc/utimer/files/utimer-0.4-locale.patch
@@ -0,0 +1,10 @@
+--- a/src/utimer.h
++++ b/src/utimer.h
+@@ -35,6 +35,7 @@
+ #include <stdlib.h>
+ #include <glib.h>
+ #include <glib/gi18n-lib.h>
++#include <locale.h>
+ 
+ #include "utils.h"
+ #include "timer.h"
diff --git a/app-misc/utimer/utimer-0.4-r1.ebuild b/app-misc/utimer/utimer-0.4-r1.ebuild
index bf5c8f9fd36b..d3055fbb083f 100644
--- a/app-misc/utimer/utimer-0.4-r1.ebuild
+++ b/app-misc/utimer/utimer-0.4-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A command line timer and stopwatch"
 HOMEPAGE="http://utimer.codealpha.net/utimer"
@@ -12,21 +12,19 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug nls"
 
-DEPEND="
+RDEPEND="
 	dev-libs/glib:2
 	dev-util/intltool"
+DEPEND="${RDEPEND}"
 
-RDEPEND="${RDEPEND}"
-
+PATCHES=(
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-locale.patch
+)
 DOCS=( AUTHORS ChangeLog NEWS README )
 
 src_configure() {
-	local myconf=( --enable-debug=no )
-	use debug || myconf=( --enable-debug=yes )
-	econf "${myconf[@]}" $(use_enable nls)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	einstalldocs
+	econf \
+		$(use_enable debug) \
+		$(use_enable nls)
 }
diff --git a/app-misc/vcp/Manifest b/app-misc/vcp/Manifest
index b8b3d340d759..8d17fcc7aa1a 100644
--- a/app-misc/vcp/Manifest
+++ b/app-misc/vcp/Manifest
@@ -1,4 +1,5 @@
+AUX vcp-2.2-fno-common.patch 905 BLAKE2B 8c38e14d3b90176d196d30bae5f2770b2b13b5f95d02f78180eebfce283819d8d9cbdb2795128bf41130e6772b8f3625d1e238a83c8603a2cd8b8611802f119a SHA512 92d229db834ec3c26405d037a80b42a0404f74034ac9c23925ff0320b70e5060148dffed0a96c7090b14a4ae5479c1168741175b70342ff21682dde5af8aabb3
 AUX vcp-2.2-tinfo.patch 310 BLAKE2B 31ebbb498615f7eb9c0472cd99f85643a44a84e94dcae7d671044cc2aea9001e31e925506958db397516074f45d62ea834b28302448d158ab87038c0208244b8 SHA512 886a20474591c5fee3c70bf978977b2bc19f362dc38898eff6f44365b6edebd2eaff1cf09befc764163d32f0f2a84a80d032647266af0e7fb343b9ee6c5f82d3
 DIST vcp-2.2.tar.gz 20075 BLAKE2B 862ed1a816c45e50374e17d387d33bda3d758e155e6a38c1636000ce87de3b54928acaac5f89b0580098acb9b796e803406c9d95dec76c029fdc580d65a496b2 SHA512 3f9f60bce875f16a825b935fd241b11cc75d45b85b66133b27d16b86644c4bbfe69fa5f22571703e0ed6d235498f920a8796f6d74259db51a1abbd626c6f5137
-EBUILD vcp-2.2-r2.ebuild 741 BLAKE2B df056f3fcae3294a5b77a485f758ae3c9a253368541777c08178d5e2adf0d8b59cbe65134cab5f63cd1907b0a055dd5bdf3a3d62c9f591856df91cad2f51c02d SHA512 69900311ae134a54d5eddb17898e90e3921cfbd3c72845d09df88c0e81b1690f9645143c8c09c75813d6589d5d8242a2c4202ba63278d5b3cf5d673f0e80a29c
+EBUILD vcp-2.2-r2.ebuild 771 BLAKE2B 7e4cf68db4ad7481b59f6fdeec875698eb2fc0a25c31db032fc95c3248ad0d87ef2e5b642bcbad4ee2d6b89d94beb821269e15d64ef0a53799b5925c83dfab37 SHA512 10e549a432bd571b8c3763e4a28f1d8bb7c1e0b6296afac1ddd0ca759487d6ff6a3b58f7481638df95d65dfe51d521176569a4510208af96935e0fd86c4efdfc
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/vcp/files/vcp-2.2-fno-common.patch b/app-misc/vcp/files/vcp-2.2-fno-common.patch
new file mode 100644
index 000000000000..394cbaede850
--- /dev/null
+++ b/app-misc/vcp/files/vcp-2.2-fno-common.patch
@@ -0,0 +1,47 @@
+--- a/common.h
++++ b/common.h
+@@ -23,8 +23,8 @@
+ #define T_DIR  1 /*      -> DIR              */
+ #define T_NED  2 /* DIR  -> NON-EXISTENT DIR */
+ 
+-WINDOW *mainw;
+-WINDOW *logw;
++extern WINDOW *mainw;
++extern WINDOW *logw;
+ 
+ struct dest_new {
+ 	char *opath;
+--- a/log.c
++++ b/log.c
+@@ -13,6 +13,8 @@
+ #include "screen.h"
+ #include "color.h"
+ 
++extern WINDOW *logw;
++
+ int logaddi(int code, char *base, int var, int var2) {
+ 	
+ 	if(code == LOG_VRB && !vflag)
+--- a/misc.c
++++ b/misc.c
+@@ -22,6 +22,8 @@
+ #include "color.h"
+ #include "screen.h"
+ 
++extern WINDOW *logw;
++
+ int statit(char *path,struct stat *st,int cmdline) {
+ 	if(Rflag) {
+ 		if(pflag || ((Hflag) && !cmdline))
+--- a/screen.c
++++ b/screen.c
+@@ -17,6 +17,9 @@
+ int winw,winh,mainww;
+ int mainwsbw; /* width of status bar */
+ 
++WINDOW *mainw;
++WINDOW *logw;
++
+ /* create windows, draw border and title */
+ void scrn_draw() {
+ 	int dev_null;
diff --git a/app-misc/vcp/vcp-2.2-r2.ebuild b/app-misc/vcp/vcp-2.2-r2.ebuild
index c53cc103faa9..686e5ab2df44 100644
--- a/app-misc/vcp/vcp-2.2-r2.ebuild
+++ b/app-misc/vcp/vcp-2.2-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
@@ -17,8 +17,10 @@ DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}"
 
 DOCS=( Changelog README INSTALL )
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-tinfo.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_compile() {
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index 9ca32264904b..87334bacdd43 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,3 +1,5 @@
 DIST vifm-0.10.1.tar.bz2 1097998 BLAKE2B b9712d61a00761986aa54d9bc561a5125ae96f751e8ba2844adae91577ba093b1a4860071b57ab81dbed3eb52c2c91ce3316831fa44a06436ef5fa81d2739f3a SHA512 8116c4c31b01a9453684a90b26b87a33e5ec2cd2930162869507f673319d231f44e464d1056239f647531c3be5bc9bcf92045c79e5d545f9c75be11c7fe03ea2
+DIST vifm-0.11.tar.gz 1525791 BLAKE2B c2aa6d3ddd0304ce1e3a0d1c9ac3218a783bc6dd8eebf7b3346ca262811f63dac75597913ad4883c62680cb77036c2985ca4ce88989a0dd0212dce975d8ec8b8 SHA512 15ace460da6d5f9bb7a016d8bb3f3d9cba47a608da5a39defbf7d09ff9de64c90a63a44264d695fe005f2f6d27ecb07dcec8f4ed5aef15e9d8728b52f1168dbd
 EBUILD vifm-0.10.1.ebuild 2109 BLAKE2B aad52868d392db5234ca53c2694afdbb5626afc61b277b5031e76f08d859af76b26813eb689820c2f2d54c751935721515083f3cf7be35c94527eed736cdd4f7 SHA512 7f2ca99051e8e0dcfcb9bdbe1783e783cdf9c02f2f6b9f4434e16701cc9cacab77cc19014f202c56c3a22f5cfab1dc4163266cac51249f4c17a63c93bc3d2846
+EBUILD vifm-0.11.ebuild 1783 BLAKE2B ad44189d58f35d09e6ea936d537fbe2f4231a24f69807305105e4d412883a85d3b5f5cd3c419f4b10356457ab87b00b3fc06e57aeb08636d9a5d842861496769 SHA512 4309965925a6651656ac678d114ab9d8ea8e545e7ba179e9b64251960322b4e59dace0a2f1ef5f2cdd5c621fd52e00bca8129aec1e2fb79053a7829fe5edfa82
 MISC metadata.xml 1144 BLAKE2B 7fb3843c66347b41788014325145c08b79ab3d2ce4845501ca33a6e0a62454298351636a21a712528fe5ea3ff99b24fdaea4d27936024710866a50bf6370ebef SHA512 ceaa84abce6268f7ea54edef793d5f0df4586e2902059fa9c06fecd20f2b562740a8993c5248558fc85fe68fc2d70794b89e75400bad8868f7e8f1a51f897fbe
diff --git a/app-misc/vifm/vifm-0.11.ebuild b/app-misc/vifm/vifm-0.11.ebuild
new file mode 100644
index 000000000000..1304f6cb7705
--- /dev/null
+++ b/app-misc/vifm/vifm-0.11.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools vim-doc xdg
+
+DESCRIPTION="Console file manager with vi(m)-like keybindings"
+HOMEPAGE="https://vifm.info/"
+SRC_URI="https://github.com/vifm/vifm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="developer +extended-keys gtk +magic +vim +vim-syntax X"
+
+DEPEND="
+	>=sys-libs/ncurses-5.9-r3:0
+	magic? ( sys-apps/file )
+	gtk? ( x11-libs/gtk+:2 )
+	X? ( x11-libs/libX11 )"
+RDEPEND="${DEPEND}
+	vim? ( || ( app-editors/vim app-editors/gvim ) )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable developer) \
+		$(use_enable extended-keys) \
+		$(use_with magic libmagic) \
+		$(use_with gtk) \
+		$(use_with X X11)
+}
+
+src_install() {
+	default
+
+	if use vim; then
+		local t
+		for t in app plugin; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins -r data/vim/doc/${t}/${PN}*
+		done
+	fi
+
+	if use vim-syntax; then
+		local t
+		for t in ftdetect ftplugin syntax; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins -r data/vim/${t}/${PN}*
+		done
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if use vim; then
+		update_vim_helptags
+
+		if [[ -n ${REPLACING_VERSIONS} ]]; then
+			elog
+			elog "You don't need to copy or link any files for"
+			elog "  the vim plugin and documentation to work anymore."
+			elog "If you copied any vifm files to ~/.vim/ manually"
+			elog "  in earlier vifm versions, please delete them."
+		fi
+		elog
+		elog "To use vim in vifm to view the documentation"
+		elog "  edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	use vim && update_vim_helptags
+}
diff --git a/app-misc/vlock/Manifest b/app-misc/vlock/Manifest
index 54e1082bcc35..dbcb3a074341 100644
--- a/app-misc/vlock/Manifest
+++ b/app-misc/vlock/Manifest
@@ -2,5 +2,5 @@ AUX vlock-2.2.2-asneeded.patch 393 BLAKE2B 1434b168d0f55c3a88e08f280d213850ed676
 AUX vlock-2.2.2-test_process.patch 905 BLAKE2B 89d80dddc8b13c23a9da34b3570d44984f66156a756027ae6787e1678973375dfdaaae449f771cf925411f17bd03f733ec2bdb94be9736a75a7f3be0da8c097b SHA512 5963bad2bbbaa639cc917adb594e47df156a12dd832bc252343416152934b9e78b3b0ed2f46d529fd7612fc2c8188340a84d249ea9b7e5e31638711428efa597
 AUX vlock-2.2.3-echo-printf.patch 375 BLAKE2B ae93fbf307dfd0a911a38b2426d89d0a7a864c47db4c533af01bf2b12f89227e4af38e1eba00dac677b1c467bf688166647681265b3ff7006a323cc91e971306 SHA512 30d1f3d20e7e7881b0fa759f0cba1fed3249cd27c91a784624de23df07db821b2c0ec73b5ae54ce90bb8f58d9d68c4cc3bf10f738d99fda6d7bd1f16a429de7d
 DIST vlock-2.2.3.tar.gz 54860 BLAKE2B 140b38dda15dd5c269729db1fbc3cc36dfea035c79e7998adb7f6ec56806408748701b986a2a1509aab6118a796a13b96a1de24f2837f94c4cdf058df736f37c SHA512 7eba8fe4f7085be7ef9169843d0814e55840b823dfc061727db037d2420e8ff4b669a3b08e15f61cdd9d5048c1e088288a46acad341cbe97585e64da2b58c855
-EBUILD vlock-2.2.3-r1.ebuild 1352 BLAKE2B f8a6948b22083a18fcfd9fe367d58d9c1df57410908a87cc2d232eaa06661d21acf4cbaf21129e46d2577328fb8a301be98bcd6c452e93d7466eeb481525a1a7 SHA512 35711aaf093d31cdd9bcd9670d7bb7323c0753b5460618109343010594f7d2672a8e05a2d6c2a5556b7803c17b69030f6317e5bc9543b7c461f694237a6c7a81
+EBUILD vlock-2.2.3-r1.ebuild 1353 BLAKE2B 384daa1edbe974986a04d13a4a44a212abcc318d7a94359d2913e1dd57363ca56dde58496c38b6ac25f11481c95a3b8821a2039bbe4b0fad07e241f3e70f2cda SHA512 b98529fc2c2085192f6a193b4eb37254f39bf8c446833495a77b55795ec8aca0657d8ca040e0629f564b1746aa678a0175161352c33744218ca88c9dd65f21dd
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/vlock/vlock-2.2.3-r1.ebuild b/app-misc/vlock/vlock-2.2.3-r1.ebuild
index 6bac4b08b79e..63003936c4cc 100644
--- a/app-misc/vlock/vlock-2.2.3-r1.ebuild
+++ b/app-misc/vlock/vlock-2.2.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/WorMzy/vlock/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="pam test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-misc/zisofs-tools/Manifest b/app-misc/zisofs-tools/Manifest
index 74b567b48a86..d984ec652094 100644
--- a/app-misc/zisofs-tools/Manifest
+++ b/app-misc/zisofs-tools/Manifest
@@ -1,3 +1,3 @@
 DIST zisofs-tools-1.0.8.tar.bz2 52968 BLAKE2B 81224adfcf4309513ceec7c25f72d90e4dfbacc225c756b35f1ae2ce721709abd4f52559596632a121813bae2c14d259e7950e84cbed43a547e77bf3491f8fdb SHA512 2c50bb73428c065e02e95def81950e1f64aff3cec0a4d74ee91ddbf4c15b81a423d8a128a4abc2e11aeb866b9d5f67f55019f7ae884c9e1a8b013ed3133db50d
-EBUILD zisofs-tools-1.0.8.ebuild 629 BLAKE2B f8cf03751ac5c0782381af9390c3dff7996b16155488c103e5df2c371012788511c897b27e9ff6b682c024e631f839b0e0c0565eef3cc9116a529d296b81a7e7 SHA512 41f158d4250f7dd1e1f35c820a253499ebdcf72eac247cd70484e504713175cd2089c5d0e5eedf178be8ec1b750ec5fffb316087c7f73a6cce5dff4f964019ba
+EBUILD zisofs-tools-1.0.8.ebuild 630 BLAKE2B ddad39aec227ea71004a692811f0394a5f30dcaaca6bd590076bffc17f014f84d582228cd40cc0315dad3a50853d418fa5bd6464291ffee443b024c390c7af37 SHA512 24b2c314082a54fd3d9ada8bc08761e1e1658aa0efbcb7db15adea08a97ba4eb9b742eb083b9487b2be740ab8c0d6d26a35b992979ff1ae6f0c70817ce2a260d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild b/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
index 800d24e2f3a0..288ff1329e49 100644
--- a/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
+++ b/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static"
 
 RDEPEND=">=sys-libs/zlib-1.1.4:0="
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
commit	129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree	53bf797418ac5e9b99c41ca0382c87b82421e5de /app-misc
parent	441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)