new release, cleanup

9 files changed, 339 insertions, 124 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 4fbd82d7890d..ddb5fb2cc3db 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.61 2003/10/17 13:27:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.62 2003/10/21 18:54:18 foser Exp $
+
+*nautilus-2.4.1 (21 Oct 2003)
+
+  21 Oct 2003; foser <foser@gentoo.org> nautilus-2.4.0.ebuild :
+  New version, fix automake stuff for cups
+  Add patch to support audio preview via gst (by <foser@gentoo.org>)
 
   17 Oct 2003; Aron Griffis <agriffis@gentoo.org> nautilus-2.4.0.ebuild:
   Stable on alpha
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index b101d8eb18f1..a8e5e5d8c6bb 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,28 +1,27 @@
 MD5 c24819bc79e3cf5920bc6359fd82bc32 nautilus-2.2.1.ebuild 1689
+MD5 e671b9d62fdb33d2e7f2d5546d48c141 nautilus-1.0.6-r9.ebuild 3523
+MD5 5914423f4dcac1754f14edac047dd270 nautilus-2.2.3.ebuild 1298
+MD5 257a1175282ed3810d367b24ba390d7f nautilus-2.4.1.ebuild 1970
+MD5 84e67b452e5ca30aa47d26ef3a7f9d93 nautilus-2.2.4.ebuild 1355
+MD5 84f30f7f888e4f81fa829ca973858aeb ChangeLog 9351
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 631c4b8db10bb9172a1d7a1472247225 nautilus-2.4.0.ebuild 1677
 MD5 dbfcca25a47c67d13020371a1acbff7a files/nautilus-2-thumbnail_max_size.patch 1444
 MD5 b6616981e10e2a9725840198f3b29d15 files/nautilus-2-x-printers.patch 39941
+MD5 4792b2819e2384304f5a63008db5b9f6 files/nautilus-2-icon_view_gst_audio_preview.patch 8305
 MD5 65769439a2d335132210b34a49905531 files/nautilus-2.4-startup-bonobo.patch 677
-MD5 6e4f0293f123c4fc7acf8e4d17e39990 files/digest-nautilus-2.2.4-r5 68
 MD5 3a7c7847c496aaa4230e7191aeb39c9a files/nautilus-2-snap_to_grid-r1.patch 37548
 MD5 4c62404b0162ab39572cb522fed222c4 files/nautilus-1.0.6-hyperbola.diff 1632
 MD5 47ad4a802bbd17967708599cda1b7aaf files/nautilus-1.0.6-mozilla-1.0_rc1.diff 920
 MD5 3db7f854e279f4032b8d1e86d64157aa files/digest-nautilus-1.0.6-r9 68
 MD5 d7ad0d83dbafefa25a34a50e2ee34806 files/nautilus-1.0.6-mozilla-1.0_rc3.diff 1709
-MD5 7cb2f285f24e86a90c6a65b0b9356d39 files/macros/gnome.m4 16426
-MD5 486b971d706aec59655a72282d3feb0b files/macros/nautilus-macros.m4 7993
-MD5 e7d7ddd19f8953646a1634ebe3e60e26 files/digest-nautilus-2.0.7 68
 MD5 0a040bda22d0a905a2d15c9c4df69b09 files/digest-nautilus-2.2.1 68
 MD5 eb934f4bc6062d4b539e0b3dd9a0f98b files/digest-nautilus-2.2.3 68
 MD5 6e4f0293f123c4fc7acf8e4d17e39990 files/digest-nautilus-2.2.4 68
 MD5 323fc939bd6c4e4c2a4d55fe9de94bb2 files/digest-nautilus-2.4.0 68
+MD5 edea17bb51bbdc0ffbeb076961b25b21 files/digest-nautilus-2.4.1 68
 MD5 94955c8317b2f5742603a9dd1d656ed3 files/nautilus-2.2-double_menu_entry_fix.patch 1322
 MD5 0596a42317e21832ae5a4899b88348e3 files/nautilus-2.2.0.2-locale.patch 351
 MD5 ddc1abbf275436c7fa5fd5c04a27cc94 files/nautilus-1.0.6-mozilla-embed-1.0_rc3.diff 526
-MD5 a6aeb0d6265095fd3b10a75b90b1673b nautilus-2.0.7.ebuild 1549
-MD5 e671b9d62fdb33d2e7f2d5546d48c141 nautilus-1.0.6-r9.ebuild 3523
-MD5 5914423f4dcac1754f14edac047dd270 nautilus-2.2.3.ebuild 1298
-MD5 84e67b452e5ca30aa47d26ef3a7f9d93 nautilus-2.2.4.ebuild 1355
-MD5 b67acd1f6b380743783f7f376e68e648 ChangeLog 9146
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 a2b7b5e18819628371abb172530ff5c5 nautilus-2.2.4-r5.ebuild 1564
-MD5 631c4b8db10bb9172a1d7a1472247225 nautilus-2.4.0.ebuild 1677
+MD5 7cb2f285f24e86a90c6a65b0b9356d39 files/macros/gnome.m4 16426
+MD5 486b971d706aec59655a72282d3feb0b files/macros/nautilus-macros.m4 7993
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.0.7 b/gnome-base/nautilus/files/digest-nautilus-2.0.7
deleted file mode 100644
index c93cee4a9fb6..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-2.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e57430aafa33314b5df93e34de28c7dd nautilus-2.0.7.tar.bz2 4978890
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.2.4-r5 b/gnome-base/nautilus/files/digest-nautilus-2.2.4-r5
deleted file mode 100644
index 5e24233fdbc4..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-2.2.4-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cb189d8a53dca17e5345261bd819c421 nautilus-2.2.4.tar.bz2 4657953
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.4.1 b/gnome-base/nautilus/files/digest-nautilus-2.4.1
new file mode 100644
index 000000000000..c2162f2ee0ae
--- /dev/null
+++ b/gnome-base/nautilus/files/digest-nautilus-2.4.1
@@ -0,0 +1 @@
+MD5 3e01d69809c4e6bb302c81075ed0be1e nautilus-2.4.1.tar.bz2 5573224
diff --git a/gnome-base/nautilus/files/nautilus-2-icon_view_gst_audio_preview.patch b/gnome-base/nautilus/files/nautilus-2-icon_view_gst_audio_preview.patch
new file mode 100644
index 000000000000..01aeff93a0a6
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2-icon_view_gst_audio_preview.patch
@@ -0,0 +1,251 @@
+? .tm_project.cache
+? nautilus.prj
+? nautilus.pws
+Index: configure.in
+===================================================================
+RCS file: /cvs/gnome/nautilus/configure.in,v
+retrieving revision 1.540
+diff -u -r1.540 configure.in
+--- configure.in	22 Sep 2003 17:44:34 -0000	1.540
++++ configure.in	12 Oct 2003 13:50:52 -0000
+@@ -20,6 +20,7 @@
+ RSVG_REQUIRED=2.0.1
+ XML_REQUIRED=2.4.7
+ STARTUP_NOTIFICATION_REQUIRED=0.5
++GSTREAMER_REQUIRED=0.6.0
+ 
+ AC_SUBST(ART_REQUIRED)
+ AC_SUBST(BONOBO_ACTIVATION_REQUIRED)
+@@ -39,6 +40,7 @@
+ AC_SUBST(RSVG_REQUIRED)
+ AC_SUBST(XML_REQUIRED)
+ AC_SUBST(STARTUP_NOTIFICATION_REQUIRED)
++AC_SUBST(GSTREAMER_REQUIRED)
+ 
+ dnl ===========================================================================
+ 
+@@ -245,6 +247,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.7
++	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,
+@@ -314,7 +363,7 @@
+ AC_SUBST(LIBNAUTILUS_IDL_INCLUDES)
+ 
+ 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"
+Index: src/file-manager/fm-icon-view.c
+===================================================================
+RCS file: /cvs/gnome/nautilus/src/file-manager/fm-icon-view.c,v
+retrieving revision 1.287
+diff -u -r1.287 fm-icon-view.c
+--- src/file-manager/fm-icon-view.c	30 Sep 2003 20:38:00 -0000	1.287
++++ src/file-manager/fm-icon-view.c	12 Oct 2003 13:50:56 -0000
+@@ -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"
+@@ -195,6 +200,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);
+@@ -1741,6 +1750,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. */
+@@ -1748,6 +1773,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;
+@@ -1865,6 +1918,7 @@
+ 	icon_view->details->audio_preview_timeout = 0;
+ 	icon_view->details->audio_preview_file = NULL;
+ #endif
++#endif /* USE_GST_AUDIO_PREVIEW */
+ 	return FALSE;
+ }
+ 
+@@ -1878,7 +1932,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 ();
+@@ -1903,15 +1972,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) {
+@@ -1942,10 +2014,18 @@
+ 		mime_type = nautilus_file_get_mime_type (file);
+ 
+ 		if ((eel_istr_has_prefix (mime_type, "audio/")
+-		     || eel_istr_has_prefix (mime_type, "application/x-ogg"))
++#ifdef USE_GST_AUDIO_PREVIEW
++		     || eel_istr_has_prefix (mime_type, "application/ogg")
++		     || 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
+-		    && nautilus_sound_can_play_sound ()) {
++			) {
++#else
++		     || eel_istr_has_prefix (mime_type, "application/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.0.7.ebuild b/gnome-base/nautilus/nautilus-2.0.7.ebuild
deleted file mode 100644
index 904a68e390f4..000000000000
--- a/gnome-base/nautilus/nautilus-2.0.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.0.7.ebuild,v 1.9 2003/09/12 20:04:27 liquidx Exp $
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A filemanager for the Gnome2 desktop"
-SRC_URI="mirror://gnome/2.0.2/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/projects/nautilus/"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1 FDL-1.1"
-KEYWORDS="x86 ppc sparc alpha"
-IUSE="oggvorbis"
-
-RDEPEND="app-admin/fam-oss
-	>=dev-libs/glib-2.0.6-r1
-	>=gnome-base/gconf-1.2.1
-	>=x11-libs/gtk+-2.0.6-r1
-	>=dev-libs/libxml2-2.4.24
-	>=gnome-base/gnome-vfs-2.0.4
-	>=media-sound/esound-0.2.29
-	>=gnome-base/eel-2.0.7
-	>=gnome-base/gail-0.17
-	>=gnome-base/libgnome-2.0.5
-	>=gnome-base/libgnomeui-2.0.5
-	>=gnome-base/gnome-desktop-2.0.8
-	>=media-libs/libart_lgpl-2.3.10
-	>=gnome-base/libbonobo-2.0.0
-	>=gnome-base/libbonoboui-2.0.3
-	>=gnome-base/libgnomecanvas-2.0.4
-	>=gnome-base/librsvg-2.0.1
-	>=app-text/scrollkeeper-0.3.11
-	>=gnome-extra/gnome-utils-2.0.5
-	sys-apps/eject
-	oggvorbis? ( media-sound/vorbis-tools )"
-
-DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.12.0"
-
-
-G2CONF="${G2CONF} --enable-platform-gnome-2 --enable-gdialog=yes"
-DOCS="AUTHORS COPYIN* ChangeLo* HACKING INSTALL MAINTAINERS NEWS README THANKS TODO"
-
-src_compile () {
-	# Also apply the "reverse deps" patch.
-	#
-	# http://bugzilla.gnome.org/show_bug.cgi?id=75635
-	ELTCONF="${ELTCONF} --reverse-deps"
-	gnome2_src_configure ${1}
-	make || die "compile dislikes me"
-}
-
diff --git a/gnome-base/nautilus/nautilus-2.2.4-r5.ebuild b/gnome-base/nautilus/nautilus-2.2.4-r5.ebuild
deleted file mode 100644
index f217060738f0..000000000000
--- a/gnome-base/nautilus/nautilus-2.2.4-r5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.2.4-r5.ebuild,v 1.8 2003/09/12 20:04:27 liquidx Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="A filemanager for the Gnome2 desktop"
-HOMEPAGE="http://www.gnome.org/projects/nautilus/"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
-IUSE="oggvorbis cups"
-
-RDEPEND="app-admin/fam-oss
-	>=dev-libs/glib-2
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.1.1
-	>=dev-libs/libxml2-2.4.7
-	>=gnome-base/gnome-vfs-2.1.5
-	>=media-sound/esound-0.2.27
-	>=gnome-base/eel-${PV}
-	>=gnome-base/gconf-1.2.1
-	>=gnome-base/libgnome-2.1.1
-	>=gnome-base/libgnomeui-2.1.1
-	>=gnome-base/gnome-desktop-2.1
-	>=media-libs/libart_lgpl-2.3.10
-	>=gnome-base/libbonobo-2.1
-	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/librsvg-2.0.1
-	>=gnome-base/ORBit2-2.4
-	sys-apps/eject
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-themes
-	oggvorbis? ( media-sound/vorbis-tools )
-	cups? ( net-print/libgnomecups
-		net-print/gnome-cups-manager )"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.12.0"
-
-G2CONF="${G2CONF} --enable-gdialog=yes"
-
-DOCS="AUTHORS COPYIN* ChangeLo* HACKING INSTALL MAINTAINERS NEWS README THANKS TODO"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-2-snap_to_grid-r1.patch
-	if [ `use cups` ]; then
-		epatch ${FILESDIR}/${PN}-2-x-printers.patch
-		WANT_AUTOCONF_2_5=1 autoconf || die
-		WANT_AUTOMAKE=1.4 automake || die
-	fi
-}
-
diff --git a/gnome-base/nautilus/nautilus-2.4.1.ebuild b/gnome-base/nautilus/nautilus-2.4.1.ebuild
new file mode 100644
index 000000000000..8ea1aeefbc1c
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-2.4.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.4.1.ebuild,v 1.1 2003/10/21 18:54:18 foser Exp $
+
+inherit gnome2
+
+DESCRIPTION="A filemanager for the Gnome2 desktop"
+HOMEPAGE="http://www.gnome.org/projects/nautilus/"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
+IUSE="oggvorbis cups gstreamer"
+
+RDEPEND=">=dev-libs/glib-2
+	>=x11-libs/pango-1.2
+	>=x11-libs/gtk+-2.2
+	>=dev-libs/libxml2-2.4.7
+	>=gnome-base/eel-${PV}
+	>=gnome-base/gnome-vfs-2.3.5
+	>=media-sound/esound-0.2.27
+	>=gnome-base/gconf-2.3
+	>=gnome-base/libgnome-2.2
+	>=gnome-base/libgnomeui-2.3.3
+	>=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/ORBit2-2.4
+	>=x11-libs/startup-notification-0.5
+	dev-libs/popt
+	app-admin/fam-oss
+	sys-apps/eject
+	!gstreamer? ( oggvorbis? ( media-sound/vorbis-tools ) )
+	cups? ( net-print/libgnomecups
+		net-print/gnome-cups-manager )
+	gstreamer? ( >=media-libs/gstreamer-0.6.3
+		>=media-libs/gst-plugins-0.6.3 )"
+
+DEPEND="${RDEPEND}
+	>=app-text/scrollkeeper-0.3.11
+	>=dev-util/pkgconfig-0.12.0"
+
+PDEPEND="x11-themes/gnome-icon-theme
+	x11-themes/gnome-themes"
+
+DOCS="AUTHORS COPYIN* ChangeLo* HACKING INSTALL 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-icon_view_gst_audio_preview.patch
+	# add libgnomeprint support
+	use cups && epatch ${FILESDIR}/${PN}-2-x-printers.patch
+
+	# regenerating only needed with patching
+	if [ `use cups` ] || [ `use gstreamer` ]; then
+		# nasteh
+		WANT_AUTOMAKE_2_5=1 autoheader-2.57 || die
+		WANT_AUTOCONF_2_5=1 autoconf || die
+		WANT_AUTOMAKE=1.4 automake || die
+	fi
+
+}