gentoo resync : 14.12.2020

25 files changed, 353 insertions, 23 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index d3b3f5dab6cd..75a70eb0dac1 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 5373a91dad31..3f43f5db4aa6 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -1,5 +1,5 @@
 AUX 1.0.9-linker.patch 1799 BLAKE2B b082af9af7eb8df80bf86717e9b9511952e77afd649de9bfe9cbf445216d4e9d6a6e34dc065008d0129892240c98bcb6e7beb5443d4c459a1bb77eff664f7245 SHA512 04d5505074e042eca46a8dfd9d9a3a2c9af901d9bf7d98c219e8e1f8c9b9071bccbddfa3e17e86800de2606a10b26dc05d69948cd84ddd3075d6c1c51991bcc2
 DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904 SHA512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5
-EBUILD brotli-1.0.9-r1.ebuild 1764 BLAKE2B 4d10d4e1b1fb06fa9d6c5ae7dc2d7ba3c608514babf7ea0e723d044dce08acc85bbadb333e6302dcba4244650cf672d818ff11a2a4ff55392d3166b338029578 SHA512 c14b4bd8c30f3b1a1650be6be973be5badafd1335b9f034a88ef3b16f83e9d78e20f63e90280714168a98a20cf7b2e209ec379937af2078b9813ed9bfa9997d3
-EBUILD brotli-9999.ebuild 1656 BLAKE2B f9f9e46750995bc450b3be52e71571bc76d4d5b02157f1cc50f028c8c68659583cd84e0cdaeef395a9d84e0cd1e474e728ccab522a6a196b3d4cc98ab59c39e0 SHA512 0f54e7839f789f8b89a6fc66a1fe8e4dd845b2e8393ed8990a79d3fd67281ef121fbece382d8f21d4a629404625741763c9cfcb008f55b5a3eccb1bf0914e7cd
+EBUILD brotli-1.0.9-r1.ebuild 1777 BLAKE2B 9162757fb47b9691bcbe5ccf02acb8513218db247287e1c2a863827baf4b36bf44f413b290bb5d89c46a0f43faae4eea95e5ff1221924015e6b426ad420d798f SHA512 722649d131fb256478ef322da85a6a8bf841163a319c605335c0bcfafba94bf87dbe3aa8fe84655335ce3a2a63ace91633408be5fb66440d2d879ae29a97150c
+EBUILD brotli-9999.ebuild 1658 BLAKE2B 6045fbcf26a87d865c34c2f5264a8cd39b23b1a5c6e2dec319bc7c2604253cf67311796fee76819023b9f37e7f4d83a4c194e27463d26c5d4b3a29431d51bcb5 SHA512 1b5422cd44a1b22ba689b9589e19f4e6d3fa56b2921aefe639d5a13e1c83817f5db7cc389d350a0f34d8ec2c6f616d1bb1f2699b6d5dbc5262fd9888e7b98b89
 MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc
diff --git a/app-arch/brotli/brotli-1.0.9-r1.ebuild b/app-arch/brotli/brotli-1.0.9-r1.ebuild
index eeeb0e284d4c..f0d05fef19ad 100644
--- a/app-arch/brotli/brotli-1.0.9-r1.ebuild
+++ b/app-arch/brotli/brotli-1.0.9-r1.ebuild
@@ -29,7 +29,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild
index f40bbfb62d2f..89d52f2c2ec4 100644
--- a/app-arch/brotli/brotli-9999.ebuild
+++ b/app-arch/brotli/brotli-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_IN_SOURCE_BUILD="1"
 
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 422b9b096cb8..09ff56736b87 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,4 +1,6 @@
 AUX libarchive-3.3.3-libressl.patch 458 BLAKE2B 883523792c0d3e964a2bf9ae40d25a0127e43a2d95e0187d566fd371aa7ecc0861d99ab21641e9f2d6800b36155e3b845c1099ec7b1d3dc0f3c0fe2b78c9e273 SHA512 0a8dfd7f30ca450cf253bd475d328a886957257e1c7c6a6c9eace4cacdefd9f1eaeb4de81ad00a2439bb75336a82b08278f98c6143803f6047159036e848aabe
 DIST libarchive-3.4.3.tar.gz 6990533 BLAKE2B 12f97e8e4032daf0fa8f9e1839f9c7ef80fda0b2a0ba703c67d860437fad6a293484a61417f72eff933179d544cfed45083e7886f462276bc6abbce1097e6256 SHA512 d00167dec6e65a0b17b46a1e3bb0242d85716dbc637afd233360cb515b2750dafe0ff0644b9e01ad23534340b405a8551f496c5e39fba9ee99355a515580d65d
+DIST libarchive-3.5.0.tar.gz 7017726 BLAKE2B 651c9e28d1a1b0a6dd2dbd2aefa0a47ba23d5fb5e96c1bc8c059152952c284f089ce16626b9fbc2cbea70dac2d16ab949235bf4c28f38235f23aeb6da3d69f0d SHA512 9a3d4ce9d4bc856c8d85b846d9d0c9f30369393aa107941c202ba0100c6bac009952c92d809e6981276b3bf91e9f37d018e7f1446b17c0c1c316fe5aafe15440
 EBUILD libarchive-3.4.3.ebuild 3761 BLAKE2B 2d9bcb9f9e0d6ead67db818a64fb611ce6158b0a7b01f20aadbfcb73624db143b399c446e6b1797d25581f7fb89ffe3b9528377f72dfc96cf2f5db7a658e4570 SHA512 346b64cc503f74f0220d319f02fe8c8265c3468c54a5c09df23fd948be20262bd849a34648522f6774854afef004bfefef7fd3f0cc0ee52b1bd18ec99e978924
+EBUILD libarchive-3.5.0.ebuild 3770 BLAKE2B 4807869b7b89b14b1c97218ce92a316de81c806580049e134ebe39688d678462f0e8a4ee790c364ff0a3ec2879840990f6c337b5541e5db3e4f06ac91a133f1b SHA512 2aaa032adff8441721e42e6fe4de0787eaa9602f71f2e60735c6a0fbd388a0137f82e8058b1b635287d790774663575c673cfa5ba2a75a3f9940e81e903c2c00
 MISC metadata.xml 1514 BLAKE2B 377e5cfd85ad2660469744537665395cb99b12187f63d5a2202b8eee52cbe19adcc9f5289ea6665e5bc5f4e9339a5280e1e6dd297199cb009bebb37624009a5b SHA512 8dd39292864923ced4fab7f1307130082525aab611f94e5c7eee25045168e812dade090ea621ca3252eeb85ef8c7269fcaf0de1adc2979f4567f5e01581540e7
diff --git a/app-arch/libarchive/libarchive-3.5.0.ebuild b/app-arch/libarchive/libarchive-3.5.0.ebuild
new file mode 100644
index 000000000000..dde837017a82
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.5.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2020 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 ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads 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}] )
+	)
+	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[threads=,${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.3.3-libressl.patch
+)
+
+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=
+	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/lzip/Manifest b/app-arch/lzip/Manifest
index 0645d7faad3a..e517b47ad08a 100644
--- a/app-arch/lzip/Manifest
+++ b/app-arch/lzip/Manifest
@@ -1,3 +1,3 @@
 DIST lzip-1.21.tar.gz 105558 BLAKE2B 07658ec901bdfc255fef5af24b62614b2db9821b9a2820daa5137fd47ede0b68bbf3eac340ad5484d2ef7011d15c2eaccf19abc9e33b5c96273fc9b9d323083e SHA512 02e31a8fc9431e88edbb0fd467e9dd0947203e693e6581be1a8d25d96c74d9c3794f1fef9e4c993553ba74330c8f5851cad6315b49f263fe9cf2444225af4362
-EBUILD lzip-1.21.ebuild 769 BLAKE2B b79481b3d1cc7d64708e4316c0ab92367e4da885aaf1e1bd556d941e02e35a58ccca1006137b31aebc1f9150858c727908fb69df5254c311ea61fb4fa40f9598 SHA512 1587e92228baf8a4b0cc3be74b2575591e4884a94b28847939604e64c40cf841c202b8cb92e7aadd47470d39d7ba42ce5c7800feadaff49bf3fc15ff5c70070f
+EBUILD lzip-1.21.ebuild 776 BLAKE2B 7d9cb2f04c55873fe47242ddea592235ed8b464a20bdc13a31a9dc05d754fff145fc580e20da08b98f1c2177acdf4f44037d06018ae654e16104bfd54a54065b SHA512 a345d18d328af8ee6e73726b9968ef209fd676e000b5b4de4463aceeefef404d1b8cf584058edc158cecb22326422a43a7d33020fe49a1eac811c455df4f3092
 MISC metadata.xml 357 BLAKE2B baa377044f421ed8bc913a5bbdc72e49e026bf0529190f07aa2d0081208870453f140af7ce3d3a97121b563891b4a4b36196db233a3fdb6a98b6eee34af9e9ba SHA512 e5f560cf4a71e085f50e0710d39e81aeddff8fb72fb07126f86a080970dc2b79acef11522b2ca471fccbf4e20e34ea57712b0b178eaaaed7c9ab5df9910542e9
diff --git a/app-arch/lzip/lzip-1.21.ebuild b/app-arch/lzip/lzip-1.21.ebuild
index cde6febef71c..84286251e21d 100644
--- a/app-arch/lzip/lzip-1.21.ebuild
+++ b/app-arch/lzip/lzip-1.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${P/_/-}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S="${WORKDIR}/${P/_/-}"
 
diff --git a/app-arch/lzma/Manifest b/app-arch/lzma/Manifest
index 583e71d1a384..2f9c9d1171fc 100644
--- a/app-arch/lzma/Manifest
+++ b/app-arch/lzma/Manifest
@@ -1,5 +1,5 @@
 DIST lzma-19.00.7z 1082692 BLAKE2B 88aca3f3225d589c9b1b0fbf4c196db8e6e8df362f926736a45e1f80d302c132b25537203b0a903da9de5f3b0398b10901f126cf6905fcbdf0a57ee894e74b6d SHA512 60532483249d86960d5c481dc88ebeafabb7e435afb6188bc26f38177b8534ef3da83317d6920d99103d4f10a8dcdb624489ea5ddad8e0c8732bab1bb4ebd7eb
 DIST lzma-9.20.tar.bz2 534077 BLAKE2B c1be526d6fb9f68da10b654940a92420b6c708c7aefe213394cf1c7650b3d65c4f54d3ca0663e52be13aa9f996ff9cc87262fac8b76dd0654e839cefc073c374 SHA512 1c495530834107430a675fb48c006093edc301ec7a2c2f273efd62ff260f3056503bb2c3ddef63e82f5ff04b1347381055cf6cacd59eee9d451c4d841c13cd35
-EBUILD lzma-19.00.ebuild 1011 BLAKE2B d3d3c3c01ecde62a039b622d54a28fbc1fe28d73be0a77ffc944252dcad90d821082cfe65daeccc93ed068672c42f0e2734218e2bed108d691981128ad9cc4f3 SHA512 2516f46777a11dc8b00a4a4ff69bb091f2da95ac676373cd2283bc3f7abd7ecb1613dc744a8ae54673ba9b649f97373274a59a338790b9ebc96bc0fcc7d5d0b0
+EBUILD lzma-19.00.ebuild 1018 BLAKE2B 62862764dc66afc8f40877a135f69de5646452f8ab317e4ed090689858c540015a917f1746fb4fb98a85387d2eff3e74b07892e088417a86a1eccd6cc3c6622a SHA512 3a1fd36a6d5fdb5026b6c85bd72d868fb4a2644e833a84a0c475d50efa9b5091ba715fb9e15171b89615f980cf39de25030ec48a1f7f18425702d885f32d36eb
 EBUILD lzma-9.20-r1.ebuild 902 BLAKE2B 768a2f1db8ffa970a91e108e9666a1ce3fb2d7061bd8f79c678333ee2c7f864391e0d605d4255bf73934288f3b2afbd84bb0ae4385a49b3cb763851602a6fb08 SHA512 c472806e0b31156679c40ef8ae60e6a6b4b079e49c721a8879683b5991dfae9630550663c983289bf3533dc5eda47eb6eae92c0b5830dd84c545ba0d073afdac
 MISC metadata.xml 444 BLAKE2B aec04279877865b9a1cea3f7feb010894c28ac21f120a9d90749a9a625b9fb8b8ef70b141031cd85e10d648deb217dbfb808b8a14566b4c130ae9623a80e919a SHA512 81f32c3de736c2adc84c87340765e18e12a7a3868b135a4e585fe91f646767698208c18aebfc6a772eace180cbbb65ada2dcc8b88ba603cdc3337077dcdf6029
diff --git a/app-arch/lzma/lzma-19.00.ebuild b/app-arch/lzma/lzma-19.00.ebuild
index 491acc885393..96ca5df0f656 100644
--- a/app-arch/lzma/lzma-19.00.ebuild
+++ b/app-arch/lzma/lzma-19.00.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sevenzip/${MY_P}.7z -> ${P}.7z"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc"
 
 BDEPEND="app-arch/p7zip"
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 78f71eb95f46..d4079c5371a4 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -7,5 +7,5 @@ AUX p7zip-16.02-darwin.patch 2134 BLAKE2B f8890b8b3e0a3ade007f162e5d3b7fdc9925e8
 DIST p7zip_16.02_src_all.tar.bz2 4239909 BLAKE2B 075356fba5284cbb124e30c36364a910ae5a7ac6bee8a8fb682c5a7ce2f1870ef83d3160c84f8dabad1d616c13d642cba1f19fb9384160d21590cf678dd8f1a6 SHA512 d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f
 EBUILD p7zip-16.02-r4.ebuild 4636 BLAKE2B 9fdb8cccf0921c95670f251114c5e32925cec4c68c28b68b3326947344bf30faaa6a32e2385100b52565053fa9b5de06067c5b5b4390e51c9c467e61a10976a3 SHA512 82861403e305d2ee2b980e158b2614d3acf563097a07e920e7ffdcde6ac261ceaf02789ad540816067ed445050dfa67961ff0a88bd456cf8bf1e1149fd9d88aa
 EBUILD p7zip-16.02-r5.ebuild 4802 BLAKE2B 98405f4baabcf5ba6c482b133f9451f0a786e7460007b9ba09a135fe0975e08c813d7bb6569190da9def27bfb0b4c548dd9d6b92c0e652bc049839e500a3c669 SHA512 092759547ee6849b3fae31cf1ada4333d82955a7c91ef6db25b7c2ab153daa1105dd4a166b9412cd3cba8ca204c64adae4d8d08d22fb8ebe2c0b34787abd870e
-EBUILD p7zip-16.02-r6.ebuild 4780 BLAKE2B f252038b96fc64714331faba2be93ce6d8624f2dc7ee61c2ad51c3fb5b5b76fd4bd0264f83420b19435296c1b4067f275b62d27857b4c06f65aa3f5fae50407a SHA512 92bc5e49c150abd40eddc558aad33397832877e0737f34f7133cda4bd2a94e29dcfe00677049c2ecc852e32cb0233d819e510b547d6cb4f970563c38b3e00c8b
+EBUILD p7zip-16.02-r6.ebuild 4787 BLAKE2B 41ee68409dda5a17e160163b6b124be6e83d78fbad95e578cc6846322e17fdbc52ca16d66231d7930deadf01a202f7634cd2980d66cd7abd5926557651186937 SHA512 6f9c26790ce42a08c62628602d9db81748f87c65d1c9490d6bea44768a960bd8bfaec87ea991f0c9f14b0a4461796d9b9ec31dcfdc8f9ceedace592c4b6b45fc
 MISC metadata.xml 393 BLAKE2B 6ab87f3e2f35dded47136efbf8f93c7a899a5918b4a8e3ab6658a427da8085e8eb0e6ce2aec09fd0ea5fb14909081600b79027878b7e5b8ef9d476def057e52f SHA512 50eb24c1e60e0be2c02d8054a5039c5e2b11ac82aea3f90c0a37c21e68b01135de88878b1079ec46eeb8d1f8ab52fb8c9f58f88a498feb38ae5743adb7519176
diff --git a/app-arch/p7zip/p7zip-16.02-r6.ebuild b/app-arch/p7zip/p7zip-16.02-r6.ebuild
index 3717156c8ded..598644099a4d 100644
--- a/app-arch/p7zip/p7zip-16.02-r6.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
 
 REQUIRED_USE="kde? ( wxwidgets )"
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index bbecfb76cfa5..eb6196cc1b03 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,13 +1,17 @@
 DIST rarlinux-5.9.1_p20200625.tar.gz 606675 BLAKE2B fe8f26d422bc816fbba27405f9d2e4063e9af6e136ca4c270bb5274a67e99d9a7c97250b05e6041f3ed27517398b0500aad765a1f599474ff08ebb6bacf5b0a3 SHA512 3ed37adda5f5b2f5502ab2e549614dad2848157321a31174d7259aaf77cc773c6398eb0e19ee6597536c58a938289a587e7db9681e6c47c906a5307c2d362147
+DIST rarlinux-6.0.0_p20201201.tar.gz 609227 BLAKE2B 8cf0052a7b2d53c57ae5e24290f24f4815815682a199d99a9b4fe120d01b3c31699bf6cdf46ddabc144944ab7437fff4043f16153770c7e732ee337082308978 SHA512 1c7abf04b2fc67dbc329210ffba707faf2d368750789cab695a45f25381f219cf9c7ad09a071b9caf4889ffae24b87260ebdfd18900891230c1fc2d8ba7a9fd7
 DIST rarlinux-6.0_beta1_p20201022.tar.gz 609438 BLAKE2B ab4793431f5d1d1570e1046868004722a39614ca4c3174d8f0cb2c67db0d138565e524deace2319dbbb853e3d4b33f35ae583596c6f77f52724e48484787c776 SHA512 668d0a4fa610aa71d5b69cace186c8d33683337bb88aa5e7f5ffeb5a314b666277205f0d6962cf6203dc3bfe0c2ec4fe2b38ede90754709f89479168bdd050d8
 DIST rarlinux-6.0_beta2_p20201112.tar.gz 609761 BLAKE2B 77acd1811cdafd85f317f7e96cfe5d69113ff25cbd9409bbb8d653bdc28f51a349f1df91c729543498d19704e253b2f58bee86ab1046e4ff51872fcf827c14f9 SHA512 510df1dece1154e1a0d951866965cc002a5044adf86a2e01b50a65a6a05e762bcb611d25ee051a4fcb1f8721d1b43bfb1bf69bccffc8c407b93a5de2d06a0d3d
 DIST rarlinux-x64-5.9.1_p20200625.tar.gz 595595 BLAKE2B 68eb24da7ecb2fe8a2be68bc3c3397df85490f4cd5517a2dc5390ad0dafbdd0a04d15968276657d600cf6c127cd8f52b74e920f7ee9b86b7083b9edbf0a57141 SHA512 6e0aec1642118331bfe79a35fa654f7d5143e61c0315375fa21d862a3941b672c58eaed4da69b8ea23a024aaafcfd02a277251391e59220b845847d4b3b82562
+DIST rarlinux-x64-6.0.0_p20201201.tar.gz 598314 BLAKE2B 778e4f2360617ae04a30cafdec54485c757c0aae66c925c353047850a9873a536e258d8835d78cdcf6b69b4000814c242db311fda74a8dee492bd5916c879e79 SHA512 7a9fbed46954c06b15109a5af6a945702e0dec949349e17b7e31753a04298abfb80c6f2514224926aea920d26f2f2578ae8fca61c8ee3f1883e9ed60139e0968
 DIST rarlinux-x64-6.0_beta1_p20201022.tar.gz 598338 BLAKE2B a0af6342f71a6ae448ce8b3fdc49dfd022337d74364d17f8135eb3c32d3d778857e9a4ef7e819d336581f477713a647be22377ced2d50faba4ab4a0c6e14f49c SHA512 312c1a59236cb32df69462bead45df5fa4f8180a8c075c964d508326027f2182cc8a1e31347fcb7570ff18d105a8df7abb5adf463a34f41c8f3e091cfba7f0fc
 DIST rarlinux-x64-6.0_beta2_p20201112.tar.gz 598386 BLAKE2B 49202329698dd8c26fecd74e48cad2583507a727049281e36130cb7408f64e0530245fab8aba4a8ad6ca6a48af6bd35beefec777d185b578a02a81e1bf00cc10 SHA512 6b61b2ce0efb8c44db5217ccb8e52d5e7e1efd95a9daeb3be6af30eed08993269389ab16faf5d9cfc0f562a0e9fb26ec4f8c73b72e4e0edefdc936e7f3821f66
 DIST winrar-x64-5.9.1_p20200625.exe 3246712 BLAKE2B c0616e600b11aaa524154b9b0108ab1a62e09cdd27a968b5bf9fa6d742800c9006ee7655df39511f31b24506dd03eb431c3e016ea63a5fe8fff702ccd8d3b358 SHA512 da7a85d56f1ed4dd6204e51297175c90349a26896b223bf210055a0c38f315c59f9d9b8368d5c279049443467d962c72bad48a3c62c1d80f2260f8ecd4d17db6
+DIST winrar-x64-6.0.0_p20201201.exe 3334088 BLAKE2B 37d7d4c3ede27a049eb3ca42b944e49570cd109c2c940ddaa40139700ed7ad32d292bdec6d9d6b60908bbeba2e363b8013cc91331419325dc4d3c1613b93d782 SHA512 c161d760070a133f249fba8730fa7268435b3c7f32f5cfa59ec228f3c7a94e915f0a201749e234df0314f1b436d8d46365bf1a7fc118a9b34e8f7419cb556b71
 DIST winrar-x64-6.0_beta1_p20201022.exe 3334400 BLAKE2B 61615920c38671649fe44b3c50f0427c82ba36cc5d610eeeeda5ec8acbc465b2e2a9573875a3efc5082bef24b3e1f1490e47eaf47d0a326aaade8ed3c3231cad SHA512 26bcfef84aa20eaed415b088e5a69fd2833baf3f660c38e58f26a04e6754335603f0d5e89e802b02acbef43ecbe43b45f810f5682c5857fbad1689c44c80bc9a
 DIST winrar-x64-6.0_beta2_p20201112.exe 3335984 BLAKE2B 2c9a3a44887990bb3ca36ca6797cf968bb65f082abaf4a843b5b69c1d562d331ec0622e79d631255519d769252e6c29e2a44db1a7555a05a290401c8eff30533 SHA512 b90290214254322acad10e6e56f904b3719d46c1c16bf384801050f8fc5a826a22de6e8d031fca2c67ab9da74916f3f6294152a43ab640d027ae2fa375a30ac9
 EBUILD rar-5.9.1_p20200625.ebuild 2232 BLAKE2B 35d9813aff0214bedd8580d884df51a57d6fa13a85bd1dff818c76a59a399c12da4fb61910508a351ed3519ea52d99719c09435d5d04192ba1c5c0463e71bab4 SHA512 09c59590aa819cf74013ef125710d5e86c67f036a9ea9ceecc47fb97acd600ae1bf6cd031de5c37d85407d2743f9da40c0a2bca31c2a62848a8e1c509a78081c
+EBUILD rar-6.0.0_p20201201.ebuild 2234 BLAKE2B 41a95f0e2089dd58c07be9195f123584c7566cb848e93eb01e49e1a403c635fd45fe0d01f57153a58863b32cf783261f6e9bce6c7902b21249d49034673595d7 SHA512 1697cc58d6d0fccd92b65ed6b175c3092f7ea47c3a9b48e994f2991d4449c9b787b5f028c2dc13f320c1129845e5d57f38ecc5a47856aa21d2161d548f965d87
 EBUILD rar-6.0_beta1_p20201022.ebuild 2234 BLAKE2B 41a95f0e2089dd58c07be9195f123584c7566cb848e93eb01e49e1a403c635fd45fe0d01f57153a58863b32cf783261f6e9bce6c7902b21249d49034673595d7 SHA512 1697cc58d6d0fccd92b65ed6b175c3092f7ea47c3a9b48e994f2991d4449c9b787b5f028c2dc13f320c1129845e5d57f38ecc5a47856aa21d2161d548f965d87
 EBUILD rar-6.0_beta2_p20201112.ebuild 2234 BLAKE2B 41a95f0e2089dd58c07be9195f123584c7566cb848e93eb01e49e1a403c635fd45fe0d01f57153a58863b32cf783261f6e9bce6c7902b21249d49034673595d7 SHA512 1697cc58d6d0fccd92b65ed6b175c3092f7ea47c3a9b48e994f2991d4449c9b787b5f028c2dc13f320c1129845e5d57f38ecc5a47856aa21d2161d548f965d87
 MISC metadata.xml 436 BLAKE2B 772b97d33730af0ec24c126f46634735b661470d99fe1c2fc90d36653d0143014cf45f84686f3621b3b276c70b859f6551ffe764089d0fb646f99cd04b7d0def SHA512 9748890b95ef59d0fc815cc71757c10e77914ea73d254770a8669d8b766d95c65a90eb941a360b361d4e0c28f1abde6ba15a84a77609820aea7eaa25d2e913a1
diff --git a/app-arch/rar/rar-6.0.0_p20201201.ebuild b/app-arch/rar/rar-6.0.0_p20201201.ebuild
new file mode 100644
index 000000000000..7623c5c7ee5d
--- /dev/null
+++ b/app-arch/rar/rar-6.0.0_p20201201.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="RAR compressor/uncompressor"
+HOMEPAGE="https://rarlab.com/"
+URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz"
+URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
+URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
+SRC_URI="x86? ( ${URI_x86} )
+	amd64? ( ${URI_amd64} )
+	all_sfx? (
+		${URI_x86}
+		${URI_amd64}
+		${URI_w64}
+	)"
+
+LICENSE="RAR BSD BSD-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="all_sfx"
+RESTRICT="mirror bindist"
+
+DEPEND="all_sfx? ( app-arch/unrar )"
+RDEPEND="sys-libs/glibc"
+
+S="${WORKDIR}/${PN}"
+
+QA_FLAGS_IGNORED="opt/rar/default.sfx
+	opt/rar/default-elf32.sfx
+	opt/rar/default-elf64.sfx
+	opt/rar/default-win32.sfx
+	opt/rar/default-win64.sfx
+	opt/rar/WinCon.SFX
+	opt/rar/WinCon64.SFX
+	opt/rar/Zip.SFX
+	opt/rar/Zip64.SFX
+	opt/rar/unrar
+	opt/rar/rar"
+QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
+
+src_unpack() {
+	local _file
+
+	for _file in ${A}; do
+		if [[ "${_file}" == rarli* ]]; then
+			if [[ "${_file}" =~ x64 ]]; then
+				if ! use amd64; then
+					continue
+				fi
+
+				unpack "${_file}"
+			elif [[ ! "${_file}" =~ x64 ]]; then
+				if ! use x86; then
+					continue
+				fi
+
+				unpack "${_file}"
+			else
+				die "Unknown SRC file '${_file}'!"
+			fi
+		fi
+	done
+
+	rm -f "${S}"/license.txt
+
+	if use all_sfx ; then
+		mkdir sfx
+		cd sfx
+		for _file in ${A}; do
+			if [[ "${_file}" == rarli* ]]; then
+				unpack "${_file}"
+				if [[ "${_file}" =~ x64 ]]; then
+					mv rar/default.sfx default-elf64.sfx || die
+				else
+					mv rar/default.sfx default-elf32.sfx || die
+				fi
+			elif [[ "${_file}" == winrar* ]]; then
+				ln -s "${DISTDIR}"/${_file} w64.rar || die
+				unpack ./w64.rar
+				mv Default.SFX default-win32.sfx || die
+				mv Default64.SFX default-win64.sfx || die
+			else
+				die "Unknown SFX file '${_file}'!"
+			fi
+		done
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	exeinto /opt/rar
+	doexe rar unrar
+
+	dodir /opt/bin
+	dosym ../rar/rar /opt/bin/rar
+	dosym ../rar/unrar /opt/bin/unrar
+
+	insinto /opt/rar
+	if use all_sfx ; then
+		doins "${WORKDIR}"/sfx/*.{sfx,SFX}
+	else
+		doins default.sfx
+	fi
+	doins rarfiles.lst
+	dodoc *.txt
+}
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index b8cd852b63bc..070e859a54ec 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -5,6 +5,6 @@ AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400
 AUX rpm-4.9.1.2-libdir.patch 1056 BLAKE2B 5be54a8109c2c24fcd0c197c0a62e433047ac4f84c7239fed6ee9830611de98b7a0bf0e7675b861c27a436b73dad64dee674e2780644ad712164beafbfa2276e SHA512 505faa54ccf196891f1e2231c776f8eadf547bf2003a495c90a2e5e4c93e31aadae5bac70541d316643a8aca85a1b2a3dc6b0ae2601834534ccded06a4a5fabc
 DIST rpm-4.14.2.1.tar.bz2 4156574 BLAKE2B 2eb0cf621eecef7d8977d28d52be922156ceb64b14d2aefda0f5a927b90cf3d3e9c055d773e05ed52422254397153b79557dc94bdb43ca28a2ea126153a43c1f SHA512 0aad457f91918904c15649a1764ce7cbfaf38e083678031286e866f7997be0435a6b7b73596706d97e9263cff7b4df4a3150b142d81e6e3fddbfcf67bd83f990
 DIST rpm-4.16.0.tar.bz2 4341683 BLAKE2B 5161e5dcc6d9a1f1d4b8e44740fb368050b808fd9e8b8276fb17b530a4642e1b9ad104b5a30c0071215aef7f823eeab10988dd41f73af1c52d575529c374b5eb SHA512 177119c3ac3d48980db55bb4ba0fdbb2a911968e5efc690bfa8cc343f850fc90531cc0dee6dd8e45d2b14f0d951ced35bd8893d24011b7f270745d281ddf4e3d
-EBUILD rpm-4.14.2.1-r1.ebuild 3461 BLAKE2B 9d822a8d3d59899a7d84fb206af11f5b8d0d9e4efc5202f2eecf49f682a48f3a217bc690ee2ed4bf9dacce5b053731ecae4b3403b00476faf149f4ec2adcc05d SHA512 d385a795e3413cc621af265fc0de080e36063f5a0f0fadfdedecb9dcb1d46d0fb5322cb4f68bc94f7fbcbe41dc2e73ac88d5bd8ffd7cbf194d7945d89d481d1d
-EBUILD rpm-4.16.0.ebuild 3363 BLAKE2B ea1259dee892910f0f590839816f6cfbbc99e0d4a1204812354fd9a73c48cfd960137dba14380381414c7a3b7d2e0405255df0349f52706a792b065c8fc9f0a7 SHA512 c15625d6f4235ab067dde4cf679c62393c7ad16af9d52f9315b09a36eced217b6bd782b1f6c5001d7c7031714bdc7b35d5c0e873f6114aeaffbdc0d9fcd83d45
+EBUILD rpm-4.14.2.1-r1.ebuild 3462 BLAKE2B f8905ac5a807746eb25507592625112aee78feccf478fb03063c3a506635a559f8601d3fca9a8b8dfaef051b00af8a8e3c06d70cb406f8b7a81a3d5bacc73ac3 SHA512 3be933e741e65926eb95616891d17327a1502bb052f2e80900c8d750428b3630e24967bc80f72b57a8dc80e7acf98278a16eaaa4953c02563bb7414a41180f35
+EBUILD rpm-4.16.0.ebuild 3454 BLAKE2B ffa372891087408e9bf9cc21720ad5450e3601cc58f27ec26d47dabba5a7840d55dab93a2861d95056b971f25a4e3786650472bd473766e487ea25daa36da6d2 SHA512 87b0f73bc8060bd351f7a6657632a23bdfc4b29cbdc576c33252742ebbb2440321592fabde36961b81cfa6a97213c64e2edd739a1cd876b30e3e5a6ff363f7d8
 MISC metadata.xml 337 BLAKE2B d01523bdc86c3b93ae548f601265338290470dcb578a79757ba7d3b2c4be257c89e76c97b5d411f9271d9ee754981a004b03e2a5cfe9b6bd56e32932796771c9 SHA512 20a89c9f7af0c1a7dd5f325eb3c1af65044a6f09e6ea8c70033bf35819ee18faf8c3a0ee2cebcbc0849a84e962dbbdd2111e02b3369d0feccf3719dc0bcfa6cc
diff --git a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
index f4a6a46bc5ea..22a48d51d444 100644
--- a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
+++ b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
@@ -36,7 +36,7 @@ CDEPEND="!app-arch/rpm5
 	dev-libs/nss
 	python? ( ${PYTHON_DEPS} )
 	nls? ( virtual/libintl )
-	lua? ( >=dev-lang/lua-5.1.0:*[deprecated] )
+	lua? ( >=dev-lang/lua-5.1.0:0=[deprecated] )
 	acl? ( virtual/acl )
 	caps? ( >=sys-libs/libcap-2.0 )
 	zstd? ( app-arch/zstd )
diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild
index 67132e47a629..f6c94ab43d7b 100644
--- a/app-arch/rpm/rpm-4.16.0.ebuild
+++ b/app-arch/rpm/rpm-4.16.0.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=7
 
+LUA_COMPAT=( lua5-2 )
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 
-inherit autotools flag-o-matic perl-module python-single-r1
+inherit autotools flag-o-matic lua-single perl-module python-single-r1
 
 DESCRIPTION="Red Hat Package Management Utils"
 HOMEPAGE="https://rpm.org
@@ -20,7 +21,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~
 RESTRICT="test"
 
 IUSE="acl caps doc dbus lua nls python selinux test +zstd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
 
 CDEPEND="!app-arch/rpm5
 	app-arch/libarchive
@@ -36,7 +38,7 @@ CDEPEND="!app-arch/rpm5
 	dev-libs/nss
 	python? ( ${PYTHON_DEPS} )
 	nls? ( virtual/libintl )
-	lua? ( dev-lang/lua:5.2 )
+	lua? ( ${LUA_DEPS} )
 	acl? ( virtual/acl )
 	caps? ( >=sys-libs/libcap-2.0 )
 	zstd? ( app-arch/zstd )
@@ -52,6 +54,7 @@ RDEPEND="${CDEPEND}
 "
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	use python && python-single-r1_pkg_setup
 }
 
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index d116ea3d668e..a46969004f53 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -3,7 +3,9 @@ AUX unrar-5.9.3-build.patch 943 BLAKE2B 1f482772b491269413e11e600e049ed608ccb4b0
 DIST unrar-5.9.4.tar.gz 229921 BLAKE2B d87189a6b6b3566a0efac7f72e40732ff673cdcac6f4fdaa96b5a771025f02779d74e2822053681477b3490f45817196673aa5707846767c4061ca95718557a1 SHA512 4c026bc12c38314c7df6e1b2f296be681fffa4ba525e378809063519cb5d51889fe8d3cbce16e802023354f02b45b1bcc672b79a6fa81b4baa13a374ce22c8f1
 DIST unrar-6.0.1.tar.gz 232142 BLAKE2B 0f048f67769b31c67988131b5d8cca33dc9fa2abc6b39e5be63aa8f6061cbf93fa7d7e2055641f286f6be4de2733d2a123441d26381335e2779b3c7d7004ad11 SHA512 2c88dd05252237d7d62ad34332673ac9e457bb43b0ed980be977d557d0deb3d5bd19372d41ac2e254d94e20ecb1ca62b1c15781320cf231f2a7bfa12fe176d8a
 DIST unrar-6.0.2.tar.gz 232306 BLAKE2B d0f410364d2be74dbcc061b8f54b79eb37f7d66e1910e3c6a80c59cf3d4e14a39cf0fb2f465f94757a2c30b886dff0b970fc44dbc166c50f5357e56148f82367 SHA512 fd5598499863f734563213acb67cee41c997eac69c5814d275468c9eb627286c016de23ddbf9c96ef9ba0b985ac57476b26382c8263d8f81c55b8bca1c013671
+DIST unrar-6.0.3.tar.gz 232331 BLAKE2B bcea5219daf8338cbb73fc43131d1c7e7a4c576164a30d79352d1bb3a96b3c66fd190dc40a5149b9bf38e723c0654bc5d5d45e246276c2ea18c1c8dc9904e555 SHA512 1ec20e7a122cb7f48936c691a8c3dc96b4dd989aa8416e6a96332733a0839490996baa22f709af3eb07be17e5987d871f995b5dbc36284cb951bed8047bdfb7c
 EBUILD unrar-5.9.4.ebuild 1885 BLAKE2B a3d674f2b906716a0b94cefddbf230b1cc8af84f61eeec97db50c38a04d046cd2366ecb4f23150049a0f3205b1e74419694f11c747c2f44ecea3e0f66eadeef2 SHA512 e84d1a513b32c739767a0d445c3c7a156b1e381fa0f0b191d606385bb416e3e243e0bb0ba1d9616c68dc3490097338c31e8b4b318df52f5b011abb1d56aa6348
 EBUILD unrar-6.0.1.ebuild 1893 BLAKE2B 944cf1df78f3f3f2e6db04b5a50f0d5727d81a959cb4d85c2ef6a0532ab1660ce70b7f4b04cb91f488c7149fda139b2d3d2c968092b7120c66c021b8c93a73bf SHA512 fba8c1d0cb692af1f73f2bec15270be668cbcb46df5609794b587ada792e18e1b77dc2f301ea0e2ef67df88b697260a57088e2f5ae4500b56e427af1c6167b68
 EBUILD unrar-6.0.2.ebuild 1893 BLAKE2B 944cf1df78f3f3f2e6db04b5a50f0d5727d81a959cb4d85c2ef6a0532ab1660ce70b7f4b04cb91f488c7149fda139b2d3d2c968092b7120c66c021b8c93a73bf SHA512 fba8c1d0cb692af1f73f2bec15270be668cbcb46df5609794b587ada792e18e1b77dc2f301ea0e2ef67df88b697260a57088e2f5ae4500b56e427af1c6167b68
+EBUILD unrar-6.0.3.ebuild 1893 BLAKE2B 944cf1df78f3f3f2e6db04b5a50f0d5727d81a959cb4d85c2ef6a0532ab1660ce70b7f4b04cb91f488c7149fda139b2d3d2c968092b7120c66c021b8c93a73bf SHA512 fba8c1d0cb692af1f73f2bec15270be668cbcb46df5609794b587ada792e18e1b77dc2f301ea0e2ef67df88b697260a57088e2f5ae4500b56e427af1c6167b68
 MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-6.0.3.ebuild b/app-arch/unrar/unrar-6.0.3.ebuild
new file mode 100644
index 000000000000..bd059f18fdd7
--- /dev/null
+++ b/app-arch/unrar/unrar-6.0.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib toolchain-funcs
+
+MY_PN="${PN}src"
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+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 ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S="${WORKDIR}/unrar"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.9.3-build.patch
+	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin}
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+
+	find "${ED}" -type f -name "*.a" -delete || die
+}
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index 6f18845486f2..76838ca079c6 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -5,5 +5,5 @@ AUX xar-1.8-safe_dirname.patch 392 BLAKE2B 8bf3e2104fb4249ca9ba313f7ae1d6fc03a6d
 DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159
 DIST xar-417.1.tar.gz 219350 BLAKE2B 2ca073e52b8d7a12c3d33fb65ccaf0984b912f42e4e9dc52bcaec7af41bafcc530cd055da16646113fb24ee046122425a66351f88279ef79a0f0b2b04ae51f9a SHA512 4c3c61f5289d0b2e380cbde772b383da369ca8ad046f5d779e02f59300288c90c5e31d105a2c01ac17dc719b8b46b55d8d36a8b3b20360f315766fce92dec762
 EBUILD xar-1.8-r2.ebuild 1458 BLAKE2B 555288ffa046e123dd907ffc82149fcb8475d8e0523832843ada29a45e0a93e54c231d1ffc0fd0f34a11ca19456c38299a92c631ca07e521146c2408a625968a SHA512 56560c834837cc754a67b75a62e6a6d55e66e01e529013b418371dd241572b0cba263ed259750c2f4864eece26bb2d2de4d4925e575bceaf859b7f06b20890f7
-EBUILD xar-1.8-r3.ebuild 2001 BLAKE2B 3dab7ee32ea82cc9e495437b12fd3938a91b9892723af22f96a73eda4a9dfa06d9f8b35f96996dff63ae17416f442fd034d6bd4dfc53d6e0eb7dc3d00dcab621 SHA512 243ba1c4497bd3148b55719a2fcf28a82c84140241663721d7886d9736332e9e3a6c4188209b6cfddb8699e7f7fc33915b660856e0c812eb715540bd65428e16
+EBUILD xar-1.8-r3.ebuild 2008 BLAKE2B 8c75abf68299e7f82df130cff852346dbabd599b5fe65dcec09d57902cce9ce587d98a3731ca3011ae64d78d0c77919cbaaf84a8b50cafe52728fd04596d2ba1 SHA512 95fd1cefb6f5d117ce6abb5ca6c27d55a9c61186c570e8dbb7b9efe289f1c57a12e605153a235279c700b2a9d7c53393c80be86d5d9a72f97743264aba50f4df
 MISC metadata.xml 895 BLAKE2B 7e901c1e2689bc8a94d60eb5ccb993775a7973697320dcd647bd4b3e3e13a4350cd3b1c033a176f2bec7c41bd67a5266ad87b8d3d1a9c5d1bbbceb29726c9226 SHA512 6b0ffedc678b52c23489465ab7267308210d1971ab8aca62471b3a58331bc1c7ff6f8fae9dbb27a7d597aa44b90dc4ff4eac2ef27f726a397aa1ec625d9463f1
diff --git a/app-arch/xar/xar-1.8-r3.ebuild b/app-arch/xar/xar-1.8-r3.ebuild
index 2b1ae6a93b9c..7bbcf784161c 100644
--- a/app-arch/xar/xar-1.8-r3.ebuild
+++ b/app-arch/xar/xar-1.8-r3.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=6
@@ -11,7 +11,7 @@ SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libressl kernel_Darwin"
 
 DEPEND="
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index 6c9c42289bc1..3fbef225dca6 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -1,3 +1,3 @@
 DIST xarchiver-0.5.4.15.tar.gz 1072943 BLAKE2B 6f80c8dba510bf5c05dfe5c8f12aafbd4f563861878c73b7da78562836ef4b85f9bc8e4ed7cda5d98c5e33a211a2677d163c2912f1bb605e0085627ca4ee5cbb SHA512 e5174241dd45dd6186d91b15a15b207a8b356480d9ce1a7b9ac2da167878cdb14316a3e7abf3f2aac8d41a02777df2131e205c7d5971a376ff7dd0ca70fbc82f
-EBUILD xarchiver-0.5.4.15.ebuild 1421 BLAKE2B 27dbf674f6d09d5810773f67cbcfb66353710fec46a7b0727e096a996b6b62a12002f7dc2108017ea3822a8e3321fdb2cc0d285024a9309f6b63fe0967d38aca SHA512 0febaf90ac9779f1e4cd10f366897f0d7a790a03704c02f8493b6d1a8155f807f0788b280b435aab0ccc5714bff02042fb05cce3043afb80800e34da0b0a1618
+EBUILD xarchiver-0.5.4.15.ebuild 1428 BLAKE2B 05941c387d97a5ff0e7e9e4c98c1c7a57118c562016213caaf0d464be9084787b9c9dab44cfac0cc982a3cb6c49473eabce5264b516952677d89a9adc57e2b4f SHA512 af14235bdcf1bf71033fcc1457e592fbaa2f7f6a5285a5740d8c6c530ee1f48df88e67ccb7f011253598dba2b33b901eaad150a6f0c9fcb98bb8ad00e482b424
 MISC metadata.xml 447 BLAKE2B 3ac670facb7c0034e1f079622c8c14e04a131e359e1cdbbc18b7cdd111a673651a97a7e35a430d13d80c1cf35e87f4aec0738836b60dd2837e4a77ff4e9485a3 SHA512 ccccc741a75658963153a71810ea9d8c25bfe49765f90a4aa5558ef8fef2abdd1e17d1c9ffb604a78deafeda1e5032b671c8f85a8189e6c89cf3f057dfec9a4a
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.15.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.15.ebuild
index a31e0b6ca1f0..d3030bf6c079 100644
--- a/app-arch/xarchiver/xarchiver-0.5.4.15.ebuild
+++ b/app-arch/xarchiver/xarchiver-0.5.4.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ib/xarchiver/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 # older pigz versions have incompatible command-line processing
diff --git a/app-arch/zopfli/Manifest b/app-arch/zopfli/Manifest
index 7ac41af0e4d8..d710a3272f20 100644
--- a/app-arch/zopfli/Manifest
+++ b/app-arch/zopfli/Manifest
@@ -2,5 +2,5 @@ AUX zopfli-1.0.2-makefile.patch 2505 BLAKE2B f00e9056738bc9cb64f7aae79c42388d1d8
 DIST zopfli-1.0.2.tar.gz 136035 BLAKE2B 23b9af324f50f2fa7276cdb8ac042e251f4e295617638c6e3999b8ecaef5d61d1fe21dd7b8d84e19f7f682f3a592674fcd6c19f359efb86ac4ea57acaac3761e SHA512 290a9506a0c1f3d0510230ca21017e1d2bed830f3f96f9d38c9f27210d89123c3baebd05a1da988eccd5395a7b007f6690f08eb9087550a06eaa69d7531f074e
 DIST zopfli-1.0.3.tar.gz 195227 BLAKE2B fed322e6d0baf8e9008e91fef4c459e8f67f0e7d62942469893d89b8ca39ace6d1ac68cbbc322e938e66a613ea9a36e3ae9f59550b5f4964107bec490a07038a SHA512 362cbeee0b3f04a4c5da512f82671491f874d4ec7b693dca9724ae42123d7ac184cc4d5de1872b4f1fc938c97f79dfdb482f62d1fca4a17cff6d267f6021e8d2
 EBUILD zopfli-1.0.2.ebuild 966 BLAKE2B cab9a7529b3516654f4c9fc84b38ba72d2b3000c70682d61b6ca42eae86655bab2ca3fc6929d481a140324a4669bf496a5b08d645f4c2b39895b677e73b17102 SHA512 401c5e1a4be1ab1dd813335758c04ead724d5029f631f960cc3017e036aca3a3d80043ba93b4064d12c041d1217129cce05aeb92fa6af40a9719babccab4db16
-EBUILD zopfli-1.0.3.ebuild 500 BLAKE2B e017ce2f1362d078512b354b4c76a18f93455c694efc4ca731f07fb5a53cfc413dceb79c7df00dcc1d9007722f392b073c1295ba5127cb53c511ae62c4710027 SHA512 cd409422c8b75edefd3452e8e6d4b5808d9732b7c4e4bc220c6a5467614416780281efac1b5c1160ce064723519d59e90985bf8b204a39583a05c884aee2fabd
+EBUILD zopfli-1.0.3.ebuild 507 BLAKE2B 27771f307925839a6ed0b115a50a15e51b1c4311e72bd4706761a745b477f25df507e177a6759fecb4d9551747af64e559159fdfc54ad2d4bd260252dfd9980d SHA512 8b3fd3d6addef7bd8fa6f5cc2b9e285d705941a9f19d76742318e5d92c965243a19ec597b94e5bb59b6001deb9db9906369b21f8dc72ef62829af87cc4e4cee0
 MISC metadata.xml 250 BLAKE2B 1c20423b13baa29fbe982337cf7c7f75c02e96e0dc84a35efd58db42561327a91a2d1d8efde9631df1bfaa561dedf0bf3533939eb62fbf00901ea55bd3eb59b8 SHA512 86aa5b6da7a3b70221832eafcdcca8585939f670834cdcc205c7f1674d1ad8b81ebd9135e0c699d4073ea5d496170334dee1000ea83767973cae4e49981377ab
diff --git a/app-arch/zopfli/zopfli-1.0.3.ebuild b/app-arch/zopfli/zopfli-1.0.3.ebuild
index 5ee720b81960..9fcaf2e720e4 100644
--- a/app-arch/zopfli/zopfli-1.0.3.ebuild
+++ b/app-arch/zopfli/zopfli-1.0.3.ebuild
@@ -13,6 +13,6 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0/1"
-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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 DOCS=( CONTRIBUTORS README README.zopflipng )