Fix slot-deps on gnome libs, remove old

(Portage version: 2.1.9.44/cvs/Linux x86_64)

4 files changed, 14 insertions, 69 deletions

diff --git a/net-wireless/gnome-bluetooth/ChangeLog b/net-wireless/gnome-bluetooth/ChangeLog
index ebe84a76d1d7..05f5d4b133e6 100644
--- a/net-wireless/gnome-bluetooth/ChangeLog
+++ b/net-wireless/gnome-bluetooth/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/gnome-bluetooth
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.93 2011/02/27 15:13:31 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.94 2011/03/21 22:21:43 nirbheek Exp $
+
+  21 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  gnome-bluetooth-2.28.6.ebuild, -gnome-bluetooth-2.30.0.ebuild,
+  gnome-bluetooth-2.32.0.ebuild:
+  Fix slot-deps on gnome libs, remove old
 
   27 Feb 2011; Gilles Dartiguelongue <eva@gentoo.org>
   gnome-bluetooth-2.32.0.ebuild:
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.6.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.6.ebuild
index 98503b70a662..1012cf45e68c 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.6.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.6.ebuild,v 1.8 2010/07/20 15:40:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.6.ebuild,v 1.9 2011/03/21 22:21:43 nirbheek Exp $
 
 EAPI="2"
 
@@ -14,12 +14,12 @@ IUSE="doc"
 KEYWORDS="amd64 ppc x86"
 
 # XXX: gtk+-2.18 required, configure.ac lies, bug 298534
-COMMON_DEPEND=">=dev-libs/glib-2.16
-	>=x11-libs/gtk+-2.18
+COMMON_DEPEND=">=dev-libs/glib-2.16:2
+	>=x11-libs/gtk+-2.18:2
 	>=x11-libs/libnotify-0.4.3
-	>=gnome-base/gconf-2.6
+	>=gnome-base/gconf-2.6:2
 	>=dev-libs/dbus-glib-0.74
-	dev-libs/libunique"
+	dev-libs/libunique:1"
 RDEPEND="${COMMON_DEPEND}
 	>=net-wireless/bluez-4.34
 	app-mobilephone/obexd"
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.30.0.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.30.0.ebuild
deleted file mode 100644
index 3bbe15915411..000000000000
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.30.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-2.30.0.ebuild,v 1.3 2010/08/01 12:41:58 fauli Exp $
-
-EAPI="2"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Fork of bluez-gnome focused on integration with GNOME"
-HOMEPAGE="http://live.gnome.org/GnomeBluetooth"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="2"
-IUSE="doc nautilus"
-KEYWORDS="amd64 ~ppc x86"
-
-COMMON_DEPEND=">=dev-libs/glib-2.19.1
-	>=x11-libs/gtk+-2.19.1
-	>=x11-libs/libnotify-0.4.3
-	>=gnome-base/gconf-2.6
-	>=dev-libs/dbus-glib-0.74
-	dev-libs/libunique
-	nautilus? ( >=gnome-extra/nautilus-sendto-2.28.0.1[-bluetooth] )"
-RDEPEND="${COMMON_DEPEND}
-	>=net-wireless/bluez-4.34
-	app-mobilephone/obexd"
-DEPEND="${COMMON_DEPEND}
-	!!net-wireless/bluez-gnome
-	app-text/gnome-doc-utils
-	app-text/scrollkeeper
-	dev-libs/libxml2
-	dev-util/intltool
-	dev-util/pkgconfig
-	sys-devel/gettext
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-proto/xproto
-	gnome-base/gnome-common
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-DOCS="AUTHORS README NEWS ChangeLog"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-	        $(use_enable nautilus nautilus-sendto)
-	        --disable-moblin
-	        --disable-desktop-update
-	        --disable-icon-update
-	        --disable-introspection"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Add pin code for BT-GPS8 JENTRO
-	epatch "${FILESDIR}/${P}-add-pin.patch"
-
-	# Don't fail to browse the device if already mounted
-	epatch "${FILESDIR}/${P}-mounted-failure.patch"
-}
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild
index 09e4a65edc45..cb7c8eeec000 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.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-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild,v 1.12 2011/02/27 15:13:31 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild,v 1.13 2011/03/21 22:21:43 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -19,7 +19,7 @@ IUSE="doc +introspection nautilus"
 COMMON_DEPEND=">=dev-libs/glib-2.26.1-r1:2
 	>=x11-libs/gtk+-2.19.1:2
 	>=x11-libs/libnotify-0.4.3
-	>=gnome-base/gconf-2.6
+	>=gnome-base/gconf-2.6:2
 	>=dev-libs/dbus-glib-0.74
 	dev-libs/libunique:1
 	nautilus? ( >=gnome-extra/nautilus-sendto-2.31.7 )"