telepathy-connection-managers moved to net-im/. Drop old and drop keywords from unsecure version.

Package-Manager: portage-2.1.10.36/cvs/Linux x86_64
RepoMan-Options: --force

6 files changed, 24 insertions, 141 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index ae8eed8dfb84..b9a545d64ff8 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.96 2011/11/13 19:29:25 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.97 2011/11/22 01:01:42 pacho Exp $
+
+  22 Nov 2011; Pacho Ramos <pacho@gentoo.org> -empathy-3.2.1.1.ebuild,
+  empathy-2.32.2.ebuild, empathy-2.34.0-r2.ebuild, empathy-3.2.1.2.ebuild:
+  telepathy-connection-managers moved to net-im/. Drop old and drop keywords
+  from unsecure version.
 
 *empathy-3.2.1.2 (13 Nov 2011)
 
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index 62759475aa16..43c4c42a604f 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -7,18 +7,16 @@ AUX empathy-2.34.0-auth-dialog-crash-fix.patch 976 RMD160 97ea8bb28e5673baaca8d4
 AUX empathy-2.34.0-missing-include.patch 379 RMD160 c0284cfd166c731b8214f849c0503e646eb4bf7b SHA1 e01c5f0dfc57550e7933b85f0d4c61d29e58b061 SHA256 4e0db8f73a72c5adfd331f53d291f600f83a01832a22121a4b946306f8bc23b6
 DIST empathy-2.32.2.tar.bz2 2936340 RMD160 36d42e08343e49c1963405caeb35e76400bab209 SHA1 b956af129aaecc54491c7bc01892bb29c33c1d32 SHA256 f90a45955205fd8bd783a55acae4603197caab4f16a880106f8639cbbbe5e861
 DIST empathy-2.34.0.tar.bz2 3361496 RMD160 a76e9633d88dbd48c5d494d3393566a88a5b35c4 SHA1 cc82c871fb1d3dbc428b851c59ad44184f064d10 SHA256 6efa0ae3ac3580ac9600f889c92497f36983e22da79d547a65030a14691369d1
-DIST empathy-3.2.1.1.tar.xz 3195440 RMD160 20af11b464744e9fc16d10f38fb2a4aa6639ddd6 SHA1 2d6cc3a8864ea7a276c36e493700fb68a73d0d43 SHA256 2b4ce3184fcd8c2260654f925e4055a7e02513c5eefa4745bcdf82c9039b7681
 DIST empathy-3.2.1.2.tar.xz 3183768 RMD160 f3f5b7cfb852a1f82d6a6e3b2a62aba95ac1042f SHA1 6bf4e0d0c3fcfb8c62269ad324b21c6a15f2dab1 SHA256 44e149ecadce6269a6d31d93bbd7d4a4bda8d092d4e95de9d5ca09cf067d8ab7
-EBUILD empathy-2.32.2.ebuild 3129 RMD160 432ea4a9ea354ff8c031a6e91b77f460f853f568 SHA1 02c8374d7368e1485f992df349441b316b12fcc9 SHA256 8c784893206ce642837dec44e29cfbbaa7ca6a57b55a65d847d02b5883fdbdad
-EBUILD empathy-2.34.0-r2.ebuild 3299 RMD160 4baa0beae829db55bf9b18e12ce6c6aa5fec8cda SHA1 64e8ff392fafb4e287637b18b568e201095ce80e SHA256 8d0ee3102ca8bd0f3f5abd80165aafe260a112bbc916841756e4e3e6bd805ad4
-EBUILD empathy-3.2.1.1.ebuild 3350 RMD160 8cc1a951d6e7c9317e1542c4121e7235f1a93e11 SHA1 93e07e9a0571574193f99961f3787b366ba99bc0 SHA256 f0dc9ef2ce1e6284d7775a0525f7bc6933a1442f86988aab77bae06534d6e6c4
-EBUILD empathy-3.2.1.2.ebuild 3344 RMD160 03d54547c3c5f3f62a09ca40ae77629b1c13076e SHA1 c59855522c172f334677debd0bff74c69c3a11c7 SHA256 6bd5b15151ff7449592761bea3a0340cc762587ed917876dc6ec9a438d84e197
-MISC ChangeLog 16884 RMD160 805d59284823f6550c99567252c85418e3e13673 SHA1 9570d16471f0071044e5474d729a0710c0a4079b SHA256 0e331207f512366d8010d9d8eb90c0765c250f301df6a13e051a20c72fe06326
+EBUILD empathy-2.32.2.ebuild 3097 RMD160 d585f770a9e6affcf0cdaf13180a61512621af16 SHA1 8796b3b5196a1a1c6ffbad5fa274170e5b4c8629 SHA256 0a1cfdec0922f176ae8ff77fcf1c8cc3c42539bf126c1ca166329532e35bc99c
+EBUILD empathy-2.34.0-r2.ebuild 3294 RMD160 9981434c5eead60d6db1db357cc2ad0594abbe46 SHA1 bb7a7dd49df2aa1aca9e2ed10e0cb434d5183dbf SHA256 00abf95107eeffbb1c2c05a078a2387df9373085329d35b3af9f32c61ca30b3f
+EBUILD empathy-3.2.1.2.ebuild 3342 RMD160 1c6ff87f9abf99b99e14323a730f552c5331f70e SHA1 8b9e627edb75b0707df932d764e52d352fc86854 SHA256 b94e7a65b249b6aa2b680966d340f6ea6d9d6b35e4680bfc8fb797bccd510689
+MISC ChangeLog 17135 RMD160 fb701f76cca005c13b718ebfb97ec32e3b68d235 SHA1 441af1ba494f98b5b51df98a65bedac88ef636f4 SHA256 e37200c2bb77090ed6e7e414b7b032f56f8bbd5c6be457309773602677df3c16
 MISC metadata.xml 1425 RMD160 38d0a65bd440db5fe8deb90bd79f079b12a5502d SHA1 d1743cb72216d94a45eae200cd40d310a121cb5b SHA256 0a68cd5576cafddcf96b2046679bcd0511adc7f3205fefb8f8cc1cb4de87d7c0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7AGpsACgkQ1fmVwcYIWAb9xQCeN1M/5c9s/BhkRqo7QGu/9Y0v
-CUIAnjk5rjDIP3Pc6Mk/lX5j3t6JFPx1
-=sS1c
+iEYEARECAAYFAk7K9H0ACgkQCaWpQKGI+9R/sACdGI32j6SRKg2NxlQUKYh9AYSK
+xTEAoIhdojt5i2hmlpYQfkU8D1JE7/vu
+=09Kc
 -----END PGP SIGNATURE-----
diff --git a/net-im/empathy/empathy-2.32.2.ebuild b/net-im/empathy/empathy-2.32.2.ebuild
index aeada523d3be..704d50be249f 100644
--- a/net-im/empathy/empathy-2.32.2.ebuild
+++ b/net-im/empathy/empathy-2.32.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.32.2.ebuild,v 1.14 2011/03/22 19:40:56 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.32.2.ebuild,v 1.15 2011/11/22 01:01:42 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/Empathy"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ppc ~sparc x86"
+KEYWORDS="alpha"
 # FIXME: Add location support once geoclue stops being idiotic with automagic deps
 IUSE="eds nautilus networkmanager spell test webkit" # map
 
@@ -40,7 +40,7 @@ RDEPEND=">=dev-libs/glib-2.25.9:2
 	>=net-libs/telepathy-farsight-0.0.14
 	dev-libs/libxml2:2
 	x11-libs/libX11
-	net-voip/telepathy-connection-managers
+	net-im/telepathy-connection-managers
 	>=net-im/telepathy-logger-0.1.5
 	<net-im/telepathy-logger-0.2.0
 
@@ -104,6 +104,6 @@ src_test() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 	elog "Empathy needs telepathy's connection managers to use any IM protocol."
-	elog "See the USE flags on net-voip/telepathy-connection-managers"
+	elog "See the USE flags on net-im/telepathy-connection-managers"
 	elog "to install them."
 }
diff --git a/net-im/empathy/empathy-2.34.0-r2.ebuild b/net-im/empathy/empathy-2.34.0-r2.ebuild
index cd0cc28c9377..525f3380739f 100644
--- a/net-im/empathy/empathy-2.34.0-r2.ebuild
+++ b/net-im/empathy/empathy-2.34.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.34.0-r2.ebuild,v 1.4 2011/11/06 13:00:29 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.34.0-r2.ebuild,v 1.5 2011/11/22 01:01:42 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -41,7 +41,7 @@ RDEPEND=">=dev-libs/glib-2.27.2:2
 	>=net-libs/telepathy-farsight-0.0.14
 	dev-libs/libxml2
 	x11-libs/libX11
-	net-voip/telepathy-connection-managers
+	net-im/telepathy-connection-managers
 	>=net-im/telepathy-logger-0.2.0
 
 	eds? ( >=gnome-extra/evolution-data-server-1.2 )
@@ -115,6 +115,6 @@ src_test() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 	elog "Empathy needs telepathy's connection managers to use any IM protocol."
-	elog "See the USE flags on net-voip/telepathy-connection-managers"
+	elog "See the USE flags on net-im/telepathy-connection-managers"
 	elog "to install them."
 }
diff --git a/net-im/empathy/empathy-3.2.1.1.ebuild b/net-im/empathy/empathy-3.2.1.1.ebuild
deleted file mode 100644
index 267a143049d5..000000000000
--- a/net-im/empathy/empathy-3.2.1.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.2.1.1.ebuild,v 1.1 2011/11/04 05:12:33 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.4"
-
-inherit gnome2 python
-
-DESCRIPTION="Telepathy client and library using GTK+"
-HOMEPAGE="http://live.gnome.org/Empathy"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="call debug eds +map +geoloc gnome-online-accounts +networkmanager sendto spell test +v4l"
-
-# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
-# eventually at which point the dep can be dropped
-# libgee extensively used in libempathy
-# gdk-pixbuf and pango extensively used in libempathy-gtk
-RDEPEND=">=dev-libs/glib-2.28:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.0.2:3
-	x11-libs/pango
-	>=dev-libs/dbus-glib-0.51
-	>=dev-libs/folks-0.6.2
-	dev-libs/libgee:0
-	>=gnome-base/gnome-keyring-2.91.4-r300
-	>=media-libs/libcanberra-0.25[gtk3]
-	media-sound/pulseaudio[glib]
-	>=net-libs/gnutls-2.8.5
-	>=net-libs/telepathy-glib-0.16.0
-	>=net-libs/webkit-gtk-1.3.13:3
-	>=x11-libs/libnotify-0.7
-
-	dev-libs/libxml2:2
-	gnome-base/gsettings-desktop-schemas
-	media-libs/gstreamer:0.10
-	media-libs/gst-plugins-base:0.10
-	media-libs/gst-plugins-bad
-	>=net-im/telepathy-logger-0.2.8
-	net-libs/farsight2
-	>=net-libs/telepathy-farsight-0.0.14
-	net-voip/telepathy-connection-managers
-	x11-libs/libX11
-
-	call? (
-		>=media-libs/clutter-1.7.14:1.0
-		>=media-libs/clutter-gtk-0.90.3:1.0
-		media-libs/clutter-gst:1.0
-		net-libs/telepathy-farstream )
-	eds? ( >=gnome-extra/evolution-data-server-1.2 )
-	geoloc? ( >=app-misc/geoclue-0.11 )
-	gnome-online-accounts? ( net-libs/gnome-online-accounts )
-	map? (
-		>=media-libs/clutter-1.7.14:1.0
-		>=media-libs/clutter-gtk-0.90.3:1.0
-		media-libs/libchamplain:0.12[gtk] )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 )
-	spell? (
-		>=app-text/enchant-1.2
-		>=app-text/iso-codes-0.35 )
-	v4l? (
-		|| ( sys-fs/udev[gudev] sys-fs/udev[extras] )
-		media-plugins/gst-plugins-v4l2:0.10
-		>=media-video/cheese-2.91.91.1 )
-"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.17.3
-	>=dev-util/intltool-0.35.0
-	>=dev-util/pkgconfig-0.16
-	>=sys-devel/gettext-0.17
-	test? (
-		sys-apps/grep
-		>=dev-libs/check-0.9.4 )
-	dev-libs/libxslt
-"
-PDEPEND=">=net-im/telepathy-mission-control-5.7.6"
-
-pkg_setup() {
-	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		--disable-coding-style-checks
-		--disable-schemas-compile
-		--disable-static
-		--disable-meego
-		--disable-Werror
-		$(use_enable call)
-		$(use_enable debug)
-		$(use_with eds)
-		$(use_enable geoloc location)
-		$(use_enable gnome-online-accounts goa)
-		$(use_enable map)
-		$(use_with networkmanager connectivity nm)
-		$(use_enable sendto nautilus-sendto)
-		$(use_enable spell)
-		$(use_with v4l cheese)
-		$(use_enable v4l gudev)"
-
-	# Build time python tools need python2
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	elog "Empathy needs telepathy's connection managers to use any IM protocol."
-	elog "See the USE flags on net-voip/telepathy-connection-managers"
-	elog "to install them."
-}
diff --git a/net-im/empathy/empathy-3.2.1.2.ebuild b/net-im/empathy/empathy-3.2.1.2.ebuild
index 83dc657f96aa..f6aebf65effc 100644
--- a/net-im/empathy/empathy-3.2.1.2.ebuild
+++ b/net-im/empathy/empathy-3.2.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.2.1.2.ebuild,v 1.1 2011/11/13 19:29:25 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.2.1.2.ebuild,v 1.2 2011/11/22 01:01:42 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -44,7 +44,7 @@ RDEPEND=">=dev-libs/glib-2.28:2
 	>=net-im/telepathy-logger-0.2.8
 	net-libs/farsight2
 	>=net-libs/telepathy-farsight-0.0.14
-	net-voip/telepathy-connection-managers
+	net-im/telepathy-connection-managers
 	x11-libs/libX11
 
 	call? (
@@ -115,6 +115,6 @@ src_test() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 	elog "Empathy needs telepathy's connection managers to use any IM protocol."
-	elog "See the USE flags on net-voip/telepathy-connection-managers"
+	elog "See the USE flags on net-im/telepathy-connection-managers"
 	elog "to install them."
 }