bug #566 fix and removal of old diffs

5 files changed, 93 insertions, 60 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index af7087d91e25..601d58bf4f08 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,13 +1,13 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.2 2002/03/07 06:27:56 blocke Exp $
 
-*nautilus-1.0.6-r2 (1 Feb 2002)
+*nautilus-1.0.6-r3 (7 Mar 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  7 Mar 2002; Bruce A. Locke <blocke@gentoo.org> nautilus-1.0.6-r3.ebuild :
+
+  Applied a patch from Mandrake brought to our attention by Naresh Donti
+  (ndonti@ndonti.dynodns.net).  A temporary patch to hyperbola to prevent
+  50+ zombie sh processes due to the fact we are not using a cvs version
+  of scrollkeeper.
   
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/gnome-base/nautilus/files/digest-nautilus-1.0.6-r3 b/gnome-base/nautilus/files/digest-nautilus-1.0.6-r3
new file mode 100644
index 000000000000..618f369df464
--- /dev/null
+++ b/gnome-base/nautilus/files/digest-nautilus-1.0.6-r3
@@ -0,0 +1 @@
+MD5 436283056c100bcbd14098a5342e2868 nautilus-1.0.6.tar.gz 11481232
diff --git a/gnome-base/nautilus/files/nautilus-1.0.4-mozilla-0.9.3.patch b/gnome-base/nautilus/files/nautilus-1.0.4-mozilla-0.9.3.patch
deleted file mode 100644
index cdd9b4ff0efd..000000000000
--- a/gnome-base/nautilus/files/nautilus-1.0.4-mozilla-0.9.3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nrc -x *~ nautilus-1.0.4.orig/components/mozilla/mozilla-events.cpp nautilus-1.0.4/components/mozilla/mozilla-events.cpp
-*** nautilus-1.0.4.orig/components/mozilla/mozilla-events.cpp	Tue Feb 27 04:38:53 2001
---- nautilus-1.0.4/components/mozilla/mozilla-events.cpp	Wed Aug  8 16:16:10 2001
-***************
-*** 60,65 ****
---- 60,66 ----
-  #include "nsIDocShellTreeOwner.h"
-  #include "nsIDocument.h"
-  #include "nsIContent.h"
-+ #include "nsIContentViewer.h"
-  #include "nsIDOMHTMLElement.h"
-  #include "nsIDOMHTMLAnchorElement.h"
-  #include "nsIDOMHTMLDocument.h"
-diff -Nrc -x *~ nautilus-1.0.4.orig/components/mozilla/nautilus-mozilla-embed-extensions.cpp nautilus-1.0.4/components/mozilla/nautilus-mozilla-embed-extensions.cpp
-*** nautilus-1.0.4.orig/components/mozilla/nautilus-mozilla-embed-extensions.cpp	Thu Feb 22 07:40:40 2001
---- nautilus-1.0.4/components/mozilla/nautilus-mozilla-embed-extensions.cpp	Wed Aug  8 16:15:37 2001
-***************
-*** 41,46 ****
---- 41,47 ----
-  #include "nsIMarkupDocumentViewer.h"
-  #include "nsICharsetConverterManager.h"
-  #include "nsICharsetConverterManager2.h"
-+ #include "nsIContentViewer.h"
-  #include <vector>
-  #include <string>
-  
diff --git a/gnome-base/nautilus/files/nautilus-1.0.4-mozilla-0.9.4.patch b/gnome-base/nautilus/files/nautilus-1.0.4-mozilla-0.9.4.patch
deleted file mode 100644
index cdd9b4ff0efd..000000000000
--- a/gnome-base/nautilus/files/nautilus-1.0.4-mozilla-0.9.4.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nrc -x *~ nautilus-1.0.4.orig/components/mozilla/mozilla-events.cpp nautilus-1.0.4/components/mozilla/mozilla-events.cpp
-*** nautilus-1.0.4.orig/components/mozilla/mozilla-events.cpp	Tue Feb 27 04:38:53 2001
---- nautilus-1.0.4/components/mozilla/mozilla-events.cpp	Wed Aug  8 16:16:10 2001
-***************
-*** 60,65 ****
---- 60,66 ----
-  #include "nsIDocShellTreeOwner.h"
-  #include "nsIDocument.h"
-  #include "nsIContent.h"
-+ #include "nsIContentViewer.h"
-  #include "nsIDOMHTMLElement.h"
-  #include "nsIDOMHTMLAnchorElement.h"
-  #include "nsIDOMHTMLDocument.h"
-diff -Nrc -x *~ nautilus-1.0.4.orig/components/mozilla/nautilus-mozilla-embed-extensions.cpp nautilus-1.0.4/components/mozilla/nautilus-mozilla-embed-extensions.cpp
-*** nautilus-1.0.4.orig/components/mozilla/nautilus-mozilla-embed-extensions.cpp	Thu Feb 22 07:40:40 2001
---- nautilus-1.0.4/components/mozilla/nautilus-mozilla-embed-extensions.cpp	Wed Aug  8 16:15:37 2001
-***************
-*** 41,46 ****
---- 41,47 ----
-  #include "nsIMarkupDocumentViewer.h"
-  #include "nsICharsetConverterManager.h"
-  #include "nsICharsetConverterManager2.h"
-+ #include "nsIContentViewer.h"
-  #include <vector>
-  #include <string>
-  
diff --git a/gnome-base/nautilus/nautilus-1.0.6-r3.ebuild b/gnome-base/nautilus/nautilus-1.0.6-r3.ebuild
new file mode 100644
index 000000000000..a5ddfe1cf21a
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-1.0.6-r3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>
+# Updated by Sebastian Werner <sebastian@werner-productions.de>
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-1.0.6-r3.ebuild,v 1.1 2002/03/07 06:27:56 blocke Exp $
+
+
+S=${WORKDIR}/${P}
+DESCRIPTION="nautilus"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
+
+HOMEPAGE="http://www.gnome.org/"
+
+RDEPEND="mozilla? ( >=net-www/mozilla-0.9.5 )
+		>=app-admin/fam-oss-2.6.4
+        >=media-sound/cdparanoia-3.9.8
+        >=gnome-base/bonobo-1.0.9-r1
+        >=gnome-base/gnome-core-1.4.0.4-r1
+        >=gnome-base/libghttp-1.0.9-r1
+		>=gnome-base/gnome-vfs-1.0.3
+		>=gnome-base/librsvg-1.0.1
+		>=gnome-base/eel-1.0.2
+		>=gnome-extra/medusa-0.5.1-r1"
+
+DEPEND="${RDEPEND}
+		sys-devel/gettext
+        >=app-text/scrollkeeper-0.2
+        >=dev-util/intltool-0.11"
+
+src_unpack() {
+
+	unpack ${P}.tar.gz
+
+	# The following is a temporary patch contributed by Naresh Donti
+	# to fix the 50 defunct copies of sh caused by hyperbola.  This patch
+	# will no longer be needed with a future version of scrollkeeper.
+	# see bug #566 for more information
+
+	patch -p0 < ${FILESDIR}/nautilus-1.0.6-hyperbola.diff
+
+}
+
+src_compile() {                           
+	local myconf
+
+	if [ "`use mozilla`" ]
+	then
+		MOZILLA=${MOZILLA_FIVE_HOME}
+		myconf="${myconf} --with-mozilla-lib-place=$MOZILLA \
+				  --with-mozilla-include-place=$MOZILLA/include"
+
+		export MOZILLA_FIVE_HOME=$MOZILLA
+		export LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME
+	else
+		myconf="${myconf} --disable-mozilla-component"
+	fi
+
+	CFLAGS="${CFLAGS} `gnome-config --cflags gdk_pixbuf`"
+
+	./configure --host=${CHOST} 					\
+		    --prefix=/usr					\
+		    --sysconfdir=/etc					\
+		    --localstatedir=/var/lib				\
+		    --enable-eazel-services=0 				\
+		    ${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+	make prefix=${D}/usr						\
+	     sysconfdir=${D}/etc					\
+	     localstatedir=${D}/var/lib					\
+	     install || die
+
+	# Fix missing icon in Gnome Spash
+	insinto /usr/share/pixmaps
+	newins nautilus-launch-icon.png gnome-launch-icon.png
+
+	dodoc AUTHORS COPYING* ChangeLog* NEWS TODO
+
+	# Fix permissions in order to resolve the mozilla-view issue
+	chmod -R g+r,o+r ${D}/*
+}