gentoo resync : 25.09.2021

27 files changed, 25 insertions, 231 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 82f6557000a6..61af6601ede7 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/cksfv/Manifest b/app-arch/cksfv/Manifest
index e2af9b6dac7b..5969b3fc9b28 100644
--- a/app-arch/cksfv/Manifest
+++ b/app-arch/cksfv/Manifest
@@ -1,6 +1,4 @@
 AUX cksfv-1.3.15-destdir.patch 566 BLAKE2B 4bd22c37f2e254edc2956db45515666711a7ebb41322b0260492219c0061eb5a8ddd132c53d0dd5b49139e134b00dd0d85c372490c37d8c134f1a6238792e031 SHA512 b9f70b390922da4e353fa4b3bb5be46bd85701ee639a7b4c138fa6db0cd2aee20aaa807de040348256b1bbbca77928d699faa1e89de83604d56e8ab1a6a1f53e
-DIST cksfv-1.3.14.tar.bz2 26114 BLAKE2B 696ae3499bc2b1c566a40da202b70d30777ee07a7923ac567345872098626c82820a9bb75b711915e2274a3e0f1d7804ba58f8ce41dcca375391d778ba135a02 SHA512 016c2f61632980678957fe4b5bc9ecb30360efd548ff09bfbb7a31cc6fc36f6fe7936d3d819fe468a6208c71f8b625662aa3ae0abd668435d7273e149d7e4519
 DIST cksfv-1.3.15.tar.bz2 27282 BLAKE2B c1df7bac982815915327753d8f6b888cc53395a0066bc5b34fb310d540c50c3006be2b9f31ebfac269d961126b0046a5b63fbbbe9c05c265953b2d2a94602a7a SHA512 a0b5286e0dce610e8b482a55cf8af38f8f8256e175435b6f2518c6566ea844c3cf2981f96c7600c7eb9b23b35cf19f1b55f540ba0f73f1267e4593e744858d43
-EBUILD cksfv-1.3.14-r1.ebuild 655 BLAKE2B fa3ff03e77bf86bcbaab1f73f5a591aa476f52b9f9693e903e714633ab7ac7f0e66e88c5b5eef02ee583a08b2b59225be9e6307eec9841ce437a369dd168caca SHA512 9690dacb7bf13035006bee9dccf634f008ecdbbb1b928452e97ec579bff51f8f00f41d397a5afa09960181219008f78a3901f803cdfa7623236f0178dba16b50
 EBUILD cksfv-1.3.15.ebuild 682 BLAKE2B 80d587f6714489fddd371d659c0428d1f6dc9c37c3b484a37bc61b1380fc4e7d8fa7959a8d8ad16291c06298e97f40e8add5db97b3f2ac07d20f9810d10c8de5 SHA512 d65c6bc7d88f68c3b649f6bba3c6624b4cb021eca642210c86fd10bda3847321b30c747b2fa4f3dced5a407bc339412c049b5fed6c81a7606920973d8cb1037a
 MISC metadata.xml 251 BLAKE2B 622459ab70a66eb3f79667bfda6208e65a8b15dfe5e14cabc1c018521533f0c553c42ec271161e317eb5d5ca8ee3a67bacd9c5329dc7cf45f2bfc97f23e76d69 SHA512 5d1c656c2741a209fc616d0653d65c5e4926c8aec499257d2a774effdf24c001836fa843df51d9190ddc92e90a43b414b994d54d5912623182de0678c1a6bf55
diff --git a/app-arch/cksfv/cksfv-1.3.14-r1.ebuild b/app-arch/cksfv/cksfv-1.3.14-r1.ebuild
deleted file mode 100644
index eb3bd336958d..000000000000
--- a/app-arch/cksfv/cksfv-1.3.14-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="SFV checksum utility (simple file verification)"
-HOMEPAGE="http://zakalwe.fi/~shd/foss/cksfv/"
-SRC_URI="http://zakalwe.fi/~shd/foss/cksfv/files/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
-
-src_configure() {
-	# note: not an autoconf configure script
-	./configure \
-		--compiler="$(tc-getCC)" \
-		--prefix="${EPREFIX}"/usr \
-		--package-prefix="${D}" \
-		--bindir="${EPREFIX}"/usr/bin \
-		--mandir="${EPREFIX}"/usr/share/man || die
-}
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index 7faa83422a23..a932a3b77184 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -4,5 +4,5 @@ AUX cpio-2.12-non-gnu-compilers.patch 223 BLAKE2B e5ba3da0c1dc23199e52c3782d3a11
 DIST cpio-2.12.tar.bz2 1258605 BLAKE2B 4b6d42a1d8aaeaa980cab5894b2e264451e96a108f2c3aa89d3e6fde0bff338e026ee233ebd7c8cf41f3c926d42d38b866778244db774055736ca8792889e160 SHA512 0cd4da5f2fbca179ab4e666a5f878414c086a5f98bce4c76273f21d9b2a6fe422d901b5d453826c5f81bbe363aa015047a1e99779ad1a451c8feca6205c63120
 DIST cpio-2.13.tar.bz2 1354559 BLAKE2B 45d77723acb55f15c8574ab5a2fdff6fb1767629d177dd3416b0268e9f82ee6bdd11b4fa591ef020efccbdc3f4918cf77263169da1a0f6422dfe1a9712295778 SHA512 459398e69f7f48201c04d1080218c50f75edcf114ffcbb236644ff6fcade5fcc566929bdab2ebe9be5314828d6902e43b348a8adf28351df978c8989590e93a3
 EBUILD cpio-2.12-r1.ebuild 820 BLAKE2B 0bd3ab90aa51e11f7fdf9ad3fca7f8134953deeefd1f297e7c59acea4488e233255efc6cd7559972ce891d7a1a8d38c77dea4c550ef50eb140487a2c4a984c28 SHA512 79c3b2cb754b3b24fdf6cf792408971aba81048279887df0202eb43bca09727cf77250af7d4fb409f9eae378987cb8d9b9ed9660466ca4a172a70e5188e9fe17
-EBUILD cpio-2.13.ebuild 804 BLAKE2B e83fdf9524b6e956473f1fd974991d8ca50096d014335afc29d89739a6c1d541b18b1e1ef72e47de769e28920e9a137a65761bf0acfafeff161d7a42bce6f459 SHA512 1ed9849be48ed8effaac3046638090e4e7f4a3ab00a649bc69aa3b021d9663c55f1feb7ba1bf28ef4bd02fe97b4666bdbf1fccc8931ba9d63cd002f036fe83e9
+EBUILD cpio-2.13.ebuild 811 BLAKE2B 9dbf636f731d07e9fbf097fa0b5d06557e88d8c454fd4cd5019ec34ce03cc5bad10176b9f9d19ceb960c033911a24e40cfc37595be5551e136a42f4f31eb09a4 SHA512 8ee529e549017f856c1654dce07016de1606246c1e7c588a95b2c09c4c77a0d8807e0faa0aeb28fb6cb21127994c1d3b3c38b00aa30010c321fb9ebdff774701
 MISC metadata.xml 328 BLAKE2B f8b8bff5b160351a92837553de20eda1da31a6c0594c1118e1f71b3cd19d9ea8d3420bdce943d83644f5ffc234950f95fb9229a213660767dc5281120085b26f SHA512 08e1c6a03b894946bf6332bf46c8a7534ed0998777b30cb9eecb9c746bb333b65fb41dfeeb6938cbc08d0ad0a303d752ea70a6a6a6ae2c5c2935b2b4e4d9928f
diff --git a/app-arch/cpio/cpio-2.13.ebuild b/app-arch/cpio/cpio-2.13.ebuild
index 2e958085fd51..89a3336d5afa 100644
--- a/app-arch/cpio/cpio-2.13.ebuild
+++ b/app-arch/cpio/cpio-2.13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 PATCHES=(
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 5ed0a31dc7b9..d60fc18693b8 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -3,6 +3,6 @@ AUX dpkg-1.18.12-rsyncable.patch 1245 BLAKE2B e1488cc6a6807d38ec7218ae6651b0d919
 AUX dpkg-1.20.5-dpkg_buildpackage-test.patch 209 BLAKE2B d15000423abe8259e7bdd92e5ff2d38f8fd32622e8467259e791159df590f7d394647ba4efdd599b77d652f973cd07af09d64f29df920fb8015c995bce9b302a SHA512 046200d2a8c143a2b08e0c8113765c7a7a18846ce0b7a2dfd5a3f1167eacc70391415c6bcef21abe49e5d8225dbf08680fcdc405f0910e9c42071ad4cf8ae6d5
 DIST dpkg_1.20.7.1.tar.xz 4952736 BLAKE2B 0439cd9440c34597ff5c5e04bd8e1b79d34cd7675a216cbe1e7dc4d68460847143a8a7dff14b1845374d8e504d6fba63842b1d1ac37aa01f7b2a96b78ef0278d SHA512 beec7a7ba1cfbd6954b3d583e57c811af3bfa5e4e4554e6af6673d4a4be0e79fb4aded2f6aeeda592c2ba3d91facb82138f2eb8eb2338dc4fae1832911df2fd6
 DIST dpkg_1.20.9.tar.xz 4954428 BLAKE2B 4e04f7a90c8696971895081e18b220d9dee4bc5930428f131556ae71c673e61e18c363e279b566c2218da60a5aca421807c14cf518952502e707c7397769097b SHA512 904a4742f5f340dc65b2137364dce102a0b2eb42ccedb2a73f79c207362c699fbffaaf1379f1f6c8b8b0e490321af1d03c34b50ebe0c703f5ce8a7f75f17a839
-EBUILD dpkg-1.20.7.1.ebuild 2002 BLAKE2B 52e2f821c92f6cf0f64bfe36d13c264a7860a845bf39dd1b57f347ce1c88dc48d2e4dc9c01533ea9d6cdc990a7e834a7dc9f4a93cb68442a78a499bdda0cc2e8 SHA512 e12646a5773edec84e9918922435d9bc0441d6f25f28041b79a0efbd4a36d47ff8cb4f768595e97149dd7a238ce67ad88931e04eb8b83aab3e8df2245ce93d46
-EBUILD dpkg-1.20.9.ebuild 2008 BLAKE2B 920c16b61438a5dac6c03308c52142a6578048405ae9def81ecb16a8ad53e834f6f7ab01c253dfe4fa60ccb9d91283b87367a7210f9004832d6e48a2b8d98ea7 SHA512 427c9b54fd34a6862b8a843d57de07c6412a1aac523e011e37eb0c3ec7da6c13ec5783a6c43405100ddc0d6b216b24350342ded817fc8b425ce2dc05b73b24f8
+EBUILD dpkg-1.20.7.1.ebuild 2001 BLAKE2B e236a5cd683fed0131efe0ba775f33372ab0ad2ea7b12eed1107dcdcbf164b9d4ba7f8be97f183f18fed82861e50552fbfc3cdacca98fbf84285c400239702c3 SHA512 2567e608fcecbcfc2c066f7861cf9f038d3f51d3c49efb1f2255cad6f44233e5eafb3bd6cb81ef65bb9215b678217b3d4ae6208b53f4477a8d406075d0088630
+EBUILD dpkg-1.20.9.ebuild 2014 BLAKE2B 43766e4bb3fc0f2865a84a45980f017c9b5537af787c906e5f44d90f83f75c38b28863fbda9ecd80c15a5d1bf424d32c599d6b85110428fb174f7cfc8e37de2d SHA512 f65531314573012592f00e5d5dce75acb061b26818004a58dd978aad68900b1ae675caac469323183b9125d0a5ceab1a721e506ca7164da309490af50b167825
 MISC metadata.xml 433 BLAKE2B fe1e0ca0c96628891b711ca120d5c119f8effe66ce43198ebb2a16fce1cea23b7ab6ab88d807a71645298e2311bc3044dca4989fe83cf99e54a9e97f66835c69 SHA512 2882194685980d67acc10913c8863b55dc0a9215558db2e3cf33f0489d91e5477bf2ac0c0fc5b4a134f45593f6f5d3fde5e09493d20ca45224645b8c1c597fef
diff --git a/app-arch/dpkg/dpkg-1.20.7.1.ebuild b/app-arch/dpkg/dpkg-1.20.7.1.ebuild
index a286db6882db..9c802e00c611 100644
--- a/app-arch/dpkg/dpkg-1.20.7.1.ebuild
+++ b/app-arch/dpkg/dpkg-1.20.7.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/dpkg/dpkg-1.20.9.ebuild b/app-arch/dpkg/dpkg-1.20.9.ebuild
index fce1289c1427..744a4b7566c4 100644
--- a/app-arch/dpkg/dpkg-1.20.9.ebuild
+++ b/app-arch/dpkg/dpkg-1.20.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index 29ce5c5dd699..277904d728bb 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-autoar-0.3.3.tar.xz 298536 BLAKE2B effbd3c15ab851c97f3c69f96bbf806f3639ce4865161df99b7f84ec2c4c8a3df9381517227d9a475b1006d88ac21eb02b4b474fd8bd27524959b56cf486e888 SHA512 41cda2670506e9b3f79c4995d2fdfbd5024777d8f8b3f85a2010af4e5f4303743d26ad9cad787c995362f83b65617ed5773d972c8aa2c7bdcd358d873cb86ec4
 DIST gnome-autoar-0.4.0.tar.xz 50176 BLAKE2B 6dce638d180ae8566f45757870cdf0de70a944cbdfde940f13bd139f3ee6fb1c18ff91ca0b1cc9b99dbeb4b5c67314c81448e1876a328e928b2d9787492988ec SHA512 ab4ef47ef65e4fa0dc652b19a9eb94cc307013e4c7ced6980cedc7ced20fb77d53e1807c20b14a69c1ddc536c4ed0007062481e258d36c07e3be837537916b7f
 EBUILD gnome-autoar-0.3.3.ebuild 938 BLAKE2B 14ef901e62956cb84ccec0790971e83dc176e73b8da92d2e785bb8b0136132b5bfed43964139409f915b43babf27ab09f7ad5cb3eac9c0b4c454e6552cbb7c47 SHA512 70a9f7e15c9db87e4d56c089a407da0b97bc274bcf6a6deed93e9c16828e5f2e51ac0d8bca55b684e98784ca80fcc3af0d52ee6768b4b8b74bb522fb9096fdc5
-EBUILD gnome-autoar-0.4.0.ebuild 1039 BLAKE2B 6c09e01575fc60dfc51b9479467f9cf8a7d5ca53c831faab0754f6b28613fdb7070bb43a0d34a0d42085fe66d66b7c2c091a0e5575e0729010f178563f4d4562 SHA512 3964e80c19caa7617036b518b7bfc487ce1439b07babe6623cb36bd9cbb892bebbabf96ab1ed209631c2ca891e371f8d8d0ffdc9418a3ce044dc613c8bfcd209
+EBUILD gnome-autoar-0.4.0.ebuild 1118 BLAKE2B 0c56bfc85c93c78715cd5e5b61539fa7f7fc85ea68f96824a86a16b4144416ddf7d8a7d08ceddea8b530b27a0ea170a4996fb9bf2b649dbef4e635bb59a12477 SHA512 f932b2a68b3f969eb83a36e2371f5877903a1c66d2ebe5b47b714164ff7e47d1662336a4ea77ea245c83e58a8d990f1afb3af77a55cd5171a0db7548df304cfb
 MISC metadata.xml 465 BLAKE2B 11413058ead980c52d3389e3aeb7daf756c4a39e3caddee888e4da23e32490e912debf6448ff4a7d0222132545ec9bea295018d9c438475cb920e24cada3d81c SHA512 082d48f638537b52bce8cd7dcf3ac68cbd01cc5f4ab2a6a4dacf25e28c062bcd6cf7f20cebb9f1ad23ed4ce33ee9dfd1e5bac59965ea200ed28c1bc095a3510d
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.4.0.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.4.0.ebuild
index 5a8aac17c318..d076830bfd4d 100644
--- a/app-arch/gnome-autoar/gnome-autoar-0.4.0.ebuild
+++ b/app-arch/gnome-autoar/gnome-autoar-0.4.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-autoar"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="gtk gtk-doc +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
+REQUIRED_USE="vala? ( introspection ) gtk-doc? ( gtk )"
 RESTRICT="!test? ( test )"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	>=dev-util/meson-0.58
 	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
 	vala? ( $(vala_depend) )
 "
 
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index c3c3a87d17f8..d1a9c45e815d 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,6 +1,4 @@
 AUX libarchive-3.5.0-darwin-strnlen.patch 732 BLAKE2B d20ffd1d898acf1e69e2f275bec2beda0769569ac37e179604dc7d0a5eca8fda2a06aa5b3811e28f465fb34c2061d15aa8073110f703244aec02cfa35afd8087 SHA512 9f5b86b6dc483f17a1d909d88841e1f82f5835dbef0bdfc18ffb982cd5f649d87fdc22f490169eb827de654fbd469fda77a5ce1bc0748b48f3f46e77318e672c
-DIST libarchive-3.5.1.tar.gz 7008338 BLAKE2B 243dfda2bd4582bbc20679328b89aae0c530475c822dcf9ff25c65df2017b8f18bb616142d6ab016ccea4a5aa1b410d46b913c2ee0afefd2fdb1a41cf51585d9 SHA512 08ddd74bef4cef0981739da202879f36cf7ca33a8f6d438724588efe3ab8477f2f1d0cccf7b8ed0bedfc0c8d0cab16ee3ae5c0c6e83b6811bc650d7d7471a996
 DIST libarchive-3.5.2.tar.gz 7054934 BLAKE2B 1fc6ee0166573658dc5e0f170113c07ecdaa76b287cbf68bdee63ccd198dad615b3f2803a3fc1aed303cd1f7f32033e6d8e782ef6a8a991562cdc2a375894c9e SHA512 2003ec9b24086373451bd7317bdab86d81627f087c14a6f7df1a92e131a216749f9aa352504c3d04dc82b62078b59aeea5aad5543b7e6c1c21fcafa2955d3762
-EBUILD libarchive-3.5.1-r1.ebuild 3761 BLAKE2B 712b3e29fe3ade19f8bd24dcfc6005842743221a4b9bda3ca212b0e166829726ca71c1ea09fa1b7055e2734808725049c8d4737cae7411874a92a0b991a8e6a0 SHA512 d8258ddff7b030c6c3ea399db91825695fc7d5e5d5b9f92a3a78b63cc7057c695027a8a567e68b223ca545ec34d50c48787bae44c9a00d9d6b67445a2514307a
-EBUILD libarchive-3.5.2.ebuild 3698 BLAKE2B 8884c1804f4540a89a917ee1688e3c26eec131059f265c273031d9567a8cb114b4d9b8effdc4ab73b466716410e1429a3f6844ab1293515b0e3a950e0d2c333c SHA512 5c1e6658e1bb320993da56b50b527110cab163b567196c575286b1d03dddef62ee233d3d78db4ebc396efd7f290f1c5adfd2a9f0ea977e9a65982d9d18860499
+EBUILD libarchive-3.5.2.ebuild 3697 BLAKE2B 7cc0f99b45e07c716a3c513bb3bc08bc80aa60228d6d64a4bf0d7db946e5149e8c6e902a97922cf076744773ffb6b3b510f4f00bc2072f372514e88c2a454ec0 SHA512 af165fcf46e79ba56fd814cc646ecbd993d4bd6d73e38f86dffd6485be39aa8e64d1ec9a1938f6097128965f0c7e63792aee7b88381105f2278335bf90104d8c
 MISC metadata.xml 1515 BLAKE2B c30009d41ef242d07f1f047b96f72e436e930f4ef6a316fc3054865061f3b32450239392df9da6b4431eb3a959f0a892425065f292253b4b4e145f56c0575161 SHA512 ff5508fb73ec4dca5d84525ebdd176ab626071f2ae6693c60dcfabf7ef29342340ed6af10230d983424d20d3927770b028fb866c1d0a179f5ad3c7c63c721319
diff --git a/app-arch/libarchive/libarchive-3.5.1-r1.ebuild b/app-arch/libarchive/libarchive-3.5.1-r1.ebuild
deleted file mode 100644
index 495a49a99ae6..000000000000
--- a/app-arch/libarchive/libarchive-3.5.1-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="Multi-format archive and compression library"
-HOMEPAGE="https://www.libarchive.org/"
-SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 BSD-4 public-domain"
-SLOT="0/13"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux lz4 +lzma lzo nettle static-libs xattr +zlib zstd"
-
-RDEPEND="
-	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
-	blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
-	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	kernel_linux? (
-		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	)
-	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.2.5-r1[${MULTILIB_USEDEP}] )
-	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
-	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	kernel_linux? (
-		virtual/os-headers
-		e2fsprogs? ( sys-fs/e2fsprogs )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5.0-darwin-strnlen.patch  # drop on next release
-)
-
-src_prepare() {
-	default
-	elibtoolize  # is required for Solaris sol2_ld linker fix
-}
-
-multilib_src_configure() {
-	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
-
-	local myconf=(
-		$(use_enable acl)
-		$(use_enable static-libs static)
-		$(use_enable xattr)
-		$(use_with blake2 libb2)
-		$(use_with bzip2 bz2lib)
-		$(use_with expat)
-		$(use_with !expat xml2)
-		$(use_with iconv)
-		$(use_with lz4)
-		$(use_with lzma)
-		$(use_with lzo lzo2)
-		$(use_with nettle)
-		$(use_with zlib)
-		$(use_with zstd)
-
-		# Windows-specific
-		--without-cng
-	)
-	if multilib_is_native_abi ; then
-		myconf+=(
-			--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
-			--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
-			--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
-		)
-	else
-		myconf+=(
-			--disable-bsdcat
-			--disable-bsdcpio
-			--disable-bsdtar
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		emake libarchive.la
-	fi
-}
-
-src_test() {
-	mkdir -p "${T}"/bin || die
-	# tests fail when lbzip2[symlink] is used in place of ref bunzip2
-	ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
-	local -x PATH=${T}/bin:${PATH}
-	multilib-minimal_src_test
-}
-
-multilib_src_test() {
-	# sandbox is breaking long symlink behavior
-	local -x SANDBOX_ON=0
-	local -x LD_PRELOAD=
-	# some locales trigger different output that breaks tests
-	local -x LC_ALL=C
-	emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		emake DESTDIR="${D}" install
-
-		# Create symlinks for FreeBSD
-		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
-			# Exclude cat for the time being #589876
-			for bin in cpio tar; do
-				dosym bsd${bin} /usr/bin/${bin}
-				echo '.so bsd${bin}.1' > "${T}"/${bin}.1
-				doman "${T}"/${bin}.1
-			done
-		fi
-	else
-		local install_targets=(
-			install-includeHEADERS
-			install-libLTLIBRARIES
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${install_targets[@]}"
-	fi
-
-	# Libs.private: should be used from libarchive.pc instead
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-multilib_src_install_all() {
-	cd "${S}" || die
-	einstalldocs
-}
diff --git a/app-arch/libarchive/libarchive-3.5.2.ebuild b/app-arch/libarchive/libarchive-3.5.2.ebuild
index c4d343702bc2..4693ba4bc318 100644
--- a/app-arch/libarchive/libarchive-3.5.2.ebuild
+++ b/app-arch/libarchive/libarchive-3.5.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux lz4 +lzma lzo nettle static-libs xattr +zlib zstd"
 
 RDEPEND="
diff --git a/app-arch/lzip/Manifest b/app-arch/lzip/Manifest
index febc244f2b07..d17d33cf4e97 100644
--- a/app-arch/lzip/Manifest
+++ b/app-arch/lzip/Manifest
@@ -1,3 +1,3 @@
 DIST lzip-1.22.tar.gz 120769 BLAKE2B d6d4faaff981d64219e27364c7072f9e1309507220e80d4195d866c3429db537a9fa9b7a4ac67ef5c267cad0f6e43ce997a98f1e47a88b228bd1aa437c991140 SHA512 318de74effdbdfa79070d28919459a85bf1efe662b818b8af2a3daa964b6c24e3386c37de360c6d5b8b624d549b5c9ed777c6234561129c477e03d92ac2db206
-EBUILD lzip-1.22.ebuild 765 BLAKE2B 2a0d43af11d19e275f2e0386d17c4c159246457292984f8540c3d758c4204528072e34ea8033ad7b718a98483f6eae98c94349c67e58adaba38e381cc7a8b0e2 SHA512 fd76d7c1efce7ee7d265fa841077c61ca9cf6dfecacb552c49fd4d276767353f0bcd4f2d82908c63878a0ec77e1a621d1d6fe1e6f93c27e2ce5152576ed6f383
+EBUILD lzip-1.22.ebuild 764 BLAKE2B 4f27d76030045b7e78f3a85a7ac04d7b261680c9356c236b6c07db1e8b38c92d094259891435967f823729a152be78d34f330444515b4808d1e355ae6b8a817e SHA512 2ac60aae9a0642bfe51ec653749e20d348f44ed28f87ec67dffddd90312f4c685d0738e28c9e4f92b3610b1ea4ada86d18cafa5e4d99cee5c53666a6c322b700
 MISC metadata.xml 358 BLAKE2B c0e0c2c610a33aa6f8bff1325deb8c583fbde09ceaef09f4ddc1f343feaf3cc81a0e59ff2e4f3cd81bf6e3294e18026fa4ae6870eef8d213ff44c73edbb7df0a SHA512 faa29e9bc8f49b51279e643a7d9f0dc4b5463b434f9874901625af9f13c4460c19888913ee9d4105ee9eda4257526af50383fbe936d5834b2713eb027e75773f
diff --git a/app-arch/lzip/lzip-1.22.ebuild b/app-arch/lzip/lzip-1.22.ebuild
index 357d530b1717..54b50d1d7314 100644
--- a/app-arch/lzip/lzip-1.22.ebuild
+++ b/app-arch/lzip/lzip-1.22.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/_/-}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 src_configure() {
 	# not autotools-based
diff --git a/app-arch/makeself/Manifest b/app-arch/makeself/Manifest
index 82bbb66dd4af..eab693936dc2 100644
--- a/app-arch/makeself/Manifest
+++ b/app-arch/makeself/Manifest
@@ -1,5 +1,3 @@
-DIST makeself-2.4.3.tar.gz 32613 BLAKE2B 2295b6d47a8105f2b495260abb0c9ae85875c821d0291a19b5af894c1cef669f338c4e10de8128fe38008e7e08079d1f29949884f202cab680c7fd62e2f00dd9 SHA512 d404c7920c7f69ae29c7168bcf76806b6e2aae2e8916bb7feed998d031ce8b2cd205b83ad960a90b01189c97f9242eb3ef574194ba3ee51c605fe99dafbd6c13
 DIST makeself-2.4.5.tar.gz 39012 BLAKE2B f79cf1c087e89c4fd09f328fb795a3f8a78ee38060dbbd1590e3dcdf22a346b0c12bf6837d1636efadb2a66f6a762308de7ee9dd2fc62a7c88d417d257c5f0f6 SHA512 1dae74586f6bd5afb526801b7ffa7fc7962ff74b0f190cdd51da93c21421864b72f5fe18090cb2ff6ad27f0907fbf3aeb5545f3f70e33dbc9e505a78505f5f90
-EBUILD makeself-2.4.3.ebuild 929 BLAKE2B cf5cf22da092ef5ed0b9e9f32c237d49529ebf0be2b7d998a8109ad19613237feb6d4c8f8f72bce28d0c5da43efed7e4473c8f03d56ece72a0fb34388ebf5f8d SHA512 1eb89f4e0f5b4eeedec4f538052f6dd1bf21f515cb90ea5561f7e7eaa9e2694fad6266f36687c19f9fa3464ef87ab849271de50182ca024a703c00330409f7ef
 EBUILD makeself-2.4.5.ebuild 1155 BLAKE2B 25578f47579ccd101e31428439449f9e55c509c1e3268c794b80035f5a40a1dc05bf1a8f7575ddf28155216522db114b1da7f5e12b92103c552f788861440f5d SHA512 d165630a20a4feb643d6fe780f1933202621f01f9f50523e1f67421df71d075d8ce07ed308c4996ca7938b1bfd633222803f405c224a42eb2b2b35c53b2b19f3
 MISC metadata.xml 514 BLAKE2B ccb9fd9f251b529d56b53183f909ec7e2a6f1636da5d0db428032ab974613bcdcab9251e8b0d5c4e00b97eff196c52c212376c3307e96f62be71268a7eb27768 SHA512 b1c2a61936a614de1c969c9d1b7ef630d70068116fcefb6c7216ef93a21f5987cec605253b6d2af759559d9b661442163eb20b864fa91b0abc8cba142567d2c0
diff --git a/app-arch/makeself/makeself-2.4.3.ebuild b/app-arch/makeself/makeself-2.4.3.ebuild
deleted file mode 100644
index 32df98cc0e0c..000000000000
--- a/app-arch/makeself/makeself-2.4.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature
-
-DESCRIPTION="Shell script that generates a self-extractible tar.gz"
-HOMEPAGE="https://makeself.io/"
-SRC_URI="https://github.com/megastep/makeself/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-release-${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
-
-src_prepare() {
-	default
-	rm Makefile || die
-}
-
-src_install() {
-	dobin makeself-header.sh makeself.sh
-	dosym makeself.sh /usr/bin/makeself
-	doman makeself.1
-	dodoc README.md makeself.lsm
-}
-
-pkg_postinst() {
-	optfeature "lz4 support" app-arch/lz4
-	optfeature "lzop support" app-arch/lzop
-	optfeature "pbzip2 support" app-arch/pbzip2
-	optfeature "pigz support" app-arch/pigz
-	optfeature "zstd support" app-arch/zstd
-
-	# Also bzip2 and xz are supported but they are in @system.
-}
diff --git a/app-arch/ncompress/Manifest b/app-arch/ncompress/Manifest
index e8bfd369fd4e..3d02fd7407a0 100644
--- a/app-arch/ncompress/Manifest
+++ b/app-arch/ncompress/Manifest
@@ -1,3 +1,3 @@
 DIST ncompress-5.0.tar.gz 34185 BLAKE2B 7b296bd00024bfb483d3261ff8aa6e47a6be8c62b445c3d456d702b69fbc2a7b731326f7ea91aa331ba8e8a27936f4318b3e252cc978b6bf3198e8812988913f SHA512 5bc886f98f25b03d034e8d8ebb0ee9388d727ee3e0c6d8a906698b2f8fa5c930f55d857486244b7f40447c7b74f3c620626600db619d0c6d6fd434f52912be42
-EBUILD ncompress-5.0.ebuild 750 BLAKE2B ac8723df91a087aa45d41904b9586cfd0055f0e67cecbf0aca2ef009c70926af8e4e397a9a40fc4bb45741c203d533bf32e4927be9bd485554d1581ad74f6dbd SHA512 e4aa5c3b4e261f2bd6810f212a224ac9e5a6714071e477db1067212d71707406172edb34af8bd0e9481db6fbc63e7516326210ed3d296c5f6ef3359fbdbb00aa
+EBUILD ncompress-5.0.ebuild 757 BLAKE2B f4e4c703857af06135a7b9a64577255d7c60ca51ab3792129704f161e234b2c6343fcd019b2692883cb35b80e570cb62055092ce5a7acebc402e27724995ab9e SHA512 aa491fa0a7b6b34c638fd947d78cc612b7da4cdac177169b8effece4e66cb4f8580d2e7e4a194651c97e3c406ce6f98167cb65c65ee1e8fbb7a366125934e28b
 MISC metadata.xml 393 BLAKE2B 24133518bbc568fc7861bb255fcd6ebb34d8ed24912889ac7df4f0517f34fcb281a3eff0c75d5a285891f820956b680270b42cdb1f5cf7a417f43241b46d392f SHA512 7b5f6f0ea16f60fb9b05d9a27701b56e80b62c8e9d1fbf05ecc75015f51dc010f53546661013ec36831051985360e21fb374bc8b5006ecc14f707f9b715fe745
diff --git a/app-arch/ncompress/ncompress-5.0.ebuild b/app-arch/ncompress/ncompress-5.0.ebuild
index 096db9bc9a6e..88f47ec0935f 100644
--- a/app-arch/ncompress/ncompress-5.0.ebuild
+++ b/app-arch/ncompress/ncompress-5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_prepare() {
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index ca8ae9f520ae..534df2ab097e 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,3 +1,3 @@
 DIST pigz-2.6.tar.gz 106840 BLAKE2B 8e1a8ca593896fc947a7d6ffaa71d9be69d347f7cf1ed2f635b8480aa05708f4679a4768cf3a18ac515ea94dd8352dd4158bd3c9d1b6fdebd82ad1b582d04cba SHA512 04d2e44bc7a7eb061c3c48100ce5b8fc79931aeac72340abd768fd2a4499ff1004e2bc009772fc2003a4c599f6e90f3abc8bef5c377d6397f1c8e9f7c49f95e2
-EBUILD pigz-2.6.ebuild 959 BLAKE2B 0f3b28b07d4af30775e5c1d1e061a5cffe8e1b2d9f01dd31e9f4ad9b606e6fdbb7ccd2c55dd9397557ee0285ebbc34bc7ac8e64467613013568513b330b0f3da SHA512 b16444c8e914dd220e19c6cd931c5e2ab21cec731d173b1b33245d2456f2fe5f05cf9254850c23e56a3cf5a87626a3e7c065feaa5d04a0412e66db5eecc8b170
+EBUILD pigz-2.6.ebuild 966 BLAKE2B 0ab657b6c18b981f9b608b1b7bdfecd54edc83ecb3b2d36f712b84c4c042ed31d2453621d121f173b4f7964d70c6e6c4a6287e2b492cdeee92adabb84e858191 SHA512 204512015258a1db29827415d7a27a09bbbf52f0f3ddaed3bf7e1602416317fb0bca526e45d7b9c7d0040520d22c9cb5f0cae580150977fd70525c0b346b4063
 MISC metadata.xml 740 BLAKE2B f16110bdf40040ccabd1674c4eab628d44b019d6b17174b286e5bdeb0e2817ade6898202afccf02461ae6adfea61ffa41a8345d9b88234fbf3b0e5d41a396aa8 SHA512 7779fb38f750f9a3dee07e26cbd37d9cc5228422168a8cd59091c452969d7384d611b8153d87311ca922702e76a697f0a5c233c0e947ad4c2ac076453376d61f
diff --git a/app-arch/pigz/pigz-2.6.ebuild b/app-arch/pigz/pigz-2.6.ebuild
index f57fbf711a4b..73d2eb703ca9 100644
--- a/app-arch/pigz/pigz-2.6.ebuild
+++ b/app-arch/pigz/pigz-2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
 IUSE="static symlink test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 41ef7f452c94..37683eb189a1 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -5,5 +5,5 @@ DIST unrar-6.0.5.tar.gz 232702 BLAKE2B 8e33d116ae9de06818379f4303241dd7f44ba3196
 DIST unrar-6.0.7.tar.gz 232903 BLAKE2B eba5179f622726046fabedac03e8c05f7dd2f64782dc0be18010deb22c1036b895cbb9429f44239e63d9c04f3e031b4f9787462f4f643f8bca11b135de08f547 SHA512 2c50d1f58f5189e59dad36eb25aa50a34572f583242e624846c9791c5609e83d4ee76314d785771fe514ec3378749dcb86e4c97a8d2a3ab7b469df49a5c5f412
 EBUILD unrar-6.0.4.ebuild 1862 BLAKE2B 785443182da522d483e6efbcf32999755ff897d36bb1f59c8b77d57a7060348759cccaf653af7a017149a927215cecbe78179c85389e2b9e1df1a18e1b83a805 SHA512 4c887ff1f51183c96b76cbdd62774bf74fd98e53f48bee5a948fa84e91fb87d4f1724efabdeab40b2f7d4cb1b59c97774aabebe4899a146067f485b842d1b6d4
 EBUILD unrar-6.0.5.ebuild 1863 BLAKE2B a151fcc7bcc6e015450a00216793be440c50241726aa0c238c246e8708afb3976dbb548d7de9eaf5f8842a46ad283aaf41593211bb57a60169b08d974d6f7ef2 SHA512 27de8a6deac82faab6419b01651c7f24d69a3c430614b75c304fee9477d4cece38d5791a0afa9326a70dc1f8cc8682f61daf858e7458d62772da71948285c9ff
-EBUILD unrar-6.0.7.ebuild 1862 BLAKE2B 785443182da522d483e6efbcf32999755ff897d36bb1f59c8b77d57a7060348759cccaf653af7a017149a927215cecbe78179c85389e2b9e1df1a18e1b83a805 SHA512 4c887ff1f51183c96b76cbdd62774bf74fd98e53f48bee5a948fa84e91fb87d4f1724efabdeab40b2f7d4cb1b59c97774aabebe4899a146067f485b842d1b6d4
+EBUILD unrar-6.0.7.ebuild 1869 BLAKE2B ad08b4b9b3daa9ba6cdbf1521062ededebcdf40810a09df5544ed10bbaaf2d4a4fb15edaf76251620e6ceff9e54f08fd4c1613562b3a26a677b098b8b3523ae7 SHA512 02bf1ae593aba1be9fc0910ee6076878639b133527180decb4889fd8defd93e5faef42869f2bb5d5fb2e143e340e807a74d28892f8acc164daee4217183596f2
 MISC metadata.xml 521 BLAKE2B bf6d200d054dac732bfbb968ccb376a62230e0d2948a42c6c94ecb6823407877edbf3ec98f33ea21c22ea52b13b32dec508576dccfa34d4948de79741f863882 SHA512 2a4bac4e32c01b93d51cee66abd62f227f1f4b3c57a1d4e3e325724d349508107bf1a078282bcdc5fb5481058cf657040c697a3ff939fb8146f24fce7938eb4d
diff --git a/app-arch/unrar/unrar-6.0.7.ebuild b/app-arch/unrar/unrar-6.0.7.ebuild
index adc92be38a0c..4aaef633085b 100644
--- a/app-arch/unrar/unrar-6.0.7.ebuild
+++ b/app-arch/unrar/unrar-6.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="unRAR"
 # subslot = soname version
 SLOT="0/6"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
 
diff --git a/app-arch/unshield/Manifest b/app-arch/unshield/Manifest
index b98d579e3569..825275beb218 100644
--- a/app-arch/unshield/Manifest
+++ b/app-arch/unshield/Manifest
@@ -1,4 +1,4 @@
 AUX unshield-1.4.3-mandir.patch 776 BLAKE2B 6d0c23a3cf0457ffb03f8f6a08667bfec7bd2fe1744867febfd9ce9a786a0e7b84408cbd5a2c23eb94c68d33a17d2c638ab7e44ea6ae0d95d5c0cc280b0ed585 SHA512 4acc69f49e3828f1dac5448b22d6015cd1c4f551c22c9d824d0650790ec509d02e7ef13f18b58bc338d25d7e93bf334d2ae1bbf198b2b831c183707b22bceceb
 DIST unshield-1.4.3.tar.gz 58822 BLAKE2B 89e23462610d7ffd25358cb1d9f234b5c80a580deb60e85610ddacc8e3aa92420cb0e885e80375089e93786565824813f23c54f7c4d60b7773f23d174c98e5d7 SHA512 2f058e0a28d0497e2afe231ded1b1bb16745401398eb1035e628d263351b10a1343c9664f3937b8912755db9dc5236a1b43e9bcba596affb7aa8b036f49382aa
-EBUILD unshield-1.4.3.ebuild 825 BLAKE2B 4189b7544ffbba11f833d3447b7ab76ad7ea8fd011c17760215a21a0dea3bb611df3c50d0cd73ca8dfc2ff44814e655419e821ab2750cbe4137916c992c1f9c9 SHA512 1919b5fced6ad0f9b667839239f2b6dfeae724a7e2c8d4ce2af254b085abf8aadc13317c2b8f08f9b41b9533ddef96341a00a1ea1b0d16f920e88053f038ca21
+EBUILD unshield-1.4.3.ebuild 832 BLAKE2B afb14c602f0c2dac1f1ca60a9ba113f719e58bb30e2439aa17c5ec9d8890d4faafd89aa93f8e9f2e273c275b5814f25840fdb68be209dba4bc948dc9ca855842 SHA512 8c319b8d5c84e92347c0ada54469942c39783224fcf8bfdad9ca657c320ccfc51d25da45aa6bbc147b2c5dda340b0cd39bbf42d4ae5a3a2b80371fe2a4c36b65
 MISC metadata.xml 252 BLAKE2B 53cb03dc869146a76fb5fcdf82fbff2de9d5ba3089698bbd483e0e0042e2c762aa4fb847c8c7013470b3e87d7e2006ced995489e58261709025a8b2e7fcfdb5e SHA512 cb1ad379f1fb78be79dff6b6562a8adde061767668bc05859b11cba5a244977c5f28e10c2c30dd0aa9a26607c3f6bafbc72a29a268ce67101a7519aeebefd06b
diff --git a/app-arch/unshield/unshield-1.4.3.ebuild b/app-arch/unshield/unshield-1.4.3.ebuild
index 7cd9b3ff46e4..ef6402a9381b 100644
--- a/app-arch/unshield/unshield-1.4.3.ebuild
+++ b/app-arch/unshield/unshield-1.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/twogood/unshield/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~riscv x86"
 
 # OpenSSL is detected at build time, and used to determine
 # whether or not a hand-rolled md5 implementation is used. The build
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index 134bd2b2dfed..749ab0fa159f 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -4,5 +4,5 @@ AUX unzip-6.0-natspec.patch 14304 BLAKE2B 87f724fcdb0960bfa17d609dbb764f3469b1dd
 AUX unzip-6.0-no-exec-stack.patch 381 BLAKE2B c298afe0df1c903c0894bf55e55b3f4f0d616662e3fa706bcb9813707af3f2bfebff1a2b4290d943718ca35aa2ce098f20b5d370a624c1a16b81d4e921a3bdeb SHA512 a00ba3c805aa64bebeb3194cd75093c1e7c951366d40bba4852837dcb355eedf1ca6a6e648ea007fcb71124e778e54b5168a7b38a7b7268bc3983d87594633a5
 DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d
 DIST unzip_6.0-26.debian.tar.xz 23708 BLAKE2B 7655396df2f8c4443bbd37a2fab590f1e66b3b8531871a6d95f281ac702e64a0e602f2412a58ff2addf4ce9cae8d146af650a18b02919d120c9db6c49df480b5 SHA512 9a56e400ad0984f87c7ee0548429349be549e35a3cae4c9acb88a8fb97a1d1fbd116cfa3292622ad8b2c67ffe79ae268861ddec1269993ba98f1a6a411b7611f
-EBUILD unzip-6.0_p26.ebuild 2804 BLAKE2B 5494fe51d269c97c8ddb3cec2632e87f8066835e9ef382579cfe988cebfb8c76595c7a86cc049484801ca121775e3e4301c96ba32aed6a144f954f1e0b226a2c SHA512 bc7ab1b7d4358ab4a6edd677e110c287b9f2c091cb0694f647883d88e9ef4db28c104bb5fde015f0bae79291dab3f7db5d6a9bb066b3950d188779d0131a38ed
+EBUILD unzip-6.0_p26.ebuild 2809 BLAKE2B b7ba87034c28d23992574fa00bc939dcab5cc102ebf846b76f0a6d90d8d2b928f08ec4ddba9aef530321b6c0b0198b4e0f514840824c560e8ccbe48c743625e2 SHA512 722c86d267214dd2462229e2208c189498c977c67ddfbb59937dc2a830a8cf95833d5f8ee17f9d14e5be4cdff51e78165ef2ea913c655cd78be407dad1b338f7
 MISC metadata.xml 587 BLAKE2B c2190274c146c5587ac7d6adf786fd98db897aa5a62433afdde4953d3a7ae4a6022837ee6b06f3e216633f5710ab89cccd2000504481094b5871b79300424957 SHA512 75b014ae98951f4484eaa909af92eac9ee955bf5f4ba6795a4bb40a5e40036ba4909a42471ccd2916dd4c9a33a500054590faec39faf9d4049f9c74201884c56
diff --git a/app-arch/unzip/unzip-6.0_p26.ebuild b/app-arch/unzip/unzip-6.0_p26.ebuild
index 398013305c5d..b28a3acf9fc0 100644
--- a/app-arch/unzip/unzip-6.0_p26.ebuild
+++ b/app-arch/unzip/unzip-6.0_p26.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs flag-o-matic
+inherit flag-o-matic multilib toolchain-funcs
 
 MY_PV="${PV//.}"
 MY_PV="${MY_PV%_p*}"
@@ -76,7 +76,7 @@ src_configure() {
 }
 
 src_compile() {
-	ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \
+	ASFLAGS="${ASFLAGS} $(get_abi_CFLAGS)" \
 		emake -f unix/Makefile ${TARGET}
 }