Added patch from bug #72294 to disable the hidden cdparanoia linking

5 files changed, 129 insertions, 1 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 1d31eb6d80fa..4d500f89fe91 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.112 2004/11/25 11:46:16 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.113 2004/11/30 09:13:38 obz Exp $
+
+*nautilus-2.8.2-r1 (30 Nov 2004)
+
+  30 Nov 2004; Mike Gardiner <obz@gentoo.org>
+  +files/nautilus-2-nocdda.patch, +nautilus-2.8.2-r1.ebuild:
+  Added patch from bug #72294 to disable the hidden cdparanoia linking
 
 *nautilus-2.8.2 (25 Nov 2004)
 
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index a859a0455c49..05d2d162aee0 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,11 +1,15 @@
 MD5 6221323eec446b07aa21332a5ace34ec nautilus-2.8.2.ebuild 2675
 MD5 77e8c0a2b6f070b9685d6a3306f5512b nautilus-1.0.6-r9.ebuild 3393
 MD5 02d5c43bef26ae8797e93bb4a2def060 nautilus-2.6.3.ebuild 2731
+MD5 910b9432d50e769e91210b8d05511367 nautilus-2.8.2-r1.ebuild 2659
+MD5 733658f1c2f4a36cc622e3de5e2b4e9e .nautilus-2.8.2-r1.ebuild.swp 12288
 MD5 bac3dc7b259225af5e65d52566ad622f ChangeLog 15081
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 ba0e27027635430553e977b8e877ed17 nautilus-2.8.0.ebuild 2682
 MD5 b6616981e10e2a9725840198f3b29d15 files/nautilus-2-x-printers.patch 39941
 MD5 4970e67a919b0043dcd12623014a9aac files/nautilus-2.6-icon_view_gst_audio_preview.patch 8284
+MD5 bc1e45c9ea8c180c0051d226af000364 files/digest-nautilus-2.8.2-r1 68
+MD5 e5290667a362d69a787cf1b6308674bd files/nautilus-2-nocdda.patch 640
 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
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.8.2-r1 b/gnome-base/nautilus/files/digest-nautilus-2.8.2-r1
new file mode 100644
index 000000000000..33918b6c2a36
--- /dev/null
+++ b/gnome-base/nautilus/files/digest-nautilus-2.8.2-r1
@@ -0,0 +1 @@
+MD5 d5fdec9acc37181016e8424e96d663b8 nautilus-2.8.2.tar.bz2 5808170
diff --git a/gnome-base/nautilus/files/nautilus-2-nocdda.patch b/gnome-base/nautilus/files/nautilus-2-nocdda.patch
new file mode 100644
index 000000000000..298c2a422055
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2-nocdda.patch
@@ -0,0 +1,20 @@
+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/nautilus-2.8.2-r1.ebuild b/gnome-base/nautilus/nautilus-2.8.2-r1.ebuild
new file mode 100644
index 000000000000..8152809ef9d3
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-2.8.2-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2004 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.1 2004/11/30 09:13:39 obz 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 ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips ~arm"
+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
+	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.6-icon_view_gst_audio_preview.patch
+	# add libgnomeprint support
+	use cups && epatch ${FILESDIR}/${PN}-2-x-printers.patch
+
+	# 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"
+
+}