diff options
| -rw-r--r-- | net-ftp/filezilla/ChangeLog | 9 | ||||
| -rw-r--r-- | net-ftp/filezilla/files/filezilla-3.2.4.1-gnutls-2.7.patch | 11 | ||||
| -rw-r--r-- | net-ftp/filezilla/filezilla-3.3.0.1.ebuild | 4 | ||||
| -rw-r--r-- | net-ftp/filezilla/filezilla-3.3.1.ebuild | 48 | ||||
| -rw-r--r-- | net-ftp/filezilla/filezilla-3.3.2.1.ebuild | 48 | ||||
| -rw-r--r-- | net-ftp/filezilla/filezilla-3.3.2.ebuild | 48 | ||||
| -rw-r--r-- | net-ftp/filezilla/filezilla-3.3.3-r1.ebuild | 4 | ||||
| -rw-r--r-- | net-ftp/filezilla/filezilla-3.3.3.ebuild | 4 |
8 files changed, 14 insertions, 162 deletions
diff --git a/net-ftp/filezilla/ChangeLog b/net-ftp/filezilla/ChangeLog index 6c4ee8ddd310..89f99e883fa0 100644 --- a/net-ftp/filezilla/ChangeLog +++ b/net-ftp/filezilla/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-ftp/filezilla # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.67 2010/06/23 12:42:10 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.68 2010/08/19 19:00:02 voyageur Exp $ + + 19 Aug 2010; Bernard Cafarelli <voyageur@gentoo.org> + -files/filezilla-3.2.4.1-gnutls-2.7.patch, filezilla-3.3.0.1.ebuild, + -filezilla-3.3.1.ebuild, -filezilla-3.3.2.ebuild, + -filezilla-3.3.2.1.ebuild, filezilla-3.3.3.ebuild, + filezilla-3.3.3-r1.ebuild: + Fix depend on wxGTK:2.8, bug #332709 by Martin Wegner <public@mroot.net> 23 Jun 2010; Bernard Cafarelli <voyageur@gentoo.org> filezilla-3.3.0.1.ebuild, filezilla-3.3.1.ebuild, filezilla-3.3.2.ebuild, diff --git a/net-ftp/filezilla/files/filezilla-3.2.4.1-gnutls-2.7.patch b/net-ftp/filezilla/files/filezilla-3.2.4.1-gnutls-2.7.patch deleted file mode 100644 index 7e9dbfa260b5..000000000000 --- a/net-ftp/filezilla/files/filezilla-3.2.4.1-gnutls-2.7.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in.orig 2009-05-07 15:27:48.000000000 +0200 -+++ configure.in 2009-05-07 15:33:53.000000000 +0200 -@@ -319,7 +319,7 @@ - # GnuTLS - # ------ - -- AM_PATH_LIBGNUTLS(2.0.4,, AC_MSG_ERROR([[ -+ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 2.0.4,, AC_MSG_ERROR([[ - *** - *** libgnutls 2.0.4 or greater was not found. You may want to get it from - *** ftp://ftp.gnutls.org/pub/gnutls/]])) diff --git a/net-ftp/filezilla/filezilla-3.3.0.1.ebuild b/net-ftp/filezilla/filezilla-3.3.0.1.ebuild index c9c75c0c1da6..cdaee9545b98 100644 --- a/net-ftp/filezilla/filezilla-3.3.0.1.ebuild +++ b/net-ftp/filezilla/filezilla-3.3.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.3.0.1.ebuild,v 1.7 2010/06/23 12:42:10 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.3.0.1.ebuild,v 1.8 2010/08/19 19:00:02 voyageur Exp $ EAPI=2 @@ -23,7 +23,7 @@ IUSE="dbus nls test" RDEPEND=">=app-admin/eselect-wxwidgets-0.7-r1 net-dns/libidn >=net-libs/gnutls-2.8.3 - >=x11-libs/wxGTK-2.8.9[X] + >=x11-libs/wxGTK-2.8.9:2.8[X] dbus? ( sys-apps/dbus )" DEPEND="${RDEPEND} dev-util/pkgconfig diff --git a/net-ftp/filezilla/filezilla-3.3.1.ebuild b/net-ftp/filezilla/filezilla-3.3.1.ebuild deleted file mode 100644 index c195badcb2be..000000000000 --- a/net-ftp/filezilla/filezilla-3.3.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.3.1.ebuild,v 1.3 2010/06/23 12:42:10 voyageur Exp $ - -EAPI=2 - -WX_GTK_VER="2.8" - -inherit eutils multilib wxwidgets - -MY_PV=${PV/_/-} -MY_P="FileZilla_${MY_PV}" - -DESCRIPTION="FTP client with lots of useful features and an intuitive interface" -HOMEPAGE="http://filezilla-project.org/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86" -IUSE="dbus nls test" - -RDEPEND=">=app-admin/eselect-wxwidgets-0.7-r1 - net-dns/libidn - >=net-libs/gnutls-2.8.3 - >=x11-libs/wxGTK-2.8.9[X] - dbus? ( sys-apps/dbus )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=sys-devel/libtool-1.4 - nls? ( >=sys-devel/gettext-0.11 ) - test? ( dev-util/cppunit )" - -S="${WORKDIR}"/${PN}-${MY_PV} - -src_configure() { - econf $(use_with dbus) $(use_enable nls locales) \ - --with-tinyxml=builtin \ - --disable-autoupdatecheck || die "econf failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - doicon src/interface/resources/48x48/${PN}.png || die "doicon failed" - - dodoc AUTHORS ChangeLog NEWS -} diff --git a/net-ftp/filezilla/filezilla-3.3.2.1.ebuild b/net-ftp/filezilla/filezilla-3.3.2.1.ebuild deleted file mode 100644 index 09e0a88dac6a..000000000000 --- a/net-ftp/filezilla/filezilla-3.3.2.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.3.2.1.ebuild,v 1.3 2010/06/23 12:42:10 voyageur Exp $ - -EAPI=2 - -WX_GTK_VER="2.8" - -inherit eutils multilib wxwidgets - -MY_PV=${PV/_/-} -MY_P="FileZilla_${MY_PV}" - -DESCRIPTION="FTP client with lots of useful features and an intuitive interface" -HOMEPAGE="http://filezilla-project.org/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86" -IUSE="dbus nls test" - -RDEPEND=">=app-admin/eselect-wxwidgets-0.7-r1 - net-dns/libidn - >=net-libs/gnutls-2.8.3 - >=x11-libs/wxGTK-2.8.9[X] - dbus? ( sys-apps/dbus )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=sys-devel/libtool-1.4 - nls? ( >=sys-devel/gettext-0.11 ) - test? ( dev-util/cppunit )" - -S="${WORKDIR}"/${PN}-${MY_PV} - -src_configure() { - econf $(use_with dbus) $(use_enable nls locales) \ - --with-tinyxml=builtin \ - --disable-autoupdatecheck || die "econf failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - doicon src/interface/resources/48x48/${PN}.png || die "doicon failed" - - dodoc AUTHORS ChangeLog NEWS -} diff --git a/net-ftp/filezilla/filezilla-3.3.2.ebuild b/net-ftp/filezilla/filezilla-3.3.2.ebuild deleted file mode 100644 index a2f0875c7fe3..000000000000 --- a/net-ftp/filezilla/filezilla-3.3.2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.3.2.ebuild,v 1.3 2010/06/23 12:42:10 voyageur Exp $ - -EAPI=2 - -WX_GTK_VER="2.8" - -inherit eutils multilib wxwidgets - -MY_PV=${PV/_/-} -MY_P="FileZilla_${MY_PV}" - -DESCRIPTION="FTP client with lots of useful features and an intuitive interface" -HOMEPAGE="http://filezilla-project.org/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86" -IUSE="dbus nls test" - -RDEPEND=">=app-admin/eselect-wxwidgets-0.7-r1 - net-dns/libidn - >=net-libs/gnutls-2.8.3 - >=x11-libs/wxGTK-2.8.9[X] - dbus? ( sys-apps/dbus )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=sys-devel/libtool-1.4 - nls? ( >=sys-devel/gettext-0.11 ) - test? ( dev-util/cppunit )" - -S="${WORKDIR}"/${PN}-${MY_PV} - -src_configure() { - econf $(use_with dbus) $(use_enable nls locales) \ - --with-tinyxml=builtin \ - --disable-autoupdatecheck || die "econf failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - doicon src/interface/resources/48x48/${PN}.png || die "doicon failed" - - dodoc AUTHORS ChangeLog NEWS -} diff --git a/net-ftp/filezilla/filezilla-3.3.3-r1.ebuild b/net-ftp/filezilla/filezilla-3.3.3-r1.ebuild index daafdc0b892b..f465bf6f6ecd 100644 --- a/net-ftp/filezilla/filezilla-3.3.3-r1.ebuild +++ b/net-ftp/filezilla/filezilla-3.3.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.3.3-r1.ebuild,v 1.2 2010/06/23 12:42:10 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.3.3-r1.ebuild,v 1.3 2010/08/19 19:00:02 voyageur Exp $ EAPI=2 @@ -24,7 +24,7 @@ RDEPEND=">=app-admin/eselect-wxwidgets-0.7-r1 dev-libs/tinyxml[-stl] net-dns/libidn >=net-libs/gnutls-2.8.3 - >=x11-libs/wxGTK-2.8.9[X] + >=x11-libs/wxGTK-2.8.9:2.8[X] dbus? ( sys-apps/dbus )" DEPEND="${RDEPEND} dev-util/pkgconfig diff --git a/net-ftp/filezilla/filezilla-3.3.3.ebuild b/net-ftp/filezilla/filezilla-3.3.3.ebuild index 73b475b98543..a36708de3b09 100644 --- a/net-ftp/filezilla/filezilla-3.3.3.ebuild +++ b/net-ftp/filezilla/filezilla-3.3.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.3.3.ebuild,v 1.2 2010/06/23 12:42:10 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.3.3.ebuild,v 1.3 2010/08/19 19:00:02 voyageur Exp $ EAPI=2 @@ -23,7 +23,7 @@ IUSE="dbus nls test" RDEPEND=">=app-admin/eselect-wxwidgets-0.7-r1 net-dns/libidn >=net-libs/gnutls-2.8.3 - >=x11-libs/wxGTK-2.8.9[X] + >=x11-libs/wxGTK-2.8.9:2.8[X] dbus? ( sys-apps/dbus )" DEPEND="${RDEPEND} dev-util/pkgconfig |