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

Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64

4 files changed, 21 insertions, 15 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/Manifest b/gnome-base/gnome-vfs/Manifest
index 1d84c9d0f18d..3c3a04fe4e5a 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -11,7 +11,7 @@ AUX gnome-vfs-2.24.4-disable-test-async-cancel.patch 689 RMD160 5289d40fdad25819
 AUX gnome-vfs-2.24.4-home_dir_fakeroot.patch 4996 RMD160 ee9a680747ed1060dd41bc64fd78d9791faa2fa8 SHA1 97b5a7ab01ba0976fac02accad7671ade5b8cbe0 SHA256 4d1841e7c296f7774aea01649d28549b5d04db486c5c7cd0b4c0e63ba04e4dc0
 DIST gnome-vfs-2.24.3.tar.bz2 1830456 RMD160 652afba47a33b05128d354927d2648b39b50f35a SHA1 56aed067eea79175bc186a00003c07a42e5e9aa6 SHA256 3b0f342e79813bfc11d8e636db96b3ffd16c9ca48b07306410e09a3fd1065b4a
 DIST gnome-vfs-2.24.4.tar.bz2 1890370 RMD160 6a5952bea02dfc96782b6f1129fe765f5313a75b SHA1 0dc634e7dd979fd218f378902c0ca1af80738961 SHA256 62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa
-EBUILD gnome-vfs-2.24.3-r1.ebuild 3633 RMD160 fd8838416d3f8d8f7111fca905382830d4f56eb6 SHA1 ea36bf4e288863e138219f7a474ab689f76ec127 SHA256 7f1d06d43048bb14ac9226ada1d060c57e8ba883a678f3c171bad8024423c424
-EBUILD gnome-vfs-2.24.4.ebuild 3837 RMD160 8ccec0fd84ae9c50d5d3717d25afe62662a17c4a SHA1 1cecd714494b7654d542bf760a6ae27c007a5e41 SHA256 2138e38249bf1de7d568d688b2a3e5c302d96410f241f2f376a14cd431956c5d
-MISC ChangeLog 44400 RMD160 e5c24beacf9d6ec95505a01fdcea1fa06b96e62d SHA1 5b41ebce2230f4b50d64bf455d59321d48ed1ecb SHA256 ba50ba94be41acffe6766148597f96533e02e1af623210426607ad8e1a0e5761
+EBUILD gnome-vfs-2.24.3-r1.ebuild 3753 RMD160 ca26d4fbbec508077b9865d86972d04f802cc725 SHA1 250818052a61326905cb036aee99892afd06c1c7 SHA256 50936945c6124fe5cd604679ca04b862a8f44233b8d649b42595a4ea92024bc0
+EBUILD gnome-vfs-2.24.4.ebuild 3793 RMD160 7955d0cc284a148d215a729cbe7b771bf9ba6c88 SHA1 89a9c86f011620640fdf90ff297931df767c6a2e SHA256 5e19f92904eb010bb1f0333fa34b5fb6648ad8c587755a6d5063547f2fbde830
+MISC ChangeLog 44625 RMD160 ad04be4c022bc352896c3be93b9cd88e4206e541 SHA1 6e08fa766b93394245123c628d3f339a1d6758af SHA256 53cadca47f710edd0d1d160c099f3c1d304015f3afc9645a5e92143be69d4259
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
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() {