always disable mozilla plugin for nautilus-1. if someone wants to backport some fixes to work with seamonkey, it can be re-enabled.

(Portage version: 2.1.1_pre2-r2)
 (Unsigned Manifest commit)

3 files changed, 18 insertions, 153 deletions

diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 1154329e45da..fc97bd643255 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -50,15 +50,15 @@ AUX nautilus-2.9.90-icon_view_gst.patch 8136 RMD160 adc024c514ce2dd2af2962caa894
 MD5 76cc1af40c4dc75ce99179ae9b25a2cd files/nautilus-2.9.90-icon_view_gst.patch 8136
 RMD160 adc024c514ce2dd2af2962caa8941fce250ab2b1 files/nautilus-2.9.90-icon_view_gst.patch 8136
 SHA256 b6e7eef6e3ff11a9e3490e371ec06a9cd24b9251b7cad7262204071ff67a8a31 files/nautilus-2.9.90-icon_view_gst.patch 8136
-DIST nautilus-1.0.6.tar.gz 11481232 RMD160 01c2d5412ccf9998d8de24dcf6aef75db9d8b3b9 SHA256 d7f0e91a4c1f73124b09e13e69b9709dfd7886981447b0b7d66196f96e405629
-DIST nautilus-2.10.1.tar.bz2 5960278 RMD160 d3e7e0f66e972087d45975f2efa0fe3bfcb7620e SHA256 3bf0841e8d53ab5014807fc85eef9b16f077453910d2168c5baa747b4ec7201e
+DIST nautilus-1.0.6.tar.gz 11481232 RMD160 01c2d5412ccf9998d8de24dcf6aef75db9d8b3b9 SHA1 3ecad4d460fd2a08534a69c903c4a7dfddb7f276 SHA256 d7f0e91a4c1f73124b09e13e69b9709dfd7886981447b0b7d66196f96e405629
+DIST nautilus-2.10.1.tar.bz2 5960278 RMD160 d3e7e0f66e972087d45975f2efa0fe3bfcb7620e SHA1 738a1c58bf83bb2034bf9466daecdf09d8f131cb SHA256 3bf0841e8d53ab5014807fc85eef9b16f077453910d2168c5baa747b4ec7201e
 DIST nautilus-2.12.1.tar.bz2 4056062 RMD160 e5e3c10ff88c49109bf204cfb00959c4aef2b241 SHA256 256ebd70c3e2fd6aae3ddf5cb43a8ca808cfeb840279e8fdfdc54f2e3c5821a8
-DIST nautilus-2.12.2.tar.bz2 4057461 RMD160 6fedb1880febead00e5d4f4e71fb3cf219e1942e SHA256 9b1a11fde474d0bc0891afeef912aaa01bf8189e453bb555b2977f60f98d5455
-DIST nautilus-2.14.1.tar.bz2 4057351
-EBUILD nautilus-1.0.6-r9.ebuild 3396 RMD160 b7d521b616bc81e0b6412f7f7c9b0af236e0fde0 SHA1 9b0f98161eb14849ed0d08635e0f153738f11caa SHA256 9df292833052f960e3efa86fe48130ef5815fdffa56d095d068b67d8b9217e02
-MD5 3d6c41d63b220a10294364f0f79f0340 nautilus-1.0.6-r9.ebuild 3396
-RMD160 b7d521b616bc81e0b6412f7f7c9b0af236e0fde0 nautilus-1.0.6-r9.ebuild 3396
-SHA256 9df292833052f960e3efa86fe48130ef5815fdffa56d095d068b67d8b9217e02 nautilus-1.0.6-r9.ebuild 3396
+DIST nautilus-2.12.2.tar.bz2 4057461 RMD160 6fedb1880febead00e5d4f4e71fb3cf219e1942e SHA1 9a7e01afb8db91c3b95b7aef9572a581fdb2f1b5 SHA256 9b1a11fde474d0bc0891afeef912aaa01bf8189e453bb555b2977f60f98d5455
+DIST nautilus-2.14.1.tar.bz2 4057351 RMD160 dd5b052a74e79a318ca9aba52da8dc3b95f6a58f SHA1 5267c76782190796743b0647025ef9079eee7f78 SHA256 ace7b821176159bf70cca61ee9a38384896878ec028e1fc1014ec975c08b12db
+EBUILD nautilus-1.0.6-r10.ebuild 3185 RMD160 63dad269f97f129ad0a74b2fb76824a0de1e45ff SHA1 828ee97e44142f2753caf1bc870d485c93e91a4f SHA256 d9c28953adf7ff4b110e0af8ab835d7809294ceb7dda31ef3890df524d0edf6f
+MD5 174212ec6b5e6e18746e3c6d733d7da8 nautilus-1.0.6-r10.ebuild 3185
+RMD160 63dad269f97f129ad0a74b2fb76824a0de1e45ff nautilus-1.0.6-r10.ebuild 3185
+SHA256 d9c28953adf7ff4b110e0af8ab835d7809294ceb7dda31ef3890df524d0edf6f nautilus-1.0.6-r10.ebuild 3185
 EBUILD nautilus-2.10.1-r1.ebuild 2554 RMD160 9ddd0c797ad0ace3276dc2abd80f1d309464d05a SHA1 b4f77ae346c109a174c95600e61d9703eab200cd SHA256 eca1fc8e60e7dd0e04840aeb4e209dea54d2212fe93a077b8d1b7dcc9b30876e
 MD5 f7d00aeb5e458b7a34f9d39f9a508c79 nautilus-2.10.1-r1.ebuild 2554
 RMD160 9ddd0c797ad0ace3276dc2abd80f1d309464d05a nautilus-2.10.1-r1.ebuild 2554
@@ -75,17 +75,17 @@ EBUILD nautilus-2.14.1.ebuild 2042 RMD160 5a055c1e24b0324b3dbf30d7ace677525176c7
 MD5 519e2be84a9312074c2e59caa4d11167 nautilus-2.14.1.ebuild 2042
 RMD160 5a055c1e24b0324b3dbf30d7ace677525176c743 nautilus-2.14.1.ebuild 2042
 SHA256 412d9a2eb8e420d1d295f41d972a3c5526b592e4d4f848a949a2389bc8f32a6f nautilus-2.14.1.ebuild 2042
-MISC ChangeLog 24293 RMD160 0881df51e9e91fa014f0ec37f388c8621007fd38 SHA1 f4690396112600c4c7b6a146fe47fb6e8d3796ee SHA256 5b844181fc056654f2212cd5e261bfc4598349d3d8e120055212fc1cc07f5de7
-MD5 040d9497a3c0a8d41927fe18f47948f2 ChangeLog 24293
-RMD160 0881df51e9e91fa014f0ec37f388c8621007fd38 ChangeLog 24293
-SHA256 5b844181fc056654f2212cd5e261bfc4598349d3d8e120055212fc1cc07f5de7 ChangeLog 24293
+MISC ChangeLog 24578 RMD160 b381de54ad20785c03ad2cdd174f902787725c81 SHA1 f937e692de765ecf6a73237bc7a4e80a8f813ae2 SHA256 aef56e0e2e4ebdf0177b9e1236e208420e431cb9c6b0b0f738aee292326314c2
+MD5 1e9e50cbeb8f7bf6d2fb0a7ee0b3f5fd ChangeLog 24578
+RMD160 b381de54ad20785c03ad2cdd174f902787725c81 ChangeLog 24578
+SHA256 aef56e0e2e4ebdf0177b9e1236e208420e431cb9c6b0b0f738aee292326314c2 ChangeLog 24578
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
-MD5 4a2765d028f354ecf9ce42311c68d02e files/digest-nautilus-1.0.6-r9 250
-RMD160 dc7c7c6a0ee885cc1bf4f6e996b8556b50a4c576 files/digest-nautilus-1.0.6-r9 250
-SHA256 882a0f1b7b3c7a35e56b4bc60b1b6447c7fcab526b7278e9b506954dd44175cb files/digest-nautilus-1.0.6-r9 250
+MD5 4a2765d028f354ecf9ce42311c68d02e files/digest-nautilus-1.0.6-r10 250
+RMD160 dc7c7c6a0ee885cc1bf4f6e996b8556b50a4c576 files/digest-nautilus-1.0.6-r10 250
+SHA256 882a0f1b7b3c7a35e56b4bc60b1b6447c7fcab526b7278e9b506954dd44175cb files/digest-nautilus-1.0.6-r10 250
 MD5 2f6d773deecd7c3f65b6bd271f159634 files/digest-nautilus-2.10.1-r1 253
 RMD160 5cb6c0ddd53794f52a5725b0c0731abeb5b41294 files/digest-nautilus-2.10.1-r1 253
 SHA256 b5c0a618f57f5819f44a6af363a05811b0dcf4780065fd93ee39cb3a67bf5329 files/digest-nautilus-2.10.1-r1 253
@@ -95,6 +95,6 @@ SHA256 186de163d8bee4e0e69a4f88f868affd46b36037c2ac43f8bec8abb9e382e08f files/di
 MD5 6d2910c0d22cdc27feb2d63184bc6798 files/digest-nautilus-2.12.2 253
 RMD160 a3d55b8d579d1a97c4e1afa96ac99daa7cb79fe3 files/digest-nautilus-2.12.2 253
 SHA256 aadee03162fb1380bc4c73cb482cdbec5ef84e1d416516757a3eed2d883bc98d files/digest-nautilus-2.12.2 253
-MD5 efe9dde5c9d6be5de12d2a64c4ed8cad files/digest-nautilus-2.14.1 69
-RMD160 1ad84388a9672167489b05388e5c645f768dbcaf files/digest-nautilus-2.14.1 69
-SHA256 2520c4bc9f26111d3ba4d588ec1af77616b116a9b1be28de064dc107e75ab1bf files/digest-nautilus-2.14.1 69
+MD5 fc2a75544738593fbff53de2a321a5e4 files/digest-nautilus-2.14.1 253
+RMD160 f1d718562414a65fc550588a7ae3ce0b1b015f70 files/digest-nautilus-2.14.1 253
+SHA256 afccacd3d3b1e0e359b562ba6be45afb6b259ec5bcaada24539d98d8069362df files/digest-nautilus-2.14.1 253
diff --git a/gnome-base/nautilus/files/digest-nautilus-1.0.6-r9 b/gnome-base/nautilus/files/digest-nautilus-1.0.6-r9
deleted file mode 100644
index 63eadbb3225c..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-1.0.6-r9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 436283056c100bcbd14098a5342e2868 nautilus-1.0.6.tar.gz 11481232
-RMD160 01c2d5412ccf9998d8de24dcf6aef75db9d8b3b9 nautilus-1.0.6.tar.gz 11481232
-SHA256 d7f0e91a4c1f73124b09e13e69b9709dfd7886981447b0b7d66196f96e405629 nautilus-1.0.6.tar.gz 11481232
diff --git a/gnome-base/nautilus/nautilus-1.0.6-r9.ebuild b/gnome-base/nautilus/nautilus-1.0.6-r9.ebuild
deleted file mode 100644
index b4113dd28a53..000000000000
--- a/gnome-base/nautilus/nautilus-1.0.6-r9.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-1.0.6-r9.ebuild,v 1.28 2006/06/17 05:13:59 mr_bones_ Exp $
-
-DESCRIPTION="A filemanager for the Gnome desktop"
-HOMEPAGE="http://www.gnome.org/projects/nautilus/"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE="nls mozilla"
-
-# =gnome-base/gnome-core-1.4*
-RDEPEND="mozilla? ( >=www-client/mozilla-1.0_rc3 )
-	virtual/fam
-	>=media-sound/cdparanoia-3.9.8
-	>=gnome-base/bonobo-1.0.9-r1
-	>=gnome-base/libghttp-1.0.9-r1
-	=gnome-base/gnome-vfs-1.0*
-	=gnome-base/librsvg-1*
-	=gnome-base/eel-1.0*
-	=gnome-base/gnome-panel-1.4*"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	>=app-text/scrollkeeper-0.2
-	>=dev-util/intltool-0.11"
-
-src_unpack() {
-
-	unpack ${P}.tar.gz
-
-	cd ${S}
-
-	# 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 -p1 < ${FILESDIR}/nautilus-1.0.6-hyperbola.diff || die
-
-	# This patch to fix http://bugs.gentoo.org/show_bug.cgi?id=2082
-	# (taken from
-	# http://lists.eazel.com/pipermail/nautilus-list/2002-April/008473.html)
-	# Credit to Kaoru Fukui <k_fukui@highway.ne.jp>. This is probably
-	# a temporary patch until the next nautilus.
-
-	patch -p1 < ${FILESDIR}/${P}-mozilla-1.0_rc1.diff || die
-
-	# The following patch things for mozilla-1.0_rc3, and was
-	# cooked up by me.
-	#
-	# NOTE: We still need the ${P}-mozilla-1.0_rc1.diff patch !!!!!!
-	#
-	# Martin Schlemmer <azarah@gentoo.org>
-	# 26 May 2002
-
-	patch -p1 < ${FILESDIR}/${P}-mozilla-1.0_rc3.diff || die
-
-	# Here's another patch to fix it for gcc3.1. This is one I
-	# made, and it probably needs to sail upstream
-	# (mkennedy@gentoo.org)
-
-	patch -p1 < ${FILESDIR}/${P}-mozilla-embed-1.0_rc3.diff || die
-
-
-	# Add missing files
-	mkdir -p ${S}/intl
-	touch ${S}/intl/po2tbl.sed.in
-
-	# Libtoolize to fix .la files, and reconf automake stuff
-	cd ${S}
-	mkdir macros
-	cp ${FILESDIR}/macros/*.m4 macros
-	libtoolize --copy --force
-	aclocal -I macros
-	automake --add-missing
-	autoconf &>${S}/foo
-}
-
-src_compile() {
-	local myconf
-
-	if ! use nls
-	then
-		myconf="${myconf} --disable-nls"
-		mkdir intl
-		touch intl/libgettext.h
-	fi
-
-	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 \
-		--mandir=/usr/share/man	\
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		--enable-eazel-services=0 \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		 mandir=${D}/usr/share/man	\
-	     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}/*
-}