gentoo resync : 17.07.2021

24 files changed, 116 insertions, 409 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 274c24fcfc84..c998f2393a6d 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index d20c9e6360d7..53ac9578b22f 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,4 +1,4 @@
 AUX libarchive-3.5.0-darwin-strnlen.patch 732 BLAKE2B d20ffd1d898acf1e69e2f275bec2beda0769569ac37e179604dc7d0a5eca8fda2a06aa5b3811e28f465fb34c2061d15aa8073110f703244aec02cfa35afd8087 SHA512 9f5b86b6dc483f17a1d909d88841e1f82f5835dbef0bdfc18ffb982cd5f649d87fdc22f490169eb827de654fbd469fda77a5ce1bc0748b48f3f46e77318e672c
 DIST libarchive-3.5.1.tar.gz 7008338 BLAKE2B 243dfda2bd4582bbc20679328b89aae0c530475c822dcf9ff25c65df2017b8f18bb616142d6ab016ccea4a5aa1b410d46b913c2ee0afefd2fdb1a41cf51585d9 SHA512 08ddd74bef4cef0981739da202879f36cf7ca33a8f6d438724588efe3ab8477f2f1d0cccf7b8ed0bedfc0c8d0cab16ee3ae5c0c6e83b6811bc650d7d7471a996
-EBUILD libarchive-3.5.1.ebuild 3768 BLAKE2B c2d8d0cfe99fedfa134f22d9f7147fe443270a9bc1ea31c1277459b52bb2ec6bd2db0b9c2e3b9962fd7b0516d20231abbf2efeecd30ec4bad204ebf945813c49 SHA512 275df5dfeef66002bf0005049f3d82eff1f7b59ed9bcc42b14b026492962b842c67b3ba342259cecfca5d2dab1cd4668e86cee8e177dab2c1669d378b8d74d15
+EBUILD libarchive-3.5.1-r1.ebuild 3761 BLAKE2B 712b3e29fe3ade19f8bd24dcfc6005842743221a4b9bda3ca212b0e166829726ca71c1ea09fa1b7055e2734808725049c8d4737cae7411874a92a0b991a8e6a0 SHA512 d8258ddff7b030c6c3ea399db91825695fc7d5e5d5b9f92a3a78b63cc7057c695027a8a567e68b223ca545ec34d50c48787bae44c9a00d9d6b67445a2514307a
 MISC metadata.xml 1514 BLAKE2B 377e5cfd85ad2660469744537665395cb99b12187f63d5a2202b8eee52cbe19adcc9f5289ea6665e5bc5f4e9339a5280e1e6dd297199cb009bebb37624009a5b SHA512 8dd39292864923ced4fab7f1307130082525aab611f94e5c7eee25045168e812dade090ea621ca3252eeb85ef8c7269fcaf0de1adc2979f4567f5e01581540e7
diff --git a/app-arch/libarchive/libarchive-3.5.1.ebuild b/app-arch/libarchive/libarchive-3.5.1-r1.ebuild
index 1319a7f8b960..495a49a99ae6 100644
--- a/app-arch/libarchive/libarchive-3.5.1.ebuild
+++ b/app-arch/libarchive/libarchive-3.5.1-r1.ebuild
@@ -11,7 +11,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"
-IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
+IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux lz4 +lzma lzo nettle static-libs xattr +zlib zstd"
 
 RDEPEND="
 	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
@@ -25,7 +25,7 @@ RDEPEND="
 	)
 	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.2.5-r1[${MULTILIB_USEDEP}] )
 	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
 	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
diff --git a/app-arch/makeself/Manifest b/app-arch/makeself/Manifest
index 356299366b15..337b29352de9 100644
--- a/app-arch/makeself/Manifest
+++ b/app-arch/makeself/Manifest
@@ -1,9 +1,5 @@
-AUX makeself-2.2.0-help-header.patch 6728 BLAKE2B 7d0211074f68346ead19fd58d9440976ee0e5f0367b0776c186ced0ee77769cca7597948f2894aee68e9d3f42fb6e0e19dcdc378ce0dfe714596ab8ad705d13b SHA512 5cdee18f5190086e8421d091406df5aeefdc9fe3aaee6c26aa990b1eb7d6f415c8c8ebf67137a1b2a22470c14749d394808ed9e5a4fc6f737cd87c32651e2a8c
-AUX makeself-unpack 2814 BLAKE2B cd96049b052b46a6d5273d78e27598f73046c1a29049af406f0f82c2c301e3b8f95c40534a18313eaffb6ac7ce68cbde1d988efa3503bb46f950936706e41590 SHA512 ebfe1dd13a11cd00a853e6a4e7d6094b5f923fbe987f6b5a778fec09e00e2b2daf1e5daab0eb04850d4471019fb95f88a5d2b9d88520f5738a29997d81f2c1c3
 DIST makeself-2.4.3.tar.gz 32613 BLAKE2B 2295b6d47a8105f2b495260abb0c9ae85875c821d0291a19b5af894c1cef669f338c4e10de8128fe38008e7e08079d1f29949884f202cab680c7fd62e2f00dd9 SHA512 d404c7920c7f69ae29c7168bcf76806b6e2aae2e8916bb7feed998d031ce8b2cd205b83ad960a90b01189c97f9242eb3ef574194ba3ee51c605fe99dafbd6c13
-DIST makeself-2.4.4.tar.gz 38889 BLAKE2B eac74fa28ac39cbc6b18d11671bfa32d6c0b04b55b3603c6c928483dd64af38d416936ef242f55aa4840affd4bf7fb91c2987f87afab093816331e50f16379ab SHA512 3d4d03458f7f11a8df46340d1b489ca60d413d5ed857cc67bb8ef15335ce2848e4675e080791c26fdf29423f813d468b4b797438fe0876dad54e85c6346b9b8b
-DIST release-2.2.0.tar.gz 21640 BLAKE2B 32b06157829864918d225a136043a5c9b7c6c543351e981c0e3cdce84cbbe4c52f00870bb04d29bfd79e715c1c708b51cc9958d495a9633afb9a8d342601c20d SHA512 11cd536baed2d56405103f18a8318a202092755a74baf10730aa58dc57032e327697b1c7f76bf9bf438927093ba9ac467ffa0c4564c7f6b1d3b2b3936f34fa73
-EBUILD makeself-2.2.0-r2.ebuild 695 BLAKE2B 24c8845a3765c0540fbc61a0d479a52aa48368c5992391b24a6e50d4d21df96973fd4c24dfb37d72eade758d1350b04dcce6061603e1e36df7aad1c461440cf7 SHA512 3686991760d6bdaca0ae09db9506f6337609550052041ec60a5d1da3321ed99a08f1f5e149c56228b0086f1a664531b8df81690496bf80774fe8f7546bb08022
-EBUILD makeself-2.4.3.ebuild 942 BLAKE2B c9853c874c7653c35ab3656b80357bef22ebcee730a9f2be6eecc857302dce32dcf90e4ad5e15874babcbbd44f6331440517089a086f8c225cc1c1e2f14d490f SHA512 8357031146ec48a52bdf7957c8faa50eab5ca9fa6e68ceb6462666da63c7f2bb61892efe8bfea4ae50659dd3b60c41b7dab3669de1b0ba2131ba8fb99ec36d0c
-EBUILD makeself-2.4.4.ebuild 1171 BLAKE2B ebad131c264fd1caacb5bedeb4ff3298ff35c095db7954cf017e34d232c9631b427bea0d582a1b5b27373e16ab7d84477166fe23a401cba58d05f2f2442a8974 SHA512 e65cac5fb12545c8060434cde76c02911e0dc065ce3be4829e2cb5c051353f9d1853589b7791afbb10926d7c073315f7aba57b110f1fb5a13834c171e0000f72
+DIST makeself-2.4.5.tar.gz 39012 BLAKE2B f79cf1c087e89c4fd09f328fb795a3f8a78ee38060dbbd1590e3dcdf22a346b0c12bf6837d1636efadb2a66f6a762308de7ee9dd2fc62a7c88d417d257c5f0f6 SHA512 1dae74586f6bd5afb526801b7ffa7fc7962ff74b0f190cdd51da93c21421864b72f5fe18090cb2ff6ad27f0907fbf3aeb5545f3f70e33dbc9e505a78505f5f90
+EBUILD makeself-2.4.3.ebuild 929 BLAKE2B cf5cf22da092ef5ed0b9e9f32c237d49529ebf0be2b7d998a8109ad19613237feb6d4c8f8f72bce28d0c5da43efed7e4473c8f03d56ece72a0fb34388ebf5f8d SHA512 1eb89f4e0f5b4eeedec4f538052f6dd1bf21f515cb90ea5561f7e7eaa9e2694fad6266f36687c19f9fa3464ef87ab849271de50182ca024a703c00330409f7ef
+EBUILD makeself-2.4.5.ebuild 1158 BLAKE2B 943cb467f061b207812394cacb456070c552c549092fa2a3ec93f32a6ea108915f40dd1990662ba766f67f7e3f02b10c9056fe482dbed8114b1ef3684ced305f SHA512 1f0454d64d30047c29454a294aa156a1da0d7b02ff94d1bcd8e5f2550cf4cf19e27ac9a28f98cec2014dc119c66695817f2e83865da4c9aa32b5ea4ec543186a
 MISC metadata.xml 513 BLAKE2B 25f348226db47085523f7e1f74b1b557982acf56ba2b33252e250cc45400137be2090e29dad3b009e7b11c2d2942e564e7c499c7566c857ad5b05849553014c0 SHA512 48b0f4efee7e7dd1dc3e5bc0b2585748a15e4e2e0e41eb764709b41b4eb45d6ef98b712fc5265c2892e70b6c99c00e15542430e854811961d3acb5a803c6d5c5
diff --git a/app-arch/makeself/files/makeself-2.2.0-help-header.patch b/app-arch/makeself/files/makeself-2.2.0-help-header.patch
deleted file mode 100644
index 5726bf55f7da..000000000000
--- a/app-arch/makeself/files/makeself-2.2.0-help-header.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From c9f605cb4a3903985f2c6f816c30c1edf728c1b5 Mon Sep 17 00:00:00 2001
-From: Jon Salz <jsalz@google.com>
-Date: Mon, 27 Jan 2014 16:04:33 +0800
-Subject: [PATCH] Add --help-header option to prepend a string to the archive's
- --help.
-
----
- makeself-header.sh |  3 ++-
- makeself.sh        | 71 ++++++++++++++++++++++++++++++------------------------
- 2 files changed, 41 insertions(+), 33 deletions(-)
-
-diff --git a/makeself-header.sh b/makeself-header.sh
-index e3f6c11..f97758c 100755
---- a/makeself-header.sh
-+++ b/makeself-header.sh
-@@ -13,6 +13,7 @@ label="$LABEL"
- script="$SCRIPT"
- scriptargs="$SCRIPTARGS"
- licensetxt="$LICENSE"
-+helpheader='$HELPHEADER'
- targetdir="$archdirname"
- filesizes="$filesizes"
- keep="$KEEP"
-@@ -119,7 +120,7 @@ MS_dd_Progress()
- MS_Help()
- {
-     cat << EOH >&2
--Makeself version $MS_VERSION
-+\${helpheader}Makeself version $MS_VERSION
-  1) Getting help or info about \$0 :
-   \$0 --help   Print this message
-   \$0 --info   Print embedded info : title, default target directory, embedded script ...
-diff --git a/makeself.sh b/makeself.sh
-index 361d710..cb2d6f2 100755
---- a/makeself.sh
-+++ b/makeself.sh
-@@ -88,38 +88,39 @@ MS_Usage()
- {
-     echo "Usage: $0 [params] archive_dir file_name label startup_script [args]"
-     echo "params can be one or more of the following :"
--    echo "    --version | -v  : Print out Makeself version number and exit"
--    echo "    --help | -h     : Print out this help message"
--    echo "    --quiet | -q    : Do not print any messages other than errors."
--    echo "    --gzip          : Compress using gzip (default if detected)"
--    echo "    --bzip2         : Compress using bzip2 instead of gzip"
--    echo "    --pbzip2        : Compress using pbzip2 instead of gzip"
--    echo "    --xz            : Compress using xz instead of gzip"
--    echo "    --compress      : Compress using the UNIX 'compress' command"
--    echo "    --complevel lvl : Compression level for gzip xz bzip2 and pbzip2 (default 9)"
--    echo "    --base64        : Instead of compressing, encode the data using base64"
--    echo "    --nocomp        : Do not compress the data"
--    echo "    --notemp        : The archive will create archive_dir in the"
--    echo "                      current directory and uncompress in ./archive_dir"
--    echo "    --copy          : Upon extraction, the archive will first copy itself to"
--    echo "                      a temporary directory"
--    echo "    --append        : Append more files to an existing Makeself archive"
--    echo "                      The label and startup scripts will then be ignored"
--    echo "    --target dir    : Extract directly to a target directory"
--    echo "                      directory path can be either absolute or relative"
--    echo "    --current       : Files will be extracted to the current directory"
--    echo "                      Both --current and --target imply --notemp"
--    echo "    --tar-extra opt : Append more options to the tar command line"
--    echo "    --nomd5         : Don't calculate an MD5 for archive"
--    echo "    --nocrc         : Don't calculate a CRC for archive"
--    echo "    --header file   : Specify location of the header script"
--    echo "    --follow        : Follow the symlinks in the archive"
--    echo "    --noprogress    : Do not show the progress during the decompression"
--    echo "    --nox11         : Disable automatic spawn of a xterm"
--    echo "    --nowait        : Do not wait for user input after executing embedded"
--    echo "                      program from an xterm"
--    echo "    --lsm file      : LSM file describing the package"
--    echo "    --license file  : Append a license file"
-+    echo "    --version | -v     : Print out Makeself version number and exit"
-+    echo "    --help | -h        : Print out this help message"
-+    echo "    --quiet | -q       : Do not print any messages other than errors."
-+    echo "    --gzip             : Compress using gzip (default if detected)"
-+    echo "    --bzip2            : Compress using bzip2 instead of gzip"
-+    echo "    --pbzip2           : Compress using pbzip2 instead of gzip"
-+    echo "    --xz               : Compress using xz instead of gzip"
-+    echo "    --compress         : Compress using the UNIX 'compress' command"
-+    echo "    --complevel lvl    : Compression level for gzip xz bzip2 and pbzip2 (default 9)"
-+    echo "    --base64           : Instead of compressing, encode the data using base64"
-+    echo "    --nocomp           : Do not compress the data"
-+    echo "    --notemp           : The archive will create archive_dir in the"
-+    echo "                         current directory and uncompress in ./archive_dir"
-+    echo "    --copy             : Upon extraction, the archive will first copy itself to"
-+    echo "                         a temporary directory"
-+    echo "    --append           : Append more files to an existing Makeself archive"
-+    echo "                         The label and startup scripts will then be ignored"
-+    echo "    --target dir       : Extract directly to a target directory"
-+    echo "                         directory path can be either absolute or relative"
-+    echo "    --current          : Files will be extracted to the current directory"
-+    echo "                         Both --current and --target imply --notemp"
-+    echo "    --tar-extra opt    : Append more options to the tar command line"
-+    echo "    --nomd5            : Don't calculate an MD5 for archive"
-+    echo "    --nocrc            : Don't calculate a CRC for archive"
-+    echo "    --header file      : Specify location of the header script"
-+    echo "    --follow           : Follow the symlinks in the archive"
-+    echo "    --noprogress       : Do not show the progress during the decompression"
-+    echo "    --nox11            : Disable automatic spawn of a xterm"
-+    echo "    --nowait           : Do not wait for user input after executing embedded"
-+    echo "                         program from an xterm"
-+    echo "    --lsm file         : LSM file describing the package"
-+    echo "    --license file     : Append a license file"
-+    echo "    --help-header file : Add a header to the archive's --help output"
-     echo
-     echo "Do not forget to give a fully qualified startup script name"
-     echo "(i.e. with a ./ prefix if inside the archive)."
-@@ -254,6 +255,12 @@ do
- 	LSM_CMD="cat \"$2\" >> \"\$archname\""
-     if ! shift 2; then MS_Help; exit 1; fi
- 	;;
-+    --help-header)
-+	HELPHEADER=`sed -e "s/'/'\\\\\''/g" $2`
-+    if ! shift 2; then MS_Help; exit 1; fi
-+	[ -n "$HELPHEADER" ] && HELPHEADER="$HELPHEADER
-+"
-+    ;;
-     -q | --quiet)
- 	QUIET=y
- 	shift
--- 
-1.8.5.5
-
diff --git a/app-arch/makeself/files/makeself-unpack b/app-arch/makeself/files/makeself-unpack
deleted file mode 100644
index 90b98312c8b9..000000000000
--- a/app-arch/makeself/files/makeself-unpack
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/bash
-
-# Glue to keep unpack_makeself() unchanged
-source /lib/gentoo/functions.sh
-find_unpackable_file() { echo "$@"; }
-debug-print() { :; }
-emktemp() { mktemp "$@"; }
-die() { eerror "$*"; exit 1; }
-assert() { _pipestatus="${PIPESTATUS[*]}"; [[ "${_pipestatus// /}" -eq 0 ]] || die; }
-
-# Straight copied from unpacker.eclass ... should be kept in sync
-
-unpack_banner() {
-	echo ">>> Unpacking ${1##*/} to ${PWD}"
-}
-
-unpack_makeself() {
-	local src_input=${1:-${A}}
-	local src=$(find_unpackable_file "${src_input}")
-	local skip=$2
-	local exe=$3
-
-	[[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
-
-	unpack_banner "${src}"
-
-	if [[ -z ${skip} ]] ; then
-		local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
-		local skip=0
-		exe=tail
-		case ${ver} in
-			1.5.*|1.6.0-nv*)	# tested 1.5.{3,4,5} ... guessing 1.5.x series is same
-				skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
-				;;
-			2.0|2.0.1)
-				skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
-				;;
-			2.1.1)
-				skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
-				(( skip++ ))
-				;;
-			2.1.2)
-				skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
-				(( skip++ ))
-				;;
-			2.1.3)
-				skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
-				(( skip++ ))
-				;;
-			2.1.4|2.1.5|2.1.6|2.2.0)
-				skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
-				skip=$(head -n ${skip} "${src}" | wc -c)
-				exe="dd"
-				;;
-			*)
-				eerror "I'm sorry, but I was unable to support the Makeself file."
-				eerror "The version I detected was '${ver}'."
-				eerror "Please file a bug about the file ${src##*/} at"
-				eerror "http://bugs.gentoo.org/ so that support can be added."
-				die "makeself version '${ver}' not supported"
-				;;
-		esac
-		debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
-	fi
-	case ${exe} in
-		tail)	exe="tail -n +${skip} '${src}'";;
-		dd)		exe="dd ibs=${skip} skip=1 if='${src}'";;
-		*)		die "makeself cant handle exe '${exe}'"
-	esac
-
-	# lets grab the first few bytes of the file to figure out what kind of archive it is
-	local filetype tmpfile=$(emktemp)
-	eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
-	filetype=$(file -b "${tmpfile}") || die
-	case ${filetype} in
-		*tar\ archive*)
-			eval ${exe} | tar --no-same-owner -xf -
-			;;
-		bzip2*)
-			eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
-			;;
-		gzip*)
-			eval ${exe} | tar --no-same-owner -xzf -
-			;;
-		compress*)
-			eval ${exe} | gunzip | tar --no-same-owner -xf -
-			;;
-		XZ*)
-			eval ${exe} | unxz | tar --no-same-owner -xf -
-			;;
-		*)
-			eerror "Unknown filetype \"${filetype}\" ?"
-			false
-			;;
-	esac
-	assert "failure unpacking (${filetype}) makeself ${src##*/} ('${ver}' +${skip})"
-	rm "${tmpfile}"
-}
-
-for x; do unpack_makeself "$x" ; done
diff --git a/app-arch/makeself/makeself-2.2.0-r2.ebuild b/app-arch/makeself/makeself-2.2.0-r2.ebuild
deleted file mode 100644
index 04f9402991c5..000000000000
--- a/app-arch/makeself/makeself-2.2.0-r2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker
-
-DESCRIPTION="Shell script that generates a self-extractible tar.gz"
-HOMEPAGE="http://www.megastep.org/makeself/"
-SRC_URI="https://github.com/megastep/makeself/archive/release-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-release-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="sys-apps/gentoo-functions"
-
-PATCHES=( "${FILESDIR}/${P}-help-header.patch" )
-
-src_install() {
-	dobin makeself-header.sh makeself.sh "${FILESDIR}"/makeself-unpack
-	dosym makeself.sh /usr/bin/makeself
-	doman makeself.1
-	dodoc README.md makeself.lsm
-}
diff --git a/app-arch/makeself/makeself-2.4.3.ebuild b/app-arch/makeself/makeself-2.4.3.ebuild
index 2cd2a9fa8709..32df98cc0e0c 100644
--- a/app-arch/makeself/makeself-2.4.3.ebuild
+++ b/app-arch/makeself/makeself-2.4.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit optfeature
 
 DESCRIPTION="Shell script that generates a self-extractible tar.gz"
-HOMEPAGE="http://www.megastep.org/makeself/"
+HOMEPAGE="https://makeself.io/"
 SRC_URI="https://github.com/megastep/makeself/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-release-${PV}"
 
diff --git a/app-arch/makeself/makeself-2.4.4.ebuild b/app-arch/makeself/makeself-2.4.5.ebuild
index 17f5cf26fdd7..6e66645515bd 100644
--- a/app-arch/makeself/makeself-2.4.4.ebuild
+++ b/app-arch/makeself/makeself-2.4.5.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 inherit optfeature
 
 DESCRIPTION="Shell script that generates a self-extractible tar.gz"
-HOMEPAGE="http://www.megastep.org/makeself/"
+HOMEPAGE="https://makeself.io/"
 SRC_URI="https://github.com/megastep/makeself/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index da96124396a3..9aba7c4285d9 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,8 +1,3 @@
-AUX 2.4-trailing-junk.patch 916 BLAKE2B 1487b9fc75bafe50cd00aac14e867f073c8d8db22067a645ed67aec9ebf46c1599d174679a56a23806d546b3a43739f6f5137dc9dd3f7e62b8b0aaaf61e0dd99 SHA512 8159a6b8c5c7086269dbaa06f73262fb53125edbb360ad22526d47364e8006735e72650d869f81335620177a78eb828aa87198905ec0e7ac41dea731261b10dc
-DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba
-DIST pigz-2.5.tar.gz 106438 BLAKE2B d1db42e412d91243aebdc06204a032e1d9dd7e01f659cc428e8a194df26242782d22328658b773b61ccbdf1e34a7ada4d358a93d9c6eda7d7e78c4291ca901ac SHA512 8f52900b8664c67b5b1813ac2f6e226d899c72ba19eefd6424181dc4dc0416d38ad3c7e5fe3dce6bdb58f5ac34ec0269f846c43f9aef6f69a121713113c1643a
 DIST pigz-2.6.tar.gz 106840 BLAKE2B 8e1a8ca593896fc947a7d6ffaa71d9be69d347f7cf1ed2f635b8480aa05708f4679a4768cf3a18ac515ea94dd8352dd4158bd3c9d1b6fdebd82ad1b582d04cba SHA512 04d2e44bc7a7eb061c3c48100ce5b8fc79931aeac72340abd768fd2a4499ff1004e2bc009772fc2003a4c599f6e90f3abc8bef5c377d6397f1c8e9f7c49f95e2
-EBUILD pigz-2.4-r1.ebuild 1012 BLAKE2B e1c0774598db74d40076ae564be85a4162e8b8bf30021af753f5898796fd3af76669e7cf3ed1f150700e9018bd9f689b572bb011c10ee9b1e5d005f0c5b9a6d4 SHA512 2a31104d83f09e9dbfde55b198abb677c43e00d5f0ce22a5c00acfabe9953c3afb486e153e60000ccf7ba7eadd54886b75ee92afba0d3053faa31fa8a273d1de
-EBUILD pigz-2.5.ebuild 966 BLAKE2B 92b57b79d8a6a4e48a43063ae241b3191399732b7beeea86cce1498e5aead468826468b942b218083bd99521d9c9db29eb35a44efd06adc5ca03f6040303fbb1 SHA512 7231d728746338e81679c0cad7538d1274a3590e579a98694ef5f0be973877b81ae4569b5114f4c0bcd6aa5e66607de3dedf360e4a6d5dc7777263a9b27ef74d
-EBUILD pigz-2.6.ebuild 966 BLAKE2B 92b57b79d8a6a4e48a43063ae241b3191399732b7beeea86cce1498e5aead468826468b942b218083bd99521d9c9db29eb35a44efd06adc5ca03f6040303fbb1 SHA512 7231d728746338e81679c0cad7538d1274a3590e579a98694ef5f0be973877b81ae4569b5114f4c0bcd6aa5e66607de3dedf360e4a6d5dc7777263a9b27ef74d
+EBUILD pigz-2.6.ebuild 959 BLAKE2B 0f3b28b07d4af30775e5c1d1e061a5cffe8e1b2d9f01dd31e9f4ad9b606e6fdbb7ccd2c55dd9397557ee0285ebbc34bc7ac8e64467613013568513b330b0f3da SHA512 b16444c8e914dd220e19c6cd931c5e2ab21cec731d173b1b33245d2456f2fe5f05cf9254850c23e56a3cf5a87626a3e7c065feaa5d04a0412e66db5eecc8b170
 MISC metadata.xml 739 BLAKE2B 66bac4d792d20a9edc0a4b52f55c4f02e5e9ff79b9c67365af252b928dd68b63f71a6cc75c31f824c5c0f63917f6c4c11de2cc2e82d78b7ce4518f9ac1868223 SHA512 26106d41b334587ca0aabd620d481ce6c8729fc279ddb97a529286910936a8a25d42a2f09b8ee48b9ac9343cd3384a6f7d6ccaaf39ab111214e88aff5203e90e
diff --git a/app-arch/pigz/files/2.4-trailing-junk.patch b/app-arch/pigz/files/2.4-trailing-junk.patch
deleted file mode 100644
index eb5585b7d362..000000000000
--- a/app-arch/pigz/files/2.4-trailing-junk.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1414ff3eb0b1ac9e5f096b0a28efa459cb8be1cd Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Fri, 10 Jul 2020 19:46:10 -0700
-Subject: [PATCH] Ignore trailing junk on .gz by default, to emulate gzip.
-
-backport of
-https://github.com/madler/pigz/commit/9696c84cb1963651707e649978afb07d0c11b254
----
- pigz.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pigz.c b/pigz.c
-index bbbfd2c..f2e79d7 100644
---- a/pigz.c
-+++ b/pigz.c
-@@ -3368,7 +3368,7 @@ local void infchk(void) {
-         cat();
-     else if (was > 1 && get_header(0) != -5)
-         complain("warning: %s: entries after the first were ignored", g.inf);
--    else if ((was == 0 && ret != -1) || (was == 1 && (GET(), !g.in_eof)))
-+    else if (( g.verbosity > 1 && was == 0 && ret != -1) || (was == 1 && (GET(), !g.in_eof)))
-         complain("warning: %s: trailing junk was ignored", g.inf);
- }
- 
--- 
-2.27.0
-
diff --git a/app-arch/pigz/pigz-2.4-r1.ebuild b/app-arch/pigz/pigz-2.4-r1.ebuild
deleted file mode 100644
index f23df83523ad..000000000000
--- a/app-arch/pigz/pigz-2.4-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="A parallel implementation of gzip"
-HOMEPAGE="https://www.zlib.net/pigz/"
-SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
-IUSE="static symlink test"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	test? ( app-arch/ncompress )"
-
-PATCHES=( "${FILESDIR}/${PV}-trailing-junk.patch" )
-
-src_compile() {
-	use static && append-ldflags -static
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	dosym ${PN} /usr/bin/un${PN}
-	dodoc README
-	doman ${PN}.1
-
-	if use symlink; then
-		dosym ${PN} /usr/bin/gzip
-		dosym un${PN} /usr/bin/gunzip
-	fi
-}
diff --git a/app-arch/pigz/pigz-2.5.ebuild b/app-arch/pigz/pigz-2.5.ebuild
deleted file mode 100644
index 3e1f3a17235d..000000000000
--- a/app-arch/pigz/pigz-2.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="A parallel implementation of gzip"
-HOMEPAGE="https://www.zlib.net/pigz/"
-SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
-IUSE="static symlink test"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	test? ( app-arch/ncompress )"
-
-src_compile() {
-	use static && append-ldflags -static
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	dosym ${PN} /usr/bin/un${PN}
-	dodoc README
-	doman ${PN}.1
-
-	if use symlink; then
-		dosym ${PN} /usr/bin/gzip
-		dosym un${PN} /usr/bin/gunzip
-	fi
-}
diff --git a/app-arch/pigz/pigz-2.6.ebuild b/app-arch/pigz/pigz-2.6.ebuild
index 3e1f3a17235d..f57fbf711a4b 100644
--- a/app-arch/pigz/pigz-2.6.ebuild
+++ b/app-arch/pigz/pigz-2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
 IUSE="static symlink test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index b2afbebc8082..942e717db416 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -8,6 +8,6 @@ DIST rpm-4.14.2.1.tar.bz2 4156574 BLAKE2B 2eb0cf621eecef7d8977d28d52be922156ceb6
 DIST rpm-4.16.0.tar.bz2 4341683 BLAKE2B 5161e5dcc6d9a1f1d4b8e44740fb368050b808fd9e8b8276fb17b530a4642e1b9ad104b5a30c0071215aef7f823eeab10988dd41f73af1c52d575529c374b5eb SHA512 177119c3ac3d48980db55bb4ba0fdbb2a911968e5efc690bfa8cc343f850fc90531cc0dee6dd8e45d2b14f0d951ced35bd8893d24011b7f270745d281ddf4e3d
 DIST rpm-4.16.1.3.tar.bz2 4354652 BLAKE2B 10013014bdeaf908b64c90f8e76f1d4b0cd0e8cb926f0cd979d7b1e1963b9a25c5b98531deea7e74e00168e2e6349f443fa4578c69c717ca1ab5e6b79d801f3a SHA512 54e503b32dffaa73d6168f26a00220d9d9124082d8a1eb1ddf34ce32a482f07cb06ec654cf065fca1607cc37b13fa7d4fa9895553541d7cfddecf68c9eb96f2e
 EBUILD rpm-4.14.2.1-r1.ebuild 3455 BLAKE2B 3636d33dfe5deec80c1ca78ff0df7a4ac29d6c42549eab4cf09927ceb538996ee6804a978331bd67debbf971e12fcf6956d79ef9df6f39ebfc81bce0a6f62c8a SHA512 96a0bc5a032e69eb91bd5967af59e242d4b9570621b6eba455a7f1f0d6ad67c1adb0c3eb2c8e7eb8587bf3022b328accefd3c7b0d3315f183c3cb4c1c24ec55c
-EBUILD rpm-4.16.0.ebuild 3935 BLAKE2B ca9fcf934a6acdfc918ccf658b1959528c5c11d0b5784402f5f599743a0a9536bf054ef8eef3cf3d9b0dfd13ce0c63d5e961d97790fb423c418cd4e48e87faff SHA512 bcbeec2d9533cdb7c41dde254fed52b579e118834cfbe033b7afa283e9813d34bb10fbd63bd31097bf974bfb1ca1037611ffdba87087d405c2aead85fb3b7f6c
-EBUILD rpm-4.16.1.3.ebuild 3632 BLAKE2B 81e8d2c8181bb2778fa6abc36b6c37db4470fd6bc2b6355f9f19a062b0d35eb7f102253c7b386baced9a2a7af054cb96be359c3c86b949c137370df72884049b SHA512 b2505da0564792233c403369f951696ee16ed5686718e616c249b438a2119fc73b656b63d4dae11c43bb759c8714923567adaebbf6ec2278e87bda10484c1bda
+EBUILD rpm-4.16.0.ebuild 3940 BLAKE2B 3e9adc41250a0cad5389abbcc0b6fc865f0db902b33dc00e2250de9eba0165bf9f9daf1565b9b5702afd2bde9a3043abd3aab7e25ca90ebe12e0161351f9673d SHA512 423a9e7ea8d95c9c96208aba406f4c22815cf533227bd795bb69d9c033af0e3d4b2e8baac3dc9469cb7f57a4cbb70cc6d6135c60b5cd96ca5ed98b238a3a4e65
+EBUILD rpm-4.16.1.3.ebuild 3642 BLAKE2B 20e3eebb5667d0367ae7d40892a0898c093e81a5d06a7e663b662bdbe93a9b1f8e5c9c48295ad5ca0aa49d2ff14974c79453d9625fc1ab607f818a02ccdd976a SHA512 092048f92e01f0c8aa7f42ee16a416fd3119b9571bf59f8c27a89e4bf328ac1ee56e2200d3ba227c2caaeafe86c3bc21817a34b603d0a3e0e56b1266a8008604
 MISC metadata.xml 337 BLAKE2B d01523bdc86c3b93ae548f601265338290470dcb578a79757ba7d3b2c4be257c89e76c97b5d411f9271d9ee754981a004b03e2a5cfe9b6bd56e32932796771c9 SHA512 20a89c9f7af0c1a7dd5f325eb3c1af65044a6f09e6ea8c70033bf35819ee18faf8c3a0ee2cebcbc0849a84e962dbbdd2111e02b3369d0feccf3719dc0bcfa6cc
diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild
index 3e6a36bfe072..cdb8d7392a5a 100644
--- a/app-arch/rpm/rpm-4.16.0.ebuild
+++ b/app-arch/rpm/rpm-4.16.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-2 )
+LUA_COMPAT=( lua5-{2..4} )
 PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit autotools flag-o-matic lua-single perl-module python-single-r1 toolchain-funcs
diff --git a/app-arch/rpm/rpm-4.16.1.3.ebuild b/app-arch/rpm/rpm-4.16.1.3.ebuild
index 1302a5a779e0..2603c2191f03 100644
--- a/app-arch/rpm/rpm-4.16.1.3.ebuild
+++ b/app-arch/rpm/rpm-4.16.1.3.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-2 )
-PYTHON_COMPAT=( python3_{7,8,9} )
+LUA_COMPAT=( lua5-{2..4} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit autotools flag-o-matic lua-single perl-module python-single-r1 toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # Tests are broken. See bug 657500
 RESTRICT="test"
diff --git a/app-arch/wimlib/Manifest b/app-arch/wimlib/Manifest
index 1d2d3569a1b8..8b9fa7dca346 100644
--- a/app-arch/wimlib/Manifest
+++ b/app-arch/wimlib/Manifest
@@ -1,3 +1,5 @@
 DIST wimlib-1.13.3.tar.gz 1030667 BLAKE2B 2b897392bed3c4a390479f34925474c229ee835ab624c81a0baa7ebb8f3484f27aa4efb2a440debdcafe23b152b385bbe0f198d6f0560e8f88a34c7328a74edd SHA512 5c6e3bd1d7bda55812c818cc527cd241ac8a15276648f2a307db1f2a858de0b322e9f2beffda5bab991811aee3f4a953c3e31847bfa76a7d32ad5850595a15d4
-EBUILD wimlib-1.13.3.ebuild 1469 BLAKE2B 213d3087f76925360c0d8973ae99c967233c41cd17223617ee0eea4c8466db4d7264dffde3b8dfec0406bbbc1b12d1a147ebd2856d746c718444d6528e95d790 SHA512 5ec6b2df3632f5ed55de5ddbcd247e70b80638af5c6340d06dcc446ef721707fdc83871f97d9566ea740f9b7a53e73aff9eaf750e17bbdb2c8196fbaedae2aa6
-MISC metadata.xml 633 BLAKE2B 441e45675abb3671408e44a13ea6ae1738276a598e9e30522e4f58116936ae85a1971f92b2d2c791395abaed09640d2224ccd1ad889a845839212b29222d5cce SHA512 1f7e158976543a9e195330a8cdd5b0f87bae9154d9d01b30bb0e93f900af5410cf35a61e8ea5230b2cf5601717d0a46381febb1375e540da510f95d770e82281
+DIST wimlib-1.13.4.tar.gz 1040411 BLAKE2B 4563429d42be39b959a15ef66ac4c173531ff0c0b0f1a341812a4f870c9f189478f3ce78bf6240544f71b1746d98c9eae3f7182d646355343e26526559384f07 SHA512 480fe6fa6c6e8f1bf9c3960f5e1671f3266535b18dc72e9d7c4c05c7fb833d9b00db5ae9fb49154da6e71e536cae8b562cbf81ab5a124e2a79326927e2cf7344
+EBUILD wimlib-1.13.3.ebuild 1468 BLAKE2B f9fda406269868fee8864b80cbf402082ad5d94c1aa3bbb2e9f5f5c6b7782b5ad43a4175661f0c0b3a2155e90809002bef437b5c9f030edd35f9f46451ffce13 SHA512 7ed537bceba0e7089a5a05d814e8dbf7e2874dac3b7abeb13e9e093f1ed179168742fd1e18a15a5dcbf7927d7295d29c5ccfc19f52444332dd9c8ea3851151a9
+EBUILD wimlib-1.13.4.ebuild 1481 BLAKE2B 0ffb97b8efaa6259101dc9a46b16baf2f9b7639686507144ca8849a3d6afc11f71432608b4e2a1e6959d51f5ec9492112e23f279a305b312b52204bc5e54ed6e SHA512 6b83cb0cc66a068089f1a353a71a269ae69d3c30afc5ebbd1bd65e982466f01698e62e6d967f63ed2b3b1dcb6a0924b05b1c5e1647462f8aa17e0d904dfd015d
+MISC metadata.xml 788 BLAKE2B 39fb937f096a607648c23c57f4fb17947b7ff4705b97db69b3ebea637a4e85723ed333ba01b9755708644d0c7daa2e920d0fd192a586b051ea4682b335156ecc SHA512 638f1e0cf7242b2fbc8c55482b75391e435465e2a7de7cde48eb95e0c2c3d52db360e2595138577d9934285c2fd2b5dafd758a6f97431ece72db5625fab8c29b
diff --git a/app-arch/wimlib/metadata.xml b/app-arch/wimlib/metadata.xml
index 7d39835030d1..b591ed9e0496 100644
--- a/app-arch/wimlib/metadata.xml
+++ b/app-arch/wimlib/metadata.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="fuse">
-      Use fuse libraries
-    </flag>
-    <flag name="iso">
-      Install app-cdr/cdrtools in order to prepare iso images
-    </flag>
-    <flag name="ntfs">
-      Use libntfs-3g library from sys-fs/ntfs3g
-    </flag>
-    <flag name="openssl">
-      Use the SHA-1 message digest from libcrypto instead of compilling another implementation
-    </flag>
-    <flag name="yasm">
-      Use yasm assembler instead of nasm
-    </flag>
-  </use>
+	<maintainer type="person" proxied="yes">
+		<email>marco@scardovi.com</email>
+		<name>Marco Scardovi</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="fuse">Use fuse libraries</flag>
+		<flag name="iso">Install app-cdr/cdrtools in order to prepare iso images</flag>
+		<flag name="ntfs">Use libntfs-3g library from sys-fs/ntfs3g</flag>
+		<flag name="openssl">Use the SHA-1 message digest from libcrypto instead of compilling another implementation</flag>
+		<flag name="yasm">Use yasm assembler instead of nasm</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-arch/wimlib/wimlib-1.13.3.ebuild b/app-arch/wimlib/wimlib-1.13.3.ebuild
index 5c3f76379b53..be0165156be7 100644
--- a/app-arch/wimlib/wimlib-1.13.3.ebuild
+++ b/app-arch/wimlib/wimlib-1.13.3.ebuild
@@ -11,7 +11,7 @@ else
 	MY_PV="${PV/_/-}"
 	MY_PV="${MY_PV^^}"
 	SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="The open source Windows Imaging (WIM) library"
diff --git a/app-arch/wimlib/wimlib-1.13.4.ebuild b/app-arch/wimlib/wimlib-1.13.4.ebuild
new file mode 100644
index 000000000000..84e997127f0a
--- /dev/null
+++ b/app-arch/wimlib/wimlib-1.13.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools pax-utils
+
+DESCRIPTION="The open source Windows Imaging (WIM) library"
+HOMEPAGE="https://wimlib.net"
+SRC_URI="https://wimlib.net/downloads/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="|| ( GPL-3+ LGPL-3+ ) CC0-1.0"
+SLOT="0"
+IUSE="cpu_flags_x86_ssse3 fuse iso ntfs ssl test threads yasm"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	cpu_flags_x86_ssse3? (
+		yasm? ( dev-lang/yasm )
+		!yasm? ( dev-lang/nasm )
+	)
+"
+RDEPEND="
+	dev-libs/libxml2:2
+	fuse? ( sys-fs/fuse:0 )
+	iso? (
+		app-arch/cabextract
+		app-cdr/cdrtools
+	)
+	ntfs? ( sys-fs/ntfs3g )
+	ssl? ( dev-libs/openssl:0= )
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with ntfs ntfs-3g)
+		$(use_with fuse)
+		$(use_with ssl libcrypto)
+		$(use_enable threads multithreaded-compression)
+		$(use_enable test test-support)
+		--disable-static
+	)
+
+	if use cpu_flags_x86_ssse3; then
+		if ! use ssl; then
+			myeconfargs+=( --enable-ssse3-sha1 )
+		else
+			elog "cpu_flags_x86_ssse3 and ssl can't be enabled together, "
+			elog "enabling ssl and disabling cpu_flags_x86_ssse3 for you."
+			myeconfargs+=( --disable-ssse3-sha1 )
+		fi
+	fi
+
+	ac_cv_prog_NASM="$(usex yasm yasm nasm)" \
+		econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	pax-mark m "${S}"/.libs/wimlib-imagex
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index f3b494ab1a35..6255ebe3c95f 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,4 +1,4 @@
 DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043 SHA512 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce
-EBUILD xz-utils-5.2.5.ebuild 2750 BLAKE2B 070d4a08f519ab557890b6587c2617025e0386f1216feff40b7e842f89f2b4497048d6468669f63e207f28f8a95553e3413dfc1f4f14fea691fee24b7159db6b SHA512 7db43473bc7120250ef288ea83a257fd4a576b3d958dd9d8c99e0942288ea8d1a8c753e3d3e106ac5a08d411b0fe26f4376669c6f28a2ecc8d1300b7f0543215
-EBUILD xz-utils-9999.ebuild 2758 BLAKE2B 577f2c05c90dbd5361114e1032556978b4fb028a97358ff07d6a19ca8e204505ae7b3a45790b53394db0db2b908bef453ccf511c5fdb5afa50320b1c7890eb0c SHA512 e52511314356824d8706c885b69ae6b2bbcd5799712d916b39718f1ca12cf7d66c6f4dc0c6512e02b130a6fcaf17d62864b5b0c606fdd501915e9cb05a73b06a
+EBUILD xz-utils-5.2.5-r1.ebuild 2736 BLAKE2B caf809358d5cca6b53534d2a3e12c74ea592ba2d4c27c3464fed1e37e76730a6c070ff12ebd0a89d5083bb75f6556574fff577809365fe0ce7fa97c304def8aa SHA512 bc662f0c55445f9cbc2fb49047d0c65cc8564cdc90cc6fdf1fb348865982b4050fe90a508fada72ff4cdefcca877d243b01efa5f8c3ba73a6100346af2f3e5c3
+EBUILD xz-utils-9999.ebuild 2744 BLAKE2B 6d7541d509b95264c5e29cd18eeaa755be7e3cb190bcb9907c18b6a2c8df6a27c3d8548a1b8aded4d723d2b71cc4b8822bbe644174d27ce57072185e25ead892 SHA512 7293c540ba6114237b58e5788cae3499645a655d1c4e96821b932e477147ae8a645dbb39cc7762113d10d5229496e3e59f12970260931eeff6bfc58ab062b133
 MISC metadata.xml 538 BLAKE2B 06981ff73e0b5996d9231d91eb18dfc31f03c7120d68eae5eb1bf98a5b99fecea4622ee0e3649fc655db4abc455a46627a0b77c971afb5729f7c8c5e50b0f616 SHA512 1f1cc9d8bb737ec14e06c1cc41f27dfc4140efb2e9c5bcb749ecc4cba11df9ee5513d8874e0f78a8ba8d597e16c532ad25891f31824beab2ec02e3455a95f8c3
diff --git a/app-arch/xz-utils/xz-utils-5.2.5.ebuild b/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild
index fbfae9e95d0e..d628150b10fa 100644
--- a/app-arch/xz-utils/xz-utils-5.2.5.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild
@@ -27,7 +27,7 @@ HOMEPAGE="https://tukaani.org/xz/"
 # See top-level COPYING file as it outlines the various pieces and their licenses.
 LICENSE="public-domain LGPL-2.1+ GPL-2+"
 SLOT="0"
-IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
+IUSE="elibc_FreeBSD +extra-filters nls static-libs"
 
 RDEPEND="!<app-arch/lzma-4.63
 	!<app-arch/p7zip-4.57
@@ -49,8 +49,8 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myconf=(
+		--enable-threads
 		$(use_enable nls)
-		$(use_enable threads)
 		$(use_enable static-libs static)
 	)
 	multilib_is_native_abi ||
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index f4e55c873afd..ae5ec60bf348 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -27,7 +27,7 @@ HOMEPAGE="https://tukaani.org/xz/"
 # See top-level COPYING file as it outlines the various pieces and their licenses.
 LICENSE="public-domain LGPL-2.1+ GPL-2+"
 SLOT="0"
-IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
+IUSE="elibc_FreeBSD +extra-filters nls static-libs"
 
 RDEPEND="!<app-arch/lzma-4.63
 	!<app-arch/p7zip-4.57
@@ -49,8 +49,8 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myconf=(
+		--enable-threads
 		$(use_enable nls)
-		$(use_enable threads)
 		$(use_enable static-libs static)
 	)
 	multilib_is_native_abi ||