fix fam dep

12 files changed, 27 insertions, 186 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 53365156b211..6d4ae8a24d7d 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,7 +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.65 2003/11/16 16:04:11 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.66 2003/12/07 23:40:37 foser Exp $
 
+  07 Dec 2003; foser <foser@gentoo.org> nautilus-2*.ebuild :
+  Dep fix fam-oss > fam due to move
 
 *nautilus-2.4.1-r1 (16 Nov 2003)
 
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 4beea0865e56..a76d4b0bd1ed 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,30 +1,24 @@
-MD5 039f7280f360a3bff7e55efd0b12dda0 ChangeLog 9826
+MD5 cae5c71ff02a8e3a6a125d25f4a1f9ed nautilus-1.0.6-r9.ebuild 3516
+MD5 d386ddd18a960e36e9184856886ee582 nautilus-2.4.1.ebuild 1949
+MD5 d443adfa1b1bfc4f538e9fe862e1cf43 nautilus-2.4.1-r1.ebuild 1849
+MD5 025f8d01a54622313900f6333fb89588 ChangeLog 9922
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 e671b9d62fdb33d2e7f2d5546d48c141 nautilus-1.0.6-r9.ebuild 3523
-MD5 c24819bc79e3cf5920bc6359fd82bc32 nautilus-2.2.1.ebuild 1689
-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 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
-MD5 eb934f4bc6062d4b539e0b3dd9a0f98b files/digest-nautilus-2.2.3 68
-MD5 6e4f0293f123c4fc7acf8e4d17e39990 files/digest-nautilus-2.2.4 68
-MD5 edea17bb51bbdc0ffbeb076961b25b21 files/digest-nautilus-2.4.1 68
-MD5 323fc939bd6c4e4c2a4d55fe9de94bb2 files/digest-nautilus-2.4.0 68
-MD5 ddc1abbf275436c7fa5fd5c04a27cc94 files/nautilus-1.0.6-mozilla-embed-1.0_rc3.diff 526
-MD5 47ad4a802bbd17967708599cda1b7aaf files/nautilus-1.0.6-mozilla-1.0_rc1.diff 920
-MD5 d7ad0d83dbafefa25a34a50e2ee34806 files/nautilus-1.0.6-mozilla-1.0_rc3.diff 1709
+MD5 2cf455d7eac98f67f51736c295bfa54d nautilus-2.4.0.ebuild 1673
 MD5 dbfcca25a47c67d13020371a1acbff7a files/nautilus-2-thumbnail_max_size.patch 1444
-MD5 3a7c7847c496aaa4230e7191aeb39c9a files/nautilus-2-snap_to_grid-r1.patch 37548
-MD5 0596a42317e21832ae5a4899b88348e3 files/nautilus-2.2.0.2-locale.patch 351
 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 3a7c7847c496aaa4230e7191aeb39c9a files/nautilus-2-snap_to_grid-r1.patch 37548
 MD5 63d8d3d2f44b839065888ee8338f5f46 files/nautilus-2-disable-cdda.patch 314
+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
+MD5 d7ad0d83dbafefa25a34a50e2ee34806 files/nautilus-1.0.6-mozilla-1.0_rc3.diff 1709
+MD5 323fc939bd6c4e4c2a4d55fe9de94bb2 files/digest-nautilus-2.4.0 68
+MD5 edea17bb51bbdc0ffbeb076961b25b21 files/digest-nautilus-2.4.1 68
+MD5 94955c8317b2f5742603a9dd1d656ed3 files/nautilus-2.2-double_menu_entry_fix.patch 1322
+MD5 0596a42317e21832ae5a4899b88348e3 files/nautilus-2.2.0.2-locale.patch 351
+MD5 ddc1abbf275436c7fa5fd5c04a27cc94 files/nautilus-1.0.6-mozilla-embed-1.0_rc3.diff 526
 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.2.1 b/gnome-base/nautilus/files/digest-nautilus-2.2.1
deleted file mode 100644
index 4d7ce76907a4..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-2.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d5d0982ad17f654b925c42376cdb4917 nautilus-2.2.1.tar.bz2 4428521
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.2.3 b/gnome-base/nautilus/files/digest-nautilus-2.2.3
deleted file mode 100644
index 42b0c0aa312c..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-2.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 de940f6ce5f335aa2d7afc07f021c439 nautilus-2.2.3.tar.bz2 4573521
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.2.4 b/gnome-base/nautilus/files/digest-nautilus-2.2.4
deleted file mode 100644
index 5e24233fdbc4..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-2.2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cb189d8a53dca17e5345261bd819c421 nautilus-2.2.4.tar.bz2 4657953
diff --git a/gnome-base/nautilus/nautilus-1.0.6-r9.ebuild b/gnome-base/nautilus/nautilus-1.0.6-r9.ebuild
index 336dedc89df2..23f495348233 100644
--- a/gnome-base/nautilus/nautilus-1.0.6-r9.ebuild
+++ b/gnome-base/nautilus/nautilus-1.0.6-r9.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Updated by Sebastian Werner <sebastian@werner-productions.de>
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-1.0.6-r9.ebuild,v 1.16 2003/09/06 23:51:37 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-1.0.6-r9.ebuild,v 1.17 2003/12/07 23:40:37 foser Exp $
 
 IUSE="nls mozilla"
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.gnome.org/projects/nautilus/"
 
 # =gnome-base/gnome-core-1.4*
 RDEPEND="mozilla? ( >=net-www/mozilla-1.0_rc3 )
-	>=app-admin/fam-oss-2.6.4
+	>=app-admin/fam-2.6.4
 	>=media-sound/cdparanoia-3.9.8
 	>=gnome-base/bonobo-1.0.9-r1
 	>=gnome-base/libghttp-1.0.9-r1
diff --git a/gnome-base/nautilus/nautilus-2.2.1.ebuild b/gnome-base/nautilus/nautilus-2.2.1.ebuild
deleted file mode 100644
index 59135edac2e6..000000000000
--- a/gnome-base/nautilus/nautilus-2.2.1.ebuild
+++ /dev/null
@@ -1,56 +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.2.1.ebuild,v 1.13 2003/09/12 20:04:27 liquidx Exp $
-
-inherit gnome2 eutils
-
-S=${WORKDIR}/${P}
-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"
-IUSE="oggvorbis"
-
-RDEPEND="app-admin/fam-oss
-	>=dev-libs/glib-2
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.1.1
-	>=dev-libs/libxml2-2.4.7
-	>=gnome-base/gnome-vfs-2.1.5
-	>=media-sound/esound-0.2.27
-	>=gnome-base/eel-${PV}
-	>=gnome-base/libgnome-2.1.1
-	>=gnome-base/libgnomeui-2.1.1
-	>=gnome-base/gnome-desktop-2.1
-	>=media-libs/libart_lgpl-2.3.10
-	>=gnome-base/libbonobo-2.1
-	>=gnome-base/libbonoboui-2
-	>=gnome-base/librsvg-2.0.1
-	>=gnome-base/ORBit2-2.4
-	sys-apps/eject
-	oggvorbis? ( media-sound/vorbis-tools )
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-themes"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.12.0
-	>=gnome-base/gconf-1.2.1"
-
-G2CONF="${G2CONF} --enable-gdialog=yes"
-
-DOCS="AUTHORS COPYIN* ChangeLo* HACKING INSTALL MAINTAINERS NEWS README THANKS TODO"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Fix bug 15450: nautilus-2.2.0.2 doesn't build without
-	# optimization.  We'll need this patch until it's fixed upstream.
-	epatch ${FILESDIR}/${PN}-2.2.0.2-locale.patch
-	# Fix bug #15984: double rightclick menus on localized systems
-	epatch ${FILESDIR}/${PN}-2.2-double_menu_entry_fix.patch
-	# Fix thumbnailer to handle bigger files (#16192)
-	epatch ${FILESDIR}/${PN}-2-thumbnail_max_size.patch
-}
diff --git a/gnome-base/nautilus/nautilus-2.2.3.ebuild b/gnome-base/nautilus/nautilus-2.2.3.ebuild
deleted file mode 100644
index 8ca6c63152be..000000000000
--- a/gnome-base/nautilus/nautilus-2.2.3.ebuild
+++ /dev/null
@@ -1,46 +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.2.3.ebuild,v 1.11 2003/09/12 20:04:27 liquidx Exp $
-
-inherit gnome2 eutils
-
-S=${WORKDIR}/${P}
-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"
-IUSE="oggvorbis"
-
-RDEPEND="app-admin/fam-oss
-	>=dev-libs/glib-2
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.1.1
-	>=dev-libs/libxml2-2.4.7
-	>=gnome-base/gnome-vfs-2.1.5
-	>=media-sound/esound-0.2.27
-	>=gnome-base/eel-${PV}
-	>=gnome-base/libgnome-2.1.1
-	>=gnome-base/libgnomeui-2.1.1
-	>=gnome-base/gnome-desktop-2.1
-	>=media-libs/libart_lgpl-2.3.10
-	>=gnome-base/libbonobo-2.1
-	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/librsvg-2.0.1
-	>=gnome-base/ORBit2-2.4
-	sys-apps/eject
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-themes
-	oggvorbis? ( media-sound/vorbis-tools )"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.12.0
-	>=gnome-base/gconf-1.2.1"
-
-G2CONF="${G2CONF} --enable-gdialog=yes"
-
-DOCS="AUTHORS COPYIN* ChangeLo* HACKING INSTALL MAINTAINERS NEWS README THANKS TODO"
-
-# needed for 2.2.3 only
-export SED=sed
diff --git a/gnome-base/nautilus/nautilus-2.2.4.ebuild b/gnome-base/nautilus/nautilus-2.2.4.ebuild
deleted file mode 100644
index bf5ef31a8fe1..000000000000
--- a/gnome-base/nautilus/nautilus-2.2.4.ebuild
+++ /dev/null
@@ -1,50 +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.2.4.ebuild,v 1.8 2003/09/12 20:04:27 liquidx Exp $
-
-inherit gnome2 eutils
-
-S=${WORKDIR}/${P}
-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 amd64 hppa"
-IUSE="oggvorbis"
-
-RDEPEND="app-admin/fam-oss
-	>=dev-libs/glib-2
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.1.1
-	>=dev-libs/libxml2-2.4.7
-	>=gnome-base/gnome-vfs-2.1.5
-	>=media-sound/esound-0.2.27
-	>=gnome-base/eel-${PV}
-	>=gnome-base/gconf-1.2.1
-	>=gnome-base/libgnome-2.1.1
-	>=gnome-base/libgnomeui-2.1.1
-	>=gnome-base/gnome-desktop-2.1
-	>=media-libs/libart_lgpl-2.3.10
-	>=gnome-base/libbonobo-2.1
-	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/librsvg-2.0.1
-	>=gnome-base/ORBit2-2.4
-	sys-apps/eject
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-themes
-	oggvorbis? ( media-sound/vorbis-tools )"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.12.0"
-
-G2CONF="${G2CONF} --enable-gdialog=yes"
-
-DOCS="AUTHORS COPYIN* ChangeLo* HACKING INSTALL MAINTAINERS NEWS README THANKS TODO"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-2-snap_to_grid-r1.patch
-}
diff --git a/gnome-base/nautilus/nautilus-2.4.0.ebuild b/gnome-base/nautilus/nautilus-2.4.0.ebuild
index 13aad9a21987..850ba9646ace 100644
--- a/gnome-base/nautilus/nautilus-2.4.0.ebuild
+++ b/gnome-base/nautilus/nautilus-2.4.0.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.0.ebuild,v 1.10 2003/11/15 02:49:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.4.0.ebuild,v 1.11 2003/12/07 23:40:37 foser Exp $
 
 inherit gnome2
 
@@ -31,7 +31,7 @@ RDEPEND=">=dev-libs/glib-2
 	>=gnome-base/ORBit2-2.4
 	>=x11-libs/startup-notification-0.5
 	dev-libs/popt
-	app-admin/fam-oss
+	app-admin/fam
 	sys-apps/eject
 	oggvorbis? ( media-sound/vorbis-tools )
 	cups? ( net-print/libgnomecups
diff --git a/gnome-base/nautilus/nautilus-2.4.1-r1.ebuild b/gnome-base/nautilus/nautilus-2.4.1-r1.ebuild
index cdeb0de2867c..416319e3e4b7 100644
--- a/gnome-base/nautilus/nautilus-2.4.1-r1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.4.1-r1.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-r1.ebuild,v 1.1 2003/11/16 16:00:00 spider Exp $
+# $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
 
@@ -29,7 +29,7 @@ RDEPEND=">=dev-libs/glib-2
 	>=gnome-base/ORBit2-2.4
 	>=x11-libs/startup-notification-0.5
 	dev-libs/popt
-	app-admin/fam-oss
+	app-admin/fam
 	sys-apps/eject
 	!gstreamer? ( oggvorbis? ( media-sound/vorbis-tools ) )
 	cups? ( net-print/libgnomecups
diff --git a/gnome-base/nautilus/nautilus-2.4.1.ebuild b/gnome-base/nautilus/nautilus-2.4.1.ebuild
index 6f51c36fd997..4a3ef6a2843d 100644
--- a/gnome-base/nautilus/nautilus-2.4.1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.4.1.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.ebuild,v 1.2 2003/10/21 21:19:57 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.4.1.ebuild,v 1.3 2003/12/07 23:40:37 foser Exp $
 
 inherit gnome2
 
@@ -14,7 +14,7 @@ IUSE="oggvorbis cups gstreamer"
 RDEPEND=">=dev-libs/glib-2
 	>=x11-libs/pango-1.2
 	>=x11-libs/gtk+-2.2
-	>=gnome-base/eel-${PV}
+	=gnome-base/eel-${PV}
 	>=dev-libs/libxml2-2.4.7
 	>=gnome-base/gnome-vfs-2.3.5
 	>=media-sound/esound-0.2.27
@@ -29,7 +29,7 @@ RDEPEND=">=dev-libs/glib-2
 	>=gnome-base/ORBit2-2.4
 	>=x11-libs/startup-notification-0.5
 	dev-libs/popt
-	app-admin/fam-oss
+	app-admin/fam
 	sys-apps/eject
 	!gstreamer? ( oggvorbis? ( media-sound/vorbis-tools ) )
 	cups? ( net-print/libgnomecups