gentoo resync : 28.04.2019

5 files changed, 44 insertions, 141 deletions

diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index df320136a26b..9d67d5bafa79 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -1,14 +1,11 @@
-AUX thin-provisioning-tools-0.6.3-build-fixes.patch 2206 BLAKE2B 7bed8f8a3eb9411674bca8a283ebe69bd241f6f2650928dfe6473c5d80a14b2e4ce20b35dba58280ece8c38253a24717e212e41fae3e8a8e292d275f8cc9f0f2 SHA512 1a9fee83de23f67a9b8051c3ccef47de212dedbc4dff585137628b7069fc204c7fbb116d3528db2e39c8fd8a104442ded83f303742b63a1981b06fd85a434353
 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
-DIST thin-provisioning-tools-0.6.3.tar.gz 198697 BLAKE2B 0bc9ae1ee650f4f2c553ca72e0569bcf2590174cde2b89084ff4347d78f0dbd08c29bbc9629498f2b8fe2149fb27eeee2e0b5928890224b9ead224fd1a3161d1 SHA512 ccebf5bb1ac2da56a3dab5b7ce8d61f6a71f84b5168c2680618d724340bbf8cf97c935c1bce966a296331d9dc048a855d81775d2a39f10b4096ab3ee835286d9
 DIST thin-provisioning-tools-0.7.0.tar.gz 230595 BLAKE2B 00238a682f80600e3a5bb6d0d2a9662bd0fd3ae5404d5895427f169640b469780f554c22c6a93187058e6399c76ba14a6fa8d73f2bb09aa79927dd458b58ffa9 SHA512 cb6c44c7215aadd72292d73e2374d8c0c28566adcb10c7a3de83576dbd28649ebba6e2cc59945a28921e423540969cb21f648c37e375d68f48e56a8be4a4c7b8
-DIST thin-provisioning-tools-0.7.5.tar.gz 278856 BLAKE2B f554a9001bc9dde3510e3702f184d48cd77ddfc04f16c7e054fea8a3a47fdce7796ca4fcdb8d155e3d22526535ae965e344b3c2735f6275a7702044536dff923 SHA512 65268cc0c68428fa89f039c097794f574ef79b1862de3208715b9180ba73b197f37d879b386b110c52d9f2d3e80fb069a8d48ee2939aa1fd2b88f2513babc763
 DIST thin-provisioning-tools-0.7.6.tar.gz 285428 BLAKE2B af74eff6d435f00e347872786fee8627f02844af122a9f1bf9ffd00234ce5275d3a61d9b4204313a19813cadbc0197bbeb9a1bd92d55992c6d9a03a299579e29 SHA512 395035b6f59fafb1c0f3e68750611e04f10223bc8d57b257e25c28c928647d1d2c6e94014b64ed90eeae1151fc7e5d23cf1aa428716e343338cb3c8fe55ed704
+DIST thin-provisioning-tools-0.8.0.tar.gz 305009 BLAKE2B 1002916cd7b455be21091007f68d12455476efc234a3892607152085adab37db03cea9959cf76d6903dad680b209d87ec62745b268daa02ff11667d0e070da8c SHA512 b95f320f8da94b52327d7afece98020de65c7a3eccf9e6d8e8f89600b9f984e3d4ae928b52c04dd973d0d87885354567f6d392e9551e0e7394158406bae79891
 EBUILD thin-provisioning-tools-0.4.1.ebuild 1295 BLAKE2B d41882d0b24f3641e6de64f115918ea9d90ba4f1bcdde9d710e12fd2d2352157119e5ac9816386cdfd7816b1b9f1e7a3b1467518b9aa0373ba7541082a035523 SHA512 c4360645c8cdcb3a1d85590630b077aa3ff0c658a4ee3a42c51c7ab807bdb535abc6ea12a4ec7a953cffa75a3a77b50a04fb40142da817543ee00e2a36fd55e9
-EBUILD thin-provisioning-tools-0.6.3.ebuild 1310 BLAKE2B f82450f18643858269b441a9dcc0d0cc6b2e80d3b17ce27dd5418d78225b1600e1748bbaeb9ebc9c826dca8b6c42f11247ae222676d979c368f47ea87235582a SHA512 7c00e74e0f4eb92a1a54df434ccd4e7d55d7c3808ce85de03f9942974d44697ab18d644c6910afe6959c5ec3d0aed029c5248ba656421221ee1c0877da342065
 EBUILD thin-provisioning-tools-0.7.0.ebuild 1306 BLAKE2B 30c35547bef9b7df248dd86d85d3a39868ae3573c4b6b9f81d5b85dfed98524ff64c17c54727f131eb479c1fcd54ff8bd9029026e799842da9e1cf9c651fe0da SHA512 67f0ee4b13d52bb480733ed5a94e1300918b518687ea511e604cff921712c93da478a305ef9ee3b82972ee085d9d5498b611bc7050b64e43fe11ad8a4f29b5be
-EBUILD thin-provisioning-tools-0.7.5.ebuild 1320 BLAKE2B 9e6308a4d050c42ef84b12d60fb11a0fdd122060127a8e5b44b1e48fa2e75bfd2186bec24fcab46afe104408b76b8655685db4b34850eab748928b27b2edd9e9 SHA512 72e4fb319e715afc5af130fc4d2cfb5d80992bbb9e803b4d8d8a63c46da9df66997f4862ce6d39c7b4895c6a8cec7260e3b4baca09500acf1bb9b2e9cccf91e8
 EBUILD thin-provisioning-tools-0.7.6.ebuild 1320 BLAKE2B 9e6308a4d050c42ef84b12d60fb11a0fdd122060127a8e5b44b1e48fa2e75bfd2186bec24fcab46afe104408b76b8655685db4b34850eab748928b27b2edd9e9 SHA512 72e4fb319e715afc5af130fc4d2cfb5d80992bbb9e803b4d8d8a63c46da9df66997f4862ce6d39c7b4895c6a8cec7260e3b4baca09500acf1bb9b2e9cccf91e8
-EBUILD thin-provisioning-tools-9999.ebuild 1470 BLAKE2B 3c023e493161cfa78a33f987406e55afe163581252a768f22767bb8fafe190e613664987d9c8e145711d85c159e6500ba14e5ac9493d1670c891f9a44a5ad4f8 SHA512 d1749913aca43f22a0d2cf7cfa3a56af612c4deafb03bcae826220f99421e03ccba2ce1249a6994f600e3bc881a4be30d7ccfe7a4f3729354e452b3447d5c282
+EBUILD thin-provisioning-tools-0.8.0.ebuild 1494 BLAKE2B bf3e6d902de15d0d15069b16a4f9cda59d67613c9686d07d389d32a7a69772a590ad2fa49977373cc22714d76d2e45af92a143577d89aa1ea85f58525b70ca0c SHA512 dd917a0dddb1846c65a5c7e394c81df1b4ec4e584c3c18aa49633e2084c17c8b0716c23fd54c0e96e9bf9a93ccff63788e258c6f2d54cce159d3191e86f73dab
+EBUILD thin-provisioning-tools-9999.ebuild 1494 BLAKE2B bf3e6d902de15d0d15069b16a4f9cda59d67613c9686d07d389d32a7a69772a590ad2fa49977373cc22714d76d2e45af92a143577d89aa1ea85f58525b70ca0c SHA512 dd917a0dddb1846c65a5c7e394c81df1b4ec4e584c3c18aa49633e2084c17c8b0716c23fd54c0e96e9bf9a93ccff63788e258c6f2d54cce159d3191e86f73dab
 MISC metadata.xml 531 BLAKE2B 37dbd49f21f2816fec9f5b620dae0e5d95f4233bedfcdcdd54d573899fc3aaf48ff6c82b62ceeb36f400924889ca52f3f826ed62c8333bc2723c40e1fe697117 SHA512 80fde34da9de5b2436c096bc9051ccb55124c330dc82ac538f66a100225623aa7cb0869041179999608cc52613e40ba464b46630cff52423c13d1a374eb98ed0
diff --git a/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.6.3-build-fixes.patch b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.6.3-build-fixes.patch
deleted file mode 100644
index ae1148a1626f..000000000000
--- a/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.6.3-build-fixes.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -purN a/Makefile.in b/Makefile.in
---- a/Makefile.in	2016-07-21 15:42:52.000000000 +0100
-+++ b/Makefile.in	2016-10-28 22:45:54.292931031 +0100
-@@ -108,7 +108,7 @@ CFLAGS?=@CFLAGS@
- CFLAGS+=-Wall
- CFLAGS+=@LFS_FLAGS@
- CXXFLAGS?=@CXXFLAGS@
--CXXFLAGS+=-Wall -fno-strict-aliasing -std=gnu++98
-+CXXFLAGS+=-Wall -fno-strict-aliasing
- CXXFLAGS+=@CXXOPTIMISE_FLAG@
- CXXFLAGS+=@CXXDEBUG_FLAG@
- CXXFLAGS+=@CXX_STRERROR_FLAG@
-diff -purN a/thin-provisioning/restore_emitter.cc b/thin-provisioning/restore_emitter.cc
---- a/thin-provisioning/restore_emitter.cc	2016-07-21 15:42:52.000000000 +0100
-+++ b/thin-provisioning/restore_emitter.cc	2016-10-28 22:49:32.662189111 +0100
-@@ -142,7 +142,7 @@ namespace {
- 		bool device_exists(thin_dev_t dev) const {
- 			uint64_t key[1] = {dev};
- 			device_tree::maybe_value v = md_->details_->lookup(key);
--			return v;
-+			return v.is_initialized();
- 		}
- 
- 		metadata::ptr md_;
-diff -purN a/thin-provisioning/thin_pool.cc b/thin-provisioning/thin_pool.cc
---- a/thin-provisioning/thin_pool.cc	2016-07-21 15:42:52.000000000 +0100
-+++ b/thin-provisioning/thin_pool.cc	2016-10-28 22:50:26.999256645 +0100
-@@ -232,7 +232,7 @@ bool
- thin_pool::device_exists(thin_dev_t dev) const
- {
- 	uint64_t key[1] = {dev};
--	return md_->details_->lookup(key);
-+	return md_->details_->lookup(key).is_initialized();
- }
- 
- //----------------------------------------------------------------
-diff -purN a/unit-tests/Makefile.in b/unit-tests/Makefile.in
---- a/unit-tests/Makefile.in	2016-07-21 15:42:52.000000000 +0100
-+++ b/unit-tests/Makefile.in	2016-10-28 22:45:20.985893955 +0100
-@@ -25,7 +25,7 @@ GMOCK_FLAGS=\
- 	-Wno-unused-local-typedefs
- 
- GMOCK_LIBS=\
--	-Llib -lpdata -lgmock -lpthread -laio
-+	-Llib -lpdata -lgmock -lpthread -laio -lgtest
- 
- GMOCK_DEPS=\
- 	$(wildcard $(GMOCK_DIR)/include/*.h) \
-@@ -80,7 +80,7 @@ TEST_OBJECTS=$(subst .cc,.gmo,$(TEST_SOU
- 	sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo $* : Makefile ,g' < $*.$$$$ > $*.d; \
- 	$(RM) $*.$$$$
- 
--unit-tests/unit_tests: $(TEST_OBJECTS) lib/libgmock.a lib/libpdata.a
-+unit-tests/unit_tests: $(TEST_OBJECTS)  lib/libpdata.a
- 	@echo "    [LD]  $<"
- 	$(V)g++ $(CXXFLAGS) $(LDFLAGS) -o $@ $(TEST_OBJECTS) $(LIBS) $(GMOCK_LIBS) $(LIBEXPAT)
- 
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.6.3.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.6.3.ebuild
deleted file mode 100644
index fdca9783f125..000000000000
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.6.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="A suite of tools for thin provisioning on Linux"
-HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
-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"
-IUSE="static 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.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"
-
-PATCHES=( "${FILESDIR}"/${P}-build-fixes.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	STRIP=true econf \
-		--prefix="${EPREFIX}"/ \
-		--bindir="${EPREFIX}"/sbin \
-		--with-optimisation='' \
-		$(use_enable test testing)
-}
-
-src_compile() {
-	MAKEOPTS+=" V="
-	default
-}
-
-src_test() {
-	emake unit-test
-}
-
-src_install() {
-	emake DESTDIR="${D}" DATADIR="${ED}/usr/share" install
-	dodoc README.md TODO.org
-}
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.5.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.0.ebuild
index 22a1164fc489..8b0eb97b2165 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.5.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,11 +7,17 @@ inherit autotools flag-o-matic
 
 DESCRIPTION="A suite of tools for thin provisioning on Linux"
 HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
-SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+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 ~s390 ~sh ~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"
-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(+)]
@@ -20,7 +26,11 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	test? (
-		|| ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 )
+		|| (
+			dev-lang/ruby:2.6
+			dev-lang/ruby:2.5
+			dev-lang/ruby:2.4
+		)
 		>=dev-cpp/gtest-1.8.0
 		dev-util/cucumber
 		dev-util/aruba
@@ -38,11 +48,13 @@ src_prepare() {
 
 src_configure() {
 	use static && append-ldflags -static
-	STRIP=true econf \
-		--prefix="${EPREFIX}"/ \
-		--bindir="${EPREFIX}"/sbin \
-		--with-optimisation='' \
+	local myeconfargs=(
+		--prefix="${EPREFIX}"/
+		--bindir="${EPREFIX}"/sbin
+		--with-optimisation=''
 		$(use_enable test testing)
+	)
+	STRIP=true econf "${myeconfargs[@]}"
 }
 
 src_compile() {
@@ -55,6 +67,6 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" DATADIR="${ED%/}/usr/share" install
+	emake DESTDIR="${D}" DATADIR="${D%/}/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 96d1cf0b494d..8b0eb97b2165 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git'
-inherit autotools flag-o-matic $SCM
+inherit autotools flag-o-matic
 
 DESCRIPTION="A suite of tools for thin provisioning on Linux"
 HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
@@ -13,6 +11,9 @@ 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 ~s390 ~sh ~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"
@@ -25,14 +26,20 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	test? (
-		|| ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 )
+		|| (
+			dev-lang/ruby:2.6
+			dev-lang/ruby:2.5
+			dev-lang/ruby:2.4
+		)
 		>=dev-cpp/gtest-1.8.0
 		dev-util/cucumber
 		dev-util/aruba
 	)
 	dev-libs/boost"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.7.0-build-fixes.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.0-build-fixes.patch
+)
 
 src_prepare() {
 	default
@@ -41,11 +48,13 @@ src_prepare() {
 
 src_configure() {
 	use static && append-ldflags -static
-	STRIP=true econf \
-		--prefix="${EPREFIX}"/ \
-		--bindir="${EPREFIX}"/sbin \
-		--with-optimisation='' \
+	local myeconfargs=(
+		--prefix="${EPREFIX}"/
+		--bindir="${EPREFIX}"/sbin
+		--with-optimisation=''
 		$(use_enable test testing)
+	)
+	STRIP=true econf "${myeconfargs[@]}"
 }
 
 src_compile() {
@@ -58,6 +67,6 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" DATADIR="${ED%/}/usr/share" install
+	emake DESTDIR="${D}" DATADIR="${D%/}/usr/share" install
 	dodoc README.md TODO.org
 }