Fix depend on wxGTK:2.8, bug #332709 by Martin Wegner <public@mroot.net>

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

9 files changed, 18 insertions, 173 deletions

diff --git a/net-ftp/filezilla/ChangeLog b/net-ftp/filezilla/ChangeLog
index 6c4ee8ddd310..89f99e883fa0 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.67 2010/06/23 12:42:10 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.68 2010/08/19 19:00:02 voyageur Exp $
+
+  19 Aug 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  -files/filezilla-3.2.4.1-gnutls-2.7.patch, 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.3.ebuild,
+  filezilla-3.3.3-r1.ebuild:
+  Fix depend on wxGTK:2.8, bug #332709 by Martin Wegner <public@mroot.net>
 
   23 Jun 2010; Bernard Cafarelli <voyageur@gentoo.org>
   filezilla-3.3.0.1.ebuild, filezilla-3.3.1.ebuild, filezilla-3.3.2.ebuild,
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 70e80272bb2c..b768a17ef851 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,14 +1,7 @@
-AUX filezilla-3.2.4.1-gnutls-2.7.patch 390 RMD160 b96355a4048627b24556fd00032cb8da2c3c3286 SHA1 32d2986c03fc6b22fe96494f764b1ad53dc11c91 SHA256 fcf9431e82f892107e04490a858d2f178135e9e84f60f3698fe59fd811329ae4
 DIST FileZilla_3.3.0.1_src.tar.bz2 3113486 RMD160 1bfbc885773229c4c72ad8c82001fadd555b9b3d SHA1 51ecb7c79c53466595c5691945ad83b49415f1b4 SHA256 67abea4b429e759eabafc510d342e04d9da0bfd18ab52c5d8d5e58523b023caa
-DIST FileZilla_3.3.1_src.tar.bz2 3129864 RMD160 72ade8ebc1d8e26b21900814aa168e834d3b9155 SHA1 aa0c42e0fed93e7068376b63213ff7c164fd078e SHA256 2c4e8e37c63517404967efd2740d5ebeff6dae1c52b29a31a209766a90204178
-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 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
+EBUILD filezilla-3.3.0.1.ebuild 1230 RMD160 168d65fdd758e17247ccdd507693d368422cdd3b SHA1 5d99aa99f904c6d95ba32cfc9fad2291a6609194 SHA256 0de412cbf6a685b3ec86e73f3e8b332a9f7f6f678ccda2a91d85a1da7bb13319
+EBUILD filezilla-3.3.3-r1.ebuild 1258 RMD160 b03a568a954599ef5796241b16911b33c448aa43 SHA1 f59249250424f2ec483e1906e2448e3942638f80 SHA256 862eac1de8a6ae1de29b0cc044ed57bcfc877448b593e27dabd82f3ea1f0bde4
+EBUILD filezilla-3.3.3.ebuild 1232 RMD160 32cbb604165468a7cf30b8abafebba0d526144d6 SHA1 eb73f6b9ebd0f6242ea35c9e8617d0b0b369fa1e SHA256 d9fb8891257c02c2afdf9606bca55c7284bfd96019788d064cf447092e55aa90
+MISC ChangeLog 12820 RMD160 52390512a7e1dbc262bb137d3c5bf08b2cad613b SHA1 1c23ae2d5106be56be33d8d0fa86e469115b4b4b SHA256 d89f1418d78c714dfb6ee15b66c391fada0f6ea0011be8fc89b71c3a5214d0c9
 MISC metadata.xml 358 RMD160 847093b8297b203ca89664d66e195f763d50e751 SHA1 a61011a0ee29bdb9a156e297a414bc2902598156 SHA256 13ba819a417c003a969b6557fd32a73ed49be658c3e0470c29a21ee807d5a28b
diff --git a/net-ftp/filezilla/files/filezilla-3.2.4.1-gnutls-2.7.patch b/net-ftp/filezilla/files/filezilla-3.2.4.1-gnutls-2.7.patch
deleted file mode 100644
index 7e9dbfa260b5..000000000000
--- a/net-ftp/filezilla/files/filezilla-3.2.4.1-gnutls-2.7.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	2009-05-07 15:27:48.000000000 +0200
-+++ configure.in	2009-05-07 15:33:53.000000000 +0200
-@@ -319,7 +319,7 @@
-   # GnuTLS
-   # ------
- 
--  AM_PATH_LIBGNUTLS(2.0.4,, AC_MSG_ERROR([[
-+  PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 2.0.4,, AC_MSG_ERROR([[
- ***
- *** libgnutls 2.0.4 or greater was not found. You may want to get it from
- *** ftp://ftp.gnutls.org/pub/gnutls/]]))
diff --git a/net-ftp/filezilla/filezilla-3.3.0.1.ebuild b/net-ftp/filezilla/filezilla-3.3.0.1.ebuild
index c9c75c0c1da6..cdaee9545b98 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.7 2010/06/23 12:42:10 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.3.0.1.ebuild,v 1.8 2010/08/19 19:00:02 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[X]
+	>=x11-libs/wxGTK-2.8.9:2.8[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
deleted file mode 100644
index c195badcb2be..000000000000
--- a/net-ftp/filezilla/filezilla-3.3.1.ebuild
+++ /dev/null
@@ -1,48 +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.1.ebuild,v 1.3 2010/06/23 12:42:10 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
-	net-dns/libidn
-	>=net-libs/gnutls-2.8.3
-	>=x11-libs/wxGTK-2.8.9[X]
-	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=builtin \
-		--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
deleted file mode 100644
index 09e0a88dac6a..000000000000
--- a/net-ftp/filezilla/filezilla-3.3.2.1.ebuild
+++ /dev/null
@@ -1,48 +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.ebuild,v 1.3 2010/06/23 12:42:10 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
-	net-dns/libidn
-	>=net-libs/gnutls-2.8.3
-	>=x11-libs/wxGTK-2.8.9[X]
-	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=builtin \
-		--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.ebuild b/net-ftp/filezilla/filezilla-3.3.2.ebuild
deleted file mode 100644
index a2f0875c7fe3..000000000000
--- a/net-ftp/filezilla/filezilla-3.3.2.ebuild
+++ /dev/null
@@ -1,48 +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.ebuild,v 1.3 2010/06/23 12:42:10 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
-	net-dns/libidn
-	>=net-libs/gnutls-2.8.3
-	>=x11-libs/wxGTK-2.8.9[X]
-	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=builtin \
-		--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.3-r1.ebuild b/net-ftp/filezilla/filezilla-3.3.3-r1.ebuild
index daafdc0b892b..f465bf6f6ecd 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.2 2010/06/23 12:42:10 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.3.3-r1.ebuild,v 1.3 2010/08/19 19:00:02 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[X]
+	>=x11-libs/wxGTK-2.8.9:2.8[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 73b475b98543..a36708de3b09 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.2 2010/06/23 12:42:10 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.3.3.ebuild,v 1.3 2010/08/19 19:00:02 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[X]
+	>=x11-libs/wxGTK-2.8.9:2.8[X]
 	dbus? ( sys-apps/dbus )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig