updated ebuild

6 files changed, 149 insertions, 2 deletions

diff --git a/gnome-base/gnome-volume-manager/ChangeLog b/gnome-base/gnome-volume-manager/ChangeLog
index b5d953ce0e8e..7c39bdba6ff8 100644
--- a/gnome-base/gnome-volume-manager/ChangeLog
+++ b/gnome-base/gnome-volume-manager/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-volume-manager
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.4 2004/09/20 01:08:29 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.5 2004/09/23 14:42:49 foser Exp $
+
+*gnome-volume-manager-1.0.2-r1 (23 Sep 2004)
+
+  23 Sep 2004; foser <foser@gentoo.org> gnome-volume-manager-1.0.2-r1.ebuild :
+  Add a few patches that should make g-v-m work with hal 0.2.98 (#64855)
 
   19 Sep 2004; Travis Tilley <lv@gentoo.org>
   gnome-volume-manager-1.0.2.ebuild:
diff --git a/gnome-base/gnome-volume-manager/Manifest b/gnome-base/gnome-volume-manager/Manifest
index d5dbff8ecd8f..3041018e45af 100644
--- a/gnome-base/gnome-volume-manager/Manifest
+++ b/gnome-base/gnome-volume-manager/Manifest
@@ -1,6 +1,10 @@
 MD5 0d30a0b1628cea7705a1ece8917680de gnome-volume-manager-0.9.9.ebuild 936
 MD5 8961bae13af6b54603b91fba3caa2af9 gnome-volume-manager-1.0.2.ebuild 961
-MD5 3647c04017e0736c9f67e0fe4bf62ce3 ChangeLog 847
+MD5 9e7d015423e23fb116073dd7f89057be gnome-volume-manager-1.0.2-r1.ebuild 1135
+MD5 2bef1aa2fade1c060470961d4884bce5 ChangeLog 1049
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 5b1bbc0741bf8067f76c8ee57dd838fb files/digest-gnome-volume-manager-1.0.2-r1 79
 MD5 ce5b6a04a77d0a0520ddcabac5d9a97f files/digest-gnome-volume-manager-0.9.9 79
 MD5 5b1bbc0741bf8067f76c8ee57dd838fb files/digest-gnome-volume-manager-1.0.2 79
+MD5 a5c2ae52268cb41e570d8f04a9067d3f files/gnome-volume-manager-1.0.2-hal_updates2.patch 1621
+MD5 d4362b07e7738f99bf1e75651a8655f2 files/gnome-volume-manager-1.0.2-hal_updates.patch 1006
diff --git a/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.0.2-r1 b/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.0.2-r1
new file mode 100644
index 000000000000..d2c566716b9a
--- /dev/null
+++ b/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.0.2-r1
@@ -0,0 +1 @@
+MD5 d5801767ad80e082de6e13118a0712a0 gnome-volume-manager-1.0.2.tar.bz2 180824
diff --git a/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.0.2-hal_updates.patch b/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.0.2-hal_updates.patch
new file mode 100644
index 000000000000..be6603ac63be
--- /dev/null
+++ b/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.0.2-hal_updates.patch
@@ -0,0 +1,33 @@
+===================================================================
+RCS file: /cvs/gnome/gnome-volume-manager/src/manager.c,v
+retrieving revision 1.31
+retrieving revision 1.32
+diff -u -r1.31 -r1.32
+--- manager.c	2004/09/01 19:17:41	1.31
++++ manager.c	2004/09/20 16:12:22	1.32
+@@ -38,7 +38,7 @@
+ # define N_(String) (String)
+ #endif
+ 
+-/*#define GVM_DEBUG*/
++#define GVM_DEBUG
+ #ifdef GVM_DEBUG
+ # define dbg(fmt,arg...) fprintf(stderr, "%s/%d: " fmt,__FILE__,__LINE__,##arg)
+ #else
+@@ -664,6 +664,16 @@
+ {
+ 	char *media_type;
+ 
++	/* Refuse to enforce policy on removable media if drive is locked */
++	if (hal_device_property_exists (
++		    hal_ctx, storage_device, "info.locked") &&
++	    hal_device_get_property_bool (
++		    hal_ctx, storage_device, "info.locked")) {
++		dbg ("Drive with udi %s is locked through hal; "
++		     "skipping policy\n", storage_device);
++		return;
++	}
++
+ 	/*
+ 	 * Get HAL's interpretation of our media type.  Note that we must check
+ 	 * the storage device and not this UDI
diff --git a/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.0.2-hal_updates2.patch b/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.0.2-hal_updates2.patch
new file mode 100644
index 000000000000..0c19cfe1b4fa
--- /dev/null
+++ b/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.0.2-hal_updates2.patch
@@ -0,0 +1,58 @@
+===================================================================
+RCS file: /cvs/gnome/gnome-volume-manager/src/manager.c,v
+retrieving revision 1.30
+retrieving revision 1.31
+diff -u -r1.30 -r1.31
+--- manager.c	2004/08/30 14:53:09	1.30
++++ manager.c	2004/09/01 19:17:41	1.31
+@@ -659,7 +659,8 @@
+  * At the moment, we only handle CD-ROM and DVD drives.
+  */
+ static void
+-gvm_media_changed (const char *udi, const char *storage_device)
++gvm_media_changed (const char *udi, const char *storage_device, 
++		   const char *device)
+ {
+ 	char *media_type;
+ 
+@@ -674,10 +675,14 @@
+ 		return;
+ 	}
+ 
+-	if (!g_strcasecmp (media_type, "cdrom"))
++	if (!g_strcasecmp (media_type, "cdrom")) {
+ 		gvm_cdrom_policy (udi);
+-
+-	/* other media_types go here */
++	} else {
++		dbg ("Added: %s\n", device);
++		
++		if (config.automount_drives)
++			gvm_device_mount (device);
++	}
+ 
+ 	hal_free_string (media_type);
+ }
+@@ -730,7 +735,7 @@
+ 					  "storage.removable")) {
+ 		/* we handle media change events separately */
+ 		dbg ("Changed: %s\n", device);
+-		gvm_media_changed (udi, storage_device);
++		gvm_media_changed (udi, storage_device, device);
+ 		goto out;
+ 	}
+ 	
+@@ -952,9 +957,10 @@
+ 
+ 		/* only mount if the block device got a sensible filesystem */
+ 		if (!hal_device_property_exists (ctx, udi, 
+-						"volume.is_filesystem") ||
+-		    !hal_device_get_property_bool (ctx, udi, 
+-						   "volume.is_filesystem"))
++						"volume.fsusage") ||
++		    strcmp (hal_device_get_property_string (ctx, udi, 
++							    "volume.fsusage"), 
++			    "filesystem") != 0)
+ 			continue;
+ 
+ 		device_file = hal_device_get_property_string (ctx, udi,
diff --git a/gnome-base/gnome-volume-manager/gnome-volume-manager-1.0.2-r1.ebuild b/gnome-base/gnome-volume-manager/gnome-volume-manager-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..381a46aeb960
--- /dev/null
+++ b/gnome-base/gnome-volume-manager/gnome-volume-manager-1.0.2-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/gnome-volume-manager-1.0.2-r1.ebuild,v 1.1 2004/09/23 14:42:49 foser Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Daemon that enforces volume-related policies"
+HOMEPAGE="http://www.gnome.org/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+# we just require the latest of the utopia stack to be on the safe side
+RDEPEND=">=sys-apps/dbus-0.22
+	>=sys-apps/hal-0.2.98
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomeui-2.2"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29"
+
+DOCS="AUTHORS ChangeLog COPYING README HACKING NEWS TODO"
+
+src_unpack() {
+
+	unpack ${A}
+
+	# makes gvm work with fam 0.2.98
+	cd ${S}/src
+	epatch ${FILESDIR}/${P}-hal_updates.patch
+	epatch ${FILESDIR}/${P}-hal_updates2.patch
+
+}
+
+pkg_postinst() {
+
+	gnome2_pkg_postinst
+
+	einfo "To start the gnome-volume-manager daemon you need to configure"
+	einfo "it through it's preferences capplet. Also the HAL daemon (hald)"
+	einfo "needs to be running or it will shut down."
+
+}