6 files changed, 109 insertions, 31 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 758600f99ffe..b91aed85412c 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libucontext/Manifest b/sys-libs/libucontext/Manifest
index 54996ac98cf9..ef33e57346c5 100644
--- a/sys-libs/libucontext/Manifest
+++ b/sys-libs/libucontext/Manifest
@@ -1,6 +1,5 @@
-AUX libucontext-1.1-respect-CFLAGS.patch 368 BLAKE2B b04163e9e75ad3f8704d85d78091a41957cb072edd3ecbe58dbf45bf59c5ffb3662b5f96bf413eaaa5e328c964cbe99a70c6f8f23f4f8bc74bfdda7a0e45c54d SHA512 889b67269066ccdf84221dd1a636d4f6782f4c5f6800828f4068f3764b7e9d1797614d9f07f81864bc720f415c475c1b78aba38dd35355a54fcbf2f7a64a57ff
-DIST libucontext-1.1.tar.gz 25261 BLAKE2B 269b3899657779bc2c6a2f1c365242f0ee936afeb0acf74e48af5c1e6b96918bbaa239039508e7b1b1f7b358679fb4a222311b761223b69b9a3e7a9be2d0bc40 SHA512 05aed6f82a2b3d9dba896423335a7fc2fc5eddc87ed725f05e14488c6ddfcef10b835c928619439c7783e052baff7ef2dc162b6e06aa78992f6f611ca13c2e39
 DIST libucontext-1.2.tar.gz 29073 BLAKE2B 378816376877729776c41515ad1c3da36c24528bcdcf5272c4df2029b5273cf90228c163e87bd1af558129b1274d0b22632c4fa8ad2a0f37ac7014dae527a48e SHA512 f47b776517fa9e3fe48b762b11ae580c28bd7646f9e3ab843141d3e203f886326e68dd8040852ab1cb92dbd09d821161660c4be44e3025448d90131e74a4cf51
-EBUILD libucontext-1.1-r1.ebuild 1227 BLAKE2B 80165906c3525c3a1d8cd1079a509ff11cb8ec92833ea493e03103c775f99c4f303d86c33ee4fb921cb9c1dcdfc9e06b031e2c6158c1547a99a86edf7b4ff9ab SHA512 accd79cbc600ca4f02dcdc76f6ed7a964b8714238dfe2d5d44734ef3be472a998a6d04afa196c9a086e58ca18138c80b64973b4caa870ffe7e1ba5e579220ede
+DIST libucontext-1.3.1.tar.xz 24688 BLAKE2B d6a15644abda73ea3e1dd45d6bcbf42627ad4a17fe90ebe8067383f9abfa7c9f87fbb1ab7f21b8b57b88fbe496b57524370d7cbb0fcde5c6e42408c025c271f9 SHA512 9b3c7fc04aedbbed6f35fc18037b75472f8fa44d3c89f261ef923f46874251a10f49894f7a549b0b47d3ffdee1b6678929bdda95822d8043d76b5a1f34e4dc8a
 EBUILD libucontext-1.2.ebuild 1405 BLAKE2B 1fac14d814818573a5f4699a39655cd5f807a82c83659559a9f8465bab4930f93b6f1e32f3e3ecab4b93106bf8a0e9a199bf1d58faa7dda11fb4c00e55c45c10 SHA512 58869036d0005bb3873460980bc158fde56c88d8cce1a14fb26962c062f1e4a3e6f5d9ac3451953aa63cffddeaa4af45cb83c24b6c2cdcd794970f84bfd8d224
+EBUILD libucontext-1.3.1.ebuild 1349 BLAKE2B c9e782158b3d703bfd5851950e08ab00444e15744dfb304fa02142e5aac82f3f61b55d4d1c2e1d614e3cdac04c4bbe287ca59bba59ff4daf898f3ae691cacd82 SHA512 1b012210a1d0efa78940ba6cbaac194857f6620e6cc5a5bf8aae705c38d01c957eeb287a00d46e86496475564193a27f0243cd33137a62c8d3e731c079ef541e
 MISC metadata.xml 329 BLAKE2B 8958a3567263e9f2fc2409c2cd5858ca3e68659a45f67e5132fca640c6ffe05cac8810436f334b5c775ed049709f43aaf366cfecc97bc732a0917bb47aa5c34d SHA512 7b5d5832b22828f6a0600e3be45ff1da8ff340481a3602db6f5b8540373ff0ac3c72f0de64f00a1691598bbd9cea0128eb869cda67d8ac4894e3a51a7009a730
diff --git a/sys-libs/libucontext/files/libucontext-1.1-respect-CFLAGS.patch b/sys-libs/libucontext/files/libucontext-1.1-respect-CFLAGS.patch
deleted file mode 100644
index 49dd872690d5..000000000000
--- a/sys-libs/libucontext/files/libucontext-1.1-respect-CFLAGS.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/832677
-https://github.com/kaniini/libucontext/issues/39
---- a/Makefile
-+++ b/Makefile
-@@ -17,7 +17,7 @@ endif
- LIBDIR := /lib
- INCLUDEDIR := /usr/include
- PKGCONFIGDIR := /usr/lib/pkgconfig
--CFLAGS := -ggdb3 -O2 -Wall
-+CFLAGS ?= -ggdb3 -O2 -Wall
- CPPFLAGS := -Iinclude -Iarch/${ARCH} -Iarch/common
- EXPORT_UNPREFIXED := yes
- FREESTANDING := no
diff --git a/sys-libs/libucontext/libucontext-1.1-r1.ebuild b/sys-libs/libucontext/libucontext-1.3.1.ebuild
index 7ec73298a79c..ba313f31183c 100644
--- a/sys-libs/libucontext/libucontext-1.1-r1.ebuild
+++ b/sys-libs/libucontext/libucontext-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,23 +7,15 @@ inherit toolchain-funcs
 
 DESCRIPTION="ucontext implementation featuring glibc-compatible ABI"
 HOMEPAGE="https://github.com/kaniini/libucontext"
-SRC_URI="https://github.com/kaniini/libucontext/archive/refs/tags/${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${P}
+SRC_URI="https://distfiles.ariadne.space/libucontext/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
 IUSE="+man"
 
 BDEPEND="man? ( app-text/scdoc )"
 
-# segfault needs investigation
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1-respect-CFLAGS.patch
-)
-
 src_compile() {
 	tc-export AR CC
 
@@ -46,7 +38,8 @@ src_compile() {
 	emake \
 		ARCH="${arch}" \
 		LDFLAGS="${LDFLAGS}" \
-		LIBDIR="/usr/$(get_libdir)" \
+		libdir="/usr/$(get_libdir)" \
+		pkgconfigdir="/usr/$(get_libdir)/pkgconfig" \
 		all $(usev man 'docs')
 }
 
@@ -54,14 +47,19 @@ src_test() {
 	emake \
 		ARCH="${arch}" \
 		LDFLAGS="${LDFLAGS}" \
-		LIBDIR="/usr/$(get_libdir)" \
+		libdir="/usr/$(get_libdir)" \
+		pkgconfigdir="/usr/$(get_libdir)/pkgconfig" \
 		check
 }
 
 src_install() {
 	emake \
 		ARCH="${arch}" \
-		DESTDIR="${ED}" \
-		LIBDIR="/usr/$(get_libdir)" \
+		DESTDIR="${D}" \
+		prefix="${EPREFIX}/usr" \
+		libdir="${EPREFIX}/usr/$(get_libdir)" \
+		pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" \
 		install $(usev man 'install_docs')
+
+	find "${ED}" -name '*.a' -delete || die
 }
diff --git a/sys-libs/pkgcraft/Manifest b/sys-libs/pkgcraft/Manifest
index b00e08f420b4..04112ef5149a 100644
--- a/sys-libs/pkgcraft/Manifest
+++ b/sys-libs/pkgcraft/Manifest
@@ -1,6 +1,8 @@
 DIST pkgcraft-c-0.0.14.tar.xz 29920400 BLAKE2B dc163e0fb9bcdfb283346cc2bc2dfec9111d4d70c0bbd7b37b9306cd1bcf1d262e99b8126db71608f16807224ca6a357a7449d7076ab57b225745c7bb69c6080 SHA512 9d47788b60a00f5d006787fa38606f12a738a86e587cff0df5671a959d1e970860f31546117f44187f17c0fa8b52e6ac8ad6ec2a767abcc985e470d5a5f9f4a5
 DIST pkgcraft-c-0.0.15.tar.xz 22494284 BLAKE2B a1cccec51f0684282e5e962fc2c50a7a1ddb459dac0fb6c8d611aa4d51abc5a2394a5f3a43ad9599ae841b00678713559f1aeb7bc282309aa222d1024a50d67d SHA512 5e2c79c43f9e9113fc46b1c5cb9a78a70718eb9fd2ac9ba03d1586d6273649429b5f36ee5e832b58889914491ff9369803e509d5ba7c820a7e006df70cacf8e9
+DIST pkgcraft-c-0.0.16.tar.xz 20787816 BLAKE2B 085ee23fce8e03fa82fcec210e31f032cbe51354a14de2f2261329f432c0f6460363898d735dc7ed1c4115a184d6b7a3ff9a7c4d1697b12e34729cda54f6c234 SHA512 a805919375c8791b73a803a61c10df9ba0db87381f7fdec976428cf07b287bd10f02a6c97d1b7bb4d483b37a4ec6e027ae397067b658e4a4b422102e42d814e3
 EBUILD pkgcraft-0.0.14.ebuild 1990 BLAKE2B 80c23006c2a0138ca870fe094aee7f4420b24638b3e14ed97ebc37a0eef8f5b59a8bb0f8978073db97e344573aa1f0f8fc00ca95e69c5b62240ac8c7297cf2b1 SHA512 7f1ecf8cf0b821abd1ee344119da3755055b310381ecd7c4246b90ff773ca42685242ecf92b74c4a5604389fce8b437be7b6ad29bfb2965d860cc02529dea1c0
 EBUILD pkgcraft-0.0.15.ebuild 1990 BLAKE2B 5f23fe835aedf762e30aff6cb9b0d1414c0bc5eeca0ab668aac353d8428fa4f9365cd5989495b61d5e243db21140a73a6d77229b34e26a2df127b3a8db4bdaed SHA512 b68c3b3ec02e5da9cfe899a206150350188a4cfa52d1f77bfb47e17314c9763f8cafd637786cc41c0cdc6aa3f197e9770a0d024ff3c002ba8bc0d1fd7b90719e
+EBUILD pkgcraft-0.0.16.ebuild 1990 BLAKE2B 5f23fe835aedf762e30aff6cb9b0d1414c0bc5eeca0ab668aac353d8428fa4f9365cd5989495b61d5e243db21140a73a6d77229b34e26a2df127b3a8db4bdaed SHA512 b68c3b3ec02e5da9cfe899a206150350188a4cfa52d1f77bfb47e17314c9763f8cafd637786cc41c0cdc6aa3f197e9770a0d024ff3c002ba8bc0d1fd7b90719e
 EBUILD pkgcraft-9999.ebuild 1990 BLAKE2B 5f23fe835aedf762e30aff6cb9b0d1414c0bc5eeca0ab668aac353d8428fa4f9365cd5989495b61d5e243db21140a73a6d77229b34e26a2df127b3a8db4bdaed SHA512 b68c3b3ec02e5da9cfe899a206150350188a4cfa52d1f77bfb47e17314c9763f8cafd637786cc41c0cdc6aa3f197e9770a0d024ff3c002ba8bc0d1fd7b90719e
 MISC metadata.xml 322 BLAKE2B b0ee0fc53eb8b4b485f74806a78b5560aaf53f1772d7bd3e5af4e03385b3f3aed18fc52462c2d49de6c0d735db0cae3fab175b8adc0e5f7c4baa89e28973776f SHA512 9343cd5028750182fe9325c44f4c4c7df0976b79e0422b66e0fd16f94be76eaa203e8ecad5ec2cbed3535f455f038e51968850ced9afb27af9a98b6b968df88a
diff --git a/sys-libs/pkgcraft/pkgcraft-0.0.16.ebuild b/sys-libs/pkgcraft/pkgcraft-0.0.16.ebuild
new file mode 100644
index 000000000000..a964805ae71c
--- /dev/null
+++ b/sys-libs/pkgcraft/pkgcraft-0.0.16.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2023-2024 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.76
+"
+
+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[@]}"
+}