Update dependency on QCA plugins to use USE flags on app-crypt/qca:2 unconditionally, to provide a single sane path for dependency resolution. Bug #541066.

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

37 files changed, 145 insertions, 92 deletions

diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog
index 7a1d7a9fb970..4e1c54ecfd74 100644
--- a/kde-base/kdeplasma-addons/ChangeLog
+++ b/kde-base/kdeplasma-addons/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeplasma-addons
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.274 2015/02/18 16:26:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.275 2015/02/22 18:41:23 mgorny Exp $
+
+  22 Feb 2015; Michał Górny <mgorny@gentoo.org> kdeplasma-addons-4.14.3.ebuild:
+  Update dependency on QCA plugins to use USE flags on app-crypt/qca:2
+  unconditionally, to provide a single sane path for dependency resolution. Bug
+  #541066.
 
   18 Feb 2015; Michał Górny <mgorny@gentoo.org> -kdeplasma-addons-4.12.5.ebuild:
   Remove KDE SC 4.12
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild
index ea23fd5b3f4c..512f3b203cdf 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild,v 1.6 2015/02/17 11:06:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild,v 1.7 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -38,7 +38,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-cpp/eigen:2
 "
 RDEPEND="${COMMON_DEPEND}
-	|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
+	app-crypt/qca:2[openssl]
 "
 
 src_configure() {
diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index fb2c3495cbe3..271801063c28 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.457 2015/02/18 22:36:15 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.458 2015/02/22 18:41:23 mgorny Exp $
+
+  22 Feb 2015; Michał Górny <mgorny@gentoo.org> kopete-4.14.3-r1.ebuild,
+  kopete-4.14.3.ebuild:
+  Update dependency on QCA plugins to use USE flags on app-crypt/qca:2
+  unconditionally, to provide a single sane path for dependency resolution. Bug
+  #541066.
 
   18 Feb 2015; Johannes Huber <johu@gentoo.org> metadata.xml:
   Cleanup metadata.xml
diff --git a/kde-base/kopete/kopete-4.14.3-r1.ebuild b/kde-base/kopete/kopete-4.14.3-r1.ebuild
index c4162719efb9..290f9215e0f3 100644
--- a/kde-base/kopete/kopete-4.14.3-r1.ebuild
+++ b/kde-base/kopete/kopete-4.14.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.14.3-r1.ebuild,v 1.2 2015/02/11 03:35:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.14.3-r1.ebuild,v 1.3 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -108,7 +108,7 @@ RDEPEND="${COMMONDEPEND}
 		virtual/latex-base
 	)
 	sms? ( app-mobilephone/smssend )
-	ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
+	ssl? ( app-crypt/qca:2[openssl] )
 	winpopup? ( net-fs/samba )
 "
 #	telepathy? ( net-libs/decibel )"
@@ -158,9 +158,9 @@ pkg_postinst() {
 
 	if ! use ssl; then
 		if use xmpp ; then # || use irc; then
-			if ! has_version app-crypt/qca-ossl ; then
+			if ! has_version "app-crypt/qca:2[openssl]" ; then
 				elog "In order to use ssl in xmpp you'll need to"
-				elog "install app-crypt/qca-ossl package."
+				elog "install app-crypt/qca package with USE=openssl."
 			fi
 		fi
 	fi
diff --git a/kde-base/kopete/kopete-4.14.3.ebuild b/kde-base/kopete/kopete-4.14.3.ebuild
index cd0a08e7c719..8222445070be 100644
--- a/kde-base/kopete/kopete-4.14.3.ebuild
+++ b/kde-base/kopete/kopete-4.14.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild,v 1.6 2015/02/17 11:06:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild,v 1.7 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -100,7 +100,7 @@ RDEPEND="${COMMONDEPEND}
 		virtual/latex-base
 	)
 	sms? ( app-mobilephone/smssend )
-	ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
+	ssl? ( app-crypt/qca:2[openssl] )
 	winpopup? ( net-fs/samba )
 "
 #	telepathy? ( net-libs/decibel )"
@@ -149,9 +149,9 @@ pkg_postinst() {
 
 	if ! use ssl; then
 		if use xmpp ; then # || use irc; then
-			if ! has_version app-crypt/qca-ossl ; then
+			if ! has_version "app-crypt/qca:2[openssl]" ; then
 				elog "In order to use ssl in xmpp you'll need to"
-				elog "install app-crypt/qca-ossl package."
+				elog "install app-crypt/qca package with USE=openssl."
 			fi
 		fi
 	fi
diff --git a/kde-misc/kdeconnect/ChangeLog b/kde-misc/kdeconnect/ChangeLog
index 1d4a45cb4e02..7becaa3aa7f5 100644
--- a/kde-misc/kdeconnect/ChangeLog
+++ b/kde-misc/kdeconnect/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-misc/kdeconnect
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdeconnect/ChangeLog,v 1.14 2015/02/21 08:03:41 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdeconnect/ChangeLog,v 1.15 2015/02/22 18:41:23 mgorny Exp $
+
+  22 Feb 2015; Michał Górny <mgorny@gentoo.org> kdeconnect-0.7.3.ebuild,
+  kdeconnect-0.8.ebuild:
+  Update dependency on QCA plugins to use USE flags on app-crypt/qca:2
+  unconditionally, to provide a single sane path for dependency resolution. Bug
+  #541066.
 
 *kdeconnect-0.8 (21 Feb 2015)
 
diff --git a/kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild b/kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild
index c450bf9a012b..3782259d7307 100644
--- a/kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild,v 1.4 2015/02/02 14:44:04 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild,v 1.5 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -33,7 +33,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	$(add_kdebase_dep plasma-workspace)
-	|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
+	app-crypt/qca:2[openssl]
 "
 
 [[ ${KDE_BUILD_TYPE} != live ]] && S=${WORKDIR}/${MY_P}
diff --git a/kde-misc/kdeconnect/kdeconnect-0.8.ebuild b/kde-misc/kdeconnect/kdeconnect-0.8.ebuild
index 5d1bb183fba9..f9f5cbe665f0 100644
--- a/kde-misc/kdeconnect/kdeconnect-0.8.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdeconnect/kdeconnect-0.8.ebuild,v 1.1 2015/02/21 08:03:41 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdeconnect/kdeconnect-0.8.ebuild,v 1.2 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -34,7 +34,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
 	$(add_kdebase_dep plasma-workspace)
-	|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
+	app-crypt/qca:2[openssl]
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
diff --git a/media-sound/tomahawk/ChangeLog b/media-sound/tomahawk/ChangeLog
index 2b4dc5c6cedb..ae3e1a010576 100644
--- a/media-sound/tomahawk/ChangeLog
+++ b/media-sound/tomahawk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/tomahawk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.44 2015/01/29 22:44:23 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.45 2015/02/22 18:41:23 mgorny Exp $
+
+  22 Feb 2015; Michał Górny <mgorny@gentoo.org> tomahawk-0.8.2.ebuild,
+  tomahawk-9999.ebuild:
+  Update dependency on QCA plugins to use USE flags on app-crypt/qca:2
+  unconditionally, to provide a single sane path for dependency resolution. Bug
+  #541066.
 
   29 Jan 2015; Johannes Huber <johu@gentoo.org> tomahawk-9999.ebuild:
   Fix qt5 build.
diff --git a/media-sound/tomahawk/tomahawk-0.8.2.ebuild b/media-sound/tomahawk/tomahawk-0.8.2.ebuild
index 9d3fdeef89d6..dfda962ea28b 100644
--- a/media-sound/tomahawk/tomahawk-0.8.2.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.8.2.ebuild,v 1.2 2015/01/29 00:27:02 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.8.2.ebuild,v 1.3 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -70,7 +70,7 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
-	|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
+	app-crypt/qca:2[openssl]
 "
 
 DOCS=( AUTHORS ChangeLog README.md )
diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
index 67408eb89bb6..3f46894e3551 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.30 2015/01/29 22:44:23 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.31 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -68,7 +68,7 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
-	|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
+	app-crypt/qca:2[openssl]
 "
 
 DOCS=( AUTHORS ChangeLog README.md )
diff --git a/metadata/layout.conf b/metadata/layout.conf
index 12d23ddeb3c6..9a42f7b0f6d3 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -22,3 +22,8 @@ cache-formats = md5-dict
 # specify that this repo does not dependent on any masters, in order
 # to distinguish it from repos that rely on the deprecated behavior.
 masters =
+
+# override repository name without modifying profiles/ dir
+repo-name = gentoo-cvs
+# fill out the blanks with a regular rsync/git checkout
+masters = gentoo
diff --git a/net-im/dianara/ChangeLog b/net-im/dianara/ChangeLog
index 209823b35632..863124f1e8c9 100644
--- a/net-im/dianara/ChangeLog
+++ b/net-im/dianara/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/dianara
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/dianara/ChangeLog,v 1.19 2015/01/29 00:38:21 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/dianara/ChangeLog,v 1.20 2015/02/22 18:41:23 mgorny Exp $
+
+  22 Feb 2015; Michał Górny <mgorny@gentoo.org> dianara-1.2.4.ebuild:
+  Update dependency on QCA plugins to use USE flags on app-crypt/qca:2
+  unconditionally, to provide a single sane path for dependency resolution. Bug
+  #541066.
 
   29 Jan 2015; Johannes Huber <johu@gentoo.org> -dianara-1.2.1.ebuild,
   dianara-1.2.4.ebuild:
diff --git a/net-im/dianara/dianara-1.2.4.ebuild b/net-im/dianara/dianara-1.2.4.ebuild
index f1ca72085d76..7ebfde0707cc 100644
--- a/net-im/dianara/dianara-1.2.4.ebuild
+++ b/net-im/dianara/dianara-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/dianara/dianara-1.2.4.ebuild,v 1.4 2015/01/29 00:38:21 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/dianara/dianara-1.2.4.ebuild,v 1.5 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ DEPEND="
 	dev-qt/qtgui:4
 	sys-apps/file"
 RDEPEND="${DEPEND}
-	|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
+	app-crypt/qca:2[openssl]
 "
 
 S=${WORKDIR}/${MY_P}
diff --git a/net-im/kadu/ChangeLog b/net-im/kadu/ChangeLog
index 8f7e0c94ede3..06e899000de7 100644
--- a/net-im/kadu/ChangeLog
+++ b/net-im/kadu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/kadu
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.153 2015/01/29 00:42:13 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.154 2015/02/22 18:41:23 mgorny Exp $
+
+  22 Feb 2015; Michał Górny <mgorny@gentoo.org> kadu-0.12.3.ebuild:
+  Update dependency on QCA plugins to use USE flags on app-crypt/qca:2
+  unconditionally, to provide a single sane path for dependency resolution. Bug
+  #541066.
 
   29 Jan 2015; Johannes Huber <johu@gentoo.org> kadu-0.12.3.ebuild:
   Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
diff --git a/net-im/kadu/kadu-0.12.3.ebuild b/net-im/kadu/kadu-0.12.3.ebuild
index b8b0c955968e..28692f79e107 100644
--- a/net-im/kadu/kadu-0.12.3.ebuild
+++ b/net-im/kadu/kadu-0.12.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.12.3.ebuild,v 1.8 2015/01/29 00:42:13 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.12.3.ebuild,v 1.9 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI="4"
 
@@ -56,7 +56,7 @@ DEPEND="${COMMON_DEPEND}
 	x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
-	|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
+	app-crypt/qca:2[openssl]
 	>=dev-qt/qtsvg-4.7.0:4
 	speech? ( app-accessibility/powiedz )
 "
diff --git a/net-im/ktp-auth-handler/ChangeLog b/net-im/ktp-auth-handler/ChangeLog
index ef67c9db547e..905278ff55a9 100644
--- a/net-im/ktp-auth-handler/ChangeLog
+++ b/net-im/ktp-auth-handler/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/ktp-auth-handler
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-auth-handler/ChangeLog,v 1.33 2015/01/29 00:45:46 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-auth-handler/ChangeLog,v 1.34 2015/02/22 18:41:23 mgorny Exp $
+
+  22 Feb 2015; Michał Górny <mgorny@gentoo.org> ktp-auth-handler-0.9.0.ebuild:
+  Update dependency on QCA plugins to use USE flags on app-crypt/qca:2
+  unconditionally, to provide a single sane path for dependency resolution. Bug
+  #541066.
 
   29 Jan 2015; Johannes Huber <johu@gentoo.org> ktp-auth-handler-0.9.0.ebuild:
   Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1, bug
diff --git a/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild b/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild
index 8612ee28878e..2ca78b883054 100644
--- a/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild
+++ b/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild,v 1.2 2015/01/29 00:45:46 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild,v 1.3 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -29,5 +29,5 @@ DEPEND="
 	>=net-libs/telepathy-qt-0.9.5[qt4]
 "
 RDEPEND="${DEPEND}
-	|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
+	app-crypt/qca:2[openssl]
 "
diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index b1ccdedbe8ad..1ab1bfb59757 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/psi
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.240 2015/01/29 01:08:31 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.241 2015/02/22 18:41:23 mgorny Exp $
+
+  22 Feb 2015; Michał Górny <mgorny@gentoo.org> psi-0.14-r4.ebuild,
+  psi-0.15.ebuild, psi-9999.ebuild:
+  Update dependency on QCA plugins to use USE flags on app-crypt/qca:2
+  unconditionally, to provide a single sane path for dependency resolution. Bug
+  #541066.
 
   29 Jan 2015; Johannes Huber <johu@gentoo.org> psi-0.14-r4.ebuild,
   psi-0.15.ebuild, psi-9999.ebuild:
diff --git a/net-im/psi/psi-0.14-r4.ebuild b/net-im/psi/psi-0.14-r4.ebuild
index 42cde2588bfe..07bf235665d3 100644
--- a/net-im/psi/psi-0.14-r4.ebuild
+++ b/net-im/psi/psi-0.14-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v 1.17 2015/01/29 01:08:31 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v 1.18 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=4
 
@@ -44,10 +44,10 @@ DEPEND="${RDEPEND}
 	sys-devel/qconf
 	doc? ( app-doc/doxygen )"
 
-PDEPEND="crypt? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) )
+PDEPEND="crypt? ( app-crypt/qca:2[gpg] )
 	jingle? ( net-im/psimedia
-		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
-	ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )"
+		app-crypt/qca:2[openssl] )
+	ssl? ( app-crypt/qca:2[openssl] )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/net-im/psi/psi-0.15.ebuild b/net-im/psi/psi-0.15.ebuild
index 4c184b6db199..58a23f0a5ef4 100644
--- a/net-im/psi/psi-0.15.ebuild
+++ b/net-im/psi/psi-0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.15.ebuild,v 1.5 2015/01/29 01:08:31 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.15.ebuild,v 1.6 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -37,10 +37,10 @@ DEPEND="${RDEPEND}
 	sys-devel/qconf
 	doc? ( app-doc/doxygen )"
 
-PDEPEND="crypt? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) )
+PDEPEND="crypt? ( app-crypt/qca:2[gpg] )
 	jingle? ( net-im/psimedia
-		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
-	ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )"
+		app-crypt/qca:2[openssl] )
+	ssl? ( app-crypt/qca:2[openssl] )"
 
 DOC_CONTENTS='Psi+ support(USE="extras") was removed from ebuild since 0.15'
 FORCE_PRINT_ELOG=1
diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
index 1db012c8c4d2..e3a9b25509f9 100644
--- a/net-im/psi/psi-9999.ebuild
+++ b/net-im/psi/psi-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.22 2015/01/29 01:08:31 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.23 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI="4"
 
@@ -54,12 +54,12 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 PDEPEND="
-	crypt? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) )
+	crypt? ( app-crypt/qca:2[gpg] )
 	jingle? (
 		net-im/psimedia
-		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
+		app-crypt/qca:2[openssl]
 	)
-	ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
+	ssl? ( app-crypt/qca:2[openssl] )
 "
 RESTRICT="test"
 
diff --git a/net-im/qutim/ChangeLog b/net-im/qutim/ChangeLog
index 61fbb75f0874..01923cb53abb 100644
--- a/net-im/qutim/ChangeLog
+++ b/net-im/qutim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/qutim
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.36 2015/01/29 01:18:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.37 2015/02/22 18:41:22 mgorny Exp $
+
+  22 Feb 2015; Michał Górny <mgorny@gentoo.org> qutim-0.3.1-r1.ebuild,
+  qutim-0.3.2.ebuild:
+  Update dependency on QCA plugins to use USE flags on app-crypt/qca:2
+  unconditionally, to provide a single sane path for dependency resolution. Bug
+  #541066.
 
   29 Jan 2015; Johannes Huber <johu@gentoo.org> qutim-0.3.1-r1.ebuild,
   qutim-0.3.2.ebuild:
diff --git a/net-im/qutim/qutim-0.3.1-r1.ebuild b/net-im/qutim/qutim-0.3.1-r1.ebuild
index 14a8ec1d783c..b4388b2b2a23 100644
--- a/net-im/qutim/qutim-0.3.1-r1.ebuild
+++ b/net-im/qutim/qutim-0.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.1-r1.ebuild,v 1.3 2015/01/29 01:18:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.1-r1.ebuild,v 1.4 2015/02/22 18:41:22 mgorny Exp $
 
 EAPI=5
 
@@ -70,8 +70,8 @@ DEPEND="${CDEPEND}
 	kde? ( dev-util/automoc )
 "
 RDEPEND="${CDEPEND}
-	jabber? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) )
-	oscar? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
+	jabber? ( app-crypt/qca:2[gpg] )
+	oscar? ( app-crypt/qca:2[openssl] )
 "
 
 DOCS=( AUTHORS ChangeLog )
diff --git a/net-im/qutim/qutim-0.3.2.ebuild b/net-im/qutim/qutim-0.3.2.ebuild
index 3758f6dc3dc7..91f24e4f194c 100644
--- a/net-im/qutim/qutim-0.3.2.ebuild
+++ b/net-im/qutim/qutim-0.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.2.ebuild,v 1.6 2015/01/29 01:18:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.2.ebuild,v 1.7 2015/02/22 18:41:22 mgorny Exp $
 
 EAPI=5
 
@@ -88,8 +88,8 @@ DEPEND="${CDEPEND}
 	kde? ( dev-util/automoc )
 "
 RDEPEND="${CDEPEND}
-	jabber? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) )
-	oscar? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
+	jabber? ( app-crypt/qca:2[gpg] )
+	oscar? ( app-crypt/qca:2[openssl] )
 	|| ( kde-apps/oxygen-icons kde-base/oxygen-icons )
 "
 
diff --git a/net-irc/konversation/ChangeLog b/net-irc/konversation/ChangeLog
index 951d6d88cb27..60a275740c87 100644
--- a/net-irc/konversation/ChangeLog
+++ b/net-irc/konversation/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/konversation
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.121 2015/01/29 01:20:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.122 2015/02/22 18:41:23 mgorny Exp $
+
+  22 Feb 2015; Michał Górny <mgorny@gentoo.org> konversation-1.5.1.ebuild:
+  Update dependency on QCA plugins to use USE flags on app-crypt/qca:2
+  unconditionally, to provide a single sane path for dependency resolution. Bug
+  #541066.
 
   29 Jan 2015; Johannes Huber <johu@gentoo.org> konversation-1.5.1.ebuild:
   Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
diff --git a/net-irc/konversation/konversation-1.5.1.ebuild b/net-irc/konversation/konversation-1.5.1.ebuild
index bb4b76ed8297..cecf4e9b496a 100644
--- a/net-irc/konversation/konversation-1.5.1.ebuild
+++ b/net-irc/konversation/konversation-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.5.1.ebuild,v 1.4 2015/01/29 01:20:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.5.1.ebuild,v 1.5 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ DEPEND="
 	crypt? ( app-crypt/qca:2[qt4(+)] )
 "
 RDEPEND="${DEPEND}
-	crypt? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
+	crypt? ( app-crypt/qca:2[openssl] )
 "
 
 src_configure() {
diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 57094bc0e59d..1bf1a9571fc6 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.189 2015/02/16 22:01:22 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.190 2015/02/22 18:41:23 mgorny Exp $
+
+  22 Feb 2015; Michał Górny <mgorny@gentoo.org> quassel-0.10.0-r1.ebuild,
+  quassel-0.10.1.ebuild, quassel-0.11.0.ebuild, quassel-0.9.2.ebuild,
+  quassel-0.9.3.ebuild, quassel-9999.ebuild:
+  Update dependency on QCA plugins to use USE flags on app-crypt/qca:2
+  unconditionally, to provide a single sane path for dependency resolution. Bug
+  #541066.
 
   16 Feb 2015; Johannes Huber <johu@gentoo.org> quassel-9999.ebuild:
   Update dependencies for Qt5 based kde support.
diff --git a/net-irc/quassel/quassel-0.10.0-r1.ebuild b/net-irc/quassel/quassel-0.10.0-r1.ebuild
index 6b2d45f9d4f6..500092dc1a47 100644
--- a/net-irc/quassel/quassel-0.10.0-r1.ebuild
+++ b/net-irc/quassel/quassel-0.10.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.10.0-r1.ebuild,v 1.6 2015/01/29 01:35:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.10.0-r1.ebuild,v 1.7 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -20,10 +20,7 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslo
 
 SERVER_RDEPEND="
 	dev-qt/qtscript:4
-	crypt? (
-		app-crypt/qca:2[qt4(+)]
-		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-	)
+	crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
 	!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	postgres? ( dev-qt/qtsql:4[postgres] )
 	syslog? ( virtual/logger )
diff --git a/net-irc/quassel/quassel-0.10.1.ebuild b/net-irc/quassel/quassel-0.10.1.ebuild
index 59d7daf8fd9b..a45eef1ca392 100644
--- a/net-irc/quassel/quassel-0.10.1.ebuild
+++ b/net-irc/quassel/quassel-0.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.10.1.ebuild,v 1.3 2015/01/29 01:35:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.10.1.ebuild,v 1.4 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -20,10 +20,7 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslo
 
 SERVER_RDEPEND="
 	dev-qt/qtscript:4
-	crypt? (
-		app-crypt/qca:2[qt4(+)]
-		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-	)
+	crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
 	!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	postgres? ( dev-qt/qtsql:4[postgres] )
 	syslog? ( virtual/logger )
diff --git a/net-irc/quassel/quassel-0.11.0.ebuild b/net-irc/quassel/quassel-0.11.0.ebuild
index 1343ad137b4e..719dfc198dc5 100644
--- a/net-irc/quassel/quassel-0.11.0.ebuild
+++ b/net-irc/quassel/quassel-0.11.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.11.0.ebuild,v 1.5 2015/01/29 01:35:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.11.0.ebuild,v 1.6 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -26,10 +26,7 @@ SERVER_RDEPEND="
 	)
 	!qt5? (
 		dev-qt/qtscript:4
-		crypt? (
-			app-crypt/qca:2[qt4(+)]
-			|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-		)
+		crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
 		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-0.9.2.ebuild b/net-irc/quassel/quassel-0.9.2.ebuild
index 618c52562755..e59e0db12e4f 100644
--- a/net-irc/quassel/quassel-0.9.2.ebuild
+++ b/net-irc/quassel/quassel-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.9.2.ebuild,v 1.10 2015/01/29 01:35:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.9.2.ebuild,v 1.11 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=4
 
@@ -24,10 +24,7 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslo
 
 SERVER_RDEPEND="
 	>=dev-qt/qtscript-${QT_MINIMAL}:4
-	crypt? (
-		app-crypt/qca:2[qt4(+)]
-		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-	)
+	crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
 	!postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[postgres] )
 	syslog? ( virtual/logger )
diff --git a/net-irc/quassel/quassel-0.9.3.ebuild b/net-irc/quassel/quassel-0.9.3.ebuild
index 3adbb2c5a9a5..b111291dfb26 100644
--- a/net-irc/quassel/quassel-0.9.3.ebuild
+++ b/net-irc/quassel/quassel-0.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.9.3.ebuild,v 1.7 2015/01/29 01:35:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.9.3.ebuild,v 1.8 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -24,10 +24,7 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslo
 
 SERVER_RDEPEND="
 	>=dev-qt/qtscript-${QT_MINIMAL}:4
-	crypt? (
-		app-crypt/qca:2[qt4(+)]
-		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-	)
+	crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
 	!postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[postgres] )
 	syslog? ( virtual/logger )
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 4b97b4941737..7fc867d36850 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.79 2015/02/16 22:01:22 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.80 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -27,10 +27,7 @@ SERVER_RDEPEND="
 	)
 	!qt5? (
 		dev-qt/qtscript:4
-		crypt? (
-			app-crypt/qca:2[qt4(+)]
-			|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-		)
+		crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
 		postgres? ( dev-qt/qtsql:4[postgres] )
 		!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	)
diff --git a/sys-auth/fingerprint-gui/ChangeLog b/sys-auth/fingerprint-gui/ChangeLog
index e89cb981913d..3d98e27d5055 100644
--- a/sys-auth/fingerprint-gui/ChangeLog
+++ b/sys-auth/fingerprint-gui/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/fingerprint-gui
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/ChangeLog,v 1.9 2015/01/29 01:47:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/ChangeLog,v 1.10 2015/02/22 18:41:23 mgorny Exp $
+
+  22 Feb 2015; Michał Górny <mgorny@gentoo.org> fingerprint-gui-1.05-r1.ebuild,
+  fingerprint-gui-1.05.ebuild:
+  Update dependency on QCA plugins to use USE flags on app-crypt/qca:2
+  unconditionally, to provide a single sane path for dependency resolution. Bug
+  #541066.
 
   29 Jan 2015; Johannes Huber <johu@gentoo.org> fingerprint-gui-1.05-r1.ebuild,
   fingerprint-gui-1.05.ebuild:
diff --git a/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild b/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild
index 6a6ae677017a..d1bb7b660a4b 100644
--- a/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild
+++ b/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild,v 1.2 2015/01/29 01:47:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild,v 1.3 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -15,8 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+upekbsapi"
 
-DEPEND="app-crypt/qca:2[qt4(+)]
-	|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
+DEPEND="app-crypt/qca:2[openssl,qt4(+)]
 	sys-auth/libfprint
 	sys-auth/polkit-qt
 	sys-libs/pam
diff --git a/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild b/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild
index 92f55e7948ca..c6805e5ad71d 100644
--- a/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild
+++ b/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild,v 1.2 2015/01/29 01:47:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild,v 1.3 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=4
 
@@ -15,8 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+upekbsapi"
 
-DEPEND="app-crypt/qca:2[qt4(+)]
-	|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
+DEPEND="app-crypt/qca:2[openssl,qt4(+)]
 	sys-auth/libfprint
 	sys-auth/polkit-qt
 	sys-libs/pam