gentoo resync : 20.10.2017

3 files changed, 39 insertions, 3 deletions

diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index af0f421dddcb..356e1b70a15c 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -1,15 +1,16 @@
 AUX thin-provisioning-tools-0.6.3-build-fixes.patch 2206 SHA256 721c4657d66fa00bef105c80c7d08c4882c9f3f1975b1816dee6764b0e53927a SHA512 1a9fee83de23f67a9b8051c3ccef47de212dedbc4dff585137628b7069fc204c7fbb116d3528db2e39c8fd8a104442ded83f303742b63a1981b06fd85a434353 WHIRLPOOL 0e7ed90d0ad1044465b4c65360c696f2f66ae019b22d6ac9a0d82d31cac660fe41ee062348c3db164bc97a5d95ada66ca9d4a80c749167afb32747d6f70ce45d
 AUX thin-provisioning-tools-0.7.0-build-fixes.patch 1077 SHA256 863806519182c7c07f79cf299ce7accf85c7132e112f7305bdcf21bde834ae0c SHA512 fbdf778774bca2e608bbab7696b6646c64ee740c40c743f40f28e7e360fc2a6c6c3752992d9d5f7bbb624a9240ba480a6e58a7c5956ba6d2b772ece18502afe7 WHIRLPOOL bfab3309c5218828ea0ab7ce2b4d1e6b6199ec593b6e5fa0e1e96aacafa5b84ce86fd13178db9f5e2d29730bd0feb9b164b74289f3873a51b32fe1c5d64c9c12
+AUX thin-provisioning-tools-0.7.4-disabled-tests_build_fix.patch 909 SHA256 ba0d9d6de8a5e67778569b492c6960f3f3242d5a48e23d215db1dc51f8dea00b SHA512 bed70d275d0cd98198432998e33ae8998141e03b066323a3cb38113030604dfde524dc5abe89a6fafab86e8700387340002585b950143fb3904adabd5c66e011 WHIRLPOOL 4742991ecaf4c4d32c547572f5b47c340735117399c5f0041e291245c32ee692a7b6555ec414ff2bd5d13a61e476387fa51a5772588a78759053097df670644e
 DIST thin-provisioning-tools-0.4.1.tar.gz 186979 SHA256 59c8a787df8d4828bf9ca1b6310584f2b7723068901e20aa609015ce85df1d46 SHA512 e148296b55f7ff4ab85dc3b4679c7eab0ee8d56e61415397fc2e46f17bcc16a6a582c17343381320f8582bc4f12311af622d43aabe60e7abb25a882446016b7e WHIRLPOOL a7e5da6879dfdc64d5e60e9072d43db21fb8f328d268366a6e4892cad9b2d55e907d564240f9bd67da0d726d80eab9d45e151bbe6d89272887703a8ae8b66c8c
 DIST thin-provisioning-tools-0.6.3.tar.gz 198697 SHA256 52d808c29dcaa83c142ceb2b418d01e9423811b082eff63fa0336bb7f0590c45 SHA512 ccebf5bb1ac2da56a3dab5b7ce8d61f6a71f84b5168c2680618d724340bbf8cf97c935c1bce966a296331d9dc048a855d81775d2a39f10b4096ab3ee835286d9 WHIRLPOOL b83c0aa081a27bfd0652d3d2d9786849e998487ce70864b8996b1e5f780b56753e52fa6a3243f62183692d9393643a0a30978069672fd4272e692dea98b93d88
 DIST thin-provisioning-tools-0.7.0.tar.gz 230595 SHA256 68a815860fce3f09f64ef241fd4ba45713f4c7be384fe116ec1dbea467684b32 SHA512 cb6c44c7215aadd72292d73e2374d8c0c28566adcb10c7a3de83576dbd28649ebba6e2cc59945a28921e423540969cb21f648c37e375d68f48e56a8be4a4c7b8 WHIRLPOOL 80201034dafd00617951a30369fc617a9c91b4408ec5c5272b4406c8f86caf0ff738938d6ef92d27a9ac96c3110edfa16609f0777c8592e6a100aeb3e02d3837
-DIST thin-provisioning-tools-0.7.1.tar.gz 247111 SHA256 da45e387bb7ad5b1b8727dc3e013a1136a18fe7a59bea19074a945ff6d73b925 SHA512 47ce2f0699e3bc21fa5bb1175e12fa8f545d2abfbed4529b144bd4812a4a0021635713c3e71228f20b30cbe067c77fb93db20b65075b2689ec2aa5b0385854b9 WHIRLPOOL 9723450f069df280b9dce3c53e0dff7342ed6757135ea3e07f7df5c081896d003aceafcb00af8f40a98aae7c42c401b7d363ebc4080f16435ba3962ae4f3edfb
 DIST thin-provisioning-tools-0.7.2.tar.gz 265819 SHA256 98e779cb3f9131bc0bb3051ac33ff93562085bee1cb5409f2184163d74092e7e SHA512 563363842ab0b92f563ac7fcaedb18b8fca70b0894ff30d55cc40487d53b035c32d3ef711adb7102ef1a55b26a75510239da2542b791d850a5cbccf1ddf1acdd WHIRLPOOL e0e0ab86a5d6746744b7cc2e75d3b9ea729ea7ecd4aa59b0eeaeaecf8746ddf10385b8ecad564d6dbab77e2defa641a717a0cbe83fab470a8dabc19013fcfff0
+DIST thin-provisioning-tools-0.7.4.tar.gz 276652 SHA256 f65f84e653e182480dacad77c611e13cd6de1c354e02fb4b96db4d2f328c3904 SHA512 cf7f15efc1dca4e4961ae72a1cafa46985639619da90d0ef192d14e0c45ae7996365f3f87846cce6d27259f72caf14cba653254414876687e4d14f500687b3cb WHIRLPOOL ffbf7c098ae5844aead5383a3f65df5b16d7c2ce3702f92cee5c4468b772fa777bc7ec1333f41c96a9b55d54a483d15386e19499fb034224339f1b6a79e77956
 EBUILD thin-provisioning-tools-0.4.1.ebuild 1556 SHA256 a88d41a8382734da8d584aa692078d0c3e941c4a574d6a2b93de6c0d36bf15d4 SHA512 aa53f7f3f63c1ba9b1f4921d08924a9a38db2346a96520f4b2fe3a43b8c13c824c8cf93f6651c2c3bbce8902e484351c710dd729bda15b5ade160f3a522f3d0a WHIRLPOOL fe50a8045dc133ded01e99a1d61a7d489cbcda06e0f79dbf4eb96c72af8674990a790e98c1d00091ee220e5c808ebe648b773bab0d60a10e0c087d7ff5ef7256
 EBUILD thin-provisioning-tools-0.6.3.ebuild 1535 SHA256 1263e4c9131ed3353be4c0cfc1802cbbd6304eec8163dc9d31b66896bcb70478 SHA512 2d0b39da75af09bb22226fe5e5078de529a50218fe0036ca4b5145b142147030609a6ab906fc216f056c90ef219c4d533ea08f013d25a316efc31648bfb13d7d WHIRLPOOL f3f26fee3638e854f39664cf5b4334df1519a75b52f397cc4c691cd34bdf257d00e0aef7d197e0e0cfd301d3f3456274df5ff80f0c2bb3c5f984c77e13801735
 EBUILD thin-provisioning-tools-0.7.0.ebuild 1523 SHA256 487c4478550ba34a67b574ca2e654bfa421f9994079b15ebdc23e97b7d7edddf SHA512 edd9fc811b465d130e3fb5b950bace1e3cbd187e98eea360c1eda0a5264dbd71763bb6f77a001efe6d1417abf62756949a197cc850ffd6698cc2eb50eba2e2d8 WHIRLPOOL d8015f6a289cd7b89d532193812610ace494d6f4258ebc072564a9685c13c839b3300aa4c1c2cc9bb6bb58a67f1a4638c1c9a377f0a491250d640b76f2c30f20
-EBUILD thin-provisioning-tools-0.7.1.ebuild 1526 SHA256 37660c240d4c2475496fcde3e2bddb195444f41769b586c66f4a4b2d864f6807 SHA512 8dd47fbcb609a0ae5ce12962f81c758e4108b4e68b7464749fbe0dee268578f049e5aa10d1b2083a3c320a6b77c1bb938ca8912241731ac64951a741bbd65b8b WHIRLPOOL 6db782ce195eb8ef7074cbf8cf5c4a1c10bbcfe542e9ddcff76d084aee1d4a4ab5bfd92a51026b63942442fa29905b559c55501ba46a14f81a5c4706296153fc
 EBUILD thin-provisioning-tools-0.7.2.ebuild 1526 SHA256 37660c240d4c2475496fcde3e2bddb195444f41769b586c66f4a4b2d864f6807 SHA512 8dd47fbcb609a0ae5ce12962f81c758e4108b4e68b7464749fbe0dee268578f049e5aa10d1b2083a3c320a6b77c1bb938ca8912241731ac64951a741bbd65b8b WHIRLPOOL 6db782ce195eb8ef7074cbf8cf5c4a1c10bbcfe542e9ddcff76d084aee1d4a4ab5bfd92a51026b63942442fa29905b559c55501ba46a14f81a5c4706296153fc
+EBUILD thin-provisioning-tools-0.7.4.ebuild 1586 SHA256 78a9eb10c64da348f0e7b3bf53e456a0c9a609ab27116a9b208ecb385917f472 SHA512 1deb6732a34855f7d0ae235f4aaa5d8a176569c3b48ea0dad2888d5d71bd5b6dc9b535215d8f6320f8f370ff316a3d19c11dae17ebb33ac68ac97a62e3ea253a WHIRLPOOL 1c7ef7966dd6918809caa4bdba90ece6aaf89f4d4cac631fde5267bf1c81c9f15c59b4268a10b5887bde0070a6eb84640b0ab69fcf8177ef148dd78695d3de87
 EBUILD thin-provisioning-tools-9999.ebuild 1677 SHA256 7125e5e2bba810678683818ee9603069b198fb70e758e0a0aeaf0e50f111d550 SHA512 dde0fa7fe6a63172082cb6520d4bd301b67a5c7dec68de3131417b25fd5a86d0fa4dfcbabf5707103c4d8df4f1fea28a7afc61b52bac0c8ba33b6fd30313da12 WHIRLPOOL 3b88c0b06f28ea6217f6b1f50ff446472c48155d320ef858ec6582a99ac4ecaa04cc25f5ba3c1f2febb9b18517e2e48546020ab7594e06233eba35ed6e79e24f
 MISC ChangeLog 4860 SHA256 98ff581f26c6eb93b79b955cf4a137bf649403ecbe987a3a19792d638997714e SHA512 4de4b7156c89d49b9b02248bca6d0b1ad9bb7f6c3e21ff2b0ffc7dcfec4a30f6c375442ffec2a98d4ca23de1f7589aa027541e0d7783788b0c76a7bce7368755 WHIRLPOOL 9e7c64037e390685a742b40f84f97da730e52b4292eed20bf7747d8e8c5e3ad55ee4406b89195cf1e0201d21c25732b31060661aa05e32c6e496f67b0ab9d591
 MISC ChangeLog-2015 10388 SHA256 e21c9629ea6d0bf35062cef7530a9f6108c08e84c052199ba7047fb4ebcb33f1 SHA512 95790b12c870ff343b7c905363a22f0f42f266ed26982790d6d5a211aa82a927d510487e89d2007c0b84a2884a5c803be0733d4fb5363281fd8608dbd1bfbe14 WHIRLPOOL 3f565d524d65d1f5a5f5a9c2103a1b5fde6a1f647d0506ffae9dfd6ff7380fa5457618db3697474c9673b63ab835e0ec2fc4625f6d6fc3d65f103db8e6a199b7
diff --git a/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.7.4-disabled-tests_build_fix.patch b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.7.4-disabled-tests_build_fix.patch
new file mode 100644
index 000000000000..f9a64b2188d0
--- /dev/null
+++ b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.7.4-disabled-tests_build_fix.patch
@@ -0,0 +1,32 @@
+From 8d75be81120b9cf172c95d0153c5f845ed804234 Mon Sep 17 00:00:00 2001
+From: Adam Sampson <ats-github@offog.org>
+Date: Mon, 16 Oct 2017 13:07:36 +0100
+Subject: [PATCH] [functional-tests] fix build with testing disabled (#88)
+
+The rule for lib/libft.so is only enabled with --enable-testing,
+so the default target shouldn't depend unconditionally on it.
+With the default configure options, the build failed with:
+make: *** No rule to make target 'lib/libft.so', needed by 'all'.  Stop.
+---
+ Makefile.in | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e745739..02b75dd 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -21,8 +21,13 @@ V=@
+ PROGRAMS=\
+ 	bin/pdata_tools
+ 
++ifeq ("@TESTING@", "yes")
++TESTLIBS=\
++	lib/libft.so
++endif
++
+ .PHONY: all
+-all: $(PROGRAMS) lib/libft.so
++all: $(PROGRAMS) $(TESTLIBS)
+ 
+ SOURCE=\
+ 	base/output_file_requirements.cc \
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.1.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.4.ebuild
index 36d3cd79766f..b0807e8fcff4 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.1.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.4.ebuild
@@ -29,7 +29,10 @@ DEPEND="${RDEPEND}
 	)
 	dev-libs/boost"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.7.0-build-fixes.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.0-build-fixes.patch
+	"${FILESDIR}/${P}-disabled-tests_build_fix.patch" #634868
+)
 
 src_prepare() {
 	default