new version, mark 2.2.4 x86 and cleanup

13 files changed, 16 insertions, 211 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index ba9c0b11073a..0994de99f44f 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.49 2003/04/13 14:51:01 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.50 2003/05/22 12:36:33 foser Exp $
+
+*gnome-vfs-2.2.5 (22 May 2003)
+
+  22 May 2003; foser <foser@gentoo.org> gnome-vfs-2.2.5.ebuild :
+  New version
 
 *gnome-vfs-2.2.4 (31 Mar 2003)
 
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.0.4.1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.0.4.1
deleted file mode 100644
index e7e5a19630fe..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.0.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1d9ef5f9570268338512f9da1e6a8c6f gnome-vfs-2.0.4.1.tar.bz2 833915
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.0.4.1-r1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.0.4.1-r1
deleted file mode 100644
index e7e5a19630fe..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.0.4.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1d9ef5f9570268338512f9da1e6a8c6f gnome-vfs-2.0.4.1.tar.bz2 833915
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.2.1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.2.1
deleted file mode 100644
index 7072c157fb3d..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fc1d8dae45b1a70b4493fc7a65d7b743 gnome-vfs-2.2.1.tar.bz2 987420
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.2.2 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.2.2
deleted file mode 100644
index 96f7b0970f5e..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 02845c284b27d1bed89176b72cb17890 gnome-vfs-2.2.2.tar.bz2 988477
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
new file mode 100644
index 000000000000..3254654ea8db
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.2.5
@@ -0,0 +1 @@
+MD5 6ed2702382675c78eed6a96b2296e51d gnome-vfs-2.2.5.tar.bz2 956410
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2-oggdetect.diff b/gnome-base/gnome-vfs/files/gnome-vfs-2-oggdetect.diff
deleted file mode 100644
index 3f852154abf5..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2-oggdetect.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: libgnomevfs/gnome-vfs-mime-magic.c
-===================================================================
-RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-mime-magic.c,v
-retrieving revision 1.43
-diff -u -r1.43 gnome-vfs-mime-magic.c
---- libgnomevfs/gnome-vfs-mime-magic.c	19 Dec 2002 17:57:19 -0000	1.43
-+++ libgnomevfs/gnome-vfs-mime-magic.c	20 Jan 2003 12:57:20 -0000
-@@ -855,6 +855,13 @@
- 		&& (sniff_buffer->buffer[7] < 0x80u)
- 		&& (sniff_buffer->buffer[8] < 0x80u)
- 		&& (sniff_buffer->buffer[9] < 0x80u)) {
-+		/* checks for existance of vorbis identification header */
-+		for (offset=10; offset < GNOME_VFS_MP3_SNIFF_LENGTH-7; offset++) {
-+			if (strncmp ((char *) &sniff_buffer->buffer[offset], 
-+				     "\x01vorbis", 7) == 0) {
-+				return FALSE;
-+			}
-+		}
- 		return TRUE;
- 	}
- 
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.0-patch.diff b/gnome-base/gnome-vfs/files/gnome-vfs-2.0-patch.diff
deleted file mode 100644
index 4a36fc9f2a93..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.0-patch.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnome-vfs-2.0.0.orig/libgnomevfs/gnome-vfs-monitor.c	Sun May 19 02:24:07 2002
-+++ gnome-vfs-2.0.0/libgnomevfs/gnome-vfs-monitor.c	Mon Jun 17 23:47:27 2002
-@@ -87,6 +87,7 @@
- 	if (result != GNOME_VFS_OK) {
- 		gnome_vfs_uri_unref (uri);
- 		g_free (monitor_handle);
-+                monitor_handle = NULL;
- 	} else {
- 		G_LOCK (handle_hash);
- 		g_hash_table_insert (handle_hash, 
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.0.4.1-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.0.4.1-r1.ebuild
deleted file mode 100644
index a2a51906cfe7..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.0.4.1-r1.ebuild
+++ /dev/null
@@ -1,52 +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.1-r1.ebuild,v 1.3 2003/02/13 12:10:18 vapier Exp $
-
-IUSE="doc"
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Gnome Virtual Filesystem"
-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() {
-		export DESTDIR=${D}
-		gnome2_src_compile 
-}
-
-src_install() {
-		gnome2_src_install
-#there are bettere ways, but that is the quicker
-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.0.4.1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.0.4.1.ebuild
deleted file mode 100644
index 90e44fa89db1..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.0.4.1.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/gnome-vfs/gnome-vfs-2.0.4.1.ebuild,v 1.8 2003/02/13 12:10:22 vapier Exp $
-
-IUSE="doc"
-
-inherit gnome2 libtool
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Gnome Virtual Filesystem"
-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() {
-	elibtoolize 
-
-	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.2.2.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.2.2.ebuild
deleted file mode 100644
index 33e5422ef8c2..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.2.2.ebuild
+++ /dev/null
@@ -1,58 +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.2.ebuild,v 1.6 2003/03/01 14:45:09 weeve Exp $
-
-IUSE="doc ssl"
-
-inherit gnome2 eutils
-
-S=${WORKDIR}/${P}
-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
-	>=gnome-base/bonobo-activation-1
-	>=dev-libs/libxml2-2.2.8
-	>=gnome-base/gnome-mime-data-2
-	>=sys-devel/gettext-0.10.40
-	app-admin/fam-oss	
-	ssl? ( >=dev-libs/openssl-0.9.5 )"
-
-DEPEND="${RDEPEND}
-	>=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"
-
-src_unpack() {
-	unpack ${A}
-
-	# fixes oggs with id3 tags detection
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-2-oggdetect.diff
-}
-
-src_compile() {
-	gnome2_src_compile DESTDIR=${D}
-}
-
-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
index ab07387c2a8a..580c4009ac06 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.2.4.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.2.4.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.2.4.ebuild,v 1.2 2003/04/13 14:51:02 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.2.4.ebuild,v 1.3 2003/05/22 12:36:33 foser Exp $
 
 IUSE="doc ssl"
 
@@ -9,7 +9,7 @@ inherit gnome2 eutils
 DESCRIPTION="Gnome Virtual Filesystem"
 HOMEPAGE="http://www.gnome.org/"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+KEYWORDS="x86 ~ppc ~alpha ~sparc"
 LICENSE="GPL-2 LGPL-2.1"
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.2.1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.2.5.ebuild
index d3b65ba60462..075962acda14 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.2.1.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.2.5.ebuild
@@ -1,16 +1,15 @@
 # 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.1.ebuild,v 1.3 2003/02/17 13:29:48 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.2.5.ebuild,v 1.1 2003/05/22 12:36:33 foser Exp $
 
 IUSE="doc ssl"
 
 inherit gnome2 eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Gnome Virtual Filesystem"
 HOMEPAGE="http://www.gnome.org/"
 SLOT="2"
-KEYWORDS="x86 ~ppc ~alpha"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc"
 LICENSE="GPL-2 LGPL-2.1"
 
 RDEPEND=">=dev-libs/glib-2
@@ -20,31 +19,22 @@ RDEPEND=">=dev-libs/glib-2
 	>=gnome-base/bonobo-activation-1
 	>=dev-libs/libxml2-2.2.8
 	>=gnome-base/gnome-mime-data-2
-	>=sys-devel/gettext-0.10.40
 	app-admin/fam-oss	
 	ssl? ( >=dev-libs/openssl-0.9.5 )"
 
 DEPEND="${RDEPEND}
-	>=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"
-
-src_unpack() {
-	unpack ${A}
-
-	# fixes oggs with id3 tags detection
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-2-oggdetect.diff
-}
-
-src_compile() {
-	gnome2_src_compile DESTDIR=${D}
-}
+                                                                                
+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
 }