Version bump, drop previous 3.6.x versions, bug #469356

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

5 files changed, 30 insertions, 134 deletions

diff --git a/net-ftp/filezilla/ChangeLog b/net-ftp/filezilla/ChangeLog
index c1bc43cc3279..8ee30a8613e9 100644
--- a/net-ftp/filezilla/ChangeLog
+++ b/net-ftp/filezilla/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/filezilla
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.96 2013/03/16 21:15:52 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.97 2013/05/12 20:39:59 voyageur Exp $
+
+*filezilla-3.7.0.1 (12 May 2013)
+
+  12 May 2013; Bernard Cafarelli <voyageur@gentoo.org> -filezilla-3.6.0.ebuild,
+  -filezilla-3.6.0.1.ebuild, -filezilla-3.6.0.2.ebuild,
+  +filezilla-3.7.0.1.ebuild:
+  Version bump, drop previous 3.6.x versions, bug #469356
 
 *filezilla-3.6.0.2-r1 (16 Mar 2013)
 
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 5d5bbecfa82c..11eabf3b03a3 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -4,24 +4,17 @@ Hash: SHA256
 AUX filezilla-3.3.5.1-debug.patch 423 SHA256 6093c67c850f33d23ed278b601e269f08f38cba0b49090f4b0ad58ddbc961e2e SHA512 06ca4ba2c0fef72dc649324fd7045c7f353c17f4d8e87a885dfc70596fdbdb8b7dd56e4c87f0f4ed2b7a48f026bc710f8631e6dfa5d8325b6f0aabe8a8ba5745 WHIRLPOOL ce891e0c098e0a9b49167d8b135eee9c08c20b75c1f1af0bac20331a538166d7ef0fdec3d919fc3012fa5a95bb74422247bce6746e0ca6ecb56bbdbc2e5cdcaa
 AUX filezilla-3.6.0.2-tests_link.patch 468 SHA256 d708d1fe5648f841bdce0ae29ba0694c0e3b6307f67cd6bb2eead0ceebd04fdd SHA512 0373a51dd24361f7c1d8595999dcb9dfea600f4ecde59a7930a36978393dce1706969654472b2b6ed8647613c5f66f525fb681c2b031be449ddef28a7a7cdd14 WHIRLPOOL 5205f4952730f0261b84d9287605b40a62da7377fbceeb5efdabf5543cab69de9e0ea27e951b30144c506fdfdd526d875f9a11e82b7259569d2a68fb4d317af3
 DIST FileZilla_3.5.3_src.tar.bz2 3366662 SHA256 0bba27baa2041fd926f9775e360e70af391cdec10f3f3b1a8dff20b3e100ff6b SHA512 e233d1ee3083541bd443bfbd97c7cade9248cc015c99fc89e5ac0d656554a6e00cd764d22b848ec937ac1483de92034a5e3b84c798cec08c03ce6a8d806d14b2 WHIRLPOOL ccbc1e2e50c10b1410c108791647612d00bce3a090315259dec03d793651b9be8bc1ca51d4c483f5186acfe297f85ef1beb4ce979d8cf0e8d2da748f67d9c5f4
-DIST FileZilla_3.6.0.1_src.tar.bz2 3534874 SHA256 ca15eded526bc3e2412cc7f74e89b98a59bf1ea92a432de420d391046a2822f0 SHA512 961df785099a9d55789e9733f2e1495d69b9305fa8531e524c90e613ef558435b7174c176e77248d70d3c5850518c5f87c405bd2a327e8344b86e59e1c34e2a6 WHIRLPOOL 528fdde4494c14b4aeba0a6bf7ef57752b7871da2688d72744bb3d37b3dd8c981305cf7c5c133d9e2910a06910448740e7d622e54f76b860822dfb2eb24bbcca
 DIST FileZilla_3.6.0.2_src.tar.bz2 3540542 SHA256 536a5e387f371272b5bcbf51b08a6df07508097b79f496432141c4207098c606 SHA512 2382306a8f55dec420a3d094e6ff39b99c03e056f012752561e103091d5dd958c70649b5e27d3bd0d386b5fab94e04bcd743f44d4121d10acda389b8d005fa58 WHIRLPOOL fd119ad2239190b632403c284ba93931ef20b8dc5c60967bc1a1e76a2222f7ed33c6ec7dae8b738e8722c37cc0eee42241bc9de621a005e74f471b6eec58192c
-DIST FileZilla_3.6.0_src.tar.bz2 3525207 SHA256 78855028a830f9839ee0e0bb678ce7c3e56aef1f7b7435ac121a02234caeaeae SHA512 93110b5505fec03593691ca5f2c1a52784dae2c5b949e7812199a98859d694ce89f684f5d62b2ed855f63d2b0163b10b650b2a706af17cb24d663d42cccc4547 WHIRLPOOL c1f0e3ae46e2f62bd7ecb4708d3d322d4d0ff92c749c1a79beb45d6750caad36ea4f955a87222985073fd945e89c222bfc1a1a9001df722e901d798d559dc8b4
+DIST FileZilla_3.7.0.1_src.tar.bz2 3652864 SHA256 fe01645c296e7fc97354fcec40f5f704d522e619a9ec13252bee7db23f3e0dc7 SHA512 e537bf5e2fb401d0d19d1828494d73e0b0da556a8ea4c65bc2053823b31d542a27bd711a0e8b12b00656caa18b5883d70f38bc23f9223bd1522d01dd2ff78b70 WHIRLPOOL e4dbdd3e869f1db348e313b25327f45cc1d16715c6df1231bc788e0a17c312940e94692a0289f42d86867b7c8a0048dd2432e29fe25090de01a95c3f748428e1
 EBUILD filezilla-3.5.3.ebuild 1434 SHA256 16b2513e77da4488d4c5cfaa97cdb7abb95fb322b60cbab996f57f657b5373b4 SHA512 c8836a6241ed866c8c20800cca38bcb90f47c73021a16496386d8f10f6de227ed456793e310654f6cfa804b7685758fcd1cd63991f78a8797e5e8bc79946ca77 WHIRLPOOL 45f289ac3673a2b81c9fe8475077568ed5862294f2f28f4e752dbca967aaf171520635f2c0e45e7bf01bd84a426a8fe76816ffffe3045720d68748c818fc735f
-EBUILD filezilla-3.6.0.1.ebuild 1367 SHA256 bceab08662006a90e6ea58848a9ce0ed74766df9ac71c2943ccefb16bc7997f2 SHA512 707d4e6e4f4765f5bea66dfe0a4759149314959478f3fb5ac74174856b4e8e3caf299576f578f917fc1342eee671e104c0268eedc1f64464c7bb909dfc73d3f1 WHIRLPOOL 2384e26c2a366761e2921c4a3009379d4376c719827344b6b662375ac1e87c4a3d32d16132b07f50d2224eba1f7ea59a5ceaa670c2c0827bfcabec87091d2662
 EBUILD filezilla-3.6.0.2-r1.ebuild 1759 SHA256 b6aff95c20505dd9cfca6fb8852419febbd9c53fe87d544252f691cbcaad737a SHA512 ce680c18fe1b711ae0afc950d528a130b241f8610c3b187506b10e288375e19e573706f7d44fe30bc1087f81196edafb438f79bb4bc4e1502b3bb90f36425d7a WHIRLPOOL 0a6cc1c0781ea98f2fcf56405db427349be7862d8c296772d2de648490a47b74e1aaf13a10a03cbe4b8d7b6a533825393ecf1e68026f6f0557cccdd9da3a88c3
-EBUILD filezilla-3.6.0.2.ebuild 1411 SHA256 f7a1ad2f32f06af95b9e3f6d7f0ca9809c8fe1a35781546be24f2dacdefc1def SHA512 897683273db4dfa62f2c78f572896db772145f3610d1d751185d314088bdcb989fe98698560ccd3d3c7d267e36f2e1fd0023db1a19f8d8eb868587d8fbf0288d WHIRLPOOL d0940b3f95d03f5a4640c3f44e68cfa1693020f147c87e63064ffc9ad907385e319db6734de313b4d564fc081ba7f23fd28dbf4caa4d7ff73b40bafb3fc2834c
-EBUILD filezilla-3.6.0.ebuild 1437 SHA256 559873dd33afb1e71a7af8284e142dcc0af9e086e59fd73f819da4d3622e3bcc SHA512 e758d2ed5a28e5d8a18328225e33ce8dbd8d15280552515a6c8b8b35f601d36223c3f5c23124672f38594c00413589283fb13592a7ccfc966e3afea7ee8da275 WHIRLPOOL da5cf910fac8da7f084740026fcddb75e77672e105e7a41fdfce05ea28cccbcbc5654d546debe0812fa775453d688ac6e0a0eac2d376725807a06680c0f06de6
-MISC ChangeLog 17359 SHA256 a3907a1e1be55c06d0ae79da19c928ca9e5bcb3e9e43a2ead67985ebd35dfcfc SHA512 0604f117ed2f5bb13299fbfc9b2931ad048b7eb755bb2122a39984239e815b529e6747d9d293d7b6803ef22b29e03a6d77e96b7134449d3931d844bc681adce9 WHIRLPOOL f6a432166bb8b8e91fe7da01c11517b3b2b7ce97248a3ed10a78808f370c4328590574904ec3fc2429c32589e9ea7082ad1809369426a2e7c27c3ae3451079c9
+EBUILD filezilla-3.7.0.1.ebuild 1714 SHA256 4cf0e4c6794cf8a0472cf9c0474ea263bc644b299be1ed9af9f8cc447a859549 SHA512 5e888c3fe45b42387cd7c0722d570e8a4a5e461c563595c14dcd13b63342e01264055c893cebadf3ed285d6ba66de1889168291df18e8059e20bccf93de8deed WHIRLPOOL 9fb4c948aca246b211a2880e97f79acae2f4e4d1a6d8ef2a096acd27d5a3cab3f892bdd95d5be9e4d2906b4dd676f6f4d7d577e5c765fe87248c110a542c9f97
+MISC ChangeLog 17619 SHA256 3131789d6eaa058263c9a0951ee547a2364202e1c543395adbfd58fde0144077 SHA512 1482c58f4b8030ae6ea1001d09b848a37c54993d9d93ab266e7894a0ff43a8bfaf69e9f50d4e410ce58f7ad7e851552fdd3bc3ec3f439285b59cb6157cf3f079 WHIRLPOOL c2419ba5944033bea3db6ee920dd0faad7c94cb58493ee11fae59b27b2d2274979e81aa88d814fc96e75f430a525eb586b59c6c44aacec2e7f721436c7a38f15
 MISC metadata.xml 358 SHA256 13ba819a417c003a969b6557fd32a73ed49be658c3e0470c29a21ee807d5a28b SHA512 8008462bcccc0b22ea71170427d3318b3f403ad324bd3d2207b35b2344a5822b2b1c82c7cb379b99a08707853477a0887c65684c0b5de93b6782ae863569c373 WHIRLPOOL 5dac2fceebc89a40318fbc2ef5c3501c7726228afe431b455d6e6d485b9f3d51f2f8496abe91d2364733b82372a68e678d23e319ba7986830448ce7bd3e9cbbe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRROEKAAoJEOeBhlrCAAWGUPkH/jevZYrXYXIqP64ffydoYNr2
-XeXTvfOKW8tmWbliet5ITmPfHPw4SJ5/tBpbUaQMoMsemxF2R2YSiv/LKI935Rtf
-49Cm7fDROTM9eXFQbp0G6X7ha9Y35fZ1dMKBSf5Cp8kijZkwQiWhu/UuQcU5S/RT
-Dmz80XhY8R9+nStIfQYrORulVIrPLKp+qr1Lfh7v2iuwtM39YrXOhB20wnPy2Tcf
-/oIwDdK/G0ylfQNKG0w2yhwsBmwVh1hthHwOxb5avigeBvvNLB0aq7z2rO3MbbeX
-j8tPRlyN86EsvchB7kdMt6E0rLoS9cRxCwKB4kAe96+URgk/mxCyUBZMsbQP+8I=
-=JbI5
+iF4EAREIAAYFAlGP/iUACgkQFYEBGcdFJfK3cAD9E8dCDT0cvLlaoXhHkFzYjbMj
+PTB7sHxiotrbddDUhqkA+wbsii2bkJe5Bu8HiL20iaiu/159MhUy1f5dcUOf8pUJ
+=KJiR
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/filezilla/filezilla-3.6.0.1.ebuild b/net-ftp/filezilla/filezilla-3.6.0.1.ebuild
deleted file mode 100644
index b4703f96a636..000000000000
--- a/net-ftp/filezilla/filezilla-3.6.0.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.6.0.1.ebuild,v 1.1 2012/11/19 09:48:18 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 ~ia64 ~ppc ~sparc ~x86"
-IUSE="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-3.1
-	>=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.3.5.1-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
-}
diff --git a/net-ftp/filezilla/filezilla-3.6.0.ebuild b/net-ftp/filezilla/filezilla-3.6.0.ebuild
deleted file mode 100644
index 30f1003d8129..000000000000
--- a/net-ftp/filezilla/filezilla-3.6.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.6.0.ebuild,v 1.2 2012/11/15 09:48:23 voyageur Exp $
-
-EAPI=2
-
-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 ~ia64 ~ppc ~sparc ~x86"
-IUSE="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-3.1
-	>=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.3.5.1-debug.patch
-	append-flags -DTIXML_USE_STL
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-tinyxml=system \
-		--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.6.0.2.ebuild b/net-ftp/filezilla/filezilla-3.7.0.1.ebuild
index df0b0c305ac2..23aa97031c79 100644
--- a/net-ftp/filezilla/filezilla-3.6.0.2.ebuild
+++ b/net-ftp/filezilla/filezilla-3.7.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.6.0.2.ebuild,v 1.2 2013/01/21 15:54:24 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.7.0.1.ebuild,v 1.1 2013/05/12 20:39:59 voyageur Exp $
 
 EAPI=5
 
@@ -17,16 +17,16 @@ 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"
+KEYWORDS="~amd64 ~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-3.1
-	>=x11-libs/wxGTK-2.8.12:2.8[X]
-	x11-misc/xdg-utils
+	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
@@ -38,7 +38,6 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.3.5.1-debug.patch
-	epatch "${FILESDIR}"/${P}-tests_link.patch
 	append-cppflags -DTIXML_USE_STL
 	eautoreconf
 }
@@ -55,4 +54,15 @@ src_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 "${S}"/FileZilla.app
+	fi
 }