aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2015-01-29 22:30:37 +0100
committerJohannes Huber <johu@gentoo.org>2015-01-29 22:30:37 +0100
commit762b36c66d261a3c56d5513f31cc775924c9476e (patch)
treed429769306d3560ee0aed54b76c4fa6590903581
parent[net-irc/quasel] Sync with tree (diff)
downloadjohu-762b36c66d261a3c56d5513f31cc775924c9476e.tar.gz
johu-762b36c66d261a3c56d5513f31cc775924c9476e.tar.bz2
johu-762b36c66d261a3c56d5513f31cc775924c9476e.zip
[media-sound/tomahawk] Sync with tree
Package-Manager: portage-2.2.15
-rw-r--r--media-sound/tomahawk/tomahawk-9999.ebuild5
1 files 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 )