5 files changed, 8 insertions, 72 deletions
diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index f093aa0121ee..ce02c90e7562 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,9 @@
 # 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.68 2003/12/13 19:54:04 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.69 2003/12/15 23:13:32 spider Exp $
+
+  16 Dec 2003; <spider@gentoo.org> nautilus-2.4.1-r2.ebuild:
+  KEYWORDS="x86", motivated by the fix of a bad crasher bug on file management
 
 *nautilus-2.4.1-r2 (13 Dec 2003)
 
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index cb82fc853f52..71e1bd50f1c4 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,10 +1,9 @@
-MD5 f8419b08f76edf76607d9c9ef337eb06 ChangeLog 10136
+MD5 720a807f93b5f8f834a961f482a25a82 ChangeLog 10277
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 cae5c71ff02a8e3a6a125d25f4a1f9ed nautilus-1.0.6-r9.ebuild 3516
-MD5 f2b63cf6a665984079188c51b64d597b nautilus-2.4.1-r2.ebuild 1960
+MD5 5e93427bcf9a99f9a12222c5a7d2ee2d nautilus-2.4.1-r2.ebuild 1959
 MD5 559d579e057b4f9d2892cb76ce5a2c68 nautilus-2.4.0.ebuild 1673
 MD5 d386ddd18a960e36e9184856886ee582 nautilus-2.4.1.ebuild 1949
-MD5 d443adfa1b1bfc4f538e9fe862e1cf43 nautilus-2.4.1-r1.ebuild 1849
 MD5 4c62404b0162ab39572cb522fed222c4 files/nautilus-1.0.6-hyperbola.diff 1632
 MD5 3db7f854e279f4032b8d1e86d64157aa files/digest-nautilus-1.0.6-r9 68
 MD5 edea17bb51bbdc0ffbeb076961b25b21 files/digest-nautilus-2.4.1-r2 68
@@ -20,7 +19,6 @@ MD5 b6616981e10e2a9725840198f3b29d15 files/nautilus-2-x-printers.patch 39941
 MD5 4792b2819e2384304f5a63008db5b9f6 files/nautilus-2-icon_view_gst_audio_preview.patch 8305
 MD5 94955c8317b2f5742603a9dd1d656ed3 files/nautilus-2.2-double_menu_entry_fix.patch 1322
 MD5 65769439a2d335132210b34a49905531 files/nautilus-2.4-startup-bonobo.patch 677
-MD5 edea17bb51bbdc0ffbeb076961b25b21 files/digest-nautilus-2.4.1-r1 68
 MD5 63d8d3d2f44b839065888ee8338f5f46 files/nautilus-2-disable-cdda.patch 314
 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.4.1-r1 b/gnome-base/nautilus/files/digest-nautilus-2.4.1-r1
deleted file mode 100644
index c2162f2ee0ae..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-2.4.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3e01d69809c4e6bb302c81075ed0be1e nautilus-2.4.1.tar.bz2 5573224
diff --git a/gnome-base/nautilus/nautilus-2.4.1-r1.ebuild b/gnome-base/nautilus/nautilus-2.4.1-r1.ebuild
deleted file mode 100644
index 416319e3e4b7..000000000000
--- a/gnome-base/nautilus/nautilus-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,64 +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.4.1-r1.ebuild,v 1.2 2003/12/07 23:40:37 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
-	>=gnome-base/eel-${PV}
-	>=dev-libs/libxml2-2.4.7
-	>=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
-	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}
-	# Fix a cdda linking error. (it silently links to cdda)
-	epatch ${FILESDIR}/${PN}-2-disable-cdda.patch
-
-	# 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
-
-}
diff --git a/gnome-base/nautilus/nautilus-2.4.1-r2.ebuild b/gnome-base/nautilus/nautilus-2.4.1-r2.ebuild
index a63462a5e56f..6b83c47ecc5f 100644
--- a/gnome-base/nautilus/nautilus-2.4.1-r2.ebuild
+++ b/gnome-base/nautilus/nautilus-2.4.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.1 2003/12/13 19:54:04 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.4.1-r2.ebuild,v 1.2 2003/12/15 23:13:32 spider Exp $
 
 inherit gnome2
 
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
 IUSE="oggvorbis cups gstreamer"
 
 RDEPEND=">=dev-libs/glib-2