gentoo resync : 19.04.2018

4 files changed, 12 insertions, 11 deletions

diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 1100eb3a8eb4..c111d12851ac 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -14,10 +14,10 @@ EBUILD libressl-2.4.5.ebuild 1288 BLAKE2B b0b15886c79d4711057dce71dd0bd087740a07
 EBUILD libressl-2.5.0.ebuild 1295 BLAKE2B 5a596e4f2129eed334a02e4bee41c703a7199d6c8398414d0660dc388ac69c3b566a0a4a7c36f3d8f57e30a48d69fe6f73a98fe6d06cb90a199c481841a4762d SHA512 2855b421ead68be0c5337fec2d4e4dbe957c6040e0dd731db73b20a5133b855b10e39891cc4eb7f78a29b92a4084c7e5c7fbf0cd86c0c2e39456f6786d0b53ba
 EBUILD libressl-2.5.4.ebuild 1315 BLAKE2B c72430f36cfbad6a855e22c97a191966aa9abf2bcf814ab72d9a72c60bfdc1b7dca3c8e4dd5fcbd92a00a3fcb9f72def28696b1668bd6855a50793cb1bb5d141 SHA512 44c432cd921f06c052625559817e2bd7e1322dbb23f6a83d85dc5acce31d5f0a11fa67d3a992dd469aab9eb3e948bf782a1b4ab39849162a4226e43c36282137
 EBUILD libressl-2.5.5.ebuild 1308 BLAKE2B 2c500d115a57666f18d47b1174cdf171b1a094cbb12255f19e863618694e7ead16e2ab911610b449ad5e8948f4144adfc7ea44854063d60a3cc676130acfa8f5 SHA512 cefb43c76305e0400efc8b0c33f142b47c8358186fad3329dcc2b22ce387d9b774d2bdea825fe1c8602ca5ab4f3594ea0dbdd551431b1f549454832bcaceaf33
-EBUILD libressl-2.6.0.ebuild 1339 BLAKE2B 972fca7ee193125ac70354489457eae41f8d63707b226dc7ba5adf1061069460e87f6c22be2917d8c5a3320295ae5cc4942ce73db641210b433309a907890e7f SHA512 347cee6db53b099328c4fee6d9a8f889398baa1fbb54889c12b04e83a685fe971b39310ee00dad494923afc7ce932bc7c2943f5645475a1711291b4efc766d8d
+EBUILD libressl-2.6.0.ebuild 1351 BLAKE2B c50aef1bf338ac7cde282311f4ee82fcf0b7174c419fc64b632222b1efe0b59d0845d072623e7e27bde8152a0b353d9ae727322db98db9be3cba609ff4df56f7 SHA512 6f02a29826b0ff0c97c24ad11a93420e2a3638531b67ed09d8a22ab1e7869994e266da9ddf4a05fb1ec3ea4147a3648ffc270934775925bdc3f782768b5edbd9
 EBUILD libressl-2.6.1.ebuild 1308 BLAKE2B 005fc03aa6f53f0b66029e24e322360c126d87e63c011d70e6628341397b266d7fb1fd3ff029e2bbe6a5a3e38f3f2e344c9b255389de51ec9f8391bead806253 SHA512 c4463fe8f0829a9714fe072971d744b991ae6578324ad4c313076d8294814dee6ee3c7827d5bc530fc3ce7e2f91aaa8c307c98d98161477495ad526f7d6daefb
 EBUILD libressl-2.6.2.ebuild 1308 BLAKE2B 005fc03aa6f53f0b66029e24e322360c126d87e63c011d70e6628341397b266d7fb1fd3ff029e2bbe6a5a3e38f3f2e344c9b255389de51ec9f8391bead806253 SHA512 c4463fe8f0829a9714fe072971d744b991ae6578324ad4c313076d8294814dee6ee3c7827d5bc530fc3ce7e2f91aaa8c307c98d98161477495ad526f7d6daefb
 EBUILD libressl-2.6.3-r2.ebuild 1315 BLAKE2B 27557c431220c36ead74810a6bec36f8c50e45efff1f76a57c26b0546d6a2a309a91e68e4156415f3bed7f2c1080a8c90764d00a3e5d1f91cbbd7a7f5574cad9 SHA512 817ac8f8a17a757cbada0e6978a880fd8ea1d84fae02c43b7ef0c48ea5a57c88fbb71e540bf4ac93d7fdf0698b0b8464fd482a6c9add2621215bafce8ecc46e2
-EBUILD libressl-2.6.4.ebuild 1312 BLAKE2B 02f50726d11d7fcef059dd50502d904d3e52c8811c7fc7ae32c26eaf721c39eb8a05be1a86f8f91b18da6b8caf940e3ae655820185367941a8642e8c174de490 SHA512 b7abaee2162673b5a746d5ccccaacbaddb05bd9dca87ca74bba584c3ac7d97599692f16036a2d3b92c89c19d546ec99de0fc81453e811826f4648c28b7943755
-EBUILD libressl-2.7.2.ebuild 1328 BLAKE2B 5336c18471c6bf59da562fcac0b531d6e698dd51ebe0278c3289c4f4cdbb55842d1f8a5df6d9c7b1d4156fa85f3629904e33b551803d2e909bfe90508e79523a SHA512 52e36b6f5ca5a65e4ec331f141c77c1effa072db202d9668735301f2f704e9aa4e347f4f0a4d2f1b53f90c6aa5b6abbbe6bdfef4ed5a55b4c4b9f0bd19f2f730
+EBUILD libressl-2.6.4.ebuild 1355 BLAKE2B 4ab22f89ae1cd6122d172e01c6a65f0e74cda30b9783671dd684525bcfec6b90c2f64c5c8dad7b41db469cbd3ac700eb3400883b82f63799b5bb81708d410461 SHA512 b9f774988a573d5638b3468dc3bd700bf5de2544bc3f89b8819c9f08d07a9484ab106cb08345161503952e46b2c7c82ac227651fb86affb053b6b7c4a7ba55b2
+EBUILD libressl-2.7.2.ebuild 1371 BLAKE2B 76d727e0cce777dcaec922367344125447ea62fa0135a56e2ead996f6cc8bdcc1200533dd96d3d64b1ef946b55c7c7a1de2235337baaa8e96297d49879041b5c SHA512 ba032fe0411d89b37192399ff6b182a621cb0a8cae63cea0dcf3892b3fce7a9c7886667593210099a61015379432f695bbe75458807a6415c2f968d71ed78c3c
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.6.0.ebuild b/dev-libs/libressl/libressl-2.6.0.ebuild
index 44ecf27ddcb0..2613eb39b531 100644
--- a/dev-libs/libressl/libressl-2.6.0.ebuild
+++ b/dev-libs/libressl/libressl-2.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils multilib-minimal
+inherit ltprune multilib-minimal
 
 DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
 HOMEPAGE="https://www.libressl.org/"
@@ -15,14 +15,13 @@ LICENSE="ISC openssl"
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/43"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="+asm static-libs"
+IUSE="+asm static-libs test"
+REQUIRED_USE="test? ( static-libs )"
 
 RDEPEND="!dev-libs/openssl:0"
 DEPEND="${RDEPEND}"
 PDEPEND="app-misc/ca-certificates"
 
-RESTRICT="test" # bug #625266
-
 src_prepare() {
 	touch crypto/Makefile.in
 
diff --git a/dev-libs/libressl/libressl-2.6.4.ebuild b/dev-libs/libressl/libressl-2.6.4.ebuild
index b4987334136f..d8f2130d4b1a 100644
--- a/dev-libs/libressl/libressl-2.6.4.ebuild
+++ b/dev-libs/libressl/libressl-2.6.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils multilib-minimal
+inherit ltprune multilib-minimal
 
 DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
 HOMEPAGE="https://www.libressl.org/"
@@ -15,7 +15,8 @@ LICENSE="ISC openssl"
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/44"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="+asm static-libs"
+IUSE="+asm static-libs test"
+REQUIRED_USE="test? ( static-libs )"
 
 RDEPEND="!dev-libs/openssl:0"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libressl/libressl-2.7.2.ebuild b/dev-libs/libressl/libressl-2.7.2.ebuild
index af207c40014f..d988e0c8f015 100644
--- a/dev-libs/libressl/libressl-2.7.2.ebuild
+++ b/dev-libs/libressl/libressl-2.7.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils multilib-minimal
+inherit ltprune multilib-minimal
 
 DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
 HOMEPAGE="https://www.libressl.org/"
@@ -16,7 +16,8 @@ LICENSE="ISC openssl"
 SLOT="0/45"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 KEYWORDS=""
-IUSE="+asm static-libs"
+IUSE="+asm static-libs test"
+REQUIRED_USE="test? ( static-libs )"
 
 RDEPEND="!dev-libs/openssl:0"
 DEPEND="${RDEPEND}"