6 files changed, 61 insertions, 19 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 0916dddb69b7..db2c84e6d325 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/pxz/Manifest b/app-arch/pxz/Manifest
index 3a9ffc1fad60..1e25e8a84ba6 100644
--- a/app-arch/pxz/Manifest
+++ b/app-arch/pxz/Manifest
@@ -1,4 +1,6 @@
 DIST pxz-5.0_pre20151029.tar.gz 12271 BLAKE2B 6ba2cb7629b0475761b59620375a2d0de7c6a3a61f7af20140e214383f737e046c45f0c602830c0331794fe1d38332d8d309ed0b8451e3a780ef1a2835de85e6 SHA512 d26bfdf9b70baf91c575e21824920cb42d0a9bd171254b99147a6e5e322ed3d1f7351a570358213431bdacdcbe6e7b22646a2dd2d7a127e167c8237bc4f3038a
+DIST pxz-5.0_pre20220509.tar.gz 12375 BLAKE2B 5d954d4cd1b139dc94a9ecc5aa99c19a1484812eb62fce089b8f33bfc0ce3ed3ad8053cdc58843c429a365439cd13b3a4b14ebc34de7f2a99deae7cd995cd4e6 SHA512 b1de877d2b8ee9ea5190af4c1a0dc97f7777c35a084137db6d86e23de99b332ea361a82ed995ac2ea12b7bf0670ae92a822235be3b19a1145b6cf5604074f960
 EBUILD pxz-5.0_pre20151029-r1.ebuild 954 BLAKE2B f830dab90a2ce0a18b3fc7b1af707b0d944505bd11da195b2f6114dc804c7687942647ad285f63484c223ebb89a2ea2e26646c3c7d7c8ed6ef68ea83b66773e5 SHA512 41b4fd0e84164bc59b654cbe090d2166ac38ec885cf0b8f8e07ede110d23520f907ece6bc98a1a9deba6b40d17815f66b2837210392b3a7c56c1734f3893d7a6
+EBUILD pxz-5.0_pre20220509.ebuild 983 BLAKE2B 6fe668306af9fd67e552b19f4d822342802095f949213a337d19d1a8060036afb16218a75439c05d52862ee18e9181e2ec4fb9f902dc0e40b71de5d2390628a1 SHA512 89b141c3648962243be2ae3a0d22b7eedc165d388d946f0a8866de50b13002c86e394e9b97539caa1bc38b822689233fd590cb3dfa3d951954319247d038753c
 EBUILD pxz-9999.ebuild 1121 BLAKE2B bcfbf07cee491d39415249a3bbc71a2f6b6916bdfd770f35e6f6b97ae5615f11972590322873a51d94990b7d7c4f7a3f1f2f20b0a77b92989189fc5a481e9800 SHA512 c56047b53c3ff5dfc60ed6145e7094feaedb9ec2b33922a034b3282216c9d9cb80b4ae4b5339a88324c87e76143f2dfbab7d8497bc3eb26f030d9e473bc74b7c
-MISC metadata.xml 590 BLAKE2B dc0e461eddfdb09a6837da49b6221437f09c7ca7bb13b57486c62466c8547a4a73c8ec6c3e28be149840318adf36aa893501326ed9fa6fa1b08dba95ef544a51 SHA512 2535178a8e8a4bc14d70366fef8295eca4fcdbdf6451b7a9c8806f114607edaea4bb60ce1c473fa9b9d9b78fb141a91c90923d32e6cf88da6157f7d8653eaebe
+MISC metadata.xml 677 BLAKE2B 970357f7a9fbc5bbfefe6d2a8d8c72a27d3d62f37987a578811f056df9452efb7417c8a3cdd446f54ea0ffd1f12c4217a6ea8c8df9e699e88975c2e2b1afa183 SHA512 35091887bb484b965b915e280a4233f20fca36b19e893a1cc8eeae983f92a7afaf6ad67df87cf337083611e7805db6f80dcf184cab79ce4f0c2d877f28b01d6d
diff --git a/app-arch/pxz/metadata.xml b/app-arch/pxz/metadata.xml
index 8aaea027cbbd..c9d7bc294a84 100644
--- a/app-arch/pxz/metadata.xml
+++ b/app-arch/pxz/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>chutzpah@gentoo.org</email>
-<name>Patrick McLean</name>
-</maintainer>
-<longdescription lang="en">
-Parallel XZ is a compression utility that takes advantage of running LZMA
-compression of different parts of an input file on multiple cores and
-processors simultaneously. Its primary goal is to utilize all resources
-to speed up compression time with minimal possible influence on compression
-ratio.
-</longdescription>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<longdescription lang="en">
+	Parallel XZ is a compression utility that takes advantage of running LZMA
+	compression of different parts of an input file on multiple cores and
+	processors simultaneously. Its primary goal is to utilize all resources
+	to speed up compression time with minimal possible influence on compression
+	ratio.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">jnovy/pxz</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-arch/pxz/pxz-5.0_pre20220509.ebuild b/app-arch/pxz/pxz-5.0_pre20220509.ebuild
new file mode 100644
index 000000000000..72381a102246
--- /dev/null
+++ b/app-arch/pxz/pxz-5.0_pre20220509.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs vcs-snapshot
+
+PXZ_COMMIT="136e5c25daf545753329d7cee1b06ae482fb9c44"
+DESCRIPTION="Parallel implementation of the XZ compression utility"
+HOMEPAGE="http://jnovy.fedorapeople.org/pxz/"
+SRC_URI="https://github.com/jnovy/pxz/archive/${PXZ_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux"
+
+# needs the library from xz-utils
+RDEPEND="app-arch/xz-utils"
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	if use elibc_musl ; then
+		sed -i -e '/<error.h>/c\#define error(R,E,S,...) fprintf(stderr, S "\\n", ##__VA_ARGS__); exit(R)' pxz.c || die
+	fi
+}
+
+src_configure() {
+	tc-export CC
+	export BINDIR="${EPREFIX}"/usr/bin
+	export MANDIR="${EPREFIX}"/usr/share/man
+}
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 16b09b399b50..c4269d13f777 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -2,10 +2,10 @@ DIST xz-5.2.7.tar.gz 2105803 BLAKE2B 5363c5d0403e041c6d2e35b5d3321feeb8e63b85564
 DIST xz-5.2.7.tar.gz.sig 566 BLAKE2B 00702dff24d655ebf30f2bf8bee94406e002164408b9eabb4f461a789482584c2b9c90675b8d1d5e030913e674946aa7392b73fcedf6ac62e3b1e3bc05bf92e6 SHA512 556e05107437fae2c75cc1a93465fce04426707e979403f41c6ee5b748fe7c3f985812a4e3b07785a84f68ef9d9f362ded470af1cceb9f4e8c80620a2699163f
 DIST xz-5.2.8.tar.gz 2118089 BLAKE2B 28d4ede071ebd04fe6ce6b9ba88245aca432c7b3077a4857a14310001cbd1230026888d1813b5c163b86de3ec78c92418d9cb35f867f1a8ea65e5de593091676 SHA512 aaba9e4dfabc1ccb66b92f5930ca07219089c7c02396be80bd727073f90c824d2698f7aaaf156b881fdc6750da993e8a6289929d71225df8327bc3beed5cdee1
 DIST xz-5.2.8.tar.gz.sig 566 BLAKE2B c3f20d6fabd42839c0265b9c5a308b43392705f4923f83e9aba808d5d2b03814b1af566c1ff078dc0a69143420a47e5ee0a0f8dcc6773595d1ee2a8e3922a88a SHA512 253c0877357cd7305f4c852cc2b946b196a4007b48b58824446729f8f2390f6465d6d2bb9087d1147a40a707940142a5eb7ada91f0323b95482b92eff05904f2
-DIST xz-5.3.3alpha.tar.gz 2119150 BLAKE2B 031e1a1556cbbd49565c2b72676e46a22c00e0e25bca2938c21d56f2d7f585c294d2a3a5712a3ae5d62fe8fef6e7b2f411fcc3c0ccac4714786209599b599d25 SHA512 c780c6854cb7599ed97629dbf923f5c6802b48e12aa25638c863e2403e56557abffb2b501823d4d53c852b7d09360b9ede355989756fef1daa1fa8cd9395da8d
-DIST xz-5.3.3alpha.tar.gz.sig 566 BLAKE2B 2a02fd8a84c27967384021aa879efdf598b40ca9ff552080be2d057f402b3aace13bb0d98574e0185edd6ee3084793767f9941d4c1f21f5c5d55f886025cb845 SHA512 e6a849f2dd6f67ad3d51f50fe5f3e7f2a57e97e9d89499e2f88b94ab9716f1db5de34c3bb6f17b6fd55498ee5f4653d3d25e1a495b9c682b3200b2603a85479f
+DIST xz-5.3.4alpha.tar.gz 2216390 BLAKE2B 0ed5828645b665bd5b18187ac051419258cf3790ffc1868ddd0989bf722c844c7acc3acfd75fa49ba2a4a03da6d105e09e35287ff518a57af5e18b61046ff901 SHA512 5b81d16d2a4547a638421147ec1018fb2a1f413c6ad73e82def47a371c8a3959a382c58296789a9c5ea1efe6e763bbe559c10d10d1d2cc2ebbc06298b8136cf7
+DIST xz-5.3.4alpha.tar.gz.sig 566 BLAKE2B ddb49538c1a2e1eee2166b07cdd828dd58934d39f08a9631d2370d61c6ad34ae1be32038f0e9fd8f39e68fc291c07657b04e80b50ade86c3feb589e623662081 SHA512 b44ccb8ccac7082410156b04f8dafb07a619b4f246ea3cbd1a51564330d3cf497f4caf5afe730102cb382d6bad0cdd859ab032e048e8f0ee395940400b5c85ce
 EBUILD xz-utils-5.2.7.ebuild 2847 BLAKE2B f7e07afe31018ac1aaa06ce82467d8fb119abb0185a6415fb6d63586f9c924d85b21279cb845b8b8da3db8a6927c7cc27b6f056b1b7669a9b6661f8a824fe258 SHA512 79c90863cae998c4393da6bb1d877b15248ad81ecdbdde77ab0bdde1222933abf725c7c5b42142e0698bf293cedf14b66dea251d62fa5cef3815026611e27294
 EBUILD xz-utils-5.2.8.ebuild 2855 BLAKE2B 2c19431300aaa009d555ed79110b8d72468514508c665743ccb90704b372a742397b07f6ca0500fc0c2941a0cbb93d8478dcae65adbc0b2ce25edaefd12baacd SHA512 e80b77aea4996a5671b7cf07e74923013a2e8a45fa9848409d6b8eb123cd713d4b40ab98cdf2757fb470f74d00e8067bc557af42568b358caf7d41336645938c
-EBUILD xz-utils-5.3.3_alpha.ebuild 2885 BLAKE2B 00cedd70d450943dd489e6b9e05ce1d7a0f5f4472b501f4587cf482c2294fcd7f86d5811a7325b6812f468738a0144838291033eb83afb79aaaba640b34800d1 SHA512 8172456c5fcfd424a4f2bf7e6993fc67b782dc8a7fc3c4c433610cae31252acb2a022cde8a128d5e20d5842ceee4a3b5eeeff9f8a4e9c0f667505d7397a37398
+EBUILD xz-utils-5.3.4_alpha.ebuild 2761 BLAKE2B 909cd4550713dd2eaae9f242ec5c45e5aedcaa78748569bfcaeac3c867638bfe2f0e8ecc0a7dbd0b1220f7a2860cfe1430545e272c0a97cbf9877ebc5190cc27 SHA512 88b9523cb3c31be766d78198716489fc9b26ac39897b20ded7c775c9c74969028a84241af1ee688149442ab9c333f1ec25f7d134a8182bfd4396c8f17995b3ad
 EBUILD xz-utils-9999.ebuild 2761 BLAKE2B 909cd4550713dd2eaae9f242ec5c45e5aedcaa78748569bfcaeac3c867638bfe2f0e8ecc0a7dbd0b1220f7a2860cfe1430545e272c0a97cbf9877ebc5190cc27 SHA512 88b9523cb3c31be766d78198716489fc9b26ac39897b20ded7c775c9c74969028a84241af1ee688149442ab9c333f1ec25f7d134a8182bfd4396c8f17995b3ad
 MISC metadata.xml 539 BLAKE2B 57809a0b57c640a42eca00c3cfbec8a549647b82afc6229b904c769b94b3ee109610d412af69cefe6b86c7cce9a7c363cf376bb87c19b5cee96b45bdd980cddc SHA512 5b86a0f7c76d5b33f32e5db91dafe675dc01399659c5304fafd77adf83b403c936019afadeed1f075834bbb31169d60c87c9d9e69783e7c7a720890f512172a7
diff --git a/app-arch/xz-utils/xz-utils-5.3.3_alpha.ebuild b/app-arch/xz-utils/xz-utils-5.3.4_alpha.ebuild
index 3072f038b6e4..650633ad355b 100644
--- a/app-arch/xz-utils/xz-utils-5.3.3_alpha.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.3.4_alpha.ebuild
@@ -6,7 +6,6 @@
 
 EAPI=7
 
-QA_PKGCONFIG_VERSION=${PV/_/}
 inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
 
 if [[ ${PV} == 9999 ]] ; then
@@ -42,9 +41,6 @@ if [[ ${PV} != 9999 ]] ; then
 	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
 fi
 
-# Tests currently do not account for smaller feature set
-RESTRICT="!extra-filters? ( test )"
-
 src_prepare() {
 	default