gentoo resync : 12.01.2019

4 files changed, 13 insertions, 14 deletions

diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index dec320c24bd5..e8aaaa48e4fa 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,6 +1,6 @@
 AUX softhsm-2.5.0-libressl.patch 1046 BLAKE2B e647878998493606d9941f1b4683be8f072f5c5779fb6aa6606857a12af7aa0228d349b722813449ed33a026ea5e8bec9b0e6235ac6c271f34c61fca7eafb4b4 SHA512 23c8048ef08417422194eb84d4581b4a1c443de6917608f953cdcb5b2433446272d937e05eabc6bae17d88061a0b3aa997355b7b47e71702dc52d69223972809
 DIST softhsm-2.4.0.tar.gz 1042566 BLAKE2B 01a0f4bdc589847c4a1f860c3e3f572644d874b11d7ab8e149e598fc123b75e898de9a46f73f5f2a107edcaeabdda29e4b9b6d54af5b95ad79a3c7b7b77b8bbf SHA512 f14f65de32206500f708523ee88d8d5e3d1fd40175f1a9cd24c7760c829e2de9dbcb05453022df8186836c49a57e4eae7f2e75ce6a5346a426114f4d610a8a84
 DIST softhsm-2.5.0.tar.gz 1078439 BLAKE2B f96f9e08f3ea568daccb64a5de94ac91b5efcee3dea09f460e98491e7fcdca1277ed52c339a2ec10dac2f78c9e7e44fe5c4a7d36c58e97afba6e749979d4d7e0 SHA512 a1e686729196dc25591eb3da57c2c8ea8494ed274ba711842b2dcae696f477a202acda13a975b8fb1eb68e8e44a79e839dbbc6ba500cab02ad13072c660752d9
-EBUILD softhsm-2.4.0.ebuild 1041 BLAKE2B c20642ae2741ce0941fa12b8ab4ba3162df9484c775a88c5e4a15b0e774471fc872b0c9d486a081afdda800d4e08b4798b05b44c32a387dd93b4ea1f433c2309 SHA512 721f120e09c2fc85154cecd824a85c36d499fcb11eb5173a52cb3c73c941fa7234d97492a1e675f04ceca192475cd31fde61313f0951eb0ba5618b434e483662
-EBUILD softhsm-2.5.0.ebuild 1089 BLAKE2B fc038b382c50a1f0b065dcf1145b5a74189119961f24432d78c89516cf3fb225a6de38118f63a5be9e2965b138810b395850e3f9d2a4c06cf06ad8bd4408a4df SHA512 d6f213a0edab60adc5c741f5a54d650ec4ee268c689e5b893ac1f4417f7f70cf90cf93d5b8dab105cfaa03dcea7ad4cb809b7e4693962233af1a79f83e00ebea
-MISC metadata.xml 322 BLAKE2B 64433451cd97495272e25d2bd1a4ad951781f7a61e47f1f048b13b4a1b4f577f9eb37f1145f1d9710969cfd9e38dd89aacc83641ec8b3bf0b36027c39a8dfe8b SHA512 b145c1ee8c20a9aad9c9b8e6f6526c596dd80a993faecb8e8caf6e930cf05e32f3e6ef5ad72c337a43c48cf57224f209e65d177567e3c5c577d3872eb11841a8
+EBUILD softhsm-2.4.0.ebuild 1034 BLAKE2B a23e92f44ed9bb03277cd3d124d4d1eb7e0a0eec0ec67b793d2c999d44490c63a546595bbba20b5913b8aedda9d7695b357ea05c3be9f1ec0610a9a6fc10b2d4 SHA512 bdf82fc5041a0c0eb40344f1a9a3393dfdc726118a1d9491cd57f68f40c1e97d5101e0e7ce071711a3182d8e772c93d2477205c3eee73100e43f4865c18dc882
+EBUILD softhsm-2.5.0.ebuild 1085 BLAKE2B a86e64d8a8bd46cd7f63b35fd6c1aa241ec688a8bcd0f526fb31aa96880b5f8093dbceb107fbfac76929421d06e4f6a14772795e3f35087d68dcce326ffd36ea SHA512 e1399d22f68ec1ede572605ba1d37f99d14338bff0fbc30ec2c332806959bcf248787b0da9be2c22ad679c1ed2f8b543f1b8c0960c9362518203ef9be046c9bc
+MISC metadata.xml 365 BLAKE2B 1661f2dba2653a4fd4ca4ed53b9d10ca647c3e13ec93eb21062505578489e4d403c497f304f18be655e116f7bdad253f79de7cf185af9512676c43ff5fe3f8f0 SHA512 a5641e507a0fb5bb77278a39c5dd3f9f228438f650e8ea8710855c0499521b88b7197d89d7c5866471826485e840863258520b026c3ca1b2eb7555bc842dd262
diff --git a/dev-libs/softhsm/metadata.xml b/dev-libs/softhsm/metadata.xml
index 1db90fe1ffe9..5b486dde6ca3 100644
--- a/dev-libs/softhsm/metadata.xml
+++ b/dev-libs/softhsm/metadata.xml
@@ -6,8 +6,7 @@
 		<name>Crypto</name>
 	</maintainer>
 	<use>
-		<flag name="migration-tool">
-		Build db migration tool
-		</flag>
+		<flag name="gost">Enable gost algorithm</flag>
+		<flag name="migration-tool">Build db migration tool</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-libs/softhsm/softhsm-2.4.0.ebuild b/dev-libs/softhsm/softhsm-2.4.0.ebuild
index ec4f819aecca..70b3e1b0f080 100644
--- a/dev-libs/softhsm/softhsm-2.4.0.ebuild
+++ b/dev-libs/softhsm/softhsm-2.4.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=7
@@ -8,12 +8,12 @@ HOMEPAGE="https://www.opendnssec.org/"
 SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
 
 KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bindist libressl migration-tool test"
+IUSE="bindist gost libressl migration-tool test"
 SLOT="2"
 LICENSE="BSD"
 
 RDEPEND="migration-tool? ( dev-db/sqlite:3 )
-	!libressl? ( dev-libs/openssl:=[bindist=] )
+	!libressl? ( dev-libs/openssl:0=[bindist=] )
 	libressl? ( dev-libs/libressl )
 	!~dev-libs/softhsm-2.0.0:0"
 DEPEND="${RDEPEND}"
@@ -33,7 +33,7 @@ src_configure() {
 		--disable-p11-kit \
 		--localstatedir="${EROOT}/var" \
 		$(use_enable !bindist ecc) \
-		$(use_enable !libressl gost) \
+		$(use_enable gost) \
 		$(use_with migration-tool migrate)
 }
 
diff --git a/dev-libs/softhsm/softhsm-2.5.0.ebuild b/dev-libs/softhsm/softhsm-2.5.0.ebuild
index efb92f3af4d2..c05dee21086a 100644
--- a/dev-libs/softhsm/softhsm-2.5.0.ebuild
+++ b/dev-libs/softhsm/softhsm-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,12 +8,12 @@ HOMEPAGE="https://www.opendnssec.org/"
 SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
 
 KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bindist libressl migration-tool test"
+IUSE="bindist gost libressl migration-tool test"
 SLOT="2"
 LICENSE="BSD"
 
 RDEPEND="migration-tool? ( dev-db/sqlite:3= )
-	!libressl? ( dev-libs/openssl:=[bindist=] )
+	!libressl? ( dev-libs/openssl:0=[bindist=] )
 	libressl? ( dev-libs/libressl:= )
 	!~dev-libs/softhsm-2.0.0:0"
 DEPEND="${RDEPEND}"
@@ -37,7 +37,7 @@ src_configure() {
 		--disable-p11-kit \
 		--localstatedir="${EROOT}/var" \
 		$(use_enable !bindist ecc) \
-		$(use_enable !libressl gost) \
+		$(use_enable gost) \
 		$(use_with migration-tool migrate)
 }