new release, remove unused dir by default

8 files changed, 82 insertions, 86 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index baa254bcaa6c..6165b97f5f30 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.86 2004/04/17 09:19:08 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.87 2004/04/19 16:06:23 foser Exp $
+
+*gnome-vfs-2.6.1 (19 Apr 2004)
+
+  19 Apr 2004; foser <foser@gentoo.org> gnome-vfs-{1.0.5-r3,2.6.1}.ebuild :
+  2.6.1 : New release, added gnutls USE support (still defaults to ssl if both are enabled)
+  1.0.5-r3 & 2.6.1 : Remove unused dir /usr/doc (#46567)
 
   17 Apr 2004; Travis Tilley <lv@gentoo.org> gnome-vfs-2.4.2-r1.ebuild:
   stable on amd64
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
deleted file mode 100644
index 9cd7198bffa2..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2c7908e98b482add387e305619cfe4aa gnome-vfs-2.4.0.tar.bz2 1092146
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.4.1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.4.1
deleted file mode 100644
index 4ea37b9ada8a..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cb7a36076f6a65e40c7f540be3057310 gnome-vfs-2.4.1.tar.bz2 1060029
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.6.1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.6.1
new file mode 100644
index 000000000000..8b4a00ba004c
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.6.1
@@ -0,0 +1 @@
+MD5 c192cd126ff5bf113348e21385c3fb5e gnome-vfs-2.6.1.tar.bz2 1482123
diff --git a/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild b/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild
index 990b2adf9c9d..00a563bb50a3 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-1.0.5-r3.ebuild,v 1.10 2004/04/01 08:53:12 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild,v 1.11 2004/04/19 16:06:23 foser Exp $
 
 IUSE="ssl nls"
 
@@ -68,5 +68,7 @@ src_compile() {
 src_install() {
 	einstall || die
 
+	rmdir ${D}/usr/doc
+
 	dodoc AUTHORS COPYING* ChangeLog NEWS README
 }
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.4.0.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.4.0.ebuild
deleted file mode 100644
index 4f44a19565fd..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.4.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2004 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.12 2004/04/01 08:53:12 leonardop Exp $
-
-inherit gnome2 eutils
-
-IUSE="doc ssl"
-
-SLOT="2"
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="http://www.gnome.org/"
-KEYWORDS="x86 ppc alpha sparc hppa amd64 ia64"
-LICENSE="GPL-2 LGPL-2.1"
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-base/gconf-1.2
-	>=gnome-base/ORBit2-2.4
-	>=gnome-base/libbonobo-2
-	>=dev-libs/libxml2-2.2.8
-	>=gnome-base/gnome-mime-data-2
-
-	app-admin/fam
-	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} $(use_enable ssl openssl) --disable-schemas-install"
-
-src_install() {
-
-	gnome2_src_install
-
-	# FIXME: there are cleaner ways to do this
-	echo "trash:    libvfolder-desktop" >> ${D}/etc/gnome-vfs-2.0/modules/default-modules.conf
-
-}
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.4.1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.4.1.ebuild
deleted file mode 100644
index 99fdb21d9949..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.4.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2004 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.5 2004/01/29 04:47:41 agriffis Exp $
-
-inherit gnome2 eutils
-
-IUSE="doc ssl"
-
-SLOT="2"
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="http://www.gnome.org/"
-KEYWORDS="x86 ~ppc alpha sparc hppa ~amd64 ia64"
-LICENSE="GPL-2 LGPL-2.1"
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-base/gconf-1.2
-	>=gnome-base/ORBit2-2.4
-	>=gnome-base/libbonobo-2
-	>=dev-libs/libxml2-2.2.8
-	>=gnome-base/gnome-mime-data-2
-
-	app-admin/fam
-	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} $(use_enable ssl openssl) --disable-schemas-install"
-
-src_install() {
-
-	gnome2_src_install
-
-	# FIXME: there are cleaner ways to do this
-	echo "trash:    libvfolder-desktop" >> ${D}/etc/gnome-vfs-2.0/modules/default-modules.conf
-
-}
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.6.1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.6.1.ebuild
new file mode 100644
index 000000000000..01f45e1f37f7
--- /dev/null
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.6.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2004 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.6.1.ebuild,v 1.1 2004/04/19 16:06:23 foser Exp $
+
+inherit gnome2 eutils
+
+IUSE="doc ssl gnutls  samba ipv6"
+
+SLOT="2"
+
+DESCRIPTION="Gnome Virtual Filesystem"
+HOMEPAGE="http://www.gnome.org/"
+
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~mips ~ia64"
+LICENSE="GPL-2 LGPL-2"
+
+RDEPEND=">=dev-libs/glib-2
+	>=gnome-base/gconf-1.2
+	>=gnome-base/ORBit2-2.9
+	>=gnome-base/libbonobo-2
+	>=dev-libs/libxml2-2.2.8
+
+	gnome-base/gnome-mime-data
+	x11-misc/shared-mime-info
+
+	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"