Version bump, clean some old versions

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x00F7AB331B0F097F

6 files changed, 12 insertions, 237 deletions

diff --git a/net-ftp/filezilla/ChangeLog b/net-ftp/filezilla/ChangeLog
index 2d551d2824ca..d706a95b9389 100644
--- a/net-ftp/filezilla/ChangeLog
+++ b/net-ftp/filezilla/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/filezilla
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.126 2015/06/03 11:39:34 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.127 2015/07/08 20:09:35 voyageur Exp $
+
+*filezilla-3.12.0 (08 Jul 2015)
+
+  08 Jul 2015; Bernard Cafarelli <voyageur@gentoo.org>
+  -filezilla-3.9.0.5.ebuild, -filezilla-3.10.2.ebuild,
+  -filezilla-3.10.3.ebuild, -filezilla-3.11.0.ebuild, +filezilla-3.12.0.ebuild:
+  Version bump, clean some old versions
 
 *filezilla-3.11.0.2 (03 Jun 2015)
 
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 633301be5b7d..7db8bf88b8fb 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,47 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX filezilla-3.10.2-debug.patch 366 SHA256 6cc22419e4833c90bf0a2595077a1726552e290b9c47a785b25a5548df25dbfe SHA512 b484216d7af21902e4de4ca72dd6c725a9f0e236dee5600210e4b0717e357eb1be4f640e9e21a6f9c87b8403660cb71513363ae7c454d1c96d1746ea2917c98b WHIRLPOOL 7259e36307e7f3783156ff3cc97e74b062b244402681b4a2a0f515f86921683a7581b90284e2271270b6e4bed6fe2c6031ae91df564e19f5fe3e6a466eb1cde5
 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.10.1.1_src.tar.bz2 4572160 SHA256 67dbd801b15edd446f35b8df093a24440b5fd41966928d018f03f81db12e636d SHA512 92ecf8a7943975b218ee44d24dcb7dde937125ba056059eed2b7217416269d73e8ed50fc79258cb544606e7949cb7c4ff6aedd27095e083d5ac645a27c5cd068 WHIRLPOOL 56a7be2cdd33b776e41546fcb6e4781e3689ea482a01242b9e096cef782cba6e5f49747d0626f3dc124203d2d7a6421c5706290e91322823f29b2197b310b54d
-DIST FileZilla_3.10.2_src.tar.bz2 4232889 SHA256 c08ee3bff4ce35010a5f32610ef699081662c9f8c51c20740f719e653ce9b611 SHA512 20a0c31d5600a935d6fb4b8166446f45aa90ba90a0548ba6a39dc0c720f353b25b915b6aecd21752a8cd6ca7352489a53760476ecc70c9ab5e5ae50d0aa2f42f WHIRLPOOL 15c453e3e397ad829dda8a088cb74bb21238dcdf26dff8f9dafc5bbf3c886f35138b7e06a1eddb791d29abf13960eee4f5739a23f137c34d5a4db5f5b439cd4d
-DIST FileZilla_3.10.3_src.tar.bz2 4430113 SHA256 7968e2799437c0b89741bd7afbc077156525d930e9a18543fd087fbd8979de8d SHA512 74d30ba80ed6976283ec9d48612220c940e2cba5eb29fc4526369c30c2df8a8ad48dc7e477509d4dac53160c199e12871af9d06a7a13899192cc86322e5997f3 WHIRLPOOL 201b0235a2f9539a260170871399492f20a4426004de092ca45edc52f55777222e896768e0b3d9ac9755e872500315f546d2678cd7a9a098451d471191594aeb
 DIST FileZilla_3.11.0.1_src.tar.bz2 4434678 SHA256 0309d5fbb12988a615b7e57eaf5a1b3ffad23ea4cc0e932d9ddea185fdd44c72 SHA512 b0ac96fe29e219a6fe0cab63616980de6b5e89cbc489ffffa4d4843c1f9790e52e6bfc75cec55653ca77ba0474a1f7e5b20d79d6bfc2ea6ebc56232ed626ccea WHIRLPOOL d54e19da26d74e80bf5febcc9f1465f1ca79ad5e1990a7a97f9a4c4f1759eb49741ea4d43b9dbd59d146054496b80a8ac483c98d7db68cd50b546e7367041849
 DIST FileZilla_3.11.0.2_src.tar.bz2 4421399 SHA256 341ba02803c29bdd1f9c3ce524723fe9288433d22d286b5a4b7d7c2e0d6989d9 SHA512 7bc59b685a64c243e02db2078592044d94d38c61fc97b8167d2fa026f978a435177b0cc92b557d7804f4d0ff341a9cef426b390d69f078ee03b7a3350a91b19e WHIRLPOOL b0c968a7552d85b1b391d0486fc58e64a590f5bc8d7f9ca2aec4e1598a932c457177f958497432c4cc76dff5740c600d8ebd20d9eb18fd002fb660f4e412ed73
-DIST FileZilla_3.11.0_src.tar.bz2 4434986 SHA256 2568a249556c87188bef47e7b8a1247d035785a005c6ad61f31e2fb212228db6 SHA512 46b9450702b5b98c8c96da37a1a60e8aef7ece43d5f8dd2b18c439afd311e7965febc2817bf8c4c605a8955a1ad0bc1ccac069c280f5548aa9302ef3b7a5c17e WHIRLPOOL 58f261da11381ce08aa01db6773084779bcf2fff156bbbb65457cc524c284cb0cc7b353f9b019bffac2de511d69200a5f8acba0439f3edb7fda8504abe0ce012
+DIST FileZilla_3.12.0_src.tar.bz2 4438133 SHA256 f31a664d418ae5d8fc27027c6bfdd94bb8c489e6f4dc3059d92ee366965fc2f5 SHA512 2f137ded716901673249aea8f2603322dd5210289743db20a10d2e6dd3c1dce87357c9589cf2855cb280963f481ca4b1b715e6892abb7da20e9cc70d9a558167 WHIRLPOOL 99d5761068d773f0ecbef8f271f8f365fafea4a10772e3b530f182a770f99824063d415f963dcfdd9e2fe000e811190d65762a2a5d3f5d26aa5298921cdd3fe0
 DIST FileZilla_3.7.3_src.tar.bz2 3682494 SHA256 2b012970a6033d8ffd4629b1d57b50ace62cd3750efad70001109f25e520c042 SHA512 b20ec013110e643dd0afca960b4577dd4f17ae744caf63be64e0c8435b8812064aebb4167d0efb186ba171b26967bbc61b6b22a8866b2460530f5793d7d5ecfb WHIRLPOOL acfceb3976f53abcce8da25ea1358761ee6e1a5f556e335067ed665b710fb4a873cce4f62916a19ec784a542db367bed9380a17df37c6ae200fa52e5cd7cc910
 DIST FileZilla_3.8.1_src.tar.bz2 4089186 SHA256 66bc9c082843ffdcb915c7902900b92bdf921ed7310f2a40ff6b96b03cfa1e4f SHA512 abe4b653ac0627f1dda8ae7b6bb3d1a92454b98ce69f6eb6fcced2e63b5d35edba578ba24f06b16218fcfd23edff21cc7c76fe1c7056efb129b081fddbd83101 WHIRLPOOL 94db8545244d1cd4bf0c3f4ed1daaabf150df262334c2311196b916a1d84d06026aa34707ce7d4e74a575a7eda18cb2da4c5e326d591bdc4bf71b69a6935fff9
-DIST FileZilla_3.9.0.5_src.tar.bz2 4180577 SHA256 d8497b9f91929fabe44b0cf573745fd22091663519f85ea5a7bb07df1aa0ea05 SHA512 43eb5cfeca1206244ff25ad6bd5d4706f94f81757fb3de2e0aafb759653f706ec6cc2f63cfa3d1a847d71a199bb4deef438da91c3c77125008c542efca710b01 WHIRLPOOL 12ca1a88719d5878e187be0db91aba7185275dec6b731c9b2e9205b382d58948bfd61c62550616d16b2463d4e9e9fbb3b34c4b995601e3f1b9e97969598a3f20
 DIST FileZilla_3.9.0.6_src.tar.bz2 4181121 SHA256 ce7f56b383fa59dc55b16d8695e9f03b6e86d59a04dce44a16b5d02b2391b0b7 SHA512 750bb9afc12d0015cab7f775878def5bbbc0d16eed7ab3d876888ebc1f72480e338acfd16cd2bbe9520c26d491a996c85f712f47d6cd7e05d083c189cd23899c WHIRLPOOL 4bdbbd570b2a0290e2c4dff1e02aec2484891f5100fc7829e75b3ccf4ff004a1cfacc328b85efbb60be9d058499d0b4b4e1e28927c345a9450e7204cd25746b2
 EBUILD filezilla-3.10.1.1.ebuild 1729 SHA256 59e9a0083966dbf193977dfac5e550eb477e38ba64904f4a3bd21f4510ef1126 SHA512 7fec1434a1a51596a858cd46ba5e65d6574e291f43c9d1acebff8a0340b53f7821d9f4fafa2f6e078a86415f6d88cc1f39ae7ac4acd725f5b99f101f3c912b22 WHIRLPOOL 40222d678666e87e38b887014fd73a28ab132f38f08f4972f0564a180dd625201f1e6e1ded9a6feab4b646983e6772f940c79736c8f8ae301c938a89a51cb9f9
-EBUILD filezilla-3.10.2.ebuild 1728 SHA256 72c26309bf095789efb6b4f309e9a6cce23155634cf8eb72f94267075f217731 SHA512 4d801a0c1994196eb40bddcfc8e0691e39fb0d7dd741fe2b46b0af75be4e960b5ee6d1b012dc4cab00fc6933d76e3a48b2e4e21c548610d57ab037e9100617b2 WHIRLPOOL e1eddf26c59588d3352d5004e4d5f4468339fd84e464abf90103956ba5142f43ab432ea6e2a3b3a8f1a5ce186980682d091d29e780e8e826c156b30bc36fda26
-EBUILD filezilla-3.10.3.ebuild 1728 SHA256 28d387550db76171e5534e6e4432d6022bf466f247265f175479e44a5e717783 SHA512 59ef1c471447ca62b052e91f10265b68b972a996572dbc062b63fcc436f35aedb8069476f5d38815bbdbc9f2fc1980620f1e3bbc0438e5dbb1c8fde46dcf79f0 WHIRLPOOL 4cdae72635a69f5ec535c25fcb61aa35dae11f7e4b96a6441121330fe1271d1753d8d043380b73a15bb4bf2a8bd6b79b333d0d4c6ed206b9741866a42c52521b
 EBUILD filezilla-3.11.0.1.ebuild 1735 SHA256 6f16951419b020c6401fe8d8fb884b384fe083755d0ac18ec30a0eb448cada95 SHA512 6800d3726b3ec3c3f444e37792b22a8f6a8a8591bb95178c24a1b4acfe6fdb9ccc657cb616b2a13601f29bd8d5d2d760ab56e2c73145c7795496e9ce9a03543f WHIRLPOOL df7304eeb60c7be096863c80f20fc5e2372dcefea4c982f67f157e42a770ba6ca1337faf07c7f085ac83bcf78011fe0edfe947353427d8ddde82a0fe39f19a4f
 EBUILD filezilla-3.11.0.2.ebuild 1735 SHA256 c587963853836aaa1d6a28cdfd8e7091c37b186413aa87c67abe31ddc1065844 SHA512 78eb92eee17dd228380b16eb4975b37b91a68ab2e4b8d540d1c4e19cbd82321dc89b882ccd9cf43d948990327140926bc1877c4648a20b3f4e5b2642d057add9 WHIRLPOOL 07b30ba5b0ab940d1910de319dcdfca1dc565332a319d9c3b879b3c20b9c6b0f484ff586e8d1b9f1ed02b8edfb24a1d99f7044e179682b24a10837783c93d0a8
-EBUILD filezilla-3.11.0.ebuild 1733 SHA256 6a91ac68346ccf36ba386aebc38ffee6ba4b16ff7f05047c135d6eed9fea8682 SHA512 cbaae2ef78af03ab26e1a8faa3a4556630f6a4dcf0970cc404a708bb5ba0b76fbd9071189d94f5bad6a0f3b0748be7a48582c3d0a89fd612a4d9955c23f06a6d WHIRLPOOL b5121656a73bf28ec5ed2bdeb2a770787dfdb347b3bb4067b646d6c66d733d7cb7e720ab07b9d8e3f6f4f8795aab699b3b1b38bf5cf7f0580b87809c229f760a
+EBUILD filezilla-3.12.0.ebuild 1733 SHA256 25825b0b72b2d7ca5b25d4270e54177271406aee2971f9dd0e2bb34d9677e80c SHA512 6600007650fbcaadd75e3adce50a5fe78c67814c65df656b7cf3ad664e375e57cfb64cbee34db5d4c9f70ff42f6de3e202d97d6c88e6604a81d2ba44ea6e3d34 WHIRLPOOL 3302713a56db57d69584985ed96fb422665892dbdbe0b84cfac6fca34ce7a5583498251620b9a4e237ae36cb7904b76d3d7e155c560e689db725a58943c18130
 EBUILD filezilla-3.7.3.ebuild 1715 SHA256 0f3a8958ff45d2eb7c007bd5a124f9677bdd8b7e825735ff55a5b1ffceed5ed1 SHA512 80290919b9da95c9ec90b9dfc508a479ae98219899fc4383aa9b8cb08710bc5fda259975fbe04274ad786a17ebfb2bbf720567fe5c91863c43445c94909e419b WHIRLPOOL 4d794d2e5a759ba31aca23462ea015af5772fc737b79e42d51a4916545a7d1a58d2d31f7c2af47f6e892d0d51bda7bd7653f931a85e891f726976ed2f7dbcc82
 EBUILD filezilla-3.8.1.ebuild 1718 SHA256 e2136ffbd25325aa156ccf99c43bb9641e863d0265e55c62f424e3e5dde5519a SHA512 1af826502a7cea5721fefdab9cbe04ea0df836735561abb529d0eba281c5d80525881dcf99710c1f106efdf345f5edaeea170f8abdb54589024c64ecd2dc9795 WHIRLPOOL 02873d525a472192755c3a6ff377bbb4dfbdc873697efd45ac98c3a2f42164bc25e167b3bea20b025adee40cafdc2b63227e387df706651d3281c9b01c1030a0
-EBUILD filezilla-3.9.0.5.ebuild 1718 SHA256 4d489eb1835292034b506dd670b5c70ecb16066e7b69da435d70adabd24efad3 SHA512 5b709fc874eabe1a7ecc87e04054f8fffe79f24d6afa8371abe9d1f66c4ce3883abbe0b65fbd9b5cf253567c41ca983e3d03be00eeac898a2e5efe95e559d4a8 WHIRLPOOL 3af8eb00d2c0512d5156f6be619bdf1379a29c0fe75409dab1e84fd10edd0fc43eee805e184430f1216cbfb4905a9b46884294c7dc2980f7792b3470ea4f1be2
 EBUILD filezilla-3.9.0.6.ebuild 1718 SHA256 b382a25c5056de8a09489831da4e69c5b39474b7c876e44204503cd4876be7f1 SHA512 b5af00fb082b7bb382ec561e87e447d6845eb02741d29444bde39450721cd737a3a82f1ef5581b1f7dc048a6b2aed93048bf06675c42f4c358ac164393fb9667 WHIRLPOOL 7b1b77c73021204a4bb4b9e35c6df607130e42af5494ecb97cbf4fd1c630e56bc3f21902f034a335c168e78a070b50414a1f7a4484a743b078711837741f0049
-MISC ChangeLog 22142 SHA256 cfe2add8d899ee8b9f0dd768a8fa38cce25d98a847fc428d28a41da400032b24 SHA512 b4a0b6247d461fdce47980592658f13cc2d88581ef13253cb1ff051923768d10a71bc857b4c2a3de40b414ccacc50ae3e5bf3d1995fa49d62cd6df1451e0c16e WHIRLPOOL 0a1d8ae0e1c33f0d3dd2a8e30b5ac2566027e53f5d8e4761895de53df6cd2bb77e268d9264ea3064d83007fcea9f3249e2db23c97c80204de2e1b4445e994d3c
+MISC ChangeLog 22406 SHA256 43e0042b379d966faf02918aff802f4529e1338ebac085faad36eea98bbb9e00 SHA512 d0fded76a76de8696c79442a7a03137de3d81fb2315b734f05fa65ea231777d18f28fdd71772112629571941060dc69b7db3f42a075721d1a7f1d39f6f060453 WHIRLPOOL 7de21776fc36b7fff737144833c59298a808802686d3129031f0ab6718d33bf2f787c3394cd35c42cf1f611fd2b37db09ee45b52e341880db4fa11d28916727f
 MISC metadata.xml 453 SHA256 efc4c473ca63d0a8bb85d56ab535497d2363967a83b3cb4bb7c9d6de6a110ce2 SHA512 cee62d4efa34710a2d090e81aca88fbac8b9bd7aabbdf1ae1faad0a7f7b9f667ed0c5e978291cc0b0ebb7d4331d1bc39f1a510570a135ecf862deebbd004b054 WHIRLPOOL b9c1a3ef85fc71a47b5154c93b7e19d64c835f69df2de168bf58866ef34d447672d90a067d4679c03a504d3ce4c3623aa8a9c5312f17fed9810ad2ac58d42814
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCgBmBQJVfwtoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiTZkQAJNv8LP7ttAmwV/XoNoLR5+9
-m0OzICmNV2U5HwGCXf3DQYbA9IOkHrFqiYfViY80mbFJQO1tztHR3aZrr34DWolz
-8aJoGwg+88ezz9bDLEKOn9UUQhhI/C96IJ1rt9HjS2Q3RlxJTd2VZkf1WufAWIPY
-ia7ZNFCBTJdhm7yCtQ/03MEfgOx71HZuUr8gaCG+OEB1zMT40sZ4X3g1md/Rjuma
-+knE+AMiIuVEDtiePEi/0S81Q725aLZ3e1lO1KfpbPkZdHIh9/OhZil2TMP3rs9j
-qyte5LUW+nfP5MTDYg+TwF8mqfBfKi9y24wsE0GEqy9KlI1S13C/YTyKh/JA/mp2
-lQSAy0BHTZ4D48Kq/WHsQV5IC4dKa9a/1sgFnHM1hkcoZBHT+oNMJz8wsKH9gKv9
-THJZ3+0/iX/E6lUB5DW+EGAhtUE0icWpCmF8sqbvj4CXDyInmYF2YydWpz7qkG3n
-lO54CjdaBRIj9hkGk+p2d/idp0H9FIUrVlsVOoBMcTb+1x9EsXZKUo2NGwdiG9E8
-r7wGj0ta+6Lru8m86dQ6R2YmGigfqmEL9ETT8Xd378h66bDIZLWnb602SzfMdsF/
-O62aze9h8li4z+MhV7d5h2sxTAXm5+l96r58P4mpR27Vj+51dYg5nC2N2mwmX5vI
-jskdPjTfDHqDvtC2+z19
-=xGq8
------END PGP SIGNATURE-----
diff --git a/net-ftp/filezilla/filezilla-3.10.3.ebuild b/net-ftp/filezilla/filezilla-3.10.3.ebuild
deleted file mode 100644
index 547b00a0d2af..000000000000
--- a/net-ftp/filezilla/filezilla-3.10.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.10.3.ebuild,v 1.2 2015/03/31 20:01:26 ulm Exp $
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-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-eselect/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.12
-	aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[aqua] )
-	!aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[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.10.2-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.11.0.ebuild b/net-ftp/filezilla/filezilla-3.11.0.ebuild
deleted file mode 100644
index 0b4c9d983f8d..000000000000
--- a/net-ftp/filezilla/filezilla-3.11.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.11.0.ebuild,v 1.1 2015/05/20 13:27:34 voyageur Exp $
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-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-eselect/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.12
-	aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[aqua] )
-	!aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[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.10.2-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.10.2.ebuild b/net-ftp/filezilla/filezilla-3.12.0.ebuild
index 096688303498..2b2e26d29e05 100644
--- a/net-ftp/filezilla/filezilla-3.10.2.ebuild
+++ b/net-ftp/filezilla/filezilla-3.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.10.2.ebuild,v 1.2 2015/03/31 20:01:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.12.0.ebuild,v 1.1 2015/07/08 20:09:35 voyageur Exp $
 
 EAPI=5
 
diff --git a/net-ftp/filezilla/filezilla-3.9.0.5.ebuild b/net-ftp/filezilla/filezilla-3.9.0.5.ebuild
deleted file mode 100644
index 3e922edb6a12..000000000000
--- a/net-ftp/filezilla/filezilla-3.9.0.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.9.0.5.ebuild,v 1.2 2015/03/31 20:01:26 ulm Exp $
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-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-eselect/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.12
-	aqua? ( >=x11-libs/wxGTK-3.0.1:3.0[aqua] )
-	!aqua? ( >=x11-libs/wxGTK-3.0.1:3.0[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
-}