Rename jabber USE flag to xmpp, bug #216300.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

diff --git a/net-im/telepathy-connection-managers/ChangeLog b/net-im/telepathy-connection-managers/ChangeLog
index cd1566ea642870cc100777342dc88910f8149126..130408321e1f3bba26b9bc1b7cd7e469d8aec6ec 100644 (file)
--- a/net-im/telepathy-connection-managers/ChangeLog
+++ b/net-im/telepathy-connection-managers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/telepathy-connection-managers
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-connection-managers/ChangeLog,v 1.24 2014/11/14 09:11:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-connection-managers/ChangeLog,v 1.25 2014/12/27 15:49:45 eva Exp $
+
+  27 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  telepathy-connection-managers-2-r2.ebuild, metadata.xml:
+  Rename jabber USE flag to xmpp, bug #216300.
 
   14 Nov 2014; Pacho Ramos <pacho@gentoo.org>
   -telepathy-connection-managers-2.ebuild:

diff --git a/net-im/telepathy-connection-managers/Manifest b/net-im/telepathy-connection-managers/Manifest
index 207f066fc845f57e82e77b6f795f6edd54d5da51..15bc696e9821814d5b909d757e59deb6e3dea73a 100644 (file)
--- a/net-im/telepathy-connection-managers/Manifest
+++ b/net-im/telepathy-connection-managers/Manifest
@@ -1,13 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD telepathy-connection-managers-2-r2.ebuild 1026 SHA256 bc09a37a392ef65a128f78642b8805d4d68f3e1cc47ba49a28f72a08ec175b17 SHA512 e278fedf8f85e726a07897f71c24188352892601059fc38f1c6aaac3eb6bc24ca62fc5b382ffde0ea53b3188f1d954af188e9f11292d1a7994faeeb29fb8844f WHIRLPOOL d72aec50213c22c6528c44f32daefa027ac64bd4fe8e32212bec55dc6af363df9d14ba128dd60c80b2d83429648c6075536652ce3594c8283b07f44e53c082eb
-MISC ChangeLog 5305 SHA256 d446a25136420648933e4c09422286cfc3a581cc4e094fd55a6cc1efc93cb2c1 SHA512 324f7ebd60d364b0b2042f73e3197bdecb4c6f2d79c82664d1d202edd9a5b5979c23fa2f3b0ae474500c53501c3bf82d2b3ce78fe96ba6434a6fb831404c6c00 WHIRLPOOL 42cb79dd8f028217d7a1c061d1189647fab17c194c4a0ec3753a58cbda4ae13a3b486267de3df30cdc19043a442e2a744cf1cced25a6bd307d2aa04a9f6b833b
-MISC metadata.xml 607 SHA256 91d6eeb6ecade4d621a160de337528c83204b8e2861c38c7d24b59a6faf4b8ae SHA512 b0e5c61bdd8e18547519e157e0eae38af3e1237c20b571c1c6e7415e7af6e17ac5f768dc171cb7c584ca51d8a8c32739d976ca864803e8e4e295910439456e0e WHIRLPOOL b74d633acdf9c90b2e4798024c91276dffebd7f7ec3033aae78d194d43d0c84db97097664870fcfe5271ba1b978c111d887b46ef18fa4da1da4f2363e34f29fe
+EBUILD telepathy-connection-managers-2-r2.ebuild 1020 SHA256 e5e1ddec19eb7d9278318b1d240a729cf98198c9c284758558accc2529ca58fb SHA512 6142c66a8c2cd4e63f302882dfd697f5830cdf6122ff74ee18aeee9a8c7c348d8e880010ee07c4facbbfbda11232ea0b686496e3c147f55920ea0e79f3efbd92 WHIRLPOOL 941ec3271130dcac55008635a6e0e964565623011d3839b18f9e65f708d1aa0383fd24d42320179464e7bef143bac3c4d40365e4e361f142b852d28a4308740a
+MISC ChangeLog 5464 SHA256 6a0be722cff9df3ab3176277dd69e9d923f30f47142cb0b3ff171554659d0173 SHA512 643b0e11c799049cfbc152e059e52d6b0697e3fe127237fd8a8d1f3adfcb958147ec4da0a8ad86d42569090f06f379eb1f99e07e80e301a345bd08cae4d500e2 WHIRLPOOL 22d2bd3ed5c23818a64d6e158b2491973bea5449d7a25d81c2c28e98aa93043af775a61b8998a4fbef8cf0cb7a8598684cc6b0a57134837185f24480f3eb4888
+MISC metadata.xml 605 SHA256 ba8c04895763f2b3742d415308598ef295e9f2e98d51291d4e956ac0abe94183 SHA512 4fd73af2c3cf07d07cb8a8656b958a7e7cd7aab8b8b687fafc6208cd10af1d0964b56f6663eb5fae440406e56059c80290349423df1aa9666508aa15427364db WHIRLPOOL 1847c9113c25bcfa56e54e6a00dba6b294b363980baa01f2fb16d50bafd8f5bebbac55e9ade08c06995bf062bcce9e4feec817a054bdc7db486f3849a4b4b008
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRlxysACgkQCaWpQKGI+9QpLgCePYLuaOYr9SJtLSJG+gYqiecg
-OokAn3C8OzWCnC20Zx/6hcfOHJ/bZTpp
-=QtoP
+iEYEAREIAAYFAlSe1RoACgkQ1fmVwcYIWAbLWwCgpmTbzDL3NaBo3HR1tG9PU7zo
+E0IAn3jUGXt7qdRX/7Puhv8VSVYFPfUV
+=Nzuw
 -----END PGP SIGNATURE-----

diff --git a/net-im/telepathy-connection-managers/metadata.xml b/net-im/telepathy-connection-managers/metadata.xml
index b69f6034d1a646585246716b7161bf52c8beb121..b282d71c2d682ce8b6093bddc200dfe1ae8a29bd 100644 (file)
--- a/net-im/telepathy-connection-managers/metadata.xml
+++ b/net-im/telepathy-connection-managers/metadata.xml
@@ -3,11 +3,11 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-  <flag name='zeroconf'>Enable Link-Local Messaging via the zeroconf or Bonjour protocol.</flag>
-  <flag name='sip'>Enable SIP/SIMPLE messaging and calling.</flag>
   <flag name='irc'>Enable Internet Relay Chat (IRC) support.</flag>
-  <flag name='yahoo'>Enable Yahoo! messaging support.</flag>
-  <flag name='jabber'>Enable XMPP protocol handler (this is also Google Talk).</flag>
+  <flag name='sip'>Enable SIP/SIMPLE messaging and calling.</flag>
   <flag name='sipe'>Enable Sip Exchange Protocol.</flag>
+  <flag name='xmpp'>Enable XMPP protocol handler (this is also Google Talk).</flag>
+  <flag name='yahoo'>Enable Yahoo! messaging support.</flag>
+  <flag name='zeroconf'>Enable Link-Local Messaging via the zeroconf or Bonjour protocol.</flag>
 </use>
 </pkgmetadata>

diff --git a/net-im/telepathy-connection-managers/telepathy-connection-managers-2-r2.ebuild b/net-im/telepathy-connection-managers/telepathy-connection-managers-2-r2.ebuild
index fc70e619776fbe2d45a2ee81ab9a9d50d59e6750..72f4facb6fc1d032725d931db04a06ac07ed77d1 100644 (file)
--- a/net-im/telepathy-connection-managers/telepathy-connection-managers-2-r2.ebuild
+++ b/net-im/telepathy-connection-managers/telepathy-connection-managers-2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-connection-managers/telepathy-connection-managers-2-r2.ebuild,v 1.4 2014/03/09 12:02:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-connection-managers/telepathy-connection-managers-2-r2.ebuild,v 1.5 2014/12/27 15:49:45 eva Exp $
 
 EAPI=5
 
@@ -12,18 +12,18 @@ SLOT="0"
 
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
 
-IUSE="msn +irc yahoo icq +jabber sip sipe zeroconf"
+IUSE="icq +irc msn sip sipe +xmpp yahoo zeroconf"
 
 DEPEND=""
 # These version support the 0.24.0 Telepathy specification
 # They work with Mission Control 5.14
 RDEPEND="
+       icq? ( >=net-voip/telepathy-haze-0.6.0 )
+       irc? ( >=net-irc/telepathy-idle-0.1.14 )
        msn? ( >=net-voip/telepathy-gabble-0.16.4 )
-       jabber? ( >=net-voip/telepathy-gabble-0.16.4 )
        sip? ( >=net-voip/telepathy-rakia-0.7.4 )
        sipe? ( >=x11-plugins/pidgin-sipe-1.17.1[telepathy] )
-       zeroconf? ( >=net-voip/telepathy-salut-0.8.1 )
-       icq? ( >=net-voip/telepathy-haze-0.6.0 )
+       xmpp? ( >=net-voip/telepathy-gabble-0.16.4 )
        yahoo? ( >=net-voip/telepathy-haze-0.6.0 )
-       irc? ( >=net-irc/telepathy-idle-0.1.14 )
+       zeroconf? ( >=net-voip/telepathy-salut-0.8.1 )
 "