Drop a masked version, depend on wxGTK[X], spotted by Jacob Godserv <jacobgodserv@gmail.com> in bug #324621

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

9 files changed, 27 insertions, 70 deletions

diff --git a/net-ftp/filezilla/ChangeLog b/net-ftp/filezilla/ChangeLog
index 665ad82b539d..6c4ee8ddd310 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.66 2010/06/14 09:00:48 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.67 2010/06/23 12:42:10 voyageur Exp $
+
+  23 Jun 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  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.2.1-r1.ebuild,
+  filezilla-3.3.3.ebuild, filezilla-3.3.3-r1.ebuild:
+  Drop a masked version, depend on wxGTK[X], spotted by Jacob Godserv
+  <jacobgodserv@gmail.com> in bug #324621
 
 *filezilla-3.3.3-r1 (14 Jun 2010)
 *filezilla-3.3.3 (14 Jun 2010)
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 04357043b92e..70e80272bb2c 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -4,12 +4,11 @@ DIST FileZilla_3.3.1_src.tar.bz2 3129864 RMD160 72ade8ebc1d8e26b21900814aa168e83
 DIST FileZilla_3.3.2.1_src.tar.bz2 3164447 RMD160 09cdc5e67181e5f04d17400d162734fa379b459b SHA1 a4a17497ea0515b781593c03c2f3da58cb02fbf4 SHA256 04768d0bb300562d30a3a7c0e8ec461dd8307c7830daa86fc68a527f0590577e
 DIST FileZilla_3.3.2_src.tar.bz2 3186595 RMD160 5d74132747aa6345ab8bc19aff06cf034412c597 SHA1 80c5357eea6ec9ce74d9e85789680eb289abc354 SHA256 e25758cf0523f9d09df0522a666f108bd415356abf0137877c42d6c5470b2afe
 DIST FileZilla_3.3.3_src.tar.bz2 3212044 RMD160 a2f5eada36253ef0d236c53c4101109ec13179ac SHA1 25b7ef7e48c7489e99b6b1b26bd3d7d56332bf4b SHA256 61f75564d04571573610406382733dcec2925b88d42a7a0b4e69a206fa482857
-EBUILD filezilla-3.3.0.1.ebuild 1223 RMD160 fe0b2655b11f6721e095155b4866c2cd3d0d232c SHA1 9d5de11f5851d20f3713624e18ef9d059588dbe6 SHA256 aa326c5809227dea3fbaaea6d79686051c32abc3910e0a6fa99b84575e04973e
-EBUILD filezilla-3.3.1.ebuild 1225 RMD160 4459bc9c4914b24e22001154becb86c6046750e5 SHA1 053e3b070e3f9bd5ca40ab80cb1d2d89f5e45927 SHA256 77e8473fd1d2c22952aa8e986c5e42bbd15b122699a3083d84a0ada3312eac8e
-EBUILD filezilla-3.3.2.1-r1.ebuild 1253 RMD160 2fad743a1d30ce9957b427972400846387fe410b SHA1 8446fe82e037c96c43064d55f38504680ce250c9 SHA256 232cb34bb3b6074cc7ccf6d6a17d5cab4e047045da206dde47e34bc6a76ce887
-EBUILD filezilla-3.3.2.1.ebuild 1227 RMD160 a06a6fbe59e0a455cbef33186beb29bb09e88330 SHA1 271abcdcca7b7be95562948390315f3fc343bf25 SHA256 cbdde76c9248eff7caa60455301c45ca1674849d618f5f7f08b38004f74842b0
-EBUILD filezilla-3.3.2.ebuild 1225 RMD160 6f3802cdc6e922deed5af7af5114740ecca35bfc SHA1 561713dd29ba194ca4d021b9603e9c33fa20db0d SHA256 3666d6b957de331b201065fcdf0895395c22cedff737d5a64e1340358a95b423
-EBUILD filezilla-3.3.3-r1.ebuild 1251 RMD160 98482c8f95aef3f03a4cb8a442bb3c371b424c91 SHA1 e8f0aecdc94c7bd1b6cbafa018c1ee7c459d8c45 SHA256 27902ecc21a1f989ac2fce56b7daa7f0bfa5855207789a6b228fc915603ffe56
-EBUILD filezilla-3.3.3.ebuild 1225 RMD160 27ed31807accfbab1120039103b2947f371c6293 SHA1 3e84b7ace4ce6df7321e6866bb181c84136aab5e SHA256 468f078da520ade30797ebf602dcbd0d6c9783f4d01ad88981f8475cb317eb7d
-MISC ChangeLog 12129 RMD160 49787d312c52523f9f9432e75d75399f532c3c28 SHA1 8940b88dc96ab5da659ed295f686b0cdecee6e9c SHA256 de7da06e36f8ed598c6692b5c86e6b7f87fcf044b0094059768efc5396116730
+EBUILD filezilla-3.3.0.1.ebuild 1226 RMD160 8da5eca522882ee0ab949418177a46a3d5e1b693 SHA1 bc76b5ef128137203603e040e352fb237c64adbf SHA256 ecbcea37c869034a1c9d2989050e4b95f32cf9c0a4104ae70e2fd71ebc0cd788
+EBUILD filezilla-3.3.1.ebuild 1228 RMD160 4f4627500090101207df9a8e898698f9619c62f2 SHA1 2e01fc232931a05af0ad5fa6171490588f352eff SHA256 870cdc059d59becba1e264176d4d6332adeaca1ce50b54e0079fac4643002c9f
+EBUILD filezilla-3.3.2.1.ebuild 1230 RMD160 816f6fa4532ceb8e79d22e754174a92846794463 SHA1 350776e49a9c193f80570ebf5d36bbfdd39d2396 SHA256 e9c92f46c7540307920acf7578deeda1565a62a71880d3a5118016acb9c0b4ea
+EBUILD filezilla-3.3.2.ebuild 1228 RMD160 a75f457561394a7436258f52b09b8fb5a8d2845a SHA1 b37ce6706c5f9c4a5062efca2124b6f08a56fe32 SHA256 0b48258562404f6071fa234cb3a67012e9a6fdfcac8de0f396532aa7b17c018d
+EBUILD filezilla-3.3.3-r1.ebuild 1254 RMD160 4584105982bc408fcfd5a5ab58e2bf38278a627f SHA1 e2b73ae99e9cc27323bae30868e8b7133b9b2d00 SHA256 20bdb76485c858facafef9db2cdbd08ba968e69050f8201a099132ba09d9a880
+EBUILD filezilla-3.3.3.ebuild 1228 RMD160 bb8c2cbf8d5e21f784dffe968e29c090f8aa0e2c SHA1 5932702d106ca4055947782f22ae251f8f4ceddf SHA256 e9516c7f7cdcd73ef8f672980d8e04b22847c3073818a054e27c19307a9c50af
+MISC ChangeLog 12484 RMD160 682061a3cf5c79ef93f64f83e876ba88c69a899e SHA1 711d67935ff8e6e228ae4e6c41e60ef799764122 SHA256 26ef2bcc41f2b18649c3d848e0c7d4628f80122a1ca5ac858c8adce4acb7bf65
 MISC metadata.xml 358 RMD160 847093b8297b203ca89664d66e195f763d50e751 SHA1 a61011a0ee29bdb9a156e297a414bc2902598156 SHA256 13ba819a417c003a969b6557fd32a73ed49be658c3e0470c29a21ee807d5a28b
diff --git a/net-ftp/filezilla/filezilla-3.3.0.1.ebuild b/net-ftp/filezilla/filezilla-3.3.0.1.ebuild
index 5aaa2bfa35e2..c9c75c0c1da6 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.6 2010/04/12 15:32:44 voyageur Exp $
+# $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 $
 
 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
+	>=x11-libs/wxGTK-2.8.9[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
index e00df18fc734..c195badcb2be 100644
--- a/net-ftp/filezilla/filezilla-3.3.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.3.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.1.ebuild,v 1.2 2010/04/12 15:32:44 voyageur Exp $
+# $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
 
@@ -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
+	>=x11-libs/wxGTK-2.8.9[X]
 	dbus? ( sys-apps/dbus )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/net-ftp/filezilla/filezilla-3.3.2.1-r1.ebuild b/net-ftp/filezilla/filezilla-3.3.2.1-r1.ebuild
deleted file mode 100644
index 12c78d82b6cc..000000000000
--- a/net-ftp/filezilla/filezilla-3.3.2.1-r1.ebuild
+++ /dev/null
@@ -1,49 +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-r1.ebuild,v 1.1 2010/04/12 15:32:44 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
-	dev-libs/tinyxml[-stl]
-	net-dns/libidn
-	>=net-libs/gnutls-2.8.3
-	>=x11-libs/wxGTK-2.8.9
-	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=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.3.2.1.ebuild b/net-ftp/filezilla/filezilla-3.3.2.1.ebuild
index 603a73a4753b..09e0a88dac6a 100644
--- a/net-ftp/filezilla/filezilla-3.3.2.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.3.2.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.2.1.ebuild,v 1.2 2010/04/12 15:32:44 voyageur Exp $
+# $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
 
@@ -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
+	>=x11-libs/wxGTK-2.8.9[X]
 	dbus? ( sys-apps/dbus )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/net-ftp/filezilla/filezilla-3.3.2.ebuild b/net-ftp/filezilla/filezilla-3.3.2.ebuild
index 72267096f4f9..a2f0875c7fe3 100644
--- a/net-ftp/filezilla/filezilla-3.3.2.ebuild
+++ b/net-ftp/filezilla/filezilla-3.3.2.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.2.ebuild,v 1.2 2010/04/12 15:32:44 voyageur Exp $
+# $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
 
@@ -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
+	>=x11-libs/wxGTK-2.8.9[X]
 	dbus? ( sys-apps/dbus )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/net-ftp/filezilla/filezilla-3.3.3-r1.ebuild b/net-ftp/filezilla/filezilla-3.3.3-r1.ebuild
index eb2f6938daa0..daafdc0b892b 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.1 2010/06/14 09:00:48 voyageur Exp $
+# $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 $
 
 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
+	>=x11-libs/wxGTK-2.8.9[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 4e845febac91..73b475b98543 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.1 2010/06/14 09:00:48 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.3.3.ebuild,v 1.2 2010/06/23 12:42:10 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
+	>=x11-libs/wxGTK-2.8.9[X]
 	dbus? ( sys-apps/dbus )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig