bump to 2.22.5. Disable automount commands that should be handled by nautilus now since 2.22.

(Portage version: 2.1.5)

3 files changed, 77 insertions, 1 deletions

diff --git a/gnome-base/gnome-volume-manager/ChangeLog b/gnome-base/gnome-volume-manager/ChangeLog
index c8e2725b456c..523318a87003 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.104 2008/05/14 16:34:02 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.105 2008/05/25 19:44:32 eva Exp $
+
+*gnome-volume-manager-2.22.5 (25 May 2008)
+
+  25 May 2008; Gilles Dartiguelongue <eva@gentoo.org> metadata.xml,
+  +gnome-volume-manager-2.22.5.ebuild:
+  bump to 2.22.5. Disable automount commands that should be handled by
+  nautilus now since 2.22.
 
   14 May 2008; Markus Rothe <corsair@gentoo.org>
   gnome-volume-manager-2.22.1.ebuild:
diff --git a/gnome-base/gnome-volume-manager/gnome-volume-manager-2.22.5.ebuild b/gnome-base/gnome-volume-manager/gnome-volume-manager-2.22.5.ebuild
new file mode 100644
index 000000000000..bc3a6c9a2c1e
--- /dev/null
+++ b/gnome-base/gnome-volume-manager/gnome-volume-manager-2.22.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2008 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-2.22.5.ebuild,v 1.1 2008/05/25 19:44:32 eva Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Daemon that enforces volume-related policies"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sh ~sparc ~x86" # ~x86-fbsd"
+IUSE="automount debug"
+
+# TODO: libnotify support is optional but doesn't have a configure switch
+
+RDEPEND=">=gnome-base/libgnomeui-2.1.5
+	>=dev-libs/dbus-glib-0.71
+	>=sys-apps/hal-0.5.9
+	>=x11-libs/gtk+-2.6
+	>=gnome-base/libglade-2
+	>=x11-libs/libnotify-0.3
+	>=gnome-base/gconf-2
+
+	  gnome-base/nautilus
+	>=gnome-base/gnome-mount-0.6"
+DEPEND="${RDEPEND}
+	  sys-devel/gettext
+	>=dev-util/pkgconfig-0.20
+	>=dev-util/intltool-0.35"
+
+DOCS="AUTHORS ChangeLog README HACKING NEWS TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_enable debug) $(use_enable automount)"
+
+	# FIXME: We should be more intelligent about disabling multiuser support
+	# (like enable it when pam_console is available?). For now, this is a
+	# slightly nicer solution than applying ${PN}-1.5.9-no-pam_console.patch
+	# FIXME: now that we have pambase, find time to check if we can do this
+	G2CONF="${G2CONF} --disable-multiuser"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix most FreeBSD issues (bug #183442) -- local fallback wont work
+	epatch "${FILESDIR}"/${PN}-2.22.0-fbsd-support.patch
+
+	# Fix default totem command.  Bug #200999
+	epatch "${FILESDIR}"/${PN}-2.17.0-totem-dvd.patch
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "To start the gnome-volume-manager daemon you need to configure"
+	elog "it through it's preferences capplet. Also the HAL daemon (hald)"
+	elog "needs to be running or it will shut down."
+	elog
+	elog "If you experience problems with automounting (windows opened"
+	elog "twice or nothing happening on media insertion) try changing"
+	elog "the status of the automount USE flag."
+}
diff --git a/gnome-base/gnome-volume-manager/metadata.xml b/gnome-base/gnome-volume-manager/metadata.xml
index da6fd63d0085..021c8f29f346 100644
--- a/gnome-base/gnome-volume-manager/metadata.xml
+++ b/gnome-base/gnome-volume-manager/metadata.xml
@@ -2,4 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<use>
+	<flag name="automount">Enable support for automounting devices that are
+	handled by <pkg>gnome-base/nautilus</pkg> since 2.22. This should me off on
+	most Gnome systems.</flag>
+</use>
 </pkgmetadata>