17 files changed, 258 insertions, 11 deletions
diff --git a/app-arch/7zip/7zip-24.07.ebuild b/app-arch/7zip/7zip-24.07.ebuild
new file mode 100644
index 000000000000..59e13dc0c5e5
--- /dev/null
+++ b/app-arch/7zip/7zip-24.07.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edos2unix flag-o-matic toolchain-funcs
+
+NO_DOT_PV=$(ver_rs 1- '')
+DESCRIPTION="Free file archiver for extremely high compression"
+HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/"
+# linux-x64 tarball is only used for docs
+SRC_URI="
+	https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz
+	https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz
+"
+S="${WORKDIR}"
+
+LICENSE="LGPL-2 BSD rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="uasm jwasm rar"
+REQUIRED_USE="?? ( uasm jwasm )"
+
+DOCS=( readme.txt History.txt License.txt )
+HTML_DOCS=( MANUAL )
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	uasm? ( dev-lang/uasm )
+	jwasm? ( dev-lang/jwasm )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-24.05-respect-build-env.patch"
+)
+
+# TODO(NRK): also build and install the library
+# TODO(NRK): make it so this package can be used as a drop-in replacement
+# for app-arch/p7zip ??
+
+pkg_setup() {
+	# instructions in DOC/readme.txt, Compiling 7-Zip for Unix/Linux
+	# TLDR; every combination of options (clang|gcc)+(asm/noasm)
+	# has a dedicated makefile & builddir
+	mfile="cmpl"
+	if tc-is-clang; then
+		mfile="${mfile}_clang"
+		bdir=c
+	elif tc-is-gcc; then
+		mfile="${mfile}_gcc"
+		bdir=g
+	else
+		die "Unsupported compiler: $(tc-getCC)"
+	fi
+	if use jwasm || use uasm ; then
+		mfile="${mfile}_x64"
+		bdir="${bdir}_x64"
+	fi
+	export mfile="${mfile}.mak"
+	export bdir
+}
+
+src_prepare() {
+	# patch doesn't deal with CRLF even if file+patch match
+	# not even with --ignore-whitespace, --binary or --force
+	pushd "./CPP/7zip" || die "Unable to switch directory"
+	edos2unix ./7zip_gcc.mak ./var_gcc{,_x64}.mak ./var_clang{,_x64}.mak
+	sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror"
+	popd >/dev/null || die "Unable to switch directory"
+
+	default
+}
+
+src_compile() {
+	pushd "./CPP/7zip/Bundles/Alone2" || die "Unable to switch directory"
+
+	# avoid executable stack when using uasm/jwasm, harmless otherwise
+	append-ldflags -Wl,-z,noexecstack
+	export G_CFLAGS=${CFLAGS}
+	export G_CXXFLAGS=${CXXFLAGS}
+	export G_LDFLAGS=${LDFLAGS}
+
+	local args=(
+		-f "../../${mfile}"
+		CC=$(tc-getCC)
+		CXX=$(tc-getCXX)
+	)
+	# NOTE: makefile doesn't check the value of DISABLE_RAR_COMPRESS, only
+	# whether it's defined or not. so in case user has `rar` enabled
+	# DISABLE_RAR_COMPRESS (and DISABLE_RAR) needs to stay undefined.
+	if ! use rar; then
+		# disables non-free rar code but allows listing and extracting
+		# non-compressed rar archives
+		args+=( DISABLE_RAR_COMPRESS=1 )
+	fi
+	if use jwasm; then
+		args+=( USE_JWASM=1 )
+	elif use uasm; then
+		args+=( MY_ASM=uasm )
+	fi
+
+	mkdir -p "${bdir}" || die  # Bug: https://bugs.gentoo.org/933619
+	emake ${args[@]}
+	popd > /dev/null || die "Unable to switch directory"
+}
+
+src_install() {
+	dobin "./CPP/7zip/Bundles/Alone2/b/${bdir}/7zz"
+	einstalldocs
+}
diff --git a/app-arch/7zip/Manifest b/app-arch/7zip/Manifest
index 2e6ccfd95cfd..c9da034c5db3 100644
--- a/app-arch/7zip/Manifest
+++ b/app-arch/7zip/Manifest
@@ -6,7 +6,10 @@ DIST 7z2405-linux-x64.tar.xz 1553872 BLAKE2B d6c0bd4eb81f4112bfe50bf6affc68021b0
 DIST 7z2405-src.tar.xz 1486772 BLAKE2B 609c7ae8b89e56e747ebfecb25108d8918138f48f0f2ed73183c76101ddd3615aafb9eb7823be0de2a434b450587e01f476d2ed092628a311b6e4ed091e06260 SHA512 d340adfa68e818dd3d3aa411780c81532fa37b6649178b81ec3739725f83e0bc3c01744612b2d467f4d0c2cc984dd35488406d7baee185cf372acebd9c0123a7
 DIST 7z2406-linux-x64.tar.xz 1551724 BLAKE2B e4cc8141b074209b58018e6aeb4b91f140160d5d52e1fba59da2d0cfcd41c488cbfa4bda99bdedd4915ca3c3bcca50e7f7f4289f44ce120577c8b632d2f7bf07 SHA512 fce2b8e9f26f092209613dc058a267ddf24c474a80b7e9837014fdaeab53bb892b7181561ca90048ca593fe29e010b8221e078c9c3ab9815baf23bc9caf3e829
 DIST 7z2406-src.tar.xz 1487008 BLAKE2B 0f8dd19a031520a9c233725e376bca06c91b9b513bc802a54b92ea046ae3dda69a293561938a1e4467d01333d46427bfee7a055c8b62cab7a9d04cf8262fe4eb SHA512 02c6d7d045ba0dc0e8533f471f3c138f0d6549b59594095cb81a2f0e602627bd6a49df3fd680e21400a908006121ff7ba370086db9bde639f79b821bb4c9707a
+DIST 7z2407-linux-x64.tar.xz 1554932 BLAKE2B 9229fdac09148c50032656743aba0f8ce1ec06b7fd2dad2c693dc299c5f83fc093ba047e9c3c3971bf4cc9387b0db52c84167202ed7fcecfcc6f5bc508d04ada SHA512 31b5bb832e73f3c2fd0437873fe6130b8d1bd1bea8320d1b27d06bf40dd737758732eb3664fab2c36417b96ffc5daca6607b6f1aefdaa9e697122da60e37a728
+DIST 7z2407-src.tar.xz 1488556 BLAKE2B 42b4f9553aaa4797e80a2d50073ff0e77b5261e50766f8c596a632fb013ac1514a2963f27b924485f07728d13a4536c69911867e3728e8f8604ec25fc4c6824e SHA512 0299e5c1e1dfd33ecf22077f812da1f25bf2146a713c7a7e2498d639520f21f029e853914e66a84d1edfc5d721e1f3d914a3171ab336a406a94bc82d5b2d8e5d
 EBUILD 7zip-23.01.ebuild 2960 BLAKE2B 9abf731f224a0cf143bcb0d11c21ccbb66a1e1f5456872c48f9ed14ed7ef1fbc46588fdcdb5d9fb10bb5f74f7322de6724f73f58db9fdbdc2c0d13b7fe0bb403 SHA512 ed752a84f6db6670a4136c35f1e932b9f141bcd169c7c608a719fe4bf6a931afad98ea620cfd72aade5fb99f853885e72febaabc1dd1e43d48284cc1bfab45a3
 EBUILD 7zip-24.05.ebuild 2960 BLAKE2B 9abf731f224a0cf143bcb0d11c21ccbb66a1e1f5456872c48f9ed14ed7ef1fbc46588fdcdb5d9fb10bb5f74f7322de6724f73f58db9fdbdc2c0d13b7fe0bb403 SHA512 ed752a84f6db6670a4136c35f1e932b9f141bcd169c7c608a719fe4bf6a931afad98ea620cfd72aade5fb99f853885e72febaabc1dd1e43d48284cc1bfab45a3
 EBUILD 7zip-24.06.ebuild 2967 BLAKE2B f94c9ea2760fe533c5d2e5435f82297220d9257c09880e44ba94b1160c7de4bece261e278d9c53b8669d096cd9b0adb916d6b0dc368131d02266c97bc71415d6 SHA512 4738a2b71e36968d9c0f39d685d2da168781f0e5b38ca35c0db37bc5bd9465597a47b818f777520189fad5546d53137b667ebc18d030b2eb7d75e7bfb361ea56
+EBUILD 7zip-24.07.ebuild 2967 BLAKE2B f94c9ea2760fe533c5d2e5435f82297220d9257c09880e44ba94b1160c7de4bece261e278d9c53b8669d096cd9b0adb916d6b0dc368131d02266c97bc71415d6 SHA512 4738a2b71e36968d9c0f39d685d2da168781f0e5b38ca35c0db37bc5bd9465597a47b818f777520189fad5546d53137b667ebc18d030b2eb7d75e7bfb361ea56
 MISC metadata.xml 967 BLAKE2B 5b54d1cc757cdc63407a51587389f9db032ae141fd9e19423185fd457f50c469ceb53095b128d8c6cd751cf3f0a87703dd36ba5d048dbfe9bea0ccd2354168b2 SHA512 c8c53c995f4bb5982461fa16dd50193f48c59aa15076bd78e38ccc4f0abf2190bf2b143df50e1c7911bd7814bd2ecb34892ee818b328764a9ff4ab2429718d37
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 5db04b200dbe..227aec7e5b81 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/createrepo_c/Manifest b/app-arch/createrepo_c/Manifest
index 6ce225e7d2be..e22bd53df1f7 100644
--- a/app-arch/createrepo_c/Manifest
+++ b/app-arch/createrepo_c/Manifest
@@ -1,6 +1,6 @@
-DIST createrepo_c-1.1.0.tar.gz 637506 BLAKE2B 9e8ccc9da83f071b2426f3be08a363281f30356d5811648eeaa322d2761d2152310af6ca87a744e9024ac54e46368496d0b9b4fb2b6702e99ab965bafa0203cc SHA512 9e09a2a1dcc0b285975037b70b961f66f08f43b84b384c87b607aaa76462956e2dee305fd2ac620956e4bf365aa3fcf3874e1145054c96c0e41656957835d97e
 DIST createrepo_c-1.1.2.tar.gz 638204 BLAKE2B d0fcd916709a4afaf9842ed2f7aed7dd0f179b787fa47f47273dcdeb1119ce4c6f110278bb9da5ec40ae6573c08621a55b884b02abf2bcd9955c1430dfb55743 SHA512 ffb811f28534e6bc1551602f8ba94d0e524e2ad2304dd608210588dbff7c60502660e3367e52927eba5ee03a8dd3f5eeea7f8450fc8c4e8aecced9bb349656fe
-EBUILD createrepo_c-1.1.0.ebuild 1472 BLAKE2B ab5c3eb56f3da03da28837c10d053d2c5ed3454b501753234f4f0e5de3ed3de04ea8f7809e137ee517255ca93c40767e4b73956a6278f552dfa869ab68bd755e SHA512 23424e98af056f00479da601042e5a223d9cf52e8d86904f0b6eec868879caf26cfe1b3897dae5d833f80909003366a73973026fc274d0c958bc755ea2d9c7bb
+DIST createrepo_c-1.1.3.tar.gz 638208 BLAKE2B 70ae65a7092dc9d47f6188c6bfdf70c04fc22e7179ede576f4e0050cfaa61acf736ccd70b04a88b46b459f87ff933dc30cf6eef23136673dde46dd52b7778f59 SHA512 5e7cb1312fbde6cecc54ee98c18925e28e77823240476b4f5468545a70dd07bec1d6fae65311904b068ff2e0ee824c1744f416064f5beb4af250a490269c7bbd
 EBUILD createrepo_c-1.1.2.ebuild 1472 BLAKE2B ab5c3eb56f3da03da28837c10d053d2c5ed3454b501753234f4f0e5de3ed3de04ea8f7809e137ee517255ca93c40767e4b73956a6278f552dfa869ab68bd755e SHA512 23424e98af056f00479da601042e5a223d9cf52e8d86904f0b6eec868879caf26cfe1b3897dae5d833f80909003366a73973026fc274d0c958bc755ea2d9c7bb
+EBUILD createrepo_c-1.1.3.ebuild 1472 BLAKE2B ab5c3eb56f3da03da28837c10d053d2c5ed3454b501753234f4f0e5de3ed3de04ea8f7809e137ee517255ca93c40767e4b73956a6278f552dfa869ab68bd755e SHA512 23424e98af056f00479da601042e5a223d9cf52e8d86904f0b6eec868879caf26cfe1b3897dae5d833f80909003366a73973026fc274d0c958bc755ea2d9c7bb
 EBUILD createrepo_c-9999.ebuild 1472 BLAKE2B ab5c3eb56f3da03da28837c10d053d2c5ed3454b501753234f4f0e5de3ed3de04ea8f7809e137ee517255ca93c40767e4b73956a6278f552dfa869ab68bd755e SHA512 23424e98af056f00479da601042e5a223d9cf52e8d86904f0b6eec868879caf26cfe1b3897dae5d833f80909003366a73973026fc274d0c958bc755ea2d9c7bb
 MISC metadata.xml 806 BLAKE2B cdbea36c4c79334604895efc7caebfadf3c0122a43a603439a926ae7b4101780514732272dd4790cae8d108f4b6ef4b9a48f89be3798c99b8eb8d47a35d1f697 SHA512 0564f15d1075a58648d9c4001e7dc3109672e929f608235390f2a9c56c1feff5560ba4432917eaf90673320be27aad4dcbd3e97b2eec697f206f30ea9f7ac5fc
diff --git a/app-arch/createrepo_c/createrepo_c-1.1.0.ebuild b/app-arch/createrepo_c/createrepo_c-1.1.3.ebuild
index afc050773235..afc050773235 100644
--- a/app-arch/createrepo_c/createrepo_c-1.1.0.ebuild
+++ b/app-arch/createrepo_c/createrepo_c-1.1.3.ebuild
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 17b74bdfaa7e..f8b79d8659b2 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -1,5 +1,5 @@
 AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611823dfe81ab72f9e1a2bd3547b8fbbae07d2108ac255a1a9dae604f9acb77744bda3a9eec2a575580558a4ca7042164c563 SHA512 4a20d61d48c456c4f5cca31b38e6f26460f781782c66ff4cd1b193eb1a48dd9fa88967989b2698b5e45a61d64c9ce3b87fba0f6b67bf507c5bb386a847f477fd
 DIST gzip-1.13.tar.xz 838248 BLAKE2B f0e3b4c28bafcd3b59b65ac2d71218dc58d81b52c6921c1be038757c99e99184178c5d0e9674caa5099713b8b64e8c85cf061f4abfa20b73b478288f121fb05d SHA512 e3d4d4aa4b2e53fdad980620307257c91dfbbc40bcec9baa8d4e85e8327f55e2ece552c9baf209df7b66a07103ab92d4954ac53c86c57fbde5e1dd461143f94c
 DIST gzip-1.13.tar.xz.sig 833 BLAKE2B 42e38fa7b3a6b6d21a18308cf662844ed84e1a142a945f3f3142db0a14212c0e642de514abb1307ec12ee7bb9644472cc3aed40582d9c266ab24808acbca0215 SHA512 f95e016f61f4a67cb4cec6cede2510af6bb5567d72bbd3d70210a6d5cf3ee5fea8f0cbf8f7b612fa52f2ecfd9dba050d9cd4494075ce5ac4abac7b74eaa7ccbc
-EBUILD gzip-1.13.ebuild 2426 BLAKE2B 806e241d76575d2d3a66e9483235a958e09b2150cbe256e6bc97194deb7805dafa67766ab499ac11d36a37e28a774f4f5c13f46a8c21882217e295e6122b86c9 SHA512 e2375b1782b20b865ed0c968d8219e220fc3e876ab8c2e9ca32dae34ce3927cbfa9a2a9384d5ea40e4e2790cfdd775e7b767cee433f583054917fe9078f55029
+EBUILD gzip-1.13-r1.ebuild 2600 BLAKE2B 1533cf9ff66870b919e643c0a36d32a174d765e02c9094ee295083c38775df1858d6543e88a518e7aaa472477ebd64a8ec29ae738ad69246d58ec696a26b2fd7 SHA512 117713ed42e780f7baf3ddf15b529b2fc8b2b3714fb979883aa0be48d8e3a14fc83e5f2cec0562148a64edaee26e8fe7c729ab85d66e87d072a53b1b0cefdd7b
 MISC metadata.xml 479 BLAKE2B cdefe625a65bd3c5e40e813650884b2fc6c41e4d3456d3935d16472097d179a41b42c8b8bf1457bdd3aea29ea91eaa8f7534989385e77016c717871e07d38b8e SHA512 e57ec8f6ad9342c61a6eae56cb70893357ba7feb7ea79d6941ffcda5abaadac05dd2e7469743d3a24ef7dcc7cdb7d6ee02a7172e6462ccbdf9d674aa0cca845e
diff --git a/app-arch/gzip/gzip-1.13.ebuild b/app-arch/gzip/gzip-1.13-r1.ebuild
index a864a1774f32..aec0278bdd82 100644
--- a/app-arch/gzip/gzip-1.13.ebuild
+++ b/app-arch/gzip/gzip-1.13-r1.ebuild
@@ -51,6 +51,10 @@ src_configure() {
 	# Avoid text relocation in gzip
 	use pic && export DEFS="NO_ASM"
 
+	# embeds the path to grep detected at build time into installed scripts;
+	# use the canonical USE="split-usr" agnostic path. bug #935721
+	export GREP="${EPREFIX}/bin/grep"
+
 	# bug #663928
 	econf --disable-gcc-warnings
 }
diff --git a/app-arch/libdeflate/Manifest b/app-arch/libdeflate/Manifest
index 861af430b296..4c4f1bd01ee5 100644
--- a/app-arch/libdeflate/Manifest
+++ b/app-arch/libdeflate/Manifest
@@ -2,6 +2,6 @@ AUX libdeflate-1.19-make-gzip-tests-conditional.patch 1376 BLAKE2B 9480aed1f1a31
 DIST libdeflate-1.19.tar.gz 187684 BLAKE2B 6d3c58b4095f91f64c25e09a062f1d7e68cd43b4dffc2de6484cd941ede4bffd8a82dd3af08eda6c94ad4120d40809c1d6a1814c28bad5387dfbaad418b93070 SHA512 fe57542a0d28ad61d70bef9b544bb6805f9f30930b16432712b3b1caab041f1f4e64315a4306a0635b96c2632239c5af0e45a3915581d0b89975729fc2e95613
 DIST libdeflate-1.20.tar.gz 194212 BLAKE2B b3633f1068f36bf346e1f435c67259612ad5ed1571e83f1bbc4a58c6a67b3eadca85e0abb2d2d47f180dd2ff01c5891c8b3958a63ddbcc2447106f2e5cb3c0fe SHA512 5ebe6af9ce81872cba508d1f0aa087ddeb0e0f0c8e6360da66b8a9db2a76203dafbf3d3f6b3b791618ea9c6d0231fab5b4a55badb31a4480fb4174b9445c658b
 EBUILD libdeflate-1.19.ebuild 1334 BLAKE2B 3777957c8ac7c30df7cf3b838bbe15dd47e7df202945aa7b6848a57d7ce8f56c2fd03e76ac1cf05ebfd6be4b7ab9b5a1599483f92925b5a8605a7ff5adfaa3a0 SHA512 d9e5cd50722a7c5cb7bba2d11feb34f2a034dcc9d2d23a53a423368139f091de017ab882a924977652fcb1d550f4d584e50634a409927fdecb2bc6e52c094c11
-EBUILD libdeflate-1.20.ebuild 1337 BLAKE2B dffc993ff440acecb33de090f66c77ff0d1a29b84de7b0f0cb0b9be23ab5aad3486cad63515a1983441f18b9eefd22222dce26a12bacc4669ca24acc9a20ab9d SHA512 343d9e57987c1f60950d19130316346f1a43221ebf7846ff45377963b82825dc201543a69b73ca26fc7d859889ef21036b5f993c431209d11bc4909e3f13653e
+EBUILD libdeflate-1.20.ebuild 1343 BLAKE2B d7dedcbbdcbf7fc38b433a1d7610cdfd62459b45ca79f18caa91dcb8088bbf3c345915598d9443b0760e8a44c591325e542adff7c9e31fdc9b3654b10d9c78fb SHA512 3530c17cdf8bada65a7c04fd425ec3d323635885e3154abc4bd283147729afc8f759e0e45b9bc1b0814c90ed88a812f25d864f361de1563792108f4028661199
 EBUILD libdeflate-9999.ebuild 1273 BLAKE2B 4a82b568a26c03fa89ea725550df63782cb8dd22eb880a13e8ff0ded781c1d9e15be4185191d9c6116d29b008196bde790c47f1ec9a1dc3b809ff101b40b4928 SHA512 8c8bda36b893b8ddedabca0dbf7e5aaa9a3a39aa6163ccc61dcc9355e9110b514c5ea64df36ea5e94573f57e0977d4f1a8588444a6c3ca540dbf341d9ed7d5f0
 MISC metadata.xml 778 BLAKE2B 91c91f6056ae4d819e47afbf0827a78d03e0d6c9508f7be719f04e1d2b26e62953ee5cf616cfb5f64ecb200a8c308df1bd0f19b020666f3516562311ea028bb6 SHA512 ed0195a5aa10b6ec10852e6b08b2740f513d333a1c458ec051dc30862844f659335c2d7cbe180fee31c24d68660ee4f2fcd182ff7a564f7bc06d48d4e4eb22f5
diff --git a/app-arch/libdeflate/libdeflate-1.20.ebuild b/app-arch/libdeflate/libdeflate-1.20.ebuild
index 19e1b432a064..62ed3cb5e592 100644
--- a/app-arch/libdeflate/libdeflate-1.20.ebuild
+++ b/app-arch/libdeflate/libdeflate-1.20.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/ebiggers/libdeflate.git"
 else
 	SRC_URI="https://github.com/ebiggers/libdeflate/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-arch/lxqt-archiver/Manifest b/app-arch/lxqt-archiver/Manifest
index 662a809ee1a9..0b992848866b 100644
--- a/app-arch/lxqt-archiver/Manifest
+++ b/app-arch/lxqt-archiver/Manifest
@@ -3,5 +3,5 @@ DIST lxqt-archiver-0.9.1.tar.xz 186600 BLAKE2B 365b849578f9f663ed7628c52c4c7205a
 DIST lxqt-archiver-1.0.0.tar.xz 187944 BLAKE2B c28e0c7c5a41fa5a1e2d417239e5de0b33d3a84a2833fab7239f50ae1b7f426c2b7fd630a09cea24f2032183e2bdcc037276462fdab3719fb709fd9f51ea8afd SHA512 12552539cb7601c3c1422ed00d6fa8ed0ebed744ce8b7b4a3e3cc8bd59bf8df165008fa63b0ce173b58309001f35c33a219cd80e7568acf12c4c896320fc5061
 EBUILD lxqt-archiver-0.9.0.ebuild 1288 BLAKE2B 0401a420bcd98e5118c541ba79c514401126b8a94151cf5aa988dcc7f111c7d89b41379e4df5bbfb8c2311f4bf10855db46d5597cf60e4d6f26c61f4e5761685 SHA512 55818ad06afba1827d359edf44211c00cec2e8c4412d1b7f31ecff03e49a9c1ae7545c05f7408fc137d003ab6b665c8a9227d15c034dc444bfe5ab830d3a3c6b
 EBUILD lxqt-archiver-0.9.1.ebuild 1290 BLAKE2B 658005cc38bbc0dafa0ecf29e22743119393452e36365a41f9a113a015e62762dad2fb89a7c284c91f39bb3c6a7d4d57a913e89c625e1214a05c6f79a30c8e97 SHA512 0dab5b31df8a80a5c905d840dc5e1706b34d75bd988f94ee5e9eb7b97cf541da7d875df1f969de36d031f18cb98500702d8b5582bcbda7e6e33096da3eacfd71
-EBUILD lxqt-archiver-1.0.0.ebuild 1203 BLAKE2B 93eb2de7ac2d215b795cc602bbdcfaf4b582143657e98433dd07c6045ff33ce13e5f32f5fc29529e2aa872411bcb0c3708a068c72e021532b31a2411ad125215 SHA512 36b736ebf80efc2043922ff771c1ae3e51acfbcb44dad878e80161666899a20ad8b5c3d3cf2ed0e703f2e42d930865729589821c98a328b9ac211dfc06cc2506
+EBUILD lxqt-archiver-1.0.0.ebuild 1217 BLAKE2B a6c1260ca3d4180006318fcf30bc3219a5d318171d035d80613a69c63eff4554f1d19b47cfa61ec7f5f6677f459f000e46e7382daec837d1d55ea26b71c6ecd7 SHA512 7065139471ffe868c74b9241dc453905650b4b46f0c5fdee513086a5276b855cea99c0820c6ee48d96ca62d6bb08eed13f0550808d2322b08238e0c499e3305a
 MISC metadata.xml 330 BLAKE2B 1f25c787f9b43ef0ef62206ca9ab67dfab8b95b2786fc84248541159507290229b291b9f83541adc196b58a9dcad7c0f3abd18c5c899a98978dc72403386896d SHA512 12f4638550e157da50134bf6c7cb480bd49661b9655900efdbb12a023c4bd4cd13018d7caa672096329691cf8556f89c9d13d6710463048329c8e3bd5f04f6ee
diff --git a/app-arch/lxqt-archiver/lxqt-archiver-1.0.0.ebuild b/app-arch/lxqt-archiver/lxqt-archiver-1.0.0.ebuild
index 6013e54464dd..1601cd9dbd43 100644
--- a/app-arch/lxqt-archiver/lxqt-archiver-1.0.0.ebuild
+++ b/app-arch/lxqt-archiver/lxqt-archiver-1.0.0.ebuild
@@ -15,7 +15,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"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/app-arch/patool/Manifest b/app-arch/patool/Manifest
index 81b49808c92f..7ade547f7aae 100644
--- a/app-arch/patool/Manifest
+++ b/app-arch/patool/Manifest
@@ -1,3 +1,5 @@
 DIST patool-2.2.0.tar.gz 1995287 BLAKE2B ec7a188abfbfc2198e0171568324cb0e372a5629363aaeabfa404767f08062669028d6a9771e80370eb096677f3668da75923f7def7fbb4525f5ce7418cdf68a SHA512 eae774e7da2be13c7644038dc47457105caff7a51a9d3b99e38962dd26c0ace0129f1c0151c27766708ee9754049aec283873fd4a2e8647015a1a07acd48de60
+DIST patool-2.3.0.tar.gz 1996107 BLAKE2B 8fdb13eee3f60f136a93fad538d9f45b94a7aabe243e33fcd37da27d973a74dd8df8ac7f3daae8d0e8d70da4abb30889c9ea5d60f0de2953d539c316b1107b53 SHA512 0d6cad4b449706f2f5c012a40adf0dda3cbb654c4a7444cff31a755bb3bed8a5221fa4467879d97244922cbdc9789a7a0923d020bfb2e46bdd1345a9fb2f14c3
 EBUILD patool-2.2.0.ebuild 2571 BLAKE2B a84d7ceaaa4ba19a51a0538ecd5faf499e5e293f26a4c0859c72bfbc7e6480849b57f65d54874845ef4ec8a43eb01f86438e9f492427202e59ae0603b1061be9 SHA512 12225db3e185ddd2dbb2927e79e2a8970c3612b31b1601f0d70d76f26e3cc3eaa896ee5248b88173183c4e5f27d760e491146f57271260248ddd68323bfd9e53
+EBUILD patool-2.3.0.ebuild 2554 BLAKE2B 841b4b85c155ce6e7b7e7de9026e65c68fc26e1f426323045738185860f73658d2f9a7db55b0bfec373573b9aec957889b5f081f7a5bd2994d1e9333c69a7b65 SHA512 eef6c743f84ace9db290d9e30b1b4303590faf44bfc35209c7812de3103b2169784927cd8a2ff15ef45ba8a3563b360a5c309b6379accbadc22ece3874dd09e9
 MISC metadata.xml 539 BLAKE2B b19f1ad36967b42e152a23108851ad6eabcd7f44fd1faeeb4c345ff812b97d4b4079afc83653c1fd0dd005943a152cba44210132389e1ec956a434d24e97486d SHA512 b557ec32ca1211faa72e108a7f769f4ffb3a08075a4010aee2f9ced79a9f7f8c26f60bf26e2587d4a0cbb3cf6d52ea52d9102407ed548cdd41f53c67dd10d7bb
diff --git a/app-arch/patool/patool-2.3.0.ebuild b/app-arch/patool/patool-2.3.0.ebuild
new file mode 100644
index 000000000000..9fcc78d0b714
--- /dev/null
+++ b/app-arch/patool/patool-2.3.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Portable archive file manager"
+HOMEPAGE="https://wummel.github.io/patool/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		app-arch/arj
+		app-arch/bzip2
+		app-arch/bzip3
+		app-arch/cabextract
+		app-alternatives/cpio
+		app-arch/dpkg
+		app-arch/gzip
+		app-arch/lbzip2
+		app-arch/lcab
+		app-arch/lha
+		app-arch/libarchive
+		app-arch/lz4
+		app-arch/lzip
+		app-arch/lzop
+		app-arch/ncompress
+		app-arch/p7zip[rar]
+		app-arch/pbzip2
+		app-arch/pdlzip
+		app-arch/pigz
+		app-arch/plzip
+		app-arch/rpm
+		app-arch/rzip
+		app-arch/sharutils
+		app-arch/tar
+		app-arch/unace
+		app-arch/unadf
+		app-arch/unzip
+		app-arch/xdms
+		app-arch/xz-utils
+		app-arch/zip
+		app-arch/zopfli
+		app-arch/zpaq
+		app-arch/zstd
+		app-cdr/cdrtools
+		dev-libs/chmlib
+		media-libs/flac
+		media-sound/shorten
+		sys-apps/diffutils
+		sys-apps/file
+		sys-apps/grep
+		!elibc_musl? ( app-arch/rar )
+		!x86? (
+			app-arch/clzip
+			app-arch/lrzip
+			app-arch/unar
+		)
+	)
+"
+# Test dependencies which are packaged but can't be tested for various reasons.
+# app-arch/arc
+# app-arch/zoo
+# media-sound/mac
+
+# app-arch/rar is masked on musl
+# app-arch/clzip is unkeyworded on x86
+# app-arch/lrzip bug #916317 on x86
+# app-arch/unar is unkeyworded on x86
+
+# Unpackaged testable dependencies
+# archmage
+# genisoimage
+# lhasa
+# nomarch
+# pdzip2
+# py_{bz2,echo,gzip,tarfile,zipfile}
+# rpm2cpio
+# rzip
+# star
+# unalz
+# uncompress.real
+# 7zz ( app-arch/7zip:guru )
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	einstalldocs
+	doman doc/patool.1
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# zoo emits a non-zero exit status on a possibly false consistency check
+		# Zoo:  WARNING:  Archive header failed consistency check.
+		"tests/archives/test_zoo.py"
+		# Doesn't accept long arguments, such as those that files in ${S} would have.
+		# Too long argument: /var/tmp/portage/app-arch/patool-1.12_p20230424/work/patool-ab64562c8cdac34dfd69fcb6e30c8c0014282d11/tests/data/p.arc.foo
+		"tests/archives/test_arc.py"
+		# Error: 1002 (invalid input file)
+		"tests/archives/test_mac.py"
+	)
+
+	if use elibc_musl; then
+		EPYTEST_IGNORE+=(
+			"tests/archives/test_rar.py"
+		)
+	fi
+
+	if use x86; then
+		EPYTEST_IGNORE+=(
+			"tests/archives/test_clzip.py"
+			# bug #916317
+			"tests/archives/test_lrzip.py::TestLrzip::test_lrzip"
+		)
+	fi
+
+	epytest
+}
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index f5b4f318dac7..bce4acbe24fb 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -7,5 +7,5 @@ AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400
 DIST rpm-4.18.1.tar.bz2 6396363 BLAKE2B 4bc582bdc34a89d83346a8e18133c4f1846f2e8741c85ae2d0fd3398166e5a5d81ed86869e34700d3ea414fbf8ccf6c918692e865b956b1e6b70830b64cd323e SHA512 0ede2138b9b4c3b50d7e914cf82655507fcc207ba67804c749ea17560002976cb26b95801e9138a51589b60459494a991213a1131dbef5af2eca9b5050a4f29c
 DIST rpm-4.19.1.1.tar.bz2 5849649 BLAKE2B 66ed845007f3767fd92e2384962927b93cef7b825b8ea60f81f0a4b51b9d6a09d1cbec1668226fa85de675347d52635cb25c4d11204ada0eed6c898425b21536 SHA512 3364c453c29903c144a3680ceca7a17426eb085c288b6313fb7e857a42a5e0a965f623882e0f58e633f8b8770e839d9df9f7653d99c73759af5c89d0a981908d
 EBUILD rpm-4.18.1.ebuild 4163 BLAKE2B 1f74a64a7b34bd4e2c84b0c9b980ebc6f2da6d436efcd50d163c4383adbd01a590a29305d6a71b7cc3856198d858704bcc2dc6cf82b5b0cf669317cc662084c1 SHA512 100f19f15e0db915aa7f8fc6351ab2db2b4fe4e38cd3038529f4a278daaf56d6a066fbb0fa529f79233548ff7eaa1be51fe7aab3fa25882dacba45c883302116
-EBUILD rpm-4.19.1.1.ebuild 3285 BLAKE2B 77182d5519b34fcfb876e75ea4551499b2f2a7fc1d1e4da9cc8f8a59a3dcf83901e85017add215a18e5f0321c405099d5db47c198d7ca3aed58c6d41ae1c1bf8 SHA512 3c37ade13f2b7e66bdbe03e663180e6e7333dc5b468ad8bd737312f233242dec023a696642741c42d87ff3c3324d89dd442bec5a5345da040fe0148ea5776509
+EBUILD rpm-4.19.1.1.ebuild 3292 BLAKE2B b8743c1d79fce1635152a9c8b1b5bc6427576358f344cc1e696410953991f3b7252626441bcc8fa859368228d0b1f971463b35f8c63466902d376960a18e48c2 SHA512 ffedab222e5ad431121c7ae5c3f0e05ae5371a206b9909dde1c87469ad2ce20cfeb0c096140676f98caf45224a7e0cf3c795e30521cc134de784955c45c76691
 MISC metadata.xml 616 BLAKE2B f0df64810f4eaf6b3fa7cdb09a892677404fa2d6d3bd36abb9c5f638be56200d1c83dfec4b6a3bd18ad9ae9b56eeaabdbce243eafad366f366c9157ddfb00ad8 SHA512 792c6c2476c7e928b1e1515b56e19ec83e3855aaaebd17aa66407f6a232f4680ba5d90da54c0a5af7d3db829124fa062015070a1ab82ebe91f5f8f2d1ebaff29
diff --git a/app-arch/rpm/rpm-4.19.1.1.ebuild b/app-arch/rpm/rpm-4.19.1.1.ebuild
index f4dede090217..656c2d64fc53 100644
--- a/app-arch/rpm/rpm-4.19.1.1.ebuild
+++ b/app-arch/rpm/rpm-4.19.1.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sequoia +sqlite"
 REQUIRED_USE="
 	${LUA_REQUIRED_USE}
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index fe8f90073670..85389cc8d553 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -5,7 +5,7 @@ DIST xz-5.4.7.tar.gz.sig 566 BLAKE2B 525eeeddb219c6e46ef2079af0cd28c8514969ce33b
 DIST xz-5.6.2.tar.gz 2355785 BLAKE2B d2d5f9772714b5b5993ec26c313bd27dc10d88928d9d3a1c71b78f80797e376cf065dcdd0c2c7977a83b67cbe2558140c74c5df44a9408e5a72529212c2205ad SHA512 c32c32c95e3541b906e0284e66a953ace677e0ce6af2084e7b122600047bf7542c1b0fabb5909b19ff79fba6def530be674df1c675b22a47a8d57f3f0b736a82
 DIST xz-5.6.2.tar.gz.sig 566 BLAKE2B 9b1f19d0449de18057eb5bd3cceaa073fc245e9a05fb19fabdac98b1d2e708b39c8070130c522b78ff75df724e207f978d8da65e2ccb1c6fa295aa892eda0d23 SHA512 f3d1055a2a6e96eec2fd5c0b733f2ab5e150bac9645f1fe9a7558ed6f34a241b4f57e17fd4504f311be26cf1e2b9b797f2e78b1b9d2db02e9cd0c1548cb6160b
 EBUILD xz-utils-5.4.2.ebuild 3916 BLAKE2B e5ed50ed6c54ba51fabcc3b77ad0a42a00e8b5aca66a3264e51c572300bcbdf0ce181b8548aad3cd2c917ba9f77960e069ee73392be9d6b43f399ce70c98d8a6 SHA512 15d25fb0df99907985f4cd94edff05f3db0a15afee067276f00616eceb46fb79de248cd3b2945ca4aded3a4ff079a72ddeee7b9f599934c4f0ff2f71db6284f6
-EBUILD xz-utils-5.4.7-r1.ebuild 4435 BLAKE2B e84af7efd0c87ac42d29740f9f4e12c18bfef015233d860f70441046070223635228cb34a31fd3369b71f8c8661d4b580dd865dd1f09d69c44b8dd511bb57dec SHA512 d69ced38cdb8a714f80686d8a76584e52b72870bc3f2e8b686264cc273a988c02553083fe766e833f056bc2778507d19310462f6e3f6d03e1ee0a9c96474713d
+EBUILD xz-utils-5.4.7-r1.ebuild 4428 BLAKE2B 426f6d3628201c82d879ef428068df3c5984827d83048885077e7893be9d2c65f1627b9dbc5faf1f61486055a7fb5c3f5e97cf504e3b3367087f5e4c7b0b5bfe SHA512 fee2b9b1a900b8483d767a23ac037036fdbcdf74aa221b01a7773b2afab5dc9b80651f531f7def3a84e08fb768554fd8b29db2e4b11bd30436dbe1f9b6b26bb9
 EBUILD xz-utils-5.6.2-r1.ebuild 5857 BLAKE2B ddbf27c95c439d481da5f12e5ffd90e6014fb17c4419f8addf826d6287d6b6f1a3a2b1ba0ba233445584a0f3dffb7083680d66b7e95bbcf913ff5168b6e8cd0b SHA512 0ebe53bb215989a055914a78cb97a99a51fb57269598fee022be1f45c34f95418b569b52d35ecdd96e72765f43aff6141835c8d20e95bbe528fcbb935400938a
 EBUILD xz-utils-9999.ebuild 5666 BLAKE2B 826be455df4ac0c84c53d41025a4cbce9b01f0969706eeb1c903c82eed9d7920cfd1128f9255b92db0e944d600e237540fab8e3d11c6931efc70d3315403d428 SHA512 c00ed80b9180a39f41ba1fa8dd6c01de83ee641120820e0d1ab38662d4e1c7bab4afdabddd3aba5783c28b0d62987c2a6d654780323df550a9683eff94173bb6
 MISC metadata.xml 748 BLAKE2B fe48d0e6b5aac2c843670597f0daa0202af709c27fe81889da8e4ef6877e35b30009b72831bc737b1078954b6494b508fa1b59305fdaf795db8801d20d9a0638 SHA512 6e64f0053489389818430808acb32cc1d3b33013978adf4952fbf57ab555e0710a106623ac1eb67405f1dd91c33397c5c70bddc9c5015878f280266b29b4e189
diff --git a/app-arch/xz-utils/xz-utils-5.4.7-r1.ebuild b/app-arch/xz-utils/xz-utils-5.4.7-r1.ebuild
index 2b5beefd93f6..5d71ec517e84 100644
--- a/app-arch/xz-utils/xz-utils-5.4.7-r1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.7-r1.ebuild
@@ -35,7 +35,7 @@ else
 	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	fi
 
 	S="${WORKDIR}/${MY_P}"