gnome-2.10 release

Package-Manager: portage-2.0.51.19

9 files changed, 429 insertions, 22 deletions

diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog
index cb51b0c65420..dc1738c99290 100644
--- a/gnome-base/gnome-desktop/ChangeLog
+++ b/gnome-base/gnome-desktop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-desktop
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.85 2005/02/17 06:48:10 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.86 2005/03/09 04:28:56 joem Exp $
+
+*gnome-desktop-2.10.0 (08 Mar 2005)
+
+  08 Mar 2005; Joe McCann <joem@gentoo.org> +gnome-desktop-2.10.0.ebuild:
+  gnome-2.10 release
 
 *gnome-desktop-2.8.3 (17 Feb 2005)
 
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index d1766316d3f0..684148dcb2ba 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,10 +1,12 @@
+MD5 f973095459cdf54123946fda8d37e71d ChangeLog 10554
 MD5 6e2b0e6752ef3ae228e26ea1f24932cb gnome-desktop-2.6.2.ebuild 1235
-MD5 b60c8253f07c2441c916dfabffc9860f gnome-desktop-2.8.3.ebuild 1154
 MD5 fcd15a8c9bcfb65517eb2164a78b5bac gnome-desktop-2.8.0.ebuild 1238
-MD5 f973095459cdf54123946fda8d37e71d ChangeLog 10554
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 cb3cbd85c90f04922be4d29206e4d2f9 gnome-desktop-2.8.1.ebuild 1226
+MD5 b60c8253f07c2441c916dfabffc9860f gnome-desktop-2.8.3.ebuild 1154
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 661d14f458b120d15303c839277fb3f0 gnome-desktop-2.10.0.ebuild 1059
 MD5 7da730c589038e00931bb8894d5a9054 files/digest-gnome-desktop-2.6.2 73
 MD5 d2aa408f8ca1d7a5a752c31886b97213 files/digest-gnome-desktop-2.8.0 73
 MD5 39610cc4df959402bbc9a7426eb94566 files/digest-gnome-desktop-2.8.1 73
 MD5 6c5c7db8959b2137a1cc8c5522472243 files/digest-gnome-desktop-2.8.3 73
+MD5 79c8cb7777a1a9aaee6cf55091178161 files/digest-gnome-desktop-2.10.0 74
diff --git a/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.10.0 b/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.10.0
new file mode 100644
index 000000000000..374ebf54e2ca
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.10.0
@@ -0,0 +1 @@
+MD5 62edee01c309cb1b049ceaa801d415cc gnome-desktop-2.10.0.tar.bz2 1102509
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.10.0.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.10.0.ebuild
new file mode 100644
index 000000000000..79af97cb3fe5
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.10.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.10.0.ebuild,v 1.1 2005/03/09 04:28:56 joem Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Libraries for the gnome desktop that is not part of the UI"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.1.2
+	>=dev-libs/glib-2.6
+	>=gnome-base/libgnomeui-2.1
+	>=gnome-base/libgnomecanvas-2
+	>=gnome-base/gnome-vfs-2
+	>=x11-libs/startup-notification-0.5
+	!gnome-base/gnome-core"
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	sys-devel/gettext
+	>=dev-util/intltool-0.29
+	>=dev-util/pkgconfig-0.12.0"
+
+DOCS="AUTHORS ChangeLog README NEWS HACKING"
+
+G2CONF="$G2CONF --with-gnome-distributor=Gentoo"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	# Fix bug 16853 by building gnome-about with IEEE to prevent
+	# floating point exceptions on alpha
+	if use alpha; then
+		sed -i '/^CFLAGS/s/$/ -mieee/' ${S}/gnome-about/Makefile.in \
+		|| die "sed failed (2)"
+	fi
+
+}
+USE_DESTDIR="1"
diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 307483063c2c..0462883f4ef1 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.122 2005/01/20 09:39:28 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.123 2005/03/09 04:33:13 joem Exp $
+
+*nautilus-2.10.0 (08 Mar 2005)
+
+  08 Mar 2005; Joe McCann <joem@gentoo.org>
+  +files/nautilus-2.9.90-icon_view_gst.patch, +nautilus-2.10.0.ebuild:
+  gnome-2.10 release
 
   20 Jan 2005; Mike Gardiner <obz@gentoo.org>
   +files/nautilus-2.8-x-printers.patch, nautilus-2.8.2-r1.ebuild:
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 6f5fb534ce99..f782a5ca399c 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,33 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 e03f75e77593aec5d89be7e162c6d889 ChangeLog 16255
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 e68e229bdcaa2b24d9542da53d7ee66a nautilus-1.0.6-r9.ebuild 3394
-MD5 403b0fb7191c89ba4101948e0c11f150 nautilus-2.8.2.ebuild 2678
 MD5 1f21f286a67d2d669f180312d22f76fc nautilus-2.6.3.ebuild 2732
-MD5 2d14c0fa0ac3042b8c6ae1bf5082b139 nautilus-2.8.2-r1.ebuild 2930
 MD5 df950888f88f804470320cb6b6c32aa5 nautilus-2.8.0.ebuild 2683
+MD5 2d14c0fa0ac3042b8c6ae1bf5082b139 nautilus-2.8.2-r1.ebuild 2930
+MD5 403b0fb7191c89ba4101948e0c11f150 nautilus-2.8.2.ebuild 2678
+MD5 2ebf140f3d2087d7a5ce32f126034666 nautilus-2.10.0.ebuild 3012
 MD5 3db7f854e279f4032b8d1e86d64157aa files/digest-nautilus-1.0.6-r9 68
+MD5 eacb36058242d4b79c6b36a12133823b files/digest-nautilus-2.6.3 68
+MD5 ba6864f5fd16f269567214a308a87a5d files/digest-nautilus-2.8.0 68
 MD5 bc1e45c9ea8c180c0051d226af000364 files/digest-nautilus-2.8.2 68
+MD5 bc1e45c9ea8c180c0051d226af000364 files/digest-nautilus-2.8.2-r1 68
 MD5 4c62404b0162ab39572cb522fed222c4 files/nautilus-1.0.6-hyperbola.diff 1632
 MD5 47ad4a802bbd17967708599cda1b7aaf files/nautilus-1.0.6-mozilla-1.0_rc1.diff 920
 MD5 d7ad0d83dbafefa25a34a50e2ee34806 files/nautilus-1.0.6-mozilla-1.0_rc3.diff 1709
 MD5 ddc1abbf275436c7fa5fd5c04a27cc94 files/nautilus-1.0.6-mozilla-embed-1.0_rc3.diff 526
-MD5 bc1e45c9ea8c180c0051d226af000364 files/digest-nautilus-2.8.2-r1 68
+MD5 17a27d5da6fc0545c43731d5ca7c37cd files/nautilus-2-libexif.patch 2320
 MD5 e5290667a362d69a787cf1b6308674bd files/nautilus-2-nocdda.patch 640
-MD5 e59f42d528ba156ebff5be711d19c97c files/nautilus-2.8-x-printers.patch 39945
 MD5 b6616981e10e2a9725840198f3b29d15 files/nautilus-2-x-printers.patch 39941
 MD5 4970e67a919b0043dcd12623014a9aac files/nautilus-2.6-icon_view_gst_audio_preview.patch 8284
-MD5 eacb36058242d4b79c6b36a12133823b files/digest-nautilus-2.6.3 68
-MD5 ba6864f5fd16f269567214a308a87a5d files/digest-nautilus-2.8.0 68
-MD5 17a27d5da6fc0545c43731d5ca7c37cd files/nautilus-2-libexif.patch 2320
+MD5 e59f42d528ba156ebff5be711d19c97c files/nautilus-2.8-x-printers.patch 39945
+MD5 d3f1a79cced5768f96e22c17df92261b files/digest-nautilus-2.10.0 69
 MD5 7cb2f285f24e86a90c6a65b0b9356d39 files/macros/gnome.m4 16426
 MD5 486b971d706aec59655a72282d3feb0b files/macros/nautilus-macros.m4 7993
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.14 (GNU/Linux)
-
-iD8DBQFB8fYRroRuSHgZdywRAoZTAJ4v18I9+yK8j2gYikd5uG9/7rMzfQCeNIzC
-vhUNdlJWa1n57lhOXCj4qDs=
-=4NGO
------END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.10.0 b/gnome-base/nautilus/files/digest-nautilus-2.10.0
new file mode 100644
index 000000000000..d425fe86c341
--- /dev/null
+++ b/gnome-base/nautilus/files/digest-nautilus-2.10.0
@@ -0,0 +1 @@
+MD5 b29a02be8733a82e002179e2e0f3fe83 nautilus-2.10.0.tar.bz2 5899170
diff --git a/gnome-base/nautilus/files/nautilus-2.9.90-icon_view_gst.patch b/gnome-base/nautilus/files/nautilus-2.9.90-icon_view_gst.patch
new file mode 100644
index 000000000000..43017e6c0d97
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.9.90-icon_view_gst.patch
@@ -0,0 +1,240 @@
+diff -ur nautilus-2.9.90/configure.in nautilus-2.9.90-patched/configure.in
+--- nautilus-2.9.90/configure.in	2005-01-25 22:57:34.000000000 +0800
++++ nautilus-2.9.90-patched/configure.in	2005-02-03 19:35:49.240088040 +0800
+@@ -19,6 +19,7 @@
+ m4_define(xml_minver,                  2.4.7)
+ m4_define(startup_notification_minver, 0.5)
+ m4_define(exif_minver,                 0.5.12)
++m4_define(gstreamer_minver,			   0.6.0)
+ 
+ AC_INIT(nautilus, 2.9.90,
+         [http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus])
+@@ -48,6 +49,7 @@
+ AC_SUBST(RSVG_REQUIRED, [rsvg_minver])
+ AC_SUBST(XML_REQUIRED, [xml_minver])
+ AC_SUBST(STARTUP_NOTIFICATION_REQUIRED, [startup_notification_minver])
++AC_SUBST(GSTREAMER_REQUIRED, [gstreamer_minver])
+ 
+ 
+ AC_C_BIGENDIAN
+@@ -260,6 +262,53 @@
+ 	AC_MSG_RESULT(no)
+ fi
+ 
++ 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 gimphwrapbox
+@@ -285,7 +334,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 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES"
++CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-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 -ur nautilus-2.9.90/src/file-manager/fm-icon-view.c nautilus-2.9.90-patched/src/file-manager/fm-icon-view.c
+--- nautilus-2.9.90/src/file-manager/fm-icon-view.c	2005-01-17 17:05:03.000000000 +0800
++++ nautilus-2.9.90-patched/src/file-manager/fm-icon-view.c	2005-02-03 19:36:04.634747696 +0800
+@@ -79,8 +79,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
+ 
+ #define POPUP_PATH_ICON_APPEARANCE		"/selection/Icon Appearance Items"
+ 
+@@ -168,6 +173,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);
+@@ -1682,6 +1691,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. */
+@@ -1689,6 +1714,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;
+@@ -1813,6 +1866,7 @@
+ 	icon_view->details->audio_preview_timeout = 0;
+ 	icon_view->details->audio_preview_file = NULL;
+ #endif
++#endif /* End USE_GST_AUDIO_PREVIEW */
+ 	return FALSE;
+ }
+ 
+@@ -1827,6 +1881,21 @@
+ 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 ();
+@@ -1851,15 +1920,18 @@
+ 		icon_view->details->audio_preview_timeout = g_timeout_add (1000, play_file, icon_view);
+ #endif
+ 	}
++#endif /* End 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) {
+@@ -1890,11 +1962,22 @@
+ 		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
new file mode 100644
index 000000000000..e7ad72b0fbd6
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-2.10.0.ebuild
@@ -0,0 +1,114 @@
+# 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.1 2005/03/09 04:33:13 joem 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="~x86 ~ppc"
+IUSE="oggvorbis gstreamer mad flac"
+#IUSE="oggvorbis gstreamer cups mad flac"
+
+RDEPEND=">=dev-libs/glib-2.6
+	>=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.9.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.9.91
+	>=media-libs/libart_lgpl-2.3.10
+	>=gnome-base/libbonobo-2.2
+	>=gnome-base/librsvg-2.0.1
+	>=gnome-base/orbit-2.4
+	>=x11-libs/startup-notification-0.5
+	>=media-libs/libexif-0.5.12
+	dev-libs/popt
+	virtual/fam
+	sys-apps/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.9.90-icon_view_gst.patch
+
+	# -- Component architecture has changed in 2.9 -- this 
+# -- patch no longer applies.
+
+	# 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
+
+
+	#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
+	WANT_AUTOMAKE=1.7 automake || die
+	fi
+}
+
+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"
+
+}
+USE_DESTDIR="1"