app-crypt/qca: rename openssl USE flag -> ssl

Gentoo-bug: 592706

Package-Manager: portage-2.3.2

3 files changed, 12 insertions, 13 deletions

diff --git a/app-crypt/qca/metadata.xml b/app-crypt/qca/metadata.xml
index a92ea3e2cd6a..dff1320aa6b8 100644
--- a/app-crypt/qca/metadata.xml
+++ b/app-crypt/qca/metadata.xml
@@ -19,7 +19,6 @@
 	<flag name="gpg">Enable GnuPG plugin</flag>
 	<flag name="logger">Enable logger plugin</flag>
 	<flag name="nss">Enable NSS plugin</flag>
-	<flag name="openssl">Enable OpenSSL plugin</flag>
 	<flag name="pkcs11">Enable PKCS#11 plugin</flag>
 	<flag name="sasl">Enable SASL plugin</flag>
 	<flag name="softstore">Enable softstore plugin</flag>
diff --git a/app-crypt/qca/qca-2.1.1-r1.ebuild b/app-crypt/qca/qca-2.1.1-r1.ebuild
index ff969a702085..0ad3980c8f38 100644
--- a/app-crypt/qca/qca-2.1.1-r1.ebuild
+++ b/app-crypt/qca/qca-2.1.1-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
-IUSE="botan debug doc examples gcrypt gpg libressl logger nss +openssl pkcs11 +qt4 qt5 sasl softstore test"
+IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 +qt4 qt5 sasl softstore +ssl test"
 REQUIRED_USE="|| ( qt4 qt5 )"
 
 RDEPEND="
@@ -27,10 +27,6 @@ RDEPEND="
 	gcrypt? ( dev-libs/libgcrypt:= )
 	gpg? ( app-crypt/gnupg )
 	nss? ( dev-libs/nss )
-	openssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
 	pkcs11? (
 		!libressl? ( dev-libs/openssl:0 )
 		libressl? ( dev-libs/libressl )
@@ -43,6 +39,10 @@ RDEPEND="
 		dev-qt/qtnetwork:5
 	)
 	sasl? ( dev-libs/cyrus-sasl:2 )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
 "
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
@@ -78,10 +78,10 @@ src_configure() {
 			$(qca_plugin_use gpg gnupg)
 			$(qca_plugin_use logger)
 			$(qca_plugin_use nss)
-			$(qca_plugin_use openssl ossl)
 			$(qca_plugin_use pkcs11)
 			$(qca_plugin_use sasl cyrus-sasl)
 			$(qca_plugin_use softstore)
+			$(qca_plugin_use ssl ossl)
 			-DBUILD_TESTS=$(usex test)
 		)
 
diff --git a/app-crypt/qca/qca-2.1.1.ebuild b/app-crypt/qca/qca-2.1.1.ebuild
index 3ac1973e96ef..81e1b32b3442 100644
--- a/app-crypt/qca/qca-2.1.1.ebuild
+++ b/app-crypt/qca/qca-2.1.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1"
 SLOT="2"
 KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
-IUSE="botan debug doc examples gcrypt gpg libressl logger nss +openssl pkcs11 +qt4 qt5 sasl softstore test"
+IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 +qt4 qt5 sasl softstore +ssl test"
 REQUIRED_USE="|| ( qt4 qt5 )"
 
 RDEPEND="
@@ -27,10 +27,6 @@ RDEPEND="
 	gcrypt? ( dev-libs/libgcrypt:= )
 	gpg? ( app-crypt/gnupg )
 	nss? ( dev-libs/nss )
-	openssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
 	pkcs11? (
 		!libressl? ( dev-libs/openssl:0 )
 		libressl? ( dev-libs/libressl )
@@ -43,6 +39,10 @@ RDEPEND="
 		dev-qt/qtnetwork:5
 	)
 	sasl? ( dev-libs/cyrus-sasl:2 )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
 "
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
@@ -76,10 +76,10 @@ src_configure() {
 			$(qca_plugin_use gpg gnupg)
 			$(qca_plugin_use logger)
 			$(qca_plugin_use nss)
-			$(qca_plugin_use openssl ossl)
 			$(qca_plugin_use pkcs11)
 			$(qca_plugin_use sasl cyrus-sasl)
 			$(qca_plugin_use softstore)
+			$(qca_plugin_use ssl ossl)
 			$(cmake-utils_use_build test TESTS)
 		)