Clean up old revisions.

(Portage version: 2.2_rc42/cvs/Linux i686)

7 files changed, 9 insertions, 534 deletions

diff --git a/gnome-base/gnome-volume-manager/ChangeLog b/gnome-base/gnome-volume-manager/ChangeLog
index 8c21701a2daf..298ea5c604d6 100644
--- a/gnome-base/gnome-volume-manager/ChangeLog
+++ b/gnome-base/gnome-volume-manager/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-volume-manager
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.127 2009/04/28 10:52:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.128 2009/10/05 15:58:09 eva Exp $
+
+  05 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-volume-manager-2.17.0-r1.ebuild,
+  -files/gnome-volume-manager-2.17.0-fbsd.patch,
+  -gnome-volume-manager-2.22.5.ebuild, -gnome-volume-manager-2.24.0.ebuild,
+  -gnome-volume-manager-2.24.0-r1.ebuild,
+  -files/gnome-volume-manager-2.24.0-consolekit03.patch:
+  Clean up old revisions.
 
   28 Apr 2009; Raúl Porcel <armin76@gentoo.org>
   gnome-volume-manager-2.24.1.ebuild:
diff --git a/gnome-base/gnome-volume-manager/files/gnome-volume-manager-2.17.0-fbsd.patch b/gnome-base/gnome-volume-manager/files/gnome-volume-manager-2.17.0-fbsd.patch
deleted file mode 100644
index 615347d6f4a7..000000000000
--- a/gnome-base/gnome-volume-manager/files/gnome-volume-manager-2.17.0-fbsd.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gnome-volume-manager-2.17.0.orig/src/manager.c gnome-volume-manager-2.17.0/src/manager.c
---- gnome-volume-manager-2.17.0.orig/src/manager.c	2006-11-07 13:01:17.000000000 -0500
-+++ gnome-volume-manager-2.17.0/src/manager.c	2007-07-05 19:48:50.000000000 -0400
-@@ -23,9 +23,12 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <dirent.h>
-+#include <fcntl.h>
- #include <signal.h>
- #include <unistd.h>
- #include <utmp.h>
-+#include <sys/param.h>
-+#include <sys/mount.h>
- 
- #include <locale.h>
- 
-@@ -1556,12 +1559,27 @@ enum {
- 	MOUNT_UID        = (1 << 15),
- 	MOUNT_UMASK      = (1 << 16),
- 	MOUNT_UTF8       = (1 << 17),
-+	MOUNT_LOCALE     = (1 << 18),
-+	MOUNT_LONGNAME   = (1 << 19),
- };
- 
- static struct {
- 	const char *name;
- 	guint32 flag;
- } mount_options[] = {
-+#ifdef __FreeBSD__
-+	{ "-D=",	MOUNT_CODEPAGE   },  /* vfat */
-+	{ "-M=",	MOUNT_DMASK      },  /* vfat */
-+	{ "-m=",	MOUNT_FMASK      },  /* vfat, ntfs */
-+	{ "-L=",	MOUNT_LOCALE     },  /* vfat */
-+	{ "-C=",	MOUNT_IOCHARSET  },  /* ntfs, ios9660 */
-+	{ "noatime",	MOUNT_NOATIME    },
-+	{ "noexec",	MOUNT_NOEXEC     },
-+	{ "ro",		MOUNT_READ_ONLY  },
-+	{ "longnames",	MOUNT_LONGNAME   },  /* vfat */
-+	{ "sync",	MOUNT_SYNC       },
-+	{ "-u=",	MOUNT_UID        },  /* vfat, ntfs */
-+#else
- 	{ "codepage=",  MOUNT_CODEPAGE   },  /* vfat */
- 	{ "data=",      MOUNT_DATA       },  /* ext3 */
- 	{ "dirsync",    MOUNT_DIRSYNC    },
-@@ -1580,6 +1598,7 @@ static struct {
- 	{ "uid=",       MOUNT_UID        },  /* vfat, ntfs, udf, iso9660 */
- 	{ "umask=",     MOUNT_UMASK      },  /* vfat, ntfs, udf */
- 	{ "utf8",       MOUNT_UTF8       },  /* vfat, iso9660 */
-+#endif
- };
- 
- 
-@@ -1760,10 +1779,17 @@ gvm_mount_options (GPtrArray *options, g
- 		g_slist_free_1 (l);
- 	}
- 	
-+#ifndef __FreeBSD__
- 	if (opts & MOUNT_UID) {
- 		option = g_strdup_printf ("uid=%u", getuid ());
- 		g_ptr_array_add (options, option);
- 	}
-+#else
-+	if (opts & MOUNT_UID && (!strcmp (where, "vfat") || !strcmp (where, "ntfs"))) {
-+		option = g_strdup_printf ("u=%u", getuid ());
-+		g_ptr_array_add (options, option);
-+	}
-+#endif
- 	
- 	return TRUE;
- }
-@@ -1813,7 +1839,7 @@ gvm_device_mount (const char *udi, gbool
- 		
- 		return retval;
- 	} else {
--		char *mount_point, *fstype, *drive, **moptions, fmask_opt[12], *charset_opt = NULL;
-+		char *mount_point, *fstype, *drive, **moptions, fmask_opt[12], *charset_opt = NULL, *locale_opt = NULL;
- 		DBusMessage *dmesg, *reply;
- 		gboolean freev = FALSE;
- 		GPtrArray *options;
-@@ -1893,21 +1919,86 @@ gvm_device_mount (const char *udi, gbool
- 				
- 				if (opts & MOUNT_FMASK) {
- 					mask = umask (0);
-+#ifdef __FreeBSD__
-+					snprintf (fmask_opt, sizeof (fmask_opt), "-m=%#o", mask | 0111);
-+#else
- 					snprintf (fmask_opt, sizeof (fmask_opt), "fmask=%#o", mask | 0111);
-+#endif
- 					g_ptr_array_add (options, fmask_opt);
- 					umask (mask);
- 				}
- 				
- 				if (opts & MOUNT_SHORTNAME)
- 					g_ptr_array_add (options, "shortname=lower");
-+				if (opts & MOUNT_LONGNAME)
-+					g_ptr_array_add (options, "longnames");
-+
-+				if (opts & MOUNT_LOCALE) {
-+					char *locale;
-+
-+					locale = setlocale(LC_ALL, NULL);
-+					if (!locale)
-+						locale = getenv("LANG");
-+					if (locale) {
-+
-+						locale_opt = g_strdup_printf ("-L=%s", locale);
-+						g_ptr_array_add (options, locale_opt);
-+					}
-+				}
-+
-+#ifdef __FreeBSD__
-+				if (opts & MOUNT_CODEPAGE) {
-+					if ((iocharset = gvm_iocharset ())) {
-+						charset_opt = g_strdup_printf ("-D=%s", iocharset);
-+						g_ptr_array_add (options, charset_opt);
-+					}
-+				}
-+
-+				if (opts & MOUNT_UID) {
-+					snprintf (uid, sizeof (uid) - 1, "-u=%s", getuid ());
-+					g_ptr_array_add (options, uid);
-+				}
-+#endif
- 			} else if (!strcmp (fstype, "iso9660")) {
- 				/* only care about uid= and iocharset= */
-+#ifdef __FreeBSD__
-+				if (opts & MOUNT_IOCHARSET) {
-+					if ((iocharset = gvm_iocharset ())) {
-+						charset_opt = g_strdup_printf ("-C=%s", iocharset);
-+						g_ptr_array_add (options, charset_opt);
-+					}
-+				}
-+#endif
- 			} else if (!strcmp (fstype, "udf")) {
- 				/* also care about uid= and iocharset= */
- 				if (opts & MOUNT_NOATIME)
- 					g_ptr_array_add (options, "noatime");
-+#ifdef __FreeBSD__
-+				if (opts & MOUNT_IOCHARSET) {
-+					if ((iocharset = gvm_iocharset ())) {
-+						charset_opt = g_strdup_printf ("-C=%s", iocharset);
-+						g_ptr_array_add (options, charset_opt);
-+					}
-+				}
-+#endif
-+			} else if (!strcmp (fstype, "ntfs")) {
-+				/* only care about uid= and iocharset= */
-+#ifdef __FreeBSD__
-+				if (opts & MOUNT_IOCHARSET) {
-+					if ((iocharset = gvm_iocharset ())) {
-+						charset_opt = g_strdup_printf ("-C=%s", iocharset);
-+						g_ptr_array_add (options, charset_opt);
-+					}
-+				}
-+
-+				if (opts & MOUNT_UID) {
-+					snprintf (uid, sizeof (uid) - 1, "-u=%s", getuid ());
-+					g_ptr_array_add (options, uid);
-+				}
-+#endif
- 			}
- 			
-+#ifndef __FreeBSD__
- 			if (opts & (MOUNT_IOCHARSET|MOUNT_UTF8)) {
- 				if ((iocharset = gvm_iocharset ())) {
- 					if ((opts & MOUNT_UTF8) && !strcmp (iocharset, "utf8")) {
-@@ -1923,6 +2014,7 @@ gvm_device_mount (const char *udi, gbool
- 				snprintf (uid, sizeof (uid) - 1, "uid=%u", getuid ());
- 				g_ptr_array_add (options, uid);
- 			}
-+#endif
- 			
- 			libhal_free_string (fstype);
- 		}
-@@ -1947,6 +2039,7 @@ gvm_device_mount (const char *udi, gbool
- 		
- 		g_ptr_array_free (options, TRUE);
- 		g_free (charset_opt);
-+		g_free (locale_opt);
- 		
- 		policy = g_new (struct _MountPolicy, 1);
- 		policy->udi = g_strdup (udi);
-@@ -3185,6 +3278,12 @@ gvm_local_user (void)
- 	size_t n;
- 	DIR *dir;
- 	int vt;
-+#ifndef __linux__
-+	int bytes, fd;
-+	struct stat sb;
-+	struct utmp buf[1024];
-+	size_t len;
-+#endif
- 	
- 	if (local & LOCAL_USER_CHECKED)
- 		return (local & LOCAL_USER_FOUND);
-@@ -3208,6 +3307,7 @@ gvm_local_user (void)
- 	
-  fallback:
- 	
-+#ifdef __linux__
- 	if (!(local & LOCAL_USER_FOUND)) {
- 		setutent ();
- 		
-@@ -3222,6 +3322,29 @@ gvm_local_user (void)
- 		
- 		endutent ();
- 	}
-+#else
-+	if ((fd = open (_PATH_WTMP, O_RDONLY, 0)) < 0 || fstat(fd, &sb) == -1) {
-+		close (fd);
-+		return TRUE;
-+	}
-+
-+	len = (sb.st_size + sizeof(buf) - 1) / sizeof(buf);
-+
-+	while (!local && --len >= 0) {
-+		if (lseek(fd, (off_t) (len * sizeof(buf)), L_SET) == -1 ||
-+				(bytes = read (fd, buf, sizeof(buf))) == -1) {
-+			close (fd);
-+			return TRUE;
-+		}
-+		for (utmp = &buf[bytes / sizeof(buf[0]) - 1]; !local && utmp >= buf; --utmp) {
-+			if (!utmp->ut_name[0] || strncmp (utmp->ut_name, user, n) != 0)
-+				continue;
-+			local = utmp->ut_line[0] == ':' && utmp->ut_line[1] >= '0' && utmp->ut_line[1] <= '9' || !strncmp (utmp->ut_line, "ttyv", 4) ? LOCAL_USER_FOUND : 0;
-+		}
-+	}
-+
-+	close (fd);
-+#endif
- 	
- 	local |= LOCAL_USER_CHECKED;
- 	
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gnome-volume-manager-2.17.0.orig/src/properties.c gnome-volume-manager-2.17.0/src/properties.c
---- gnome-volume-manager-2.17.0.orig/src/properties.c	2006-11-07 13:01:17.000000000 -0500
-+++ gnome-volume-manager-2.17.0/src/properties.c	2007-07-05 19:48:50.000000000 -0400
-@@ -504,7 +504,11 @@ main (int argc, char **argv)
- 							  _("The \"hald\" service is required but not currently "
- 							    "running. Enable the service and rerun this application, "
- 							    "or contact your system administrator.\n\n"
-+#ifndef __FreeBSD__
- 							    "Note: You need Linux kernel 2.6 for volume "
-+#else
-+							    "Note: You need sysutils/hal installed for volume "
-+#endif
- 							    "management to work."));
- 		
- 		gtk_dialog_run (GTK_DIALOG (dialog));
diff --git a/gnome-base/gnome-volume-manager/files/gnome-volume-manager-2.24.0-consolekit03.patch b/gnome-base/gnome-volume-manager/files/gnome-volume-manager-2.24.0-consolekit03.patch
deleted file mode 100644
index 066e6bb8ec4c..000000000000
--- a/gnome-base/gnome-volume-manager/files/gnome-volume-manager-2.24.0-consolekit03.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# This patch deals with DBus API changes in consolekit 0.3
-# https://bugs.gentoo.org/show_bug.cgi?id=248471
-#
---- a/src/manager.c	2008-11-21 17:54:00.000000000 -0800
-+++ b/src/manager.c	2008-11-21 17:54:25.000000000 -0800
-@@ -3932,9 +3932,11 @@
- 	
- 	dbus_message_iter_init (reply, &iter);
- 	if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_INT32) {
--		dbg ("Unrecognized response to ConsoleKit GetUnixUser request\n");
--		dbus_message_unref (reply);
--		return FALSE;
-+		if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_UINT32) {
-+			dbg ("Unrecognized response to ConsoleKit GetUnixUser request\n");
-+			dbus_message_unref (reply);
-+			return FALSE;
-+		}
- 	}
- 	
- 	dbus_message_iter_get_basic (&iter, uid);
diff --git a/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0-r1.ebuild b/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0-r1.ebuild
deleted file mode 100644
index c0d8487eb4bd..000000000000
--- a/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.17.0-r1.ebuild,v 1.11 2008/10/19 10:09:54 eva Exp $
-
-inherit gnome2 eutils autotools
-
-DESCRIPTION="Daemon that enforces volume-related policies"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="crypt debug doc"
-
-RDEPEND="gnome-base/nautilus
-	>=gnome-base/libgnomeui-2.1.5
-	>=dev-libs/dbus-glib-0.71
-	>=sys-apps/hal-0.5.6
-	>=x11-libs/gtk+-2.6
-	>=gnome-base/libglade-2
-	>=x11-libs/libnotify-0.3
-	>=gnome-base/gconf-2
-	>=gnome-base/gnome-control-center-2.0
-	gnome-base/gnome-mime-data
-	gnome-base/gnome-mount"
-
-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 crypt) \
-			$(use_enable debug) \
-			$(use_enable doc)"
-
-	# 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
-	G2CONF="${G2CONF} --disable-multiuser"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# fbsd fixes.  bug #183442
-	epatch "${FILESDIR}"/${P}-fbsd.patch
-
-	# Fix default totem command.  Bug #200999
-	epatch "${FILESDIR}"/${P}-totem-dvd.patch
-
-	# fix LINGUAS handling, bug #183086
-	intltoolize --force || die "intltoolize failed"
-	eautoreconf
-}
-
-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."
-}
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
deleted file mode 100644
index 80f5cce636df..000000000000
--- a/gnome-base/gnome-volume-manager/gnome-volume-manager-2.22.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.9 2008/11/13 19:47:21 ranger 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 ppc64 ~sh sparc x86" # ~x86-fbsd"
-IUSE="automount debug consolekit"
-
-# 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
-
-	consolekit? ( >=sys-auth/consolekit-0.2 )"
-DEPEND="${RDEPEND}
-	  sys-devel/gettext
-	>=dev-util/pkgconfig-0.20
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog README HACKING NEWS TODO"
-
-pkg_setup() {
-	# if consolekit is absent, g-v-m will fall back to the old
-	# behavior of the pam_console time.
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable automount)
-		$(use_enable consolekit 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/gnome-volume-manager-2.24.0-r1.ebuild b/gnome-base/gnome-volume-manager/gnome-volume-manager-2.24.0-r1.ebuild
deleted file mode 100644
index 2ec8e0873cf5..000000000000
--- a/gnome-base/gnome-volume-manager/gnome-volume-manager-2.24.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2009 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.24.0-r1.ebuild,v 1.2 2009/01/31 09:04:29 aballier 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 ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="automount debug consolekit"
-
-# 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
-
-	consolekit? ( >=sys-auth/consolekit-0.2 )"
-DEPEND="${RDEPEND}
-	  sys-devel/gettext
-	>=dev-util/pkgconfig-0.20
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog README HACKING NEWS TODO"
-
-pkg_setup() {
-	# if consolekit is absent, g-v-m will fall back to the old
-	# behavior of the pam_console time.
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable automount)
-		$(use_enable consolekit 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"
-
-	# Fix consolekit DBus API use, bug #248471
-	epatch "${FILESDIR}/${P}-consolekit03.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/gnome-volume-manager-2.24.0.ebuild b/gnome-base/gnome-volume-manager/gnome-volume-manager-2.24.0.ebuild
deleted file mode 100644
index c9f1d5cc4d78..000000000000
--- a/gnome-base/gnome-volume-manager/gnome-volume-manager-2.24.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.24.0.ebuild,v 1.1 2008/11/17 23:11:27 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 ~ppc64 ~sh ~sparc ~x86" # ~x86-fbsd"
-IUSE="automount debug consolekit"
-
-# 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
-
-	consolekit? ( >=sys-auth/consolekit-0.2 )"
-DEPEND="${RDEPEND}
-	  sys-devel/gettext
-	>=dev-util/pkgconfig-0.20
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog README HACKING NEWS TODO"
-
-pkg_setup() {
-	# if consolekit is absent, g-v-m will fall back to the old
-	# behavior of the pam_console time.
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable automount)
-		$(use_enable consolekit 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."
-}