| 1 |
commit: 3d7ec936dff0c072b75acec951a9ecfa464620cf |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 3 09:07:42 2014 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 3 09:07:42 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3d7ec936 |
| 7 |
|
| 8 |
[kde-base/kopete] Remove MSN support due to that service shutting down. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.10 |
| 11 |
|
| 12 |
--- |
| 13 |
kde-base/kopete/kopete-4.14.49.9999.ebuild | 12 +++++------- |
| 14 |
kde-base/kopete/metadata.xml | 1 - |
| 15 |
2 files changed, 5 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-base/kopete/kopete-4.14.49.9999.ebuild b/kde-base/kopete/kopete-4.14.49.9999.ebuild |
| 18 |
index 7cc4815..5db281a 100644 |
| 19 |
--- a/kde-base/kopete/kopete-4.14.49.9999.ebuild |
| 20 |
+++ b/kde-base/kopete/kopete-4.14.49.9999.ebuild |
| 21 |
@@ -46,19 +46,19 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex |
| 22 |
# xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK |
| 23 |
# jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM |
| 24 |
# meanwhile: net-libs/meanwhile |
| 25 |
-# msn: libmsn == this is wlm plugin, we disable msn one |
| 26 |
# oscar: NO DEPS |
| 27 |
# telepathy: net-libs/decibel |
| 28 |
# testbed: NO DEPS |
| 29 |
# winpopup: NO DEPS (we're adding samba as RDEPEND so it works) |
| 30 |
# yahoo: media-libs/jasper |
| 31 |
# zeroconf (bonjour): NO DEPS |
| 32 |
-PROTOCOLS="gadu groupwise jingle meanwhile msn oscar skype |
| 33 |
+PROTOCOLS="gadu groupwise jingle meanwhile oscar skype |
| 34 |
sms testbed winpopup +xmpp yahoo zeroconf" |
| 35 |
|
| 36 |
# disabled protocols |
| 37 |
# telepathy: net-libs/decibel |
| 38 |
# irc: NO DEPS |
| 39 |
+# msn: net-libs/libmsn |
| 40 |
# qq: NO DEPS |
| 41 |
|
| 42 |
IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" |
| 43 |
@@ -78,7 +78,6 @@ COMMONDEPEND=" |
| 44 |
net-libs/ortp:= |
| 45 |
) |
| 46 |
meanwhile? ( net-libs/meanwhile ) |
| 47 |
- msn? ( >=net-libs/libmsn-4.1 ) |
| 48 |
otr? ( >=net-libs/libotr-4.0.0 ) |
| 49 |
statistics? ( dev-db/sqlite:3 ) |
| 50 |
v4l? ( media-libs/libv4l ) |
| 51 |
@@ -122,7 +121,6 @@ src_configure() { |
| 52 |
# enable protocols |
| 53 |
for x in ${PROTOCOLS}; do |
| 54 |
case ${x/+/} in |
| 55 |
- msn) x2=Libmsn ;; |
| 56 |
zeroconf) x2=bonjour ;; |
| 57 |
xmpp) x2=jabber ;; |
| 58 |
*) x2='' ;; |
| 59 |
@@ -130,7 +128,7 @@ src_configure() { |
| 60 |
mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2})) |
| 61 |
done |
| 62 |
|
| 63 |
- mycmakeargs+=( -DWITH_qq=OFF ) |
| 64 |
+ mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF ) |
| 65 |
|
| 66 |
# enable plugins |
| 67 |
for x in ${PLUGINS}; do |
| 68 |
@@ -150,9 +148,9 @@ pkg_postinst() { |
| 69 |
#fi |
| 70 |
|
| 71 |
if ! use ssl; then |
| 72 |
- if use xmpp || use msn; then # || use irc; then |
| 73 |
+ if use xmpp ; then # || use irc; then |
| 74 |
if ! has_version app-crypt/qca-ossl ; then |
| 75 |
- elog "In order to use ssl in xmpp and msn you'll need to" |
| 76 |
+ elog "In order to use ssl in xmpp you'll need to" |
| 77 |
elog "install app-crypt/qca-ossl package." |
| 78 |
fi |
| 79 |
fi |
| 80 |
|
| 81 |
diff --git a/kde-base/kopete/metadata.xml b/kde-base/kopete/metadata.xml |
| 82 |
index 0821cde..8523a4e 100644 |
| 83 |
--- a/kde-base/kopete/metadata.xml |
| 84 |
+++ b/kde-base/kopete/metadata.xml |
| 85 |
@@ -25,7 +25,6 @@ |
| 86 |
<flag name="irc">Enable the IRC protocol handler.</flag> |
| 87 |
--> |
| 88 |
<flag name="meanwhile">Enable the Sametime protocol handler.</flag> |
| 89 |
- <flag name="msn">Enable "Windows live messenger" protocol support.</flag> |
| 90 |
<flag name="skype">Enable Skype protocol handler (not fully functional yet).</flag> |
| 91 |
<!-- uncomment this when enabled in ebuild |
| 92 |
<flag name="telepathy">Enable support for the real-time communication framework telepathy.</flag> |
Archives