14 files changed, 6 insertions, 373 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index a26e96aa4f53..e7ca8601901b 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
index 6b1aad103a72..491e2651e790 100644
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@@ -1,5 +1,3 @@
-DIST advancecomp-2.4.tar.gz 1315369 BLAKE2B fba921473efb54493590cc225a7ece2d05a5e7a047e38cebdd14ec6141856b5f7efe0aafd279d399bca7bb836f73a586cd4711e75f2a11047e063bf72d67f15a SHA512 667e0e898208df578a676b6084ca6c8dae119a6006f716b1dfa29cd0ec5b022f7b5fd099d09c25e520bdf90bc5531a7e36ed120472ca732303b719818cc5b712
 DIST advancecomp-2.5.tar.gz 1315529 BLAKE2B 6d5844e64595f611ecf5a1ae69fa0208d324745fde91e63e2d934ca7c7ea6ce67da88063563ccfb67d8762eccff0723bc8f0e47b9322691a67bc7cc80a2039b0 SHA512 3beb26e9afdafb62ab13c3c56902b71b5dabccfa458c9930bdfd0a835149c46bed22bfac7b529c341f241bb8f7670c4cda4c50fd34df31b9a3902f8b8b655049
-EBUILD advancecomp-2.4.ebuild 881 BLAKE2B 4f51e115905cb47422c6f267f92304bb3b011deaa933bcf26ce20eb9cd92a1ddc1e369c5514700a15c91fb18e07d8e3e88efc5f51fc7c91b8c3ab0d91c981d54 SHA512 40c86ca82a557b79d1f86605f8da74e58c28891ae2ebd450df50218f482f9bf92aa4084a2621da3da9cdec5ac79d3bcd7ac948f0e43e928c32656b6e4eb55ba0
-EBUILD advancecomp-2.5.ebuild 886 BLAKE2B c75a61e371f68e9f6adb9fb83272bc8a9f3e9087fea174d3120d5a6e9d10d38f92ef088a248ba7a40abf0260b783d6686681627157d4dda71eb237866b430054 SHA512 fc4f526e623369c3dc8db9a7532261a099711a7c8175da61b606f2fc59a8d2220a71ac05398545a0c38c706f564c17cd9fb6aa255233e8b8da1546f3bb34a060
+EBUILD advancecomp-2.5.ebuild 881 BLAKE2B 8b1fbc2cbaa15a40f99fc014a726a40c02256e0f14f052f1d57ada0fb63435e390694eaf9bb303eaaa38d8965c36610c18645587f61aa632111bcdf2d174bed9 SHA512 173779ebfebd62acc8b94dd3ef36bb754c1cc02f4a2b81a951cfa1b3c56d6b2e0de2b85e60ad41c666b6c74ceb476aed65b308fac2aad869fdd948906ddf0aba
 MISC metadata.xml 390 BLAKE2B ff0e188cad31daa60b4298b09a40fbbeb0d2b95ef7bf7a78df9c3acba7421ceea5511b1654c2c15acd59efd53dc6e2f222037201bf2f66c2d8abd9d888c4138f SHA512 5f2bdc25546d01a5a3b785fc5b659dc1d0f53a12f992cab12bc14790f82b6401bb8dd65f5bddb32f59ea458fa2cc913f7b1641cf36827207f7aa2875d9488ef8
diff --git a/app-arch/advancecomp/advancecomp-2.4.ebuild b/app-arch/advancecomp/advancecomp-2.4.ebuild
deleted file mode 100644
index 6d75cd55c107..000000000000
--- a/app-arch/advancecomp/advancecomp-2.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Recompress ZIP, PNG and MNG, considerably improving compression"
-HOMEPAGE="
-	https://www.advancemame.it/comp-readme.html
-	https://github.com/amadvance/advancecomp/
-"
-SRC_URI="
-	https://github.com/amadvance/advancecomp/releases/download/v${PV}/${P}.tar.gz
-"
-
-LICENSE="GPL-2+ Apache-2.0 LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86"
-
-RDEPEND="
-	app-arch/bzip2:=
-	sys-libs/zlib:=
-"
-DEPEND="
-	${RDEPEND}
-"
-
-# Tests seem to rely on exact output:
-# https://sourceforge.net/p/advancemame/bugs/270/
-RESTRICT="test"
-
-src_configure() {
-	local myconf=(
-		--enable-bzip2
-		# (--disable-* arguments are mishandled)
-		# --disable-debug
-		# --disable-valgrind
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dodoc HISTORY
-}
diff --git a/app-arch/advancecomp/advancecomp-2.5.ebuild b/app-arch/advancecomp/advancecomp-2.5.ebuild
index 5c05f17047f0..a16f10bdcec2 100644
--- a/app-arch/advancecomp/advancecomp-2.5.ebuild
+++ b/app-arch/advancecomp/advancecomp-2.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ Apache-2.0 LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	app-arch/bzip2:=
diff --git a/app-arch/bzip3/Manifest b/app-arch/bzip3/Manifest
index 754da3ad7cd7..029ff99831a7 100644
--- a/app-arch/bzip3/Manifest
+++ b/app-arch/bzip3/Manifest
@@ -1,9 +1,3 @@
-DIST bzip3-1.1.8.tar.xz 269668 BLAKE2B fe85ba2ecca8e2433501c13e57856720da731b6c959340a68dd4654a516c12e034a90ff6cd6aed55dd2160c3860fdc3e60cddd47ffd00737a657a2e6c73704af SHA512 36141a48f0d5b35de4b06117ceca3c5d5cdc3df6be187856f1436751984b0154942e0eece531ee7b191cc0cd7056960de6a1ca3ec0fc2bcc7ff1d50444cd1e3e
-DIST bzip3-1.2.2.tar.xz 275872 BLAKE2B 601f0b150dee756d204c186f6ace5106fbc90189862cb1bcba7d4f2a2dd093ded64bb8feba0f214aac39ad138a23e6ef430a5e75829dd2ebab77c79d85342197 SHA512 476876f3949ac285e86625a9a83741308910ddce5b9449c0ca02b41d9c336f759b9702f2ce6b61243f1fde59a9ef8cf926fb2e94911828d5f39e207319bf522d
-DIST bzip3-1.2.3.tar.xz 276568 BLAKE2B 08f762174ea565e4115cd7ee0e8d22bf5aae3f060955715cf7e0f22f388b99976baa571db501cc973fe93bcd5245e991ca149f097929336817169ea488bf8907 SHA512 cd83092c5f84d9491209a15a002def26bd1b1043631e4c6e90eb8e28d977da696a24c9e80994383943e104766d120acd5a7f6dc2f6892b16661ea1fe57745c53
 DIST bzip3-1.3.0.tar.xz 276724 BLAKE2B 4b9ddd4da193cc784265eb2584804cfe7ddb55947634dab9068f7df8d0f7ee8684b3ce1cc50df355780aa8514462d23e93ff637ce2ca552f3d09b32bf1edcde2 SHA512 3777f6f0c337b5014b510c97ca3d19c77e7e474482d9e83143186ab593967fcec3e19163b32b03e6d8243838091f24e45eca245e35f0a6e5e713f29873ad62c4
-EBUILD bzip3-1.1.8.ebuild 780 BLAKE2B 40c5d480da40010a89acd6f33a35048bdf5983017b9701840b917ff2fc56ffff93da2189cc783f1009d2de3063a41892bba33d3a59bf5a1d9d0c4104075dc71b SHA512 2b3d5355ca469a43563a54ffc1bc8f3e1378955e955e5e603659f7367296c68cbf0392550df77c2ae29f919b01ab33505371ed0a871e98ede7174eb7bf15c6f5
-EBUILD bzip3-1.2.2.ebuild 780 BLAKE2B c0beeaff4442ba49098444f5b0c04625180a4529776ac9c3b73cf5c9cdde95229c5e42b6db53cae58952b83c7aef907f83ab366e80958f24ba5f3bb3697640f9 SHA512 f68707c80a45818b97de6210cb137b26129ae5e90d57aded24c99a83817ce3e67c6b77b90bbd4a5b8329140dc76754b48d60503e50df16f26f11b944fca25440
-EBUILD bzip3-1.2.3.ebuild 782 BLAKE2B e2e032db4b8b2a8ec53f240c3dd78e9863ee88d9ee9cef1b48fa7f573b0d0510b3426d4d6fd56ee969aceeeb8351990e7e9d701ee0572baec969c4ae8b0ea3b3 SHA512 e9ecd0a9932d41902bb232d4b6e6862a627b15f50d48bf70450e4b55341dde203fc22327894faf41f09bd0711ebe4bdda2d324ece79f1deedd6070dfd9d10ba2
-EBUILD bzip3-1.3.0.ebuild 782 BLAKE2B e2e032db4b8b2a8ec53f240c3dd78e9863ee88d9ee9cef1b48fa7f573b0d0510b3426d4d6fd56ee969aceeeb8351990e7e9d701ee0572baec969c4ae8b0ea3b3 SHA512 e9ecd0a9932d41902bb232d4b6e6862a627b15f50d48bf70450e4b55341dde203fc22327894faf41f09bd0711ebe4bdda2d324ece79f1deedd6070dfd9d10ba2
+EBUILD bzip3-1.3.0.ebuild 780 BLAKE2B c0beeaff4442ba49098444f5b0c04625180a4529776ac9c3b73cf5c9cdde95229c5e42b6db53cae58952b83c7aef907f83ab366e80958f24ba5f3bb3697640f9 SHA512 f68707c80a45818b97de6210cb137b26129ae5e90d57aded24c99a83817ce3e67c6b77b90bbd4a5b8329140dc76754b48d60503e50df16f26f11b944fca25440
 MISC metadata.xml 879 BLAKE2B eacb925ae4939be72ae25f0f333d8c8e1c08b2fd7946e27dfadd214b8fd5f27eef3f141f9ca911cf89151245f2fa11c7a8c5459c63badbfaf71e62aaca6d67f4 SHA512 963eae34b110b883993959f97a84c5fbaae914e009d024379d8b83ad02b335f3d7404ecd9020e291a38e78cb358dd4d0ff1b4b8f3604a2cc719e9d82ebee1e50
diff --git a/app-arch/bzip3/bzip3-1.1.8.ebuild b/app-arch/bzip3/bzip3-1.1.8.ebuild
deleted file mode 100644
index 4bbe2c3cdb5b..000000000000
--- a/app-arch/bzip3/bzip3-1.1.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A better and stronger spiritual successor to BZip2"
-HOMEPAGE="https://github.com/kspalaiologos/bzip3"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git"
-else
-	SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~loong ~x86"
-fi
-
-LICENSE="LGPL-3+"
-SLOT="0"
-
-src_configure() {
-	# ./configure script will default to Clang if it is found on the system,
-	# force the use of CC selected by the user with CC=$(tc-getCC)
-	econf CC=$(tc-getCC)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-arch/bzip3/bzip3-1.2.2.ebuild b/app-arch/bzip3/bzip3-1.2.2.ebuild
deleted file mode 100644
index 5a859349b58a..000000000000
--- a/app-arch/bzip3/bzip3-1.2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A better and stronger spiritual successor to BZip2"
-HOMEPAGE="https://github.com/kspalaiologos/bzip3"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git"
-else
-	SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~loong ~x86"
-fi
-
-LICENSE="LGPL-3+"
-SLOT="0"
-
-src_configure() {
-	# ./configure script will default to Clang if it is found on the system,
-	# force the use of CC selected by the user with CC=$(tc-getCC)
-	econf CC=$(tc-getCC)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-arch/bzip3/bzip3-1.2.3.ebuild b/app-arch/bzip3/bzip3-1.2.3.ebuild
deleted file mode 100644
index 33aa6e59599d..000000000000
--- a/app-arch/bzip3/bzip3-1.2.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A better and stronger spiritual successor to BZip2"
-HOMEPAGE="https://github.com/kspalaiologos/bzip3"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git"
-else
-	SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~x86"
-fi
-
-LICENSE="LGPL-3+"
-SLOT="0"
-
-src_configure() {
-	# ./configure script will default to Clang if it is found on the system,
-	# force the use of CC selected by the user with CC=$(tc-getCC)
-	econf CC=$(tc-getCC)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-arch/bzip3/bzip3-1.3.0.ebuild b/app-arch/bzip3/bzip3-1.3.0.ebuild
index 33aa6e59599d..5a859349b58a 100644
--- a/app-arch/bzip3/bzip3-1.3.0.ebuild
+++ b/app-arch/bzip3/bzip3-1.3.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git"
 else
 	SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~x86"
+	KEYWORDS="amd64 arm64 ~loong ~x86"
 fi
 
 LICENSE="LGPL-3+"
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 79a011f526a4..1f54fd3ee703 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,9 +1,4 @@
-AUX libarchive-3.6.1-CVE-2022-36227.patch 1124 BLAKE2B 2c92c81409acded94372e93f020098b6c0c6256e0d4c414a971870303d46f0b0dc98b3282b69af066c2089ac3b81a8adb2bc978fa8819767cd4ab99dc613ea74 SHA512 76e34e646dd0550ad04ebd789134c8e7ac02c95222c55f02afe5a8e74552209fd59c02873ac1230086f92ec7a67ddca23be607e0c60d944b215bdf49018a2761
-AUX libarchive-3.6.1-glibc-2.36.patch 1145 BLAKE2B 41d1d8cd22baf02810e9b405562a1d6ae696cea58352d35c5dc09f5691d6b9e0ad422477049cb3c7c18048fb92e83020100595a848ee0b56ee8fb5a26e96c822 SHA512 fd6060c67ae2ed509fb96218bb828c75065c8d8571bfce4e1c4ccd349eb58c6e38ccc3cee5ba7a8560f967d302113b2b8b7787e1bcc6d966c98162596c140c4c
-DIST libarchive-3.6.1.tar.xz 5241148 BLAKE2B e7b79e97545dabeac164069e87adbd2081d3bd75c22f80b3797c6e487a477b3f6347b6fc14c76668eb69f2f2e5dcdd5a33a694e0a292ce426b8d0d93435218cf SHA512 2e5a72edc468080c0e8f29e07d9c33826ffb246fa040ec42399bedeecf698b7555f69ffd15057ad79c0f50cd4926d43174599d99632b1b99ec6cd159c43a70b8
-DIST libarchive-3.6.1.tar.xz.asc 833 BLAKE2B 8a1ca13491f3b29b322ab281a80eaef9ca2cca680e18a0ed5ff626e8808b6c9a5eb4cdd6eaf00fb771f361d84d7785c103a9a0665d812f1f27ac66f5d1a2e1da SHA512 0411a9bdc9bb058b289b5cc102a220216420bf01ea213e771a16246ed48e670f3426e8555bac27262b686b40b7b2239907c4eef2bf43d812d73a69ccb2a5b00c
 DIST libarchive-3.6.2.tar.xz 5213196 BLAKE2B 355b5d402e352dee802513485ce7e047af58d6de5b9bf6a49f3fd8d7b94117007598820ac979585c0da79747e8b63b70ab151131182368a11f97a047cf9029d4 SHA512 a12bb6839e13a0be1099f42c650fc90fbfe62d32ce38bcbb4794206d29b2c782ae1115124d0e5f6b9716514213af32b05e4a42eb196447674a5f9a2a32bee043
 DIST libarchive-3.6.2.tar.xz.asc 659 BLAKE2B a4b0035ab2bda4129cdf0c99266cd1e5f4772d90de6e348c75958bc803f369d6abea85d9730c6c9a216466b35697faad8d265fb2c285545887eafde27d828887 SHA512 403e5f7dec14d8b1cc01fad5a249e7b7618a7b45bcb3361ea80d67d76b591b12ce97f2c88b23d5486505dd3b34c1f1643e02235a3e5fc5150ee5735946092efe
-EBUILD libarchive-3.6.1-r1.ebuild 3756 BLAKE2B 1d375f08a69115a510772f08756ea089034c353be78d92e6a425967299c8f0b9c04d0bb1edb64af95357c7f52ccfbec7934c9d8c2d75d0b5775f79cd95aef5a3 SHA512 adb9473db5b876a3fd55401cc5d25de0951996becf868c423f352c6a1703b5add58a01040ae68ac17ccaea46d9e07c23ee690754bb9ba29a2c5a30c892079461
-EBUILD libarchive-3.6.2-r1.ebuild 3894 BLAKE2B 543d2a1802ca7da9b773a381f120f68fe1612e2768efcb1a07cfae23860dc76e7d4eb219733903c8b3fed98ab44e00a7ee8e67362fd519af84701e03aba3b61f SHA512 92605f9ca5d9b52e288144e689a7db522a2603fa5b217c4781297dd15031ce255e6a67cd9273ed6153a3c62e0a44eef71777ec6129d450371f3a18d4fb1780b4
+EBUILD libarchive-3.6.2-r1.ebuild 3886 BLAKE2B 57958de1b1a9f0c473ec973234df1a1fa35985df9d036ed285e3722c052d7744b84d33443f4e2a8fe56065853f4b978da75732e406f4e29ed63771b1e16cac9e SHA512 48cd37eca3eee11eaaf262c225b33fcf636373d8f59b347cc42d5b71d484c4e7b0231ac0cb885258d9d078a22ff4bb5823e916cb9a0077042fc898671ac65981
 MISC metadata.xml 1224 BLAKE2B 538433528de5543ad8e912ce0d072340be3f6eeefe16320ef48b3c30a35ebdff4a32055edf89f36e4479ab1468c620871fcb5ba91bd66e81798093b4d0345949 SHA512 9f53d623a02334f675c06edea2829ce52e78d85e3894e684ae920a678eb47046393b7a93808c7e1761d30a69faa5986cd4922ae7ef8f1e2ef221de39869bd12b
diff --git a/app-arch/libarchive/files/libarchive-3.6.1-CVE-2022-36227.patch b/app-arch/libarchive/files/libarchive-3.6.1-CVE-2022-36227.patch
deleted file mode 100644
index da71a196b875..000000000000
--- a/app-arch/libarchive/files/libarchive-3.6.1-CVE-2022-36227.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001
-From: obiwac <obiwac@gmail.com>
-Date: Fri, 22 Jul 2022 22:41:10 +0200
-Subject: [PATCH] libarchive: Handle a `calloc` returning NULL (fixes #1754)
-
----
- libarchive/archive_write.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
-index 66592e826..27626b541 100644
---- a/libarchive/archive_write.c
-+++ b/libarchive/archive_write.c
-@@ -201,6 +201,10 @@ __archive_write_allocate_filter(struct archive *_a)
- 	struct archive_write_filter *f;
- 
- 	f = calloc(1, sizeof(*f));
-+
-+	if (f == NULL)
-+		return (NULL);
-+
- 	f->archive = _a;
- 	f->state = ARCHIVE_WRITE_FILTER_STATE_NEW;
- 	if (a->filter_first == NULL)
-@@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data,
- 	a->client_data = client_data;
- 
- 	client_filter = __archive_write_allocate_filter(_a);
-+
-+	if (client_filter == NULL)
-+		return (ARCHIVE_FATAL);
-+
- 	client_filter->open = archive_write_client_open;
- 	client_filter->write = archive_write_client_write;
- 	client_filter->close = archive_write_client_close;
diff --git a/app-arch/libarchive/files/libarchive-3.6.1-glibc-2.36.patch b/app-arch/libarchive/files/libarchive-3.6.1-glibc-2.36.patch
deleted file mode 100644
index e45d891e2a17..000000000000
--- a/app-arch/libarchive/files/libarchive-3.6.1-glibc-2.36.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://github.com/libarchive/libarchive/pull/1761
-https://bugs.gentoo.org/863227
-
-From a2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 25 Jul 2022 10:56:53 -0700
-Subject: [PATCH] libarchive: Do not include sys/mount.h when linux/fs.h is
- present
-
-These headers are in conflict and only one is needed by
-archive_read_disk_posix.c therefore include linux/fs.h if it exists
-otherwise include sys/mount.h
-
-It also helps compiling with glibc 2.36
-where sys/mount.h conflicts with linux/mount.h see [1]
-
-[1] https://sourceware.org/glibc/wiki/Release/2.36
---- a/libarchive/archive_read_disk_posix.c
-+++ b/libarchive/archive_read_disk_posix.c
-@@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$");
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
- #endif
--#ifdef HAVE_SYS_MOUNT_H
--#include <sys/mount.h>
--#endif
- #ifdef HAVE_SYS_STAT_H
- #include <sys/stat.h>
- #endif
-@@ -54,6 +51,8 @@ __FBSDID("$FreeBSD$");
- #endif
- #ifdef HAVE_LINUX_FS_H
- #include <linux/fs.h>
-+#elif HAVE_SYS_MOUNT_H
-+#include <sys/mount.h>
- #endif
- /*
-  * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h.
-
diff --git a/app-arch/libarchive/libarchive-3.6.1-r1.ebuild b/app-arch/libarchive/libarchive-3.6.1-r1.ebuild
deleted file mode 100644
index 38a8df5f833c..000000000000
--- a/app-arch/libarchive/libarchive-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools multilib-minimal toolchain-funcs verify-sig
-
-DESCRIPTION="Multi-format archive and compression library"
-HOMEPAGE="https://www.libarchive.org/"
-SRC_URI="
-	https://www.libarchive.de/downloads/${P}.tar.xz
-	verify-sig? ( https://www.libarchive.de/downloads/${P}.tar.xz.asc )
-"
-
-LICENSE="BSD BSD-2 BSD-4 public-domain"
-SLOT="0/13"
-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="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libarchive.org.asc
-
-RDEPEND="
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
-	blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
-	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	kernel_linux? (
-		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	)
-	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-	lz4? ( >=app-arch/lz4-0_p131:0=[${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}] )
-	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	kernel_linux? (
-		virtual/os-headers
-		e2fsprogs? ( sys-fs/e2fsprogs[${MULTILIB_USEDEP}] )
-	)
-"
-BDEPEND="
-	verify-sig? ( <sec-keys/openpgp-keys-libarchive-20221209 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-glibc-2.36.patch
-	# https://github.com/libarchive/libarchive/pull/1759
-	"${FILESDIR}"/${P}-CVE-2022-36227.patch
-)
-
-src_prepare() {
-	# regenerate configure script to fix implicit includes
-	# https://bugs.gentoo.org/898360
-	eautoconf
-	default
-}
-
-multilib_src_configure() {
-	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
-
-	local myconf=(
-		$(use_enable acl)
-		$(use_enable static-libs static)
-		$(use_enable xattr)
-		$(use_with blake2 libb2)
-		$(use_with bzip2 bz2lib)
-		$(use_with expat)
-		$(use_with !expat xml2)
-		$(use_with iconv)
-		$(use_with lz4)
-		$(use_with lzma)
-		$(use_with lzo lzo2)
-		$(use_with nettle)
-		--with-zlib
-		$(use_with zstd)
-
-		# Windows-specific
-		--without-cng
-	)
-	if multilib_is_native_abi ; then
-		myconf+=(
-			--enable-bsdcat="$(tc-is-static-only && echo static || echo shared)"
-			--enable-bsdcpio="$(tc-is-static-only && echo static || echo shared)"
-			--enable-bsdtar="$(tc-is-static-only && echo static || echo shared)"
-		)
-	else
-		myconf+=(
-			--disable-bsdcat
-			--disable-bsdcpio
-			--disable-bsdtar
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		emake libarchive.la
-	fi
-}
-
-src_test() {
-	mkdir -p "${T}"/bin || die
-	# tests fail when lbzip2[symlink] is used in place of ref bunzip2
-	ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
-	local -x PATH=${T}/bin:${PATH}
-	multilib-minimal_src_test
-}
-
-multilib_src_test() {
-	# sandbox is breaking long symlink behavior
-	local -x SANDBOX_ON=0
-	local -x LD_PRELOAD=
-	# some locales trigger different output that breaks tests
-	local -x LC_ALL=C
-	emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		emake DESTDIR="${D}" install
-	else
-		local install_targets=(
-			install-includeHEADERS
-			install-libLTLIBRARIES
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${install_targets[@]}"
-	fi
-
-	# Libs.private: should be used from libarchive.pc instead
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/app-arch/libarchive/libarchive-3.6.2-r1.ebuild b/app-arch/libarchive/libarchive-3.6.2-r1.ebuild
index 513c6d16e2f5..83dafd346a0d 100644
--- a/app-arch/libarchive/libarchive-3.6.2-r1.ebuild
+++ b/app-arch/libarchive/libarchive-3.6.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-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"
+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="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd"
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libarchive.org.asc