Added gst-plugins-gnomevfs dependency, required to preview sound files (bug #96361). Cleaning old ebuilds/patches.

(Portage version: 2.0.51.22-r1)

8 files changed, 12 insertions, 441 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 7c7f26d6e4a5..a652cfdb1971 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.140 2005/07/12 00:00:11 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.141 2005/07/12 12:39:57 leonardop Exp $
+
+  12 Jul 2005; Leonardo Boshell <geoman@gentoo.org> nautilus-2.10.0.ebuild,
+  nautilus-2.10.1.ebuild:
+  Added gst-plugins-gnomevfs dependency when the 'gstreamer' USE flag is
+  enabled, required to preview sound files in nautilus. Noticed by Alessio
+  D'Ascanio on bug #96361.
 
   11 Jul 2005; Stephen P. Becker <geoman@gentoo.org> nautilus-2.10.0.ebuild,
   nautilus-2.10.1.ebuild:
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.8.2-r1 b/gnome-base/nautilus/files/digest-nautilus-2.8.2-r1
deleted file mode 100644
index 33918b6c2a36..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-2.8.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d5fdec9acc37181016e8424e96d663b8 nautilus-2.8.2.tar.bz2 5808170
diff --git a/gnome-base/nautilus/files/nautilus-2-libexif.patch b/gnome-base/nautilus/files/nautilus-2-libexif.patch
deleted file mode 100644
index 2ff13fa42cb1..000000000000
--- a/gnome-base/nautilus/files/nautilus-2-libexif.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ur nautilus-2.8.0/acconfig.h nautilus-2.8.0-newpatch/acconfig.h
---- nautilus-2.8.0/acconfig.h	2003-10-14 23:28:25.000000000 +0800
-+++ nautilus-2.8.0-newpatch/acconfig.h	2004-11-11 17:02:43.170940312 +0800
-@@ -23,3 +23,4 @@
- #define HAVE_GTK_MULTIHEAD /* needed for egg-screen-exec functions */
- #undef HAVE_STARTUP_NOTIFICATION
- #undef HAVE_EXIF
-+#undef HAVE_OLD_EXIF
-diff -ur nautilus-2.8.0/components/image_properties/nautilus-image-properties-view.c nautilus-2.8.0-newpatch/components/image_properties/nautilus-image-properties-view.c
---- nautilus-2.8.0/components/image_properties/nautilus-image-properties-view.c	2004-03-09 19:23:37.000000000 +0800
-+++ nautilus-2.8.0-newpatch/components/image_properties/nautilus-image-properties-view.c	2004-11-11 17:02:43.171940160 +0800
-@@ -124,13 +124,20 @@
- exif_content_callback (ExifContent *content, gpointer data)
- {
- 	struct ExifAttribute *attribute;
-+#if !HAVE_OLD_EXIF
-+	char b[1024];
-+#endif
- 
- 	attribute = (struct ExifAttribute *)data;
- 	if (attribute->found) {
- 		return;
- 	}
- 
-+#ifdef HAVE_OLD_EXIF
-         attribute->value = g_strdup (exif_content_get_value (content, attribute->tag));
-+#else
-+        attribute->value = g_strdup (exif_content_get_value (content, attribute->tag, b, sizeof(b)));
-+#endif
- 	if (attribute->value != NULL) {
- 		attribute->found = TRUE;
- 	}
-diff -ur nautilus-2.8.0/configure.in nautilus-2.8.0-newpatch/configure.in
---- nautilus-2.8.0/configure.in	2004-09-13 16:45:08.000000000 +0800
-+++ nautilus-2.8.0-newpatch/configure.in	2004-11-11 17:03:13.662304920 +0800
-@@ -228,11 +228,19 @@
- 
- AC_MSG_CHECKING(for libExif)
- 
--PKG_CHECK_MODULES(EXIF, libexif >= $EXIF_REQUIRED, have_exif=yes, have_exif=no)
--if test "x$have_exif" = "xyes"; then
--  AC_DEFINE(HAVE_EXIF,1)
--  AC_SUBST(EXIF_CFLAGS)
--  AC_SUBST(EXIF_LIBS)
-+PKG_CHECK_MODULES(EXIF, libexif > 0.5.12, have_new_exif=yes, have_new_exif=no)
-+if test "x$have_new_exif" = "xyes"; then
-+	AC_DEFINE(HAVE_EXIF,1)
-+	AC_SUBST(EXIF_CFLAGS)
-+	AC_SUBST(EXIF_LIBS)
-+else
-+	PKG_CHECK_MODULES(EXIF, libexif = 0.5.12, have_old_exif=yes, have_old_exif=no)
-+	if test "x$have_old_exif" = "xyes"; then
-+		AC_DEFINE(HAVE_EXIF,1)
-+		AC_DEFINE(HAVE_OLD_EXIF,1)
-+		AC_SUBST(EXIF_CFLAGS)
-+		AC_SUBST(EXIF_LIBS)
-+	fi
- fi
- 
- dnl ==========================================================================
diff --git a/gnome-base/nautilus/files/nautilus-2-nocdda.patch b/gnome-base/nautilus/files/nautilus-2-nocdda.patch
deleted file mode 100644
index 298c2a422055..000000000000
--- a/gnome-base/nautilus/files/nautilus-2-nocdda.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur nautilus-2.8.2/configure.in nautilus-2.8.2-nocdda/configure.in
---- nautilus-2.8.2/configure.in	2004-10-28 23:06:04.000000000 +0800
-+++ nautilus-2.8.2-nocdda/configure.in	2004-11-30 17:00:50.569384976 +0800
-@@ -191,16 +191,6 @@
- 
- dnl ==========================================================================
- 
--dnl cdda
--
--AM_CONDITIONAL(HAVE_CDDA, false)
--AC_CHECK_HEADERS(cdda_interface.h cdda_paranoia.h, [
--	CDDA_LIBS="-lcdda_paranoia -lcdda_interface"
--	AM_CONDITIONAL(HAVE_CDDA, true)
--	])
--
--dnl ==========================================================================
--
- dnl jw (for doc build)
- 
- AC_PATH_PROG(JW,jw,no)
diff --git a/gnome-base/nautilus/files/nautilus-2.6-icon_view_gst_audio_preview.patch b/gnome-base/nautilus/files/nautilus-2.6-icon_view_gst_audio_preview.patch
deleted file mode 100644
index f8b4642cf3fb..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.6-icon_view_gst_audio_preview.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-diff -uNr --exclude='*.orig' --exclude='*.rej' nautilus-2.5.8/configure.in nautilus-2.5.8.patched/configure.in
---- nautilus-2.5.8/configure.in	2004-02-24 14:32:49.000000000 +0100
-+++ nautilus-2.5.8.patched/configure.in	2004-03-02 18:08:31.100016816 +0100
-@@ -21,6 +21,7 @@
- XML_REQUIRED=2.4.7
- STARTUP_NOTIFICATION_REQUIRED=0.5
- EXIF_REQUIRED=0.5.12
-+GSTREAMER_REQUIRED=0.6.0
- 
- AC_SUBST(ART_REQUIRED)
- AC_SUBST(BONOBO_ACTIVATION_REQUIRED)
-@@ -40,6 +41,7 @@
- AC_SUBST(RSVG_REQUIRED)
- AC_SUBST(XML_REQUIRED)
- AC_SUBST(STARTUP_NOTIFICATION_REQUIRED)
-+AC_SUBST(GSTREAMER_REQUIRED)
- 
- dnl ===========================================================================
- 
-@@ -257,6 +259,53 @@
- 
- dnl ==========================================================================
- 
-+dnl gstreamer checking
-+
-+AC_ARG_ENABLE(gstreamer,
-+		AC_HELP_STRING([--enable-gstreamer],[use GStreamer for sound preview]),
-+	[case "${enableval}" in
-+	yes) ENABLE_GST=yes ;;
-+        no)  ENABLE_GST=no ;;
-+	*) AC_MSG_ERROR(bad value ${enableval} for --enable-gstreamer) ;;
-+	esac],
-+	[ENABLE_GST=no]) dnl Default value
-+
-+AC_MSG_CHECKING(for backend libraries)
-+
-+if test x$ENABLE_GST = xyes; then
-+
-+dnl Now we're ready to ask for gstreamer libs and cflags
-+dnl And we can also ask for the right version of gstreamer
-+	HAVE_GSTREAMER=no
-+
-+dnl start with 0.7
-+	GST_MAJORMINOR=0.8
-+	PKG_CHECK_MODULES(GST, \
-+			gstreamer-gconf-$GST_MAJORMINOR >= $GSTREAMER_REQUIRED,
-+			HAVE_GSTREAMER=yes,HAVE_GSTREAMER=no)
-+
-+dnl try 0.6
-+	if test "x$HAVE_GSTREAMER" = "xno"; then
-+		GST_MAJORMINOR=0.6
-+		PKG_CHECK_MODULES(GST, \
-+			gstreamer-gconf-$GST_MAJORMINOR >= $GSTREAMER_REQUIRED,
-+			HAVE_GSTREAMER=yes,HAVE_GSTREAMER=no)
-+	fi
-+
-+dnl Give error and exit if we don't have gstreamer
-+	if test "x$HAVE_GSTREAMER" = "xno"; then
-+		AC_MSG_ERROR(you need gstreamer development packages installed !)
-+	fi
-+
-+	MM="gstreamer-libs-$GST_MAJORMINOR >= $GSTREAMER_REQUIRED gstreamer-gconf-$GST_MAJORMINOR >= $GSTREAMER_REQUIRED"
-+
-+	AC_MSG_RESULT(GStreamer)
-+	AC_DEFINE(USE_GST_AUDIO_PREVIEW,1,[Define if you want to use the GStreamer media framework])
-+
-+fi
-+
-+dnl ==========================================================================
-+
- dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
- 
- AC_ARG_ENABLE(more-warnings,
-@@ -333,7 +382,7 @@
- AC_SUBST(LIBNAUTILUS_EXTENSION_LIBS)
- 
- dnl core nautilus (must list bonobo-activation and libbonobo because idldir does not respect "requires")
--CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES"
-+CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $MM $EXTRA_CORE_MODULES"
- CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags"
- AC_SUBST(CORE_CFLAGS)
- CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs"
-diff -uNr --exclude='*.orig' --exclude='*.rej' nautilus-2.5.8/src/file-manager/fm-icon-view.c nautilus-2.5.8.patched/src/file-manager/fm-icon-view.c
---- nautilus-2.5.8/src/file-manager/fm-icon-view.c	2004-02-13 11:50:10.000000000 +0100
-+++ nautilus-2.5.8.patched/src/file-manager/fm-icon-view.c	2004-03-02 18:12:12.802312944 +0100
-@@ -78,8 +78,13 @@
- #include <sys/wait.h>
- #include <unistd.h>
- 
-+#ifdef USE_GST_AUDIO_PREVIEW
-+#include <gst/gst.h>
-+#include <gst/gconf/gconf.h>
-+#else
- #define USE_OLD_AUDIO_PREVIEW 1
- #define READ_CHUNK_SIZE 16384
-+#endif /* USE_GST_AUDIO_PREVIEW */
- 
- /* Paths to use when creating & referring to Bonobo menu items */
- #define MENU_PATH_STRETCH_ICON 			"/menu/Edit/Edit Items Placeholder/Stretch"
-@@ -193,6 +198,10 @@
- static int preview_sound_auto_value;
- static gboolean gnome_esd_enabled_auto_value;
- 
-+#ifdef USE_GST_AUDIO_PREVIEW
-+static GstElement *thread;
-+#endif
-+
- static void                 fm_icon_view_set_directory_sort_by                 (FMIconView           *icon_view,
- 										NautilusFile         *file,
- 										const char           *sort_by);
-@@ -1777,6 +1786,22 @@
- 	fm_directory_view_stop_batching_selection_changes (FM_DIRECTORY_VIEW (icon_view));
- }
- 
-+#ifdef USE_GST_AUDIO_PREVIEW
-+static void
-+gst_end_of_stream_callback (GstElement *src, gpointer callback_data) 
-+{
-+	FMIconView *icon_view;
-+	icon_view = FM_ICON_VIEW (callback_data);
-+
-+	gst_element_set_state (GST_ELEMENT (thread), GST_STATE_NULL);
-+
-+	if (icon_view->details->audio_preview_timeout != 0) {
-+		g_source_remove (icon_view->details->audio_preview_timeout);
-+		icon_view->details->audio_preview_timeout = 0;
-+	}
-+}
-+#endif 
-+
- /* handle the preview signal by inspecting the mime type.  For now, we only preview local sound files. */
- 
- /* here's the timer task that actually plays the file using mpg123, ogg123 or play. */
-@@ -1784,6 +1809,34 @@
- static gboolean
- play_file (gpointer callback_data)
- {
-+#ifdef USE_GST_AUDIO_PREVIEW
-+	gchar *file_uri;
-+	GstElement *filesrc, *decoder, *audiosink;
-+	FMIconView *icon_view;
-+
-+	icon_view = FM_ICON_VIEW (callback_data);
-+	file_uri = nautilus_file_get_uri (icon_view->details->audio_preview_file);
-+
-+	if (file_uri != NULL && gst_init_check (NULL, NULL)) { 
-+		thread = gst_thread_new ("thread");
-+		filesrc = gst_element_factory_make ("gnomevfssrc", "disk_source");
-+		decoder = gst_element_factory_make ("spider", "spider");
-+		audiosink = gst_gconf_get_default_audio_sink (); 
-+
-+		g_object_set (G_OBJECT (filesrc), "location", file_uri, NULL);
-+		g_signal_connect (G_OBJECT (filesrc), "eos", G_CALLBACK (gst_end_of_stream_callback), icon_view);
-+
-+		gst_bin_add_many (GST_BIN (thread), filesrc, decoder, audiosink, NULL);
-+		gst_element_link_many (filesrc, decoder, audiosink, NULL);
-+
-+		gst_element_set_state (GST_ELEMENT (thread), GST_STATE_PLAYING);
-+	}
-+
-+	g_free (file_uri);
-+
-+	icon_view->details->audio_preview_file = NULL;
-+	icon_view->details->audio_preview_timeout = 0;
-+#else
- #if USE_OLD_AUDIO_PREVIEW	
- 	NautilusFile *file;
- 	FMIconView *icon_view;
-@@ -1908,6 +1961,7 @@
- 	icon_view->details->audio_preview_timeout = 0;
- 	icon_view->details->audio_preview_file = NULL;
- #endif
-+#endif /* USE_GST_AUDIO_PREVIEW */
- 	return FALSE;
- }
- 
-@@ -1921,7 +1975,22 @@
- 
- static void
- preview_audio (FMIconView *icon_view, NautilusFile *file, gboolean start_flag)
--{		
-+{
-+#ifdef USE_GST_AUDIO_PREVIEW
-+	if (thread != NULL) {
-+		gst_element_set_state (GST_ELEMENT (thread), GST_STATE_NULL);
-+	}
-+
-+	if (icon_view->details->audio_preview_timeout != 0) {
-+		g_source_remove (icon_view->details->audio_preview_timeout);
-+		icon_view->details->audio_preview_timeout = 0;
-+	}
-+
-+	if (start_flag) {
-+		icon_view->details->audio_preview_file = file;
-+		icon_view->details->audio_preview_timeout = g_timeout_add (1000, play_file, icon_view);
-+	}
-+#else
- 	/* Stop current audio playback */
- #if USE_OLD_AUDIO_PREVIEW
- 	nautilus_sound_kill_sound ();
-@@ -1946,15 +2015,18 @@
- 		icon_view->details->audio_preview_timeout = g_timeout_add (1000, play_file, icon_view);
- #endif
- 	}
-+#endif /* USE_GST_AUDIO_PREVIEW */
- }
- 
- static gboolean
- should_preview_sound (NautilusFile *file)
- {
-+#ifndef USE_GST_AUDIO_PREVIEW
- 	/* Check gnome config sound preference */
- 	if (!gnome_esd_enabled_auto_value) {
- 		return FALSE;
- 	}
-+#endif /* USE_GST_AUDIO_PREVIEW */
- 
- 	/* Check user performance preference */	
- 	if (preview_sound_auto_value == NAUTILUS_SPEED_TRADEOFF_NEVER) {
-@@ -1985,11 +2057,21 @@
- 		mime_type = nautilus_file_get_mime_type (file);
- 
- 		if ((eel_istr_has_prefix (mime_type, "audio/")
-+#ifdef USE_GST_AUDIO_PREVIEW
-+		     || eel_istr_has_prefix (mime_type, "application/ogg")
-+		     || eel_istr_has_prefix (mime_type, "application/x-ogg")
-+		     || eel_istr_has_prefix (mime_type, "application/flac")
-+		     || eel_istr_has_prefix (mime_type, "application/x-flac"))
-+		    && eel_strcasecmp (mime_type, "audio/x-pn-realaudio") != 0
-+		    && eel_strcasecmp (mime_type, "audio/x-mpegurl") != 0
-+			) {
-+#else
- 		     || eel_istr_has_prefix (mime_type, "application/ogg")
- 		     || eel_istr_has_prefix (mime_type, "application/x-ogg"))
- 		    && eel_strcasecmp (mime_type, "audio/x-pn-realaudio") != 0
- 		    && eel_strcasecmp (mime_type, "audio/x-mpegurl") != 0
- 		    && nautilus_sound_can_play_sound ()) {
-+#endif
- 			result = 1;
- 			preview_audio (icon_view, file, start_flag);
- 		}	
diff --git a/gnome-base/nautilus/nautilus-2.10.0.ebuild b/gnome-base/nautilus/nautilus-2.10.0.ebuild
index cd6e9b022230..9d85d790c7a3 100644
--- a/gnome-base/nautilus/nautilus-2.10.0.ebuild
+++ b/gnome-base/nautilus/nautilus-2.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.10.0.ebuild,v 1.20 2005/07/12 00:00:11 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.10.0.ebuild,v 1.21 2005/07/12 12:39:57 leonardop Exp $
 
 inherit gnome2 eutils
 
@@ -38,6 +38,7 @@ RDEPEND=">=dev-libs/glib-2.6
 	gstreamer? (
 		>=media-libs/gstreamer-0.8
 		>=media-libs/gst-plugins-0.8
+		>=media-plugins/gst-plugins-gnomevfs-0.8
 		mad? ( >=media-plugins/gst-plugins-mad-0.8 )
 		oggvorbis? (
 			>=media-plugins/gst-plugins-ogg-0.8
@@ -82,17 +83,9 @@ src_unpack() {
 #		fi
 #	fi
 
-
-	#applied in 2.9.91
-	# patch to support libexif versions 0.5 and 0.6
-	#epatch ${FILESDIR}/${PN}-2.9.90-libexif.patch
-
 	# stop nautilus linking to cdda/paranoia
 	sed -i -e "/^CORE_LIBS/s/\$CDDA_LIBS//" configure.in
 
-	# and we always need to regenerate now, because we
-	# always apply the libexif patch <obz@gentoo.org>
-
 	if use gstreamer; then
 	WANT_AUTOCONF=2.5 autoheader || die
 	WANT_AUTOCONF=2.5 autoconf || die
diff --git a/gnome-base/nautilus/nautilus-2.10.1.ebuild b/gnome-base/nautilus/nautilus-2.10.1.ebuild
index 62b718ab3651..76b61bced647 100644
--- a/gnome-base/nautilus/nautilus-2.10.1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.10.1.ebuild,v 1.8 2005/07/12 00:00:11 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.10.1.ebuild,v 1.9 2005/07/12 12:39:57 leonardop Exp $
 
 inherit gnome2 eutils
 
@@ -11,7 +11,7 @@ LICENSE="GPL-2 LGPL-2 FDL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="oggvorbis gstreamer mad flac"
-#IUSE="oggvorbis gstreamer cups mad flac"
+# cups
 
 RDEPEND=">=dev-libs/glib-2.6
 	>=x11-libs/pango-1.2
@@ -37,6 +37,7 @@ RDEPEND=">=dev-libs/glib-2.6
 	gstreamer? (
 		>=media-libs/gstreamer-0.8
 		>=media-libs/gst-plugins-0.8
+		>=media-plugins/gst-plugins-gnomevfs-0.8
 		mad? ( >=media-plugins/gst-plugins-mad-0.8 )
 		oggvorbis? (
 			>=media-plugins/gst-plugins-ogg-0.8
@@ -84,9 +85,6 @@ src_unpack() {
 	# stop nautilus linking to cdda/paranoia
 	sed -i -e "/^CORE_LIBS/s/\$CDDA_LIBS//" configure.in
 
-	# and we always need to regenerate now, because we
-	# always apply the libexif patch <obz@gentoo.org>
-
 	if use gstreamer; then
 	WANT_AUTOCONF=2.5 autoheader || die
 	WANT_AUTOCONF=2.5 autoconf || die
diff --git a/gnome-base/nautilus/nautilus-2.8.2-r1.ebuild b/gnome-base/nautilus/nautilus-2.8.2-r1.ebuild
deleted file mode 100644
index 1088bc0fb424..000000000000
--- a/gnome-base/nautilus/nautilus-2.8.2-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.8.2-r1.ebuild,v 1.13 2005/07/07 05:07:29 vapier Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="A filemanager for the Gnome2 desktop"
-HOMEPAGE="http://www.gnome.org/projects/nautilus/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc sparc x86"
-IUSE="oggvorbis cups gstreamer mad flac"
-
-RDEPEND=">=dev-libs/glib-2.3
-	>=x11-libs/pango-1.2
-	>=x11-libs/gtk+-2.3
-	>=dev-libs/libxml2-2.4.7
-	=gnome-base/eel-${PV}*
-	>=gnome-base/gnome-vfs-2.5.1
-	>=media-sound/esound-0.2.27
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnome-2.6
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/gnome-desktop-2.2
-	>=media-libs/libart_lgpl-2.3.10
-	>=gnome-base/libbonobo-2.2
-	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/librsvg-2.0.1
-	>=gnome-base/orbit-2.4
-	>=x11-libs/startup-notification-0.5
-	dev-libs/popt
-	virtual/fam
-	virtual/eject
-	cups? ( net-print/libgnomecups
-		net-print/gnome-cups-manager )
-	!gstreamer? ( oggvorbis? ( media-sound/vorbis-tools ) )
-	gstreamer? (
-		>=media-libs/gstreamer-0.8
-		>=media-libs/gst-plugins-0.8
-		mad? ( >=media-plugins/gst-plugins-mad-0.8 )
-		oggvorbis? (
-			>=media-plugins/gst-plugins-ogg-0.8
-			>=media-plugins/gst-plugins-vorbis-0.8
-		)
-		flac? (	>=media-plugins/gst-plugins-flac-0.8 )
-	)"
-
-# FIXME : what to do with exif/jpeg config stuff ?
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.29
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.12.0"
-
-PDEPEND=">=x11-themes/gnome-icon-theme-1.1.91
-	x11-themes/gnome-themes"
-
-DOCS="AUTHORS ChangeLo* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-G2CONF="${G2CONF} $(use_enable gstreamer)"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	# use gstreamer for audio preview (patch by <foser@gentoo.org>)
-	use gstreamer && epatch ${FILESDIR}/${PN}-2.6-icon_view_gst_audio_preview.patch
-	# add libgnomeprint support
-	# With extra 2.8 fun - fixes #65604
-	if use cups; then
-		if has_version ">=net-print/gnome-cups-manager-0.28"; then
-			epatch ${FILESDIR}/${PN}-2.8-x-printers.patch
-		else
-			epatch ${FILESDIR}/${PN}-2-x-printers.patch
-		fi
-	fi
-
-	# patch to support libexif versions 0.5 and 0.6
-	epatch ${FILESDIR}/${PN}-2-libexif.patch
-
-	# stop nautilus linking to cdda/paranoia
-	epatch ${FILESDIR}/${PN}-2-nocdda.patch
-
-	# and we always need to regenerate now, because we
-	# always apply the libexif patch <obz@gentoo.org>
-	WANT_AUTOCONF=2.5 autoheader || die
-	WANT_AUTOCONF=2.5 autoconf || die
-	WANT_AUTOMAKE=1.4 automake || die
-
-}
-
-pkg_postinst() {
-
-	gnome2_pkg_postinst
-
-	einfo "Nautilus moved to a new spatial browsing model."
-	einfo "If you are unhappy with this behaviour you can revert to the"
-	einfo "old browerslike behaviour by issueing the following command :"
-	einfo "gconftool-2  -s /apps/nautilus/preferences/always_use_browser -t bool TRUE"
-
-}