gentoo resync : 28.04.2019

5 files changed, 12 insertions, 15 deletions

diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index 7e17ef6bab53..a11e701ebacf 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -9,8 +9,8 @@ AUX up.sh 2865 BLAKE2B f359c0078148a8ec59b68227844f39d784df2271e9640b54f50a9c0b6
 DIST mock_msg.h 1356 BLAKE2B da7585cfeee89c0a4d3aa6326de6e2324804ed2a57a0e8bf7c2e51b25a91a8e1fcf9d29bba90fe58e40bf0197793a76fc1e83d8b6d677228cdc5e5333253b1a3 SHA512 930775a5837bc7f97a26817ea028782d555e0e71ba06b04c39941f4c01bbc3ca0a5dc63bcf19dc694e0e746b3a382f22daf6a6373a3443c5afd7398cbaaef6ea
 DIST openvpn-2.4.6.tar.gz 1431971 BLAKE2B 1ab0746a845fc56bf738c1730cc187c27f61d5bb763df149640978f0bf87450a01e3e40372265440f1aae4e1c58b6d9a1ee1f2aade970d19fd8e8813e0b487a7 SHA512 cdd70bfd03177bc6cb70d0d614e40389df00816b7097740b4cda9d7bee094d1463fdb5afeaf604c52c7b3167d1edb098a2e095e131a8b9fed0ed8b29da90cbe8
 DIST openvpn-2.4.7.tar.gz 998094 BLAKE2B 90f91d74279a547b49704cd14d9ac3dde26c522cd77eb851ea603addb1b220eda9be4de6cf5d74fe7717f34b3ff5fc802ca977a1402c5ed75616139d449fceb0 SHA512 ba9bc08c02fad85ba05c27488b0bfcb3540ba9c625c42334e24cb1d5e253b91c518c02641d755e03b8747ae8c2ebd340c55d51f7aedbbf2550ee4e4b79823c9c
-EBUILD openvpn-2.4.6-r1.ebuild 4586 BLAKE2B db7c3da2659728384d6bb78beb8ffa632c66dba467403d87250bdbaa4bdc008b6d4e73dda30c1bf747517927256e144ab0e49e2f419525937d293cc14f38082e SHA512 ba63e3d5cade6cae6ae13126aa974798caba94a2806d0f1da2610c891072b349af73f874f6374817d3d509e1e633cf2b1fd2afbf873c9fb5790059758dc6987d
-EBUILD openvpn-2.4.6.ebuild 4577 BLAKE2B e8828ba11b3d6026ebddd2f7c64aa351881b99f9bdc2ad480347db796eaf1fa139e1d3478135e53287439a97bd6904e6911b0ff361110b9d6e32e454ff76c6e6 SHA512 b906ae2d8281893d36ed87bf4b6a58c9d8dfd11dedc2f78bdbaf00f246a32a987b50347dd6142c9224e4744bb34146b154e31c9f68b9d938dc21c1bc12a4bf92
-EBUILD openvpn-2.4.7-r1.ebuild 4631 BLAKE2B 911f155893cedef53848906375d7ff6281496c797335852f64b0d9561b722c3293aeb45ae7d61bac5990791815624fef8b5f112b9321d29c8094435d6c27c065 SHA512 5568835996f6260ac3a2cc03c163b87178775c36c1fa2d53ba09f99f4a1be6c936adab153e7442757709bf28a6de4ac1bb92d2a3ac6183769dbbc542c7cb1702
-EBUILD openvpn-9999.ebuild 4291 BLAKE2B 0bd80862bf886f0ab5a859ac1894c8c786d8a861c3c87cbf70ce8000f1c842a9025c61382aca5e2c4361f626b460ab73cea5f265b7280e023d6d31d4d88860db SHA512 dbd5e8f80532d625c4403e461ed56ba87b1f36ad24c69d13e9c120298a08aa32a3993ee4283a7d436f890b9c284f0dd1c6c313c1ff334f4661d6c2017b7b3a14
+EBUILD openvpn-2.4.6-r1.ebuild 4570 BLAKE2B 553cf285d9b56c9980288a76086cc4c1e6c2966cd0faa9fef748d8d52ebd9d5cc753744af2b91040c9b13842a143018d982221bc38d0ddffd94670cdc19e19ae SHA512 0dbfab153334ac315aa2de9aee667ed0febcc48a0d5cc432e3ec404dc564fdbb35b52626141132ca12ac6638987e98484693bb5e4181de4627228ec9aaf68ce1
+EBUILD openvpn-2.4.6.ebuild 4562 BLAKE2B e6e9d019a5acb456fc52dff3e811045a846fbe1d26548dd2f9b6c4ef5ace5072d7921f095085f2dbbc5c7f6602f2aa2f18d18e20146b5c0842ce9f18fde95515 SHA512 66a74cdff4521b8e0b63b648cf6931e9e47c0d19aa831d00bacaaf5682598d582aa953cc7b6a7447e93606aa3b0db2ade5f80beee337c15e375f684243088736
+EBUILD openvpn-2.4.7-r1.ebuild 4615 BLAKE2B 31fe988c02831d6a8bc96e1cec0b7f3046ec7b78d72c8694c1f3f45b34c20d21656646aba643e552dc199d69df288ddd49c5f8f396c969cd421b105da0e8c56d SHA512 e973cc64e828761ea9a5439d39722d2e240118931d029eb868c86bb05ca4679941bff20ba98d3d71bc15c8ffc8148b4af69ffaac55afb084323d208e677410fd
+EBUILD openvpn-9999.ebuild 4303 BLAKE2B 0f3cbf8a1a16b74e86c95ff0b8b2890ff2c3170ba1f5e274e616a5dfd68310abcdb249075c3dd6b1490e6b161ec64e1aed6a1c3b476179bad8868cf1a4c9b727 SHA512 d0ab575c0144753c57c63bdef58b7ba0a8cb8c62c72b762153b607470a73c87388271c9c079010c2dee157c906fe45fe67a911ac0fbe75d90f934bf925906822
 MISC metadata.xml 1045 BLAKE2B 14b6e8113ca48e9c0511ace61b4df0d42d7875b8f6d54f7c4c60bb2f217c8ac15b2d806e7d30897a99caa326214e48386c7bf9839dcabc86831522ca435815c5 SHA512 5d86b34f307c95414b5ae0fddc6ea730dd5058f5198fc14d45f632bb7c4b6d8adf26b7b5971d4ba3ed5b8ff2267fb64d0ab7abc8c19c899929f235563cdceaec
diff --git a/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild
index 81d3d655a383..d90a72c8b4e0 100644
--- a/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild
@@ -18,7 +18,6 @@ IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
-	mbedtls? ( ssl !libressl )
 	pkcs11? ( ssl )
 	!plugins? ( !pam !down-root )
 	inotify? ( plugins )"
@@ -72,9 +71,9 @@ src_configure() {
 	IFCONFIG=/bin/ifconfig \
 	ROUTE=/bin/route \
 	econf \
-		$(usex mbedtls '--with-crypto-library=mbedtls' '') \
 		$(use_enable inotify async-push) \
 		$(use_enable ssl crypto) \
+		$(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \
 		$(use_enable lz4) \
 		$(use_enable lzo) \
 		$(use_enable pkcs11) \
diff --git a/net-vpn/openvpn/openvpn-2.4.6.ebuild b/net-vpn/openvpn/openvpn-2.4.6.ebuild
index 09a11b23f047..41badc7b0794 100644
--- a/net-vpn/openvpn/openvpn-2.4.6.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.6.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=6
@@ -18,7 +18,6 @@ IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
-	mbedtls? ( ssl !libressl )
 	pkcs11? ( ssl )
 	!plugins? ( !pam !down-root )
 	inotify? ( plugins )"
@@ -31,8 +30,8 @@ CDEPEND="
 	pam? ( virtual/pam )
 	ssl? (
 		!mbedtls? (
-			!libressl? ( >=dev-libs/openssl-0.9.8:* )
-			libressl? ( dev-libs/libressl )
+			!libressl? ( >=dev-libs/openssl-0.9.8:0= )
+			libressl? ( dev-libs/libressl:0= )
 		)
 		mbedtls? ( net-libs/mbedtls )
 	)
@@ -72,9 +71,9 @@ src_configure() {
 	IFCONFIG=/bin/ifconfig \
 	ROUTE=/bin/route \
 	econf \
-		$(usex mbedtls '--with-crypto-library=mbedtls' '') \
 		$(use_enable inotify async-push) \
 		$(use_enable ssl crypto) \
+		$(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \
 		$(use_enable lz4) \
 		$(use_enable lzo) \
 		$(use_enable pkcs11) \
diff --git a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
index 0ae13d41d8c6..47ecc313e5d0 100644
--- a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
@@ -18,7 +18,6 @@ IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
-	mbedtls? ( ssl !libressl )
 	pkcs11? ( ssl )
 	!plugins? ( !pam !down-root )
 	inotify? ( plugins )"
@@ -73,9 +72,9 @@ src_configure() {
 	IFCONFIG=/bin/ifconfig \
 	ROUTE=/bin/route \
 	econf \
-		$(usex mbedtls '--with-crypto-library=mbedtls' '') \
 		$(use_enable inotify async-push) \
 		$(use_enable ssl crypto) \
+		$(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \
 		$(use_enable lz4) \
 		$(use_enable lzo) \
 		$(use_enable pkcs11) \
diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild
index 8ad3d42ffc35..8cf7c4dc8093 100644
--- a/net-vpn/openvpn/openvpn-9999.ebuild
+++ b/net-vpn/openvpn/openvpn-9999.ebuild
@@ -64,10 +64,10 @@ src_configure() {
 	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
 	TMPFILES_DIR="/usr/lib/tmpfiles.d" \
 	econf \
-		--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
-		$(usex mbedtls 'with-crypto-library' 'mbedtls' '' '') \
+		--with-plugindir="${EPREFIX}/usr/$(get_libdir)/$PN" \
 		$(use_enable inotify async-push) \
 		$(use_enable ssl crypto) \
+		$(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \
 		$(use_enable lz4) \
 		$(use_enable lzo) \
 		$(use_enable pkcs11) \