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

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

3 files changed, 15 insertions, 22 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/Manifest b/net-wireless/bluez-gnome/Manifest
index 3179148f61ed..17ef4b83c9fe 100644
--- a/net-wireless/bluez-gnome/Manifest
+++ b/net-wireless/bluez-gnome/Manifest
@@ -18,6 +18,6 @@ EBUILD bluez-gnome-0.23.ebuild 1391 RMD160 22ffddb1a44dffe076d4292e06d615dff04a8
 EBUILD bluez-gnome-0.24.ebuild 1384 RMD160 d44d7ca64bfb05bc4d0a57e726289fc7924ecb76 SHA1 068d29101c6b109afa1f71ede4b5ec4032f3efb9 SHA256 41e18efe9060d3d9aab90da647d2e479440981e61bdd8f031bcfba966debcddb
 EBUILD bluez-gnome-0.26.ebuild 1390 RMD160 e03d113bb26dda15f6d9d545874cb64ce29df235 SHA1 925384fe10e7a15b539732b70aad527a57f34fea SHA256 449d9074175b9c1ab439d3d0f6e0fd2a3457fabd7d72099e97a0a685ae828a16
 EBUILD bluez-gnome-0.28.ebuild 1396 RMD160 7421433026d0f1142762ade3dfb135bbe3d79b87 SHA1 9a9936eba2481a841f576d4281b1950320642c70 SHA256 9de6fab8c57f0b4c6e0710a2f51eaf70ebc1d7dc19c98658214c39addfb8c5d8
-EBUILD bluez-gnome-1.8.ebuild 1461 RMD160 6091a3bcf5148823f48b298f4ac5dd4962c5128b SHA1 2d64136971aa7d66472ae4e9cbd42a8c5b05ddcb SHA256 faf06b9b1ca4b4be5a122b99429a3cc2851de1dab6f33492b5d448ed24c6c681
-MISC ChangeLog 5942 RMD160 b08de743110d6313fa9060544f251d77479bb9b8 SHA1 b0dc75e77c1738587b268af77986054be583edfa SHA256 d0bad12619c299aa40c8641f834839ea22b485c80ccdf673f01f0d6a96b8f364
+EBUILD bluez-gnome-1.8.ebuild 1029 RMD160 54387a9853853b1b1fe73b841f9b790ba2d0f726 SHA1 5f103c1ddf83c84fe9d265589cf83330428d13d0 SHA256 ac45deb4fa55b30acea020d6d8c10e4f8cbb821f1e78bca3dd5028e0cc3c188a
+MISC ChangeLog 6172 RMD160 833a942cc93f84861704ddd1a62834017b250f1b SHA1 6c26f505b3035c89931a53e19c6ab363bc8ef2d3 SHA256 54537231002f661c60104c63c6986f64fe901187615ac5f7ca2109111418a420
 MISC metadata.xml 355 RMD160 114b0e663206f28501f2acdd0bfe73f75758782f SHA1 f7646c332998c85eabd5140dcb72bbd61df87471 SHA256 5782461caf09dbc482a95ac8762e5a5fcfcffe7df5419b843f2f22ed7a283c9d
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
-}