Add missing dbus and cppunit depends, disable automate update check, bug #260585

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

5 files changed, 23 insertions, 14 deletions

diff --git a/net-ftp/filezilla/ChangeLog b/net-ftp/filezilla/ChangeLog
index f93b337d0bc1..8048328d060e 100644
--- a/net-ftp/filezilla/ChangeLog
+++ b/net-ftp/filezilla/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/filezilla
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.36 2009/02/22 20:44:02 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.37 2009/03/02 16:17:55 voyageur Exp $
+
+  02 Mar 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  filezilla-3.2.0.ebuild, filezilla-3.2.1.ebuild, filezilla-3.2.2.1.ebuild:
+  Add missing dbus and cppunit depends, disable automate update check,
+  thanks to Sebastian Pipping <webmaster@hartwork.org> in bug #260585
 
 *filezilla-3.2.2.1 (22 Feb 2009)
 
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index ab434c0ea669..eff317cf5fa2 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -11,8 +11,8 @@ EBUILD filezilla-3.1.4.1.ebuild 1051 RMD160 9477cc09b2d09c933a88254afb51320e0d14
 EBUILD filezilla-3.1.5.1.ebuild 1051 RMD160 e14ad10f4efa837721008bcaa989b58d23503c28 SHA1 2cfb8ec9e19e6d09cdb4c2d4fb90e220432a4da5 SHA256 a2baa10dc76735cb2b143b825db967a2fceb07e39b81a98b28c5523ff867fff7
 EBUILD filezilla-3.1.5.ebuild 1049 RMD160 20c6c0f2aa36f0c5cf01d0f12fc288c93510c702 SHA1 b569e0f3ddcb626adbffcc74d690854b5b040994 SHA256 567ab82d451025d31c06f733d8a03bf5dcf3c9debca6ebbb00b511701567cb35
 EBUILD filezilla-3.1.6.ebuild 1049 RMD160 1e12f0697fd9f3cee87a2dc50e32073412279b74 SHA1 85139e79820216b26b4fd8d5311c50176273fd81 SHA256 48e6e7de82306933e9e60811cb2e9a2c19741e560c70ee86d8c60065c5af16ed
-EBUILD filezilla-3.2.0.ebuild 1066 RMD160 cd5662c001b9624359578094da59e7160566d54b SHA1 4e3fcdddc8e0983e422c94399e53831a5c7eb1e0 SHA256 c1d74683ad7ec7cd87853439bd0390b52d9617336d959f0e309c18b3c911994a
-EBUILD filezilla-3.2.1.ebuild 1070 RMD160 6712da82e1fe799348a6940eb88ffe04391bda93 SHA1 0656a96e28d8a47bcd8f605c93fe5ff499676d86 SHA256 9fb23f562ba9292f6c1a926f8545434e4021856938836442e2dd1df58c6fe681
-EBUILD filezilla-3.2.2.1.ebuild 1072 RMD160 f1e9d5d69ad37d2df9683fdc0196ac60441c9e75 SHA1 fbab8ddfc00a3edc1fd9d5fcc2251aa2329cb8d4 SHA256 5f85116439a3d4841cd2f4f8814f2a383dd3266a8050c4dc56188d51efd925ef
-MISC ChangeLog 6245 RMD160 e0129cbd33fd2a9ee6c9c437a27094ac50a8b2c3 SHA1 146d3d386fc663981c7b871063a23211fd94cde7 SHA256 46ebe26513f77bd3aa02ac2fd9edafa3c34fa5cee8525dffc99cbd8abfcc4de8
+EBUILD filezilla-3.2.0.ebuild 1092 RMD160 46db1fa0f3c606722fd6e91159708f18f085c2b8 SHA1 5ce50289adbbcc0c9f622c1b9760fd0f2f6bb128 SHA256 40e0fc8dc23015350cf67c987b6873d6429ca88230348ec9dc1ad6702ddb5753
+EBUILD filezilla-3.2.1.ebuild 1095 RMD160 8223f8ff1e9ed1f279c543582771c11fbc83fab5 SHA1 ef7f8ce7ff88e4ae1ac1f235daab7adbc8b7c577 SHA256 9474bbc1206abdda8e5d2d59849e9c4468c36159a88493f264643cc0f4913fe3
+EBUILD filezilla-3.2.2.1.ebuild 1156 RMD160 339d6bbda5e0e440ad4422873d4e6a14a1056223 SHA1 538ceb32c8e1d17a39cd64a0e5db8b6a5b6d4864 SHA256 4d037becc967f95141bc45cee8e8f1d35c5cf72497a082f467a0add2dc6999c7
+MISC ChangeLog 6518 RMD160 8f114f1ca27dcc30fb162188d3c5ad1702482ebb SHA1 df295c94f92a34e7b24092d25c12fd9b864607ba SHA256 e25d9e6b654cb3bef9a2758f961165fd450d15cdcc9ac5329d66054cceeff3f0
 MISC metadata.xml 358 RMD160 847093b8297b203ca89664d66e195f763d50e751 SHA1 a61011a0ee29bdb9a156e297a414bc2902598156 SHA256 13ba819a417c003a969b6557fd32a73ed49be658c3e0470c29a21ee807d5a28b
diff --git a/net-ftp/filezilla/filezilla-3.2.0.ebuild b/net-ftp/filezilla/filezilla-3.2.0.ebuild
index 0aeca96d0ecf..0562b2ff077a 100644
--- a/net-ftp/filezilla/filezilla-3.2.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.2.0.ebuild,v 1.4 2009/02/22 12:06:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.2.0.ebuild,v 1.5 2009/03/02 16:17:55 voyageur Exp $
 
 WX_GTK_VER="2.8"
 
@@ -20,7 +20,8 @@ IUSE="dbus"
 
 RDEPEND="net-dns/libidn
 	>=x11-libs/wxGTK-2.8.9
-	>=app-admin/eselect-wxwidgets-0.7-r1"
+	>=app-admin/eselect-wxwidgets-0.7-r1
+	dbus? ( sys-apps/dbus )"
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-1.4
 	>=sys-devel/gettext-0.11
diff --git a/net-ftp/filezilla/filezilla-3.2.1.ebuild b/net-ftp/filezilla/filezilla-3.2.1.ebuild
index 9c649a72a523..b3cbf55d086d 100644
--- a/net-ftp/filezilla/filezilla-3.2.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.2.1.ebuild,v 1.1 2009/02/07 17:42:39 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.2.1.ebuild,v 1.2 2009/03/02 16:17:55 voyageur Exp $
 
 WX_GTK_VER="2.8"
 
@@ -20,7 +20,8 @@ IUSE="dbus"
 
 RDEPEND="net-dns/libidn
 	>=x11-libs/wxGTK-2.8.9
-	>=app-admin/eselect-wxwidgets-0.7-r1"
+	>=app-admin/eselect-wxwidgets-0.7-r1
+	dbus? ( sys-apps/dbus )"
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-1.4
 	>=sys-devel/gettext-0.11
diff --git a/net-ftp/filezilla/filezilla-3.2.2.1.ebuild b/net-ftp/filezilla/filezilla-3.2.2.1.ebuild
index 4d41db1ba443..2a668fc682c3 100644
--- a/net-ftp/filezilla/filezilla-3.2.2.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.2.2.1.ebuild,v 1.1 2009/02/22 20:44:02 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.2.2.1.ebuild,v 1.2 2009/03/02 16:17:55 voyageur Exp $
 
 WX_GTK_VER="2.8"
 
@@ -16,20 +16,22 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="dbus"
+IUSE="dbus test"
 
 RDEPEND="net-dns/libidn
 	>=x11-libs/wxGTK-2.8.9
-	>=app-admin/eselect-wxwidgets-0.7-r1"
+	>=app-admin/eselect-wxwidgets-0.7-r1
+	dbus? ( sys-apps/dbus )"
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-1.4
 	>=sys-devel/gettext-0.11
-	>=net-libs/gnutls-2.0.4"
+	>=net-libs/gnutls-2.0.4
+	test? ( dev-util/cppunit )"
 
 S="${WORKDIR}"/${PN}-${MY_PV}
 
 src_compile() {
-	econf $(use_with dbus) || die "econf failed"
+	econf $(use_with dbus) --disable-autoupdatecheck || die "econf failed"
 	emake || die "emake failed"
 }