From 70a8e0f526762c28622fae5f944f8f59f9abf728 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 25 Sep 2023 11:25:16 +0100
Subject: gentoo auto-resync : 25:09:2023 - 11:25:16

---
 sys-apps/pkgcraft-tools/Manifest                   |  9 +---
 .../pkgcraft-tools-0.0.10-skip-flaky-test.patch    | 20 ---------
 .../pkgcraft-tools/pkgcraft-tools-0.0.10.ebuild    | 51 ----------------------
 .../pkgcraft-tools/pkgcraft-tools-0.0.11.ebuild    |  9 +++-
 .../pkgcraft-tools/pkgcraft-tools-0.0.9.ebuild     | 47 --------------------
 sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild |  9 +++-
 6 files changed, 18 insertions(+), 127 deletions(-)
 delete mode 100644 sys-apps/pkgcraft-tools/files/pkgcraft-tools-0.0.10-skip-flaky-test.patch
 delete mode 100644 sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.10.ebuild
 delete mode 100644 sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.9.ebuild

(limited to 'sys-apps/pkgcraft-tools')

diff --git a/sys-apps/pkgcraft-tools/Manifest b/sys-apps/pkgcraft-tools/Manifest
index b813107d7d92..c76ccf3de248 100644
--- a/sys-apps/pkgcraft-tools/Manifest
+++ b/sys-apps/pkgcraft-tools/Manifest
@@ -1,9 +1,4 @@
-AUX pkgcraft-tools-0.0.10-skip-flaky-test.patch 601 BLAKE2B 8689f7c81c963fdde6d51fcf5fa4b9731de83bcbea7f701df0e9a21f28c26de28d63bb26ec373dc81acebda70bbaa884eeeb4689007d3a2e51ad68ba4d104b45 SHA512 840ede6f6d43e74f7508ca7942af9e96adc86a03225678606a04f701d5bf58d946e3732d1cf71e3e3299873b612f821166f17d38b605c113208f4b6a10e4f468
-DIST pkgcraft-tools-0.0.10.tar.xz 20306544 BLAKE2B c17d1da2478b6afacb47168c717e3333c2ee74d134e2ce6fe032e022606057afa8ee2ab9a19ca1d74e14c1228da64caf5f59b269c86483d1367711054434da31 SHA512 cf81e9e72f954f0117c13b138ed1151501a83148ed3c39eb39d60337dccada82c79e7af5aafcdde480d3d23bfefd3bd136c3d2332819ae8cb3175968132a6718
 DIST pkgcraft-tools-0.0.11.tar.xz 31755828 BLAKE2B c47f59849ebb0b80ee9615d9b16e66f75cea2786e81a4cc521158d3e814f112328d2dbb5933bf247652772fce5277f5102f095b302df20a4f781077b2cdb0627 SHA512 59c38a888a7fb7da51001f3eff415dc8189a2073a5f06be11af2065265e7e8bf9e5747947f6d36b9ddfaaa261a4b4acfad05ba759f6f27dbe1c37d96d5976f45
-DIST pkgcraft-tools-0.0.9.tar.xz 18168280 BLAKE2B 3608c2dbe2443cca8335f0d119cf02904680c9795179ec9cecf82be350b232faab50fdc01ded9b6270659c3b097c6cd1b9256baec9a8c313e1f592b9a82f9d26 SHA512 32bf93adafcdf02f736282af0398c0cc12619589e41e9488b8dd38947cfb0f7b0e1916629c5f51bb5b2d2c00f165e3f2c4f15b34333e739789b1896f60599b64
-EBUILD pkgcraft-tools-0.0.10.ebuild 983 BLAKE2B ed469a1aa43cdc552117fd3397c5017743b1c868fea9a2e6e578a8d742b6961d717c5b794547285b56a67aea0ddc7c0446de3b30ed0b9c9a7c1b4f9ba394579c SHA512 393df22ca314f55876652b73b61d7f017ab775660bbc75d5d653627383bffdac713a1c618db62d46907829a422a270946c5bf364fedf338696d800835a0bfc7a
-EBUILD pkgcraft-tools-0.0.11.ebuild 949 BLAKE2B f7c28e9cb25abfb3cda8e6fbb46f30fc67eb1f02392ee74353aea09d3bc4b384e0118155ce02a11073ceb4f6d090aad5d3a9489a002b48b8d338c945ccac2f59 SHA512 25e7c7f897290883e5d0b0dd7aa8b53d11e05d9e1d43515da079d9cbf3a5f2bf9174023212007751fb2f71b09e02c282c3e68532689df29caf11661d27142c9e
-EBUILD pkgcraft-tools-0.0.9.ebuild 928 BLAKE2B c311f2252f0115157228d19f875a12455aa8a2f98f7f2a8a2bc2c5fb2b1781d276fa95b53871eb16f1cf5cc2958ec99702ffa84bafb12a29a917f97ee2e96a9a SHA512 6da2ed74401627b471499eb936aa2e374430cb809edab5c33a8eda911d8820296c3c6c6b1338991a1f061ee8341f1fa4420f4a7a3fb940cc623d558b29a04770
-EBUILD pkgcraft-tools-9999.ebuild 949 BLAKE2B f7c28e9cb25abfb3cda8e6fbb46f30fc67eb1f02392ee74353aea09d3bc4b384e0118155ce02a11073ceb4f6d090aad5d3a9489a002b48b8d338c945ccac2f59 SHA512 25e7c7f897290883e5d0b0dd7aa8b53d11e05d9e1d43515da079d9cbf3a5f2bf9174023212007751fb2f71b09e02c282c3e68532689df29caf11661d27142c9e
+EBUILD pkgcraft-tools-0.0.11.ebuild 1131 BLAKE2B 99e205dc085aa5246dcd350b064913e328449f2e929f89649d32317b7058c559834c64c297ec19791d4faa554730279557c8e264e3ac56bcb6ad5b05b3d3a337 SHA512 35c38480b562dc485c6feeddbbb3c342e12e5ab0c301c6f493c701abfcbfd9edc34d0f465b5924f548de5af67cdb79324f195d68777f530b8d08ce463c11d6a6
+EBUILD pkgcraft-tools-9999.ebuild 1131 BLAKE2B 99e205dc085aa5246dcd350b064913e328449f2e929f89649d32317b7058c559834c64c297ec19791d4faa554730279557c8e264e3ac56bcb6ad5b05b3d3a337 SHA512 35c38480b562dc485c6feeddbbb3c342e12e5ab0c301c6f493c701abfcbfd9edc34d0f465b5924f548de5af67cdb79324f195d68777f530b8d08ce463c11d6a6
 MISC metadata.xml 322 BLAKE2B b0ee0fc53eb8b4b485f74806a78b5560aaf53f1772d7bd3e5af4e03385b3f3aed18fc52462c2d49de6c0d735db0cae3fab175b8adc0e5f7c4baa89e28973776f SHA512 9343cd5028750182fe9325c44f4c4c7df0976b79e0422b66e0fd16f94be76eaa203e8ecad5ec2cbed3535f455f038e51968850ced9afb27af9a98b6b968df88a
diff --git a/sys-apps/pkgcraft-tools/files/pkgcraft-tools-0.0.10-skip-flaky-test.patch b/sys-apps/pkgcraft-tools/files/pkgcraft-tools-0.0.10-skip-flaky-test.patch
deleted file mode 100644
index b84460a88afa..000000000000
--- a/sys-apps/pkgcraft-tools/files/pkgcraft-tools-0.0.10-skip-flaky-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://github.com/pkgcraft/pkgcraft/commit/ae123d0b3ab979897fd959a1f03a1e3d24e8515d
-
-From ae123d0b3ab979897fd959a1f03a1e3d24e8515d Mon Sep 17 00:00:00 2001
-From: Tim Harder <radhermit@gmail.com>
-Date: Fri, 23 Jun 2023 23:21:46 -0600
-Subject: [PATCH] pk pkg source: disable -b/--bound testing until flakiness is
- fixed
-
---- a/tests/pk/pkg/source.rs
-+++ b/tests/pk/pkg/source.rs
-@@ -91,6 +91,7 @@ fn path_targets() {
- }
- 
- #[test]
-+#[ignore = "too flaky for general testing"]
- fn bound() {
-     let t = TempRepo::new("test", None, 0, None).unwrap();
-     t.create_ebuild("cat/fast-1", &[]).unwrap();
-
-
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.10.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.10.ebuild
deleted file mode 100644
index 8cf3d588c6ce..000000000000
--- a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.10.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES=" "
-LLVM_MAX_SLOT=16
-inherit cargo llvm
-
-DESCRIPTION="pkgcraft-based tools for Gentoo"
-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-tools
-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 GPL-3+ ISC MIT Unicode-DFS-2016"
-SLOT="0"
-
-QA_FLAGS_IGNORED="usr/bin/pk"
-
-# Clang needed for bindgen
-BDEPEND="
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1))
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-skip-flaky-test.patch
-)
-
-llvm_check_deps() {
-	has_version -b "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.11.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.11.ebuild
index ab222d8eafc9..bf887a5953d8 100644
--- a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.11.ebuild
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.11.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 CRATES=" "
 LLVM_MAX_SLOT=16
-inherit cargo llvm
+inherit edo cargo llvm
 
 DESCRIPTION="pkgcraft-based tools for Gentoo"
 HOMEPAGE="https://pkgcraft.github.io/"
@@ -25,6 +25,8 @@ LICENSE="MIT"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0 BSD-2 BSD CC0-1.0 GPL-3+ ISC MIT Unicode-DFS-2016"
 SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test ) "
 
 QA_FLAGS_IGNORED="usr/bin/pk"
 
@@ -32,6 +34,7 @@ QA_FLAGS_IGNORED="usr/bin/pk"
 BDEPEND="
 	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1))
 	>=virtual/rust-1.70
+	test? ( dev-util/cargo-nextest )
 "
 
 llvm_check_deps() {
@@ -46,3 +49,7 @@ src_unpack() {
 		cargo_src_unpack
 	fi
 }
+
+src_test() {
+	edo cargo nextest run $(usev !debug '--release') --color always --all-features --tests
+}
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.9.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.9.ebuild
deleted file mode 100644
index 249efde287e3..000000000000
--- a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.9.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES=" "
-LLVM_MAX_SLOT=16
-inherit cargo llvm
-
-DESCRIPTION="pkgcraft-based tools for Gentoo"
-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-tools
-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 GPL-3+ ISC MIT Unicode-DFS-2016"
-SLOT="0"
-
-QA_FLAGS_IGNORED="usr/bin/pk"
-
-# Clang needed for bindgen
-BDEPEND="
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1))
-"
-
-llvm_check_deps() {
-	has_version -b "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
index ab222d8eafc9..bf887a5953d8 100644
--- a/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 CRATES=" "
 LLVM_MAX_SLOT=16
-inherit cargo llvm
+inherit edo cargo llvm
 
 DESCRIPTION="pkgcraft-based tools for Gentoo"
 HOMEPAGE="https://pkgcraft.github.io/"
@@ -25,6 +25,8 @@ LICENSE="MIT"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0 BSD-2 BSD CC0-1.0 GPL-3+ ISC MIT Unicode-DFS-2016"
 SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test ) "
 
 QA_FLAGS_IGNORED="usr/bin/pk"
 
@@ -32,6 +34,7 @@ QA_FLAGS_IGNORED="usr/bin/pk"
 BDEPEND="
 	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1))
 	>=virtual/rust-1.70
+	test? ( dev-util/cargo-nextest )
 "
 
 llvm_check_deps() {
@@ -46,3 +49,7 @@ src_unpack() {
 		cargo_src_unpack
 	fi
 }
+
+src_test() {
+	edo cargo nextest run $(usev !debug '--release') --color always --all-features --tests
+}
-- 
cgit v1.2.3