| 1 |
commit: d5b996d08fc0b98c8c59cb7853390e0be6efab3d |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 19 18:01:56 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 19 18:01:56 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d5b996d0 |
| 7 |
|
| 8 |
kde-apps/kopete: Disable broken cryptography, jingle |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.14, Repoman-2.3.6 |
| 11 |
|
| 12 |
kde-apps/kopete/kopete-17.08.3_p20171029.ebuild | 24 ++-------------- |
| 13 |
kde-apps/kopete/kopete-9999.ebuild | 38 ++++++++++++------------- |
| 14 |
kde-apps/kopete/metadata.xml | 1 - |
| 15 |
3 files changed, 21 insertions(+), 42 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild b/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild |
| 18 |
index 2cc8c33ec6..2e91d8471d 100644 |
| 19 |
--- a/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild |
| 20 |
+++ b/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild |
| 21 |
@@ -24,7 +24,6 @@ RESTRICT+=" test" |
| 22 |
# alias: NO DEPS (disabled upstream) |
| 23 |
# autoreplace: NO DEPS |
| 24 |
# contactnotes: NO DEPS |
| 25 |
-# cryptography: app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5 |
| 26 |
# highlight: NO DEPS |
| 27 |
# history: NO DEPS |
| 28 |
# latex: virtual/latex as RDEPEND |
| 29 |
@@ -38,9 +37,8 @@ RESTRICT+=" test" |
| 30 |
# urlpicpreview: NO DEPS |
| 31 |
# webpresence: libxml2 libxslt |
| 32 |
# NOTE: By default we enable all plugins that don't have any dependencies |
| 33 |
-PLUGINS="+addbookmarks +autoreplace +contactnotes +cryptography +highlight |
| 34 |
-history latex nowlistening otr pipes +privacy +statistics +texteffect |
| 35 |
-translator +urlpicpreview webpresence" |
| 36 |
+PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening |
| 37 |
+otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence" |
| 38 |
|
| 39 |
# Available protocols |
| 40 |
# |
| 41 |
@@ -48,7 +46,6 @@ translator +urlpicpreview webpresence" |
| 42 |
# groupwise: app-crypt/qca:2 |
| 43 |
# irc: NO DEPS, probably will fail so inform user about it |
| 44 |
# xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK |
| 45 |
-# jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM |
| 46 |
# meanwhile: net-libs/meanwhile |
| 47 |
# oscar: NO DEPS |
| 48 |
# telepathy: net-libs/decibel |
| 49 |
@@ -57,8 +54,7 @@ translator +urlpicpreview webpresence" |
| 50 |
# yahoo: media-libs/jasper |
| 51 |
# zeroconf (bonjour): NO DEPS |
| 52 |
# DISABLED until fixed: skype sms |
| 53 |
-PROTOCOLS="gadu groupwise jingle meanwhile oscar |
| 54 |
-testbed winpopup +xmpp yahoo zeroconf" |
| 55 |
+PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp yahoo zeroconf" |
| 56 |
|
| 57 |
# disabled protocols |
| 58 |
# telepathy: net-libs/decibel |
| 59 |
@@ -68,7 +64,6 @@ testbed winpopup +xmpp yahoo zeroconf" |
| 60 |
|
| 61 |
IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" |
| 62 |
|
| 63 |
-# media-libs/qimageblitz |
| 64 |
COMMONDEPEND=" |
| 65 |
$(add_frameworks_dep kcmutils) |
| 66 |
$(add_frameworks_dep kconfig) |
| 67 |
@@ -98,14 +93,6 @@ COMMONDEPEND=" |
| 68 |
x11-libs/libXScrnSaver |
| 69 |
gadu? ( >=net-libs/libgadu-1.8.0[threads] ) |
| 70 |
groupwise? ( app-crypt/qca:2[qt5] ) |
| 71 |
- jingle? ( |
| 72 |
- dev-libs/expat |
| 73 |
- dev-libs/openssl:0 |
| 74 |
- >=media-libs/mediastreamer-2.3.0 |
| 75 |
- media-libs/speex |
| 76 |
- net-libs/libsrtp:= |
| 77 |
- net-libs/ortp:= |
| 78 |
- ) |
| 79 |
meanwhile? ( net-libs/meanwhile ) |
| 80 |
otr? ( >=net-libs/libotr-4.0.0 ) |
| 81 |
statistics? ( dev-db/sqlite:3 ) |
| 82 |
@@ -139,22 +126,17 @@ RDEPEND="${COMMONDEPEND} |
| 83 |
# winpopup? ( net-fs/samba ) |
| 84 |
DEPEND="${COMMONDEPEND} |
| 85 |
x11-proto/scrnsaverproto |
| 86 |
- jingle? ( dev-libs/jsoncpp ) |
| 87 |
" |
| 88 |
|
| 89 |
src_configure() { |
| 90 |
local x x2 |
| 91 |
# Handle common stuff |
| 92 |
local mycmakeargs=( |
| 93 |
- $(cmake-utils_use_find_package jingle LiboRTP) |
| 94 |
- $(cmake-utils_use_find_package jingle Mediastreamer) |
| 95 |
- $(cmake-utils_use_find_package jingle Speex) |
| 96 |
-DDISABLE_VIDEOSUPPORT=$(usex !v4l) |
| 97 |
) |
| 98 |
# enable protocols |
| 99 |
for x in ${PROTOCOLS}; do |
| 100 |
case ${x/+/} in |
| 101 |
- jingle) x2=libjingle ;; |
| 102 |
xmpp) x2=jabber ;; |
| 103 |
zeroconf) x2=bonjour ;; |
| 104 |
*) x2=${x/+/} ;; |
| 105 |
|
| 106 |
diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild |
| 107 |
index 5b143ac46c..031314eee2 100644 |
| 108 |
--- a/kde-apps/kopete/kopete-9999.ebuild |
| 109 |
+++ b/kde-apps/kopete/kopete-9999.ebuild |
| 110 |
@@ -22,7 +22,7 @@ RESTRICT+=" test" |
| 111 |
# alias: NO DEPS (disabled upstream) |
| 112 |
# autoreplace: NO DEPS |
| 113 |
# contactnotes: NO DEPS |
| 114 |
-# cryptography: app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5 |
| 115 |
+# cryptography: BROKEN (app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5) |
| 116 |
# highlight: NO DEPS |
| 117 |
# history: NO DEPS |
| 118 |
# latex: virtual/latex as RDEPEND |
| 119 |
@@ -36,9 +36,8 @@ RESTRICT+=" test" |
| 120 |
# urlpicpreview: NO DEPS |
| 121 |
# webpresence: libxml2 libxslt |
| 122 |
# NOTE: By default we enable all plugins that don't have any dependencies |
| 123 |
-PLUGINS="+addbookmarks +autoreplace +contactnotes +cryptography +highlight |
| 124 |
-history latex nowlistening otr pipes +privacy +statistics +texteffect |
| 125 |
-translator +urlpicpreview webpresence" |
| 126 |
+PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening |
| 127 |
+otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence" |
| 128 |
|
| 129 |
# Available protocols |
| 130 |
# |
| 131 |
@@ -46,7 +45,7 @@ translator +urlpicpreview webpresence" |
| 132 |
# groupwise: app-crypt/qca:2 |
| 133 |
# irc: NO DEPS, probably will fail so inform user about it |
| 134 |
# xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK |
| 135 |
-# jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM |
| 136 |
+# jingle: BROKEN (media-libs/speex net-libs/ortp) DISABLED BY UPSTREAM |
| 137 |
# meanwhile: net-libs/meanwhile |
| 138 |
# oscar: NO DEPS |
| 139 |
# telepathy: net-libs/decibel |
| 140 |
@@ -55,8 +54,7 @@ translator +urlpicpreview webpresence" |
| 141 |
# yahoo: media-libs/jasper |
| 142 |
# zeroconf (bonjour): NO DEPS |
| 143 |
# DISABLED until fixed: skype sms |
| 144 |
-PROTOCOLS="gadu groupwise jingle meanwhile oscar |
| 145 |
-testbed winpopup +xmpp yahoo zeroconf" |
| 146 |
+PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp yahoo zeroconf" |
| 147 |
|
| 148 |
# disabled protocols |
| 149 |
# telepathy: net-libs/decibel |
| 150 |
@@ -66,7 +64,6 @@ testbed winpopup +xmpp yahoo zeroconf" |
| 151 |
|
| 152 |
IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" |
| 153 |
|
| 154 |
-# media-libs/qimageblitz |
| 155 |
COMMONDEPEND=" |
| 156 |
$(add_frameworks_dep kcmutils) |
| 157 |
$(add_frameworks_dep kconfig) |
| 158 |
@@ -96,14 +93,6 @@ COMMONDEPEND=" |
| 159 |
x11-libs/libXScrnSaver |
| 160 |
gadu? ( >=net-libs/libgadu-1.8.0[threads] ) |
| 161 |
groupwise? ( app-crypt/qca:2[qt5] ) |
| 162 |
- jingle? ( |
| 163 |
- dev-libs/expat |
| 164 |
- dev-libs/openssl:0 |
| 165 |
- >=media-libs/mediastreamer-2.3.0 |
| 166 |
- media-libs/speex |
| 167 |
- net-libs/libsrtp:= |
| 168 |
- net-libs/ortp:= |
| 169 |
- ) |
| 170 |
meanwhile? ( net-libs/meanwhile ) |
| 171 |
otr? ( >=net-libs/libotr-4.0.0 ) |
| 172 |
statistics? ( dev-db/sqlite:3 ) |
| 173 |
@@ -123,6 +112,14 @@ COMMONDEPEND=" |
| 174 |
$(add_kdeapps_dep kidentitymanagement) |
| 175 |
) |
| 176 |
" |
| 177 |
+# jingle? ( |
| 178 |
+# dev-libs/expat |
| 179 |
+# dev-libs/openssl:0 |
| 180 |
+# >=media-libs/mediastreamer-2.3.0 |
| 181 |
+# media-libs/speex |
| 182 |
+# net-libs/libsrtp:= |
| 183 |
+# net-libs/ortp:= |
| 184 |
+# ) |
| 185 |
RDEPEND="${COMMONDEPEND} |
| 186 |
latex? ( |
| 187 |
|| ( |
| 188 |
@@ -137,18 +134,19 @@ RDEPEND="${COMMONDEPEND} |
| 189 |
# winpopup? ( net-fs/samba ) |
| 190 |
DEPEND="${COMMONDEPEND} |
| 191 |
x11-proto/scrnsaverproto |
| 192 |
- jingle? ( dev-libs/jsoncpp ) |
| 193 |
" |
| 194 |
+# jingle? ( dev-libs/jsoncpp ) |
| 195 |
|
| 196 |
src_configure() { |
| 197 |
local x x2 |
| 198 |
# Handle common stuff |
| 199 |
local mycmakeargs=( |
| 200 |
- $(cmake-utils_use_find_package jingle LiboRTP) |
| 201 |
- $(cmake-utils_use_find_package jingle Mediastreamer) |
| 202 |
- $(cmake-utils_use_find_package jingle Speex) |
| 203 |
-DDISABLE_VIDEOSUPPORT=$(usex !v4l) |
| 204 |
) |
| 205 |
+# $(cmake-utils_use_find_package jingle LiboRTP) |
| 206 |
+# $(cmake-utils_use_find_package jingle Mediastreamer) |
| 207 |
+# $(cmake-utils_use_find_package jingle Speex) |
| 208 |
+ |
| 209 |
# enable protocols |
| 210 |
for x in ${PROTOCOLS}; do |
| 211 |
case ${x/+/} in |
| 212 |
|
| 213 |
diff --git a/kde-apps/kopete/metadata.xml b/kde-apps/kopete/metadata.xml |
| 214 |
index 2b6a3b5d29..22e128fe4d 100644 |
| 215 |
--- a/kde-apps/kopete/metadata.xml |
| 216 |
+++ b/kde-apps/kopete/metadata.xml |
| 217 |
@@ -6,7 +6,6 @@ |
| 218 |
<flag name="addbookmarks">Automatically add incoming urls to bookmarks.</flag> |
| 219 |
<flag name="autoreplace">Automatically replace selected text</flag> |
| 220 |
<flag name="contactnotes">Enables writing personal notes for contacts.</flag> |
| 221 |
- <flag name="cryptography">Enable cryptography plugin</flag> |
| 222 |
<flag name="highlight">Allows you to specify highlights on specific events.</flag> |
| 223 |
<flag name="history">Enables saving chat history.</flag> |
| 224 |
<flag name="latex">Embed latex formatted text into messages.</flag> |
Archives