gentoo resync : 18.05.2019

3 files changed, 21 insertions, 7 deletions

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index bfc66e540bdb..dc8b21d3a6dc 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -12,6 +12,6 @@ DIST cryptsetup-2.2.0-rc0.tar.xz 10710468 BLAKE2B a65da89995c548af6de116b300dfde
 EBUILD cryptsetup-1.7.5-r1.ebuild 4033 BLAKE2B 77146c613eefaf677f4a0f77cb773b48829f520f988fb37c7ebc2b1df2e8d6269a02562a2e2f959029f563e9c89e0591160bbc5e22ec35875e4775bf20ba1da0 SHA512 0397db7c62308400767776b3caa614b8fe2dec4545ee1416eafb9116f9e458a6e26008ece4df870f40bc6270cd1b4340746b8fabb5f90418c7d9f18de852cf78
 EBUILD cryptsetup-2.0.5-r1.ebuild 4151 BLAKE2B eb67cb9e3424b5444bf298fafeb3cbf050e5420b4a2137c75e437a13b2b8a1ff642b40186d37f10ee92785074833f833cad44eca3bc3e9c0f91fd710ac9fcc50 SHA512 71c6948ff51c919ac6052ad65355ffb620049049ef21fe6545d39bb6d56adb843d5de25b722911d979becca9945f7d05d7cf1b240bb0d5448513a4fa7baad8cd
 EBUILD cryptsetup-2.0.6.ebuild 4167 BLAKE2B 0aaa413b365a5b3986e3908709e54af38af8191c2086168076d380321c8577cc686826b7f57fb1671bdf45adf141630f65e815842f0cf4703636a8caf7cee46b SHA512 c707d533fcfc71e5adcd3eacd9556ae0d87c65b9e283008daafe5aaa29056ed175bf5354c08638454677b75e99f0f77d51a0ea76a0006bb8812d721a46e8cef7
-EBUILD cryptsetup-2.1.0.ebuild 4190 BLAKE2B 2ac22e61228aac4586d6ec405cb35ea4dd97867e4b555f765987c9f703d248aeb591d7db0d8e2828e553be249cfc199424d7c1990bbd1f82717429358ec5d86f SHA512 f86859b7c431527558f490e027b45942983756f764de08410d899fe2b9e23245e37e56300a091ea3ae3460ccc52c693f208a48cab46d4af4cbe3888c91c1ebbf
-EBUILD cryptsetup-2.2.0_rc0.ebuild 4191 BLAKE2B b64c29fa6b4ae4d11598d7e978f6eb6e7799e8066d43a844874738ac9528301ddc8cac2ad1ed8a8e1591ab9574a691e6989abd455bc33c9b15d203b6e3c1454d SHA512 7d8ce5d53f6b2aa3545c968fa799f6b2e3b62fee271464b3abceb59c351b33d5b163a8328adfa6f8fb76ada4d3c9f1b939cc498b83d5402f9c6dcd7ceb15fb63
+EBUILD cryptsetup-2.1.0.ebuild 4414 BLAKE2B 604a658160a0575b23d391a0f54f304010e90b55ce0157b8af08c92846aeccd50cbce157d34a3836c5fb1d8ecd19e87de99d2a0192a8005f24d7a47960fb8eb0 SHA512 c3f2af42843a159002a45ffa75aaa9ca5b42af310841db63679621b33378362a4a98ef15082f720fae4f529a7a006c16dc2e5911f0127aa0cdd0a92bc401b0ab
+EBUILD cryptsetup-2.2.0_rc0.ebuild 4420 BLAKE2B dbe506b39f4bf619ba67273c5e39dcffcadfb87bafadcca89f7c57b16d09e9c36b27681ed18523a2d14289d2d37bf00cf5f9207d8bf711ac11b86c8cbbc462bf SHA512 71deb108361f6bd7c716b3ed1398dff73308f03a1c574a8457e2a04ad3df4241dc95726f48fa7ac652d67702b0ab2b6f5bd06e55a333c7e349e79c18ff9bfecc
 MISC metadata.xml 1074 BLAKE2B b1a6789b42307eb919717d35dabb48fc060490e561a1b5d4b0a25a2ba4dfe1399a7bf564c5477be61a68b7b5248153843f6892f95893e36257b9d790f8501779 SHA512 d070c22187874175ae93078fc80f4d150da102557cc680c8dd324ffe21de533ad67b4478f0d83e385ef5d4e75541bb04fd8308697db0ebf6ecd9f1e11382847b
diff --git a/sys-fs/cryptsetup/cryptsetup-2.1.0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.1.0.ebuild
index c69149192442..095fb0b3fc6a 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.1.0.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.1.0.ebuild
@@ -12,8 +12,10 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
-CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+# cryptsetup does _not_ have a libressl backend. We only have this for REQUIRED_USE
+# and change "libressl" to "openssl" in our econf call.
+CRYPTO_BACKENDS="gcrypt kernel libressl nettle +openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
 IUSE="${CRYPTO_BACKENDS} +argon2 libressl +luks1_default nls pwquality reencrypt static static-libs +udev urandom"
@@ -79,6 +81,11 @@ src_configure() {
 		ewarn "userspace crypto libraries."
 	fi
 
+	local x cryptobackend
+	for x in ${CRYPTO_BACKENDS//+/} ; do
+		use ${x} && cryptobackend="${x/libressl/openssl}"
+	done
+
 	local myeconfargs=(
 		--disable-internal-argon2
 		--enable-shared
@@ -86,7 +93,7 @@ src_configure() {
 		# for later use
 		--with-default-luks-format=LUKS$(usex luks1_default 1 2)
 		--with-tmpfilesdir="${EPREFIX%/}/usr/lib/tmpfiles.d"
-		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
+		--with-crypto_backend=${cryptobackend}
 		$(use_enable argon2 libargon2)
 		$(use_enable nls)
 		$(use_enable pwquality)
diff --git a/sys-fs/cryptsetup/cryptsetup-2.2.0_rc0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.2.0_rc0.ebuild
index 457a33aa1fbe..e0142bdc5218 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.2.0_rc0.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.2.0_rc0.ebuild
@@ -13,7 +13,9 @@ LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
 KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
+# cryptsetup does _not_ have a libressl backend. We only have this for REQUIRED_USE
+# and change "libressl" to "openssl" in our econf call.
+CRYPTO_BACKENDS="gcrypt kernel libressl nettle +openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
 IUSE="${CRYPTO_BACKENDS} +argon2 libressl +luks1_default nls pwquality reencrypt static static-libs +udev urandom"
@@ -79,6 +81,11 @@ src_configure() {
 		ewarn "userspace crypto libraries."
 	fi
 
+	local x cryptobackend
+	for x in ${CRYPTO_BACKENDS//+/} ; do
+		use ${x} && cryptobackend="${x/libressl/openssl}"
+	done
+
 	local myeconfargs=(
 		--disable-internal-argon2
 		--enable-shared
@@ -86,7 +93,7 @@ src_configure() {
 		# for later use
 		--with-default-luks-format=LUKS$(usex luks1_default 1 2)
 		--with-tmpfilesdir="${EPREFIX%/}/usr/lib/tmpfiles.d"
-		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
+		--with-crypto_backend=${cryptobackend}
 		$(use_enable argon2 libargon2)
 		$(use_enable nls)
 		$(use_enable pwquality)