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

Package-Manager: portage-2.2.11/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

6 files changed, 14 insertions, 219 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/Manifest b/net-ftp/filezilla/Manifest
index 8d1a7fa3f86b..aa6b9dfa8da0 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -4,21 +4,15 @@ Hash: SHA256
 AUX filezilla-3.3.5.1-debug.patch 423 SHA256 6093c67c850f33d23ed278b601e269f08f38cba0b49090f4b0ad58ddbc961e2e SHA512 06ca4ba2c0fef72dc649324fd7045c7f353c17f4d8e87a885dfc70596fdbdb8b7dd56e4c87f0f4ed2b7a48f026bc710f8631e6dfa5d8325b6f0aabe8a8ba5745 WHIRLPOOL ce891e0c098e0a9b49167d8b135eee9c08c20b75c1f1af0bac20331a538166d7ef0fdec3d919fc3012fa5a95bb74422247bce6746e0ca6ecb56bbdbc2e5cdcaa
 AUX filezilla-3.7.4-debug.patch 404 SHA256 11ff65c718b4dce0b80a8263a7342d7ff2956150be20ba5947d9219738d7d01d SHA512 4f5ef17d9ead1066960e9b3f90e5395e5228b8672f759f87bbd8a5b4e40c0d874349380416b6fc0421f22fdcc259b980e0e3778ca35a5dcce692946b27bb3dcd WHIRLPOOL 402841fb82588662e8d999071e9bc47ad7c76feea80958fd1e2dee325bb51457851675963dd6909eac7c7d7cd449e015429ef49fd443d714bfd8592e2d6a5aea
 DIST FileZilla_3.7.3_src.tar.bz2 3682494 SHA256 2b012970a6033d8ffd4629b1d57b50ace62cd3750efad70001109f25e520c042 SHA512 b20ec013110e643dd0afca960b4577dd4f17ae744caf63be64e0c8435b8812064aebb4167d0efb186ba171b26967bbc61b6b22a8866b2460530f5793d7d5ecfb WHIRLPOOL acfceb3976f53abcce8da25ea1358761ee6e1a5f556e335067ed665b710fb4a873cce4f62916a19ec784a542db367bed9380a17df37c6ae200fa52e5cd7cc910
-DIST FileZilla_3.7.4.1_src.tar.bz2 3709078 SHA256 8be46f472c12d412c58b5a0b1be751c64bc5e7fceaa6b9170f8edbc7dbfa64a9 SHA512 6b957589eb275dce017450a629f08199abafe1e7a80c7d1fed34eba929fd5dd34883eb4fc756c448ba0ff41f65147872c5df5e27e3743c1759927756176743be WHIRLPOOL 30834ddd3ebb013551200852dcc106a2cd893ffa87d53378a0d83a9c5b928b12711319beeae2c884963e6721f06d463da42d0d98c6dbeff239027d08d3e182e4
-DIST FileZilla_3.7.4_src.tar.bz2 3707985 SHA256 20a6d5ce737a8cbb38786b53365547e5e71dd9086259bf0b4eb264e8dbbc11ce SHA512 22c92d7b154f265d08c840d5107f596e8398a7ae91e99615bc278eeaf69e70b653906e80be6cddf3125946765c3934e1b86212f6ae76925c8967e7032508aa2f WHIRLPOOL 12db80b9d651e84426c1359f31e0ee53b37e545f393bfddc234863d762e5d48f2d5ac973b14c06f078947eb66e8ebda8462cecf760dbdc35370705580903d461
-DIST FileZilla_3.8.0_src.tar.bz2 3749995 SHA256 8d9c1c9812f916f83676e1930933683828579b40a9fba331c4757f84a02ec308 SHA512 f30ba186de612bf0b3b80c90cee5ff155b6fb2d6f892b5981c5d1436c8b6381194ffea6f079b6afd292e7540bfb357a474eeed89907da739a737ef0095eabea0 WHIRLPOOL 52f041432b229dd907a17bf190cc5a3c2bec545ab78440d6c88809b2aeded23bfe7e4db01dcaad545041fe6fa36ede8dd60594f903279acc4ea53f94be7fb778
 DIST FileZilla_3.8.1_src.tar.bz2 4089186 SHA256 66bc9c082843ffdcb915c7902900b92bdf921ed7310f2a40ff6b96b03cfa1e4f SHA512 abe4b653ac0627f1dda8ae7b6bb3d1a92454b98ce69f6eb6fcced2e63b5d35edba578ba24f06b16218fcfd23edff21cc7c76fe1c7056efb129b081fddbd83101 WHIRLPOOL 94db8545244d1cd4bf0c3f4ed1daaabf150df262334c2311196b916a1d84d06026aa34707ce7d4e74a575a7eda18cb2da4c5e326d591bdc4bf71b69a6935fff9
 EBUILD filezilla-3.7.3.ebuild 1717 SHA256 b025df49825eb732896b5523bbf80f84662cbdd6687c4a10e2e1a1107dfcf7b3 SHA512 3d631d88e81d2d4029238ec2ef41326df3d2db6143f177e839a02da5efab9ece9015135ff129a3dcfbe300e276d143431cae0c8438ea9c864fc7c866c841978a WHIRLPOOL 4fe6afe4a0659735101884d8ed4039ff91b4b04a118947eefad11b568d494ac0e42464241b4bc16b8064e90bbd738d56776f739eb67a4f50ed77b022f2c86e28
-EBUILD filezilla-3.7.4.1.ebuild 1722 SHA256 c1ae5cb5bc1097d447f664048d452a23a1177909237676d5cdb61fe81b21650f SHA512 162ceb9e6266bf33c9fe93eb7d5fd50ec19c77e2c214059fc36aa7cdfa0349dd04ae187311b17e7c8faeda4baffb208c3eb600e134f36139335086b98d0c5947 WHIRLPOOL 5e7438b19696cd8050c2931d0573b11007d7b7256d0cd4d0e4471b8817196f8bc5aec6fa9c0d3f3fe764dddf4355263a545a9faaa5e0a0813767e6adf5aa0e76
-EBUILD filezilla-3.7.4.ebuild 1720 SHA256 f63908c87aef1e77904f401438f782b9a459d3e26466e9e830819ba7c7d5e4fc SHA512 c893d10262adf1f704b92c4a3a0f9452215a8b94c69a113e6ea00cec15936632404b9b68612883ba88b3bcc2c9263ea10aca6be5bdee9f3f32e98dbac8eebae5 WHIRLPOOL c0e0c8a67d0865b85504ec3cea43c6116aeef9756bfb3f8c6cdf6be67d254e9e5865e534919dfc8628836e21d5d60382560f3a678d2076382e30f1c332385ecc
-EBUILD filezilla-3.8.0.ebuild 1720 SHA256 a79cff5f56b4c8b80d113eddfc1b4f201c8c74f98dd8826e3771e52fdeee9e21 SHA512 0b102606946e1da779b7a467d26ae0d585f9bf90283a73dc9d625a426409a6f531413e831817a259ced93d602fe1a4ce3b6ea3557e81847335aeb534009dcc10 WHIRLPOOL f76f95e816bc21e3104a7e57e0d85bf693cca60770bb1cda76499188e6cbc825976bf2ccf3dc6fe236439f212ea327d586fe623c9a745c3f09c4561ddb624a7c
-EBUILD filezilla-3.8.1.ebuild 1720 SHA256 b082c0ab75672774349e60ef7f7d8d5f21c8a0fc3872e1e012d2facf24183efe SHA512 8b2644a875eec43742f2cbc524f7d48c701a2a57e4e5b1d271340544eca751c3575007a50ec251b07d825ac3e13c6fa5d4ad91421a44bccca6fe05e1d2f24f7e WHIRLPOOL c758ec8aad2fe62ab36a94fefd8f837812205f3b6ab18eb354f92f575acda6d8ad9e8c054720cc925a4c5c8dfee1e6596deb80aea4d4b409741258faf35eed3c
-MISC ChangeLog 20288 SHA256 78c55172abac42e9fcc8c44d09df3a020dfed1182948298e77ec63fece74cae4 SHA512 b981affb4b1f033303ce5f77cf3819d8eec3496325f3e028b8ea28b2c6fb864ef721faff3f1615b2e317af52c8173709aacdce2c1d84005c6b638ff29a7d060e WHIRLPOOL ebfbd854c8e1bb9cae492a6bc2a42c34d15276f9f1d910b86fc0eec4e45b59b81b189a02be4c6fe609b4522794fc230e56bc371a297403f629ff22d996867154
+EBUILD filezilla-3.8.1.ebuild 1721 SHA256 c1bd170f711f21200c06037df2e3a70a5bd7b7d09ab34ef25d90ac54e31833ae SHA512 095bbe4a9a24eb7fbf1dbc6876ee60b05da1d3063b1cc3773432dcc3962aee926e8baf860f5c18641289fb6c75948092118db98d0e45270c08f0e3cc3c028b96 WHIRLPOOL 1716ce0a039844f3bda43740edc7cc7758d2d1f87ec1c088b0bf23e267074f2d0e2ddf0c88414e47e0e251890fd61dbd9aa6627a350e5393a4c70b8d20e5bc71
+MISC ChangeLog 20541 SHA256 1112d534eee99c12b0f9805f7cd03a3fdd116574464e3c56ab6d8e428b122d64 SHA512 7c7dc1373975d83160580495e3c72f86a0f76e394b681040f1c85dc20b93c563e4a277d4fa51bd799956b9576b39a9e9d217add9aa4be317c478c493b9660d61 WHIRLPOOL e63cf699ef2379ee81ee2abea802368682d21a3051f985097fe203956f9c65b9623c8b59591f3e43cb0af88b4c94a7a7245b28f04ae3b58ab64fd8f944cbd246
 MISC metadata.xml 358 SHA256 13ba819a417c003a969b6557fd32a73ed49be658c3e0470c29a21ee807d5a28b SHA512 8008462bcccc0b22ea71170427d3318b3f403ad324bd3d2207b35b2344a5822b2b1c82c7cb379b99a08707853477a0887c65684c0b5de93b6782ae863569c373 WHIRLPOOL 5dac2fceebc89a40318fbc2ef5c3501c7726228afe431b455d6e6d485b9f3d51f2f8496abe91d2364733b82372a68e678d23e319ba7986830448ce7bd3e9cbbe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAlOMbcEACgkQFYEBGcdFJfKbNgD/X3+PzAThIKxD8QZ2DQLXZlSb
-C89Mor9F2c7O/9UXxSUA/1CoMaFdIvwUEaM1FvMrzDU10fjfzviH4f0iOh896cH8
-=Vvcm
+iF4EAREIAAYFAlPg2EQACgkQFYEBGcdFJfK+lAD/W1PhcT/deU6QoavfdIR3LZ6j
+DbNa8IxAdhtU1UWfHpQA/1jNRliyo8sm+Qhpu4s5t0K+gkh3G7kuffm8GdgxUPr9
+=qATR
 -----END PGP SIGNATURE-----
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 )"