gentoo auto-resync : 01:12:2022 - 20:53:45

13 files changed, 399 insertions, 37 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 33c6cd557a1d..f152c8e1c56a 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 7d2a22810ce0..13c1092920e6 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -8,5 +8,6 @@ AUX bzip2-1.0.8-saneso.patch 463 BLAKE2B 83c5a905dbb3dd6481abe7ad7f57f9ce5c5cac8
 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
 DIST bzip2-1.0.8.tar.gz.sig 310 BLAKE2B 0d702dcb19f7738da9f05ee9d719f5cd3653540365e78db143404e599ea54bc6f9d5e6a38cdf5cdd3c6550243d34266343467c6b1db9d5d3c134f9353b00f395 SHA512 4a4a3fa0ec1c10a704b9870e8e629fd007cca55184423c6bfc3049a702fb41e4aeb73bfe9ca7442c27d32d278f1f34f27523a6be67d35b37896acdded12bf40d
 EBUILD bzip2-1.0.8-r3.ebuild 3343 BLAKE2B b0b9c71705eb40decdb293ac36edfbb9beb03a5d418c9397d575182b1a41b885fc2dffe57fcd2bc41320eb957e87daf4e4b05a534b0b696e1a4cb14bb1862edd SHA512 0d731c721a9c2df13a70ca40a13ce4cffb4f91dfc2787dd5e86fac97b3dc2d1e6bc0e86d58d50905a39b31d08c1890d02478ce61e5f04fbefc895f2113b4f3ff
-EBUILD bzip2-9999.ebuild 1362 BLAKE2B ef5a5447c068dea75b0ffce542583532deee44154ecfa9946ad3a21bb0a4bbd5b09c04d92bffe3da7d77c5f62d2d1200f92436923b443ed8f7e79313f5476db6 SHA512 392f1dee22e823b5973a0fe7c023b48c23769aace842d299a0389ace5ab7809fc67f76fe4e7aa28ba16a404c843a3c54b39ef97043ba89db3586a1e2b0940281
+EBUILD bzip2-1.0.8-r4.ebuild 3482 BLAKE2B eeafc0651562ab21585c100a669e2e9699f3d0fa30998caa5dcfc704f33f2181573516044d548e5c20e57b716144836ea64606ca02af06adec505afce3f65e0a SHA512 5bb4b6f4338942a7d61acfaf06829034b0eda35cf57f156f01819dc53dff30ecadc568cc1d7d63952482c4118de7c20a135a10ff699dd77526296900ee79711a
+EBUILD bzip2-9999.ebuild 1369 BLAKE2B a85d94d4703d628af61968efc0a76c1f55d701b8be47dd081f342245994fea1394b044646d3e23bf6758abf24b5d65420bf74d3049827bee646d663cb6ec643d SHA512 96b75235e2e79071c2874f8028caf6d0017df56fc469f767ae12515f6d76411d646d284cc3260e8dea0f6d7a2ba9a48de8bc0a38af9068265dac651af0aecaf7
 MISC metadata.xml 384 BLAKE2B e74083bed23efd0279d23ea4f9fc048a9a0c253d48757f74a6c0044f5ca6a6b4cb86908db25d42f304b72a8dbf4c3627371ad6ab69aeab9267e8eb21c2053898 SHA512 c358db6bdaabfa401452ceaa8f85298b75ae00e5f7f189768741b4c74ed123be79405c03c7b94707db29b7d60710c441d089c10fa511262ad5a88cd106fb54f4
diff --git a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
new file mode 100644
index 000000000000..3ac96e3d4ef2
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
+#      (since we're building shared libs) ...
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bzip2.gpg
+inherit toolchain-funcs multilib-minimal usr-ldscript verify-sig
+
+DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
+HOMEPAGE="https://sourceware.org/bzip2/"
+SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
+
+LICENSE="BZIP2"
+SLOT="0/1" # subslot = SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="static static-libs"
+
+BDEPEND="
+	verify-sig? ( sec-keys/openpgp-keys-bzip2 )
+"
+PDEPEND="
+	app-alternatives/bzip2
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.0.8-saneso.patch
+	"${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
+	"${FILESDIR}"/${PN}-1.0.6-progress.patch
+	"${FILESDIR}"/${PN}-1.0.3-no-test.patch
+	"${FILESDIR}"/${PN}-1.0.8-mingw.patch #393573
+	"${FILESDIR}"/${PN}-1.0.8-out-of-tree-build.patch
+)
+
+DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
+HTML_DOCS=( manual.html )
+
+src_prepare() {
+	default
+
+	# - Use right man path
+	# - Generate symlinks instead of hardlinks
+	# - pass custom variables to control libdir
+	sed -i \
+		-e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
+		-e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
+		-e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
+		Makefile || die
+}
+
+bemake() {
+	emake \
+		VPATH="${S}" \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		"$@"
+}
+
+multilib_src_compile() {
+	bemake -f "${S}"/Makefile-libbz2_so all
+	# Make sure we link against the shared lib #504648
+	ln -s libbz2.so.${PV} libbz2.so || die
+	bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')"
+}
+
+multilib_src_test() {
+	cp "${S}"/sample* "${BUILD_DIR}" || die
+	bemake -f "${S}"/Makefile check
+}
+
+multilib_src_install() {
+	into /usr
+
+	# Install the shared lib manually.  We install:
+	#  .x.x.x - standard shared lib behavior
+	#  .x.x   - SONAME some distros use #338321
+	#  .x     - SONAME Gentoo uses
+	dolib.so libbz2.so.${PV}
+	local v
+	for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
+		dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
+	done
+
+	use static-libs && dolib.a libbz2.a
+
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a bz2
+
+		dobin bzip2recover
+		into /
+		newbin bzip2 bzip2-reference
+	fi
+}
+
+multilib_src_install_all() {
+	# `make install` doesn't cope with out-of-tree builds, nor with
+	# installing just non-binaries, so handle things ourselves.
+	insinto /usr/include
+	doins bzlib.h
+	into /usr
+	dobin bz{diff,grep,more}
+	doman bz{diff,grep,more}.1
+	newman bzip2.1 bzip2-reference.1
+
+	dosym bzdiff /usr/bin/bzcmp
+	dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
+
+	dosym bzmore /usr/bin/bzless
+	dosym bzmore.1 /usr/share/man/man1/bzless.1
+
+	dosym bzip2-reference.1 /usr/share/man/man1/bzip2recover.1
+	local x
+	for x in bz{e,f}grep ; do
+		dosym bzgrep /usr/bin/${x}
+		dosym bzgrep.1 /usr/share/man/man1/${x}.1
+	done
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	# ensure to preserve the symlinks before app-alternatives/bzip2
+	# is installed
+	local x
+	for x in bzip2 bunzip2 bzcat; do
+		if [[ ! -h ${EROOT}/bin/${x} ]]; then
+			ln -s bzip2-reference "${EROOT}/bin/${x}" || die
+		fi
+	done
+}
diff --git a/app-arch/bzip2/bzip2-9999.ebuild b/app-arch/bzip2/bzip2-9999.ebuild
index e463fbf759d7..025f6378d542 100644
--- a/app-arch/bzip2/bzip2-9999.ebuild
+++ b/app-arch/bzip2/bzip2-9999.ebuild
@@ -19,9 +19,8 @@ SLOT="0/1" # subslot = SONAME
 
 IUSE="static-libs"
 
-RDEPEND="
-	!app-arch/lbzip2[symlink(-)]
-	!app-arch/pbzip2[symlink(-)]
+PDEPEND="
+	app-alternatives/bzip2
 "
 
 multilib_src_configure() {
@@ -39,16 +38,17 @@ multilib_src_install() {
 
 	if multilib_is_native_abi ; then
 		gen_usr_ldscript -a bz2
-
-		dodir /bin
-		mv "${ED}"/usr/bin/bzip2 "${ED}"/bin || die
 	fi
 }
 
 multilib_src_install_all() {
-	# Move "important" bzip2 binaries to /bin and use the shared libbz2.so
-	dosym bzip2 /bin/bzcat
-	dosym bzip2 /bin/bunzip2
+	dodir /bin
+	mv "${ED}"/usr/bin/bzip2 "${ED}"/bin/bzip2-reference || die
+	mv "${ED}"/usr/share/man/man1/bzip2{,-reference}.1 || die
+
+	# moved to app-alternatives/bzip2
+	rm "${ED}"/usr/bin/{bzcat,bunzip2} || die
+	rm "${ED}"/usr/share/man/man1/{bzcat,bunzip2.1} || die
 
 	dosym bzdiff /usr/bin/bzcmp
 	dosym bzmore /usr/bin/bzless
@@ -57,8 +57,7 @@ multilib_src_install_all() {
 		dosym bzgrep /usr/bin/${x}
 	done
 
-	dosym bzip2.1 /usr/share/man/man1/bzip2recover.1
+	dosym bzip2-reference.1 /usr/share/man/man1/bzip2recover.1
 
-	local DOCS=( AUTHORS NEWS{,-pre-1.0.7} README.md )
 	einstalldocs
 }
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 7b55403ade6a..28f7e257f9d6 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -2,4 +2,5 @@ AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611
 DIST gzip-1.12.tar.xz 825548 BLAKE2B 7e2d482c08555f5fb0ff5408c0afe48c61034e9779eed6e3dd8046c847234c0a8a6bc34d49a934a54db0d73033e12c71a228d373551384a4cd663315071637e0 SHA512 116326fe991828227de150336a0c016f4fe932dfbb728a16b4a84965256d9929574a4f5cfaf3cf6bb4154972ef0d110f26ab472c93e62ec9a5fd7a5d65abea24
 DIST gzip-1.12.tar.xz.sig 833 BLAKE2B ab7b4a759ef163d67f20773607ba0408ea9f1f7c7c224f43635fc3752acc521b74dbea4ec9ebb58a2f4fa13ecae19e00779b4b56c2cb95976301445beff817aa SHA512 1f4702797f7c5f1873c2f9c2f6210ba23824455d17ee82f50f0bf24240ed5bdf0090cf85338ccf76ba82422f8b4ad3a329d8bbf1350cb094d7bd61aa45550397
 EBUILD gzip-1.12-r2.ebuild 1715 BLAKE2B fa1cb140c6ff9bc61559a1b03124c57a484c7664012bee6d447717205c08468cdc7136e8f3de47144d54a8bf25ddf44915224ca48842a73dbcf780a1ac452d11 SHA512 3c9d7e44a6362dde64f1f44b833df22080b45119f4a4bd9f20fcba93a1e73e73d7f112ed3669c48ca6ff9da61f2751852c94dd399b1206a2e533a0777737a3b4
+EBUILD gzip-1.12-r3.ebuild 2224 BLAKE2B 4a2f02106bebee8fffc7fe38bff2edb392dba4fbf9bf5ee0c1efb1927d2fe7ed29c50bf36a70352f2ec9679fa9dbfb8f27ebb6c234b6d088de0f19a051b5fb3b SHA512 278bdea914349ae139b6982011333a1c2be5c1467475a20bf35508217ab72c12424ce5e4a27d0eea18c146afc9bc78978f2fcb558a77d2527da8a4ea79bb827e
 MISC metadata.xml 422 BLAKE2B b3ba7db4fdf23c9b1b801f21a3230898f260b131344538ff8644bc842dcd5f6bef5e4e2f8d475267d6d39047a87c00e1138e69d49892d21d58249346bde1e57c SHA512 6241ec1357f2f326c745589a18622987e9444e515157a53cb1188a21cd90e14e392db1e31b24f833ba05647ddfcfd6a89e13f6125ca15451bceb1a14e80fbc23
diff --git a/app-arch/gzip/gzip-1.12-r3.ebuild b/app-arch/gzip/gzip-1.12-r3.ebuild
new file mode 100644
index 000000000000..98f464a9e840
--- /dev/null
+++ b/app-arch/gzip/gzip-1.12-r3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gzip.asc
+inherit flag-o-matic verify-sig
+
+DESCRIPTION="Standard GNU compressor"
+HOMEPAGE="https://www.gnu.org/software/gzip/"
+SRC_URI="mirror://gnu/gzip/${P}.tar.xz
+	https://alpha.gnu.org/gnu/gzip/${P}.tar.xz"
+SRC_URI+=" verify-sig? (
+		mirror://gnu/gzip/${P}.tar.xz.sig
+		https://alpha.gnu.org/gnu/gzip/${P}.tar.xz.sig
+	)"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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="pic static"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gzip )"
+RDEPEND="!app-arch/pigz[symlink(-)]"
+PDEPEND="
+	app-alternatives/gzip
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.8-install-symlinks.patch"
+)
+
+src_configure() {
+	use static && append-flags -static
+
+	# Avoid text relocation in gzip
+	use pic && export DEFS="NO_ASM"
+
+	# bug #663928
+	econf --disable-gcc-warnings
+}
+
+src_install() {
+	default
+
+	docinto txt
+	dodoc algorithm.doc gzip.doc
+
+	# Avoid conflict with app-arch/ncompress
+	rm "${ED}"/usr/bin/uncompress || die
+
+	# keep most things in /usr, just the fun stuff in /
+	# also rename them to avoid conflict with app-alternatives/gzip
+	dodir /bin
+	local x
+	for x in gunzip gzip zcat; do
+		mv "${ED}/usr/bin/${x}" "${ED}/bin/${x}-reference" || die
+	done
+	sed -i -e 's:exec gzip:&-reference:' \
+		"${ED}"/bin/{gunzip,zcat}-reference || die
+	mv "${ED}"/usr/share/man/man1/gzip{,-reference}.1 || die
+	rm "${ED}"/usr/share/man/man1/{gunzip,zcat}.1 || die
+}
+
+pkg_postinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		local ver
+		for ver in ${REPLACING_VERSIONS}; do
+			if ver_test "${ver}" -lt "1.12-r2"; then
+				ewarn "This package no longer installs 'uncompress'."
+				ewarn "Please use 'gzip -d' to decompress .Z files."
+			fi
+		done
+	fi
+
+	# ensure to preserve the symlinks before app-alternatives/gzip
+	# is installed
+	local x
+	for x in gunzip gzip zcat; do
+		if [[ ! -h ${EROOT}/bin/${x} ]]; then
+			ln -s "${x}-reference" "${EROOT}/bin/${x}" || die
+		fi
+	done
+}
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index e11baec1b45e..be329f0e6920 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -2,10 +2,13 @@ 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.2.9.tar.gz 2122988 BLAKE2B 20e8552302ef73469edaf7dbdc8ca1df8df9ddd5e4b7399509f3f9204f7d19559db7b9a5da2185cb1b379b4d22a4773b68b81a0a2acc71230cf056a9b017ef92 SHA512 4e13c76d7d24deeb5def85f74f08f6ee7fea1873f61bfaa6b2e8771f5a1eb42587c9fca45b3a9cbbffe0d9550f6a7be4971fcb9096f03998f642daf14d33b0ec
+DIST xz-5.2.9.tar.gz.sig 566 BLAKE2B 0f5807e2c963aaba2a65495cbe49c80047f022c0ac0f2d1b001e1c4d434605499148e01855e586595d4b0db99cd9c81f72bef8dadf5c9a61ba4f6f5d7da85d9d SHA512 871f71cf4e3ed77249fb8279301a77bd2ca174647cc4d0fe034bda349d5c52438f1aafe04294a1c260ad93d9ecda16ee8aece1655de79a898536b2a6e2a65ba8
 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 2847 BLAKE2B f7e07afe31018ac1aaa06ce82467d8fb119abb0185a6415fb6d63586f9c924d85b21279cb845b8b8da3db8a6927c7cc27b6f056b1b7669a9b6661f8a824fe258 SHA512 79c90863cae998c4393da6bb1d877b15248ad81ecdbdde77ab0bdde1222933abf725c7c5b42142e0698bf293cedf14b66dea251d62fa5cef3815026611e27294
-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
+EBUILD xz-utils-5.2.7.ebuild 2894 BLAKE2B 3516bd558ae5bd8bb752854c96264c70764e47b6bcaf185826edb5c18199e67589c0ab3b8c866f5858a6aff902375a69fcfefc198305555a482730db5cacc256 SHA512 e3a8d3305f17d3a183ebf8c111b3631cbdb4fedca6e19d7a47c09371c66cf329b5d390722709d840134b2343e83b427d79baceffd8d97c6ad05a990d337165e2
+EBUILD xz-utils-5.2.8.ebuild 2894 BLAKE2B 3516bd558ae5bd8bb752854c96264c70764e47b6bcaf185826edb5c18199e67589c0ab3b8c866f5858a6aff902375a69fcfefc198305555a482730db5cacc256 SHA512 e3a8d3305f17d3a183ebf8c111b3631cbdb4fedca6e19d7a47c09371c66cf329b5d390722709d840134b2343e83b427d79baceffd8d97c6ad05a990d337165e2
+EBUILD xz-utils-5.2.9.ebuild 2902 BLAKE2B fc55880ac3c615c40892836a6cba4acc06d49a93b01601e767a16da2adac05c999c0f45ebd9bd1fdaf99e9fe69d3d80ade1517d162b2ef1c0aa2a37610b8b799 SHA512 417a0c5c210bd81bdaad27b7cde0af687e72d83237c33361e5a407d91bb0a2efad950b79b1a00ec0552d052ea675db39159099b286665ec77dace598639b2bd9
+EBUILD xz-utils-5.3.4_alpha.ebuild 2808 BLAKE2B 8eda4404458536807ee3f60f4c3d6147ef95ec5e8fb8ed2db89ef923df1988c1402ebb928ed2190bbf9a4622b632e46707abffb6cfcff4fff16b4e0cfc53afa4 SHA512 d95c98d55fcc06ab7f9de9dbbe6d80f7ffac41596d0820e442784ef11c964f62d8ed6feea81d3af2fd5d917605384f4a8befdeff3dfe0d249d83fad0fb1f2c10
+EBUILD xz-utils-9999.ebuild 2808 BLAKE2B 8eda4404458536807ee3f60f4c3d6147ef95ec5e8fb8ed2db89ef923df1988c1402ebb928ed2190bbf9a4622b632e46707abffb6cfcff4fff16b4e0cfc53afa4 SHA512 d95c98d55fcc06ab7f9de9dbbe6d80f7ffac41596d0820e442784ef11c964f62d8ed6feea81d3af2fd5d917605384f4a8befdeff3dfe0d249d83fad0fb1f2c10
+MISC metadata.xml 605 BLAKE2B 8e98c2e0b5fbf084de29042ebc760572443480fc259719f4f841c8138b976dfd9c7a0157d085a91868275ebcb689064ed91742dc041ef56d7122d9fdcea98329 SHA512 3a3bdc89d0228ff462312bbe9db8666c4936e64aad7f36e71daff9f24e727a3f71b9f045c7dd5a9073ac5f6fa5a21046d0f6283e24d42fee705297f7a795196e
diff --git a/app-arch/xz-utils/metadata.xml b/app-arch/xz-utils/metadata.xml
index 75ad4f69f981..7780c7209f08 100644
--- a/app-arch/xz-utils/metadata.xml
+++ b/app-arch/xz-utils/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<use>
-	<flag name="extra-filters">Build additional filters that are not
-		used in any of the default xz presets. This includes delta
-		and BCJ coders, additional match finders and SHA256 checks.</flag>
-</use>
-<upstream>
-	<remote-id type="cpe">cpe:/a:tukaani:xz</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="extra-filters">Build additional filters that are not
+			used in any of the default xz presets. This includes delta
+			and BCJ coders, additional match finders and SHA256 checks.</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:tukaani:xz</remote-id>
+		<remote-id type="sourceforge">lzmautils</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-arch/xz-utils/xz-utils-5.2.7.ebuild b/app-arch/xz-utils/xz-utils-5.2.7.ebuild
index 651ac2f1d2dc..fb35eaff7363 100644
--- a/app-arch/xz-utils/xz-utils-5.2.7.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.7.ebuild
@@ -19,8 +19,13 @@ else
 	inherit verify-sig
 
 	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://tukaani.org/xz/${MY_P}.tar.gz.sig )"
+	SRC_URI="
+		mirror://sourceforge/lzmautils/${MY_P}.tar.gz
+		https://tukaani.org/xz/${MY_P}.tar.gz
+		verify-sig? (
+			https://tukaani.org/xz/${MY_P}.tar.gz.sig
+		)
+	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
 		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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"
diff --git a/app-arch/xz-utils/xz-utils-5.2.8.ebuild b/app-arch/xz-utils/xz-utils-5.2.8.ebuild
index 651ac2f1d2dc..fb35eaff7363 100644
--- a/app-arch/xz-utils/xz-utils-5.2.8.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.8.ebuild
@@ -19,8 +19,13 @@ else
 	inherit verify-sig
 
 	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://tukaani.org/xz/${MY_P}.tar.gz.sig )"
+	SRC_URI="
+		mirror://sourceforge/lzmautils/${MY_P}.tar.gz
+		https://tukaani.org/xz/${MY_P}.tar.gz
+		verify-sig? (
+			https://tukaani.org/xz/${MY_P}.tar.gz.sig
+		)
+	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
 		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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"
diff --git a/app-arch/xz-utils/xz-utils-5.2.9.ebuild b/app-arch/xz-utils/xz-utils-5.2.9.ebuild
new file mode 100644
index 000000000000..92b43d373c4c
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.2.9.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#           to avoid circular deps with autotools
+
+EAPI=7
+
+inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
+	inherit git-r3 autotools
+
+	# bug #272880 and bug #286068
+	BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
+	inherit verify-sig
+
+	MY_P="${PN/-utils}-${PV/_}"
+	SRC_URI="
+		mirror://sourceforge/lzmautils/${MY_P}.tar.gz
+		https://tukaani.org/xz/${MY_P}.tar.gz
+		verify-sig? (
+			https://tukaani.org/xz/${MY_P}.tar.gz.sig
+		)
+	"
+
+	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"
+	fi
+
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Utils for managing LZMA compressed files"
+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="+extra-filters nls static-libs"
+
+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
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautopoint
+		eautoreconf
+	else
+		# Allow building shared libs on Solaris/x64
+		elibtoolize
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-threads
+		$(use_enable nls)
+		$(use_enable static-libs static)
+	)
+
+	if ! multilib_is_native_abi ; then
+		myconf+=(
+			--disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts}
+		)
+	fi
+
+	if ! use extra-filters ; then
+		myconf+=(
+			# LZMA1 + LZMA2 for standard .lzma & .xz files
+			--enable-encoders=lzma1,lzma2
+			--enable-decoders=lzma1,lzma2
+
+			# those are used by default, depending on preset
+			--enable-match-finders=hc3,hc4,bt4
+
+			# CRC64 is used by default, though some (old?) files use CRC32
+			--enable-checks=crc32,crc64
+		)
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		export gl_cv_posix_shell="${EPREFIX}"/bin/sh
+
+		# Undo Solaris-based defaults pointing to /usr/xpg5/bin
+		myconf+=( --disable-path-for-script )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	gen_usr_ldscript -a lzma
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
diff --git a/app-arch/xz-utils/xz-utils-5.3.4_alpha.ebuild b/app-arch/xz-utils/xz-utils-5.3.4_alpha.ebuild
index 650633ad355b..53811b5967ca 100644
--- a/app-arch/xz-utils/xz-utils-5.3.4_alpha.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.3.4_alpha.ebuild
@@ -19,8 +19,13 @@ else
 	inherit verify-sig
 
 	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://tukaani.org/xz/${MY_P}.tar.gz.sig )"
+	SRC_URI="
+		mirror://sourceforge/lzmautils/${MY_P}.tar.gz
+		https://tukaani.org/xz/${MY_P}.tar.gz
+		verify-sig? (
+			https://tukaani.org/xz/${MY_P}.tar.gz.sig
+		)
+	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
 		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index 650633ad355b..53811b5967ca 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -19,8 +19,13 @@ else
 	inherit verify-sig
 
 	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://tukaani.org/xz/${MY_P}.tar.gz.sig )"
+	SRC_URI="
+		mirror://sourceforge/lzmautils/${MY_P}.tar.gz
+		https://tukaani.org/xz/${MY_P}.tar.gz
+		verify-sig? (
+			https://tukaani.org/xz/${MY_P}.tar.gz.sig
+		)
+	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
 		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"