version bump, remove old

(Portage version: 2.2_rc9/cvs/Linux 2.6.20-vs2.2.0-gentoo i686)

5 files changed, 15 insertions, 82 deletions

diff --git a/sys-fs/sshfs-fuse/ChangeLog b/sys-fs/sshfs-fuse/ChangeLog
index 6e23d17ba72f..aefb31ad508b 100644
--- a/sys-fs/sshfs-fuse/ChangeLog
+++ b/sys-fs/sshfs-fuse/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-fs/sshfs-fuse
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/sshfs-fuse/ChangeLog,v 1.42 2008/03/16 14:28:48 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/sshfs-fuse/ChangeLog,v 1.43 2008/09/24 07:06:06 genstef Exp $
+
+  20 Sep 2008; Stefan Schweizer <genstef@gentoo.org>
+  -files/sshfs-fuse-2.6.0_pre3.patch, -sshfs-fuse-1.6.ebuild,
+  -sshfs-fuse-1.7.ebuild, -sshfs-fuse-1.8.ebuild, +sshfs-fuse-2.1.ebuild:
+  remove old
+
+*sshfs-fuse-2.1 (20 Sep 2008)
+
+  20 Sep 2008; Stefan Schweizer <genstef@gentoo.org> +sshfs-fuse-2.1.ebuild:
+  version bump
 
   16 Mar 2008; Ferris McCormick <fmccor@gentoo.org> sshfs-fuse-1.9.ebuild:
   Sparc stable --- Bug #211018 --- thanks to Friedrich Oslage for testing.
diff --git a/sys-fs/sshfs-fuse/files/sshfs-fuse-2.6.0_pre3.patch b/sys-fs/sshfs-fuse/files/sshfs-fuse-2.6.0_pre3.patch
deleted file mode 100644
index 4c2cf5296a00..000000000000
--- a/sys-fs/sshfs-fuse/files/sshfs-fuse-2.6.0_pre3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ur sshfs-fuse-1.6.orig/sshfs.c sshfs-fuse-1.6/sshfs.c
---- sshfs-fuse-1.6.orig/sshfs.c	2006-07-28 08:39:55.000000000 +0200
-+++ sshfs-fuse-1.6/sshfs.c	2006-07-28 08:40:30.000000000 +0200
-@@ -2349,14 +2349,14 @@
-     case KEY_HELP:
-         usage(outargs->argv[0]);
-         fuse_opt_add_arg(outargs, "-ho");
--        fuse_main(outargs->argc, outargs->argv, &sshfs_oper.oper);
-+        fuse_main(outargs->argc, outargs->argv, &sshfs_oper.oper, 0);
-         exit(1);
- 
-     case KEY_VERSION:
-         fprintf(stderr, "SSHFS version %s\n", PACKAGE_VERSION);
- #if FUSE_VERSION >= 25
-         fuse_opt_add_arg(outargs, "--version");
--        fuse_main(outargs->argc, outargs->argv, &sshfs_oper.oper);
-+        fuse_main(outargs->argc, outargs->argv, &sshfs_oper.oper, 0);
- #endif
-         exit(0);
- 
-@@ -2511,7 +2511,7 @@
-     check_large_read(&args);
-     g_free(tmp);
-     g_free(fsname);
--    res = fuse_main(args.argc, args.argv, cache_init(&sshfs_oper));
-+    res = fuse_main(args.argc, args.argv, cache_init(&sshfs_oper), 0);
-     fuse_opt_free_args(&args);
-     fuse_opt_free_args(&sshfs.ssh_args);
-     free(sshfs.directport);
diff --git a/sys-fs/sshfs-fuse/sshfs-fuse-1.6.ebuild b/sys-fs/sshfs-fuse/sshfs-fuse-1.6.ebuild
deleted file mode 100644
index 9951ea427cfa..000000000000
--- a/sys-fs/sshfs-fuse/sshfs-fuse-1.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/sshfs-fuse/sshfs-fuse-1.6.ebuild,v 1.10 2006/07/28 06:47:00 genstef Exp $
-
-inherit eutils
-
-DESCRIPTION="Fuse-filesystem utilizing the sftp service."
-SRC_URI="mirror://sourceforge/fuse/${P}.tar.gz"
-HOMEPAGE="http://fuse.sourceforge.net/sshfs.html"
-LICENSE="GPL-2"
-DEPEND=">=sys-fs/fuse-2.2.1
-	>=dev-libs/glib-2.4.2"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	if has_version '>=sys-fs/fuse-2.6.0_pre3'; then
-		epatch ${FILESDIR}/sshfs-fuse-2.6.0_pre3.patch
-	fi
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "emake install failed"
-	dodoc README NEWS ChangeLog AUTHORS
-}
diff --git a/sys-fs/sshfs-fuse/sshfs-fuse-1.7.ebuild b/sys-fs/sshfs-fuse/sshfs-fuse-1.7.ebuild
deleted file mode 100644
index 094612cb4837..000000000000
--- a/sys-fs/sshfs-fuse/sshfs-fuse-1.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/sshfs-fuse/sshfs-fuse-1.7.ebuild,v 1.6 2007/10/13 10:40:56 corsair Exp $
-
-inherit eutils
-
-DESCRIPTION="Fuse-filesystem utilizing the sftp service."
-SRC_URI="mirror://sourceforge/fuse/${P}.tar.gz"
-HOMEPAGE="http://fuse.sourceforge.net/sshfs.html"
-LICENSE="GPL-2"
-DEPEND=">=sys-fs/fuse-2.6.0_pre3
-	>=dev-libs/glib-2.4.2"
-KEYWORDS="~amd64 ~hppa ~ppc ppc64 sparc x86 ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-src_install() {
-	emake DESTDIR=${D} install || die "emake install failed"
-	dodoc README NEWS ChangeLog AUTHORS
-}
diff --git a/sys-fs/sshfs-fuse/sshfs-fuse-1.8.ebuild b/sys-fs/sshfs-fuse/sshfs-fuse-2.1.ebuild
index 1dc47b9c8622..16e140adfe0a 100644
--- a/sys-fs/sshfs-fuse/sshfs-fuse-1.8.ebuild
+++ b/sys-fs/sshfs-fuse/sshfs-fuse-2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/sshfs-fuse/sshfs-fuse-1.8.ebuild,v 1.7 2007/10/15 14:59:18 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/sshfs-fuse/sshfs-fuse-2.1.ebuild,v 1.1 2008/09/24 07:06:06 genstef Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ DEPEND=">=sys-fs/fuse-2.6.0_pre3
 	>=dev-libs/glib-2.4.2"
 RDEPEND="${DEPEND}
 	>=net-misc/openssh-4.3"
-KEYWORDS="amd64 ~hppa ~ppc ppc64 sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
 IUSE=""
 
@@ -23,6 +23,6 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "emake install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc README NEWS ChangeLog AUTHORS
 }