Make pkgcheck happy

Signed-off-by: Martin Väth <martin@mvath.de>

24 files changed, 36 insertions, 37 deletions

diff --git a/app-portage/changelog-gitrepo/Manifest b/app-portage/changelog-gitrepo/Manifest
index 75d5b2a7..8f6a96c7 100644
--- a/app-portage/changelog-gitrepo/Manifest
+++ b/app-portage/changelog-gitrepo/Manifest
@@ -1 +1 @@
-DIST changelog-gitrepo-1.1.tar.gz 1918 SHA512 f93051f7f4167e82a96314d08cdc0c55e91116821315b1b48221ff44ef176a191a3d2a74471b2e0f867582a260bfac031b5f7a417e1bcc1052d58d620b3437c2
+DIST changelog-gitrepo-1.1.tar.gz 1918 BLAKE2B 524f162d3a78438ab3f96e4ea1744b4518ae7e570ee1333850327bda898220b610f3c63500679beebce52667cbaa770dffe881fd5625664993be44c51df86cfe SHA512 f93051f7f4167e82a96314d08cdc0c55e91116821315b1b48221ff44ef176a191a3d2a74471b2e0f867582a260bfac031b5f7a417e1bcc1052d58d620b3437c2
diff --git a/app-portage/changelog-gitrepo/changelog-gitrepo-1.1.ebuild b/app-portage/changelog-gitrepo/changelog-gitrepo-1.1.ebuild
index 6eaf3c7b..6079270b 100644
--- a/app-portage/changelog-gitrepo/changelog-gitrepo-1.1.ebuild
+++ b/app-portage/changelog-gitrepo/changelog-gitrepo-1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-vcs/git"
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 92fddc45..815b1123 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,2 +1,2 @@
-DIST eix-0.35.3_alpha210825.tar.gz 691664 SHA512 332d9f28d29a741663db9ffd865025aa909aab155a713679ef5786b48ca8dea46b2f7595365d354799672c8def5fa5ab581be333ae391abd34bc9e911e654a26
-DIST eix-0.36.1.tar.xz 640084 SHA512 915a364b0f63124c53e43eb35165ce553f6eadaf8708f0c075dc2f4871fe83378cd0c8650d5605c1f87c512563fdd62f28efdc586b358fc7cd63ae42a404981d
+DIST eix-0.35.3_alpha210825.tar.gz 691664 BLAKE2B 6267f9bd43cd974e3cd074aabb9e80a5d74ae9161127a07ce5a6f2baf3afafc3f7f46fb395e20fa7561e3503bf2919fa298cb6997f51e8f507546c1a2f5420bb SHA512 332d9f28d29a741663db9ffd865025aa909aab155a713679ef5786b48ca8dea46b2f7595365d354799672c8def5fa5ab581be333ae391abd34bc9e911e654a26
+DIST eix-0.36.1.tar.xz 640084 BLAKE2B 10014bb847d71b803967354f3a415dc1c74ad37385b7b440f0c162c573453042d06bbc575582831ffc0aad6b0f7abeedbcb4e23b869505d4f85d6bd6b7cfbba4 SHA512 915a364b0f63124c53e43eb35165ce553f6eadaf8708f0c075dc2f4871fe83378cd0c8650d5605c1f87c512563fdd62f28efdc586b358fc7cd63ae42a404981d
diff --git a/app-portage/eix/eix-0.35.3_alpha210825-r1.ebuild b/app-portage/eix/eix-0.35.3_alpha210825-r1.ebuild
index 8c60fa9d..892f4cab 100644
--- a/app-portage/eix/eix-0.35.3_alpha210825-r1.ebuild
+++ b/app-portage/eix/eix-0.35.3_alpha210825-r1.ebuild
@@ -50,7 +50,7 @@ BDEPEND="meson? (
 
 pkg_setup() {
 	# remove stale cache file to prevent collisions
-	local old_cache="${EROOT}var/cache/${PN}"
+	local old_cache="${EROOT}/var/cache/${PN}"
 	test -f "${old_cache}" && rm -f -- "${old_cache}"
 }
 
@@ -164,7 +164,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	local obs="${EROOT}var/cache/eix.previous"
+	local obs="${EROOT}/var/cache/eix.previous"
 	if test -f "${obs}"; then
 		ewarn "Found obsolete ${obs}, please remove it"
 	fi
@@ -173,6 +173,6 @@ pkg_postinst() {
 
 pkg_postrm() {
 	if [ -z "${REPLACED_BY_VERSION}" ]; then
-		rm -rf -- "${EROOT}var/cache/${PN}"
+		rm -rf -- "${EROOT}/var/cache/${PN}"
 	fi
 }
diff --git a/app-portage/eix/eix-0.36.1-r1.ebuild b/app-portage/eix/eix-0.36.1-r1.ebuild
index 16645ba6..61ad3759 100644
--- a/app-portage/eix/eix-0.36.1-r1.ebuild
+++ b/app-portage/eix/eix-0.36.1-r1.ebuild
@@ -36,7 +36,7 @@ BDEPEND="meson? (
 
 pkg_setup() {
 	# remove stale cache file to prevent collisions
-	local old_cache="${EROOT}var/cache/${PN}"
+	local old_cache="${EROOT}/var/cache/${PN}"
 	test -f "${old_cache}" && rm -f -- "${old_cache}"
 }
 
@@ -146,7 +146,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	local obs="${EROOT}var/cache/eix.previous"
+	local obs="${EROOT}/var/cache/eix.previous"
 	if test -f "${obs}"; then
 		ewarn "Found obsolete ${obs}, please remove it"
 	fi
@@ -155,6 +155,6 @@ pkg_postinst() {
 
 pkg_postrm() {
 	if [ -z "${REPLACED_BY_VERSION}" ]; then
-		rm -rf -- "${EROOT}var/cache/${PN}"
+		rm -rf -- "${EROOT}/var/cache/${PN}"
 	fi
 }
diff --git a/app-portage/eix/eix-99999999.ebuild b/app-portage/eix/eix-99999999.ebuild
index 8c60fa9d..892f4cab 100644
--- a/app-portage/eix/eix-99999999.ebuild
+++ b/app-portage/eix/eix-99999999.ebuild
@@ -50,7 +50,7 @@ BDEPEND="meson? (
 
 pkg_setup() {
 	# remove stale cache file to prevent collisions
-	local old_cache="${EROOT}var/cache/${PN}"
+	local old_cache="${EROOT}/var/cache/${PN}"
 	test -f "${old_cache}" && rm -f -- "${old_cache}"
 }
 
@@ -164,7 +164,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	local obs="${EROOT}var/cache/eix.previous"
+	local obs="${EROOT}/var/cache/eix.previous"
 	if test -f "${obs}"; then
 		ewarn "Found obsolete ${obs}, please remove it"
 	fi
@@ -173,6 +173,6 @@ pkg_postinst() {
 
 pkg_postrm() {
 	if [ -z "${REPLACED_BY_VERSION}" ]; then
-		rm -rf -- "${EROOT}var/cache/${PN}"
+		rm -rf -- "${EROOT}/var/cache/${PN}"
 	fi
 }
diff --git a/app-portage/etcat/Manifest b/app-portage/etcat/Manifest
index c81e0462..a45cec3f 100644
--- a/app-portage/etcat/Manifest
+++ b/app-portage/etcat/Manifest
@@ -1 +1 @@
-DIST etcat-1.0.2.tar.gz 40730 SHA512 3620742a0806ff23581aa20927c4df749d1942b682a5468e9882b269d1e9f27485d800f4f6cb256a979b1e9087414b7ee3f4e6351e0c5b961def914350d4d4ae
+DIST etcat-1.0.2.tar.gz 40730 BLAKE2B 632d696475d8e3be0a62dc552e569cb11dde0813b05d9b4f709a2771294c3c2a1cd0b027a45edba32be3266dbdce1c45165b47e7f339ad78c990c6f8fec5c1d3 SHA512 3620742a0806ff23581aa20927c4df749d1942b682a5468e9882b269d1e9f27485d800f4f6cb256a979b1e9087414b7ee3f4e6351e0c5b961def914350d4d4ae
diff --git a/app-portage/etcat/etcat-1.0.2.ebuild b/app-portage/etcat/etcat-1.0.2.ebuild
index 98779194..d1f9e07b 100644
--- a/app-portage/etcat/etcat-1.0.2.ebuild
+++ b/app-portage/etcat/etcat-1.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 case ${PV} in
 99999999*)
@@ -15,7 +15,7 @@ case ${PV} in
 *)
 	RESTRICT="mirror"
 	SRC_URI="https://github.com/proteusx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-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"
 esac
 inherit python-single-r1
 
@@ -26,7 +26,8 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-RDEPEND=$(python_gen_cond_dep 'app-portage/gentoolkit[${PYTHON_USEDEP}]')
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'app-portage/gentoolkit[${PYTHON_USEDEP}]')"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 src_prepare() {
diff --git a/app-portage/etcat/etcat-99999999.ebuild b/app-portage/etcat/etcat-99999999.ebuild
index 98779194..d1f9e07b 100644
--- a/app-portage/etcat/etcat-99999999.ebuild
+++ b/app-portage/etcat/etcat-99999999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 case ${PV} in
 99999999*)
@@ -15,7 +15,7 @@ case ${PV} in
 *)
 	RESTRICT="mirror"
 	SRC_URI="https://github.com/proteusx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-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"
 esac
 inherit python-single-r1
 
@@ -26,7 +26,8 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-RDEPEND=$(python_gen_cond_dep 'app-portage/gentoolkit[${PYTHON_USEDEP}]')
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'app-portage/gentoolkit[${PYTHON_USEDEP}]')"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 src_prepare() {
diff --git a/app-portage/find_cruft/Manifest b/app-portage/find_cruft/Manifest
index 63962ab3..09bcc5b3 100644
--- a/app-portage/find_cruft/Manifest
+++ b/app-portage/find_cruft/Manifest
@@ -1 +1 @@
-DIST find_cruft-5.2.tar.gz 11458 SHA512 fdfe0c4dd4700395b6f109ae520cd5fbf6f086353a4f4b769ea50017b81a934c99ec3093d11610970276dc4ce311b3584e2e06ce7e605fa995a13abe5683c910
+DIST find_cruft-5.2.tar.gz 11458 BLAKE2B 9a8a596475bd590e5e6e70c7f489ec6fd58d7e17d9e7ff1f84c1eb128f31c7cfb90cc6e30845e50376391ef5445d647925732719adb10f61cf8ceae38b8ed26c SHA512 fdfe0c4dd4700395b6f109ae520cd5fbf6f086353a4f4b769ea50017b81a934c99ec3093d11610970276dc4ce311b3584e2e06ce7e605fa995a13abe5683c910
diff --git a/app-portage/find_cruft/find_cruft-5.2.ebuild b/app-portage/find_cruft/find_cruft-5.2.ebuild
index 35a4f46b..a8fd461f 100644
--- a/app-portage/find_cruft/find_cruft-5.2.ebuild
+++ b/app-portage/find_cruft/find_cruft-5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.8"
diff --git a/app-portage/logclean/Manifest b/app-portage/logclean/Manifest
index d9e68d4a..c698e8fb 100644
--- a/app-portage/logclean/Manifest
+++ b/app-portage/logclean/Manifest
@@ -1 +1 @@
-DIST logclean-18.4.1.tar.gz 15034 SHA512 0dc19c7a967794a09fa3a371fd6ade5a874ac702c60c0c208cab031c3713863a597aab3003d76868ea0c55b737da77ea25186bd8c7f4af11fd86fc1033d59383
+DIST logclean-18.4.1.tar.gz 15034 BLAKE2B 709cf8ef4cabcb30424679040f74f99a74ef35c6e3f285dae654b7fa82214e0ff71241669a4ca57407a23823e1a5dc0de2e84e46d775297ad594358fdcecd498 SHA512 0dc19c7a967794a09fa3a371fd6ade5a874ac702c60c0c208cab031c3713863a597aab3003d76868ea0c55b737da77ea25186bd8c7f4af11fd86fc1033d59383
diff --git a/app-portage/logclean/logclean-18.4.1.ebuild b/app-portage/logclean/logclean-18.4.1.ebuild
index 2f1f8a66..a8a3976c 100644
--- a/app-portage/logclean/logclean-18.4.1.ebuild
+++ b/app-portage/logclean/logclean-18.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-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 ~mips ~ppc ~ppc64 ~s390 x86"
 IUSE=""
 
 # This should really depend on a USE-flag but must not by policy.
diff --git a/app-portage/portage-bashrc-mv/Manifest b/app-portage/portage-bashrc-mv/Manifest
index 075fbbe9..f0a29107 100644
--- a/app-portage/portage-bashrc-mv/Manifest
+++ b/app-portage/portage-bashrc-mv/Manifest
@@ -1 +1 @@
-DIST portage-bashrc-mv-20.5.tar.gz 19987 SHA512 644ecfacf05562411c9beda7c3ee0da7bdb59c8ca84a0f76011e4ef295e668689a649a64c3e0b6ac1b85a1fae47ad79a429a6d9300f2fd9efaabbd815bf80814
+DIST portage-bashrc-mv-20.5.tar.gz 19987 BLAKE2B a6b5105a1fd6830c0f938d7439165e41f9e290ca41d5992c38857f119f57f504be0410c489c9e93a3a1da06977d87d880ba8380755a3f4b1a4052aa1152642c0 SHA512 644ecfacf05562411c9beda7c3ee0da7bdb59c8ca84a0f76011e4ef295e668689a649a64c3e0b6ac1b85a1fae47ad79a429a6d9300f2fd9efaabbd815bf80814
diff --git a/app-portage/portage-bashrc-mv/portage-bashrc-mv-20.5.ebuild b/app-portage/portage-bashrc-mv/portage-bashrc-mv-20.5.ebuild
index d07fa579..007c94ff 100644
--- a/app-portage/portage-bashrc-mv/portage-bashrc-mv-20.5.ebuild
+++ b/app-portage/portage-bashrc-mv/portage-bashrc-mv-20.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+ccache +cflags +remove-la +title"
 
 # the ccache script would run without dev-util/ccache but would be pointless:
diff --git a/app-portage/portage-postsyncd-mv/Manifest b/app-portage/portage-postsyncd-mv/Manifest
index 18824e0b..1bb1ad30 100644
--- a/app-portage/portage-postsyncd-mv/Manifest
+++ b/app-portage/portage-postsyncd-mv/Manifest
@@ -1 +1 @@
-DIST portage-postsyncd-mv-8.4.tar.gz 17480 SHA512 032faaae3fef44f2883337cad3da6919da1a31859c53c2525289f073d0697a1a1c8e700b20af214a4d7acb98c47fefe606ed5a5e57b50ff1c64ffdd867a0bcdf
+DIST portage-postsyncd-mv-8.4.tar.gz 17480 BLAKE2B 7ace619bfc435f4eb46ce6b3321ff748c219765bca0340761a14a3ae0739f81f12cfe8cd817f817c962b24960ede580e95d6eb6d08566ab024d0933259677cc7 SHA512 032faaae3fef44f2883337cad3da6919da1a31859c53c2525289f073d0697a1a1c8e700b20af214a4d7acb98c47fefe606ed5a5e57b50ff1c64ffdd867a0bcdf
diff --git a/app-portage/portage-postsyncd-mv/metadata.xml b/app-portage/portage-postsyncd-mv/metadata.xml
index 20517ee0..baaac435 100644
--- a/app-portage/portage-postsyncd-mv/metadata.xml
+++ b/app-portage/portage-postsyncd-mv/metadata.xml
@@ -13,7 +13,4 @@
 		<bugs-to>mailto:martin@mvath.de</bugs-to>
 		<remote-id type="github">vaeth/portage-postsyncd-mv</remote-id>
 	</upstream>
-	<use>
-		<flag name="portage-utils">Make /etc/portage/repo.postsync.d/q-reinit from <pkg>app-portage/portage-utils</pkg> non-executable and install a hack in /etc/portage/env/app-portage/portage-utils so that it stays so</flag>
-	</use>
 </pkgmetadata>
diff --git a/app-portage/portage-postsyncd-mv/portage-postsyncd-mv-8.4.ebuild b/app-portage/portage-postsyncd-mv/portage-postsyncd-mv-8.4.ebuild
index cb7bf8d2..fe75c527 100644
--- a/app-portage/portage-postsyncd-mv/portage-postsyncd-mv-8.4.ebuild
+++ b/app-portage/portage-postsyncd-mv/portage-postsyncd-mv-8.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-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 ~mips ~ppc ~ppc64 ~s390 x86"
 IUSE=""
 
 # These should really depend on USE-flags but must not by policy.
diff --git a/app-portage/trickyfetch/Manifest b/app-portage/trickyfetch/Manifest
index 349a1117..46973986 100644
--- a/app-portage/trickyfetch/Manifest
+++ b/app-portage/trickyfetch/Manifest
@@ -1 +1 @@
-DIST trickyfetch-10.1.tar.gz 11487 SHA512 9583161aedddfbd21e2b4a5ce04404b6416bcf2736e0596588dae2c6a7f3f28f6dd9b599f724deac9ba626911167047cf7f61f657a42c962893abea5402e97e7
+DIST trickyfetch-10.1.tar.gz 11487 BLAKE2B 1c6477840ef2d53ad8497e1a5a1cbb8c9d739cc60c321c0ed232cdb4a0551bc94f3fc3446cbaf16ab9af62952f9121f024343430fddee92e0aeae68a0a90019b SHA512 9583161aedddfbd21e2b4a5ce04404b6416bcf2736e0596588dae2c6a7f3f28f6dd9b599f724deac9ba626911167047cf7f61f657a42c962893abea5402e97e7
diff --git a/app-portage/trickyfetch/trickyfetch-10.1.ebuild b/app-portage/trickyfetch/trickyfetch-10.1.ebuild
index 4b26f41c..49088cbe 100644
--- a/app-portage/trickyfetch/trickyfetch-10.1.ebuild
+++ b/app-portage/trickyfetch/trickyfetch-10.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/app-portage/useflags/Manifest b/app-portage/useflags/Manifest
index 10b47775..0131c520 100644
--- a/app-portage/useflags/Manifest
+++ b/app-portage/useflags/Manifest
@@ -1 +1 @@
-DIST useflags-4.2.tar.gz 6748 SHA512 bbcef6a2df487bfae7cf78ff4150ea4eabaf3d78728a6d7d808cdad015b5329bf4a74a807ff5bfb8dbf149e05860f4297dc2e681af7e8bcd3812352ad290f42a
+DIST useflags-4.2.tar.gz 6748 BLAKE2B 2131c7d33af785a7095aaa258f8f19ca8ba3881d27672d57b3b54a1fc8fd74d970d7b945ac440833d02eb16ffb0e24e8c345315283fde638ea08df489f421779 SHA512 bbcef6a2df487bfae7cf78ff4150ea4eabaf3d78728a6d7d808cdad015b5329bf4a74a807ff5bfb8dbf149e05860f4297dc2e681af7e8bcd3812352ad290f42a
diff --git a/app-portage/useflags/useflags-4.2.ebuild b/app-portage/useflags/useflags-4.2.ebuild
index 0a4ed92e..2b668942 100644
--- a/app-portage/useflags/useflags-4.2.ebuild
+++ b/app-portage/useflags/useflags-4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-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 ~mips ~ppc ~ppc64 ~s390 x86"
 IUSE=""
 
 # These should really depend on USE-flags but must not by policy.
diff --git a/app-portage/world-mv/Manifest b/app-portage/world-mv/Manifest
index 608c1d19..98140dc3 100644
--- a/app-portage/world-mv/Manifest
+++ b/app-portage/world-mv/Manifest
@@ -1 +1 @@
-DIST world-3.20.tar.gz 3656 SHA512 53fb8c52356e34acbd15a595d5e345c9a5d3ae8fcc47d5190e44acc75492419ac0117a269d5440d40077a84b3b3e125baa5d0761f634574282fe5f2addbb236c
+DIST world-3.20.tar.gz 3656 BLAKE2B d1975a9989c07902c84b5739edd0745b1274b1ce7ab1479193e965d4c206031a8427e205a8569467e726b313f0ee595584eb3423f5415a3db71d31bbb93e357c SHA512 53fb8c52356e34acbd15a595d5e345c9a5d3ae8fcc47d5190e44acc75492419ac0117a269d5440d40077a84b3b3e125baa5d0761f634574282fe5f2addbb236c
diff --git a/app-portage/world-mv/world-mv-3.20.ebuild b/app-portage/world-mv/world-mv-3.20.ebuild
index 9cd6a37f..f0f40164 100644
--- a/app-portage/world-mv/world-mv-3.20.ebuild
+++ b/app-portage/world-mv/world-mv-3.20.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${mPN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 S="${WORKDIR}/${mPN}-${PV}"