New version, looking towards a last 2.6 GNOME stable release

4 files changed, 86 insertions, 19 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 88959774896a..88ed899e1851 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.103 2004/08/22 13:00:25 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.104 2004/09/13 08:50:42 obz Exp $
+
+*gnome-vfs-2.6.2 (13 Sep 2004)
+
+  13 Sep 2004; Mike Gardiner <obz@gentoo.org> +gnome-vfs-2.6.2.ebuild:
+  New version, looking towards a last 2.6 GNOME stable release
 
   22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> gnome-vfs-2.6.1.1.ebuild:
   Stable on alpha.
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index b4b8b608be15..b4ae1783bea7 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,24 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 656a39e03a11e2ddc335c9f162ab76fe ChangeLog 12126
-MD5 71e8a4ac243ac10eb5cd459595d1737e gnome-vfs-1.0.5-r3.ebuild 1747
+MD5 8d2dab77b3ce6081125aca8cd297a3ab gnome-vfs-2.6.0.ebuild 1315
+MD5 38c1c3722f6f3174c951fb9e2f9a23d2 gnome-vfs-2.4.2-r1.ebuild 1049
+MD5 80dad5a0ab8a18445dc7ef2240ca5d1e gnome-vfs-2.6.2.ebuild 1760
 MD5 38f23893e0d8dec0b7f75f477937b84b gnome-vfs-2.6.1.1.ebuild 1759
+MD5 71e8a4ac243ac10eb5cd459595d1737e gnome-vfs-1.0.5-r3.ebuild 1747
+MD5 debd5554945a5d5296eb26aae6643120 ChangeLog 12290
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 38c1c3722f6f3174c951fb9e2f9a23d2 gnome-vfs-2.4.2-r1.ebuild 1049
-MD5 8d2dab77b3ce6081125aca8cd297a3ab gnome-vfs-2.6.0.ebuild 1315
-MD5 a88e201c8f2ec5444db0bea2e8c302b4 files/digest-gnome-vfs-1.0.5-r3 68
-MD5 6126fab0b179eb680b819593f4bf1412 files/digest-gnome-vfs-2.6.1.1 71
 MD5 5decf8bb73287c8ce01500e5cd0ee463 files/digest-gnome-vfs-2.4.2-r1 69
+MD5 6126fab0b179eb680b819593f4bf1412 files/digest-gnome-vfs-2.6.1.1 71
+MD5 a88e201c8f2ec5444db0bea2e8c302b4 files/digest-gnome-vfs-1.0.5-r3 68
 MD5 48146c7a23e8af499720b290a58b7417 files/digest-gnome-vfs-2.6.0 69
+MD5 b9a8c5cd605a7e483e1b93edee7155c0 files/digest-gnome-vfs-2.6.2 69
+MD5 7320d4ac9d4f99766075061daa53ea63 files/1.0/gnome-vfs-1.0.5-gtkdoc_fixes.patch 4892
+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
-MD5 7320d4ac9d4f99766075061daa53ea63 files/1.0/gnome-vfs-1.0.5-gtkdoc_fixes.patch 4892
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBP0QvHTu7gpaalycRAqRaAKDQyZboGEJDHRCmyTx/O9SuxQqsRQCfRV6R
-YxyW5ICS3bcbFHRRgXXPMxU=
-=rPLl
------END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.6.2 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.6.2
new file mode 100644
index 000000000000..079fafdabbd0
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.6.2
@@ -0,0 +1 @@
+MD5 61bf3e145652089c63edd423ecbc9eba gnome-vfs-2.6.2.tar.bz2 1372181
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.6.2.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.6.2.ebuild
new file mode 100644
index 000000000000..a559222f1af3
--- /dev/null
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.6.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.6.2.ebuild,v 1.1 2004/09/13 08:50:42 obz Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Gnome Virtual Filesystem"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~mips ~ia64 ~ppc64"
+IUSE="doc ssl gnutls  samba ipv6"
+
+RDEPEND=">=dev-libs/glib-2
+	>=gnome-base/gconf-1.2
+	>=gnome-base/orbit-2.9
+	>=gnome-base/libbonobo-2
+	>=dev-libs/libxml2-2.2.8
+
+	gnome-base/gnome-mime-data
+	>=x11-misc/shared-mime-info-0.14
+
+	app-admin/fam
+
+	ssl? ( >=dev-libs/openssl-0.9.5
+		!gnome-extra/gnome-vfs-sftp )
+	gnutls? ( !ssl? ( net-libs/gnutls
+			!gnome-extra/gnome-vfs-sftp ) )
+
+	samba? ( >=net-fs/samba-3
+		!gnome-extra/gnome-vfs-extras )"
+# ssl/gnutls USE deps : if both are enabled choose openssl
+# foser <foser@gentoo.org> 19 Apr 2004
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.29
+	>=dev-util/pkgconfig-0.12.0
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+G2CONF="${G2CONF} \
+	$(use_enable ssl openssl) \
+	$(use_enable gnutls) \
+	$(use_enable samba) \
+	$(use_enable ipv6) \
+	--disable-schemas-install
+	--without-gtk"
+
+# this works because of the order of conifgure parsing
+# so should always be behind the use_enable options
+# foser <foser@gentoo.org 19 Apr 2004
+use gnutls && use ssl && G2CONF="${G2CONF} --disable-gnutls"
+
+DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README TODO"
+
+src_install() {
+
+	gnome2_src_install
+
+	# remove unused dir (#46567)
+	rmdir ${D}/usr/doc
+
+	# FIXME: there are cleaner ways to do this
+	echo "trash:    libvfolder-desktop" >> ${D}/etc/gnome-vfs-2.0/modules/default-modules.conf
+
+}
+
+# Fix bonobo 
+USE_DESTDIR="1"