| 1 |
commit: 672999f41c82bddb8da2edd99efd7f4330e8c673 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 28 23:37:42 2015 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 28 23:37:47 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=672999f4 |
| 7 |
|
| 8 |
[kde-apps/kopete] Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.15 |
| 11 |
|
| 12 |
--- |
| 13 |
kde-apps/kopete/kopete-14.12.1.ebuild | 6 +++--- |
| 14 |
kde-apps/kopete/kopete-9999.ebuild | 6 +++--- |
| 15 |
2 files changed, 6 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-apps/kopete/kopete-14.12.1.ebuild b/kde-apps/kopete/kopete-14.12.1.ebuild |
| 18 |
index b28414f..3295209 100644 |
| 19 |
--- a/kde-apps/kopete/kopete-14.12.1.ebuild |
| 20 |
+++ b/kde-apps/kopete/kopete-14.12.1.ebuild |
| 21 |
@@ -71,7 +71,7 @@ COMMONDEPEND=" |
| 22 |
>=dev-qt/qtgui-4.4.0:4[mng] |
| 23 |
!aqua? ( x11-libs/libXScrnSaver ) |
| 24 |
gadu? ( >=net-libs/libgadu-1.8.0[threads] ) |
| 25 |
- groupwise? ( app-crypt/qca:2 ) |
| 26 |
+ groupwise? ( app-crypt/qca:2[qt4] ) |
| 27 |
jingle? ( |
| 28 |
>=media-libs/mediastreamer-2.3.0 |
| 29 |
media-libs/speex |
| 30 |
@@ -86,7 +86,7 @@ COMMONDEPEND=" |
| 31 |
dev-libs/libxslt |
| 32 |
) |
| 33 |
xmpp? ( |
| 34 |
- app-crypt/qca:2 |
| 35 |
+ app-crypt/qca:2[qt4] |
| 36 |
net-dns/libidn |
| 37 |
) |
| 38 |
yahoo? ( media-libs/jasper ) |
| 39 |
@@ -100,7 +100,7 @@ RDEPEND="${COMMONDEPEND} |
| 40 |
virtual/latex-base |
| 41 |
) |
| 42 |
sms? ( app-mobilephone/smssend ) |
| 43 |
- ssl? ( app-crypt/qca-ossl:2 ) |
| 44 |
+ ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) |
| 45 |
winpopup? ( net-fs/samba ) |
| 46 |
" |
| 47 |
# telepathy? ( net-libs/decibel )" |
| 48 |
|
| 49 |
diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild |
| 50 |
index b6a6493..b5d2c61 100644 |
| 51 |
--- a/kde-apps/kopete/kopete-9999.ebuild |
| 52 |
+++ b/kde-apps/kopete/kopete-9999.ebuild |
| 53 |
@@ -71,7 +71,7 @@ COMMONDEPEND=" |
| 54 |
>=dev-qt/qtgui-4.4.0:4[mng] |
| 55 |
!aqua? ( x11-libs/libXScrnSaver ) |
| 56 |
gadu? ( >=net-libs/libgadu-1.8.0[threads] ) |
| 57 |
- groupwise? ( app-crypt/qca:2 ) |
| 58 |
+ groupwise? ( app-crypt/qca:2[qt4] ) |
| 59 |
jingle? ( |
| 60 |
>=media-libs/mediastreamer-2.3.0 |
| 61 |
media-libs/speex |
| 62 |
@@ -86,7 +86,7 @@ COMMONDEPEND=" |
| 63 |
dev-libs/libxslt |
| 64 |
) |
| 65 |
xmpp? ( |
| 66 |
- app-crypt/qca:2 |
| 67 |
+ app-crypt/qca:2[qt4] |
| 68 |
net-dns/libidn |
| 69 |
) |
| 70 |
yahoo? ( media-libs/jasper ) |
| 71 |
@@ -100,7 +100,7 @@ RDEPEND="${COMMONDEPEND} |
| 72 |
virtual/latex-base |
| 73 |
) |
| 74 |
sms? ( app-mobilephone/smssend ) |
| 75 |
- ssl? ( app-crypt/qca-ossl:2 ) |
| 76 |
+ ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) |
| 77 |
winpopup? ( net-fs/samba ) |
| 78 |
" |
| 79 |
# telepathy? ( net-libs/decibel )" |
Archives