gentoo resync : 22.01.2021

18 files changed, 77 insertions, 337 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 7856087f959b..3301ac5632d3 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/alien/Manifest b/app-arch/alien/Manifest
index b002e230ff05..0ebc46ea9194 100644
--- a/app-arch/alien/Manifest
+++ b/app-arch/alien/Manifest
@@ -1,4 +1,4 @@
 AUX alien-8.95-tar-extensions.patch 733 BLAKE2B 75aa07b9c3b4b3e48d381309caeef41ad312c7d71c81958eb74193752276240dcf6ca91fbf5a4dc6279a35cf6a6c90e77a11ee8ec7f5b087a50bfd6ba089710f SHA512 6bcaea2b8a0dd5bd5a493aaf6f0b19edb691e49fc7684486da2331621619745baeaa30d88889d8aa345f989016a096745b875aca2c01c5b8127e93903f4e8b10
 DIST alien-8.95.tar.xz 56940 BLAKE2B c2f6b71d39800a7bc4ab00bcd50d165855bad4eb1a17fe217aeb302c6b7af701bcd9445276d7e522db7e6c81f1e8d7e9e2ada99f9d7505e6ec958ae87df7c9f7 SHA512 c46d3c82542dc3d96eeabea0f0c7ab5b572acaf67d15e2064ea01df32d69a2cf6e083754be49269df6cd7431ec5b3e09ddcb83fbe2ee17843b22e9cd3e73073c
 EBUILD alien-8.95-r1.ebuild 757 BLAKE2B 4405c7b813c6dc61473768888c500c7d6044fd119e4703e2d333f399e8fe404d171365e9020095879365ba26e597379ab8fa0ec579417961d0aa11c4d31f2fd5 SHA512 f6fc5b2d718907090c14de20501414f3e3125b9f62779f29190526222be223deed56443bd0c74c1b12cfff058efa22facf45833fff20c85913ec4c5f29d46c56
-MISC metadata.xml 299 BLAKE2B f0c85fbabcb5ea8dd194f3560a66469354932c2df8a09aacfa26eb980bf1b301ff1d59e5c5196e4014fc637b7f78361ab031930409509c4529a08e78c8d540b6 SHA512 bdfc3c82d7f1c34ba9ee5c104ce164a73e4dea8d9cbbed424f2f9e6a16da20ccd081d02a39a45000a49d265bbcbd362b34ed91c4688396cf73e423591de2b46b
+MISC metadata.xml 220 BLAKE2B eabf3517ba7e5b67320254eeb2b07adf1dbe0c3432b693973bc25a3e3dc8ed160b7313f9f8ae64d994ac272487b785f33202d9640bb5a7ace9f56ceb42978a19 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc
diff --git a/app-arch/alien/metadata.xml b/app-arch/alien/metadata.xml
index 7bd44913f487..294c350c6960 100644
--- a/app-arch/alien/metadata.xml
+++ b/app-arch/alien/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>lordvan@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
 		<email>monsieurp@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index 5b6697b697bd..d9503c6c8fe6 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-autoar-0.2.4.tar.xz 294956 BLAKE2B 20e2054f996443f7c3d84d91c41705c8c63df8aea626cb54c17a9cb0c20c7109dc1dba99ad9489d8870674b0a3bbdef23da6ef07684f9c01870d421873d5bed1 SHA512 66750ae30bf9f59820f06653898eb33ac4edbb63976a02d15417118a068abd9292350220713813ddfdd1f2e77db7b3a8f8980f0c70a93d1bb87a9405e013de19
-EBUILD gnome-autoar-0.2.4.ebuild 925 BLAKE2B a7e66b83f20c8b3b4604609b4866b25a24af8b3e537d68343de495c599a459aed5f47872fc3e458544037895ad61e16fa3d8279f9ac5bdcf5a23d57e6fd9b2c4 SHA512 50e55d8d3e08269915270a787abc263ef611e3cc1068dfdbd50b2cfa94f917fbefa93e632fc14a778f28f97f57c886d8e6f386d67efc8c7ae473e2f9d4c26898
+EBUILD gnome-autoar-0.2.4.ebuild 936 BLAKE2B 61b5417dc8c5292b269b05f59cf9262daceb214352b1df56221ae089aa301a5a2ebef88ee30144704bbbe78bdcb2af03590a26ad7f03322468bda3b5b9dca903 SHA512 1bbe09781e0bc2a635eae72fe1cab84091d58aec832b6c2cb943a025753d149ffcc14e70c95aa2e52cb739babaa9f0a6c9b723cc5ccf2ccf8f2e5c8ef38f891c
 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
index 136e3777af79..ff4e408cbc94 100644
--- a/app-arch/gnome-autoar/gnome-autoar-0.2.4.ebuild
+++ b/app-arch/gnome-autoar/gnome-autoar-0.2.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome2 vala
@@ -22,7 +22,8 @@ RDEPEND="
 	gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] )
 	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=dev-util/gtk-doc-am-1.14
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 7ca49cd1de4b..1828ec5fd576 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,9 +1,5 @@
 AUX libarchive-3.3.3-libressl.patch 458 BLAKE2B 883523792c0d3e964a2bf9ae40d25a0127e43a2d95e0187d566fd371aa7ecc0861d99ab21641e9f2d6800b36155e3b845c1099ec7b1d3dc0f3c0fe2b78c9e273 SHA512 0a8dfd7f30ca450cf253bd475d328a886957257e1c7c6a6c9eace4cacdefd9f1eaeb4de81ad00a2439bb75336a82b08278f98c6143803f6047159036e848aabe
 AUX libarchive-3.5.0-darwin-strnlen.patch 732 BLAKE2B d20ffd1d898acf1e69e2f275bec2beda0769569ac37e179604dc7d0a5eca8fda2a06aa5b3811e28f465fb34c2061d15aa8073110f703244aec02cfa35afd8087 SHA512 9f5b86b6dc483f17a1d909d88841e1f82f5835dbef0bdfc18ffb982cd5f649d87fdc22f490169eb827de654fbd469fda77a5ce1bc0748b48f3f46e77318e672c
-DIST libarchive-3.4.3.tar.gz 6990533 BLAKE2B 12f97e8e4032daf0fa8f9e1839f9c7ef80fda0b2a0ba703c67d860437fad6a293484a61417f72eff933179d544cfed45083e7886f462276bc6abbce1097e6256 SHA512 d00167dec6e65a0b17b46a1e3bb0242d85716dbc637afd233360cb515b2750dafe0ff0644b9e01ad23534340b405a8551f496c5e39fba9ee99355a515580d65d
-DIST libarchive-3.5.0.tar.gz 7017726 BLAKE2B 651c9e28d1a1b0a6dd2dbd2aefa0a47ba23d5fb5e96c1bc8c059152952c284f089ce16626b9fbc2cbea70dac2d16ab949235bf4c28f38235f23aeb6da3d69f0d SHA512 9a3d4ce9d4bc856c8d85b846d9d0c9f30369393aa107941c202ba0100c6bac009952c92d809e6981276b3bf91e9f37d018e7f1446b17c0c1c316fe5aafe15440
 DIST libarchive-3.5.1.tar.gz 7008338 BLAKE2B 243dfda2bd4582bbc20679328b89aae0c530475c822dcf9ff25c65df2017b8f18bb616142d6ab016ccea4a5aa1b410d46b913c2ee0afefd2fdb1a41cf51585d9 SHA512 08ddd74bef4cef0981739da202879f36cf7ca33a8f6d438724588efe3ab8477f2f1d0cccf7b8ed0bedfc0c8d0cab16ee3ae5c0c6e83b6811bc650d7d7471a996
-EBUILD libarchive-3.4.3.ebuild 3739 BLAKE2B def9ba9f8584f7262d556d4ab779a62c60dea12aab1f817ecc4f808f3806945edf22728879af7a33d50495a4def1be1f873512fab4689b9872e060fc7b1537f1 SHA512 4cc36bdf9248525af26e929eae11828549e9b4a8ff1a2cd3b4c4e7e243a7892edb39810f080d7ad8a99a02aba114e3aa2990e5af86b42335108a35b7fd5c4298
-EBUILD libarchive-3.5.0.ebuild 3820 BLAKE2B 10fe13aea974d5b1133c7ba44d3e77a462cb516464893259acd9e86f8653a5e6b0dcc42daa5c43077fb7a1eab36b5cfe22e62b3c25e358a0978cc91ded64c0bb SHA512 28e0a522aa4f0351e1a5228b2af8371b5890e04d2060599eaffb52568cc8503dc332df9c78644c5ee22b0ba303c03452084cd7428fe2f8786de2e16e1ad8231c
-EBUILD libarchive-3.5.1.ebuild 3820 BLAKE2B 10fe13aea974d5b1133c7ba44d3e77a462cb516464893259acd9e86f8653a5e6b0dcc42daa5c43077fb7a1eab36b5cfe22e62b3c25e358a0978cc91ded64c0bb SHA512 28e0a522aa4f0351e1a5228b2af8371b5890e04d2060599eaffb52568cc8503dc332df9c78644c5ee22b0ba303c03452084cd7428fe2f8786de2e16e1ad8231c
+EBUILD libarchive-3.5.1.ebuild 3889 BLAKE2B 69eb46f44c95cb4a6dae1efc2fc95ed5a37b2f5262961f31abb2902e3acb14e3acc5ea07332ed06393cb265f1696406a902f794fc9179265f67c9a315a410771 SHA512 02f5ddeec3bee50c8abebefc48030768378943141e916e6e6616a694e7ebdc80b8bfc15a3cd2f0dee126262006933a25e1e7494913cb681ba3a01a3a7cdc43c3
 MISC metadata.xml 1514 BLAKE2B 377e5cfd85ad2660469744537665395cb99b12187f63d5a2202b8eee52cbe19adcc9f5289ea6665e5bc5f4e9339a5280e1e6dd297199cb009bebb37624009a5b SHA512 8dd39292864923ced4fab7f1307130082525aab611f94e5c7eee25045168e812dade090ea621ca3252eeb85ef8c7269fcaf0de1adc2979f4567f5e01581540e7
diff --git a/app-arch/libarchive/libarchive-3.4.3.ebuild b/app-arch/libarchive/libarchive-3.4.3.ebuild
deleted file mode 100644
index 6fecde8a1a17..000000000000
--- a/app-arch/libarchive/libarchive-3.4.3.ebuild
+++ /dev/null
@@ -1,140 +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 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/libarchive/libarchive-3.5.0.ebuild b/app-arch/libarchive/libarchive-3.5.0.ebuild
deleted file mode 100644
index bab927f9b80d..000000000000
--- a/app-arch/libarchive/libarchive-3.5.0.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 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
-	"${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=
-	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.1.ebuild b/app-arch/libarchive/libarchive-3.5.1.ebuild
index bab927f9b80d..29fe27756e66 100644
--- a/app-arch/libarchive/libarchive-3.5.1.ebuild
+++ b/app-arch/libarchive/libarchive-3.5.1.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 libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
 
 RDEPEND="
@@ -106,6 +106,8 @@ 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
 }
 
diff --git a/app-arch/lxqt-archiver/Manifest b/app-arch/lxqt-archiver/Manifest
index bf055c25fb48..63902f03baf6 100644
--- a/app-arch/lxqt-archiver/Manifest
+++ b/app-arch/lxqt-archiver/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-archiver-0.2.0.tar.xz 155912 BLAKE2B e5c92d5939d3e6d42a79804596e9acc67b007126b630cd9317df7d0d07bb8f3e27cf9ecf6e16eef3289d31ef3627b4fa870cdb5eb52a36489df1080b03509acd SHA512 478a04d0e6e4601dc342ae260c5db4178b01191cae263154dbe400b394e5cd4cb9cd8a6bab7e7c59af57d6bf20c47a5ad2663a85d0eab5f71fbaf584f7588fd7
 DIST lxqt-archiver-0.3.0.tar.xz 157492 BLAKE2B 05d9862c75cacf3b73670333a5b2dafb6abfcfd7433a1ebc3d27948122db875f892eb58a05221c880d1ac23530362ae4d9e7c6ebe0f06552b10bb903d51a6868 SHA512 840fae890611b081a1355ceb58ca65276784e6825822859ff2d6506190212268f1c67733dc94c65c9c5758f8d6a25c286c2b339356a50f29474b0c7ce2569d2c
 EBUILD lxqt-archiver-0.2.0.ebuild 1173 BLAKE2B 6bdf4813f23abb209d0f53b4c612444827c55853e806072d0621b52d50cc073ceaa86dd93ad48b36bd45b877bc73f35805f5cffceb101492e2795642512c3b6e SHA512 74e054b528428fac654be8a64410fa16edc559d0da9f79ef0e029c7273eb2f296ca060032a68d4f89ba08d394c2ba53946ff52ea8cada203e547a2a60d21886f
-EBUILD lxqt-archiver-0.3.0.ebuild 1175 BLAKE2B 87a1fe92dccb7143e0bc5a9014133f26b02e03a24cd6929e17b337e8711bac19063dc74f96a6b339cc1aae9f87ac92ee583f298d3eecb566481cc09a2e5c20ce SHA512 271e2d7b9526ff9f34d5e0d3761c28883a4139b55d3854a82018d14c870dba5dcf93d646f9e80406902d3c9c79b5a4dc0cd5a1a19183d199e4081155567ff78a
+EBUILD lxqt-archiver-0.3.0.ebuild 1174 BLAKE2B 5a99f375cebf4d58b3fd5ace9d79153e5dd19875a1a452a7cfb90cb9defd90c3d305226053059285350082d7b131bf568da0c24a6ac38262072efc089cff8fc6 SHA512 701d16574bdf581ddeb66cb1a884beeac0b9efb37351e5584d303ea264738c71d5e70242065b07d524f5407010241ff71caa2a3c6cbeb4e13c10312fca410bb8
 MISC metadata.xml 329 BLAKE2B a6082a9d0185aaa5f233d41d9de505901392c80159cbf4cf769e1a38008aaa06793e2283c974df743f2141488bdb2cc087e7990953b16b752092f31de7840c83 SHA512 42d4c3e67fbc3a84a79ed73710e8322f4a30ae6565e1aa2cbf122661e6864a8e102e67ab973942953fb2358754303b3f2d2963f3ebf15188bc23fd8ca31f5e60
diff --git a/app-arch/lxqt-archiver/lxqt-archiver-0.3.0.ebuild b/app-arch/lxqt-archiver/lxqt-archiver-0.3.0.ebuild
index 1eec73377476..fe5fb9a60b41 100644
--- a/app-arch/lxqt-archiver/lxqt-archiver-0.3.0.ebuild
+++ b/app-arch/lxqt-archiver/lxqt-archiver-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 20a79201d610..78a5907564da 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,3 +1,3 @@
 DIST lz4-1.9.3.tar.gz 320958 BLAKE2B 9a194bd18ff52f780aa03a8a53fe7fab7b58117d768f4ba8e5005830c935d16328d0f7cc54f9413b58faf245017c0ac85fb4e709a9db150cb150a0a2a3c21645 SHA512 c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a85db1a50aad416a97e9b300eee3d2a4203c2bd88bda2762e81bc229c3aa409ad217eb306a454c
 EBUILD lz4-1.9.3.ebuild 769 BLAKE2B 580f02d6a7c506676a131870f329f70155ccf28b2fc3c81b3b4443a9c00a061ecf9cc33ddcd4f2fd5c732a1827d927d667d929f1cc5b97108f219f733bc91fab SHA512 e6f2f3dfcd6f258eb0a69311fd984a9155b3fd9f04a72df25bce3c87434ceec2d006b24718866af9d90c719d208ebb4a83fa57d075d1cbf31ed793ab97432e6a
-MISC metadata.xml 591 BLAKE2B 3f9ef90c2960812f5c52a94974f4d3f754f7e74b4f208760e0ae67f4ada77610e6f193c51305929115ea72c91f8ed9bccbf507e766bd1b10b86526aba8b1b58f SHA512 a70f2c2a1671f67612f8ccc7c58fde1aa1a1488c444477b212a4d368a70b2c260d3e123b221c850516c2f837aece2f10c8dc6d15acd26279dc4aad85cf5d9890
+MISC metadata.xml 488 BLAKE2B ffeed518b26856fcf19099ec33e1f9e93d302411504037c2eea791dddcb64e7fbc13b425a6797bba3386dc69810c021b32c66223dda4838bb710d5a2a86e725e SHA512 bc9e9b477dd0fbf300efd55ce4c31350fee375ded0b3f463116488fd4e66ee685b55464a46338abae47e0ee845333019dfba9ee2e459dc0dd91b640d42bd4902
diff --git a/app-arch/lz4/metadata.xml b/app-arch/lz4/metadata.xml
index 9ea2d62a4794..26e7c6e1933b 100644
--- a/app-arch/lz4/metadata.xml
+++ b/app-arch/lz4/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ryao@gentoo.org</email>
-		<name>Richard Yao</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
diff --git a/app-arch/lzip/Manifest b/app-arch/lzip/Manifest
index d1e0880f77de..40b065945c07 100644
--- a/app-arch/lzip/Manifest
+++ b/app-arch/lzip/Manifest
@@ -1,3 +1,5 @@
 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
 MISC metadata.xml 357 BLAKE2B baa377044f421ed8bc913a5bbdc72e49e026bf0529190f07aa2d0081208870453f140af7ce3d3a97121b563891b4a4b36196db233a3fdb6a98b6eee34af9e9ba SHA512 e5f560cf4a71e085f50e0710d39e81aeddff8fb72fb07126f86a080970dc2b79acef11522b2ca471fccbf4e20e34ea57712b0b178eaaaed7c9ab5df9910542e9
diff --git a/app-arch/lzip/lzip-1.22.ebuild b/app-arch/lzip/lzip-1.22.ebuild
new file mode 100644
index 000000000000..251802b4ee31
--- /dev/null
+++ b/app-arch/lzip/lzip-1.22.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+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"
+
+src_configure() {
+	# not autotools-based
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		CXX="$(tc-getCXX)" \
+		CPPFLAGS="${CPPFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}" || die
+}
diff --git a/app-arch/wimlib/Manifest b/app-arch/wimlib/Manifest
index ad86435f1467..26104a3deb78 100644
--- a/app-arch/wimlib/Manifest
+++ b/app-arch/wimlib/Manifest
@@ -1,6 +1,6 @@
 AUX syslinux-path.patch 713 BLAKE2B 94a9a0ef73b40ad9dc0febf732e5facc24fde0a3138a0298a72f7e2cde6d5fe34560d739432bcd12f172b48763f8deab2288eb14f99470d0a1340d0103941ab2 SHA512 dd0658529fb3b35690d34bb03ae8624314c0b379765566753b1ea0804ef8f1b94f300734b35ce0815e5352b02d09c86c91e371e0c442fcc3dca7ad89ceee4cbe
-DIST wimlib-1.12.0.tar.gz 1014508 BLAKE2B d12f4e0b458fe756b74c67f2f643256c44021e0f0c3e2a3a70eb87647c3c6cabd93413917bf8a8c6ab6820860c407f4454454719227f5cbf1a9a81a7bedc1a6e SHA512 0343b37550366f07fd6a6689f4445f390187beddde677f4d6d831c07936d03b613ae95f612ec7a75e978a5e678f33ab766d0f3b3d942886df56e4ef77d4b07b9
 DIST wimlib-1.13.0.tar.gz 1035146 BLAKE2B 305d4bd4a0299c99b537c2bc59c674740239d3fe7c240038f4846849f36046ef587b04643d5a482c876668bf8f9a94a7b45a5e4f12c6d235a579a08c3879acff SHA512 a7ec729dda07b3884a851533a3c9e9db3061d9f6273ec318e40ece3687f4671f66989c07c080fa9cdcf5f01318c5eba7256b58f15f711b3ff14f4eb61c2114cb
-EBUILD wimlib-1.12.0.ebuild 1520 BLAKE2B 2d1eef2fcf1a7c311213a8baf454d0fdbda3dd36805c5b0a20dd0436a872407116bbf2766f426034e0e75d10b4dab36701be2c5d22364b5e5b8bf9daa8f85e63 SHA512 4f3cb589e575403f0a207b1769445137eff7375371f526146be272f28783233245e97f491e4c307de03c1233f31f26d24d4d8e4e90ffa3ca3ea79081e286882a
-EBUILD wimlib-1.13.0.ebuild 1520 BLAKE2B 2d1eef2fcf1a7c311213a8baf454d0fdbda3dd36805c5b0a20dd0436a872407116bbf2766f426034e0e75d10b4dab36701be2c5d22364b5e5b8bf9daa8f85e63 SHA512 4f3cb589e575403f0a207b1769445137eff7375371f526146be272f28783233245e97f491e4c307de03c1233f31f26d24d4d8e4e90ffa3ca3ea79081e286882a
+DIST wimlib-1.13.3.tar.gz 1030667 BLAKE2B 2b897392bed3c4a390479f34925474c229ee835ab624c81a0baa7ebb8f3484f27aa4efb2a440debdcafe23b152b385bbe0f198d6f0560e8f88a34c7328a74edd SHA512 5c6e3bd1d7bda55812c818cc527cd241ac8a15276648f2a307db1f2a858de0b322e9f2beffda5bab991811aee3f4a953c3e31847bfa76a7d32ad5850595a15d4
+EBUILD wimlib-1.13.0.ebuild 1517 BLAKE2B cda0345780c9edff70e7fbe88a4818edcad8e8317f34aade48712359793a333025d7a971019eb9fa45b994b6a09283e0501fda8aa1b05abe57f25722907657e1 SHA512 a6c72ea6ef5884e15f5473eaad6e669da9ab954c8a55915a3b981c2fbe9dc9fc6ac25bf0c31d78618c78cc5d7d869c176a5750dcbf0e594c36b2128d74a8a10b
+EBUILD wimlib-1.13.3.ebuild 1470 BLAKE2B a1f77e6881bb1f850c9002a2ac65bd96c51c4ac0042110677b06aa44be80f1d22abfe908737426390ad2eb5d25b795646c4c9c079310cfa85f67a06ad0967ac5 SHA512 511ed97e28f0adca5eb3322ca181c331ba81194f3c3ceb17ad4200503ef1ef3e533f11e0f5d2419f2a05c733b3d66c9306c1670823bd9f838502e4d797ba400f
 MISC metadata.xml 633 BLAKE2B 441e45675abb3671408e44a13ea6ae1738276a598e9e30522e4f58116936ae85a1971f92b2d2c791395abaed09640d2224ccd1ad889a845839212b29222d5cce SHA512 1f7e158976543a9e195330a8cdd5b0f87bae9154d9d01b30bb0e93f900af5410cf35a61e8ea5230b2cf5601717d0a46381febb1375e540da510f95d770e82281
diff --git a/app-arch/wimlib/wimlib-1.13.0.ebuild b/app-arch/wimlib/wimlib-1.13.0.ebuild
index 3fb8e91ab6c9..a6578586e5cf 100644
--- a/app-arch/wimlib/wimlib-1.13.0.ebuild
+++ b/app-arch/wimlib/wimlib-1.13.0.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools pax-utils
 if [[ -z ${PV%%*9999} ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://wimlib.net/${PN}"
 else
-	inherit vcs-snapshot
 	MY_PV="${PV/_/-}"
 	MY_PV="${MY_PV^^}"
-	SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -20,28 +19,31 @@ HOMEPAGE="https://wimlib.net/"
 
 LICENSE="|| ( GPL-3+ LGPL-3+ ) CC0-1.0"
 SLOT="0"
-IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl threads yasm"
+IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl test threads yasm"
 REQUIRED_USE="cpu_flags_x86_ssse3? ( !openssl )"
 
-PATCHES=( "${FILESDIR}/syslinux-path.patch" )
+RESTRICT="!test? ( test )"
 
+BDEPEND="
+	virtual/pkgconfig
+	cpu_flags_x86_ssse3? (
+		yasm? ( dev-lang/yasm )
+		!yasm? ( dev-lang/nasm )
+	)
+"
 RDEPEND="
 	dev-libs/libxml2:2
 	ntfs? ( sys-fs/ntfs3g )
 	fuse? ( sys-fs/fuse:0 )
-	openssl? ( dev-libs/openssl:0 )
+	openssl? ( dev-libs/openssl:0= )
 	iso? (
 		app-arch/cabextract
 		app-cdr/cdrtools
 	)
 "
-DEPEND="
-	${RDEPEND}
-	cpu_flags_x86_ssse3? (
-		yasm? ( dev-lang/yasm )
-		!yasm? ( dev-lang/nasm )
-	)
-"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/syslinux-path.patch" )
 
 src_prepare() {
 	default
@@ -55,15 +57,15 @@ src_configure() {
 		$(use_enable cpu_flags_x86_ssse3 ssse3-sha1)
 		$(use_with openssl libcrypto)
 		$(use_enable threads multithreaded-compression)
+		$(use_enable test test-support)
 		--disable-static
 	)
-	has test ${FEATURES} && myeconfargs+=( --enable-test-support )
 	ac_cv_prog_NASM="$(usex yasm yasm nasm)" \
 		econf "${myeconfargs[@]}"
 }
 
 src_compile() {
-	emake
+	default
 	pax-mark m "${S}"/.libs/wimlib-imagex
 }
 
diff --git a/app-arch/wimlib/wimlib-1.12.0.ebuild b/app-arch/wimlib/wimlib-1.13.3.ebuild
index 3fb8e91ab6c9..a6115205d0c9 100644
--- a/app-arch/wimlib/wimlib-1.12.0.ebuild
+++ b/app-arch/wimlib/wimlib-1.13.3.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools pax-utils
 if [[ -z ${PV%%*9999} ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://wimlib.net/${PN}"
 else
-	inherit vcs-snapshot
 	MY_PV="${PV/_/-}"
 	MY_PV="${MY_PV^^}"
-	SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -20,28 +19,29 @@ HOMEPAGE="https://wimlib.net/"
 
 LICENSE="|| ( GPL-3+ LGPL-3+ ) CC0-1.0"
 SLOT="0"
-IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl threads yasm"
+IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl test threads yasm"
 REQUIRED_USE="cpu_flags_x86_ssse3? ( !openssl )"
 
-PATCHES=( "${FILESDIR}/syslinux-path.patch" )
+RESTRICT="!test? ( test )"
 
+BDEPEND="
+	virtual/pkgconfig
+	cpu_flags_x86_ssse3? (
+		yasm? ( dev-lang/yasm )
+		!yasm? ( dev-lang/nasm )
+	)
+"
 RDEPEND="
 	dev-libs/libxml2:2
 	ntfs? ( sys-fs/ntfs3g )
 	fuse? ( sys-fs/fuse:0 )
-	openssl? ( dev-libs/openssl:0 )
+	openssl? ( dev-libs/openssl:0= )
 	iso? (
 		app-arch/cabextract
 		app-cdr/cdrtools
 	)
 "
-DEPEND="
-	${RDEPEND}
-	cpu_flags_x86_ssse3? (
-		yasm? ( dev-lang/yasm )
-		!yasm? ( dev-lang/nasm )
-	)
-"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	default
@@ -55,15 +55,15 @@ src_configure() {
 		$(use_enable cpu_flags_x86_ssse3 ssse3-sha1)
 		$(use_with openssl libcrypto)
 		$(use_enable threads multithreaded-compression)
+		$(use_enable test test-support)
 		--disable-static
 	)
-	has test ${FEATURES} && myeconfargs+=( --enable-test-support )
 	ac_cv_prog_NASM="$(usex yasm yasm nasm)" \
 		econf "${myeconfargs[@]}"
 }
 
 src_compile() {
-	emake
+	default
 	pax-mark m "${S}"/.libs/wimlib-imagex
 }