Rev bump to bring it inline with Gnome 2.11/2.12

(Portage version: 2.0.51.22-r2)

5 files changed, 114 insertions, 4 deletions

diff --git a/gnome-base/gnome-volume-manager/ChangeLog b/gnome-base/gnome-volume-manager/ChangeLog
index 52b2b29869d3..6a6a87996f5f 100644
--- a/gnome-base/gnome-volume-manager/ChangeLog
+++ b/gnome-base/gnome-volume-manager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-volume-manager
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.29 2005/08/25 19:15:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.30 2005/08/31 07:30:58 cardoe Exp $
+
+*gnome-volume-manager-1.5.0 (31 Aug 2005)
+
+  31 Aug 2005; Doug Goldstein <cardoe@gentoo.org>
+  +files/gvm-use-pmount-if-available-nochangelog.patch,
+  +gnome-volume-manager-1.5.0.ebuild:
+  Rev bump to bring it inline with Gnome 2.11/2.12
 
   25 Aug 2005; Aron Griffis <agriffis@gentoo.org>
   gnome-volume-manager-1.2.2.ebuild:
diff --git a/gnome-base/gnome-volume-manager/Manifest b/gnome-base/gnome-volume-manager/Manifest
index d50fb2eb7826..13564d9ef505 100644
--- a/gnome-base/gnome-volume-manager/Manifest
+++ b/gnome-base/gnome-volume-manager/Manifest
@@ -1,6 +1,9 @@
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 5b0c27087f0b79fb9e3b94b7f5326f98 ChangeLog 3814
-MD5 bad4bf06519d240210c0997886ae31df gnome-volume-manager-1.2.1.ebuild 1012
+MD5 9f186805db00c7cdfdd611bdc4ab6a3b ChangeLog 4053
 MD5 2b11e1b2cc5b12a6bf82ce0e2b8bd9d0 gnome-volume-manager-1.2.2.ebuild 1031
+MD5 bad4bf06519d240210c0997886ae31df gnome-volume-manager-1.2.1.ebuild 1012
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 c62082d74b187a125e3c6c83681532db gnome-volume-manager-1.5.0.ebuild 1603
 MD5 16d8909214e29b02eb989b948601461c files/digest-gnome-volume-manager-1.2.2 79
+MD5 8204147a3c0e44731e1baef264383fc1 files/digest-gnome-volume-manager-1.5.0 173
 MD5 fcd04d3a6284a16bdffaddaf7311cfe8 files/digest-gnome-volume-manager-1.2.1 79
+MD5 a037ca860b7fc7519f2e19ab5c1c0c82 files/gvm-use-pmount-if-available-nochangelog.patch 1741
diff --git a/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.5.0 b/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.5.0
new file mode 100644
index 000000000000..c15ec916c182
--- /dev/null
+++ b/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.5.0
@@ -0,0 +1,2 @@
+MD5 dfd61938c2dde0f41487f823e02ebb8e gnome-volume-manager-1.5.0.tar.gz 298517
+MD5 3054a930a0eddef2be59d4a602719bb1 gnome-volume-manager-1.3.3-reconnect_dbus.patch.bz2 12026
diff --git a/gnome-base/gnome-volume-manager/files/gvm-use-pmount-if-available-nochangelog.patch b/gnome-base/gnome-volume-manager/files/gvm-use-pmount-if-available-nochangelog.patch
new file mode 100644
index 000000000000..8afaba3ab756
--- /dev/null
+++ b/gnome-base/gnome-volume-manager/files/gvm-use-pmount-if-available-nochangelog.patch
@@ -0,0 +1,43 @@
+Index: configure.in
+===================================================================
+RCS file: /cvs/gnome/gnome-volume-manager/configure.in,v
+retrieving revision 1.94
+diff -u -b -B -r1.94 configure.in
+--- configure.in	3 Aug 2005 17:52:49 -0000	1.94
++++ configure.in	8 Aug 2005 18:10:06 -0000
+@@ -8,14 +8,28 @@
+ AC_PROG_CC
+ 
+ AC_PATH_PROG(mount_path, mount, mount)
++AC_PATH_PROG(pmount_hal_path, pmount-hal, NOTFOUND)
+ AC_PATH_PROG(umount_path, umount, umount)
++AC_PATH_PROG(pumount_path, pumount, NOTFOUND)
++
++if test ! x$pmount_hal_path = xNOTFOUND; then
++        mount_path="${pmount_hal_path} %h"
++else
++        mount_path="${mount_path} %d"
++fi
++
++if test ! x$pumount_path = xNOTFOUND; then
++        umount_path="${pumount_path} %d"
++else
++        umount_path="${umount_path} %d"
++fi
+ 
+ AC_ARG_WITH(mount-command, AC_HELP_STRING(--with-mount-command], [Command to invoke in order to mount a device]), 
+-            mount_command="$withval", mount_command="${mount_path} %d")
++            mount_command="$withval", mount_command="${mount_path}")
+ AC_DEFINE_UNQUOTED([MOUNT_COMMAND], ["${mount_command}"], [mount command])
+ 
+ AC_ARG_WITH(unmount-command, AC_HELP_STRING(--with-unmount-command], [Command to invoke in order to unmount a device]), 
+-            unmount_command="$withval", unmount_command="${umount_path} %d")
++            unmount_command="$withval", unmount_command="${umount_path}")
+ AC_DEFINE_UNQUOTED([UNMOUNT_COMMAND], ["${unmount_command}"], [unmount command])
+ 
+ AC_PATH_PROG(nautilus_path, nautilus, nautilus)
+Index: src/manager.c
+===================================================================
+RCS file: /cvs/gnome/gnome-volume-manager/src/manager.c,v
+retrieving revision 1.72
+diff -u -b -B -r1.72 manager.c
diff --git a/gnome-base/gnome-volume-manager/gnome-volume-manager-1.5.0.ebuild b/gnome-base/gnome-volume-manager/gnome-volume-manager-1.5.0.ebuild
new file mode 100644
index 000000000000..a9f52f2e0667
--- /dev/null
+++ b/gnome-base/gnome-volume-manager/gnome-volume-manager-1.5.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2005 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.5.0.ebuild,v 1.1 2005/08/31 07:30:58 cardoe Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Daemon that enforces volume-related policies"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="http://primates.ximian.com/~fejj/gvm//${P}.tar.gz
+	http://dev.gentoo.org/~cardoe/files/${PN}-1.3.3-reconnect_dbus.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ia64 ~ppc ~ppc64 ~x86"
+IUSE="doc crypt"
+
+RDEPEND=">=x11-libs/gtk+-2.6
+	>=sys-apps/dbus-0.31
+	>=sys-apps/hal-0.5.0
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomeui-2
+	sys-apps/pmount"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.27.2"
+
+DOCS="AUTHORS ChangeLog README HACKING NEWS TODO"
+
+USE_DESTDIR="1"
+
+pkg_setup() {
+	G2CONF="pmount_hal_path=/usr/bin/pmount-hal \
+		umount_path=/usr/bin/pumount \
+		--with-eject-command=/usr/bin/eject"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	#epatch ${FILESDIR}/gnome-volume-manager-1.3.2-set_defaults.patch
+	epatch ${DISTDIR}/gnome-volume-manager-1.3.3-reconnect_dbus.patch.bz2
+	# Doesn't apply to current cvs.  Must look at leater.
+	#epatch ${FILESDIR}/gnome-volume-manager-1.3.3-pmount_crypt.patch
+	epatch ${FILESDIR}/gvm-use-pmount-if-available-nochangelog.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."
+}