gentoo resync : 03.03.2021

21 files changed, 83 insertions, 151 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 6fb898b3bc02..3586a45cb305 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/bloscpack/Manifest b/app-arch/bloscpack/Manifest
index 3195c006c951..3d2c92be14a6 100644
--- a/app-arch/bloscpack/Manifest
+++ b/app-arch/bloscpack/Manifest
@@ -1,3 +1,3 @@
 DIST bloscpack-0.16.0.tar.gz 99059 BLAKE2B 415894771d6b987170b6938fd20ad065d30075410ddf021bd6e65e3e02d12bff6f5bb22960cdd186d9e52666a1d934047e0383e5d74016c3ad2ba1eef06cafb6 SHA512 0608c795570961c2dc6ba5a6ea3c8c79b215609c2d141db797429abbceb8ee43843196a2d14fc94797d7df62d562abf5efdae10f093154d5d7a20b3b9bcd85ed
-EBUILD bloscpack-0.16.0.ebuild 840 BLAKE2B 8568318ba6c991a9a8d87645c952cbeda1bb0674d46cb32b5457845473c5c006a84caa42146de56a6f0293a41d7e1ca03071d35ef4599fa2fb6650b917a30eff SHA512 706b69780e99a1fcd634500024caf6751b8ae65153375c1ea0113fd48e0936aa25c54cee1bedd7ab4977ba28a299ee9412dabef3d88fe0351bdba51bcf126d2f
-MISC metadata.xml 640 BLAKE2B ff3e980929e8a53610569e417c36c263316db560f53accfb4ded08767943145e21932c1efae243fe43641c941ee490ed1beec1bdcd66d2f7d52e398a96ce1d8e SHA512 82a640c36ad2ed771345c93c35da111589b7c57ffb9074e6da062c7ca84ae9fd76f9f5978abeb75362c8145fc1625ca0bb3f9fd8957688e75dfbb5cef6568c4f
+EBUILD bloscpack-0.16.0.ebuild 802 BLAKE2B 442c55ed15690e4d586987383b6ef0262ee30972b369a7b7701ac995f648eb76c18733b164a2bd125ac17db61046674e65971b8bf5889f43e63b7081943ef377 SHA512 9820fc548a11cb0018270967498c8a8f65d91fb7af5bee995d4ec9d97c1b3bfd1b766556c55fa3ce6e064d182eeb7820e52dc7ac6228ec7c433b0ff4d5f8d14b
+MISC metadata.xml 665 BLAKE2B b75a08e9e6d16f89bdb38821b0a9f55fc45418f13119b34630345aa2f32dd5cccdc82a4bf5cf6fb9400fc8229ebfcb542f236e85d7015164bb4eb00aa7e54bc3 SHA512 a421f6aaecc7045b3a176105b20345c970057b5a141d70a178736d44661c79d914a21b345e88c400f9d80b8127f1c8b812d0577916b9c38f4a70b627cea1af63
diff --git a/app-arch/bloscpack/bloscpack-0.16.0.ebuild b/app-arch/bloscpack/bloscpack-0.16.0.ebuild
index 3eca0b821221..d6ea0f5d51e1 100644
--- a/app-arch/bloscpack/bloscpack-0.16.0.ebuild
+++ b/app-arch/bloscpack/bloscpack-0.16.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
 
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="Command line interface for Blosc compression"
@@ -14,22 +14,16 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
+
+# needs porting to newer numpy, bug #732790
+RESTRICT="test"
 
 RDEPEND="
 	dev-python/blosc[${PYTHON_USEDEP}]
 	dev-python/deprecated[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
+	dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests nose
 
diff --git a/app-arch/bloscpack/metadata.xml b/app-arch/bloscpack/metadata.xml
index 5e17ecfaa28c..2439153d5b16 100644
--- a/app-arch/bloscpack/metadata.xml
+++ b/app-arch/bloscpack/metadata.xml
@@ -5,6 +5,7 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <stabilize-allarches/>
   <longdescription lang="en">
     Command line interface to and serialization format for Blosc, a high
     performance, multi-threaded, blocking and shuffling compressor. Uses
diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index 5d309dde7f5c..2c2da4ea2b3c 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-autoar-0.2.4.tar.xz 294956 BLAKE2B 20e2054f996443f7c3d84d91c41705c8c63df8aea626cb54c17a9cb0c20c7109dc1dba99ad9489d8870674b0a3bbdef23da6ef07684f9c01870d421873d5bed1 SHA512 66750ae30bf9f59820f06653898eb33ac4edbb63976a02d15417118a068abd9292350220713813ddfdd1f2e77db7b3a8f8980f0c70a93d1bb87a9405e013de19
 DIST gnome-autoar-0.3.0.tar.xz 297072 BLAKE2B 7c7204d605c80a6e0735e0be6dec1024e6073cb99d6bde885a1c8b10b7f6e6476a181c99b5bbb755abfdf86bc56aff3d9b174189ff29cc58d24607b482f242ab SHA512 2f5962e115b25be9578ecad51d9906e426bb60b675e42b364d9f0b67f0751cf59d4afd4dbfc8adc0d13256e5dcee445c5195262e6ff0839ef88350b1c6e5293a
-EBUILD gnome-autoar-0.2.4.ebuild 936 BLAKE2B 61b5417dc8c5292b269b05f59cf9262daceb214352b1df56221ae089aa301a5a2ebef88ee30144704bbbe78bdcb2af03590a26ad7f03322468bda3b5b9dca903 SHA512 1bbe09781e0bc2a635eae72fe1cab84091d58aec832b6c2cb943a025753d149ffcc14e70c95aa2e52cb739babaa9f0a6c9b723cc5ccf2ccf8f2e5c8ef38f891c
 EBUILD gnome-autoar-0.3.0.ebuild 936 BLAKE2B b58a09009e3a27bcc77dea24117043e78e65608666277bb19b2b0cc029d048021ed9788a38b9c3399e1c85c5c2f6b571b8ca9b11778aeb3bbe32acb86c279ce3 SHA512 8cf3c31ad17f7239e6d43e11f23767fd05ab51d2268e3dfe05667cc62ec7900dfa5dfdd18a15e398a247fc6896715860b13ff68894c0b80d99637cab86da9d45
 MISC metadata.xml 464 BLAKE2B 1144e271593c56474f4d7a733d09cb3d4bf042d6db45eaf81942d66e49a8c2a722d15cf8647af88c8406a7661365cded5b3ea9a8e4530d52e0f99cc5c847a1a8 SHA512 2ed7ffd5a60c7f0481868cf0f151ed8a9a097036cab309129a45b6bc5eb5ee21fc276deb3ed262d0309ffe5fcad531f05ef9c7e085e007760a9470878b61bc3c
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.2.4.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.2.4.ebuild
deleted file mode 100644
index ff4e408cbc94..000000000000
--- a/app-arch/gnome-autoar/gnome-autoar-0.2.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Automatic archives creating and extracting library"
-HOMEPAGE="https://git.gnome.org/browse/gnome-autoar"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="gtk +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=app-arch/libarchive-3.2.0
-	>=dev-libs/glib-2.35.6:2
-	gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/gtk-doc-am-1.14
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		$(use_enable gtk)
-}
diff --git a/app-arch/innoextract/Manifest b/app-arch/innoextract/Manifest
index 9d04d453e838..0b9cc8f917f5 100644
--- a/app-arch/innoextract/Manifest
+++ b/app-arch/innoextract/Manifest
@@ -1,4 +1,4 @@
 AUX innoextract-1.9-fix-linkage.patch 311 BLAKE2B 777d3592d3b0c5ced8a36473b9b481395e2ae4b33dedf1d8a7393b150a2c048c764b1f4902fdaa23ff68749d04f393668ae8b4ba7fd8bdb82f7cbfb4142391c2 SHA512 df4f251c36ed2e01314f12cecc44082c4ecbbe8bbef9825bce98cfc880a7e92047da17051879b4f2d972dadf6fc41f07338fa958d773847394be4441c5db0dea
 DIST innoextract-1.9.tar.gz 206931 BLAKE2B 1d5f0d13a7cd52262b277263f061ecab85a3419197bceb22938a0d10000578603cc2c2b972a45474027cfea8e43b8bf89d680035034785210842477b147811fa SHA512 2b18f7bb7f50744bcb1bdcd25e57e0760193b179c77b55e0f63c537e55afc98de3b0380da3cae470ce97660ed41a7ffbb48c8c25329c9ce9b3811d9aec74bcde
 EBUILD innoextract-1.9.ebuild 763 BLAKE2B 00483d46965f4c8a9948b1b90ed2dd2611284c1390d8756d6cf39943f530dabed4205bc09156a54c7eafeaa5c2077f737c28eee995ca6fbf7e1c93d6da5c4056 SHA512 534ea71db7bc4105ead308ff6c9714b6ebe6668bfd01ca82bc40b5bb89c72209fd0c39b9268b066939a381f60e6b99ee959609c01fa8266521eab7b5a8d352fe
-MISC metadata.xml 928 BLAKE2B 032de64587c2ab814a132d09f624a86f6b87a5fb1c49a1385969fcce89a7f75975480c8b3b70889621a97bb26e1d37240d51ef5a9da868983ee2467fc5c18f92 SHA512 0fb9ebc491eec20dbeee81d92ae7616464717c88684170ea064726b42120d65ac74edfac474e2605c191d91901e952859199c17bc84af3657812671cb3fb9260
+MISC metadata.xml 807 BLAKE2B bf7802c38cba2f6d75b718fcc594246a36bb2d842b337b8d21a8c6560423b6172ceab0e94b4f660473d9b77ee8c70584bf3f060515ef578bc5c12468e2adda16 SHA512 52f6d9a5196bf291bc6d7b8249ce2f7601b08f3ff61f7629fc5f28feec13464de4ee87379b5034a3de29003ee1e1579414b33c6272c20fe21b480e50dcbc8512
diff --git a/app-arch/innoextract/metadata.xml b/app-arch/innoextract/metadata.xml
index 6d8f19bb3ddf..203095f4d09a 100644
--- a/app-arch/innoextract/metadata.xml
+++ b/app-arch/innoextract/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>daniel@constexpr.org</email>
-		<name>Daniel Scharrer</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
 	</maintainer>
 	<use>
 		<flag name="debug">Enable debug logging and the --debug command-line option</flag>
diff --git a/app-arch/lrzip/Manifest b/app-arch/lrzip/Manifest
index 5f31051bb872..f361be962f90 100644
--- a/app-arch/lrzip/Manifest
+++ b/app-arch/lrzip/Manifest
@@ -1,5 +1,7 @@
 AUX lrzip-0.631-solaris.patch 372 BLAKE2B 93bfcfd952ebb976ac3fb2906eff79dd88b79906decefde76d3245e21cb711587b37750146a9a5db0221d37e7aea9259dc1ab85932463b8e94dc23e18ec7c4ac SHA512 eec9086ad4ed4a148540ef1729fc3be4e4763950a35e3f2eec981451353f9ab0358aaa754ae4675ba22d057a97f17c2478fae06c173a38e423e32338f1cf5784
 AUX lrzip-missing-stdarg_h.patch 259 BLAKE2B c191b888f7849030ef4584f3a461bd14eb44c9eed2d9ad2126ebf54f11f57f877a2c6e50847d53d6ab14e3a568118def65dbe7cbed522af411f3becca4ef0827 SHA512 33775d10e2588f55030033b845bb086abab9fd82798dd3257ab26692bcc3619169b32687cfd6d94de1fcc5afde8fd3eb4e2a40d9133249b5e83fd32499733dc8
 DIST lrzip-0.631_p20190619.tar.gz 259195 BLAKE2B d0bedfe02485011e48fa07240b1eef68560d8d61f5d28dae25bd9fcb1c41c1b8bc1b552acb06a49d853b70a0912371cec9caebb2bf7905ef528c2408d2153297 SHA512 f366c31c84a52f6ccfba56e8b11c0bcd270482d9d120e07783fbe310d7a62dddfa60ecd310a7630e7c98cfb961f57fc9e6b843d3857d0c90d36c580074528298
+DIST lrzip-0.640.tar.gz 262860 BLAKE2B 21e7e6f566ae238c85e89382a000b210621773b00cb2c509dc2e1b89dfa591a1cca954c0105ef624ed97af43f8904d67d570a0e3734dda7823f809a496cff5aa SHA512 efcf7d5cbb7c2a2a117ec815f87edf37e5500f2294a16aaa16cfe10b3db77e3cc2eb4118def4936da03323ca3ee961000e98f49ca0c18eec6ba935eac412cc8b
 EBUILD lrzip-0.631_p20190619.ebuild 1171 BLAKE2B b9c10629ea1ab82c589dd57ea939652afd22166f870438a7afc08b72d72b3e1d0b70af788dd24db7906f4804b9509e86065331fe053bd7085da8d767c1da7280 SHA512 d772a9acf5490b0be1eff06aedc8fcd4ab659e5be3ee9c1b6a4320d4799157472fe684aa8f4f4f0b017771c2d69b6e487d82572b37f8ffad1ef51e672ae1c9e2
+EBUILD lrzip-0.640.ebuild 1113 BLAKE2B 4b5324400567699433108c4032a1d43b2212f5b36e324bb7f4404f36c5bb0ab65a8578b55ad6fbcb5a16134bccfda2d05a3371f0cc7b3f135703f47e2c75b6ba SHA512 9e4edd36636df3cb03ae32ac9cc88efb4ce2b99f0ed974059dee79c7e8e0e4474f696cddd2cb6f9452b3b3d3b7b09b90fab3ad4cbf7b83b48d15e9fd526b460e
 MISC metadata.xml 607 BLAKE2B 818153c4b56ca259dd824e13c396822f5373d094d50d104562984032f7656703dfd75e617d1d03279c05a52334a265191c633cd609d6c6e948a20fc937f866ca SHA512 7236540b6002789563681648ef8016c9b692f814134fac72ccaf7ada302c8cec3c53c88658bbf2afde7625d8c756dbb5efa6b8d395f8436fe028ed0d49c5206b
diff --git a/app-arch/lrzip/lrzip-0.640.ebuild b/app-arch/lrzip/lrzip-0.640.ebuild
new file mode 100644
index 000000000000..a5c7f90aa0c6
--- /dev/null
+++ b/app-arch/lrzip/lrzip-0.640.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Long Range ZIP or Lzma RZIP optimized for compressing large files"
+HOMEPAGE="https://github.com/ckolivas/lrzip"
+SRC_URI="https://github.com/ckolivas/lrzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/lzo
+	app-arch/lz4
+	sys-libs/zlib
+"
+DEPEND="
+	${RDEPEND}
+	virtual/perl-Pod-Parser
+	x86? ( dev-lang/nasm )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-missing-stdarg_h.patch
+	"${FILESDIR}"/${PN}-0.631-solaris.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	# Don't collide with net-dialup/lrzsz and /usr/bin/lrz, bug #588206
+	rm -f "${ED}"/usr/bin/lrz || die
+	rm -f "${ED}"/usr/share/man/man1/lrz.* || die
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-arch/lzip/Manifest b/app-arch/lzip/Manifest
index 40b065945c07..904a8197d3d6 100644
--- a/app-arch/lzip/Manifest
+++ b/app-arch/lzip/Manifest
@@ -1,5 +1,3 @@
-DIST lzip-1.21.tar.gz 105558 BLAKE2B 07658ec901bdfc255fef5af24b62614b2db9821b9a2820daa5137fd47ede0b68bbf3eac340ad5484d2ef7011d15c2eaccf19abc9e33b5c96273fc9b9d323083e SHA512 02e31a8fc9431e88edbb0fd467e9dd0947203e693e6581be1a8d25d96c74d9c3794f1fef9e4c993553ba74330c8f5851cad6315b49f263fe9cf2444225af4362
 DIST lzip-1.22.tar.gz 120769 BLAKE2B d6d4faaff981d64219e27364c7072f9e1309507220e80d4195d866c3429db537a9fa9b7a4ac67ef5c267cad0f6e43ce997a98f1e47a88b228bd1aa437c991140 SHA512 318de74effdbdfa79070d28919459a85bf1efe662b818b8af2a3daa964b6c24e3386c37de360c6d5b8b624d549b5c9ed777c6234561129c477e03d92ac2db206
-EBUILD lzip-1.21.ebuild 766 BLAKE2B f21ef474926403634ef4556c2de33a457bf95d0502c3c5b8e16e841143bc5e810e55c6387fa56a692fd65bf5ead54b367ddad90721e8bd36ff38e3c4060e6d4c SHA512 56b01cabf09ef6928a77dc1c69958a1bdf5811c6373c6d40b0dc69b3cb783379339832123f27cc9fc3946988bdf95ff662b8c753b920027ca386d2325fa8dfb6
-EBUILD lzip-1.22.ebuild 772 BLAKE2B 5db76ef4d85cd749b966f2d9048a4277e38f1588e9a037a46d371b301053bb8268b4e88e13fca807ac6317efcf0bff1fab50be72d4d0b218094abf71bc616d56 SHA512 8546790d4bb70ab2e9782e69e6cea5cf46a0da6564ba275677565d502ed77f872bd3c4e52dd261bc0f69cb601a389ddcf8a83775d536894f849db89312b4a55b
+EBUILD lzip-1.22.ebuild 765 BLAKE2B 2a0d43af11d19e275f2e0386d17c4c159246457292984f8540c3d758c4204528072e34ea8033ad7b718a98483f6eae98c94349c67e58adaba38e381cc7a8b0e2 SHA512 fd76d7c1efce7ee7d265fa841077c61ca9cf6dfecacb552c49fd4d276767353f0bcd4f2d82908c63878a0ec77e1a621d1d6fe1e6f93c27e2ce5152576ed6f383
 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
deleted file mode 100644
index fc8241c82e5e..000000000000
--- a/app-arch/lzip/lzip-1.21.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="lossless data compressor based on the LZMA algorithm"
-HOMEPAGE="https://www.nongnu.org/lzip/lzip.html"
-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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
-	# not autotools-based
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		CXX="$(tc-getCXX)" \
-		CPPFLAGS="${CPPFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" || die
-}
diff --git a/app-arch/lzip/lzip-1.22.ebuild b/app-arch/lzip/lzip-1.22.ebuild
index 251802b4ee31..357d530b1717 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/lziprecover/Manifest b/app-arch/lziprecover/Manifest
index c43ca63ed1d1..5160e086a214 100644
--- a/app-arch/lziprecover/Manifest
+++ b/app-arch/lziprecover/Manifest
@@ -1,5 +1,3 @@
-DIST lziprecover-1.21.tar.gz 112895 BLAKE2B b758f863498caea7873358b5f64eab4d5dfa37b43eb875824475387a7fd89e63721384207c014d662a9a6fa4e9a094f1a3c5fb9c1680d235382873f456f0dad3 SHA512 4afd3ce319bacdd1870512af5568179c0d472f354b1e1562a54c527a37903ce3f0f0044abf273ecb113a555cc7a33ac343f5dbfb26fa29df9b24ecc9768e4ed5
 DIST lziprecover-1.22.tar.gz 152840 BLAKE2B c6c5ca0bcb0309539d48c89a1259c5d1d9b47372a92935f762daa428a9e66d6ab0b0a2ac956b70e15824d699c7de0d92e92f0c7ff68ea091599754082771b928 SHA512 5fa209f6a80314ba7db45effc2546be660b6a31133570abf2e37a4d570910757fc4241e2496e63a95fadb66cffbca59976a8568659f4e8562baeb16517599e96
-EBUILD lziprecover-1.21.ebuild 644 BLAKE2B 8d62d0e2fd3e0829d180124e034dd70d63b053c738350c4d14fd35bcc03f6caf2e7e4abae5611bc971cb9a6122a4252616c83f30c0d1df36b67d7c002f70ca5e SHA512 58fb7aaa49d01fd7909c536a33e9a6704fb0c5dd79eefec57a15e4c059aae5458ce923e3a1b67fda21e6c93762254c97be1e7be3746ce1b20761133d97041aa5
-EBUILD lziprecover-1.22.ebuild 646 BLAKE2B 0e60d326a40d41b3b833693d6b0a5ab0ca4cfdefbda105e941e66d41a15072859884e5fe757823e07d73a1713b54f803aefad404e54345ce2ede5597caa4bea4 SHA512 6a96d92e298fe06d2656ac73197478b6d20797a857ded89e71e69628dc955e220c4731ee19fbd32a3a1e9051a5efc561cfba31c1745373068844abb0f4a2323d
+EBUILD lziprecover-1.22.ebuild 644 BLAKE2B 36915122bdad52d5073d2d32cf57e1b0dcb66899a96733d73327d0d73886a41d9a49cbcf7494573175cfc7b6fc885697c15411dd1f18a82dd9f4c6a54c460f25 SHA512 2876c25f9bab31889519d1eb40b1e66749c22f3837c5ac53213d17fd2e2cb2f6db886b425a4f551e99fffe8989e6bbd89ccd30b45324f9e7bbec1f8346bc01c6
 MISC metadata.xml 2674 BLAKE2B 470d5c221311328b1620bc51fb5ccb6393f04e9a1d0367fcef04579061b9d88ac5bb131e050eb2cd3e2a8608db58586cf49bef3e58ca320d93398aba7579799b SHA512 c39f9d4478cdc3e5865567f5e6560e4fa34f014aa6538ca47a1dddf51f1d5549f8edcee34dda36e691bd28b734a8df4c04ff0a94d68c16caccc22e57c35a7823
diff --git a/app-arch/lziprecover/lziprecover-1.21.ebuild b/app-arch/lziprecover/lziprecover-1.21.ebuild
deleted file mode 100644
index 5c6d0c31853b..000000000000
--- a/app-arch/lziprecover/lziprecover-1.21.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lziprecover is a data recovery tool and decompressor for lzip compressed files"
-HOMEPAGE="https://www.nongnu.org/lzip/lziprecover.html"
-SRC_URI="https://download.savannah.gnu.org/releases/lzip/${PN}/${P/_/-}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
-	# not autotools-based
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		CXX="$(tc-getCXX)" \
-		CPPFLAGS="${CPPFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" || die
-}
diff --git a/app-arch/lziprecover/lziprecover-1.22.ebuild b/app-arch/lziprecover/lziprecover-1.22.ebuild
index ad1819697bcc..d328cc1e2e94 100644
--- a/app-arch/lziprecover/lziprecover-1.22.ebuild
+++ b/app-arch/lziprecover/lziprecover-1.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/lzip/${PN}/${P/_/-}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S="${WORKDIR}/${P/_/-}"
diff --git a/app-arch/pax/Manifest b/app-arch/pax/Manifest
index 6affbbf5052b..ae38287f29f4 100644
--- a/app-arch/pax/Manifest
+++ b/app-arch/pax/Manifest
@@ -2,5 +2,5 @@ AUX pax-20160306-glibc-to-linux.patch 852 BLAKE2B ebca2d148954e511d3a4f79ef96cad
 DIST paxmirabilis-20161104.cpio.gz 148061 BLAKE2B 997a126d3048488e1a4e49ff9753de2ebdbe75b7daedbea8c95ab5f1902d4768d4b12b13fa684cb2a7c2fe8470ab60e19ea3f9430429a6a4e6e1d57993130fd4 SHA512 42ec8365a5efb9ffb9d383cece39ffaac85c1c8d69856ec557a5567cf0d28d98a0f2d4b7fed53572366eba12c71111cc80b591d51c6a19a3e6437efb62af33ce
 DIST paxmirabilis-20201030.cpio.gz 171982 BLAKE2B cdda22bf73ff60cda7b8873ed278d1d9d7daab170084ca17760dacffc88b8edd29a0498155f860019b22641d9c84186074c5e696c67846e1997f5883267761b0 SHA512 14c913db49c05b92f3448b7ae2e11b4fdb86c2daa5f269d86e044e8779eec7ea19b41534fbd8ebfe31cffe6b50e51c0460c3994307ba2cfa07029602604882de
 EBUILD pax-20161104.ebuild 1457 BLAKE2B e35c5025b585d700f6770f7ebbefa27473b819cd35bdc2631ac5351d62011c60b27ea6856dd13a83cb592b7cb6a8c86f411b369d499f234b48492c9af2c12575 SHA512 68867a75d0108f3528750275179cf4e1ac2ff5243aa56270fbfd5ec9651e7a96fb10d881171f4272588d619bb86b09449e4d24ad913852ec34d515d7189cf7f5
-EBUILD pax-20201030.ebuild 901 BLAKE2B 00ecfdd668f9f6b3fd072b9f3b858b213aec8157f5f6e512254ae378f9cd1728d65bc93ea781c9bfdc9b5482a3a059330194f53030dc4debed444911275484bb SHA512 2bbae3ad13f7c7ea0fbc9d9093de63b051f524fc34614e55cfaae2105f1b33d0d34d6bc7d66d897add70729fc9564fb32ee1f9c109019a5ce029d7a704a4d42d
+EBUILD pax-20201030.ebuild 894 BLAKE2B 197e13e545e827d119a5f81d577f8922778502523c6aef90ff0b5a8ab73b4695bf8d08247c0ad7306c0ba6ee0c62bdb71b5e5aa952b4d2044dad1882785fc75e SHA512 07c175cec34ce8315e8e770cb57dc572a92a67f1e7383ff9c34b0b074668a8151f27f8b4b87268b0f18d32c14360b68491cb9fcddc42e44ce73dab16b5778fff
 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/app-arch/pax/pax-20201030.ebuild b/app-arch/pax/pax-20201030.ebuild
index b497a976a1f4..168e4b44d8d6 100644
--- a/app-arch/pax/pax-20201030.ebuild
+++ b/app-arch/pax/pax-20201030.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${PV}.cpio.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}"
diff --git a/app-arch/vimball/Manifest b/app-arch/vimball/Manifest
index 8cc281b7b496..f401cf2de722 100644
--- a/app-arch/vimball/Manifest
+++ b/app-arch/vimball/Manifest
@@ -1,4 +1,4 @@
 DIST vimball-0.5.1.tar.gz 5246 BLAKE2B 8ce95bfe8872f69e501b4453e5a6644d8019367173f8675325775dee58e08618b9ec0908bca9df04839bc165b086d8e5195a0753827d6038d8ccd8adbab80c35 SHA512 f89ba7291e3f4146f2ada7934b0ca74524abc639e586da12e19882e9aebe3f14858a6145b830a32dc19b0deb61f652375d8a56dc7847fd0061d14a2d77208549
-EBUILD vimball-0.5.1.ebuild 645 BLAKE2B 9b394608b1265593f8f3691248e482f30b82c8c021c6da556315eb9f09d60296c9fbd01d14a087d7e4b760af9f086c38f699c9271237d3000f8c3ad9f14d5250 SHA512 b04fe565d14b12c6d6879d90744b79c2ef5fe73c5d8b915f90bb80dd5c4ae71cd62f9939f8f088ddefdf571943fa362a09a66d6285b509905ff6a6a79215f15b
-EBUILD vimball-9999.ebuild 647 BLAKE2B ee5b4145b268d7e55844b90e69c9644f6e3f075b11231cbdcd8c26f99f0dca588f6eb01e347e741e58995dde3636b9356c39a5356b422e32d4607b17adc03d6c SHA512 b116f132b796e1857a83551ff3ffe581779bfeabbe76f8b65ecf78f62ce835c6d8c57eefc382dda7455d5ed3646e20774a873bc21a79c534ab644ce932e57d52
+EBUILD vimball-0.5.1.ebuild 549 BLAKE2B db3cbd2a234916d970fede779ff7ca49a75a8a1a1641c975026c16a4d4bc1b075ab253330cc3784c2a849a4b0887e49c2b461c4a36aca8a8213a2100b94ee83a SHA512 8e7a2efade57df3ef3328294dc76901f245bbf97fe387b69aea65f0b97205f5d663b0f1b713d5f82bd644556fc79ae2ba2361637c83ef54d945cf4a01c906b91
+EBUILD vimball-9999.ebuild 551 BLAKE2B 89199d823fba2a60578c2c2c8e1feab7d4f7b8ca0c952ca992681d429c3ada1af17f4f23a917f304e102dfdf691407aaa98202ca8c0220574750af137fc560d4 SHA512 2a097004eeca0ff5759812d0de0274ca2c68539600444e3c71809de76a6a29bb4c5ed9ae6eed96d2a23d355f746bc2520720954f72d8f4fa21b5ed68d5c3ed68
 MISC metadata.xml 301 BLAKE2B 07b3d161360551d50927727197e755234ba70034b239c4890aa90cbf863b0e8612be7541c89d503e6d8d80d806485f086e89b071140aba7e63c2f4b78487d3e7 SHA512 5ed23a22a1632cbf42763e8f069f043841ff6eb1c589e7c66b6ab83583da3bf1ec5d820943349fad261a715a9cd61e490242b987556ef9a0bee6fd278cb9e307
diff --git a/app-arch/vimball/vimball-0.5.1.ebuild b/app-arch/vimball/vimball-0.5.1.ebuild
index 2ad50ff8856c..1c9ba30f2f58 100644
--- a/app-arch/vimball/vimball-0.5.1.ebuild
+++ b/app-arch/vimball/vimball-0.5.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
@@ -19,11 +20,5 @@ HOMEPAGE="https://github.com/radhermit/vimball"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests pytest
diff --git a/app-arch/vimball/vimball-9999.ebuild b/app-arch/vimball/vimball-9999.ebuild
index b5126bad3cf2..ee51ee899907 100644
--- a/app-arch/vimball/vimball-9999.ebuild
+++ b/app-arch/vimball/vimball-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
@@ -19,11 +20,5 @@ HOMEPAGE="https://github.com/radhermit/vimball"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests pytest