sys-block/thin-provisioning-tools: Version Bump and Fixes for gcc-6

Thanks Jon for the ebuild and patch

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=598424

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec@gentoo.org>

4 files changed, 129 insertions, 11 deletions

diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index 5ab8254231b1..037df3ab19be 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -1,3 +1,4 @@
 DIST thin-provisioning-tools-0.4.1.tar.gz 186979 SHA256 59c8a787df8d4828bf9ca1b6310584f2b7723068901e20aa609015ce85df1d46 SHA512 e148296b55f7ff4ab85dc3b4679c7eab0ee8d56e61415397fc2e46f17bcc16a6a582c17343381320f8582bc4f12311af622d43aabe60e7abb25a882446016b7e WHIRLPOOL a7e5da6879dfdc64d5e60e9072d43db21fb8f328d268366a6e4892cad9b2d55e907d564240f9bd67da0d726d80eab9d45e151bbe6d89272887703a8ae8b66c8c
 DIST thin-provisioning-tools-0.5.3.tar.gz 191431 SHA256 6d6856dbca2f0fcf23ece171a8e68a4a7054350a3810958da37615358695597e SHA512 c36f85fc59b98195b7b6fa635b0d18da06b5798d735887dfa3af96bf6fa88bac0d353968ceae00de5960eb5360db70bc166fdd254a88b2246c36f6868c190e6d WHIRLPOOL cc85ff4c0bd0a9f7010bbbdfb9e9dd08d9dd1370ce5ca6ebc60626e05a2bfc52dec187dca546a8e6f4d9eb5dc786ea7063322b1b2bbfaec7cd022022fe428c3f
 DIST thin-provisioning-tools-0.6.1.tar.gz 197190 SHA256 4e7bf95e05176660250b63a5b26245d199a8510e1fede7287612c95aa54cc3f0 SHA512 7db37ac325fdecf69157896333fdd1b48b33c1a0bcf6b810b68be1ea2eb4dcd658db7ad668c3920ffb958527a5f75bd742f9fc0bc408a0858a8c5cb96ccde9d5 WHIRLPOOL d5fe4ae278bc9552259b628566505e145eed8ece77809986fff1f01be2d96240649f7f142537ff2217ac11e9470380cfa461f1cc44d5e5120c8584c4299c3b59
+DIST thin-provisioning-tools-0.6.3.tar.gz 198697 SHA256 52d808c29dcaa83c142ceb2b418d01e9423811b082eff63fa0336bb7f0590c45 SHA512 ccebf5bb1ac2da56a3dab5b7ce8d61f6a71f84b5168c2680618d724340bbf8cf97c935c1bce966a296331d9dc048a855d81775d2a39f10b4096ab3ee835286d9 WHIRLPOOL b83c0aa081a27bfd0652d3d2d9786849e998487ce70864b8996b1e5f780b56753e52fa6a3243f62183692d9393643a0a30978069672fd4272e692dea98b93d88
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
new file mode 100644
index 000000000000..ae1148a1626f
--- /dev/null
+++ b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.6.3-build-fixes.patch
@@ -0,0 +1,57 @@
+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/metadata.xml b/sys-block/thin-provisioning-tools/metadata.xml
index dafa0052591a..24ce9f15b9dd 100644
--- a/sys-block/thin-provisioning-tools/metadata.xml
+++ b/sys-block/thin-provisioning-tools/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>robbat2@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<longdescription lang="en">
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<longdescription lang="en">
 A suite of tools for thin provisioning on Linux.
 </longdescription>
-<upstream>
-	<remote-id type="github">jthornber/thin-provisioning-tools</remote-id>
-</upstream>
+	<upstream>
+		<remote-id type="github">jthornber/thin-provisioning-tools</remote-id>
+	</upstream>
 </pkgmetadata>
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
new file mode 100644
index 000000000000..2945158568e6
--- /dev/null
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.6.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 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(+)]} )"
+# || ( ) is a non-future proof workaround for Portage unefficiency wrt #477050
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	test? (
+		|| ( dev-lang/ruby:2.9 dev-lang/ruby:2.8 dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 )
+		>=dev-cpp/gmock-1.6
+		>=dev-cpp/gtest-1.6
+		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
+}