Replace gnome-base/gnome-mount depend with a warning if fallback sys-apps/pmount is not installed wrt #349015.

(Portage version: 2.2.0_alpha10/cvs/Linux x86_64)

3 files changed, 18 insertions, 12 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index b07f3fab8113..5e379775b917 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.333 2010/10/07 21:56:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.334 2010/12/26 01:05:30 ssuominen Exp $
+
+  26 Dec 2010; Samuli Suominen <ssuominen@gentoo.org>
+  gnome-vfs-2.24.3-r1.ebuild, gnome-vfs-2.24.4.ebuild:
+  Replace gnome-base/gnome-mount depend with a warning if fallback
+  sys-apps/pmount is not installed wrt #349015.
 
   07 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
   gnome-vfs-2.24.3-r1.ebuild:
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.3-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.3-r1.ebuild
index f570a09c8711..d0218c1689fc 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.3-r1.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.24.3-r1.ebuild,v 1.8 2010/10/07 21:56:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.24.3-r1.ebuild,v 1.9 2010/12/26 01:05:29 ssuominen Exp $
 
 inherit autotools eutils gnome2
 
@@ -41,7 +41,6 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/gtk-doc-am-1.13
 	doc? ( >=dev-util/gtk-doc-1 )"
-PDEPEND="hal? ( >=gnome-base/gnome-mount-0.6 )"
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
 
@@ -73,6 +72,11 @@ pkg_setup() {
 	# so should always be behind the use_enable options
 	# foser <foser@gentoo.org 19 Apr 2004
 	use gnutls && use ssl && G2CONF="${G2CONF} --disable-openssl"
+
+	if ! has_version sys-apps/pmount; then
+		ewarn "You should install and setup sys-apps/pmount if you use programs"
+		ewarn "which rely on gnome-vfs for mounting."
+	fi
 }
 
 src_unpack() {
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4.ebuild
index 8c6945683bcf..30e148db9679 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.24.4.ebuild,v 1.1 2010/10/02 11:55:03 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.24.4.ebuild,v 1.2 2010/12/26 01:05:29 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -45,7 +45,6 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/gtk-doc-am-1.13
 	doc? ( >=dev-util/gtk-doc-1 )"
-PDEPEND="hal? ( >=gnome-base/gnome-mount-0.6 )"
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
 
@@ -66,17 +65,15 @@ pkg_setup() {
 		$(use_enable ssl openssl)"
 		# Useless ? --enable-http-neon
 
-	if use hal ; then
-		G2CONF="${G2CONF}
-			--with-hal-mount=/usr/bin/gnome-mount
-			--with-hal-umount=/usr/bin/gnome-umount
-			--with-hal-eject=/usr/bin/gnome-eject"
-	fi
-
 	# this works because of the order of configure parsing
 	# so should always be behind the use_enable options
 	# foser <foser@gentoo.org 19 Apr 2004
 	use gnutls && use ssl && G2CONF="${G2CONF} --disable-openssl"
+
+	if ! has_version sys-apps/pmount; then
+		ewarn "You should install and setup sys-apps/pmount if you use programs"
+		ewarn "which rely on gnome-vfs for mounting."
+	fi
 }
 
 src_prepare() {