gentoo auto-resync : 29:03:2023 - 03:52:19

3 files changed, 19 insertions, 58 deletions

diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index 16c4dbf614c1..e79fa4d565ce 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -1,6 +1,6 @@
 AUX 0.9.0-remove-boost_iostreams.patch 300 BLAKE2B 05ebeb2a34c0c22be1d743af65ed9d2b4533e5a72034f818dd3c691aa66796b6fef41fc320e1f1d8ec21fa687752a15486e3b0716bfd67fc169cb72b3400ed31 SHA512 baced99272969395b0c5698435d22df4a2ca9ee0eec7848e918cab5bd0832a0fd73d95bf199c795c9647ce7d46d1f62e54f60d69b7e452821fd6cca9b808bc7b
 AUX thin-provisioning-tools-0.7.0-build-fixes.patch 1077 BLAKE2B 540efcaff8a0f826f132aa06b5d63728d5b7e0de2da81ff65480537c10b4a769330f0e557496f1ce6116cce51b834057ffb6c967fb527deb419aee4d1f3d2ec5 SHA512 fbdf778774bca2e608bbab7696b6646c64ee740c40c743f40f28e7e360fc2a6c6c3752992d9d5f7bbb624a9240ba480a6e58a7c5956ba6d2b772ece18502afe7
 DIST thin-provisioning-tools-0.9.0.tar.gz 500998 BLAKE2B ac269fb6dfd1baf1572da27582ac2cd763b07aaac130a9467d05581e7a0ba1309d7dbf4c6095407111667e57af2e8183318d558ed23853f9c84b9c151c0878d9 SHA512 e1796fb3948847d72ca8247cae58017507c0a847a00201b93668eeb8fbfea4107c4c2affa5c211c149798a89b10474e83d2bd61a5545a668299be97aed591e0f
-EBUILD thin-provisioning-tools-0.9.0-r1.ebuild 1568 BLAKE2B 3e1e31a2a056187870750d1ca5f4eebcd17b9bb4ffa52bee71ff7bc362db0b5d5827b329c9c92799a1d17a0b8d8f4da2ab9110585377989ed009428daa818fc0 SHA512 325ef356e65b5ef6beeacb705358b9917a3461eaa5c154c658c974f45e21b246e709ef2a8c67ddcee4a2a5aa7a87876127650352d860c88ab99d28afa584ca13
-EBUILD thin-provisioning-tools-9999.ebuild 1513 BLAKE2B e96e3b15a980ec75e4ba1fdefbe6e5fcdb0595a11ec73e165b58acfec7e1e85e31755054325d82d0883f51f63bcd9fe366405e0c3ed4b878f9fc04752f5f2934 SHA512 7c33894d4b96487a91be560db7b43bdd08833ba7fc56173b4e6fc2368a6f1939f7c32f861ce1741c2329bf91a2616ff29d7c3349f6614d559a3611c05899d12f
+EBUILD thin-provisioning-tools-0.9.0-r1.ebuild 1457 BLAKE2B 7797c0ed12b24248d41d35272bc685fde86e0cc172f381a0e982c4aaf35fc50ac56730a30dfad0b71bb513b90e6122b9323ffa779547082c020cb80e05769f0d SHA512 c3d70219f8857aed27c662cee757a915c97bab371a001b7ad31779d490fabd81fd1ad25d4c43a47095f72f45fd62eaf214393c3a3061e7f76afb8b0f44d00473
+EBUILD thin-provisioning-tools-9999.ebuild 877 BLAKE2B 7b2f469c0abdf7e9b9eacaafd106e7c5a8358619e29236e6944cbd70be6b8014e35e4e1d8540e99b713f8431919b83c7334517b6151aa944b8eba4a8cdfdb0f8 SHA512 9efb97c37073a50143d1318c63387ed362f141f36bf1d09b04057b04cf7fb7c05510f082ba65896d88435778eba50ed7844bd0b50b01a3fe8643fda5cb064d83
 MISC metadata.xml 435 BLAKE2B 158935bdfedea370ca481492bd55c0de5c21e8dc3ecc56bf0428459b11ea624c23d2e050557d84f06eeac019acfba806997e9600f29ed13f27c523c13c0b57cb SHA512 fba525dba8ae7985731ef7542a248e9a4fffae4d511488a162174ccf24dcfcc96e312c1ea56754252595bd63513063c22312d33aef83b5b89c2279139539d128
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild
index bce347e847db..42ab5f59eb01 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,14 +27,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	test? (
-		|| (
-			dev-lang/ruby:2.7
-			dev-lang/ruby:2.6
-			dev-lang/ruby:2.5
-		)
 		>=dev-cpp/gtest-1.8.0
-		dev-util/cucumber
-		dev-util/aruba
 	)
 	dev-libs/boost"
 
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
index f9480dfe1fc3..6d318a86a818 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
@@ -1,72 +1,40 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools flag-o-matic
+inherit cargo
 
 DESCRIPTION="A suite of tools for thin provisioning on Linux"
 HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
 
-if [[ ${PV} != *9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/jthornber/thin-provisioning-tools.git"
+	inherit git-r3
+else
 	SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-else
-	inherit git-r3
-	EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git'
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="static test"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="dev-libs/expat[static-libs(+)]
-	dev-libs/libaio[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	test? (
-		|| (
-			dev-lang/ruby:2.7
-			dev-lang/ruby:2.6
-			dev-lang/ruby:2.5
-		)
-		>=dev-cpp/gtest-1.8.0
-		dev-util/cucumber
-		dev-util/aruba
-	)
-	dev-libs/boost"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.0-build-fixes.patch
-)
+# Rust
+QA_FLAGS_IGNORED="usr/sbin/pdata_tools"
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myeconfargs=(
-		--prefix="${EPREFIX}"/
-		--bindir="${EPREFIX}"/sbin
-		--with-optimisation=''
-		$(use_enable test testing)
-	)
-	STRIP=true econf "${myeconfargs[@]}"
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		default
+	fi
 }
 
 src_compile() {
 	emake V=
 }
 
-src_test() {
-	emake V= unit-test
-}
-
 src_install() {
 	emake V= DESTDIR="${D}" DATADIR="${ED}/usr/share" install
-	dodoc README.md TODO.org
 }