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

Package-Manager: portage-2.1.5

4 files changed, 91 insertions, 3 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/Manifest b/gnome-base/gnome-volume-manager/Manifest
index e2431a335301..a539238c1a9a 100644
--- a/gnome-base/gnome-volume-manager/Manifest
+++ b/gnome-base/gnome-volume-manager/Manifest
@@ -1,10 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-volume-manager-2.17.0-fbsd.patch 7530 RMD160 357db1283badb5b782fb901b943f7f3cc875ba1c SHA1 78bfc95c36d96d2888a157c066f7752251682a72 SHA256 67612f8a57fd848c4e3b6a630ccf511ce715e41c418f7dd0e17261628fda4b51
 AUX gnome-volume-manager-2.17.0-totem-dvd.patch 578 RMD160 0e4b4cd0a417791df20d46f37dfd0d193c6d107b SHA1 2dd01b38707aea892bb524f763c0f4a2179cf89e SHA256 a3952985f4380674f108065e739d5a62ac64c6db42de9fbf41b044cb408936e1
 AUX gnome-volume-manager-2.22.0-fbsd-support.patch 5190 RMD160 6a7f8b09cfcb8673ad01663464e909124bc4afc7 SHA1 29ec86b683c5120a751f3f0e570758573306caf3 SHA256 99f44f168a3083ee587a9e860a0bec9c3917777f4c62d9b7964aa2d798a3aa40
 DIST gnome-volume-manager-2.17.0.tar.bz2 341241 RMD160 170585505f0bc7c024206131e445a686d89e60f8 SHA1 2b2f1367823c92fbeb269c10959adca2d3db1918 SHA256 5517cf5d6a70227d66afb9a8b97a704f0d8e29098cec98bcbf68da77133537a9
 DIST gnome-volume-manager-2.22.1.tar.bz2 361668 RMD160 01f259d49e8bd64f0e2f87fccea0ed8ba00038eb SHA1 cb06bb74c37282dfad562ea6f0cdaea441379cf6 SHA256 8305428940e3aab9a7c6ccaa283489170d8de96b873695b541c8a7daacd2d591
+DIST gnome-volume-manager-2.22.5.tar.bz2 405349 RMD160 9f080315736ae408f2dbb8eedc90d407fbc48eee SHA1 108a3c7cab897680f202a796ee7f4f07809a790e SHA256 bb2ebc93327605611849132451304e985912a4724b238b5edabe6f0a4ed54005
 EBUILD gnome-volume-manager-2.17.0-r1.ebuild 1815 RMD160 f85c4f768b742eda24fea22b3bde4cd41dcd8986 SHA1 15e3c607d1c00813bc9af75f76c846850bb5d218 SHA256 20ac9421f1e1f68f63aca24f7a46c0a3df57fea527eb657461849529232795c1
 EBUILD gnome-volume-manager-2.17.0.ebuild 1638 RMD160 a671c08ddf1dab8feb65d3c2d25d840ea375f73b SHA1 16fb3f61d9821356d3afc61881f859547bc38c24 SHA256 aeb4848fae358ad5ba37da445764f28ad5554ad78e799f96b99b4bcb986fcf8c
 EBUILD gnome-volume-manager-2.22.1.ebuild 1819 RMD160 51b9cfae9f2f87ca01ba9d14786ef156248514f0 SHA1 ea978d7f7febdce08a4d6c05e325507fd9b9045e SHA256 c63a4f065556b172f67ed46de15d47f12c907d6f2769debeb2389343aeddd89f
-MISC ChangeLog 16032 RMD160 6100f2d28ed0f670ad966655e5caaec562a39a5a SHA1 0d45f0facf8dc37190c42996a666556df870eaf5 SHA256 52e2bf027b5e2094037158dc41f9da2e729030ef10043700442af1d8fc2d2527
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+EBUILD gnome-volume-manager-2.22.5.ebuild 2038 RMD160 f9767198e4779583acf2b00246da02c8eba52e73 SHA1 f74f1335ffb62487bb544e22186a5ea971c64a55 SHA256 8d96ab24fdb84ce1c82561be3e80a87b4d4bad1d2eeb9cfda581fb0f7a60020e
+MISC ChangeLog 16278 RMD160 22171f1a326f1869ed15948eeeef9a3b40b132e0 SHA1 52bc707361b308ca927b199bd041680cdda7d5dd SHA256 8d3057bbeba97258e4c394b53b29090f330930dba006b6a81ba2e13900eed149
+MISC metadata.xml 349 RMD160 b5703a3243253d9a218e5881f4b41d9d3a0b8c53 SHA1 3aae412743891d3530cff9ab829ea0727f2ebfed SHA256 c157ddc62f16599661739b86d66fdbf8a4f376d7a91825f53afec668058ecaa1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkg53coACgkQ1fmVwcYIWAbcWwCgunOjD+z6g2o04vqY/MWJTvGw
+xE8AniMBEl19sE7xgFGVwxcKFll++S4v
+=Bi4C
+-----END PGP SIGNATURE-----
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>