Fix slot-deps on gnome libs

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

6 files changed, 19 insertions, 117 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 9a2c53715dca..381498210b11 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,10 @@
 # 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.79 2011/03/12 21:27:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.80 2011/03/21 23:13:18 nirbheek Exp $
+
+  21 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> empathy-2.30.2.ebuild,
+  -empathy-2.30.3.ebuild, empathy-2.32.2.ebuild, empathy-2.33.2.ebuild:
+  Fix slot-deps on gnome libs
 
   12 Mar 2011; Raúl Porcel <armin76@gentoo.org> empathy-2.32.2.ebuild:
   alpha stable wrt #353436
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index f23e2ef4c476..e19f867db3b2 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,11 +1,9 @@
 AUX empathy-2.32.2-libnotify-0.7.patch 1644 RMD160 87941e9933ec4fb83f45a0e052af77273a6aa250 SHA1 8696716fd49d0a0bce7eeb7044db66b7591e0d82 SHA256 8f7280c95fb67a2f91dc38984523f8ae4be95643e7404ea672d88d6541987ca8
 DIST empathy-2.30.2.tar.bz2 2644286 RMD160 891f1b60b0b5087ef3e6f106676af1728aa4be18 SHA1 de8776cdbceb3895392dee467437e76f893c9194 SHA256 e96846bafcedf39f9869d656031ba1c02c3568038e968db308ff07552e5024d7
-DIST empathy-2.30.3.tar.bz2 2655910 RMD160 57d558c81b166b8e008ee236a258d592b3ac50a3 SHA1 1a438198469f623e7051a521ef2590f0da518075 SHA256 5965434fcc05f7ec3cd32d9128b03ac20e96624b0035d329abf72decd70c5def
 DIST empathy-2.32.2.tar.bz2 2936340 RMD160 36d42e08343e49c1963405caeb35e76400bab209 SHA1 b956af129aaecc54491c7bc01892bb29c33c1d32 SHA256 f90a45955205fd8bd783a55acae4603197caab4f16a880106f8639cbbbe5e861
 DIST empathy-2.33.2.tar.bz2 3337406 RMD160 4f6b18d2999dc94602c1e4d38e2f918d948694ea SHA1 ae9f383c835cbc3995ab0944dddd64b21aaee1cc SHA256 55e359c6494a235079f8d0ecddb1e587c7d87989b8a7c7c4f75f4f38caf8c6d8
-EBUILD empathy-2.30.2.ebuild 2642 RMD160 ac6e0e327569c19add73b99874000e239cdc3400 SHA1 37d0b4e0b33ebb3262edb1456f32d330c2682c19 SHA256 7dcfbfde24a43026321e7e9573b3061fab35077010ada979bc8ae68be81f452f
-EBUILD empathy-2.30.3.ebuild 2835 RMD160 17f9fbd5096843063645124133a2fe558a3b7239 SHA1 830aa4452dfcf17f4b33c81e640bb4eac09e7803 SHA256 061ddcbf375c1604eaddc41e7515a68adfca668f2558da5b2212b4f7e1699a28
-EBUILD empathy-2.32.2.ebuild 3122 RMD160 6430ba8fb7e5b3aee485b031848fe88a6526e5fb SHA1 a0e42401b7205cfd13b9f026744ffa533369b2cc SHA256 245e553c90348ca1386c1264b093afbc04415281ee151aa98f6b8d7326b09abf
-EBUILD empathy-2.33.2.ebuild 3065 RMD160 1611576e7a934060e75a314226fb37d11134df55 SHA1 c4d372f7e2730e8331f744a4e9ef52a97b48ce18 SHA256 8f005cd463e7bb3dad4b46a8df2291d4e57fda1259da8c7e9f66447b3b01385c
-MISC ChangeLog 13923 RMD160 07aee9b8d94dd2f2c22e93358e90021ac87b82b6 SHA1 e4cd51aef9982a3d24fb5d71a822320e3f9dbfae SHA256 741c56768c97b4845dfc32bb7233f86fcb194fe9e8157670382c48e99872c2a4
+EBUILD empathy-2.30.2.ebuild 2649 RMD160 b0ad8f51259b79ec81f6623db1ed8714a31fff9e SHA1 d6bd8f45c2fdb48de687956933c89e5bb7686d5d SHA256 93e5d38390a0036da100b03c8c1c5bc300f00dbb7eb4e9f77740318401e49fa6
+EBUILD empathy-2.32.2.ebuild 3132 RMD160 74ac1e2af54f7cd41552f7fd35fc9524e2581eea SHA1 9b518800c94ee769ad938a00d68007adb85cf70c SHA256 9a315909f2a0dd312fb16e5883016f97058a85fe7e636c906e442f97c9cb79f9
+EBUILD empathy-2.33.2.ebuild 3072 RMD160 5598ee4d07cce9d27061ec0a0d3e529f256a5c89 SHA1 7a092fa2ad50465a7449391136612819fd990e9b SHA256 1528169d48a26f80f5be6cafacb689a7f4f0f7d0dca9eaa521a28973bf747a77
+MISC ChangeLog 14104 RMD160 054a3de6b4dbf6caf9978870fa22b9cf90d09426 SHA1 29f0f85a113d2d6575190dbd61cb2584f1e445cf SHA256 e418a7fa7c51433334e3352af4edaf842fd868e2152ac39c753667ef03ca1111
 MISC metadata.xml 940 RMD160 4e41d99236e8d53fc36a72411432766f084ef526 SHA1 7b36c712b8f94fd2c2cca3133249bdbeea2d35b2 SHA256 88ab29a94d21a18761bba19eb92f07aac4f4577951b0153b71a78ea3db24a23f
diff --git a/net-im/empathy/empathy-2.30.2.ebuild b/net-im/empathy/empathy-2.30.2.ebuild
index 641c6cfc34c8..f966cd5af127 100644
--- a/net-im/empathy/empathy-2.30.2.ebuild
+++ b/net-im/empathy/empathy-2.30.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.30.2.ebuild,v 1.8 2011/03/02 20:00:15 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.30.2.ebuild,v 1.9 2011/03/21 23:13:18 nirbheek Exp $
 
 EAPI="2"
 
@@ -18,7 +18,7 @@ IUSE="nautilus networkmanager spell test webkit" # map
 # FIXME: libnotify & libcanberra hard deps
 RDEPEND="dev-libs/glib:2
 	x11-libs/gtk+:2
-	>=gnome-base/gconf-2
+	>=gnome-base/gconf-2:2
 	>=dev-libs/dbus-glib-0.51
 	>=gnome-extra/evolution-data-server-1.2
 	>=net-libs/telepathy-glib-0.9.2
@@ -31,7 +31,7 @@ RDEPEND="dev-libs/glib:2
 	media-libs/gstreamer:0.10
 	media-libs/gst-plugins-base:0.10
 	net-libs/telepathy-farsight
-	dev-libs/libxml2
+	dev-libs/libxml2:2
 	x11-libs/libX11
 	net-voip/telepathy-connection-managers
 
@@ -42,7 +42,7 @@ RDEPEND="dev-libs/glib:2
 	spell? (
 		app-text/enchant
 		app-text/iso-codes )
-	webkit? ( >=net-libs/webkit-gtk-1.1.15 )"
+	webkit? ( >=net-libs/webkit-gtk-1.1.15:2 )"
 #	Upstream says not to ship this, or use this.  It is also buggy.
 #	tpl? ( >=net-im/telepathy-logger-0.1.1 )
 #	map? (
diff --git a/net-im/empathy/empathy-2.30.3.ebuild b/net-im/empathy/empathy-2.30.3.ebuild
deleted file mode 100644
index be6fc1a1f668..000000000000
--- a/net-im/empathy/empathy-2.30.3.ebuild
+++ /dev/null
@@ -1,100 +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-2.30.3.ebuild,v 1.4 2011/03/02 20:00:15 signals Exp $
-
-EAPI="2"
-
-inherit gnome2 multilib
-
-DESCRIPTION="Telepathy client and library using GTK+"
-HOMEPAGE="http://live.gnome.org/Empathy"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-# FIXME: Add location support once geoclue stops being idiotic with automagic deps
-IUSE="nautilus networkmanager spell test webkit" # map
-
-# FIXME: libnotify & libcanberra hard deps
-# gst-plugins-bad is required for the valve plugin. This should move to good
-# eventually at which point the dep can be dropped
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	>=gnome-base/gconf-2
-	>=dev-libs/dbus-glib-0.51
-	>=gnome-extra/evolution-data-server-1.2
-	>=net-libs/telepathy-glib-0.9.2
-	>=media-libs/libcanberra-0.4[gtk]
-	>=x11-libs/libnotify-0.4.4
-	>=gnome-base/gnome-keyring-2.22
-
-	>=dev-libs/libunique-1.1.6:1
-	net-libs/farsight2
-	media-libs/gstreamer:0.10
-	media-libs/gst-plugins-base:0.10
-	media-libs/gst-plugins-bad
-	media-plugins/gst-plugins-gconf
-	net-libs/telepathy-farsight
-	dev-libs/libxml2
-	x11-libs/libX11
-	net-voip/telepathy-connection-managers
-
-	nautilus? ( || (
-		>=gnome-extra/nautilus-sendto-2.28.1[-empathy]
-		>=gnome-extra/nautilus-sendto-2.28.4-r1 ) )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	spell? (
-		app-text/enchant
-		app-text/iso-codes )
-	webkit? ( >=net-libs/webkit-gtk-1.1.15 )"
-#	Upstream says not to ship this, or use this.  It is also buggy.
-#	tpl? ( >=net-im/telepathy-logger-0.1.1 )
-#	map? (
-#		>=media-libs/libchamplain-0.4[gtk]
-#		>=media-libs/clutter-gtk-0.10:0.10 )
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.17.3
-	>=dev-util/intltool-0.35.0
-	>=dev-util/pkgconfig-0.16
-	test? (
-		sys-apps/grep
-		>=dev-libs/check-0.9.4 )
-	dev-libs/libxslt
-	virtual/python
-"
-PDEPEND=">=net-im/telepathy-mission-control-5"
-
-DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	# Hard disable favourite_contacts and tpl, TpLogger is buggy.
-	G2CONF="${G2CONF}
-		--disable-maintainer-mode
-		--disable-static
-		--disable-location
-		--disable-map
-		--disable-control-center-embedding
-		--disable-Werror
-		--disable-favourite_contacts
-		--disable-tpl
-		$(use_enable debug)
-		$(use_enable nautilus nautilus-sendto)
-		$(use_with networkmanager connectivity nm)
-		$(use_enable spell)
-		$(use_enable test coding-style-checks)
-		$(use_enable webkit)"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check || die "emake check failed."
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	echo
-	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-2.32.2.ebuild b/net-im/empathy/empathy-2.32.2.ebuild
index 34d144bfd98b..48d5bbbd1446 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.12 2011/03/12 21:27:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.32.2.ebuild,v 1.13 2011/03/21 23:13:18 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -36,9 +36,9 @@ RDEPEND=">=dev-libs/glib-2.25.9:2
 	media-libs/gstreamer:0.10
 	media-libs/gst-plugins-base:0.10
 	media-libs/gst-plugins-bad
-	media-plugins/gst-plugins-gconf
+	media-plugins/gst-plugins-gconf:0.10
 	>=net-libs/telepathy-farsight-0.0.14
-	dev-libs/libxml2
+	dev-libs/libxml2:2
 	x11-libs/libX11
 	net-voip/telepathy-connection-managers
 	>=net-im/telepathy-logger-0.1.5
@@ -50,7 +50,7 @@ RDEPEND=">=dev-libs/glib-2.25.9:2
 	spell? (
 		>=app-text/enchant-1.2
 		>=app-text/iso-codes-0.35 )
-	webkit? ( >=net-libs/webkit-gtk-1.1.15 )"
+	webkit? ( >=net-libs/webkit-gtk-1.1.15:2 )"
 #	map? (
 #		>=media-libs/libchamplain-0.7.1[gtk]
 #		>=media-libs/clutter-gtk-0.10:0.10 )
diff --git a/net-im/empathy/empathy-2.33.2.ebuild b/net-im/empathy/empathy-2.33.2.ebuild
index 36d9efec0258..ef6b4e19c521 100644
--- a/net-im/empathy/empathy-2.33.2.ebuild
+++ b/net-im/empathy/empathy-2.33.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.33.2.ebuild,v 1.1 2011/02/27 17:28:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.33.2.ebuild,v 1.2 2011/03/21 23:13:18 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -51,7 +51,7 @@ RDEPEND=">=dev-libs/glib-2.27.2:2
 	spell? (
 		>=app-text/enchant-1.2
 		>=app-text/iso-codes-0.35 )
-	webkit? ( >=net-libs/webkit-gtk-1.1.15 )
+	webkit? ( >=net-libs/webkit-gtk-1.1.15:2 )
 "
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper