gentoo resync : 08.06.2019

6 files changed, 94 insertions, 69 deletions

diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index 6ee14444b78a..cef6ea6449ba 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -1,13 +1,12 @@
 AUX thin-provisioning-tools-0.7.0-build-fixes.patch 1077 BLAKE2B 540efcaff8a0f826f132aa06b5d63728d5b7e0de2da81ff65480537c10b4a769330f0e557496f1ce6116cce51b834057ffb6c967fb527deb419aee4d1f3d2ec5 SHA512 fbdf778774bca2e608bbab7696b6646c64ee740c40c743f40f28e7e360fc2a6c6c3752992d9d5f7bbb624a9240ba480a6e58a7c5956ba6d2b772ece18502afe7
-DIST thin-provisioning-tools-0.4.1.tar.gz 186979 BLAKE2B d7e60b67f716c1398c4fa7230b3e0b57f62aa47cf6253806e4e3b932b0a71a489cf367ec9eb1e0a620dfab5a7ef0f4c2049a8ee5f5da0d94855fc3618dd03feb SHA512 e148296b55f7ff4ab85dc3b4679c7eab0ee8d56e61415397fc2e46f17bcc16a6a582c17343381320f8582bc4f12311af622d43aabe60e7abb25a882446016b7e
+AUX thin-provisioning-tools-0.8.5-libaio-0.3.112.patch 2516 BLAKE2B 22c2293a00838a1207a0892e93985c8350b5d8f75d1e1eecab4d74346780be57d82f40a44f3cee49e14fbc7bb5d50f62b110c7a34295a0fa76f98374003e3feb SHA512 a53dab2e755221daf3c38602a537f32fc60128cffef60ad309711c8c4e528c5ea888f8904c5f34597f1df023b4ad0b82b609c944095f8e628d66519178a1ab52
 DIST thin-provisioning-tools-0.7.0.tar.gz 230595 BLAKE2B 00238a682f80600e3a5bb6d0d2a9662bd0fd3ae5404d5895427f169640b469780f554c22c6a93187058e6399c76ba14a6fa8d73f2bb09aa79927dd458b58ffa9 SHA512 cb6c44c7215aadd72292d73e2374d8c0c28566adcb10c7a3de83576dbd28649ebba6e2cc59945a28921e423540969cb21f648c37e375d68f48e56a8be4a4c7b8
 DIST thin-provisioning-tools-0.7.6.tar.gz 285428 BLAKE2B af74eff6d435f00e347872786fee8627f02844af122a9f1bf9ffd00234ce5275d3a61d9b4204313a19813cadbc0197bbeb9a1bd92d55992c6d9a03a299579e29 SHA512 395035b6f59fafb1c0f3e68750611e04f10223bc8d57b257e25c28c928647d1d2c6e94014b64ed90eeae1151fc7e5d23cf1aa428716e343338cb3c8fe55ed704
-DIST thin-provisioning-tools-0.8.1.tar.gz 305013 BLAKE2B 647942c6b882ea12ff0429157b72c3fa2ef0d20abae003be4823383dff20b18bc7c447805cbea023c33698f3b00aaed0b5560b08844e2d3a35199b78a9acb871 SHA512 8f1edb7e50b897a070c6c04ea9c43725db3d725d6afcb5349bdedba59fce29faa680cd79bb47f255700054ee89e80f7063cde4c8abaa172e560f22459e004ce6
-DIST thin-provisioning-tools-0.8.2.tar.gz 305022 BLAKE2B ad4f7c088d890e111679a8de041ef0e05c30c5f4a46e96f7d0e1ca8034426d047dc9d2bbad624ba5e9371a5ebdd5be55ebc9486ed38c18c6fb764f8339806f3d SHA512 3aeaef4e720a14605181b700200ce6283e0e230034e5e787164a28043ae622f932e4fe8c166bc982e5e2e987cb2530027af08cc84443b2519cfbfc607c2b4681
-EBUILD thin-provisioning-tools-0.4.1.ebuild 1295 BLAKE2B d41882d0b24f3641e6de64f115918ea9d90ba4f1bcdde9d710e12fd2d2352157119e5ac9816386cdfd7816b1b9f1e7a3b1467518b9aa0373ba7541082a035523 SHA512 c4360645c8cdcb3a1d85590630b077aa3ff0c658a4ee3a42c51c7ab807bdb535abc6ea12a4ec7a953cffa75a3a77b50a04fb40142da817543ee00e2a36fd55e9
-EBUILD thin-provisioning-tools-0.7.0.ebuild 1306 BLAKE2B 30c35547bef9b7df248dd86d85d3a39868ae3573c4b6b9f81d5b85dfed98524ff64c17c54727f131eb479c1fcd54ff8bd9029026e799842da9e1cf9c651fe0da SHA512 67f0ee4b13d52bb480733ed5a94e1300918b518687ea511e604cff921712c93da478a305ef9ee3b82972ee085d9d5498b611bc7050b64e43fe11ad8a4f29b5be
+DIST thin-provisioning-tools-0.8.3.tar.gz 305338 BLAKE2B 619f73ef7bd802eb72649d0bdaa8ce1d6afb4d7ae442ac7d2d709764aaa5058bf77b12710a332cf5f8215cfb94e1d63c189951058e2373467ca88c847e32cd8d SHA512 a69645d45fd62a487903a07f922fd622b5fb9c7858e656b9468903005ab7daa3098aa89ae356f2458fcf95e3c0672bf486b424553d82ffae54b83c0b71599541
+DIST thin-provisioning-tools-0.8.5.tar.gz 305585 BLAKE2B 7e4bde537535db79e97ddab3cba775c89854362dac7da491c040badf5e3546d2e6ac4b8da8462edb59f50a2ecd95fe9c5e3349fca5e9acd588efaaf990617ca4 SHA512 1f9a1b6b9059f0b23ec3a00ddef223599292d447894316525f13b9c1e4f29d0371cb901d199cb503be4342555e016e5e6eb2d6e0e10c44b08e6c9478c573e1d4
+EBUILD thin-provisioning-tools-0.7.0.ebuild 1305 BLAKE2B 0a7ff0dc3d9051262d35ecd614043e43244b3b53038e56d18cae2933b839ea2f148aa0cad5e775dbc88b432dfe9695c764f8e43deb542934079443a4cf78f920 SHA512 8eb3e578dc7810e70b79d6476e3cf814e0838d6e03644cc507240dcc14cc240b387460389443718fbadc87c1a79e63f4a5ee15de3f27400c8f9aa6ca1e173cc1
 EBUILD thin-provisioning-tools-0.7.6.ebuild 1320 BLAKE2B 9e6308a4d050c42ef84b12d60fb11a0fdd122060127a8e5b44b1e48fa2e75bfd2186bec24fcab46afe104408b76b8655685db4b34850eab748928b27b2edd9e9 SHA512 72e4fb319e715afc5af130fc4d2cfb5d80992bbb9e803b4d8d8a63c46da9df66997f4862ce6d39c7b4895c6a8cec7260e3b4baca09500acf1bb9b2e9cccf91e8
-EBUILD thin-provisioning-tools-0.8.1.ebuild 1494 BLAKE2B bf3e6d902de15d0d15069b16a4f9cda59d67613c9686d07d389d32a7a69772a590ad2fa49977373cc22714d76d2e45af92a143577d89aa1ea85f58525b70ca0c SHA512 dd917a0dddb1846c65a5c7e394c81df1b4ec4e584c3c18aa49633e2084c17c8b0716c23fd54c0e96e9bf9a93ccff63788e258c6f2d54cce159d3191e86f73dab
-EBUILD thin-provisioning-tools-0.8.2.ebuild 1492 BLAKE2B df177df671080545e68ef381dea34b0a64a03f3c57ed88c184d1b893dd5a6f0a688b02c171f840bfb166eacb27f905c65f982fa26d56cbba7a7b3685d1081ff4 SHA512 41942199c194f92521cc2476502ac7405dc3c1f23a8f5a232ffb2edaa5a5407a27ad6a690991414b768c5277ead1f148e02236fe9f195c61eaae4b9d84d2bf61
+EBUILD thin-provisioning-tools-0.8.3.ebuild 1492 BLAKE2B df177df671080545e68ef381dea34b0a64a03f3c57ed88c184d1b893dd5a6f0a688b02c171f840bfb166eacb27f905c65f982fa26d56cbba7a7b3685d1081ff4 SHA512 41942199c194f92521cc2476502ac7405dc3c1f23a8f5a232ffb2edaa5a5407a27ad6a690991414b768c5277ead1f148e02236fe9f195c61eaae4b9d84d2bf61
+EBUILD thin-provisioning-tools-0.8.5.ebuild 1540 BLAKE2B a8f83d0cec08c5418020093c521e3576170369bfa1365478d4d5e4b697b99c546d9c253efd958d0cb0bbdb2b169cdd1a8e97989fd7da69573bd1e90bd3f1223f SHA512 9cea7b24cd3249834bf38c4377bddd219e8df5f4b1f593d5d1793730fbbdc528fde68f8ee68f2f3bef7114aaf11ada86b3162908e9a179fbc1c95e7fb6324bda
 EBUILD thin-provisioning-tools-9999.ebuild 1492 BLAKE2B df177df671080545e68ef381dea34b0a64a03f3c57ed88c184d1b893dd5a6f0a688b02c171f840bfb166eacb27f905c65f982fa26d56cbba7a7b3685d1081ff4 SHA512 41942199c194f92521cc2476502ac7405dc3c1f23a8f5a232ffb2edaa5a5407a27ad6a690991414b768c5277ead1f148e02236fe9f195c61eaae4b9d84d2bf61
 MISC metadata.xml 531 BLAKE2B 37dbd49f21f2816fec9f5b620dae0e5d95f4233bedfcdcdd54d573899fc3aaf48ff6c82b62ceeb36f400924889ca52f3f826ed62c8333bc2723c40e1fe697117 SHA512 80fde34da9de5b2436c096bc9051ccb55124c330dc82ac538f66a100225623aa7cb0869041179999608cc52613e40ba464b46630cff52423c13d1a374eb98ed0
diff --git a/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.8.5-libaio-0.3.112.patch b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.8.5-libaio-0.3.112.patch
new file mode 100644
index 000000000000..af31b90a40b7
--- /dev/null
+++ b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.8.5-libaio-0.3.112.patch
@@ -0,0 +1,84 @@
+From 6332962ee866f5289de87ab70cd3db863298982c Mon Sep 17 00:00:00 2001
+From: Joe Thornber <ejt@redhat.com>
+Date: Wed, 5 Jun 2019 15:02:05 +0100
+Subject: [PATCH] [ft-lib/bcache] rename raise() -> raise_()
+
+Name clash with signal.h on Debian and Gentoo.
+---
+ ft-lib/bcache.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/ft-lib/bcache.c b/ft-lib/bcache.c
+index 0dca5031..ee5b6c59 100644
+--- a/ft-lib/bcache.c
++++ b/ft-lib/bcache.c
+@@ -31,7 +31,7 @@ static void warn(const char *fmt, ...)
+ }
+ 
+ // FIXME: raise a condition somehow?
+-static void raise(const char *fmt, ...)
++static void raise_(const char *fmt, ...)
+ {
+ 	va_list ap;
+ 
+@@ -51,7 +51,7 @@ static inline struct list_head *list_pop(struct list_head *head)
+ 	struct list_head *l;
+ 
+ 	if (head->next == head)
+-		raise("list is empty\n");
++		raise_("list is empty\n");
+ 
+ 	l = head->next;
+ 	list_del(l);
+@@ -98,7 +98,7 @@ static struct cb_set *cb_set_create(unsigned nr)
+ static void cb_set_destroy(struct cb_set *cbs)
+ {
+ 	if (!list_empty(&cbs->allocated))
+-		raise("async io still in flight");
++		raise_("async io still in flight");
+ 
+ 	free(cbs->vec);
+ 	free(cbs);
+@@ -713,13 +713,13 @@ struct bcache *bcache_simple(const char *path, unsigned nr_cache_blocks)
+ 	uint64_t s;
+ 
+ 	if (fd < 0) {
+-		raise("couldn't open cache file");
++		raise_("couldn't open cache file");
+ 		return NULL;
+ 	}
+ 
+ 	r = fstat(fd, &info);
+ 	if (r < 0) {
+-		raise("couldn't stat cache file");
++		raise_("couldn't stat cache file");
+ 		return NULL;
+ 	}
+ 
+@@ -751,7 +751,7 @@ void bcache_destroy(struct bcache *cache)
+ static void check_index(struct bcache *cache, block_address index)
+ {
+ 	if (index >= cache->nr_data_blocks)
+-		raise("block out of bounds (%llu >= %llu)",
++		raise_("block out of bounds (%llu >= %llu)",
+ 		      (unsigned long long) index,
+ 		      (unsigned long long) cache->nr_data_blocks);
+ }
+@@ -802,7 +802,7 @@ static struct block *lookup_or_read_block(struct bcache *cache,
+ 		// FIXME: this is insufficient.  We need to also catch a read
+ 		// lock of a write locked block.  Ref count needs to distinguish.
+ 		if (b->ref_count && (flags & (GF_DIRTY | GF_ZERO)))
+-			raise("concurrent write lock attempt");
++			raise_("concurrent write lock attempt");
+ 
+ 		if (test_flags(b, BF_IO_PENDING)) {
+ 			miss(cache, flags);
+@@ -858,7 +858,7 @@ struct block *get_block(struct bcache *cache, block_address index, unsigned flag
+ 		return b;
+ 	}
+ 
+-	raise("couldn't get block");
++	raise_("couldn't get block");
+ 	return NULL;
+ }
+ 
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.4.1.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.4.1.ebuild
deleted file mode 100644
index 5466c28be1cd..000000000000
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.4.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A suite of tools for thin provisioning on Linux"
-HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
-EXT=.tar.gz
-BASE_A=${P}${EXT}
-SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}${EXT} -> ${BASE_A}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-libs/expat
-	dev-libs/libaio"
-DEPEND="${RDEPEND}
-	test? (
-		|| ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 )
-		>=dev-cpp/gtest-1.8.0
-		dev-util/cucumber
-		dev-util/aruba
-		)
-	dev-libs/boost"
-
-src_prepare() {
-	sed -i -e '/^INSTALL_PROGRAM/s:-s::' Makefile.in || die
-	sed -i \
-		-e '/^unit-tests\/unit_tests:/s:lib/libgmock.a::' \
-		-e '/-lgmock/s:$: -lgtest:' \
-		unit-tests/Makefile.in || die #493440
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--prefix="${EPREFIX}"/ \
-		--bindir="${EPREFIX}"/sbin \
-		--with-optimisation='' \
-		$(use_enable test testing)
-}
-
-src_compile() {
-	MAKEOPTS+=" V="
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" MANPATH="${D}"/usr/share/man install
-	dodoc README.md TODO.org
-}
-
-src_test() {
-	emake unit-test
-}
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
index 018fa6001355..b945b92a8b9a 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static test"
 
 LIB_DEPEND="dev-libs/expat[static-libs(+)]
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.2.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.3.ebuild
index f230773175a1..f230773175a1 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.2.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.3.ebuild
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.1.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.5.ebuild
index 8b0eb97b2165..037f7951d172 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.1.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools flag-o-matic
 
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.7.0-build-fixes.patch
+	"${FILESDIR}"/${PN}-0.8.5-libaio-0.3.112.patch
 )
 
 src_prepare() {
@@ -67,6 +68,6 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" DATADIR="${D%/}/usr/share" install
+	emake DESTDIR="${D}" DATADIR="${D}/usr/share" install
 	dodoc README.md TODO.org
 }