New version with a cdda fix to make it stop the random and unannounced linking to cdparanoia

4 files changed, 77 insertions, 1 deletions

diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index a1e2019a1c6b..3a50751fb677 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -6,7 +6,7 @@ MD5 5914423f4dcac1754f14edac047dd270 nautilus-2.2.3.ebuild 1298
 MD5 84e67b452e5ca30aa47d26ef3a7f9d93 nautilus-2.2.4.ebuild 1355
 MD5 8b404417ab09d30d15a6a8335545e8be nautilus-2.4.0.ebuild 1680
 MD5 593a222ca4346685482428cd9d19007a nautilus-2.4.1.ebuild 1954
-MD5 dc1585a0d21ce3984eb14474dc49ab85 nautilus-2.4.1-r1.ebuild 1851
+MD5 ec9fe4ff52f796fa87102d9407f10c21 nautilus-2.4.1-r1.ebuild 1854
 MD5 4c62404b0162ab39572cb522fed222c4 files/nautilus-1.0.6-hyperbola.diff 1632
 MD5 3db7f854e279f4032b8d1e86d64157aa files/digest-nautilus-1.0.6-r9 68
 MD5 0a040bda22d0a905a2d15c9c4df69b09 files/digest-nautilus-2.2.1 68
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.4.1-r1 b/gnome-base/nautilus/files/digest-nautilus-2.4.1-r1
new file mode 100644
index 000000000000..c2162f2ee0ae
--- /dev/null
+++ b/gnome-base/nautilus/files/digest-nautilus-2.4.1-r1
@@ -0,0 +1 @@
+MD5 3e01d69809c4e6bb302c81075ed0be1e nautilus-2.4.1.tar.bz2 5573224
diff --git a/gnome-base/nautilus/files/nautilus-2-disable-cdda.patch b/gnome-base/nautilus/files/nautilus-2-disable-cdda.patch
new file mode 100644
index 000000000000..b98ac29b4845
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2-disable-cdda.patch
@@ -0,0 +1,11 @@
+--- configure.in.old	2003-11-16 16:38:53.000000000 +0100
++++ configure.in	2003-11-16 16:39:10.000000000 +0100
+@@ -198,6 +198,8 @@
+ 	AM_CONDITIONAL(HAVE_CDDA, true)
+ 	])
+ 
++AM_CONDITIONAL(HAVE_CDDA, false)
++	
+ dnl ==========================================================================
+ 
+ dnl jw (for doc build)
diff --git a/gnome-base/nautilus/nautilus-2.4.1-r1.ebuild b/gnome-base/nautilus/nautilus-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..cdeb0de2867c
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-2.4.1-r1.ebuild
@@ -0,0 +1,64 @@
+# 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.1 2003/11/16 16:00:00 spider 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-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}
+	# 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
+
+}