new version 'n cleanup

7 files changed, 13 insertions, 59 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 68d919ed7957..bd8174491285 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.56 2003/09/07 23:31:39 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.57 2003/09/08 14:35:57 foser Exp $
+
+*gnome-vfs-2.4.0 (08 Sep 2003)
+
+  08 Sep 2003; foser <foser@gentoo.org> gnome-vfs-2.4.0.ebuild :
+  New version
 
 *gnome-vfs-2.3.90 (07 Sep 2003)
 
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index e79a13586a61..ac5a3c6a5ae3 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,19 +1,15 @@
 MD5 af4a7aba1667eb928bfe258fcdcf4449 gnome-vfs-2.2.3.ebuild 1401
 MD5 2870adaf7350e991daa31caffdf4ed58 gnome-vfs-2.2.5.ebuild 1407
-MD5 fbc282ca3bfac246738539046f17e871 gnome-vfs-2.0.4-r2.ebuild 1248
 MD5 5a7d41477861cc8070b8c4ab6c648593 gnome-vfs-1.0.5-r3.ebuild 1576
 MD5 7b16cd575364efe584d1d43141fc9ccb gnome-vfs-2.2.4.ebuild 1473
-MD5 1b0da08e340974faa2fb5093589c9346 gnome-vfs-2.3.90.ebuild 1058
-MD5 1b0da08e340974faa2fb5093589c9346 gnome-vfs-2.4.0.ebuild 1058
-MD5 03be71a497465cdbcafed9bc4314dbd8 ChangeLog 7007
+MD5 9c67403e4c69e4ae4ea14035118eacfb gnome-vfs-2.4.0.ebuild 1021
+MD5 dd305c8560020ccf2320a4aec8478203 ChangeLog 7119
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 fd3377292df987adbebc861e2c0fb113 files/digest-gnome-vfs-2.3.90 70
 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 844cfd51745cc29e1040e6339391ee50 files/digest-gnome-vfs-2.0.4-r2 68
 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
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.0.4-r2 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.0.4-r2
deleted file mode 100644
index f06dd460f650..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.0.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 40ab89fa79dbb33c294b61337e54084e gnome-vfs-2.0.4.tar.bz2 892634
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.3.90 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.3.90
deleted file mode 100644
index c1839c685db7..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.3.90
+++ /dev/null
@@ -1 +0,0 @@
-MD5 36d5e527e831e2f055ad25b238faddd7 gnome-vfs-2.3.90.tar.bz2 1090215
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.4.0 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.4.0
new file mode 100644
index 000000000000..9cd7198bffa2
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.4.0
@@ -0,0 +1 @@
+MD5 2c7908e98b482add387e305619cfe4aa gnome-vfs-2.4.0.tar.bz2 1092146
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.0.4-r2.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.0.4-r2.ebuild
deleted file mode 100644
index e90e2b874336..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.0.4-r2.ebuild
+++ /dev/null
@@ -1,45 +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.0.4-r2.ebuild,v 1.8 2003/02/13 12:10:14 vapier Exp $
-
-IUSE="doc"
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Gnome Virtual Filesystem"
-SRC_URI="mirror://gnome/2.0.1/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="2"
-KEYWORDS="x86 ppc sparc alpha"
-LICENSE="GPL-2 LGPL-2.1"
-
-RDEPEND=">=dev-libs/glib-2.0.6
-	>=gnome-base/gconf-1.2.1
-	>=gnome-base/ORBit2-2.4.1
-	>=gnome-base/gnome-mime-data-2.0.1
-	>=gnome-base/libbonobo-2.0.0
-	>=gnome-base/bonobo-activation-1.0.3
-	>=sys-devel/gettext-0.10.40
-	>=dev-libs/openssl-0.9.5
-	>=sys-apps/bzip2-1.0"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.22
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-0.9 )"
-
-DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README TODO"
-
-src_compile() {
-	gnome2_src_compile DESTDIR=${D}
-}
-
-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.3.90.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.4.0.ebuild
index 4e4f63146b6d..9e29a80bc655 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.3.90.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.3.90.ebuild,v 1.2 2003/09/08 05:04:45 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.4.0.ebuild,v 1.1 2003/09/08 14:35:57 foser Exp $
 
 inherit gnome2 eutils
 
@@ -10,7 +10,7 @@ SLOT="2"
 
 DESCRIPTION="Gnome Virtual Filesystem"
 HOMEPAGE="http://www.gnome.org/"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
 LICENSE="GPL-2 LGPL-2.1"
 
 RDEPEND=">=dev-libs/glib-2
@@ -19,6 +19,7 @@ RDEPEND=">=dev-libs/glib-2
 	>=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 )"
 
@@ -28,9 +29,7 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README TODO"
 
-use ssl \
-	&& G2CONF="${G2CONF} --enable-openssl" \
-	|| G2CONF="${G2CONF} --disable-openssl"
+G2CONF="${G2CONF} $(use_enable ssl openssl)"
 
 src_install() {