Version bump

svn path=/; revision=138

4 files changed, 33 insertions, 19 deletions

diff --git a/net-ftp/filezilla/ChangeLog b/net-ftp/filezilla/ChangeLog
index 882a117..f4e783e 100644
--- a/net-ftp/filezilla/ChangeLog
+++ b/net-ftp/filezilla/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Oct 2007; <drizzt@gentoo.org> +files/filezilla-3.0.1-wxrc.patch, ++,
+  -filezilla-3.0.0_beta11.ebuild:
+  Version bump
+
+  04 Oct 2007; <drizzt@gentoo.org> +files/filezilla-3.0.1-wxrc.patch, ++,
+  -filezilla-3.0.0_beta11.ebuild:
+  Version bump
+
   23 Jul 2007; Timothy Redaelli <drizzt@gentoo.org>
   +filezilla-3.0.0_beta11.ebuild:
   Add filezilla as requested in mail.
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index ca95d86..9013c56 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,13 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST FileZilla_3.0.0-beta11_src.tar.bz2 1464353 RMD160 32020512b4c48b2596bf595396f5e7641fe6eea0 SHA1 baaed64640057aa5aa7f2ef7b25f0a695aac4c13 SHA256 2d08ede96c2e36a692fd4e1d100de1eeec308b75394ca1cf83b5ce54959eee49
-EBUILD filezilla-3.0.0_beta11.ebuild 1108 RMD160 f6e29c688a9261ffb57315f080ddab3521c1cfe6 SHA1 1d342316bc404845c1744cb1bcfed0f337c0fd94 SHA256 6057716ac63e0b0c418a7d2b06bbea96ce08f61b834bbf5a1df03b407fde81ab
-MISC ChangeLog 293 RMD160 ca01c7156afc4f467344f09d00c13ea3d012d309 SHA1 b2b17940cd3c601d8a04703b2b851f686d097301 SHA256 01f864ee0ecff88964468e40b3731069508bd182514a5c1084d0f45caab2b9a5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGpSfIjJyKLBkBVroRAu+fAJ0XsbqTYY/IMSZ3FiUCyWZuiyEIBQCfT75+
-YdWxRUxEJIaDLDhAPlcRoaY=
-=hG5X
------END PGP SIGNATURE-----
+AUX filezilla-3.0.1-wxrc.patch 321 RMD160 1f87f6baa2c403a4291fe70b7a85128a6e8f7830 SHA1 c84b5f7341dd994a93ac05004593d7690d1885cb SHA256 fb47713bf650355ba11957dac4bf9b8c37adce1a57b87a73ee4c7f3b8378b6f6
+DIST FileZilla_3.0.1_src.tar.bz2 1716334 RMD160 eb73dd4b3e9c3f7a96169f6da33af814573c44d0 SHA1 b1fa51ef996e90cd71ecc8cb2daf7e4a258c3b3d SHA256 129cffb053e1552c7ed126869062e428b10fc57ccd2a14ecd6c81a2f6d6031ec
+EBUILD filezilla-3.0.1.ebuild 1163 RMD160 80e22d117886e3bf9075ed4ce96a398dc2c3dc6a SHA1 d7c6f47431af1bcd4a2339c4789b3b1079c1be01 SHA256 86182ed9d9f3d25935ec3b6a665b525cf19f82d00e213237d51c27b1c3f756f1
+MISC ChangeLog 541 RMD160 40389f86b581d3ff1b49b4637fa772d969d2a950 SHA1 782afbfc13c232743e6a5c920b1dafae9e143a21 SHA256 c577005d917259738bc6931308623a59510342cb353ada3a59cb3f763bb8b0b5
diff --git a/net-ftp/filezilla/files/filezilla-3.0.1-wxrc.patch b/net-ftp/filezilla/files/filezilla-3.0.1-wxrc.patch
new file mode 100644
index 0000000..df14507
--- /dev/null
+++ b/net-ftp/filezilla/files/filezilla-3.0.1-wxrc.patch
@@ -0,0 +1,11 @@
+--- configure.in.old	2007-10-04 15:21:42.000000000 +0200
++++ configure.in	2007-10-04 15:30:31.000000000 +0200
+@@ -382,7 +382,7 @@
+ 
+ fi
+ 
+-AC_PATH_PROG([WXRC], [wxrc --version])
++AM_PATH_WXRC()
+ if test "x$WXRC" = "x"; then
+   AC_MSG_ERROR([
+     wxrc could not be found. This program gets build together with wxWidgets.
diff --git a/net-ftp/filezilla/filezilla-3.0.0_beta11.ebuild b/net-ftp/filezilla/filezilla-3.0.1.ebuild
index f0e2557..0f09d3f 100644
--- a/net-ftp/filezilla/filezilla-3.0.0_beta11.ebuild
+++ b/net-ftp/filezilla/filezilla-3.0.1.ebuild
@@ -28,11 +28,15 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}"/${PN}-${MY_PV}
 
 pkg_setup() {
-	if use unicode; then
 		need-wxwidgets "unicode"
-	else
-		need-wxwidgets "gtk2"
-	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}"/${P}-wxrc.patch
+	AT_M4DIR="." eautoreconf
 }
 
 src_compile() {
@@ -46,8 +50,8 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	doicon src/interface/resources/${PN}.xpm || die "doicon failed"
-	make_desktop_entry ${PN} "FileZilla" ${PN}.xpm
+	doicon src/interface/resources/48x48/${PN}.png || die "doicon failed"
+	make_desktop_entry ${PN} "FileZilla" ${PN}.png
 
 	dodoc AUTHORS ChangeLog NEWS
 }