[gentoo-commits] dev/johu:master commit in: media-sound/tomahawk/

["Johannes Huber" <johu@gentoo.org>]

commit:     762b36c66d261a3c56d5513f31cc775924c9476e
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 29 21:30:37 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jan 29 21:30:37 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=762b36c6

[media-sound/tomahawk] Sync with tree

Package-Manager: portage-2.2.15

---
 media-sound/tomahawk/tomahawk-9999.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
index ccd9b6c..e14b939 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -30,7 +30,6 @@ REQUIRED_USE="telepathy? ( kde )"
 # - deps with missing qt4/qt5 use flags
 # - does not build with in-tree only deps
 DEPEND="
-	app-crypt/qca:2
 	dev-cpp/lucene++
 	dev-cpp/sparsehash
 	dev-libs/boost
@@ -43,6 +42,7 @@ DEPEND="
 	hatchet? ( dev-cpp/websocketpp )
 	jabber? ( net-libs/jreen )
 	!qt5? (
+		app-crypt/qca:2[qt4]
 		>=dev-libs/libattica-0.4.0
 		dev-libs/qjson
 		dev-libs/qtkeychain[qt4]
@@ -57,6 +57,7 @@ DEPEND="
 		telepathy? ( net-libs/telepathy-qt[qt4] )
 	)
 	qt5? (
+		app-crypt/qca:2[qt5]
 		dev-libs/qtkeychain[qt5]
 		dev-qt/designer:5
 		dev-qt/qtcore:5
@@ -69,7 +70,7 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
-	app-crypt/qca-ossl
+	|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
 "
 
 DOCS=( AUTHORS ChangeLog README.md )