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

Gentoo-bug: 592706

Package-Manager: portage-2.3.2

diff --git a/app-crypt/qca/metadata.xml b/app-crypt/qca/metadata.xml
index a92ea3e2cd6aee3454feef6d086e0bce5318ad20..dff1320aa6b8a03e38c4aca07c51e3921dbeb072 100644 (file)
--- 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 ff969a7020852b5e5581fb3ffc732c629945e596..0ad3980c8f3804062d6d130b33837cd72578fc34 100644 (file)
--- 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 3ac1973e96effe8bfd35bfd686d41b7be8ce1ba2..81e1b32b3442cc1dcf28c37c4638e1dadcb10e19 100644 (file)
--- 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)
                )
 

diff --git a/dev-libs/qoauth/qoauth-1.0.1.ebuild b/dev-libs/qoauth/qoauth-1.0.1.ebuild
index 7e6cf33b06d66b5c526893e220b3c268ffd8782d..7ab3be45fda2d97ab3282f4459a64f1a676a0755 100644 (file)
--- a/dev-libs/qoauth/qoauth-1.0.1.ebuild
+++ b/dev-libs/qoauth/qoauth-1.0.1.ebuild
@@ -21,7 +21,7 @@ DEPEND="${COMMON_DEPEND}
        test? ( dev-qt/qttest:4 )
 "
 RDEPEND="${COMMON_DEPEND}
-       app-crypt/qca:2[openssl]
+       app-crypt/qca:2[ssl]
 "
 
 S=${WORKDIR}/${P}-src

diff --git a/dev-libs/qoauth/qoauth-2.0.1_pre20160315.ebuild b/dev-libs/qoauth/qoauth-2.0.1_pre20160315.ebuild
index d9ab014a98afbd5268e6c69bb7ed9151f677b5c6..9ffd03826a163dfed69dd322a95a5803c0bb8b43 100644 (file)
--- a/dev-libs/qoauth/qoauth-2.0.1_pre20160315.ebuild
+++ b/dev-libs/qoauth/qoauth-2.0.1_pre20160315.ebuild
@@ -21,7 +21,7 @@ DEPEND="${COMMON_DEPEND}
        test? ( dev-qt/qttest:5 )
 "
 RDEPEND="${COMMON_DEPEND}
-       app-crypt/qca:2[openssl]
+       app-crypt/qca:2[ssl]
        !dev-libs/qoauth:0
 "
 

diff --git a/kde-apps/kopete/kopete-16.04.3.ebuild b/kde-apps/kopete/kopete-16.04.3.ebuild
index c2225f7f3c16c4762bb2bcb147ce816c67d4e9ee..8de370f18e922a71a5d3f754d2efc9c1ad2e1089 100644 (file)
--- a/kde-apps/kopete/kopete-16.04.3.ebuild
+++ b/kde-apps/kopete/kopete-16.04.3.ebuild
@@ -107,7 +107,7 @@ RDEPEND="${COMMONDEPEND}
                )
                virtual/latex-base
        )
-       ssl? ( app-crypt/qca:2[openssl] )
+       ssl? ( app-crypt/qca:2[ssl] )
        winpopup? ( net-fs/samba )
 "
 DEPEND="${COMMONDEPEND}
@@ -150,7 +150,7 @@ pkg_postinst() {
 
        if ! use ssl; then
                if use xmpp ; then # || use irc; then
-                       if ! has_version "app-crypt/qca:2[openssl]" ; then
+                       if ! has_version "app-crypt/qca:2[ssl]" ; then
                                elog "In order to use ssl in xmpp you'll need to"
                                elog "install app-crypt/qca package with USE=openssl."
                        fi

diff --git a/kde-apps/kopete/kopete-16.08.2.ebuild b/kde-apps/kopete/kopete-16.08.2.ebuild
index cd117ceb710625c8ba17176d08c34089632e8f37..f23beed1770e41c9d8bceaf9eaa2fb5c7a42146b 100644 (file)
--- a/kde-apps/kopete/kopete-16.08.2.ebuild
+++ b/kde-apps/kopete/kopete-16.08.2.ebuild
@@ -107,7 +107,7 @@ RDEPEND="${COMMONDEPEND}
                )
                virtual/latex-base
        )
-       ssl? ( app-crypt/qca:2[openssl] )
+       ssl? ( app-crypt/qca:2[ssl] )
        winpopup? ( net-fs/samba )
 "
 DEPEND="${COMMONDEPEND}
@@ -150,7 +150,7 @@ pkg_postinst() {
 
        if ! use ssl; then
                if use xmpp ; then # || use irc; then
-                       if ! has_version "app-crypt/qca:2[openssl]" ; then
+                       if ! has_version "app-crypt/qca:2[ssl]" ; then
                                elog "In order to use ssl in xmpp you'll need to"
                                elog "install app-crypt/qca package with USE=openssl."
                        fi

diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-16.04.3.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-16.04.3.ebuild
index 5db6695affc67b0e999fc8d664ca8d2a0a7aef99..b90d3aa7d79990e965566eb83dbcc9c78be71bd7 100644 (file)
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-16.04.3.ebuild
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-16.04.3.ebuild
@@ -35,6 +35,6 @@ DEPEND="${COMMON_DEPEND}
        $(add_frameworks_dep kdewebkit)
 "
 RDEPEND="${COMMON_DEPEND}
-       app-crypt/qca:2[openssl]
+       app-crypt/qca:2[ssl]
        !kde-apps/ktp-auth-handler:4
 "

diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-16.08.2.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-16.08.2.ebuild
index 252e8a6ca28814669b7e4b0d4f89db6a95df254c..ea3649807bc126e971444e0bcdcd6447e91cea1d 100644 (file)
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-16.08.2.ebuild
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-16.08.2.ebuild
@@ -35,6 +35,6 @@ DEPEND="${COMMON_DEPEND}
        $(add_frameworks_dep kdewebkit)
 "
 RDEPEND="${COMMON_DEPEND}
-       app-crypt/qca:2[openssl]
+       app-crypt/qca:2[ssl]
        !kde-apps/ktp-auth-handler:4
 "

diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild
index 3381ab5ec53e06a01c15a27bf192ba73df6844a3..3ff39531ccab86edb13b7e9caf5ee6b702dc41ab 100644 (file)
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild
@@ -38,7 +38,7 @@ DEPEND="${COMMON_DEPEND}
        eigen? ( dev-cpp/eigen:2 )
 "
 RDEPEND="${COMMON_DEPEND}
-       app-crypt/qca:2[openssl]
+       app-crypt/qca:2[ssl]
 "
 
 src_configure() {

diff --git a/kde-misc/kdeconnect/kdeconnect-0.8-r1.ebuild b/kde-misc/kdeconnect/kdeconnect-0.8-r1.ebuild
index f19a55a86cce778297872b0f5c657730c9a8ec7f..79c6c133b39598837448b64c220b3a494e41bb2c 100644 (file)
--- a/kde-misc/kdeconnect/kdeconnect-0.8-r1.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-0.8-r1.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
        $(add_kdebase_dep plasma-workspace)
-       app-crypt/qca:2[openssl]
+       app-crypt/qca:2[ssl]
 "
 DEPEND="${COMMON_DEPEND}
        sys-devel/gettext

diff --git a/kde-misc/kdeconnect/kdeconnect-0.9g.ebuild b/kde-misc/kdeconnect/kdeconnect-0.9g.ebuild
index 5b40e3ea8165d45d0774bd4007512b658910dd7b..455bce65bb050b40c80d74a50f9a54b8591913b0 100644 (file)
--- a/kde-misc/kdeconnect/kdeconnect-0.9g.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-0.9g.ebuild
@@ -35,7 +35,7 @@ DEPEND="
        $(add_qt_dep qtnetwork)
        $(add_qt_dep qtwidgets)
        $(add_qt_dep qtx11extras)
-       >=app-crypt/qca-2.1.0:2[qt5,openssl]
+       >=app-crypt/qca-2.1.0:2[qt5,ssl]
        x11-libs/libfakekey
        x11-libs/libX11
        x11-libs/libXtst

diff --git a/kde-misc/kdeconnect/kdeconnect-1.0.1.ebuild b/kde-misc/kdeconnect/kdeconnect-1.0.1.ebuild
index 55a4a86854602974aa03fbaf94fbd6500d7c648c..059974198b215382ec4b7ee56a7265704bae7ab8 100644 (file)
--- a/kde-misc/kdeconnect/kdeconnect-1.0.1.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-1.0.1.ebuild
@@ -35,7 +35,7 @@ DEPEND="
        $(add_qt_dep qtnetwork)
        $(add_qt_dep qtwidgets)
        $(add_qt_dep qtx11extras)
-       >=app-crypt/qca-2.1.0:2[qt5,openssl]
+       >=app-crypt/qca-2.1.0:2[qt5,ssl]
        x11-libs/libfakekey
        x11-libs/libX11
        x11-libs/libXtst

diff --git a/kde-misc/kdeconnect/kdeconnect-1.0.ebuild b/kde-misc/kdeconnect/kdeconnect-1.0.ebuild
index 656cdadd0976bf43175698d9cf38eb7b4cc77d50..340851076adaf731fcc42cf1d88b1202611439ce 100644 (file)
--- a/kde-misc/kdeconnect/kdeconnect-1.0.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-1.0.ebuild
@@ -35,7 +35,7 @@ DEPEND="
        $(add_qt_dep qtnetwork)
        $(add_qt_dep qtwidgets)
        $(add_qt_dep qtx11extras)
-       >=app-crypt/qca-2.1.0:2[qt5,openssl]
+       >=app-crypt/qca-2.1.0:2[qt5,ssl]
        x11-libs/libfakekey
        x11-libs/libX11
        x11-libs/libXtst

diff --git a/media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild b/media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild
index 57847fea39e50b78cf5ea5188f65ddf32b900524..e11b09b825bea9c8ce514b36503a3da167146b2f 100644 (file)
--- a/media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild
@@ -70,7 +70,7 @@ DEPEND="
        )
 "
 RDEPEND="${DEPEND}
-       app-crypt/qca:2[openssl]
+       app-crypt/qca:2[ssl]
 "
 
 DOCS=( AUTHORS ChangeLog README.md )

diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
index c3d5f0cf100d4a46c140f54f4321dbaa19b12875..62a586d1f41833460866378fbdda45b84b5313ae 100644 (file)
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -53,7 +53,7 @@ DEPEND="${CDEPEND}
        $(add_qt_dep qtconcurrent)
 "
 RDEPEND="${CDEPEND}
-       app-crypt/qca:2[openssl]
+       app-crypt/qca:2[ssl]
 "
 
 DOCS=( AUTHORS ChangeLog README.md )

diff --git a/net-im/dianara/dianara-1.3.1-r1.ebuild b/net-im/dianara/dianara-1.3.1-r1.ebuild
index 39ff62cdc3d3df06fe8ad9d959e9bfd47a990fb0..3eb708071f74aae1a36415730ae17a9dcb965fbe 100644 (file)
--- a/net-im/dianara/dianara-1.3.1-r1.ebuild
+++ b/net-im/dianara/dianara-1.3.1-r1.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
-       >=app-crypt/qca-2.1.0.3:2[openssl,qt4]
+       >=app-crypt/qca-2.1.0.3:2[qt4,ssl]
        dev-libs/qjson
        dev-libs/qoauth:0
        dev-qt/qtcore:4[ssl]

diff --git a/net-im/dianara/dianara-1.3.3.ebuild b/net-im/dianara/dianara-1.3.3.ebuild
index 53368f39ef921588690f58db4714869b2e1df52f..8d5a48ad079ef3fdb88a44cda727d631a42a588d 100644 (file)
--- a/net-im/dianara/dianara-1.3.3.ebuild
+++ b/net-im/dianara/dianara-1.3.3.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-       >=app-crypt/qca-2.1.0.3:2[openssl,qt4]
+       >=app-crypt/qca-2.1.0.3:2[qt4,ssl]
        dev-libs/qjson
        dev-libs/qoauth:0
        dev-qt/qtcore:4[ssl]

diff --git a/net-im/kadu/kadu-0.12.3.ebuild b/net-im/kadu/kadu-0.12.3.ebuild
index 62625bd434b58374e27f703d0cfa267f76e8d473..dda9889938f03bafb859497835a7982e0c281b31 100644 (file)
--- a/net-im/kadu/kadu-0.12.3.ebuild
+++ b/net-im/kadu/kadu-0.12.3.ebuild
@@ -56,7 +56,7 @@ DEPEND="${COMMON_DEPEND}
        x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
-       app-crypt/qca:2[openssl]
+       app-crypt/qca:2[ssl]
        >=dev-qt/qtsvg-4.7.0:4
        speech? ( app-accessibility/powiedz )
 "

diff --git a/net-im/kadu/kadu-2.1-r1.ebuild b/net-im/kadu/kadu-2.1-r1.ebuild
index 1e6a062d1b22d83ac1386f3a73bbd8d56876a112..98fa5943e879d1995bb3ad9051320d9519a7e448 100644 (file)
--- a/net-im/kadu/kadu-2.1-r1.ebuild
+++ b/net-im/kadu/kadu-2.1-r1.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
        )
 "
 COMMON_DEPEND="
-       app-crypt/qca:2[openssl,qt5]
+       app-crypt/qca:2[qt5,ssl]
        >=dev-libs/injeqt-1.0.0
        >=dev-qt/qtcore-5.2.0:5
        >=dev-qt/qtdbus-5.2.0:5

diff --git a/net-im/kadu/kadu-3.0.ebuild b/net-im/kadu/kadu-3.0.ebuild
index 349fd496a007f843e5780ac48302bd917a07da71..d1fcd8d65334a1a0d3eeff7613b547cdbee56f56 100644 (file)
--- a/net-im/kadu/kadu-3.0.ebuild
+++ b/net-im/kadu/kadu-3.0.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
        )
 "
 COMMON_DEPEND="
-       app-crypt/qca:2[openssl,qt5]
+       app-crypt/qca:2[qt5,ssl]
        >=dev-libs/injeqt-1.0.0
        >=dev-qt/qtcore-5.2.0:5
        >=dev-qt/qtdbus-5.2.0:5

diff --git a/net-im/psi/psi-0.15.ebuild b/net-im/psi/psi-0.15.ebuild
index 8fd8d7001b8eabca28309172666da4f74f0e8250..c40955e53fa56d57170101a6a9dd41661004a26c 100644 (file)
--- a/net-im/psi/psi-0.15.ebuild
+++ b/net-im/psi/psi-0.15.ebuild
@@ -42,9 +42,9 @@ PDEPEND="
        crypt? ( app-crypt/qca:2[gpg] )
        jingle? (
                net-im/psimedia
-               app-crypt/qca:2[openssl]
+               app-crypt/qca:2[ssl]
        )
-       ssl? ( app-crypt/qca:2[openssl] )
+       ssl? ( app-crypt/qca:2[ssl] )
 "
 
 DOC_CONTENTS='Psi+ support(USE="extras") was removed from ebuild since 0.15'

diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
index a54aea898b5cc4a73400a43f95f309d238fb97a7..0bb8cc4ac2cdc5d68a4565bc4a5b5ff1875d4a16 100644 (file)
--- a/net-im/psi/psi-9999.ebuild
+++ b/net-im/psi/psi-9999.ebuild
@@ -58,9 +58,9 @@ PDEPEND="
        crypt? ( app-crypt/qca:2[gpg] )
        jingle? (
                net-im/psimedia
-               app-crypt/qca:2[openssl]
+               app-crypt/qca:2[ssl]
        )
-       ssl? ( app-crypt/qca:2[openssl] )
+       ssl? ( app-crypt/qca:2[ssl] )
 "
 RESTRICT="test"
 

diff --git a/net-im/qutim/qutim-0.3.2.ebuild b/net-im/qutim/qutim-0.3.2.ebuild
index 0b181f6a00f31d73c3138ae84f8bb422ebf6aad8..87b71a613f2dfa2a028ebb8ecca9a01c855ca6aa 100644 (file)
--- a/net-im/qutim/qutim-0.3.2.ebuild
+++ b/net-im/qutim/qutim-0.3.2.ebuild
@@ -91,7 +91,7 @@ DEPEND="${CDEPEND}
 "
 RDEPEND="${CDEPEND}
        xmpp? ( app-crypt/qca:2[gpg] )
-       oscar? ( app-crypt/qca:2[openssl] )
+       oscar? ( app-crypt/qca:2[ssl] )
        kde-frameworks/oxygen-icons
 "
 

diff --git a/net-im/qutim/qutim-0.3.3_p1.ebuild b/net-im/qutim/qutim-0.3.3_p1.ebuild
index e6b81d259acf2714c434c16c84877b71f4b0649f..611370eaf8b6ecb0ce827dbd3824ef89438b8d40 100644 (file)
--- a/net-im/qutim/qutim-0.3.3_p1.ebuild
+++ b/net-im/qutim/qutim-0.3.3_p1.ebuild
@@ -87,7 +87,7 @@ DEPEND="${CDEPEND}
 "
 RDEPEND="${CDEPEND}
        xmpp? ( app-crypt/qca:2[gpg] )
-       oscar? ( app-crypt/qca:2[openssl] )
+       oscar? ( app-crypt/qca:2[ssl] )
        kde-frameworks/oxygen-icons
 "
 

diff --git a/net-irc/konversation/konversation-1.6.2.ebuild b/net-irc/konversation/konversation-1.6.2.ebuild
index 9c940caad539d52a6c66319ea9ec125bb4f68ce5..6b2e7f952965cdb0359717d019da78b7988e75eb 100644 (file)
--- a/net-irc/konversation/konversation-1.6.2.ebuild
+++ b/net-irc/konversation/konversation-1.6.2.ebuild
@@ -54,7 +54,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
        !net-irc/konversation:4
-       crypt? ( app-crypt/qca:2[openssl] )
+       crypt? ( app-crypt/qca:2[ssl] )
 "
 
 src_configure() {

diff --git a/net-irc/quassel/quassel-0.12.4.ebuild b/net-irc/quassel/quassel-0.12.4.ebuild
index cb9c20dcd260e9359bff4745b2d4d9604b67ad3c..c5434745d9975ea2880188f43e342fb538bd4d7b 100644 (file)
--- a/net-irc/quassel/quassel-0.12.4.ebuild
+++ b/net-irc/quassel/quassel-0.12.4.ebuild
@@ -22,13 +22,13 @@ snorenotify +ssl syslog webkit X"
 SERVER_RDEPEND="
        qt5? (
                dev-qt/qtscript:5
-               crypt? ( app-crypt/qca:2[openssl,qt5] )
+               crypt? ( app-crypt/qca:2[qt5,ssl] )
                postgres? ( dev-qt/qtsql:5[postgres] )
                !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
        )
        !qt5? (
                dev-qt/qtscript:4
-               crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
+               crypt? ( app-crypt/qca:2[qt4(+),ssl] )
                postgres? ( dev-qt/qtsql:4[postgres] )
                !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
        )

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 3a862b1fd474ddf833c450d122c75ba339798c5a..c7dda72a2ce29145d6dfd65d7d4ac75ecdc6659e 100644 (file)
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -20,7 +20,7 @@ IUSE="+breeze crypt +dbus debug kde monolithic oxygen postgres +server snorenoti
 
 SERVER_RDEPEND="
        dev-qt/qtscript:5
-       crypt? ( app-crypt/qca:2[openssl,qt5] )
+       crypt? ( app-crypt/qca:2[qt5,ssl] )
        postgres? ( dev-qt/qtsql:5[postgres] )
        !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
        syslog? ( virtual/logger )

diff --git a/sci-geosciences/qgis/qgis-2.12.1.ebuild b/sci-geosciences/qgis/qgis-2.12.1.ebuild
index 119b1cd1a41ac2592941daa7ee590d923c5fe078..04e08ccc06a030c2b345f2a8813e5d16a96a41f4 100644 (file)
--- a/sci-geosciences/qgis/qgis-2.12.1.ebuild
+++ b/sci-geosciences/qgis/qgis-2.12.1.ebuild
@@ -55,7 +55,7 @@ RDEPEND="
        )
        dev-db/sqlite:3
        dev-db/spatialite
-       app-crypt/qca:2[qt4,openssl]
+       app-crypt/qca:2[qt4,ssl]
 "
 
 DEPEND="${RDEPEND}

diff --git a/sci-geosciences/qgis/qgis-2.12.2.ebuild b/sci-geosciences/qgis/qgis-2.12.2.ebuild
index 4d017ca344c0794481a0579444acef13539b04bc..01573b3bff06282e14d44ee3cb7ab6844650d65a 100644 (file)
--- a/sci-geosciences/qgis/qgis-2.12.2.ebuild
+++ b/sci-geosciences/qgis/qgis-2.12.2.ebuild
@@ -62,7 +62,7 @@ RDEPEND="
        )
        dev-db/sqlite:3
        dev-db/spatialite
-       app-crypt/qca:2[qt4,openssl]
+       app-crypt/qca:2[qt4,ssl]
 "
 
 DEPEND="${RDEPEND}

diff --git a/sci-geosciences/qgis/qgis-2.14.5.ebuild b/sci-geosciences/qgis/qgis-2.14.5.ebuild
index e5d9e34c92f4d51372151069ed781636bdbe1854..d4088cdc5a2e4f8a54ad1a6b0448fa0797fac7ea 100644 (file)
--- a/sci-geosciences/qgis/qgis-2.14.5.ebuild
+++ b/sci-geosciences/qgis/qgis-2.14.5.ebuild
@@ -64,7 +64,7 @@ RDEPEND="
        )
        dev-db/sqlite:3
        dev-db/spatialite
-       app-crypt/qca:2[qt4,openssl]
+       app-crypt/qca:2[qt4,ssl]
 "
 
 DEPEND="${RDEPEND}

diff --git a/sys-auth/fingerprint-gui/fingerprint-gui-1.07.ebuild b/sys-auth/fingerprint-gui/fingerprint-gui-1.07.ebuild
index e7d244d60a433012ba392980bf7d66dbc3d38d4f..4e2cf030a3d5f020090824606ebf1a086135a881 100644 (file)
--- a/sys-auth/fingerprint-gui/fingerprint-gui-1.07.ebuild
+++ b/sys-auth/fingerprint-gui/fingerprint-gui-1.07.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+upekbsapi"
 
-DEPEND="app-crypt/qca:2[openssl,qt4(+)]
+DEPEND="app-crypt/qca:2[qt4(+),ssl]
        sys-auth/libfprint
        sys-auth/polkit-qt[qt4(+)]
        sys-libs/pam