| 1 |
commit: 762b36c66d261a3c56d5513f31cc775924c9476e |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 29 21:30:37 2015 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 29 21:30:37 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=762b36c6 |
| 7 |
|
| 8 |
[media-sound/tomahawk] Sync with tree |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.15 |
| 11 |
|
| 12 |
--- |
| 13 |
media-sound/tomahawk/tomahawk-9999.ebuild | 5 +++-- |
| 14 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild |
| 17 |
index ccd9b6c..e14b939 100644 |
| 18 |
--- a/media-sound/tomahawk/tomahawk-9999.ebuild |
| 19 |
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild |
| 20 |
@@ -30,7 +30,6 @@ REQUIRED_USE="telepathy? ( kde )" |
| 21 |
# - deps with missing qt4/qt5 use flags |
| 22 |
# - does not build with in-tree only deps |
| 23 |
DEPEND=" |
| 24 |
- app-crypt/qca:2 |
| 25 |
dev-cpp/lucene++ |
| 26 |
dev-cpp/sparsehash |
| 27 |
dev-libs/boost |
| 28 |
@@ -43,6 +42,7 @@ DEPEND=" |
| 29 |
hatchet? ( dev-cpp/websocketpp ) |
| 30 |
jabber? ( net-libs/jreen ) |
| 31 |
!qt5? ( |
| 32 |
+ app-crypt/qca:2[qt4] |
| 33 |
>=dev-libs/libattica-0.4.0 |
| 34 |
dev-libs/qjson |
| 35 |
dev-libs/qtkeychain[qt4] |
| 36 |
@@ -57,6 +57,7 @@ DEPEND=" |
| 37 |
telepathy? ( net-libs/telepathy-qt[qt4] ) |
| 38 |
) |
| 39 |
qt5? ( |
| 40 |
+ app-crypt/qca:2[qt5] |
| 41 |
dev-libs/qtkeychain[qt5] |
| 42 |
dev-qt/designer:5 |
| 43 |
dev-qt/qtcore:5 |
| 44 |
@@ -69,7 +70,7 @@ DEPEND=" |
| 45 |
) |
| 46 |
" |
| 47 |
RDEPEND="${DEPEND} |
| 48 |
- app-crypt/qca-ossl |
| 49 |
+ || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) |
| 50 |
" |
| 51 |
|
| 52 |
DOCS=( AUTHORS ChangeLog README.md ) |
Archives