Change dependency to require gnome-base/gvfs[bluetooth] instead of the unmaintained (and broken) gnome-vfs-obexftp. Removed now unneeded warning.

(Portage version: 2.1.6.7/cvs/Linux x86_64)

2 files changed, 13 insertions, 20 deletions

diff --git a/net-wireless/bluez-gnome/ChangeLog b/net-wireless/bluez-gnome/ChangeLog
index dd942a18ff31..6b4a1fbc439c 100644
--- a/net-wireless/bluez-gnome/ChangeLog
+++ b/net-wireless/bluez-gnome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/bluez-gnome
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-gnome/ChangeLog,v 1.38 2009/02/24 01:42:06 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-gnome/ChangeLog,v 1.39 2009/02/27 23:48:54 dev-zero Exp $
+
+  27 Feb 2009; Tiziano Müller <dev-zero@gentoo.org> bluez-gnome-1.8.ebuild:
+  Change dependency to require gnome-base/gvfs[bluetooth] instead of the
+  unmaintained (and broken) gnome-vfs-obexftp. Removed now unneeded warning.
 
   24 Feb 2009; Joseph Jezak <josejx@gentoo.org> bluez-gnome-0.28.ebuild:
   Marked ~ppc for bug #209224.
diff --git a/net-wireless/bluez-gnome/bluez-gnome-1.8.ebuild b/net-wireless/bluez-gnome/bluez-gnome-1.8.ebuild
index 8bf1894dcfad..db293176370a 100644
--- a/net-wireless/bluez-gnome/bluez-gnome-1.8.ebuild
+++ b/net-wireless/bluez-gnome/bluez-gnome-1.8.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-gnome/bluez-gnome-1.8.ebuild,v 1.2 2008/11/28 21:52:57 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-gnome/bluez-gnome-1.8.ebuild,v 1.3 2009/02/27 23:48:54 dev-zero Exp $
+
+EAPI="2"
 
 inherit eutils gnome2
 
@@ -12,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~sparc ~x86"
 
 IUSE="gnome"
-COMMON_DEPEND=">=dev-libs/glib-2.0
+COMMON_DEPEND="dev-libs/glib:2
 	>=x11-libs/libnotify-0.3.2
 	>=gnome-base/gconf-2.6
 	>=dev-libs/dbus-glib-0.60
@@ -23,30 +25,17 @@ DEPEND="
 	x11-proto/xproto
 	${COMMON_DEPEND}"
 RDEPEND="net-wireless/bluez
-	gnome? ( gnome-base/nautilus )
+	gnome? ( gnome-base/nautilus gnome-base/gvfs[bluetooth] )
 	>=app-mobilephone/obex-data-server-0.4
 	${COMMON_DEPEND}"
 
-PDEPEND="gnome? ( gnome-extra/gnome-vfs-obexftp )"
-
 G2CONF="--disable-desktop-update
 		--disable-mime-update
 		--disable-icon-update"
 
 DOCS="AUTHORS README NEWS ChangeLog"
 
-src_unpack() {
-	gnome2_src_unpack
+src_prepare() {
+	gnome2_src_prepare
 	epatch "${FILESDIR}/${PV}-ODS-API.patch"
 }
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if has_version gnome-base/nautilus && \
-		! has_version gnome-extra/gnome-vfs-obexftp; then
-		ewarn "You have nautilus installed so Browse Device functionality is"
-		ewarn "enabled but gives you an obex:// not being a valid location"
-		ewarn "error until you install gnome-extra/gnome-vfs-obexftp. You"
-		ewarn "can do this by turning on the gnome use flag for ${PN}."
-	fi
-}