9 files changed, 171 insertions, 92 deletions
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index ead206bfde04..bd32a5695ff7 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,3 +1,4 @@
 DIST debootstrap-1.0.128+nmu2.tar.bz2 70406 BLAKE2B 7ba8f2cb63da3217594e9b058e1b0b4452823d9daeaaff0f91a298bd9d29ec16b332eda03259a12a9259dc759f63f1123654454341eb32f6fd882def0f3e4582 SHA512 a8baa7df3956d407c1b9344a0f0acb8162d951b55c3f402f7f04d8b652e00a366fd0e8be8fb4ecfd3997d6374c0271a329ccc631b32958a2296c73e389d622d3
 DIST debootstrap-1.0.134.tar.bz2 76120 BLAKE2B ce885d57a9c98864ea045dd3151553b57f6d9feadaba41df063f8f9056a7d1294ade2ac32374bc59cbfcae5993956bb68cb19759a109520419b8e1134563fddc SHA512 e7b9726632d3816975c8cbd0020882f69db6d2a84f6c2d086a4e002c58afa61f8b08a8a35b40dd6a284e2cdb584817292462e5dc354fb83d177d50a56aa8cda6
+DIST debootstrap-1.0.142.tar.bz2 78819 BLAKE2B ee7ef91e94471e34174b05e1ec459809db179aca6590ce6c778861a224a111d5e9722673a72b0d109202dc6c930c010ec92a4b6f9663e289488a8e316e4d501b SHA512 e979fecd3acd2c553869f2f03a7f2452e3c13159047c8eb34d16e683cc9db57bccdfebb9fa2b3e1ed609d86eca72c2b4a8edd7a104999b0302346c66b48e4b3b
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
diff --git a/dev-util/debootstrap/debootstrap-1.0.142.ebuild b/dev-util/debootstrap/debootstrap-1.0.142.ebuild
new file mode 100644
index 000000000000..1bfd6cf7cbb4
--- /dev/null
+++ b/dev-util/debootstrap/debootstrap-1.0.142.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="${PV/_p/+nmu}"
+
+DESCRIPTION="Debian/Ubuntu bootstrap scripts"
+HOMEPAGE="https://packages.qa.debian.org/d/debootstrap.html"
+SRC_URI="https://salsa.debian.org/installer-team/${PN}/-/archive/${MY_PV}/${PN}-${MY_PV}.tar.bz2
+	mirror://gentoo/devices.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	app-arch/dpkg
+	net-misc/wget
+	sys-devel/binutils
+"
+
+src_unpack() {
+	unpack "${PN}-${MY_PV}".tar.bz2
+	cp "${DISTDIR}"/devices.tar.gz "${S}" || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local DOCS=( TODO debian/changelog )
+	default
+	doman debootstrap.8
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
+		elog "To check Release files against a keyring (--keyring=K), please"
+		elog "install app-crypt/gnupg"
+	fi
+
+	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
+		elog "To check Release files from Debian or Ubuntu, please install"
+		elog " app-crypt/debian-archive-keyring or"
+		elog " app-crypt/ubuntu-keyring as required"
+	fi
+}
diff --git a/dev-util/fq/Manifest b/dev-util/fq/Manifest
index f7081e0e332d..4c477d22c719 100644
--- a/dev-util/fq/Manifest
+++ b/dev-util/fq/Manifest
@@ -1,8 +1,4 @@
-DIST fq-0.13.0-deps.tar.xz 12352972 BLAKE2B a30032d77aa03a901a2c936ab7652f6c65b5c9557c2e11a7e1910ebc230074d44d95e8a3cece35d867cbc552b0e68cc71d369f1939fcbfb9d52a1f87d03951b1 SHA512 4281b5961d57999842359ef0557000265609f6eb0a24341ad2e2862e0dd8d5c55206c876e4f6e306faf1ec2e6fcc2d5259c8d96049acfc98e0db36da48dbd2e3
-DIST fq-0.13.0.tar.gz 17869543 BLAKE2B 8d442d740a77653867e734a4bfec0ad837a449d060e8a9d061c4dbd84f1ce1ea48fcd8d17e84a878713feff8c0d9f6e8f93b1e14d7dcef8016ede74056788061 SHA512 c510e7c72e08c1267eb17060cd1969af4885e6d861d57951671118d79879f18173fae88384687f23797158433b567969c2ad0e5b5b3f97658d6fa1b7b1c7f7f1
-DIST fq-0.14.0-deps.tar.xz 12137204 BLAKE2B 4ac73adb456f039fea274f8e8c7ab8fd104beca9ee4bf6a1757071f3aeccf0de408111ac4c9772040be48b22b6f0c67730ffcf12a5034d42c0f0b457a52cfd99 SHA512 91c0f08e53cac8cdd0524c2240f88deaf4f02c198668e415b7a38e2e704880857bd5805771e4c52d4bff4ae1980eedd38e290319814690af73ec73d13b23df94
-DIST fq-0.14.0.tar.gz 17885309 BLAKE2B ec4f2c80ee86cb9ebd01006104a35ff390d802b379b953288dc72e3a5a712a8425c9d4bc999a270f08a3d109b87ea5b436897eb917a4af8550421b0b94940fea SHA512 0b2bb193d18ff068a5dad84176ca36de63be56987819d3775f3e7a8384e1b78f9910989d761bb29d884d4f990a6df5a319393282977ae8a2432e81359e84d06c
-DIST fq-0.15.0-deps.tar.xz 12166584 BLAKE2B 15361dcf080bb60777149328e42fe05c3f95161887452b81e98ea8c52bec7367e5979bc822d128b9803a47585b298a062c66405796513d5c3ba1d928a76d98d5 SHA512 c60bf5b0c9b43f937bdd53fd624ec07204f3fb6b21c8ff85b980118c0d718b2b2da7bc309d02659c7cca0c9883fa5d0de33756359b860198e4a2dfd972fc7569
-DIST fq-0.15.0.tar.gz 17886893 BLAKE2B d1c12e40350caad3358624c2d878c22d7c968a7c8cbf8a305dd48197281ae0e7657818b646de11b14e5762ba6ad25071634538b08ef8be93a5fcc1a95519e81a SHA512 0406ac9d2381900688aade6c4604d38bca326ceb1cfde17d457780736c5d3f313605cbbf8482401b3d3f26dbcef16243a04da2b7e1d62c80d3995be1323517e2
 DIST fq-0.15.1-deps.tar.xz 12415040 BLAKE2B d4e2f662af1aa222683120da75d21a496f86dc81225c1a69bd1e1ddeb62d8e11c24ce4d7ef261fccb63d4ddbedc8bd861e0d699ac8e26d3c403b9d53bc93d843 SHA512 7a0350e0895aafc5215afd3e8633f317779f39bfd6c9d3813d1006e25a9af38b39670c454b8566b35591bfe93d872663fe8118806c66aea1ba53bf0f7afb5b8c
 DIST fq-0.15.1.tar.gz 17886366 BLAKE2B f285c85698d3cacefcbeb69e7169dc1e7924d58997ac1713660ff407f94869e8c0c585b46108ca75f9608d0796e963e582105b2ed28ccb958b54e1d5b353161f SHA512 e6723d47b8b620feffa96f6e706d56ce20b41e9ae7e7a2443a09fa37d13b24b92313f54a3354d40b37f93e44ffca1825bcec914a92db40665c51688f686b517b
+DIST fq-0.16.0-deps.tar.xz 1116820 BLAKE2B f6c078fe79d5804341118b7aed5ab0c36932a069dcc027b59c58086aa5175b4e20dbcacdc594833953da62fbbf261f9ebf9f55a90cd808601033df449c312db0 SHA512 310c0982c17c23b42aa656bfcaa58c034847cf9810e4c5065e05d41fb79d9cd9decaa8faaefa6adf1ece1c45cc34183a321e195ad53ab4e64ddf8de648141b90
+DIST fq-0.16.0.tar.gz 17925924 BLAKE2B 1d7cc65e7932d4d7f33cd0cbc9ec50d6fd303ef2c1119c297befe8eb87b531984c758da561b93feccbafd4b1a577f78ee4166dc9aa113a424f43009003cf2140 SHA512 e8fa674e63c4128ffcfd92f04d859c63f58dd09aba77b4d91a6349bff5bb4300310db4c84412314e5cb4d5df61867b9bc363c9ecd2644af0e4d8c79419622567
diff --git a/dev-util/fq/fq-0.13.0.ebuild b/dev-util/fq/fq-0.13.0.ebuild
deleted file mode 100644
index 6830d05644b5..000000000000
--- a/dev-util/fq/fq-0.13.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="Tool for working with binary data (app-misc/jq for binary formats)"
-HOMEPAGE="https://github.com/wader/fq"
-SRC_URI="https://github.com/wader/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="MIT BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-tcltk/expect )"
-
-src_prepare() {
-	default
-
-	# Don't unconditionally (and therefore twice) build tests
-	# TODO: upstream
-	sed -i -e 's/all: test fq/all: fq/' Makefile || die
-}
-
-src_compile() {
-	# Avoid -s being set in Makefile (stripping)
-	export GO_BUILD_LDFLAGS="-w"
-
-	default
-}
-
-src_install() {
-	einstalldocs
-
-	dobin fq
-}
diff --git a/dev-util/fq/fq-0.14.0.ebuild b/dev-util/fq/fq-0.14.0.ebuild
deleted file mode 100644
index 78eb32435f66..000000000000
--- a/dev-util/fq/fq-0.14.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="Tool for working with binary data (app-misc/jq for binary formats)"
-HOMEPAGE="https://github.com/wader/fq"
-SRC_URI="https://github.com/wader/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="MIT BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-tcltk/expect )"
-
-src_prepare() {
-	default
-
-	# Don't unconditionally (and therefore twice) build tests
-	# TODO: upstream
-	sed -i -e 's/all: test fq/all: fq/' Makefile || die
-}
-
-src_compile() {
-	# Avoid -s being set in Makefile (stripping)
-	export GO_BUILD_LDFLAGS="-w"
-
-	default
-}
-
-src_install() {
-	einstalldocs
-
-	dobin fq
-}
diff --git a/dev-util/fq/fq-0.15.0.ebuild b/dev-util/fq/fq-0.16.0.ebuild
index 6d2b6b49262d..b1c22162dbf1 100644
--- a/dev-util/fq/fq-0.15.0.ebuild
+++ b/dev-util/fq/fq-0.16.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit go-module
+inherit go-env go-module
 
 DESCRIPTION="Tool for working with binary data (app-misc/jq for binary formats)"
 HOMEPAGE="https://github.com/wader/fq"
@@ -12,14 +12,23 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar
 
 LICENSE="MIT BSD-2"
 # Dependent licenses
-LICENSE+="  BSD BSD-2 MIT"
+LICENSE+=" BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( dev-tcltk/expect )"
 
+src_unpack() {
+	default
+
+	if [[ -d "${WORKDIR}"/vendor ]] ; then
+		mv "${WORKDIR}"/vendor "${S}"/vendor || die
+	fi
+	go-env_set_compile_environment
+}
+
 src_prepare() {
 	default
 
@@ -32,7 +41,11 @@ src_compile() {
 	# Avoid -s being set in Makefile (stripping)
 	export GO_BUILD_LDFLAGS="-w"
 
-	default
+	emake -Onone
+}
+
+src_test() {
+	emake -Onone test
 }
 
 src_install() {
diff --git a/dev-util/pkgcruft/Manifest b/dev-util/pkgcruft/Manifest
index 95d369d0f973..8e9f4519ac71 100644
--- a/dev-util/pkgcruft/Manifest
+++ b/dev-util/pkgcruft/Manifest
@@ -1 +1,2 @@
 DIST pkgcruft-0.0.16.tar.xz 42817544 BLAKE2B 351e3485ac7ff9c78bbeb768e7af7600921b2edecde7ec5c9d2bedc4ca980a4037ff23e4d3a1a27ffffc2cc5755fe23e7d3b86ab545eb0906f3b85dc6d72c680 SHA512 d5696896f41562723374fbcfc274cd60b5c556af4e0d9b093f56ebfb0ad0a15bd9496376e3da3400f5a955d47a18dfbe537c514a783b01b2df3cb7418c61880b
+DIST pkgcruft-0.0.18.tar.xz 35590536 BLAKE2B 07db1fa74888f5fd9a5cf900ef04c69e082fe02c5e8d10b1315c9f07ea4ddfbf8078f3d7555ac1ba3dfa6d3d54d2096932f1c682e6bfeeff22ee90d75563aa64 SHA512 c5a77a6e35f0bbda9ea07ba73a35bf5a9c6898069393b8b04b4ec7478d88ecec21e709e5ed748ecb97d2fd6ba8e9564d9efb6184d17871c7beac03d2d728ba00
diff --git a/dev-util/pkgcruft/pkgcruft-0.0.18.ebuild b/dev-util/pkgcruft/pkgcruft-0.0.18.ebuild
new file mode 100644
index 000000000000..be85423ae41e
--- /dev/null
+++ b/dev-util/pkgcruft/pkgcruft-0.0.18.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=" "
+LLVM_COMPAT=( {17..21} )
+RUST_MIN_VER="1.90.0"
+
+inherit cargo edo llvm-r2 multiprocessing shell-completion toolchain-funcs
+
+DESCRIPTION="QA library and tools based on 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/${PN}
+else
+	SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${P}/${P}.tar.xz"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 BSD-2 BSD CC0-1.0 CDLA-Permissive-2.0 ISC MIT MPL-2.0
+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# clang needed for bindgen
+BDEPEND+="
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+	')
+	test? ( dev-util/cargo-nextest )
+"
+
+QA_FLAGS_IGNORED="usr/bin/pkgcruft"
+
+pkg_setup() {
+	llvm-r2_pkg_setup
+	rust_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_compile() {
+	# For scallop building bash
+	# TODO: Package scallop
+	tc-export AR CC
+
+	cargo_src_compile
+
+	if [[ ${PV} == 9999 ]] ; then
+		einfo "Generating shell completions"
+		mkdir shell || die
+		local BIN="${WORKDIR}/${P}/$(cargo_target_dir)/pkgcruft"
+		"${BIN}" completion bash > shell/pkgcruft.bash || die
+		"${BIN}" completion zsh > shell/_pkgcruft || die
+		"${BIN}" completion fish > shell/pkgcruft.fish || die
+	fi
+}
+
+src_test() {
+	unset CLICOLOR CLICOLOR_FORCE
+
+	# TODO: Maybe move into eclass (and maybe have a cargo_enable_tests
+	# helper)
+	local -x NEXTEST_TEST_THREADS="$(makeopts_jobs)"
+
+	# The test failures appear ebuild-related
+	edo cargo nextest run $(usev !debug '--release') \
+		--color always \
+		--all-features \
+		--tests \
+		--no-fail-fast
+}
+
+src_install() {
+	cargo_src_install
+
+	newbashcomp shell/pkgcruft.bash pkgcruft
+	dozshcomp shell/_pkgcruft
+	dofishcomp shell/pkgcruft.fish
+}
diff --git a/dev-util/pkgcruft/pkgcruft-9999.ebuild b/dev-util/pkgcruft/pkgcruft-9999.ebuild
index b794367c9528..be85423ae41e 100644
--- a/dev-util/pkgcruft/pkgcruft-9999.ebuild
+++ b/dev-util/pkgcruft/pkgcruft-9999.ebuild
@@ -4,8 +4,8 @@
 EAPI=8
 
 CRATES=" "
-LLVM_COMPAT=( {17..20} )
-RUST_MIN_VER="1.88.0"
+LLVM_COMPAT=( {17..21} )
+RUST_MIN_VER="1.90.0"
 
 inherit cargo edo llvm-r2 multiprocessing shell-completion toolchain-funcs
 
@@ -58,6 +58,7 @@ src_unpack() {
 
 src_compile() {
 	# For scallop building bash
+	# TODO: Package scallop
 	tc-export AR CC
 
 	cargo_src_compile