Version bump, remove old.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/net-ftp/bareftp/ChangeLog b/net-ftp/bareftp/ChangeLog
index 2f975258bc7afd3692977b033a5e35167ca0d4a6..1e3a7be97a0a1e896f903c4b567a5726dfd2f1f2 100644 (file)
--- 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/Manifest b/net-ftp/bareftp/Manifest
index 93fc1671b909bf1a4c416a1d5d180a4a8415ca96..99d73c4fae008b4cfe8f21aba8351020868b4aad 100644 (file)
--- a/net-ftp/bareftp/Manifest
+++ b/net-ftp/bareftp/Manifest
@@ -1,17 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX bareftp-0.2.2-script.patch 1999 RMD160 f7c68f8453ebaf6691eb470e51ea7925455de705 SHA1 196994f504221cbd221da7f8210da3cb3998588b SHA256 0410b17ba0dc11b0366c74af66781ce55d96bba6c9661a824b5684b2919b5954
-DIST bareftp-0.2.2.tar.gz 605679 RMD160 ec15705ef924a4fe524030d106fd846ecc7dcafa SHA1 5360e0a3aa2a165c3c56f4c38d3bd274168f3782 SHA256 013206261230a008de1df11746b341e15e39b3c3930d5d458e452b27e05fb5a2
-DIST bareftp-0.2.3.tar.gz 540962 RMD160 dfdd611f87cd492bd2bc7f553310d1af18ca5d3d SHA1 2a3527bd337da1ddeb2589aff4bbefa7eb7feefd SHA256 15aa42386bd55a1a6f7f8a7e86f4b9bdf4b43aec993f60dfe77d2a8a28f1a0a6
-EBUILD bareftp-0.2.2.ebuild 863 RMD160 8ef9be767b4e715b20820c19e87afe39d6cb39c0 SHA1 b0a5efce4d25a028da8563a0f8be37d5e816ff09 SHA256 cc6ad2ec2f2b7c7cf00b6735e60c7164839575cc866da39a189ffe1620a4d1fb
-EBUILD bareftp-0.2.3.ebuild 747 RMD160 5887b60e8b16c76c7e38ae0b34a961557d5d1f4f SHA1 177f46f72b8b36efbb087888dcc99e8bf6f5d3a2 SHA256 82f29cd4aa40095830d83e44da16e58248461c57ae54302a697a1f82949fcaf7
-MISC ChangeLog 699 RMD160 21fec0477648d686461aaa7e1bf55d130d573a9d SHA1 3c7d04ef8849d14f78a2b5d823ea824fe0120f47 SHA256 8896b9e8286226528491b40173752b96ac7b409f0d6e1c59c1dfdce6f68cf086
+DIST bareftp-0.3.4.tar.gz 555912 RMD160 0c5c3d93a499ba76804b9991a37c716f456676a3 SHA1 e57144cf18382d5055b3a0e465b597bc52d0592c SHA256 21097c36096ff361d356284d0ed7dc30c8a797f93ee3019b394cecb759b69762
+EBUILD bareftp-0.3.4.ebuild 1497 RMD160 962e3be9ce0f5c44b9494a0900eda40af6ad55ea SHA1 1f93af53a528287df06618450e850b0261da5f62 SHA256 cc2c48c79919b30dcf9da90d9ab4f1b792099946c37c861de13f03d56f0ce2c5
+MISC ChangeLog 991 RMD160 22ca5d0ac7d8ea210e1959256eb87779cdb588bd SHA1 a4bcd80f9369169d3244a468bc7271dd3b58bfd2 SHA256 4ec198e78b069ec7238c9fac45c0ec531983166a786cf7364b455de54195589d
 MISC metadata.xml 159 RMD160 41527b6d3fa74dfdcd619b7d91c478b72ecc8ae8 SHA1 ac19a418765e817e54d4c54c1992c9062d5dcf3e SHA256 986c3e2fa3baa5d6e8c0b5c27a2550601780d0cc7857f7f1c01523491706d909
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkqqNSMACgkQAiZjviIA2XiJ+gCgnmXbPr2+iZizT+iSR5Aw6mYv
-MtsAnRwlmZHwg1JgraLqPmVUXDBHWoe7
-=xpxt
+iEYEARECAAYFAkwvgVsACgkQCaWpQKGI+9SEHQCfYVP7mBCEJfiJSsAGBOuIS8Oa
+E28AnReaxd8g5WSC0c/SwpL39kSh8zM/
+=DaTI
 -----END PGP SIGNATURE-----

diff --git a/net-ftp/bareftp/bareftp-0.2.2.ebuild b/net-ftp/bareftp/bareftp-0.2.2.ebuild
deleted file mode 100644 (file)
index 03af4b0..0000000
--- 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 (file)
index 7133da8..0000000
--- 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 (file)
index 0000000..4bebe98
--- /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 (file)
index 9fbd557..0000000
--- 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 "$@"