gentoo xmass resync : 25.12.2021

5 files changed, 22 insertions, 11 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 9a0055aef878..ad5d6a371f43 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index e206f8b921a4..5778f698c859 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -1,7 +1,8 @@
+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.7.0.tar.gz 230595 BLAKE2B 00238a682f80600e3a5bb6d0d2a9662bd0fd3ae5404d5895427f169640b469780f554c22c6a93187058e6399c76ba14a6fa8d73f2bb09aa79927dd458b58ffa9 SHA512 cb6c44c7215aadd72292d73e2374d8c0c28566adcb10c7a3de83576dbd28649ebba6e2cc59945a28921e423540969cb21f648c37e375d68f48e56a8be4a4c7b8
 DIST thin-provisioning-tools-0.9.0.tar.gz 500998 BLAKE2B ac269fb6dfd1baf1572da27582ac2cd763b07aaac130a9467d05581e7a0ba1309d7dbf4c6095407111667e57af2e8183318d558ed23853f9c84b9c151c0878d9 SHA512 e1796fb3948847d72ca8247cae58017507c0a847a00201b93668eeb8fbfea4107c4c2affa5c211c149798a89b10474e83d2bd61a5545a668299be97aed591e0f
 EBUILD thin-provisioning-tools-0.7.0.ebuild 1288 BLAKE2B fe429bd318ab608b2161086cff3015440fd1feeaa21c03fe86c330a1045ab3c9a6efbddb6a5d414faa31757b81643299608b77fad174be8a1560523d6c8e857d SHA512 75e81c6096febf78c05d6cf9c7b9e1fb12975f5685742cd9ae48b4311343041e7af48325e6b13224c854b78882f879ede476fc915215a574d21872d846cc829e
-EBUILD thin-provisioning-tools-0.9.0.ebuild 1517 BLAKE2B 6e3758ef2a9ac2f0433f1d2281c5e256d77df24384fa4c9e9e354e5649126f295f8fb1394fc39fc8f5ade1683224923ac5c68171266e50c967aeac73bb3e15e7 SHA512 529722782298010aa872d61507d96a6d16ef17390df4b30b6ca5d5d2650e944a76e346c65298e160088b2aec91cd7fc83fd4fafab3cba0c0b7b71a98b337198c
-EBUILD thin-provisioning-tools-9999.ebuild 1523 BLAKE2B 8b969392d3686af5df169d3bf1d968c89a273c59c63b668754c7ef6a0469d1a0cdb7882b3c32b7dbbaabe2e45cce7e58651af612e481cf694eff4d7bcd74401c SHA512 2ee4796124ffdc043f31e104431feed55b55f19f06525d3c9b1c66a15c89f2d0cc16316d0d5fae10008f33d91ab1c45d350a17a6a4666235136190342e8a0074
+EBUILD thin-provisioning-tools-0.9.0-r1.ebuild 1556 BLAKE2B 2c523ff30dbe3fb6aec338b9b0ba0689fa93a4064446f0d7e3c0e83c4fc30fd214d665a3af32c422619c6de19baae42f27e967a813d266a1ecc99361daa3a803 SHA512 9fdddfba4692ec663dd2656bd702361fdbff69d82e9a714b109c64615184a0737cce2306bba3e70cafa294d63e2c9aae710224c4d7af31e1bf83c5d2d695a27d
+EBUILD thin-provisioning-tools-9999.ebuild 1513 BLAKE2B e96e3b15a980ec75e4ba1fdefbe6e5fcdb0595a11ec73e165b58acfec7e1e85e31755054325d82d0883f51f63bcd9fe366405e0c3ed4b878f9fc04752f5f2934 SHA512 7c33894d4b96487a91be560db7b43bdd08833ba7fc56173b4e6fc2368a6f1939f7c32f861ce1741c2329bf91a2616ff29d7c3349f6614d559a3611c05899d12f
 MISC metadata.xml 435 BLAKE2B 158935bdfedea370ca481492bd55c0de5c21e8dc3ecc56bf0428459b11ea624c23d2e050557d84f06eeac019acfba806997e9600f29ed13f27c523c13c0b57cb SHA512 fba525dba8ae7985731ef7542a248e9a4fffae4d511488a162174ccf24dcfcc96e312c1ea56754252595bd63513063c22312d33aef83b5b89c2279139539d128
diff --git a/sys-block/thin-provisioning-tools/files/0.9.0-remove-boost_iostreams.patch b/sys-block/thin-provisioning-tools/files/0.9.0-remove-boost_iostreams.patch
new file mode 100644
index 000000000000..87a1b4e2f7fd
--- /dev/null
+++ b/sys-block/thin-provisioning-tools/files/0.9.0-remove-boost_iostreams.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -173,7 +173,7 @@
+ CXXFLAGS+=@CXX_STRERROR_FLAG@
+ CXXFLAGS+=@LFS_FLAGS@
+ INCLUDES+=-I$(TOP_BUILDDIR) -I$(TOP_DIR) -I$(TOP_DIR)/thin-provisioning
+-LIBS:=-laio -lexpat -lboost_iostreams -ldl
++LIBS:=-laio -lexpat -ldl
+ 
+ ifeq ("@DEVTOOLS@", "yes")
+ LIBS+=-lncurses
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild
index a79debda1725..67629157177a 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
 
 if [[ ${PV} != *9999 ]]; then
 	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"
+	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'
@@ -40,6 +40,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.7.0-build-fixes.patch
+	"${FILESDIR}"/0.9.0-remove-boost_iostreams.patch
 )
 
 src_prepare() {
@@ -59,15 +60,14 @@ src_configure() {
 }
 
 src_compile() {
-	MAKEOPTS+=" V="
-	default
+	emake V=
 }
 
 src_test() {
-	emake unit-test
+	emake V= unit-test
 }
 
 src_install() {
-	emake DESTDIR="${D}" DATADIR="${ED}/usr/share" install
+	emake V= DESTDIR="${D}" DATADIR="${ED}/usr/share" install
 	dodoc README.md TODO.org
 }
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 ad10f7d89ec9..f9480dfe1fc3 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
@@ -59,15 +59,14 @@ src_configure() {
 }
 
 src_compile() {
-	MAKEOPTS+=" V="
-	default
+	emake V=
 }
 
 src_test() {
-	emake unit-test
+	emake V= unit-test
 }
 
 src_install() {
-	emake DESTDIR="${D}" DATADIR="${ED}/usr/share" install
+	emake V= DESTDIR="${D}" DATADIR="${ED}/usr/share" install
 	dodoc README.md TODO.org
 }