Update gnutls dependency, thanks Nils Stöckmann in bug #517014. Also clean some versions

(Portage version: 2.2.11/cvs/Linux x86_64, signed Manifest commit with key C74525F2)

5 files changed, 8 insertions, 207 deletions

diff --git a/net-ftp/filezilla/ChangeLog b/net-ftp/filezilla/ChangeLog
index 20d40c0be180..f4a887a4c47f 100644
--- a/net-ftp/filezilla/ChangeLog
+++ b/net-ftp/filezilla/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/filezilla
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.116 2014/06/02 12:27:36 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.117 2014/08/05 13:12:28 voyageur Exp $
+
+  05 Aug 2014; Bernard Cafarelli <voyageur@gentoo.org> -filezilla-3.7.4.ebuild,
+  -filezilla-3.7.4.1.ebuild, -filezilla-3.8.0.ebuild, filezilla-3.8.1.ebuild:
+  Update gnutls dependency, thanks Nils Stöckmann in bug #517014. Also clean
+  some versions
 
 *filezilla-3.8.1 (02 Jun 2014)
 
diff --git a/net-ftp/filezilla/filezilla-3.7.4.1.ebuild b/net-ftp/filezilla/filezilla-3.7.4.1.ebuild
deleted file mode 100644
index 24392082360a..000000000000
--- a/net-ftp/filezilla/filezilla-3.7.4.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.7.4.1.ebuild,v 1.1 2014/02/12 09:02:12 voyageur Exp $
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-
-inherit autotools eutils flag-o-matic 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 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-IUSE="aqua dbus nls test"
-
-RDEPEND=">=app-admin/eselect-wxwidgets-0.7-r1
-	>=dev-db/sqlite-3.7
-	>=dev-libs/tinyxml-2.6.1-r1[stl]
-	net-dns/libidn
-	>=net-libs/gnutls-2.8.3
-	aqua? ( >=x11-libs/wxGTK-2.8.12:2.8[aqua] )
-	!aqua? ( >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils )
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.7.4-debug.patch
-	append-cppflags -DTIXML_USE_STL
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-tinyxml=system \
-		--disable-autoupdatecheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	doicon src/interface/resources/48x48/${PN}.png
-
-	dodoc AUTHORS ChangeLog NEWS
-
-	if use aqua ; then
-		cat > "${T}/${PN}" <<-EOF
-			#!${EPREFIX}/bin/bash
-			open "${EPREFIX}"/Applications/FileZilla.app
-		EOF
-		rm "${ED}/usr/bin/${PN}" || die
-		dobin "${T}/${PN}"
-		insinto /Applications
-		doins -r "${S}"/FileZilla.app
-	fi
-}
diff --git a/net-ftp/filezilla/filezilla-3.7.4.ebuild b/net-ftp/filezilla/filezilla-3.7.4.ebuild
deleted file mode 100644
index 854b3c000676..000000000000
--- a/net-ftp/filezilla/filezilla-3.7.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.7.4.ebuild,v 1.1 2014/02/10 00:06:52 voyageur Exp $
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-
-inherit autotools eutils flag-o-matic 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 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-IUSE="aqua dbus nls test"
-
-RDEPEND=">=app-admin/eselect-wxwidgets-0.7-r1
-	>=dev-db/sqlite-3.7
-	>=dev-libs/tinyxml-2.6.1-r1[stl]
-	net-dns/libidn
-	>=net-libs/gnutls-2.8.3
-	aqua? ( >=x11-libs/wxGTK-2.8.12:2.8[aqua] )
-	!aqua? ( >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils )
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.7.4-debug.patch
-	append-cppflags -DTIXML_USE_STL
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-tinyxml=system \
-		--disable-autoupdatecheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	doicon src/interface/resources/48x48/${PN}.png
-
-	dodoc AUTHORS ChangeLog NEWS
-
-	if use aqua ; then
-		cat > "${T}/${PN}" <<-EOF
-			#!${EPREFIX}/bin/bash
-			open "${EPREFIX}"/Applications/FileZilla.app
-		EOF
-		rm "${ED}/usr/bin/${PN}" || die
-		dobin "${T}/${PN}"
-		insinto /Applications
-		doins -r "${S}"/FileZilla.app
-	fi
-}
diff --git a/net-ftp/filezilla/filezilla-3.8.0.ebuild b/net-ftp/filezilla/filezilla-3.8.0.ebuild
deleted file mode 100644
index 1b25683369d9..000000000000
--- a/net-ftp/filezilla/filezilla-3.8.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.8.0.ebuild,v 1.1 2014/03/28 16:53:05 voyageur Exp $
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-
-inherit autotools eutils flag-o-matic 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 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-IUSE="aqua dbus nls test"
-
-RDEPEND=">=app-admin/eselect-wxwidgets-0.7-r1
-	>=dev-db/sqlite-3.7
-	>=dev-libs/tinyxml-2.6.1-r1[stl]
-	net-dns/libidn
-	>=net-libs/gnutls-2.8.3
-	aqua? ( >=x11-libs/wxGTK-2.8.12:2.8[aqua] )
-	!aqua? ( >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils )
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.7.4-debug.patch
-	append-cppflags -DTIXML_USE_STL
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-tinyxml=system \
-		--disable-autoupdatecheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	doicon src/interface/resources/48x48/${PN}.png
-
-	dodoc AUTHORS ChangeLog NEWS
-
-	if use aqua ; then
-		cat > "${T}/${PN}" <<-EOF
-			#!${EPREFIX}/bin/bash
-			open "${EPREFIX}"/Applications/FileZilla.app
-		EOF
-		rm "${ED}/usr/bin/${PN}" || die
-		dobin "${T}/${PN}"
-		insinto /Applications
-		doins -r "${S}"/FileZilla.app
-	fi
-}
diff --git a/net-ftp/filezilla/filezilla-3.8.1.ebuild b/net-ftp/filezilla/filezilla-3.8.1.ebuild
index 701933aa2925..58e2fd70968a 100644
--- a/net-ftp/filezilla/filezilla-3.8.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.8.1.ebuild,v 1.1 2014/06/02 12:27:36 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.8.1.ebuild,v 1.2 2014/08/05 13:12:28 voyageur Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ RDEPEND=">=app-admin/eselect-wxwidgets-0.7-r1
 	>=dev-db/sqlite-3.7
 	>=dev-libs/tinyxml-2.6.1-r1[stl]
 	net-dns/libidn
-	>=net-libs/gnutls-2.8.3
+	>=net-libs/gnutls-3.1.12
 	aqua? ( >=x11-libs/wxGTK-2.8.12:2.8[aqua] )
 	!aqua? ( >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils )
 	dbus? ( sys-apps/dbus )"