dep fix

10 files changed, 12 insertions, 167 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index c3b41daf9436..277f79641a7a 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.67 2003/11/16 00:02:44 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.68 2003/12/07 23:35:54 foser Exp $
+
+  08 Dec 2003; foser <foser@gentoo.org> gnome-vfs-2.4.{0,1}.ebuild :
+  dep fix fam-oss > fam, due to move
 
   14 Nov 2003; Aron Griffis <agriffis@gentoo.org> gnome-vfs-2.4.0.ebuild:
   Stable on ia64
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index eae434834875..b154e5e08b40 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,17 +1,11 @@
-MD5 da2b9abe1882b389d03881c2c6e4fdc9 ChangeLog 8228
+MD5 913f5233a5f9d44e707a4c7e55541bdc gnome-vfs-2.4.1.ebuild 1040
 MD5 f7c06df9823b13bdc8d4275cf3fac38d gnome-vfs-1.0.5-r3.ebuild 1575
-MD5 4f815ba99c01f37b993bfd71db1d3a8c gnome-vfs-2.2.3.ebuild 1366
-MD5 c292d02603d7932dea6cf8ff1190fc57 gnome-vfs-2.2.4.ebuild 1438
-MD5 22707e37f81dac19017613a19570dbf0 gnome-vfs-2.2.5.ebuild 1375
-MD5 7f7266dcc35c2692be8f3088e69f7a78 gnome-vfs-2.4.0.ebuild 1045
-MD5 968952f223560f95a541f66cde68666b gnome-vfs-2.4.1.ebuild 1042
+MD5 f57be585aaa0c3ff1d8228c60f3de302 gnome-vfs-2.4.0.ebuild 1040
+MD5 f8b7fe28de9b854a1d8782eab51dc07d ChangeLog 8334
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 a88e201c8f2ec5444db0bea2e8c302b4 files/digest-gnome-vfs-1.0.5-r3 68
-MD5 1c1f336adc7e7a64f733054a2971ef39 files/digest-gnome-vfs-2.2.3 68
-MD5 d44d08e0e2618a6858ad1f8557c78e33 files/digest-gnome-vfs-2.2.4 68
-MD5 206f781a612eb0748da6f97a752d68c3 files/digest-gnome-vfs-2.2.5 68
 MD5 7803b9dff2675a9dcf670ad1128a1d36 files/digest-gnome-vfs-2.4.0 69
 MD5 f0d9fa08ccb4ec34316561d25051dab4 files/digest-gnome-vfs-2.4.1 69
+MD5 25d42b1a4cf935fbedd3465bc4a8dd7c files/1.0/gnome-vfs-1.0.5-proxy.patch 2863
 MD5 4072a11c3c98c493cbc0bb851176fb44 files/1.0/gnome-vfs-1.0.5-codeset.patch 1762
 MD5 071edd844b13f596a2f7d986b4512521 files/1.0/gnome-vfs-1.0.5-fix-segfault.patch 430
-MD5 25d42b1a4cf935fbedd3465bc4a8dd7c files/1.0/gnome-vfs-1.0.5-proxy.patch 2863
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.2.3 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.2.3
deleted file mode 100644
index de1584ae0d8e..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8543f4cd141689b4985e800d115fdf2e gnome-vfs-2.2.3.tar.bz2 995661
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.2.4 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.2.4
deleted file mode 100644
index b83a98f1f637..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6f7e62ef65aa9690d25ed13e822e67d7 gnome-vfs-2.2.4.tar.bz2 999711
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.2.5 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.2.5
deleted file mode 100644
index 3254654ea8db..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6ed2702382675c78eed6a96b2296e51d gnome-vfs-2.2.5.tar.bz2 956410
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.2.3.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.2.3.ebuild
deleted file mode 100644
index 53ebc6ff8154..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.2.3.ebuild
+++ /dev/null
@@ -1,49 +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/gnome-vfs/gnome-vfs-2.2.3.ebuild,v 1.6 2003/09/12 19:53:38 liquidx Exp $
-
-IUSE="doc ssl"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="2"
-KEYWORDS="x86 ppc alpha sparc"
-LICENSE="GPL-2 LGPL-2.1"
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-base/gconf-1.2.1
-	>=gnome-base/ORBit2-2.4
-	>=gnome-base/libbonobo-2
-	>=dev-libs/libxml2-2.2.8
-	>=gnome-base/gnome-mime-data-2
-	app-admin/fam-oss
-	ssl? ( >=dev-libs/openssl-0.9.5 )"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.10.40
-	>=dev-util/intltool-0.22
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README TODO"
-
-use ssl \
-	&& G2CONF="${G2CONF} --enable-openssl" \
-	|| G2CONF="${G2CONF} --disable-openssl"
-
-src_install() {
-	gnome2_src_install
-
-	# FIXME: there are bettere ways
-	echo "trash:    libvfolder-desktop.so">>${D}/etc/gnome-vfs-2.0/modules/default-modules.conf
-}
-
-pkg_preinst () {
-	## this check is there because gnome-vfs still adheres the file, though it doesn't need it. backwards compliance isnt always good
-	REMOVE="${ROOT}/etc/gnome-vfs-2.0/vfolders/applications.vfolder-info"
-	if [ -f ${REMOVE} ] ; then
-		rm -f ${REMOVE}
-	fi
-}
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.2.4.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.2.4.ebuild
deleted file mode 100644
index 9af4d74a3f85..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.2.4.ebuild
+++ /dev/null
@@ -1,51 +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/gnome-vfs/gnome-vfs-2.2.4.ebuild,v 1.8 2003/09/12 19:53:38 liquidx Exp $
-
-IUSE="doc ssl"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="2"
-KEYWORDS="x86 ppc ~alpha ~sparc amd64"
-LICENSE="GPL-2 LGPL-2.1"
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-base/gconf-1.2.1
-	>=gnome-base/ORBit2-2.4
-	>=gnome-base/libbonobo-2
-	>=dev-libs/libxml2-2.2.8
-	>=gnome-base/gnome-mime-data-2
-	app-admin/fam-oss
-	ssl? ( >=dev-libs/openssl-0.9.5 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	nls? ( >=sys-devel/gettext-0.10.40 )
-	nls? ( >=dev-util/intltool-0.22 )
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README TODO"
-
-G2CONF="${G2CONF} --disable-schemas-install"
-
-use ssl \
-	&& G2CONF="${G2CONF} --enable-openssl" \
-	|| G2CONF="${G2CONF} --disable-openssl"
-
-src_install() {
-	gnome2_src_install
-
-	# FIXME: there are bettere ways
-	echo "trash:    libvfolder-desktop.so">>${D}/etc/gnome-vfs-2.0/modules/default-modules.conf
-}
-
-pkg_preinst () {
-	## this check is there because gnome-vfs still adheres the file, though it doesn't need it. backwards compliance isnt always good
-	REMOVE="${ROOT}/etc/gnome-vfs-2.0/vfolders/applications.vfolder-info"
-	if [ -f ${REMOVE} ] ; then
-		rm -f ${REMOVE}
-	fi
-}
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.2.5.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.2.5.ebuild
deleted file mode 100644
index de86d84e8bda..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.2.5.ebuild
+++ /dev/null
@@ -1,49 +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/gnome-vfs/gnome-vfs-2.2.5.ebuild,v 1.8 2003/09/23 15:50:38 darkspecter Exp $
-
-IUSE="doc ssl"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="2"
-KEYWORDS="x86 ppc ~alpha ~sparc hppa ~amd64"
-LICENSE="GPL-2 LGPL-2.1"
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-base/gconf-1.2.1
-	>=gnome-base/ORBit2-2.4
-	>=gnome-base/libbonobo-2
-	>=dev-libs/libxml2-2.2.8
-	>=gnome-base/gnome-mime-data-2
-	app-admin/fam-oss
-	ssl? ( >=dev-libs/openssl-0.9.5 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README TODO"
-
-G2CONF="${G2CONF} --disable-schemas-install"
-
-use ssl \
-	&& G2CONF="${G2CONF} --enable-openssl" \
-	|| G2CONF="${G2CONF} --disable-openssl"
-
-src_install() {
-	gnome2_src_install
-
-	# FIXME: there are bettere ways
-	echo "trash:    libvfolder-desktop.so">>${D}/etc/gnome-vfs-2.0/modules/default-modules.conf
-}
-
-pkg_preinst () {
-	## this check is there because gnome-vfs still adheres the file, though it doesn't need it. backwards compliance isnt always good
-	REMOVE="${ROOT}/etc/gnome-vfs-2.0/vfolders/applications.vfolder-info"
-	if [ -f ${REMOVE} ] ; then
-		rm -f ${REMOVE}
-	fi
-}
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.4.0.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.4.0.ebuild
index 358851959914..b6ae309a871b 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.4.0.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-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/gnome-vfs/gnome-vfs-2.4.0.ebuild,v 1.10 2003/11/16 00:02:44 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.4.0.ebuild,v 1.11 2003/12/07 23:35:54 foser Exp $
 
 inherit gnome2 eutils
 
@@ -20,7 +20,7 @@ RDEPEND=">=dev-libs/glib-2
 	>=dev-libs/libxml2-2.2.8
 	>=gnome-base/gnome-mime-data-2
 
-	app-admin/fam-oss
+	app-admin/fam
 	ssl? ( >=dev-libs/openssl-0.9.5 )"
 
 DEPEND="${RDEPEND}
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.4.1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.4.1.ebuild
index 9981072f07f5..10084ee704fb 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.4.1.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-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/gnome-vfs/gnome-vfs-2.4.1.ebuild,v 1.1 2003/10/14 04:02:58 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.4.1.ebuild,v 1.2 2003/12/07 23:35:54 foser Exp $
 
 inherit gnome2 eutils
 
@@ -20,7 +20,7 @@ RDEPEND=">=dev-libs/glib-2
 	>=dev-libs/libxml2-2.2.8
 	>=gnome-base/gnome-mime-data-2
 
-	app-admin/fam-oss
+	app-admin/fam
 	ssl? ( >=dev-libs/openssl-0.9.5 )"
 
 DEPEND="${RDEPEND}