| 1 |
commit: a00b4aabbf8e21d8203ee3dfb7b2db77da01f222 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 6 17:06:49 2015 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 6 17:06:49 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a00b4aab |
| 7 |
|
| 8 |
[kde-apps/kopete] Add missing dependencies that prevented libjingle-call from being built wrt bug #536326. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.14 |
| 11 |
|
| 12 |
--- |
| 13 |
kde-apps/kopete/kopete-14.12.1.ebuild | 19 ++++++++++++++----- |
| 14 |
kde-apps/kopete/kopete-14.12.2.ebuild | 19 ++++++++++++++----- |
| 15 |
kde-apps/kopete/kopete-9999.ebuild | 19 ++++++++++++++----- |
| 16 |
3 files changed, 42 insertions(+), 15 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-apps/kopete/kopete-14.12.1.ebuild b/kde-apps/kopete/kopete-14.12.1.ebuild |
| 19 |
index 3295209..ac708d2 100644 |
| 20 |
--- a/kde-apps/kopete/kopete-14.12.1.ebuild |
| 21 |
+++ b/kde-apps/kopete/kopete-14.12.1.ebuild |
| 22 |
@@ -64,17 +64,24 @@ sms testbed winpopup +xmpp yahoo zeroconf" |
| 23 |
IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" |
| 24 |
|
| 25 |
COMMONDEPEND=" |
| 26 |
- dev-libs/libpcre |
| 27 |
$(add_kdebase_dep kdelibs 'zeroconf?') |
| 28 |
$(add_kdebase_dep kdepimlibs) |
| 29 |
- media-libs/qimageblitz |
| 30 |
+ dev-libs/libpcre |
| 31 |
>=dev-qt/qtgui-4.4.0:4[mng] |
| 32 |
- !aqua? ( x11-libs/libXScrnSaver ) |
| 33 |
+ media-libs/phonon[qt4] |
| 34 |
+ media-libs/qimageblitz |
| 35 |
+ !aqua? ( |
| 36 |
+ x11-libs/libX11 |
| 37 |
+ x11-libs/libXScrnSaver |
| 38 |
+ ) |
| 39 |
gadu? ( >=net-libs/libgadu-1.8.0[threads] ) |
| 40 |
- groupwise? ( app-crypt/qca:2[qt4] ) |
| 41 |
+ groupwise? ( app-crypt/qca:2[qt4(+)] ) |
| 42 |
jingle? ( |
| 43 |
+ dev-libs/expat |
| 44 |
+ dev-libs/openssl |
| 45 |
>=media-libs/mediastreamer-2.3.0 |
| 46 |
media-libs/speex |
| 47 |
+ net-libs/libsrtp |
| 48 |
net-libs/ortp:= |
| 49 |
) |
| 50 |
meanwhile? ( net-libs/meanwhile ) |
| 51 |
@@ -86,8 +93,9 @@ COMMONDEPEND=" |
| 52 |
dev-libs/libxslt |
| 53 |
) |
| 54 |
xmpp? ( |
| 55 |
- app-crypt/qca:2[qt4] |
| 56 |
+ app-crypt/qca:2[qt4(+)] |
| 57 |
net-dns/libidn |
| 58 |
+ sys-libs/zlib |
| 59 |
) |
| 60 |
yahoo? ( media-libs/jasper ) |
| 61 |
" |
| 62 |
@@ -105,6 +113,7 @@ RDEPEND="${COMMONDEPEND} |
| 63 |
" |
| 64 |
# telepathy? ( net-libs/decibel )" |
| 65 |
DEPEND="${COMMONDEPEND} |
| 66 |
+ jingle? ( dev-libs/jsoncpp ) |
| 67 |
!aqua? ( x11-proto/scrnsaverproto ) |
| 68 |
" |
| 69 |
|
| 70 |
|
| 71 |
diff --git a/kde-apps/kopete/kopete-14.12.2.ebuild b/kde-apps/kopete/kopete-14.12.2.ebuild |
| 72 |
index 3295209..ac708d2 100644 |
| 73 |
--- a/kde-apps/kopete/kopete-14.12.2.ebuild |
| 74 |
+++ b/kde-apps/kopete/kopete-14.12.2.ebuild |
| 75 |
@@ -64,17 +64,24 @@ sms testbed winpopup +xmpp yahoo zeroconf" |
| 76 |
IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" |
| 77 |
|
| 78 |
COMMONDEPEND=" |
| 79 |
- dev-libs/libpcre |
| 80 |
$(add_kdebase_dep kdelibs 'zeroconf?') |
| 81 |
$(add_kdebase_dep kdepimlibs) |
| 82 |
- media-libs/qimageblitz |
| 83 |
+ dev-libs/libpcre |
| 84 |
>=dev-qt/qtgui-4.4.0:4[mng] |
| 85 |
- !aqua? ( x11-libs/libXScrnSaver ) |
| 86 |
+ media-libs/phonon[qt4] |
| 87 |
+ media-libs/qimageblitz |
| 88 |
+ !aqua? ( |
| 89 |
+ x11-libs/libX11 |
| 90 |
+ x11-libs/libXScrnSaver |
| 91 |
+ ) |
| 92 |
gadu? ( >=net-libs/libgadu-1.8.0[threads] ) |
| 93 |
- groupwise? ( app-crypt/qca:2[qt4] ) |
| 94 |
+ groupwise? ( app-crypt/qca:2[qt4(+)] ) |
| 95 |
jingle? ( |
| 96 |
+ dev-libs/expat |
| 97 |
+ dev-libs/openssl |
| 98 |
>=media-libs/mediastreamer-2.3.0 |
| 99 |
media-libs/speex |
| 100 |
+ net-libs/libsrtp |
| 101 |
net-libs/ortp:= |
| 102 |
) |
| 103 |
meanwhile? ( net-libs/meanwhile ) |
| 104 |
@@ -86,8 +93,9 @@ COMMONDEPEND=" |
| 105 |
dev-libs/libxslt |
| 106 |
) |
| 107 |
xmpp? ( |
| 108 |
- app-crypt/qca:2[qt4] |
| 109 |
+ app-crypt/qca:2[qt4(+)] |
| 110 |
net-dns/libidn |
| 111 |
+ sys-libs/zlib |
| 112 |
) |
| 113 |
yahoo? ( media-libs/jasper ) |
| 114 |
" |
| 115 |
@@ -105,6 +113,7 @@ RDEPEND="${COMMONDEPEND} |
| 116 |
" |
| 117 |
# telepathy? ( net-libs/decibel )" |
| 118 |
DEPEND="${COMMONDEPEND} |
| 119 |
+ jingle? ( dev-libs/jsoncpp ) |
| 120 |
!aqua? ( x11-proto/scrnsaverproto ) |
| 121 |
" |
| 122 |
|
| 123 |
|
| 124 |
diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild |
| 125 |
index b5d2c61..8131ba3 100644 |
| 126 |
--- a/kde-apps/kopete/kopete-9999.ebuild |
| 127 |
+++ b/kde-apps/kopete/kopete-9999.ebuild |
| 128 |
@@ -64,17 +64,24 @@ sms testbed winpopup +xmpp yahoo zeroconf" |
| 129 |
IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" |
| 130 |
|
| 131 |
COMMONDEPEND=" |
| 132 |
- dev-libs/libpcre |
| 133 |
$(add_kdebase_dep kdelibs 'zeroconf?') |
| 134 |
$(add_kdebase_dep kdepimlibs) |
| 135 |
- media-libs/qimageblitz |
| 136 |
+ dev-libs/libpcre |
| 137 |
>=dev-qt/qtgui-4.4.0:4[mng] |
| 138 |
- !aqua? ( x11-libs/libXScrnSaver ) |
| 139 |
+ media-libs/phonon[qt4] |
| 140 |
+ media-libs/qimageblitz |
| 141 |
+ !aqua? ( |
| 142 |
+ x11-libs/libX11 |
| 143 |
+ x11-libs/libXScrnSaver |
| 144 |
+ ) |
| 145 |
gadu? ( >=net-libs/libgadu-1.8.0[threads] ) |
| 146 |
- groupwise? ( app-crypt/qca:2[qt4] ) |
| 147 |
+ groupwise? ( app-crypt/qca:2[qt4(+)] ) |
| 148 |
jingle? ( |
| 149 |
+ dev-libs/expat |
| 150 |
+ dev-libs/openssl |
| 151 |
>=media-libs/mediastreamer-2.3.0 |
| 152 |
media-libs/speex |
| 153 |
+ net-libs/libsrtp |
| 154 |
net-libs/ortp:= |
| 155 |
) |
| 156 |
meanwhile? ( net-libs/meanwhile ) |
| 157 |
@@ -86,8 +93,9 @@ COMMONDEPEND=" |
| 158 |
dev-libs/libxslt |
| 159 |
) |
| 160 |
xmpp? ( |
| 161 |
- app-crypt/qca:2[qt4] |
| 162 |
+ app-crypt/qca:2[qt4(+)] |
| 163 |
net-dns/libidn |
| 164 |
+ sys-libs/zlib |
| 165 |
) |
| 166 |
yahoo? ( media-libs/jasper ) |
| 167 |
" |
| 168 |
@@ -105,6 +113,7 @@ RDEPEND="${COMMONDEPEND} |
| 169 |
" |
| 170 |
# telepathy? ( net-libs/decibel )" |
| 171 |
DEPEND="${COMMONDEPEND} |
| 172 |
+ jingle? ( dev-libs/jsoncpp ) |
| 173 |
!aqua? ( x11-proto/scrnsaverproto ) |
| 174 |
" |
Archives