gentoo auto-resync : 28:12:2023 - 07:37:55

20 files changed, 0 insertions, 1227 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index ebc2b29ed56e..4e5ff5019cdc 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index b964b147ac3a..95625224b030 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -1,7 +1,5 @@
 AUX libcap-2.62-ignore-RAISE_SETFCAP-install-failures.patch 724 BLAKE2B 39b2924071c9c6b1ffba3acf2fbeea6196c20da175ed4a5ddd6fac5375d604df3823bf183c36da6eb03e1b9cd918d107fd7e5b30f2f3746ce17b589a77f3dec5 SHA512 11ca33d7f1a352cce9dad179be415b6282efdbb9049a92ba945cbfbee2b6c263af39adb3a93f62e5077d9b33e0f098f9125362432bd333601345d8c3671d40bd
-DIST libcap-2.68.tar.xz 188824 BLAKE2B 659ee2b0f92ab7490e7f4c9ccd6aafa02ae36c509654fdb53a0b9da4d5ba8be2d1b5afd2073b2b1c75f9585a0593a9d3e70af59fe0c213e178782bbd11cd3b3d SHA512 ede3e1356aef22e18a46dc8ff0727500ab023bea698cf2bb822abb06625e272940afea52ad6457d0cd8cf1c7f435f1b568baf0a6bf0a08ae96fbf6d7502f9de2
 DIST libcap-2.69.tar.xz 189200 BLAKE2B 94d1fef7666a1c383a8b96f1f6092bd242164631532868b628d2f5de71b42a371d041a978ef7fbadfee3eeb433165444995d1078cd790275bc0433a7875a697e SHA512 647c307dc451517da9d089495ab959b4a6fbbe41c79f4e1e9bb663569dad630ead0c2e413dfb393319e3ea14dc9848c81b392107fe3382ce1813d278c3394a7f
-EBUILD libcap-2.68.ebuild 2243 BLAKE2B 429e44f61da99bdf3ca07e0282a191fff0db4c4c572850e6815a28cf1e6cb36b1ff571986ce1a5f048e089fb3f46a986edd3dc5501addf790e717670a91d9c04 SHA512 4ccc020e0b500fc7f4616e4499e69cb1bcc4eff8d1958c48a07ef0be4c67034b37be35b1ec3fce9d7a066847bd30abf6ac5dfbf6f173cddcbf0ba34f1e777d4b
 EBUILD libcap-2.69.ebuild 2243 BLAKE2B 429e44f61da99bdf3ca07e0282a191fff0db4c4c572850e6815a28cf1e6cb36b1ff571986ce1a5f048e089fb3f46a986edd3dc5501addf790e717670a91d9c04 SHA512 4ccc020e0b500fc7f4616e4499e69cb1bcc4eff8d1958c48a07ef0be4c67034b37be35b1ec3fce9d7a066847bd30abf6ac5dfbf6f173cddcbf0ba34f1e777d4b
 EBUILD libcap-9999.ebuild 2251 BLAKE2B f18956d67d59dfb12654b0f6f8b1e607ac993318ba52722dc3c45bb922c42e530daf1f3c8eb3174c72817f98085fe7757eb0aba151c0540143accf41bceb49c1 SHA512 3ee464d81cdc2243d5289f64e390c886d9b70a10120a19eceb75d017ca467e0f2cc99a40107115d249146c27dbb8d2f22df72910dfc330058e6b580a1fd8ca1c
 MISC metadata.xml 438 BLAKE2B b5260cc84a3fe6b992bb6218846c738af296522d7a467337c05a6240fd07fc9d6cece779bd9fcf24a11486a70874e17acae8182647d307a31cf43e1c19c3a2d3 SHA512 fa3713dcf6b7bb2ea6d4c2fdefc05e92ae345c76a6187ebcb40dab8c4ce0148650a8301f236efcb8cf53fff25730977a385578dbaa160b800159c6d6abbf37a9
diff --git a/sys-libs/libcap/libcap-2.68.ebuild b/sys-libs/libcap/libcap-2.68.ebuild
deleted file mode 100644
index f1d3b050aad9..000000000000
--- a/sys-libs/libcap/libcap-2.68.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-minimal toolchain-funcs pam usr-ldscript
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/libcap/libcap.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
-
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="POSIX 1003.1e capabilities"
-HOMEPAGE="https://sites.google.com/site/fullycapable/"
-
-# it's available under either of the licenses
-LICENSE="|| ( GPL-2 BSD )"
-SLOT="0"
-IUSE="pam static-libs tools"
-
-# While the build system optionally uses gperf, we don't DEPEND on it because
-# the build automatically falls back when it's unavailable.  #604802
-PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )"
-DEPEND="${PDEPEND}
-	sys-kernel/linux-headers"
-BDEPEND="
-	sys-apps/diffutils
-	tools? ( dev-lang/go )"
-
-QA_FLAGS_IGNORED="sbin/captree" # go binaries don't use LDFLAGS
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.62-ignore-RAISE_SETFCAP-install-failures.patch
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-run_emake() {
-	local args=(
-		AR="$(tc-getAR)"
-		CC="$(tc-getCC)"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		RANLIB="$(tc-getRANLIB)"
-		exec_prefix="${EPREFIX}"
-		lib_prefix="${EPREFIX}/usr"
-		lib="$(get_libdir)"
-		prefix="${EPREFIX}/usr"
-		PAM_CAP="$(usex pam yes no)"
-		DYNAMIC=yes
-		GOLANG="$(multilib_native_usex tools yes no)"
-	)
-	emake "${args[@]}" "$@"
-}
-
-src_configure() {
-	tc-export_build_env BUILD_CC
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	run_emake
-}
-
-multilib_src_test() {
-	run_emake test
-}
-
-multilib_src_install() {
-	# no configure, needs explicit install line #444724#c3
-	run_emake DESTDIR="${D}" install
-
-	gen_usr_ldscript -a cap
-	gen_usr_ldscript -a psx
-	if ! use static-libs ; then
-		rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.a || die
-	fi
-
-	# install pam plugins ourselves
-	rm -rf "${ED}"/usr/$(get_libdir)/security || die
-
-	if use pam ; then
-		dopammod pam_cap/pam_cap.so
-		dopamsecurity '' pam_cap/capability.conf
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc CHANGELOG README doc/capability.md
-}
diff --git a/sys-libs/libnvme/Manifest b/sys-libs/libnvme/Manifest
index 7ca6450b0077..c576328b0638 100644
--- a/sys-libs/libnvme/Manifest
+++ b/sys-libs/libnvme/Manifest
@@ -1,18 +1,8 @@
-AUX libnvme-1.3-configure-clang-16.patch 1332 BLAKE2B 701a941236c5fd644722086d58d7b5ce15d81f8cdc17ea4d2cb79efd743acf54990da83c81c8a8ef74822b3d1e51e70eb02a4a25a07a74404a307d564f56dc37 SHA512 a100ab3232b0a1bee74dbe0d4893d3819c4e3f4b741da740240431cabf72c4ccb411fca6a19f44ecf5e64bdbfd2f470b4c436c57b1a573dfea14e575a3dbd44f
-AUX libnvme-1.5-free-segfault.patch 1190 BLAKE2B ba2eb2116fcf5735b4bf91f6a9c8c16fe874daf37e4845caa13ac75023587acf53c7eb7874c4592f2de81b5ddc19902b10198c77e099dc4688e362c5b8798384 SHA512 fec31628bd78404ed8b10d66857bf4f6442d1b052342827ede58677ce33e9b9aff6e8c74d14bd5d1a91928ae5ef7b2af5fb3378e531ca580a1045f18b21a3bcf
 AUX libnvme-1.6-lld-17.patch 827 BLAKE2B b2ac67883856c7ea693ec298db92de1406c821f1a6648e85431aa7c5ddf6745a8e950226c01f5d5d58346bb55c0b159a3f6a6df6ab823ce388cea4080927d20c SHA512 6b3e2fdc27a1e5ff22aeea8a01c4c8ebcae078a6db2003a0084e119d0e13ba97aebbc2eed5433e5b6da1fb103a313b0d50f39e4d0b85b7916f109a127c73a459
 AUX libnvme-1.6-musl.patch 2893 BLAKE2B eb7c1879efc26e5555ee270c60b823142b6983defa8a13434c03caf21d30d347a4040d14dd4771fc91820711382d021711b32b034a4cc75af6d57f402e2b3bcb SHA512 55d6f1677e167a8aadee43b36ba951f16d88f29557599e928580107b5146a828a89ab33816d6727c4d72b141f0b82f18730a9abd54419a86996e9e2b8c00c224
-DIST libnvme-1.2.tar.gz 484397 BLAKE2B ae6b1c3aa8f45594219470059cfc8982674433772f89faab1659811d860036f8af89bbcb383db37e96b763188935d2c1ecaa5176b8140bba50f8ea226e989a06 SHA512 f50517838cd1df3cdd123afdb67870633e9e484bf84dba70b784d7e86ecb355b96ba9d6a1cffb96b35444da7870dfe21c54b69701b5fe5b515319280db4a84e4
-DIST libnvme-1.3.tar.gz 499870 BLAKE2B 5a019c12829890a0fe0b5e6aec5fbd009fc3bd6dfe7e81f61731292f4ea8b03044e7625491479350c399cc8cd5bc023e02cc9e93f1eba38f4c747667e84cfb24 SHA512 c874b29b73e55be842f71e74a226a76fcd50dfa72e2be100f0437bc83e740cd146b6d2f2cdaa940c11c3d8c48ff2c065ac0e8a83d4d0dde743edf4179f328670
-DIST libnvme-1.4.tar.gz 506101 BLAKE2B c1496c6258bf20ed4109710b06671fa7f0e27c7649520ad8ccf4021df00fffc45f80fea248d62d2b85eecc8b15b6afaf4a113d96d6737ae6772346c9d0bc1002 SHA512 cc4a0a78083471e912736d76e4faaa5c285e1149029560f212ff06254863e8f21b48fcb1638599bd68efcf888312a248fb748d23776af03574b39fbd9b2a418d
-DIST libnvme-1.5.tar.gz 566715 BLAKE2B 2111a6929bc17949f03c39fdb247420bba371641b38e30cc7bc4b61a859471d1bfaa27d0dd3bb41379a3a59bb493ff9ce9006460aaf0b900c7ce40410701c03b SHA512 0a19eca2dd7c48c9da3123767c3c789dfb7528d6f5b2b2dfdc8af7cd64e1d724fb81c6002b9821ce916cc7adb6b5e5e28253f1d73131188b0559c6d276a7d07c
 DIST libnvme-1.6-ubsan.patch.xz 5800 BLAKE2B 8603311c44a475bd09a31a6bebe96f29f2b18b6d0917cb02b680fc20861a71688f1c5b3f618d6f38e7c105c8a00b8818b2ffa67289371fd0ab62354d318bebb9 SHA512 74f1a86c4011ce6650b54ec50422fe98ec64a65b50e3aa6c3d57f3715713f85ef7c84451416bb8d136dff646b3eba00d415208c98a16c562bf5d258d51b0d006
 DIST libnvme-1.6.tar.gz 597676 BLAKE2B 8b47b268154574688a909d0664df55eda38d9f133373fabcffe987ede03e0c531f88126e0dc50204d74fb2fa665af6379aa5205757bfc5863926db8402fbab27 SHA512 ae6a95ed75bbdc6f8c5c5608eaad8bcaf60a08348ddff356bd47258da2bd2470bdaa45747cdb7ba24f10db093fc0ab95f8bda076a45cbb87e155e3158ef726f8
 DIST libnvme-1.7.1.tar.gz 604220 BLAKE2B b02bf0914be73f5877f418bebdbed31dfb019484fb9f6e169c3474d90306706b8e787003a472f13bedb72e90eff39a30ba35df252a3cdf4ea08a362c3f9e221b SHA512 aea986ae35eafa17482e07015228d5a7d529d41148f4cee9e4619adc2460abb5460d60cd91177462cbcaf2e94e5870026ff9e45548f91d9f90b65a6268eb3abb
-EBUILD libnvme-1.2-r1.ebuild 1192 BLAKE2B dd05f5d1fba9e50117b24d66fea37d05d1a9d1f900206e419f3f3ce76e3f0868639aa2aadf597507767f726fa5c59376e9d51d6bcd1067d62e24b12069e1baae SHA512 b56d7690c6b71d75b27436d36a0f47dee76b8c3951374aaf58cf4794b687b6fa02b2dbe5936c8fa76390a65c1463842ad2290d4fb4b37f3601644705c3d49971
-EBUILD libnvme-1.3-r1.ebuild 1351 BLAKE2B 571a22422960fd0a7f5c2a0e16e367cb5b9ad9fcd543698b7aa4f320d24c5bb7cb4918bd858d9ebd144e24ec15e4c4db0a546aa773bb4ed023539314b01da3ed SHA512 223e511a5699cdef31b1a22d7bdd1bf757442b652f3dcead4a08e481524f963eb243f70cafa732165783bb32a7ad2d33baf1f379e9c18252f338943c472096dc
-EBUILD libnvme-1.4.ebuild 1393 BLAKE2B 4d67d8f1c72859697e1983a609f3b55aaa62c4cd7bb8428318ae46a137fbddcb5afb46646d0b297807faea32e66fa545cff2d0d229f3b4de61b8480f1891a436 SHA512 01d338434a5bddaa21ca9d69ec362152252359660a0eb8ca16ae27b0f96389ae15c2cc78ba3eb1780deb9092e5d5fb514bafe74ab7122efe2a441fa1ad4a8877
-EBUILD libnvme-1.5-r2.ebuild 1477 BLAKE2B 54f013b3ad5cdaba2f87c15a5d70382e2cc4f74b642c39bbc9ad558907384d1ef832276bb437c2bbe3cedd461434bdd1ffea9a8b58a398c4cf37b44f04636871 SHA512 6325634468a4b3e02e53ccc230ffa8946db527a310d2833127bc953790928a9883dbac77c9605d18b48dc07c7f10d347b1d8ea07aa5028c1055af18df149348e
 EBUILD libnvme-1.6-r1.ebuild 1592 BLAKE2B cfca87f1d76df65b2de0d9444ea2cd0cf24f89a01f8bab17b191f7a8afbe5e7ee015fc1c0640857d2ac98665f9548391c2d03171da7c71d59faab129fce0cefd SHA512 38cdf8442dbd0a61f16166cd79eadaec34d4374821b0629dd6180306c229f310cedfbc254db54afa4507dd55fb5ea27ec9bec5165e593be7dab2c04436d43a63
 EBUILD libnvme-1.6-r2.ebuild 1712 BLAKE2B bcf55a48f7dcc2d904c39b93249a9de5797a4b4edfc31afd96dddf021dd82519aa1e9563af262daa835e124fc6e001a2ef822b1b5ec7c497b28c812b12bcdde4 SHA512 f1a6dc39b344004387acf19ad998e472a7fabcd3c2baf7715ac6febc8c7c07786a2831bd3e933e4e0d7afce3922d84490e4429d1fdae713b1af55d7600102e73
 EBUILD libnvme-1.6.ebuild 1535 BLAKE2B 60dd5252ef071bf3186e059fe0482a8cca78226ed28331abe629ac8eb6b224935558c4b9df1b4d74fb222a1a7c7830ededa4054950d46cc7896b25aad04b46f5 SHA512 41e03e4bb81482d292e24dbc408bc7ad48036d198b5afd0469822822bded76f6f5ced22c85766cbe71293cdb4681fe2865d239bad44bcb8a101838f4911a66f9
diff --git a/sys-libs/libnvme/files/libnvme-1.3-configure-clang-16.patch b/sys-libs/libnvme/files/libnvme-1.3-configure-clang-16.patch
deleted file mode 100644
index b7954a996272..000000000000
--- a/sys-libs/libnvme/files/libnvme-1.3-configure-clang-16.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://github.com/linux-nvme/libnvme/commit/ddfb3ba036f9df2737c165b27f9b458dd83a7df8
-
-From ddfb3ba036f9df2737c165b27f9b458dd83a7df8 Mon Sep 17 00:00:00 2001
-From: Tomas Bzatek <tbzatek@redhat.com>
-Date: Tue, 31 Jan 2023 23:27:53 +0100
-Subject: [PATCH] build: Fix nss code snippet includes
-
-With hardened distribution CFLAGS the meson code snippet wouldn't compile:
-
-Compiler stderr:
-  .build/meson-private/tmpy2z1t5q4/testfile.c: In function 'main':
-  .build/meson-private/tmpy2z1t5q4/testfile.c:2:30: error: storage size of 'hints' isn't known
-      2 |              struct addrinfo hints, *result;
-        |                              ^~~~~
-  .build/meson-private/tmpy2z1t5q4/testfile.c:3:21: warning: implicit declaration of function 'getaddrinfo' [-Wimplicit-function-declaration]
-      3 |              return getaddrinfo(argv[1], argv[2], &hints, &result);
-        |                     ^~~~~~~~~~~
---- a/meson.build
-+++ b/meson.build
-@@ -199,7 +199,10 @@ conf.set10(
- conf.set(
-     'HAVE_LIBNSS',
-     cc.links(
--      '''int main(int argc, char **argv) {
-+      '''#include <sys/types.h>
-+         #include <sys/socket.h>
-+         #include <netdb.h>
-+         int main(int argc, char **argv) {
-              struct addrinfo hints, *result;
-              return getaddrinfo(argv[1], argv[2], &hints, &result);
-       }
-
diff --git a/sys-libs/libnvme/files/libnvme-1.5-free-segfault.patch b/sys-libs/libnvme/files/libnvme-1.5-free-segfault.patch
deleted file mode 100644
index a41cf380f911..000000000000
--- a/sys-libs/libnvme/files/libnvme-1.5-free-segfault.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From c56910f807795528fff7ba6b81f8efcdb4babe98 Mon Sep 17 00:00:00 2001
-From: Martin Belanger <martin.belanger@dell.com>
-Date: Wed, 5 Jul 2023 10:59:25 -0400
-Subject: [PATCH] tree: missing closedir() causes fd leak for
- "/sys/bus/pci/slots"
-
-In nvme_ctrl_lookup_phy_slot(), we are missing a closedir(), which
-causes file descriptors to leak. Also, there was a missing free()
-when the function returns with ENOMEM.
-
-Signed-off-by: Martin Belanger <martin.belanger@dell.com>
----
- src/nvme/tree.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/nvme/tree.c b/src/nvme/tree.c
-index a2ac0698..805eff99 100644
---- a/src/nvme/tree.c
-+++ b/src/nvme/tree.c
-@@ -1292,6 +1292,8 @@ static char *nvme_ctrl_lookup_phy_slot(nvme_root_t r, const char *address)
- 			ret = asprintf(&path, "/sys/bus/pci/slots/%s", entry->d_name);
- 			if (ret < 0) {
- 				errno = ENOMEM;
-+				free(target_addr);
-+				closedir(slots_dir);
- 				return NULL;
- 			}
- 			addr = nvme_get_attr(path, "address");
-@@ -1306,6 +1308,7 @@ static char *nvme_ctrl_lookup_phy_slot(nvme_root_t r, const char *address)
- 		}
- 	}
- 	free(target_addr);
-+	closedir(slots_dir);
- 	if (found)
- 		return strdup(entry->d_name);
- 	return NULL;
diff --git a/sys-libs/libnvme/libnvme-1.2-r1.ebuild b/sys-libs/libnvme/libnvme-1.2-r1.ebuild
deleted file mode 100644
index b19e6a86bda7..000000000000
--- a/sys-libs/libnvme/libnvme-1.2-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-r1 meson
-
-DESCRIPTION="C Library for NVM Express on Linux"
-HOMEPAGE="https://github.com/linux-nvme/libnvme"
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+json python ssl +uuid"
-
-SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
-
-DEPEND="
-	json? ( dev-libs/json-c:= )
-	python? ( ${PYTHON_DEPS} )
-	ssl? ( >=dev-libs/openssl-1.1:= )
-	uuid? ( sys-apps/util-linux:= )
-"
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	dev-lang/swig
-"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dpython=false
-	)
-	meson_src_configure
-}
-
-python_compile() {
-	local emesonargs=(
-		-Dpython=true
-	)
-	meson_src_configure --reconfigure
-	meson_src_compile
-}
-
-src_compile() {
-	meson_src_compile
-
-	if use python; then
-		python_copy_sources
-		python_foreach_impl python_compile
-	fi
-}
-
-python_install() {
-	meson_src_install
-	use python && python_optimize
-}
-
-src_install() {
-	use python && python_foreach_impl python_install
-
-	meson_src_install
-}
diff --git a/sys-libs/libnvme/libnvme-1.3-r1.ebuild b/sys-libs/libnvme/libnvme-1.3-r1.ebuild
deleted file mode 100644
index d5b333357815..000000000000
--- a/sys-libs/libnvme/libnvme-1.3-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-r1 meson
-
-DESCRIPTION="C Library for NVM Express on Linux"
-HOMEPAGE="https://github.com/linux-nvme/libnvme"
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="dbus python ssl +uuid"
-
-SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
-
-DEPEND="
-	dev-libs/json-c:=
-	dbus? ( sys-apps/dbus:= )
-	python? ( ${PYTHON_DEPS} )
-	ssl? ( >=dev-libs/openssl-1.1:= )
-	uuid? ( sys-apps/util-linux:= )
-"
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	dev-lang/swig
-"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-configure-clang-16.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Dpython=false
-		$(meson_feature ssl openssl)
-		$(meson_feature dbus libdbus)
-		$(meson_use python)
-	)
-	meson_src_configure
-}
-
-python_compile() {
-	local emesonargs=(
-		-Dpython=true
-	)
-	meson_src_configure --reconfigure
-	meson_src_compile
-}
-
-src_compile() {
-	meson_src_compile
-
-	if use python; then
-		python_copy_sources
-		python_foreach_impl python_compile
-	fi
-}
-
-python_install() {
-	meson_src_install
-	use python && python_optimize
-}
-
-src_install() {
-	use python && python_foreach_impl python_install
-
-	meson_src_install
-}
diff --git a/sys-libs/libnvme/libnvme-1.4.ebuild b/sys-libs/libnvme/libnvme-1.4.ebuild
deleted file mode 100644
index e815ea07f037..000000000000
--- a/sys-libs/libnvme/libnvme-1.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-r1 meson
-
-DESCRIPTION="C Library for NVM Express on Linux"
-HOMEPAGE="https://github.com/linux-nvme/libnvme"
-LICENSE="LGPL-2.1+"
-SLOT="0/1"
-IUSE="dbus +json keyutils python ssl +uuid"
-
-SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
-
-DEPEND="
-	json? ( dev-libs/json-c:= )
-	keyutils? ( sys-apps/keyutils:= )
-	dbus? ( sys-apps/dbus:= )
-	python? ( ${PYTHON_DEPS} )
-	ssl? ( >=dev-libs/openssl-1.1:= )
-	uuid? ( sys-apps/util-linux:= )
-"
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	dev-lang/swig
-"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dpython=false
-		$(meson_feature json json-c)
-		$(meson_feature dbus libdbus)
-		$(meson_feature ssl openssl)
-		$(meson_feature python)
-	)
-	meson_src_configure
-}
-
-python_compile() {
-	local emesonargs=(
-		-Dpython=enabled
-	)
-	meson_src_configure --reconfigure
-	meson_src_compile
-}
-
-src_compile() {
-	meson_src_compile
-
-	if use python; then
-		python_copy_sources
-		python_foreach_impl python_compile
-	fi
-}
-
-python_install() {
-	meson_src_install
-	use python && python_optimize
-}
-
-src_install() {
-	use python && python_foreach_impl python_install
-
-	meson_src_install
-}
diff --git a/sys-libs/libnvme/libnvme-1.5-r2.ebuild b/sys-libs/libnvme/libnvme-1.5-r2.ebuild
deleted file mode 100644
index 1ffd8a317ec6..000000000000
--- a/sys-libs/libnvme/libnvme-1.5-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit python-r1 meson
-
-DESCRIPTION="C Library for NVM Express on Linux"
-HOMEPAGE="https://github.com/linux-nvme/libnvme"
-SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="dbus +json keyutils python ssl +uuid"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-DEPEND="
-	json? ( dev-libs/json-c:= )
-	keyutils? ( sys-apps/keyutils:= )
-	dbus? ( sys-apps/dbus:= )
-	python? ( ${PYTHON_DEPS} )
-	ssl? ( >=dev-libs/openssl-1.1:= )
-	uuid? ( sys-apps/util-linux:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-lang/swig
-"
-
-PATCHES=( "${FILESDIR}/${P}-free-segfault.patch" )
-
-src_configure() {
-	local emesonargs=(
-		-Dpython=false
-		$(meson_feature json json-c)
-		$(meson_feature dbus libdbus)
-		$(meson_feature keyutils)
-		$(meson_feature ssl openssl)
-		$(meson_feature python)
-	)
-	meson_src_configure
-}
-
-python_compile() {
-	local emesonargs=(
-		-Dpython=enabled
-	)
-	meson_src_configure --reconfigure
-	meson_src_compile
-}
-
-src_compile() {
-	meson_src_compile
-
-	if use python; then
-		python_copy_sources
-		python_foreach_impl python_compile
-	fi
-}
-
-python_install() {
-	meson_src_install
-	use python && python_optimize
-}
-
-src_install() {
-	use python && python_foreach_impl python_install
-
-	meson_src_install
-}
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index ada74ce9a325..484cd2fb5ff8 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -10,8 +10,6 @@ DIST musl-1.2.4.tar.gz.asc 490 BLAKE2B 2133cff9ae2c8f69213fb72a256533d0686fd1180
 DIST musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c 11656 BLAKE2B 1b7bf7102a1eb91a8cb881ed8ca65eb8eed911dd50238e97dc2952d89d4c6ebed6bfd046a2b38776c550b2872ab54ced8cb452fcc2ad56e5616f722debda761f SHA512 7f5b9d934d82deb5f8b23e16169a5d9b99ccab3a4708df06a95d685e1b24a3a3e69b3dcf4942f2f66c12a3d4bf0c5827e2ee2e8c4d7b1997359fccc2ac212dee
 EBUILD musl-1.2.3-r7.ebuild 5783 BLAKE2B 70a576de93379765eb5741ea555eeb0290290533014f79ce9a65ae3d73c12ab2c62196d0a00735c2fdd9130074a1d5674bee17b8342df611a4086ae54e2ef089 SHA512 458bbfeb64d14e2c46beeb89f02c8772fa2c9102307bd481d98ff80f245d58ee35bef133b5d6584df6798427ee0f3dd8ec0501dbddc44b0e1afb620173918eb3
 EBUILD musl-1.2.3-r8.ebuild 5939 BLAKE2B db7a02bc65484de181f8a389ed3d635979018f45fd2f241cfdccb295b90a728f7a95341945a548e4aa3c3ff66620a9ca99c595fdd4050dc75b2b8b9c734ad4db SHA512 5e9251dbda73e0dd0e0a71b4cbd35058dae961f0cabe4d555d95c622dd6856b22e6bf18ec6ca61d6e275c2fdd0afa3450d80c7d8c8a95ad92b95507b3ba6017c
-EBUILD musl-1.2.3.ebuild 4850 BLAKE2B 72d5aad92adf02b3e6f459e5533ce810923e05303092d199870b4fc12f49665f774ef2b962449f8d095677737886c4f7406679654e5761c52453984dc69779d7 SHA512 9fe67cc4443473e95c93879a84f0d44c32b00b7c1b108eb68ef96ce021fc7ab1f075e9a1b1822cb7218d3a00c0e01a8afdd23c2854b5d98f714727630858c2e3
 EBUILD musl-1.2.4-r1.ebuild 5728 BLAKE2B 5dd5ff3e8374159ea39c8d3bae7d0070a105add736c4b73dfd3c2f769ec6e1d1c75df60d4ff7b6c2c38bb7308b2fb1c53eee33ce747d401a16d9ebf1348ca9af SHA512 21f9438c28de8a552ed5aa0d71385f75dbb905031234b17ffca30af8291403b21afe203c4d6b7c711a2cfc49337339c7cd20b23cc8c51f731088bed6dd807ee4
-EBUILD musl-1.2.4.ebuild 5669 BLAKE2B cfd2e685efd786a4d9ca498ae798a08662ce6b30f361d1f7ed3833119dcde882456945c08c74875cdbeaa18c6729637522bca0696dc68a851e32881277b4e218 SHA512 89408896f640abda25f2ac468954f37231ecc0256d226a40b2886a02dbb04e43d67e39d5b409935fce519587eef65088309fde05399a642b00b05cbabc73fd7b
 EBUILD musl-9999.ebuild 5669 BLAKE2B cfd2e685efd786a4d9ca498ae798a08662ce6b30f361d1f7ed3833119dcde882456945c08c74875cdbeaa18c6729637522bca0696dc68a851e32881277b4e218 SHA512 89408896f640abda25f2ac468954f37231ecc0256d226a40b2886a02dbb04e43d67e39d5b409935fce519587eef65088309fde05399a642b00b05cbabc73fd7b
 MISC metadata.xml 559 BLAKE2B 8b1093a5278f716b8e21467b325e373a790f54c8ab71b92adc4c87dd569a92b20e08009372065f0f27ced39e3361c9e5e5a2e1bff271753d280439fabbddd3a4 SHA512 a35c13ea32ac8f26984bdb0d70d28a4285f34e32a2b0b17ad98fe3f357fb46c87a1e853377630d4da58fd5953de3fdeb02ee89181394e1815f5e0bbba4cd9f92
diff --git a/sys-libs/musl/musl-1.2.3.ebuild b/sys-libs/musl/musl-1.2.3.ebuild
deleted file mode 100644
index 850138951e5e..000000000000
--- a/sys-libs/musl/musl-1.2.3.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
-	inherit git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
-	inherit verify-sig
-
-	SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
-	KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 ~riscv x86"
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
-fi
-GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
-GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
-SRC_URI+="
-	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
-	https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
-	https://dev.gentoo.org/~blueness/musl-misc/iconv.c
-"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="https://musl.libc.org"
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="headers-only"
-
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
-	use headers-only && is_crosscompile
-}
-
-pkg_setup() {
-	if [ ${CTARGET} == ${CHOST} ] ; then
-		case ${CHOST} in
-		*-musl*) ;;
-		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
-		esac
-	fi
-
-	# fix for #667126, copied from glibc ebuild
-	# make sure host make.conf doesn't pollute us
-	if is_crosscompile || tc-is-cross-compiler ; then
-		CHOST=${CTARGET} strip-unsupported-flags
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	elif use verify-sig ; then
-		# We only verify the release; not the additional (fixed, safe) files
-		# we download.
-		# (Seem to get IPC error on verifying in cross?)
-		! is_crosscompile && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	mkdir "${WORKDIR}"/misc || die
-	cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die
-	cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die
-	cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die
-}
-
-src_configure() {
-	strip-flags && filter-lto # Prevent issues caused by aggressive optimizations & bug #877343
-	tc-getCC ${CTARGET}
-
-	just_headers && export CC=true
-
-	local sysroot
-	is_crosscompile && sysroot=/usr/${CTARGET}
-	./configure \
-		--target=${CTARGET} \
-		--prefix=${EPREFIX}${sysroot}/usr \
-		--syslibdir=${EPREFIX}${sysroot}/lib \
-		--disable-gcc-wrapper || die
-}
-
-src_compile() {
-	emake obj/include/bits/alltypes.h
-	just_headers && return 0
-
-	emake
-	if [[ ${CATEGORY} != cross-* ]] ; then
-		emake -C "${T}" getconf getent iconv \
-			CC="$(tc-getCC)" \
-			CFLAGS="${CFLAGS}" \
-			CPPFLAGS="${CPPFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
-			VPATH="${WORKDIR}/misc"
-	fi
-
-	$(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o  "${FILESDIR}"/stack_chk_fail_local.c || die
-	$(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
-}
-
-src_install() {
-	local target="install"
-	just_headers && target="install-headers"
-	emake DESTDIR="${D}" ${target}
-	just_headers && return 0
-
-	# musl provides ldd via a sym link to its ld.so
-	local sysroot
-	is_crosscompile && sysroot=/usr/${CTARGET}
-	local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*)
-	dosym ${EPREFIX}${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
-
-	if [[ ${CATEGORY} != cross-* ]] ; then
-		# Fish out of config:
-		#   ARCH = ...
-		#   SUBARCH = ...
-		# and print $(ARCH)$(SUBARCH).
-		local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
-
-		# The musl build system seems to create a symlink:
-		# ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute)
-		# During cross or within prefix, there's no guarantee that the host is
-		# using musl so that file may not exist. Use a relative symlink within
-		# ${D} instead.
-		rm -f "${ED}"/lib/ld-musl-${arch}.so.1 || die
-		dosym8 -r /usr/lib/libc.so /lib/ld-musl-${arch}.so.1
-
-		# If it's still a dead symlnk, OK, we really do need to abort.
-		[[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
-
-		cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die
-		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
-		eprefixify "${T}"/ldconfig
-		into /
-		dosbin "${T}"/ldconfig
-		into /usr
-		dobin "${T}"/getconf
-		dobin "${T}"/getent
-		dobin "${T}"/iconv
-		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
-		doenvd "${T}"/00musl
-		dolib.a libssp_nonshared.a
-	fi
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	[ -n "${ROOT}" ] && return 0
-
-	ldconfig || die
-}
diff --git a/sys-libs/musl/musl-1.2.4.ebuild b/sys-libs/musl/musl-1.2.4.ebuild
deleted file mode 100644
index 2908fbd17541..000000000000
--- a/sys-libs/musl/musl-1.2.4.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit crossdev flag-o-matic toolchain-funcs prefix
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
-	inherit git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
-	inherit verify-sig
-
-	SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
-fi
-GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
-GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
-SRC_URI+="
-	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
-	https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
-	https://dev.gentoo.org/~blueness/musl-misc/iconv.c
-"
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="https://musl.libc.org"
-
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="crypt headers-only split-usr"
-
-QA_SONAME="usr/lib/libc.so"
-QA_DT_NEEDED="usr/lib/libc.so"
-# bug #830213
-QA_PRESTRIPPED="usr/lib/crtn.o"
-
-# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?)
-# built as part as crossdev. Also, elide the blockers when in cross-*,
-# as it doesn't make sense to block the normal CBUILD libxcrypt at all
-# there when we're installing into /usr/${CHOST} anyway.
-if is_crosspkg ; then
-	IUSE="${IUSE/crypt/+crypt}"
-else
-	RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )"
-	PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )"
-fi
-
-just_headers() {
-	use headers-only && target_is_not_host
-}
-
-pkg_setup() {
-	if [ ${CTARGET} == ${CHOST} ] ; then
-		case ${CHOST} in
-		*-musl*) ;;
-		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
-		esac
-	fi
-
-	# fix for #667126, copied from glibc ebuild
-	# make sure host make.conf doesn't pollute us
-	if target_is_not_host || tc-is-cross-compiler ; then
-		CHOST=${CTARGET} strip-unsupported-flags
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	elif use verify-sig ; then
-		# We only verify the release; not the additional (fixed, safe) files
-		# we download.
-		# (Seem to get IPC error on verifying in cross?)
-		! target_is_not_host && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	mkdir "${WORKDIR}"/misc || die
-	cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die
-	cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die
-	cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die
-}
-
-src_configure() {
-	strip-flags && filter-lto # Prevent issues caused by aggressive optimizations & bug #877343
-	tc-getCC ${CTARGET}
-
-	just_headers && export CC=true
-
-	local sysroot
-	target_is_not_host && sysroot=/usr/${CTARGET}
-	./configure \
-		--target=${CTARGET} \
-		--prefix="${EPREFIX}${sysroot}/usr" \
-		--syslibdir="${EPREFIX}${sysroot}/lib" \
-		--disable-gcc-wrapper || die
-}
-
-src_compile() {
-	emake obj/include/bits/alltypes.h
-	just_headers && return 0
-
-	emake
-	if ! is_crosspkg ; then
-		emake -C "${T}" getconf getent iconv \
-			CC="$(tc-getCC)" \
-			CFLAGS="${CFLAGS}" \
-			CPPFLAGS="${CPPFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
-			VPATH="${WORKDIR}/misc"
-	fi
-
-	$(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o  "${FILESDIR}"/stack_chk_fail_local.c || die
-	$(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
-}
-
-src_install() {
-	local target="install"
-	just_headers && target="install-headers"
-	emake DESTDIR="${D}" ${target}
-	just_headers && return 0
-
-	# musl provides ldd via a sym link to its ld.so
-	local sysroot=
-	target_is_not_host && sysroot=/usr/${CTARGET}
-	local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*)
-	dosym -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd"
-
-	if ! use crypt ; then
-		# Allow sys-libs/libxcrypt[system] to provide it instead
-		rm "${ED}/usr/include/crypt.h" || die
-		rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die
-	fi
-
-	if ! is_crosspkg ; then
-		# Fish out of config:
-		#   ARCH = ...
-		#   SUBARCH = ...
-		# and print $(ARCH)$(SUBARCH).
-		local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
-
-		# The musl build system seems to create a symlink:
-		# ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute)
-		# During cross or within prefix, there's no guarantee that the host is
-		# using musl so that file may not exist. Use a relative symlink within
-		# ${D} instead.
-		rm "${ED}"/lib/ld-musl-${arch}.so.1 || die
-		if use split-usr; then
-			dosym ../usr/lib/libc.so /lib/ld-musl-${arch}.so.1
-			# If it's still a dead symlnk, OK, we really do need to abort.
-			[[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
-		else
-			dosym libc.so /usr/lib/ld-musl-${arch}.so.1
-			[[ -e "${ED}"/usr/lib/ld-musl-${arch}.so.1 ]] || die
-		fi
-
-		cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die
-		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
-		eprefixify "${T}"/ldconfig
-		into /
-		dosbin "${T}"/ldconfig
-		into /usr
-		dobin "${T}"/getconf
-		dobin "${T}"/getent
-		dobin "${T}"/iconv
-		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
-		doenvd "${T}"/00musl
-	fi
-
-	if target_is_not_host ; then
-		into /usr/${CTARGET}
-		dolib.a libssp_nonshared.a
-	else
-		dolib.a libssp_nonshared.a
-	fi
-}
-
-pkg_preinst() {
-	# nothing to do if just installing headers
-	just_headers && return
-
-	# prepare /etc/ld.so.conf.d/ for files
-	mkdir -p "${EROOT}"/etc/ld.so.conf.d
-}
-
-pkg_postinst() {
-	target_is_not_host && return 0
-
-	[ -n "${ROOT}" ] && return 0
-
-	ldconfig || die
-}
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 6b2499a17d5d..aa7c22b58ee9 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,10 +1,5 @@
-AUX pam-1.5.1-musl.patch 626 BLAKE2B 2fe46e9aa8ceaee40308277ab5eddc63d4d188c53feffcbc61b77c871f576532a62bcdbcf6a29a5cb4669abea6b0454585bb40c8a8c9e85a450064a17dc45ca2 SHA512 6053a8901083de1e2a6f2246f7e6959a2de7f7e773f2b761ce73f09aa0a2023d05614d2462b2e4a55ebe6cd8a02daef4d350ab050b462f73154fb591d6780c0c
-AUX pam-1.5.2-clang-15-configure-implicit-func.patch 965 BLAKE2B 8ce9f8c52eed90da7015a297ab5a86f2946536e3f7f672de5dd4aecc1c73b2eddf8b0d0a64199765799ca60b90b7ce3a9a863de8a863f94a88199b63e097a8a8 SHA512 e62bc7ae278d4494bbd7ba11d1fcb01fd3d10a1954d39161a6dad0c30ebc52db723a9c99016635f7f1c2a0b380280d2d4990b4950f3ceeb8d8f5f78eb038ce01
 AUX pam-1.5.3-termios.patch 913 BLAKE2B 3fdb9c6320c56fd2c10b76b58700263a1c190dde4a62bb33fdfe2e59e2aebedffe87bd14fb7f02ca9c3df8f9ca21af13a1e5b42cd4eb0b112bb03f311e975288 SHA512 c432af010b188ff8a3f1fb08cc7e68b12651f8a2592fa43c5aec8c60e938c04a62ae67bc0fdb6704df3ec39aa3b40a56c1abbf07e0e5105a7b7ca4af7e44c715
-DIST Linux-PAM-1.5.2-docs.tar.xz 443276 BLAKE2B eb0376022bd17d472cfbb7d757acd9a7743d68929ac604bc7fbc27e87b35f0424e9459afff8110ee094c6914cef6e6f483e6eeb2fc2ec24909477ec53f600fa2 SHA512 69bbb52b3855a1ff3066ffe3ae1890440516311260ddfb20a7a7ea7beeb42484ea085080e3206f23933edf4a695a13f2317e33dffcab2b29f6e9e210d493e1f0
-DIST Linux-PAM-1.5.2.tar.xz 988784 BLAKE2B a835034cd239bc9377419c13dda45276e8e64a33fcf714a1957ff41112fbb6dce0be8e9773afc82458a04d54bf146a0c26117d7170521fecdc0c98184cef5f4f SHA512 fa16350c132d3e5fb82b60d991768fb596582639841b8ece645c684705467305ccf1302a0147ec222ab78c01b2c9114c5496dc1ca565d2b56bf315f29a815144
 DIST Linux-PAM-1.5.3-docs.tar.xz 466340 BLAKE2B 6bade3c63ebe6b6ca7a86d7385850bb87bf1d6526add3ac5aad140533516c1d27b594a17d09c4127ff985c42e6c571618785d6b2a2913e6575678c4dcf947dc0 SHA512 a9082823da88e0054d74e13aef872519ced5fbef25c8cc1a7e3a99160f835aa09c9ef701b6ec507acd3b540da0019288424bb4c8ebd828181ea90450db1494a9
 DIST Linux-PAM-1.5.3.tar.xz 1020076 BLAKE2B 362c939f3afc343e6f4e78e7f6ba6f7a9c6ee0a9948bb5a4fc34cecfd29e9fa974082534d4ceedd04d8d3e34c7b3ef43d2a07ba5f41d26da04ec8330fc3790fb SHA512 af88e8c1b6a9b737ffaffff7dd9ed8eec996d1fbb5804fb76f590bed66d8a1c2c6024a534d7a7b6d18496b300f3d6571a08874cf406cd2e8cea1d5eff49c136a
-EBUILD pam-1.5.2-r3.ebuild 4274 BLAKE2B 348f6a36bee14c91966d1c628eaebf227b1c75384ddd68c6038811383888173d35634a1fcf722d21b3a585e34f80e3342b1e2d26c5dc265f8eb27d9b5081f4b8 SHA512 19c7b5889f1af2720e6d330171168a6d2a884c441a440a68f4966e5d7bba088fd680e93681121f5ebb4f0bd4892c0348484cdba1e83564b48387cf8b5759f3f5
 EBUILD pam-1.5.3.ebuild 4481 BLAKE2B 0657b669823b29d338e763f435dde203df42f87b02991f33661ef07084c67ea7661c4d7229415a41e8cbecda34f1f5fa1801e952fd88b642ca41d0ec11f84455 SHA512 128b9cc0a50a25ecab3c2dd6249fd667744f0658ee7e2ee2b0ef9edb07aeb41721a10a8e9afd04b7fea35ab3712d0e59330390a0721a37b0f1e4e253ecbb7584
 MISC metadata.xml 846 BLAKE2B e236bd8c7a53097d96164d9063d1dbb9372cef4ec92731dc43df6731cc7f4fc2935aeeb2e069b6da1d4bce3f1cc6a657e0361208581da615f3f41ec72c02261e SHA512 e2e28deadb2c941f8fa31447ec20c95ccb340d638f8b1e742a89ccc2dbb3c8d88e764f750d6e13c5a6320a612d6f2447689c02862a5e897919d1e9bca7857089
diff --git a/sys-libs/pam/files/pam-1.5.1-musl.patch b/sys-libs/pam/files/pam-1.5.1-musl.patch
deleted file mode 100644
index a1d5b1543daf..000000000000
--- a/sys-libs/pam/files/pam-1.5.1-musl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix undefined reference to `libintl_dgettext` on musl
-Bug: https://bugs.gentoo.org/832573
-Upstream: https://github.com/linux-pam/linux-pam/pull/433
-
---- a/libpam/Makefile.am
-+++ b/libpam/Makefile.am
-@@ -21,7 +21,7 @@ noinst_HEADERS = pam_prelude.h pam_private.h pam_tokens.h \
- 		include/pam_inline.h include/test_assert.h
- 
- libpam_la_LDFLAGS = -no-undefined -version-info 85:1:85
--libpam_la_LIBADD = @LIBAUDIT@ $(LIBPRELUDE_LIBS) $(ECONF_LIBS) @LIBDL@
-+libpam_la_LIBADD = @LIBAUDIT@ $(LIBPRELUDE_LIBS) $(ECONF_LIBS) @LIBDL@ @LTLIBINTL@
- 
- if HAVE_VERSIONING
-   libpam_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpam.map
diff --git a/sys-libs/pam/files/pam-1.5.2-clang-15-configure-implicit-func.patch b/sys-libs/pam/files/pam-1.5.2-clang-15-configure-implicit-func.patch
deleted file mode 100644
index 5ad7b8c4776e..000000000000
--- a/sys-libs/pam/files/pam-1.5.2-clang-15-configure-implicit-func.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://github.com/linux-pam/linux-pam/pull/490
-
-From 5fccc4cbac82b4677af28b59e7a657c86acab7fc Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 11 Sep 2022 16:37:59 +0100
-Subject: [PATCH] configure.ac: fix implicit function declaration in mail spool
- directory check
-
-Fixes the following error with Clang 15 (which makes implicit function
-declarations an error by default):
-```
-+error: call to undeclared library function 'exit' with type 'void (int) __attribute__((noreturn))'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
- exit(0);
- ^
- note: include the header <stdlib.h> or explicitly provide a declaration for 'exit'
-```
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -297,6 +297,7 @@ if test x$with_mailspool != x ; then
- else
- 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <paths.h>
-+#include <stdlib.h>
- int main() {
- #ifdef _PATH_MAILDIR
- exit(0);
-
diff --git a/sys-libs/pam/pam-1.5.2-r3.ebuild b/sys-libs/pam/pam-1.5.2-r3.ebuild
deleted file mode 100644
index 7ac000fbb3fb..000000000000
--- a/sys-libs/pam/pam-1.5.2-r3.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="Linux-${PN^^}-${PV}"
-
-# Avoid QA warnings
-# Can reconsider w/ EAPI 8 and IDEPEND, bug #810979
-TMPFILES_OPTIONAL=1
-
-inherit autotools db-use fcaps flag-o-matic toolchain-funcs usr-ldscript multilib-minimal
-
-DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
-HOMEPAGE="https://github.com/linux-pam/linux-pam"
-
-SRC_URI="https://github.com/linux-pam/linux-pam/releases/download/v${PV}/${MY_P}.tar.xz
-	https://github.com/linux-pam/linux-pam/releases/download/v${PV}/${MY_P}-docs.tar.xz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="audit berkdb debug nis selinux"
-
-BDEPEND="
-	dev-libs/libxslt
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	app-alternatives/yacc
-"
-
-DEPEND="
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
-	audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] )
-	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	nis? ( net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	>=net-libs/libtirpc-0.2.4-r2:=[${MULTILIB_USEDEP}] )"
-
-RDEPEND="${DEPEND}"
-
-PDEPEND=">=sys-auth/pambase-20200616"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-musl.patch
-	"${FILESDIR}"/${PN}-1.5.2-clang-15-configure-implicit-func.patch
-)
-
-src_prepare() {
-	default
-	touch ChangeLog || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Do not let user's BROWSER setting mess us up. #549684
-	unset BROWSER
-
-	# This whole weird has_version libxcrypt block can go once
-	# musl systems have libxcrypt[system] if we ever make
-	# that mandatory. See bug #867991.
-	if use elibc_musl && ! has_version sys-libs/libxcrypt[system] ; then
-		# Avoid picking up symbol-versioned compat symbol on musl systems
-		export ac_cv_search_crypt_gensalt_rn=no
-
-		# Need to avoid picking up the libxcrypt headers which define
-		# CRYPT_GENSALT_IMPLEMENTS_AUTO_ENTROPY.
-		cp "${ESYSROOT}"/usr/include/crypt.h "${T}"/crypt.h || die
-		append-cppflags -I"${T}"
-	fi
-
-	local myconf=(
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		--with-db-uniquename=-$(db_findver sys-libs/db)
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog
-		--enable-securedir="${EPREFIX}"/$(get_libdir)/security
-		--includedir="${EPREFIX}"/usr/include/security
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--enable-pie
-		--enable-unix
-		--disable-prelude
-		--disable-doc
-		--disable-regenerate-docu
-		--disable-static
-		--disable-Werror
-		$(use_enable audit)
-		$(use_enable berkdb db)
-		$(use_enable debug)
-		$(use_enable nis)
-		$(use_enable selinux)
-		--enable-isadir='.' #464016
-		)
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake sepermitlockdir="/run/sepermit"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install \
-		sepermitlockdir="/run/sepermit"
-
-	gen_usr_ldscript -a pam pam_misc pamc
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	# tmpfiles.eclass is impossible to use because
-	# there is the pam -> tmpfiles -> systemd -> pam dependency loop
-
-	dodir /usr/lib/tmpfiles.d
-
-	cat ->>  "${D}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}.conf <<-_EOF_
-		d /run/faillock 0755 root root
-	_EOF_
-	use selinux && cat ->>  "${D}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}-selinux.conf <<-_EOF_
-		d /run/sepermit 0755 root root
-	_EOF_
-
-	local page
-
-	for page in doc/man/*.{3,5,8} modules/*/*.{5,8} ; do
-		doman ${page}
-	done
-}
-
-pkg_postinst() {
-	ewarn "Some software with pre-loaded PAM libraries might experience"
-	ewarn "warnings or failures related to missing symbols and/or versions"
-	ewarn "after any update. While unfortunate this is a limit of the"
-	ewarn "implementation of PAM and the software, and it requires you to"
-	ewarn "restart the software manually after the update."
-	ewarn ""
-	ewarn "You can get a list of such software running a command like"
-	ewarn "  lsof / | grep -E -i 'del.*libpam\\.so'"
-	ewarn ""
-	ewarn "Alternatively, simply reboot your system."
-
-	# The pam_unix module needs to check the password of the user which requires
-	# read access to /etc/shadow only.
-	fcaps cap_dac_override sbin/unix_chkpwd
-}
diff --git a/sys-libs/pkgcraft/Manifest b/sys-libs/pkgcraft/Manifest
index 2f16bc9f3566..0896d4f5661b 100644
--- a/sys-libs/pkgcraft/Manifest
+++ b/sys-libs/pkgcraft/Manifest
@@ -1,8 +1,4 @@
-DIST pkgcraft-c-0.0.11.tar.xz 31609776 BLAKE2B 9e341ddedebbfab61543e86eafa074700c9b1e9b415704eb1286419f88257d8c56a40f725855d4c92d7e0223dfe0fb645d4aa4a3849e9684b96943d65d174061 SHA512 75cd8d07c550fb6c60b7743918ff0b462ce3c39adedb537a9b12325ba6e1aab5fe7b138ffecd37bdcc2d94a810f6c9651311d5810f4fe0014410622c36233442
-DIST pkgcraft-c-0.0.12.tar.xz 30086644 BLAKE2B 29f80a345e31c222feb8489635f060d5097f32b010401e71d00603d30532bf90dde8eb79f243c634b3efba2a85c3c284507eda30d69e2e6444cfbd9ddcff503b SHA512 879793b1dfc5a67e7bc24477d9fe74e2c5e81c5c199ba9cf130b395b61cf41f53228269d85a06163ec7f1cc8dcb07f5c7ae51abc964083fbdd46b928b6dc9888
 DIST pkgcraft-c-0.0.13.tar.xz 29526760 BLAKE2B 5d87fcd427fcf5022bd5d9e24a80f52815d8c472b8eccc2d4b916be3b15faed868761c327d49693d6512807cefabd6120ce96772def99e81df0f87933a49caad SHA512 45bb65003ede7d9ae06a97360c5311e9ca75d5718d5107336e9c3511ad766bcda9ef87901bc57142b6d019aa95ebaf2f351fd69bf60a799aa1f904c452234168
-EBUILD pkgcraft-0.0.11-r1.ebuild 1985 BLAKE2B 13922fc7fec4b49b800c07e00ff386648ac88aadb890c5e845c94bc25d0a24b09c9356c9ee035aed516ab6e51961422b3a8fa40c9e2d91e00e780e9cc7a35722 SHA512 2d5f6660d0693a6255987e45f2900d2613e0f90c598446cd87efa3af946b23e77fccdcffa6dc2c06d8cc2b1843a2272fe14cbf6ab5c55db9c8988ad96faffa78
-EBUILD pkgcraft-0.0.12.ebuild 1985 BLAKE2B 13922fc7fec4b49b800c07e00ff386648ac88aadb890c5e845c94bc25d0a24b09c9356c9ee035aed516ab6e51961422b3a8fa40c9e2d91e00e780e9cc7a35722 SHA512 2d5f6660d0693a6255987e45f2900d2613e0f90c598446cd87efa3af946b23e77fccdcffa6dc2c06d8cc2b1843a2272fe14cbf6ab5c55db9c8988ad96faffa78
 EBUILD pkgcraft-0.0.13.ebuild 1985 BLAKE2B a072516fe65c900e77267d06fbe8d68bc9a73adcb5f26c375975e4dae724ffb8cc55cf41eb2999ba3b4fba9a9372c5b95d3e1402f0eaad5a7838dcc9be73d458 SHA512 70e2491943f670d56f4cefd0d31636b43b919d69403d47a17385885734fd136b459f58e9678c34762cb130016f395e225c0c58ac9ce65d64da9bba1d66e817b0
 EBUILD pkgcraft-9999.ebuild 1985 BLAKE2B a072516fe65c900e77267d06fbe8d68bc9a73adcb5f26c375975e4dae724ffb8cc55cf41eb2999ba3b4fba9a9372c5b95d3e1402f0eaad5a7838dcc9be73d458 SHA512 70e2491943f670d56f4cefd0d31636b43b919d69403d47a17385885734fd136b459f58e9678c34762cb130016f395e225c0c58ac9ce65d64da9bba1d66e817b0
 MISC metadata.xml 322 BLAKE2B b0ee0fc53eb8b4b485f74806a78b5560aaf53f1772d7bd3e5af4e03385b3f3aed18fc52462c2d49de6c0d735db0cae3fab175b8adc0e5f7c4baa89e28973776f SHA512 9343cd5028750182fe9325c44f4c4c7df0976b79e0422b66e0fd16f94be76eaa203e8ecad5ec2cbed3535f455f038e51968850ced9afb27af9a98b6b968df88a
diff --git a/sys-libs/pkgcraft/pkgcraft-0.0.11-r1.ebuild b/sys-libs/pkgcraft/pkgcraft-0.0.11-r1.ebuild
deleted file mode 100644
index 544df0ae2420..000000000000
--- a/sys-libs/pkgcraft/pkgcraft-0.0.11-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES=" "
-inherit edo cargo toolchain-funcs
-
-DESCRIPTION="C library for pkgcraft"
-HOMEPAGE="https://pkgcraft.github.io/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft"
-	inherit git-r3
-
-	S="${WORKDIR}"/${P}/crates/pkgcraft-c
-
-	BDEPEND="test? ( dev-util/cargo-nextest )"
-else
-	MY_P=${PN}-c-${PV}
-	SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${MY_P}/${MY_P}.tar.xz"
-	S="${WORKDIR}"/${MY_P}
-
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-DFS-2016"
-SLOT="0/${PV}"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# clang needed for bindgen
-BDEPEND+="
-	dev-util/cargo-c
-	sys-devel/clang
-	>=virtual/rust-1.70
-"
-
-QA_FLAGS_IGNORED="usr/lib.*/libpkgcraft.so.*"
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_compile() {
-	local cargoargs=(
-		--library-type=cdylib
-		--prefix=/usr
-		--libdir="/usr/$(get_libdir)"
-		$(usev !debug '--release')
-	)
-
-	# For scallop building bash
-	tc-export AR CC
-
-	# Can pass -vv if need more output from e.g. scallop configure
-	edo cargo cbuild "${cargoargs[@]}"
-}
-
-src_test() {
-	if [[ ${PV} == 9999 ]] ; then
-		# It's interesting to test the whole thing rather than just
-		# pkgcraft-c.
-		cd "${WORKDIR}"/${P} || die
-
-		# Need nextest per README (separate processes required)
-		# Invocation from https://github.com/pkgcraft/pkgcraft/blob/main/.github/workflows/ci.yml#L56
-		edo cargo nextest run $(usev !debug '--release') --color always --all-features --tests
-	else
-		# There are no tests for pkgcraft-c. Test via e.g. dev-python/pkgcraft.
-		:;
-	fi
-}
-
-src_install() {
-	local cargoargs=(
-		--library-type=cdylib
-		--prefix=/usr
-		--libdir="/usr/$(get_libdir)"
-		--destdir="${ED}"
-		$(usev !debug '--release')
-	)
-
-	edo cargo cinstall "${cargoargs[@]}"
-}
diff --git a/sys-libs/pkgcraft/pkgcraft-0.0.12.ebuild b/sys-libs/pkgcraft/pkgcraft-0.0.12.ebuild
deleted file mode 100644
index 544df0ae2420..000000000000
--- a/sys-libs/pkgcraft/pkgcraft-0.0.12.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES=" "
-inherit edo cargo toolchain-funcs
-
-DESCRIPTION="C library for pkgcraft"
-HOMEPAGE="https://pkgcraft.github.io/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft"
-	inherit git-r3
-
-	S="${WORKDIR}"/${P}/crates/pkgcraft-c
-
-	BDEPEND="test? ( dev-util/cargo-nextest )"
-else
-	MY_P=${PN}-c-${PV}
-	SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${MY_P}/${MY_P}.tar.xz"
-	S="${WORKDIR}"/${MY_P}
-
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-DFS-2016"
-SLOT="0/${PV}"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# clang needed for bindgen
-BDEPEND+="
-	dev-util/cargo-c
-	sys-devel/clang
-	>=virtual/rust-1.70
-"
-
-QA_FLAGS_IGNORED="usr/lib.*/libpkgcraft.so.*"
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_compile() {
-	local cargoargs=(
-		--library-type=cdylib
-		--prefix=/usr
-		--libdir="/usr/$(get_libdir)"
-		$(usev !debug '--release')
-	)
-
-	# For scallop building bash
-	tc-export AR CC
-
-	# Can pass -vv if need more output from e.g. scallop configure
-	edo cargo cbuild "${cargoargs[@]}"
-}
-
-src_test() {
-	if [[ ${PV} == 9999 ]] ; then
-		# It's interesting to test the whole thing rather than just
-		# pkgcraft-c.
-		cd "${WORKDIR}"/${P} || die
-
-		# Need nextest per README (separate processes required)
-		# Invocation from https://github.com/pkgcraft/pkgcraft/blob/main/.github/workflows/ci.yml#L56
-		edo cargo nextest run $(usev !debug '--release') --color always --all-features --tests
-	else
-		# There are no tests for pkgcraft-c. Test via e.g. dev-python/pkgcraft.
-		:;
-	fi
-}
-
-src_install() {
-	local cargoargs=(
-		--library-type=cdylib
-		--prefix=/usr
-		--libdir="/usr/$(get_libdir)"
-		--destdir="${ED}"
-		$(usev !debug '--release')
-	)
-
-	edo cargo cinstall "${cargoargs[@]}"
-}