Enable jabber and irc by default, bug #488512. Drop old.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 42 insertions, 36 deletions

diff --git a/net-im/telepathy-connection-managers/ChangeLog b/net-im/telepathy-connection-managers/ChangeLog
index 604c05ed2f75..dd3db5ed097e 100644
--- a/net-im/telepathy-connection-managers/ChangeLog
+++ b/net-im/telepathy-connection-managers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/telepathy-connection-managers
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-connection-managers/ChangeLog,v 1.13 2013/07/05 03:16:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-connection-managers/ChangeLog,v 1.14 2013/10/20 07:48:11 pacho Exp $
+
+*telepathy-connection-managers-2-r1 (20 Oct 2013)
+
+  20 Oct 2013; Pacho Ramos <pacho@gentoo.org>
+  +telepathy-connection-managers-2-r1.ebuild,
+  -telepathy-connection-managers-1.ebuild:
+  Enable jabber and irc by default, bug #488512. Drop old.
 
   05 Jul 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
   telepathy-connection-managers-2.ebuild:
diff --git a/net-im/telepathy-connection-managers/Manifest b/net-im/telepathy-connection-managers/Manifest
index 52b125599fd0..5a41e4ee52d5 100644
--- a/net-im/telepathy-connection-managers/Manifest
+++ b/net-im/telepathy-connection-managers/Manifest
@@ -1,18 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD telepathy-connection-managers-1.ebuild 941 SHA256 d7b2f37cde08fe14a822f31f889388dcd24854a6eb2d4b044b346addad5917de SHA512 2ae79745c42a3f998c135d4505634a43eab715b5e788d2d813bafefcd98b92b31cdf91ff3340e49f232b42dc041a964159e2089a6bda435af48b372ad98b4358 WHIRLPOOL d5f5aac511bec3608bce4175f0244f2b806a97cc0b3f717583ff16d9183a46a6f7ee92a5c06a1ad542e22735d9468d980744a25209f1a64f4a4d1a499101682c
+EBUILD telepathy-connection-managers-2-r1.ebuild 968 SHA256 da29cb98467e98bcee65019727322492ee4e7f4962277d35c38f66f68885f806 SHA512 302e7379ee73fcbd7de53ae13f811246e0e451dd5490551f048d304d6fc3f6c0377a78e635f5feca39792d6d14fafb029968bffa5b81e1a007d08086b2a954fc WHIRLPOOL 2c8072a88935f51315ccea50c9d02f86f44e35b58c99b2ca677accfd5b351ea447caba700fd070420c44ac71aeed8dcf8e2ed5abf5a5eb7700876a3f4e89beec
 EBUILD telepathy-connection-managers-2.ebuild 946 SHA256 573152f1ee10982557d50b3c7dd7ee17eb2de1dedd924e6eaa6e0bf53b5d421a SHA512 17482bf448dca6df876ecac367cbc7372554de9f661bdbfcf94630c8dc6e53e440e3210c75de196955267cb9f2208892af582bbf37518ea567ca9467304f82b6 WHIRLPOOL 2bded71ef59156bdcf613744a9b121d7a9237d67936c5b3afa4a302de04dad216afb6e0740093c4c28397205c54dd19d1657f02688a22401e251d4a2cecfdbca
-MISC ChangeLog 3691 SHA256 dfc0bd379bf205666e61ef8b0a3d07c2e7b93e0c1a4ad5705c443f40c1085eb9 SHA512 5e0bb554961ad2ea417dd7c23744b2580568ee1153d6e3dddbc2c331764e4e7a45e27d0f0aea2c9656291b8d66c09185ec303749d5a642e7106c8671bf6bac3c WHIRLPOOL 710bdf3f38ecb15ec18567598fa3d48d104e2ccb9ee032ff7cbdc465190d2f2737a5c446df0822361b4ad5ade02c22453d1b988197de39a1cb1b988d0bb2642e
+MISC ChangeLog 3933 SHA256 be07a31703845bea3e82f29d492175b5a8e235d858434633fa84855c7c9b559b SHA512 123afcaaa75baee882a58223e810c7eb026cf189d8b474f29f70aa568d498075c06300c3668b2dc0ea373df4ef0f92b225d037f2ab2ebbedbc3ed695bca36459 WHIRLPOOL 4c92f0171e08eaa816eb8c96aea14d9d45896d4d182b56a1a3064a3ad242e3ca0958e1f584a372fa0f056004f0cdc0b86bd9236940caa9016a2dc4c71e166216
 MISC metadata.xml 588 SHA256 5b4b7fb649212520a9597de0fa8ae2577ec014568e2a892d87b23e671ab3de15 SHA512 80f3f0d666c393708df3f4601bdb01fc86db002b9064f49c0908358b9f7f0d70867a4ff35b2a9a7862f22a5e3a632cb5591f1a0b69c7c45189bd6fc3c98b99d3 WHIRLPOOL 4757c46f76e6b0151f7f2720cc1195500191dd46e7575076ce92ebf19e45f0d0d9676dd10a88f41b86319da53cc9cb4eae54710c7f0538af569f095d9f887fd6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR1jqlAAoJEJ0WA1zPCt1h/ScH/iCNn47mWiANhvBtA2yOeYGB
-rY9q6ZWUdTPvsAeF4HdbpW7bxRx4ddgCvHcpcMs8VJT1IqtZ/AUqskngTUfXjy+D
-IDje5CaPzcS/IKM8xFFngCQYC20W1oGZlb0R3TYPyurA2RYuxNvXwUsr5yYi375H
-RTpjFohTeUqrOZq0mJjjvYbRZTdlxZx9lwNWoSb+gnlPk5JcHyOBedAoKhJTCSWM
-HrH22iL3+D5yveXYPEFtvfnSBwmXT4saZuGRFgjWR6HcLPvqroq7Q3R5WsI1efhn
-LhK+A39P8btviAeWX5TzAPRxnT9kVBhuQQ6iWjtLnvAC2dEB4MabjXX1HwuGFEI=
-=/3ya
+iEYEAREIAAYFAlJjirwACgkQCaWpQKGI+9RgLwCggpV/GL43vgUB88SNlC9BvpDL
+Z6AAnRSBTshBBGPTU00VgkgTWyyHdvGx
+=wNSM
 -----END PGP SIGNATURE-----
diff --git a/net-im/telepathy-connection-managers/telepathy-connection-managers-1.ebuild b/net-im/telepathy-connection-managers/telepathy-connection-managers-1.ebuild
deleted file mode 100644
index f8bdc3aac842..000000000000
--- a/net-im/telepathy-connection-managers/telepathy-connection-managers-1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 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-1.ebuild,v 1.6 2013/02/02 23:01:34 ago Exp $
-
-DESCRIPTION="Meta-package for Telepathy Connection Managers"
-
-HOMEPAGE="http://telepathy.freedesktop.org/"
-SRC_URI=""
-LICENSE="metapackage"
-SLOT="0"
-
-KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86 ~x86-linux"
-
-IUSE="msn irc yahoo icq jabber sip zeroconf"
-
-DEPEND=""
-# These version support the 0.18.0 Telepathy specification
-# They work with Mission Control 5.2
-RDEPEND="msn? ( >=net-voip/telepathy-haze-0.3.2 )
-	jabber? ( >=net-voip/telepathy-gabble-0.8.0 )
-	sip? ( >=net-voip/telepathy-rakia-0.5.18 )
-	zeroconf? ( >=net-voip/telepathy-salut-0.3.10 )
-	icq? ( >=net-voip/telepathy-haze-0.3.2 )
-	yahoo? ( >=net-voip/telepathy-haze-0.3.2 )
-	irc? ( >=net-irc/telepathy-idle-0.1.5 )"
diff --git a/net-im/telepathy-connection-managers/telepathy-connection-managers-2-r1.ebuild b/net-im/telepathy-connection-managers/telepathy-connection-managers-2-r1.ebuild
new file mode 100644
index 000000000000..fbf2c141d322
--- /dev/null
+++ b/net-im/telepathy-connection-managers/telepathy-connection-managers-2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 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-r1.ebuild,v 1.1 2013/10/20 07:48:11 pacho Exp $
+
+EAPI=5
+DESCRIPTION="Meta-package for Telepathy Connection Managers"
+
+HOMEPAGE="http://telepathy.freedesktop.org/"
+SRC_URI=""
+LICENSE="metapackage"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+
+IUSE="msn +irc yahoo icq +jabber sip zeroconf"
+
+DEPEND=""
+# These version support the 0.24.0 Telepathy specification
+# They work with Mission Control 5.14
+RDEPEND="
+	msn? ( >=net-voip/telepathy-gabble-0.16.4 )
+	jabber? ( >=net-voip/telepathy-gabble-0.16.4 )
+	sip? ( >=net-voip/telepathy-rakia-0.7.4 )
+	zeroconf? ( >=net-voip/telepathy-salut-0.8.1 )
+	icq? ( >=net-voip/telepathy-haze-0.6.0 )
+	yahoo? ( >=net-voip/telepathy-haze-0.6.0 )
+	irc? ( >=net-irc/telepathy-idle-0.1.14 )
+"