Version bump, remove old.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 59 insertions, 137 deletions

diff --git a/net-ftp/bareftp/ChangeLog b/net-ftp/bareftp/ChangeLog
index 2f975258bc7a..1e3a7be97a0a 100644
--- a/net-ftp/bareftp/ChangeLog
+++ b/net-ftp/bareftp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-ftp/bareftp
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/bareftp/ChangeLog,v 1.3 2009/09/11 11:31:41 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/bareftp/ChangeLog,v 1.4 2010/07/03 18:28:37 pacho Exp $
+
+*bareftp-0.3.4 (03 Jul 2010)
+
+  03 Jul 2010; Pacho Ramos <pacho@gentoo.org> -bareftp-0.2.2.ebuild,
+  -files/bareftp-0.2.2-script.patch, -bareftp-0.2.3.ebuild,
+  +bareftp-0.3.4.ebuild:
+  Version bump with lots of bugfixes and fixing tests (bug #279892 by
+  Diego). Remove old and buggy versions.
 
   11 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   bareftp-0.2.2.ebuild, bareftp-0.2.3.ebuild:
diff --git a/net-ftp/bareftp/bareftp-0.2.2.ebuild b/net-ftp/bareftp/bareftp-0.2.2.ebuild
deleted file mode 100644
index 03af4b0c09b1..000000000000
--- a/net-ftp/bareftp/bareftp-0.2.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/bareftp/bareftp-0.2.2.ebuild,v 1.2 2009/09/11 11:31:41 flameeyes Exp $
-
-EAPI=2
-
-inherit mono eutils autotools gnome2
-
-DESCRIPTION="Mono based file transfer client"
-HOMEPAGE="http://www.bareftp.org/"
-SRC_URI="http://www.bareftp.org/release/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-RDEPEND=">=dev-lang/mono-2.0
-	>=dev-dotnet/gtk-sharp-2.12
-	>=dev-dotnet/gnome-sharp-2.20
-	>=dev-dotnet/gnomevfs-sharp-2.20
-	>=dev-dotnet/gconf-sharp-2.20"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	G2CONF="--disable-caches"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	epatch "${FILESDIR}/${PN}-0.2.2-script.patch"
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-	dodoc ChangeLog README || die "dodoc failed"
-}
diff --git a/net-ftp/bareftp/bareftp-0.2.3.ebuild b/net-ftp/bareftp/bareftp-0.2.3.ebuild
deleted file mode 100644
index 7133da864fb9..000000000000
--- a/net-ftp/bareftp/bareftp-0.2.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/bareftp/bareftp-0.2.3.ebuild,v 1.2 2009/09/11 11:31:41 flameeyes Exp $
-
-EAPI=2
-
-inherit mono gnome2
-
-DESCRIPTION="Mono based file transfer client"
-HOMEPAGE="http://www.bareftp.org/"
-SRC_URI="http://www.bareftp.org/release/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-RDEPEND=">=dev-lang/mono-2.0
-	>=dev-dotnet/gtk-sharp-2.12
-	>=dev-dotnet/gnome-sharp-2.20
-	>=dev-dotnet/gnomevfs-sharp-2.20
-	>=dev-dotnet/gconf-sharp-2.20"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	G2CONF="--disable-caches"
-}
-
-src_install() {
-	gnome2_src_install
-	dodoc ChangeLog README || die "dodoc failed"
-}
diff --git a/net-ftp/bareftp/bareftp-0.3.4.ebuild b/net-ftp/bareftp/bareftp-0.3.4.ebuild
new file mode 100644
index 000000000000..4bebe98a506c
--- /dev/null
+++ b/net-ftp/bareftp/bareftp-0.3.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/bareftp/bareftp-0.3.4.ebuild,v 1.1 2010/07/03 18:28:37 pacho Exp $
+
+EAPI=2
+
+inherit mono gnome2
+
+DESCRIPTION="Mono based file transfer client"
+HOMEPAGE="http://www.bareftp.org/"
+SRC_URI="http://www.bareftp.org/release/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="gnome-keyring"
+
+RDEPEND=">=dev-lang/mono-2.0
+	>=dev-dotnet/gtk-sharp-2.12
+	>=dev-dotnet/gnome-sharp-2.20
+	>=dev-dotnet/gnomevfs-sharp-2.20
+	>=dev-dotnet/gconf-sharp-2.20
+	gnome-keyring? ( >=dev-dotnet/gnome-keyring-sharp-1.0.0-r2 )"
+
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	G2CONF="--disable-caches
+		$(use_with gnome-keyring gnomekeyring)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix tests, bug #279892
+	echo "src/bareFTP.Gui.Dialog/AskFileAction.cs" >> po/POTFILES.in
+	echo "src/bareFTP.Gui.Dialog/gtk-gui/bareFTP.Gui.Dialog.ChmodDialog.cs" >> po/POTFILES.in
+	echo "src/bareFTP.Gui.Dialog/gtk-gui/bareFTP.Gui.Dialog.ExceptionDialog.cs" >> po/POTFILES.in
+	echo "src/bareFTP.Gui.FileManager/FileUtils.cs" >> po/POTFILES.in
+	echo "src/bareFTP.Gui.Preferences/BookmarkWidget.cs" >> po/POTFILES.in
+	echo "src/bareFTP.Gui/BookmarkUtils.cs" >> po/POTFILES.in
+	echo "src/bareFTP.Protocol.Sftp/sftp/SftpConnection.cs" >> po/POTFILES.in
+	echo "src/bareFTP/Main.cs" >> po/POTFILES.in
+}
+
+src_install() {
+	gnome2_src_install
+	dodoc ChangeLog README || die "dodoc failed"
+}
diff --git a/net-ftp/bareftp/files/bareftp-0.2.2-script.patch b/net-ftp/bareftp/files/bareftp-0.2.2-script.patch
deleted file mode 100644
index 9fbd557787e3..000000000000
--- a/net-ftp/bareftp/files/bareftp-0.2.2-script.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -NrU5 bareftp-0.2.2.orig/bareftp.in bareftp-0.2.2/bareftp.in
---- bareftp-0.2.2.orig/bareftp.in	1970-01-01 01:00:00.000000000 +0100
-+++ bareftp-0.2.2/bareftp.in	2009-04-21 15:30:53.000000000 +0200
-@@ -0,0 +1,2 @@
-+#!/bin/sh
-+exec @MONO@ @libdir@/bareftp/bareftp.exe $MONO_EXTRA_ARGS "$@"
-diff -NrU5 bareftp-0.2.2.orig/configure.ac bareftp-0.2.2/configure.ac
---- bareftp-0.2.2.orig/configure.ac	2009-04-21 15:37:34.000000000 +0200
-+++ bareftp-0.2.2/configure.ac	2009-04-21 16:01:52.000000000 +0200
-@@ -61,10 +61,12 @@
- AC_SUBST(LOCALE_DIR)
- 
- AC_OUTPUT([
- Makefile
- 
-+bareftp
-+
- m4/Makefile
- 
- data/Makefile
- data/icon-theme/Makefile
- po/Makefile.in
-diff -NrU5 bareftp-0.2.2.orig/Makefile.am bareftp-0.2.2/Makefile.am
---- bareftp-0.2.2.orig/Makefile.am	2009-04-21 15:37:34.000000000 +0200
-+++ bareftp-0.2.2/Makefile.am	2009-04-21 16:02:18.000000000 +0200
-@@ -1,5 +1,6 @@
-+ACLOCAL_AMFLAGS = -I m4/shamrock -I m4/bareftp
- 
- bin_SCRIPTS = bareftp 
- EXTRA_DIST = \
- 	script.in \
- 	intltool-extract.in \
-@@ -13,16 +14,10 @@
- 	  data \
- 	  src \
- 	  m4 \
- 	  po
- 
--REWRITE = \
--        sed -e "s|\@prefix\@|$(prefix)|g"               \
--            -e "s|\@pkglibdir\@|$(pkglibdir)|g"         \
--            -e "s|\@bindir\@|$(bindir)|g"		\
--	    -e "s|\@MONO\@|$(MONO)|g" 
--
- DISTCLEANFILES = \
-         *.bak \
-         *~ \
-         *.pidb \
-         intltool-extract \
-@@ -45,9 +40,5 @@
- 	intltool-extract.in \
- 	intltool-merge.in \
- 	intltool-update.in \
- 	mkinstalldirs \
- 	$(bin_SCRIPTS)
--                                                                                                              
--$(bin_SCRIPTS): $(srcdir)/script.in Makefile
--	$(REWRITE) $(srcdir)/script.in > $@.tmp
--	mv $@.tmp $@
-diff -NrU5 bareftp-0.2.2.orig/script.in bareftp-0.2.2/script.in
---- bareftp-0.2.2.orig/script.in	2009-04-21 15:37:34.000000000 +0200
-+++ bareftp-0.2.2/script.in	1970-01-01 01:00:00.000000000 +0100
-@@ -1,2 +0,0 @@
--#!/bin/sh
--exec @MONO@ @prefix@/lib/bareftp/bareftp.exe $MONO_EXTRA_ARGS "$@"