public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/, net-ftp/filezilla/files/
@ 2015-08-17 15:21 Bernard Cafarelli
  0 siblings, 0 replies; 9+ messages in thread
From: Bernard Cafarelli @ 2015-08-17 15:21 UTC (permalink / raw
  To: gentoo-commits

commit:     9e5c5fccf064f841b9777d339811ae6e5d17a94b
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 17 15:21:07 2015 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 15:21:17 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e5c5fcc

net-ftp/filezilla: version bump, tinyxml to pugixml switch

Package-Manager: portage-2.2.20.1

 net-ftp/filezilla/Manifest                         |  1 +
 .../files/filezilla-3.13.0-fzputtygen_interface.h  | 40 ++++++++++++
 net-ftp/filezilla/filezilla-3.13.0.ebuild          | 71 ++++++++++++++++++++++
 3 files changed, 112 insertions(+)

diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index f98832f..567df92 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -2,6 +2,7 @@ DIST FileZilla_3.10.1.1_src.tar.bz2 4572160 SHA256 67dbd801b15edd446f35b8df093a2
 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.12.0.2_src.tar.bz2 4440836 SHA256 7a296fc2cd94d00d3a14ad29b84ff081c60a791f4cddc07f0bd8022bd57e1d0d SHA512 163ab37d0b15ffd511c9237727b2a2879c2ff38f264853148633c87ec2d6e07cca1847104eb8c7190a0d27a6978ddb10b10dd8e1ef6e157051567b04d1ec5930 WHIRLPOOL 1b3c859f77ab1c10adcbbbdf6201adfd388d25af4ff91c4a96cba7ff57eadf66a181ddd421b01dc124b2a58ca96599d5cfd11e321dac76afc18a69698dd8d8e1
+DIST FileZilla_3.13.0_src.tar.bz2 4542742 SHA256 e6c21b41b1318d0d75273aca94cfda3039c9847bdb5adc4b9d480ecdcdfa4fc7 SHA512 f78b8387552fd829a3851bd358c1fbf78dfab3cea642734803220f4264029a898e7c65b0b82102373b27b981921d92143f2aaaf1163c20eed60a5727aca2ed12 WHIRLPOOL 21a8ba37b2fc96c8b047550c2c2634a81ec64c094d20c975a3ffdfafe0338c42f9e3f15e758f37bfb19bfa9f757ab877e52eb34d7b1e43901bd99d700bda26de
 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.6_src.tar.bz2 4181121 SHA256 ce7f56b383fa59dc55b16d8695e9f03b6e86d59a04dce44a16b5d02b2391b0b7 SHA512 750bb9afc12d0015cab7f775878def5bbbc0d16eed7ab3d876888ebc1f72480e338acfd16cd2bbe9520c26d491a996c85f712f47d6cd7e05d083c189cd23899c WHIRLPOOL 4bdbbd570b2a0290e2c4dff1e02aec2484891f5100fc7829e75b3ccf4ff004a1cfacc328b85efbb60be9d058499d0b4b4e1e28927c345a9450e7204cd25746b2

diff --git a/net-ftp/filezilla/files/filezilla-3.13.0-fzputtygen_interface.h b/net-ftp/filezilla/files/filezilla-3.13.0-fzputtygen_interface.h
new file mode 100644
index 0000000..b72d470
--- /dev/null
+++ b/net-ftp/filezilla/files/filezilla-3.13.0-fzputtygen_interface.h
@@ -0,0 +1,40 @@
+#ifndef FILEZILLA_FZPUTTYGEN_INTERFACE_HEADER
+#define FILEZILLA_FZPUTTYGEN_INTERFACE_HEADER
+
+#include <wx/process.h>
+
+class CFZPuttyGenInterface
+{
+public:
+	CFZPuttyGenInterface(wxWindow* parent);
+	virtual ~CFZPuttyGenInterface();
+	bool LoadKeyFile(wxString& keyFile, bool silent, wxString& comment, wxString& data);
+
+	void EndProcess();
+	void DeleteProcess();
+	bool IsProcessCreated();
+	bool IsProcessStarted();
+
+protected:
+	// return -1 on error
+	int NeedsConversion(wxString keyFile, bool silent);
+
+	// return -1 on error
+	int IsKeyFileEncrypted(wxString keyFile, bool silent);
+
+	wxProcess* m_pProcess{};
+	bool m_initialized{};
+	wxWindow* m_parent;
+	
+	enum ReplyCode {
+		success,
+		error,
+		failure
+	};
+
+	bool LoadProcess(bool silent);
+	bool Send(const wxString& cmd);
+	ReplyCode GetReply(wxString& reply);
+};
+
+#endif /* FILEZILLA_FZPUTTYGEN_INTERFACE_HEADER */

diff --git a/net-ftp/filezilla/filezilla-3.13.0.ebuild b/net-ftp/filezilla/filezilla-3.13.0.ebuild
new file mode 100644
index 0000000..51f2592
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.13.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	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 )"
+#	>=dev-libs/pugixml-1.5
+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() {
+	# Missing in tarball
+	cp -a "${FILESDIR}"/${P}-fzputtygen_interface.h \
+		src/interface/fzputtygen_interface.h || die
+	epatch "${FILESDIR}"/${PN}-3.10.2-debug.patch
+	eautoreconf
+}
+
+src_configure() {
+	# Does not build with system pugixml, use builtin for now
+	econf $(use_with dbus) $(use_enable nls locales) \
+		--with-pugixml=builtin \
+		--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
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/, net-ftp/filezilla/files/
@ 2015-10-17 22:19 Bernard Cafarelli
  0 siblings, 0 replies; 9+ messages in thread
From: Bernard Cafarelli @ 2015-10-17 22:19 UTC (permalink / raw
  To: gentoo-commits

commit:     92b578678a2ad86dfff37a9ba024461629785c6f
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 22:14:14 2015 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 22:19:40 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92b57867

net-ftp/filezilla: drop some old versions

Package-Manager: portage-2.2.23

 net-ftp/filezilla/Manifest                         |  7 --
 .../filezilla/files/filezilla-3.10.2-debug.patch   | 13 ----
 .../filezilla/files/filezilla-3.7.4-debug.patch    | 13 ----
 net-ftp/filezilla/filezilla-3.10.1.1.ebuild        | 68 ------------------
 net-ftp/filezilla/filezilla-3.11.0.1.ebuild        | 68 ------------------
 net-ftp/filezilla/filezilla-3.11.0.2.ebuild        | 68 ------------------
 net-ftp/filezilla/filezilla-3.13.0.ebuild          | 82 ----------------------
 net-ftp/filezilla/filezilla-3.13.1.ebuild          | 79 ---------------------
 net-ftp/filezilla/filezilla-3.8.1.ebuild           | 68 ------------------
 net-ftp/filezilla/filezilla-3.9.0.6.ebuild         | 68 ------------------
 10 files changed, 534 deletions(-)

diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 9008d0c..5494e46 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,11 +1,4 @@
-DIST FileZilla_3.10.1.1_src.tar.bz2 4572160 SHA256 67dbd801b15edd446f35b8df093a24440b5fd41966928d018f03f81db12e636d SHA512 92ecf8a7943975b218ee44d24dcb7dde937125ba056059eed2b7217416269d73e8ed50fc79258cb544606e7949cb7c4ff6aedd27095e083d5ac645a27c5cd068 WHIRLPOOL 56a7be2cdd33b776e41546fcb6e4781e3689ea482a01242b9e096cef782cba6e5f49747d0626f3dc124203d2d7a6421c5706290e91322823f29b2197b310b54d
-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.12.0.2_src.tar.bz2 4440836 SHA256 7a296fc2cd94d00d3a14ad29b84ff081c60a791f4cddc07f0bd8022bd57e1d0d SHA512 163ab37d0b15ffd511c9237727b2a2879c2ff38f264853148633c87ec2d6e07cca1847104eb8c7190a0d27a6978ddb10b10dd8e1ef6e157051567b04d1ec5930 WHIRLPOOL 1b3c859f77ab1c10adcbbbdf6201adfd388d25af4ff91c4a96cba7ff57eadf66a181ddd421b01dc124b2a58ca96599d5cfd11e321dac76afc18a69698dd8d8e1
-DIST FileZilla_3.13.0_src.tar.bz2 4542742 SHA256 e6c21b41b1318d0d75273aca94cfda3039c9847bdb5adc4b9d480ecdcdfa4fc7 SHA512 f78b8387552fd829a3851bd358c1fbf78dfab3cea642734803220f4264029a898e7c65b0b82102373b27b981921d92143f2aaaf1163c20eed60a5727aca2ed12 WHIRLPOOL 21a8ba37b2fc96c8b047550c2c2634a81ec64c094d20c975a3ffdfafe0338c42f9e3f15e758f37bfb19bfa9f757ab877e52eb34d7b1e43901bd99d700bda26de
-DIST FileZilla_3.13.1_src.tar.bz2 4548641 SHA256 c16e7dc9f6b6663ff67de608df930148d693b61e70d76783a81db710f117e8c7 SHA512 98f78dee88976c506416bc02ea76fbfc57ca77d114f50530c9b4fc017bf0525cd4237da2d91f7587b9b510d59b0ec977529fc33765b8a0f9ec35169b9e7578db WHIRLPOOL c0b607f6479e21ed95c6ac6599c71135392b6585e44d55e3a4563053878f392e3ebc4902fb9d57ffef8eac7ed1705d75460b0ff46588e0c4458cfb0e1f748577
 DIST FileZilla_3.14.0_src.tar.bz2 4415005 SHA256 92385ab4f30bc7e5e457d6a3310645cc6c4bd0e83a78e12c33f2778b73d579fd SHA512 00d81aeef1d30d16884d34a5c15584204f55f72d9a7ab88cca4ff953c6beda5ef2a7883d095c60826ccadc1c4529c0e6e93c50f5ececc598c2200c32cec5d4c5 WHIRLPOOL fd994ad7f150506111642015bf9ff87481231843512b6b5eac3b2e64ff4e63e2cd2933deb72b466785a09700fd88b9f45302b28dfed71f509001dbeb8a001d99
 DIST FileZilla_3.14.1_src.tar.bz2 4411187 SHA256 b10871b6ced5f52062b44deda037edb8a38090b226a018b9b64b1a1feb59d46c SHA512 c97767ed01f4538a2f4b8760601778ca7f9aa99b5b928cb86c9508eba0490bbc1f31921d098e0ccd30712ff06dc9f21d323201fb8bee80b9fb7a6528fbb03368 WHIRLPOOL 1fbccfbb0de5111fad14eb0b38ee190aefc4c80777c3611189c74412dfefdf2fd96d4a42c917791d3a3318b6ae22f01a7d24a4a0904386b22a98693151b5a822
 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.6_src.tar.bz2 4181121 SHA256 ce7f56b383fa59dc55b16d8695e9f03b6e86d59a04dce44a16b5d02b2391b0b7 SHA512 750bb9afc12d0015cab7f775878def5bbbc0d16eed7ab3d876888ebc1f72480e338acfd16cd2bbe9520c26d491a996c85f712f47d6cd7e05d083c189cd23899c WHIRLPOOL 4bdbbd570b2a0290e2c4dff1e02aec2484891f5100fc7829e75b3ccf4ff004a1cfacc328b85efbb60be9d058499d0b4b4e1e28927c345a9450e7204cd25746b2

diff --git a/net-ftp/filezilla/files/filezilla-3.10.2-debug.patch b/net-ftp/filezilla/files/filezilla-3.10.2-debug.patch
deleted file mode 100644
index 74e3fc3..0000000
--- a/net-ftp/filezilla/files/filezilla-3.10.2-debug.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.ac.orig	2015-03-03 17:04:56.300296016 +0100
-+++ configure.ac	2015-03-03 17:05:20.739299967 +0100
-@@ -46,8 +46,8 @@
- if ! test "$localesonly" = "yes"; then
- 
-   if test "X$GCC" = Xyes; then
--    CFLAGS="$CFLAGS -Wall -g"
--    CXXFLAGS="$CXXFLAGS -Wall -g"
-+    CFLAGS="$CFLAGS -Wall"
-+    CXXFLAGS="$CXXFLAGS -Wall"
-   fi
- 
-   # Check for C++11 support

diff --git a/net-ftp/filezilla/files/filezilla-3.7.4-debug.patch b/net-ftp/filezilla/files/filezilla-3.7.4-debug.patch
deleted file mode 100644
index 3f4a4db..0000000
--- a/net-ftp/filezilla/files/filezilla-3.7.4-debug.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.ac.orig	2014-02-10 00:55:32.716237174 +0100
-+++ configure.ac	2014-02-10 00:58:37.390508206 +0100
-@@ -44,8 +44,8 @@
- if ! test "$localesonly" = "yes"; then
- 
-   if test "X$GCC" = Xyes; then
--    CFLAGS="$CFLAGS -Wall -g -fexceptions"
--    CXXFLAGS="$CXXFLAGS -Wall -g -fexceptions"
-+    CFLAGS="$CFLAGS -Wall -fexceptions"
-+    CXXFLAGS="$CXXFLAGS -Wall -fexceptions"
-   fi
- 
-   CHECK_CXX0X

diff --git a/net-ftp/filezilla/filezilla-3.10.1.1.ebuild b/net-ftp/filezilla/filezilla-3.10.1.1.ebuild
deleted file mode 100644
index 896c5dc..0000000
--- a/net-ftp/filezilla/filezilla-3.10.1.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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.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
-}

diff --git a/net-ftp/filezilla/filezilla-3.11.0.1.ebuild b/net-ftp/filezilla/filezilla-3.11.0.1.ebuild
deleted file mode 100644
index 5a739de..0000000
--- a/net-ftp/filezilla/filezilla-3.11.0.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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.2.ebuild b/net-ftp/filezilla/filezilla-3.11.0.2.ebuild
deleted file mode 100644
index 5a739de..0000000
--- a/net-ftp/filezilla/filezilla-3.11.0.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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.13.0.ebuild b/net-ftp/filezilla/filezilla-3.13.0.ebuild
deleted file mode 100644
index 876c91f..0000000
--- a/net-ftp/filezilla/filezilla-3.13.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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
-	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 )"
-#	>=dev-libs/pugixml-1.5
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Missing in tarball
-	cp -a "${FILESDIR}"/${P}-fzputtygen_interface.h \
-		src/interface/fzputtygen_interface.h || die
-	epatch "${FILESDIR}"/${PN}-3.10.2-debug.patch
-	eautoreconf
-}
-
-src_configure() {
-	# system pugixml lacks long long ops support, use builtin for now
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-pugixml=builtin \
-		--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.13.1.ebuild b/net-ftp/filezilla/filezilla-3.13.1.ebuild
deleted file mode 100644
index 00bfe84..0000000
--- a/net-ftp/filezilla/filezilla-3.13.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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
-	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 )"
-#	>=dev-libs/pugixml-1.5
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.10.2-debug.patch
-	eautoreconf
-}
-
-src_configure() {
-	# system pugixml lacks long long ops support, use builtin for now
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-pugixml=builtin \
-		--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.8.1.ebuild b/net-ftp/filezilla/filezilla-3.8.1.ebuild
deleted file mode 100644
index 50a8205..0000000
--- a/net-ftp/filezilla/filezilla-3.8.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-
-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-2.8.12:2.8[aqua] )
-	!aqua? ( >=x11-libs/wxGTK-2.8.12:2.8[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
-}

diff --git a/net-ftp/filezilla/filezilla-3.9.0.6.ebuild b/net-ftp/filezilla/filezilla-3.9.0.6.ebuild
deleted file mode 100644
index f947d19..0000000
--- a/net-ftp/filezilla/filezilla-3.9.0.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/, net-ftp/filezilla/files/
@ 2016-10-04  8:16 Lars Wendler
  0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2016-10-04  8:16 UTC (permalink / raw
  To: gentoo-commits

commit:     560e1424231156c902846c80d40c256a85b59d2e
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  4 08:06:44 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Oct  4 08:15:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=560e1424

net-ftp/filezilla: Bump to version 3.22.1

Package-Manager: portage-2.3.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-ftp/filezilla/Manifest                         |  1 +
 .../filezilla/files/filezilla-3.22.1-debug.patch   | 12 ++++
 net-ftp/filezilla/filezilla-3.22.1.ebuild          | 69 ++++++++++++++++++++++
 3 files changed, 82 insertions(+)

diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index c04ff94..ec4c550 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -2,3 +2,4 @@ DIST FileZilla_3.12.0.2_src.tar.bz2 4440836 SHA256 7a296fc2cd94d00d3a14ad29b84ff
 DIST FileZilla_3.14.1_src.tar.bz2 4411187 SHA256 b10871b6ced5f52062b44deda037edb8a38090b226a018b9b64b1a1feb59d46c SHA512 c97767ed01f4538a2f4b8760601778ca7f9aa99b5b928cb86c9508eba0490bbc1f31921d098e0ccd30712ff06dc9f21d323201fb8bee80b9fb7a6528fbb03368 WHIRLPOOL 1fbccfbb0de5111fad14eb0b38ee190aefc4c80777c3611189c74412dfefdf2fd96d4a42c917791d3a3318b6ae22f01a7d24a4a0904386b22a98693151b5a822
 DIST FileZilla_3.21.0_src.tar.bz2 4428270 SHA256 209bcdfcd60ae2278fa2fa8d99421682e0db146add9e96cb1e8455c3378c80e4 SHA512 d58573c58e524a257cdbcb60fdb5c749d8e4f8a390b728b458721944b3e836cedf3478ff55565885ff1853ddb3f368d6e6e6d45142f19a9a4ee755b88ceb56b4 WHIRLPOOL 20e5e553f359731e205fb9fdcbb4d62329fda33e2d81e944a9b504c8958aa89beb80bb62de2ac01c0544f4ed3319cbcb9ddeb403f486e56232da2cd34a1ead10
 DIST FileZilla_3.22.0_src.tar.bz2 4446165 SHA256 60b48314f356f682712c9cec0a27c6469bf888da781c658054bb7f0b23dcfacf SHA512 ce84ac614670e07454e80139f6f3d4299559b3faf74683989db3672358e1d2352017765b643519f4a6c272f24a13adcffbe90e925404d835fe9c5e6cb26528ae WHIRLPOOL fcff9115dc796d15aba9f843469268afeba3dbb6668c9dffbff1608d1a07215877ca9b7866e01756e0ea4da52212a94ca8fd0db8f1eed7449e24ef09cbef8d5c
+DIST FileZilla_3.22.1_src.tar.bz2 4446400 SHA256 2ea8a0d613e062c34c01b0a1c0860e1328bb8247eb02aa73ef4597d984e4285f SHA512 c03435e56279d384f1b0716e61082553a6f8157b305bc200d4666a27543094d3403d471153c7ceb8a2e9af00516186663e8b8840350930938a25b456e72c5c4a WHIRLPOOL 4ab2f77a4b89b0078e944a192fecf9ae955dee133afb8f3f6bc46d6ddc8b0c66eddc0009a1c395c4426aa4d2bd377bad45d83d6b5c1af8aa9b28b4f3c5d16109

diff --git a/net-ftp/filezilla/files/filezilla-3.22.1-debug.patch b/net-ftp/filezilla/files/filezilla-3.22.1-debug.patch
new file mode 100644
index 00000000..71430db
--- /dev/null
+++ b/net-ftp/filezilla/files/filezilla-3.22.1-debug.patch
@@ -0,0 +1,12 @@
+--- filezilla-3.22.1/configure.ac
++++ filezilla-3.22.1/configure.ac
+@@ -36,9 +36,7 @@
+ 
+   if test "X$GCC" = Xyes; then
+     AX_APPEND_FLAG(-Wall, CFLAGS)
+-    AX_APPEND_FLAG(-g, CFLAGS)
+     AX_APPEND_FLAG(-Wall, CXXFLAGS)
+-    AX_APPEND_FLAG(-g, CXXFLAGS)
+   fi
+ 
+   # Do this early: Compiler and linker flags to work around a nasty bug in Xcode.

diff --git a/net-ftp/filezilla/filezilla-3.22.1.ebuild b/net-ftp/filezilla/filezilla-3.22.1.ebuild
new file mode 100644
index 00000000..6f3f380
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.22.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86"
+IUSE="dbus nls test"
+
+# pugixml 1.7 minimal dependency is for c++11 proper configuration
+RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
+	>=dev-libs/nettle-3.1:=
+	>=dev-db/sqlite-3.7
+	>=dev-libs/libfilezilla-0.7.0
+	>=dev-libs/pugixml-1.7
+	net-dns/libidn
+	>=net-libs/gnutls-3.4.0
+	>=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}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.22.1-debug.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with dbus) $(use_enable nls locales) \
+		--with-pugixml=system \
+		--disable-autoupdatecheck
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	doicon src/interface/resources/48x48/${PN}.png
+
+	dodoc AUTHORS ChangeLog NEWS
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/, net-ftp/filezilla/files/
@ 2017-03-07 18:11 Lars Wendler
  0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2017-03-07 18:11 UTC (permalink / raw
  To: gentoo-commits

commit:     32b3f457169b0689280038139c67012f92046b4c
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  7 18:11:14 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Mar  7 18:11:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32b3f457

net-ftp/filezilla: Revbump to fix broken desktop entry file (bug #611968).

Thanks to Francesco Turco for reporting this bug and pointing to the upstream
fix.

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 net-ftp/filezilla/files/filezilla-3.24.1-desktop_entry.patch      | 8 ++++++++
 .../{filezilla-3.24.1.ebuild => filezilla-3.24.1-r1.ebuild}       | 7 ++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/net-ftp/filezilla/files/filezilla-3.24.1-desktop_entry.patch b/net-ftp/filezilla/files/filezilla-3.24.1-desktop_entry.patch
new file mode 100644
index 00000000000..2a579e898cc
--- /dev/null
+++ b/net-ftp/filezilla/files/filezilla-3.24.1-desktop_entry.patch
@@ -0,0 +1,8 @@
+--- FileZilla3/trunk/data/filezilla.desktop	2017/02/28 16:01:04	8248
++++ FileZilla3/trunk/data/filezilla.desktop	2017/03/03 15:38:01	8249
+@@ -1,4 +1,4 @@
+-[Desktop Entry]
++[Desktop Entry]
+ Name=FileZilla
+ GenericName=FTP client
+ GenericName[da]=FTP-klient

diff --git a/net-ftp/filezilla/filezilla-3.24.1.ebuild b/net-ftp/filezilla/filezilla-3.24.1-r1.ebuild
similarity index 93%
rename from net-ftp/filezilla/filezilla-3.24.1.ebuild
rename to net-ftp/filezilla/filezilla-3.24.1-r1.ebuild
index 1be888aca65..fc028119488 100644
--- a/net-ftp/filezilla/filezilla-3.24.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.24.1-r1.ebuild
@@ -37,6 +37,11 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${PN}-${MY_PV}
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.22.1-debug.patch
+	"${FILESDIR}"/${P}-desktop_entry.patch #466206
+)
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		if ! test-flag-CXX -std=c++14; then
@@ -49,7 +54,7 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.22.1-debug.patch
+	epatch "${PATCHES[@]}"
 	eautoreconf
 }
 


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/, net-ftp/filezilla/files/
@ 2020-05-09 14:25 Bernard Cafarelli
  0 siblings, 0 replies; 9+ messages in thread
From: Bernard Cafarelli @ 2020-05-09 14:25 UTC (permalink / raw
  To: gentoo-commits

commit:     d4618488e5f1564a6b89aebe99c7e189a1a597d2
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sat May  9 14:23:46 2020 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sat May  9 14:25:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4618488

net-ftp/filezilla: 3.48.0 bump

Also patch build system to skip useless configure sub script (win-only
shell extension) that used default CC. Apply same patch to stable
candidate 3.47.2.1

Closes: https://bugs.gentoo.org/717736
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 net-ftp/filezilla/Manifest                                  |  1 +
 .../files/filezilla-3.47.0-disable-shellext_conf.patch      | 13 +++++++++++++
 net-ftp/filezilla/filezilla-3.47.2.1.ebuild                 |  1 +
 .../{filezilla-3.47.2.1.ebuild => filezilla-3.48.0.ebuild}  |  7 ++++---
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index a1ae050d5d7..b78827f5aea 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -4,3 +4,4 @@ DIST FileZilla_3.45.1_src.tar.bz2 4649083 BLAKE2B 8d3113e5ce96d2115a6ec02109f261
 DIST FileZilla_3.46.3_src.tar.bz2 4720329 BLAKE2B 92369d2fb3b8c9eded37f912bbd25a0e995a5fc1ab86ef6aa746a8eb239f17e8fafa78de00529b0f3af102fe268b51a60ce40ac967cf9b2fbbd6fa7900898ffc SHA512 35b61c3bfd1d40848e7846b4533da8844df0e4873cb89286b90330cbc29dffeff96fcab10aec908a08d9129198bb2d80df8f223d8ebc1a0863a4083cb06abffc
 DIST FileZilla_3.47.1_src.tar.bz2 4732088 BLAKE2B 3db5247a9e2d9a7bf296091317b8faf049dbe9dca328536671dba5e5ab7b32d16d273348d0cbcf89342262a34dcf7d90198b4dfb98e67bfb683febf07b7b680e SHA512 32573e847bc23acb86bdea8eb4de102e4f673465e0b86738d954b47eacdf6e534854a9065bddf8b586eba315bf65b1bfc4f17f9379819a6c9bd43ae6ed8f388a
 DIST FileZilla_3.47.2.1_src.tar.bz2 4733941 BLAKE2B 0517d43bfba8aa116ae4031d56e5070aadbcaf81ace2311f6cfddb47e7f67ec62396ae3690c139bcc1a8368be690776b3163dd6d53a6ebb27ee5e99300b3c67b SHA512 8919eab7762e0e30241637a8978fbf61f02ac4c52aac293191315b931d52b41ae228b753f4e3b7530835578836dfee7f91772841273e9fc2bdf75ff7ed48fafc
+DIST FileZilla_3.48.0_src.tar.bz2 4765599 BLAKE2B 0ab391c0862a34dd5ede7a80290afc82b4d85b2deaf42d3bacd243bddf15505f05028522f73eeada07e91d91e0af87676ad77081c843448fda53c3b2ac18a70d SHA512 c9d4eb17dc31894468ca4b7c4c8fda0f307d3931bf1b3b8fb44afd084a1b2c9309d39e5745f9ba287a5566d44089af32350703e324a559afd6a015af469433fb

diff --git a/net-ftp/filezilla/files/filezilla-3.47.0-disable-shellext_conf.patch b/net-ftp/filezilla/files/filezilla-3.47.0-disable-shellext_conf.patch
new file mode 100644
index 00000000000..55868dce80f
--- /dev/null
+++ b/net-ftp/filezilla/files/filezilla-3.47.0-disable-shellext_conf.patch
@@ -0,0 +1,13 @@
+diff -Naur filezilla-3.47.2.1.orig/configure.ac filezilla-3.47.2.1/configure.ac
+--- filezilla-3.47.2.1.orig/configure.ac	2020-03-11 12:24:12.000000000 +0100
++++ filezilla-3.47.2.1/configure.ac	2020-05-09 16:09:23.832476049 +0200
+@@ -130,9 +130,6 @@
+   "$ac_abs_confdir/src/fzshellext/configure" --prefix="$prefix" --exec-prefix="$exec_prefix" --host=i686-w64-mingw32 || exit 1
+   cd "$OLD_DIR/src/fzshellext/64" || exit 1
+   "$ac_abs_confdir/src/fzshellext/configure" --prefix="$prefix" --exec-prefix="$exec_prefix" --host=x86_64-w64-mingw32 || exit 1
+-else
+-  cd "$OLD_DIR/src/fzshellext/64" || exit 1
+-  "$ac_abs_confdir/src/fzshellext/configure" --disable-shellext || exit 1
+ fi
+ cd "$OLD_DIR"
+ 

diff --git a/net-ftp/filezilla/filezilla-3.47.2.1.ebuild b/net-ftp/filezilla/filezilla-3.47.2.1.ebuild
index 9b6e1abcc95..2d228d74462 100644
--- a/net-ftp/filezilla/filezilla-3.47.2.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.47.2.1.ebuild
@@ -45,6 +45,7 @@ DOCS=(AUTHORS ChangeLog NEWS )
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.22.1-debug.patch
 	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
+	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
 )
 
 pkg_pretend() {

diff --git a/net-ftp/filezilla/filezilla-3.47.2.1.ebuild b/net-ftp/filezilla/filezilla-3.48.0.ebuild
similarity index 91%
copy from net-ftp/filezilla/filezilla-3.47.2.1.ebuild
copy to net-ftp/filezilla/filezilla-3.48.0.ebuild
index 9b6e1abcc95..9e6b4b3a1bf 100644
--- a/net-ftp/filezilla/filezilla-3.47.2.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.48.0.ebuild
@@ -16,15 +16,15 @@ SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="dbus nls test"
 
 # pugixml 1.7 minimal dependency is for c++11 proper configuration
 RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
 	>=dev-libs/nettle-3.1:=
 	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.20.2:=
-	<dev-libs/libfilezilla-0.21.0:=
+	>=dev-libs/libfilezilla-0.21.0:=
+	<dev-libs/libfilezilla-0.22.0:=
 	>=dev-libs/pugixml-1.7
 	>=net-libs/gnutls-3.5.7
 	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
@@ -45,6 +45,7 @@ DOCS=(AUTHORS ChangeLog NEWS )
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.22.1-debug.patch
 	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
+	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
 )
 
 pkg_pretend() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/, net-ftp/filezilla/files/
@ 2021-01-19  0:06 Lars Wendler
  0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2021-01-19  0:06 UTC (permalink / raw
  To: gentoo-commits

commit:     10d9859ef5c73d5c4e514717fd6bbdf536f2b5a0
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 00:06:32 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 00:06:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10d9859e

net-ftp/filezilla: Fixed build with sys-devel/slibtool

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../files/filezilla-3.52.2-slibtool.patch          | 24 ++++++++++++++++++++++
 net-ftp/filezilla/filezilla-3.52.2.ebuild          |  1 +
 2 files changed, 25 insertions(+)

diff --git a/net-ftp/filezilla/files/filezilla-3.52.2-slibtool.patch b/net-ftp/filezilla/files/filezilla-3.52.2-slibtool.patch
new file mode 100644
index 00000000000..4eaae857e1d
--- /dev/null
+++ b/net-ftp/filezilla/files/filezilla-3.52.2-slibtool.patch
@@ -0,0 +1,24 @@
+This fixes compilation with slibtool instead of GNU libtool
+
+--- filezilla-3.52.2/src/engine/Makefile.am
++++ filezilla-3.52.2/src/engine/Makefile.am
+@@ -146,6 +146,8 @@
+ libfzclient_private_la_LDFLAGS += $(LIBFILEZILLA_LIBS)
+ libfzclient_private_la_LDFLAGS += $(IDN_LIB)
+ 
++libfzclient_private_la_LIBADD = $(PUGIXML_LIBS)
++
+ dist_noinst_DATA = engine.vcxproj
+ 
+ CLEANFILES = filezilla.h.gch
+--- filezilla-3.52.2/src/interface/Makefile.am
++++ filezilla-3.52.2/src/interface/Makefile.am
+@@ -309,7 +309,7 @@
+ 
+ if HAVE_DBUS
+ filezilla_DEPENDENCIES += ../dbus/libfzdbus.a
+-filezilla_LDFLAGS += ../dbus/libfzdbus.a $(LIBDBUS_LIBS)
++filezilla_LDADD = ../dbus/libfzdbus.a $(LIBDBUS_LIBS)
+ endif
+ 
+ filezilla_LDFLAGS += $(WX_LIBS)

diff --git a/net-ftp/filezilla/filezilla-3.52.2.ebuild b/net-ftp/filezilla/filezilla-3.52.2.ebuild
index ba2ce7335de..c8f67f39ebe 100644
--- a/net-ftp/filezilla/filezilla-3.52.2.ebuild
+++ b/net-ftp/filezilla/filezilla-3.52.2.ebuild
@@ -45,6 +45,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.22.1-debug.patch
 	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
 	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
+	"${FILESDIR}"/${PN}-3.52.2-slibtool.patch
 )
 
 pkg_pretend() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/, net-ftp/filezilla/files/
@ 2022-07-07 21:09 Bernard Cafarelli
  0 siblings, 0 replies; 9+ messages in thread
From: Bernard Cafarelli @ 2022-07-07 21:09 UTC (permalink / raw
  To: gentoo-commits

commit:     75796551e61712dd022b7bb9cab3cf9bd702ccb8
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 20:45:15 2022 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 21:08:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75796551

net-ftp/filezilla: add ftp scheme handler to desktop file

Closes: https://bugs.gentoo.org/852242
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 .../filezilla/files/filezilla-3.60.1-desktop.patch |  7 +++
 net-ftp/filezilla/filezilla-3.60.1-r1.ebuild       | 72 ++++++++++++++++++++++
 2 files changed, 79 insertions(+)

diff --git a/net-ftp/filezilla/files/filezilla-3.60.1-desktop.patch b/net-ftp/filezilla/files/filezilla-3.60.1-desktop.patch
new file mode 100644
index 000000000000..25b81826b7fe
--- /dev/null
+++ b/net-ftp/filezilla/files/filezilla-3.60.1-desktop.patch
@@ -0,0 +1,7 @@
+--- a/data/filezilla.desktop	2020-06-04 13:18:01.000000000 +0300
++++ b/data/filezilla.desktop	2022-06-16 02:16:03.727229995 +0300
+@@ -14,3 +14,4 @@
+ Type=Application
+ Categories=Network;FileTransfer;
+ Version=1.0
++MimeType=x-scheme-handler/ftp;

diff --git a/net-ftp/filezilla/filezilla-3.60.1-r1.ebuild b/net-ftp/filezilla/filezilla-3.60.1-r1.ebuild
new file mode 100644
index 000000000000..8f4d46102111
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.60.1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools wxwidgets xdg
+
+MY_PV="${PV/_/-}"
+MY_P="FileZilla_${MY_PV}"
+
+DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
+HOMEPAGE="https://filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="dbus nls test"
+RESTRICT="!test? ( test )"
+
+# pugixml 1.7 minimal dependency is for c++11 proper configuration
+RDEPEND="
+	>=app-eselect/eselect-wxwidgets-0.7-r1
+	>=dev-libs/nettle-3.1:=
+	>=dev-db/sqlite-3.7
+	>=dev-libs/libfilezilla-0.37.1:=
+	>=dev-libs/pugixml-1.7
+	>=net-libs/gnutls-3.5.7
+	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
+	x11-misc/xdg-utils
+	dbus? ( sys-apps/dbus )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cppunit-1.13.0 )"
+BDEPEND="
+	virtual/pkgconfig
+	>=sys-devel/libtool-1.4
+	nls? ( >=sys-devel/gettext-0.11 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.22.1-debug.patch
+	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
+	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
+	"${FILESDIR}"/${PN}-3.52.2-slibtool.patch
+	"${FILESDIR}"/${PN}-3.60.1-desktop.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	setup-wxwidgets
+
+	local myeconfargs=(
+		--disable-autoupdatecheck
+		--with-pugixml=system
+		$(use_enable nls locales)
+		$(use_with dbus)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/, net-ftp/filezilla/files/
@ 2023-02-22 19:00 Bernard Cafarelli
  0 siblings, 0 replies; 9+ messages in thread
From: Bernard Cafarelli @ 2023-02-22 19:00 UTC (permalink / raw
  To: gentoo-commits

commit:     b74372d2f26ea0096a563f4455aee1aacb657163
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 22 18:56:21 2023 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 19:00:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b74372d2

net-ftp/filezilla: handle new wxGTK versioning

Closes: https://bugs.gentoo.org/895642
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 .../files/filezilla-3.63.1-wxversion.patch         | 28 ++++++++++++++++++++++
 net-ftp/filezilla/filezilla-3.63.1.ebuild          |  1 +
 2 files changed, 29 insertions(+)

diff --git a/net-ftp/filezilla/files/filezilla-3.63.1-wxversion.patch b/net-ftp/filezilla/files/filezilla-3.63.1-wxversion.patch
new file mode 100644
index 000000000000..2e7658b703a4
--- /dev/null
+++ b/net-ftp/filezilla/files/filezilla-3.63.1-wxversion.patch
@@ -0,0 +1,28 @@
+diff -Naur filezilla-3.63.1.orig/m4/wxwin.m4 filezilla-3.63.1/m4/wxwin.m4
+--- filezilla-3.63.1.orig/m4/wxwin.m4	2020-06-04 12:18:02.000000000 +0200
++++ filezilla-3.63.1/m4/wxwin.m4	2023-02-22 19:38:22.620243565 +0100
+@@ -216,18 +216,18 @@
+ 
+     WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
+     wx_config_major_version=`echo $WX_VERSION | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
+     wx_config_minor_version=`echo $WX_VERSION | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
+     wx_config_micro_version=`echo $WX_VERSION | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
+ 
+     wx_requested_major_version=`echo $min_wx_version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
+     wx_requested_minor_version=`echo $min_wx_version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
+     wx_requested_micro_version=`echo $min_wx_version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
+ 
+     _WX_PRIVATE_CHECK_VERSION([$wx_requested_major_version],
+                               [$wx_requested_minor_version],

diff --git a/net-ftp/filezilla/filezilla-3.63.1.ebuild b/net-ftp/filezilla/filezilla-3.63.1.ebuild
index e6832f8a78e9..43c5a48aba4d 100644
--- a/net-ftp/filezilla/filezilla-3.63.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.63.1.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
 	"${FILESDIR}"/${PN}-3.52.2-slibtool.patch
 	"${FILESDIR}"/${PN}-3.60.1-desktop.patch
+	"${FILESDIR}"/${PN}-3.63.1-wxversion.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/, net-ftp/filezilla/files/
@ 2023-07-29  7:39 Bernard Cafarelli
  0 siblings, 0 replies; 9+ messages in thread
From: Bernard Cafarelli @ 2023-07-29  7:39 UTC (permalink / raw
  To: gentoo-commits

commit:     3197aa9b1646ac0eff87ed2530313beb95b6208d
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 29 07:18:28 2023 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sat Jul 29 07:18:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3197aa9b

net-ftp/filezilla: drop 3.62.2, 3.63.0, 3.63.1, 3.63.2.1

Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 net-ftp/filezilla/Manifest                         |  4 --
 .../files/filezilla-3.63.1-wxversion.patch         | 28 ---------
 net-ftp/filezilla/filezilla-3.62.2.ebuild          | 72 ----------------------
 net-ftp/filezilla/filezilla-3.63.0.ebuild          | 71 ---------------------
 net-ftp/filezilla/filezilla-3.63.1.ebuild          | 72 ----------------------
 net-ftp/filezilla/filezilla-3.63.2.1.ebuild        | 71 ---------------------
 6 files changed, 318 deletions(-)

diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index a6b9dc5303d2..6de475857240 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,6 +1,2 @@
 DIST FileZilla_3.61.0_src.tar.bz2 4939127 BLAKE2B 2c2096b7cb49223b02bea7ae363dde7b58eea4da3fbe62a228edcc6e82c0909e28ff20b6cf909ac7b36209308c66b99faf7c1c4fd571ecd9248c2c3f905c2e85 SHA512 97469bc038eab32f526859ae5db58eeef6f1a8128f67bc653b6b3707b1aa7c9771ef5caa780daa4d11d20d4e7ed8e5df24ef8bd70ee2353f80d77d5410cfa722
-DIST FileZilla_3.62.2_src.tar.bz2 4944158 BLAKE2B 84febe912d1e5337c085c3ae515969a10609444c5753270756d7e7dbd0f2a2c22f9b01c623f7eec8b7de5c4ae4da4acbc56fe65eca762fe1ea3f943192caea3a SHA512 a7dec07f6b6fe6fe1a54481e67e9ad2cb057bf84db6e6128f5e853f2edac3c34583a84f25c206f382f8bac6fa4ab48ea54a2a2f7efe8cc6c9d18cb1d3eba0255
-DIST FileZilla_3.63.0_src.tar.bz2 4949450 BLAKE2B 6fd21ece9615c6c16c63edecf769034a9c2b3a7183dfb7b6b9ae2effe710695ee1a078ca88c549f489d9d156fa884d9694c2a2ba3728527db482e3a813aeec87 SHA512 47065cfbc1944cd9f8b2c4d3b2a2bb1e9e169b083a46d79fe477cc3a628e91241822c739f308ce614212710f431c333f33193b9261f9b5ec677eb8c62a634364
-DIST FileZilla_3.63.1_src.tar.bz2 4950427 BLAKE2B 8d3fb5be0030b0cbfacfe80c2c2564fa9974860f4ce7d9f5d222208bb751b05c0f3f5c527a9b48b538586d12c499ce49e0e59328bed71bcd3600a15b8742d0a6 SHA512 c4f70eb772c868508dc10e1d3a5c9300bc034523f1ee374b30178048ded8e70be3d6307769509d4f8c0921126726dafbcbfda0066fe6d2c5f93af369196618c0
-DIST FileZilla_3.63.2.1_src.tar.bz2 4966152 BLAKE2B 04f2f6265f12053e25cd01135af62c144e5970ec28dd408b7c8484b20b3f6fb816a6baaf4cc4141ad31d5ae24d8a97e6360acc921d80d82ddf22e0eca6f7a4c5 SHA512 179dfd0e5e1bb1a8c49d035ac5f0f4cb54d09dd344b3d677a7a45224f50bae3bbc27a2fb404e90d69ea97abea1c69a6392d64831e5a7f33f89f70c3fd72d4006
 DIST FileZilla_3.64.0_src.tar.xz 4041200 BLAKE2B 38e9cec621573ff541183256943d055731f2acad95ab60f771e27b5eed6f0e447c8bf4cdf38c2322a340cd5c4a55ffb5a6b75b0de1bfdc0f8003b8aaaed900a1 SHA512 4c4ab1969613e789999bf634d62b612f21be5e221b969941c8097b7cb3525b089f4dd846e6489a3e66df7671732445e7fb8f77fc8d59cb34a78044136a3d2a99

diff --git a/net-ftp/filezilla/files/filezilla-3.63.1-wxversion.patch b/net-ftp/filezilla/files/filezilla-3.63.1-wxversion.patch
deleted file mode 100644
index 2e7658b703a4..000000000000
--- a/net-ftp/filezilla/files/filezilla-3.63.1-wxversion.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur filezilla-3.63.1.orig/m4/wxwin.m4 filezilla-3.63.1/m4/wxwin.m4
---- filezilla-3.63.1.orig/m4/wxwin.m4	2020-06-04 12:18:02.000000000 +0200
-+++ filezilla-3.63.1/m4/wxwin.m4	2023-02-22 19:38:22.620243565 +0100
-@@ -216,18 +216,18 @@
- 
-     WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
-     wx_config_major_version=`echo $WX_VERSION | \
--           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
-     wx_config_minor_version=`echo $WX_VERSION | \
--           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
-     wx_config_micro_version=`echo $WX_VERSION | \
--           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
- 
-     wx_requested_major_version=`echo $min_wx_version | \
--           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
-     wx_requested_minor_version=`echo $min_wx_version | \
--           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
-     wx_requested_micro_version=`echo $min_wx_version | \
--           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
- 
-     _WX_PRIVATE_CHECK_VERSION([$wx_requested_major_version],
-                               [$wx_requested_minor_version],

diff --git a/net-ftp/filezilla/filezilla-3.62.2.ebuild b/net-ftp/filezilla/filezilla-3.62.2.ebuild
deleted file mode 100644
index 5c1ee4a26cf5..000000000000
--- a/net-ftp/filezilla/filezilla-3.62.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools wxwidgets xdg
-
-MY_PV="${PV/_/-}"
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="dbus nls test"
-RESTRICT="!test? ( test )"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND="
-	>=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-libs/nettle-3.1:=
-	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.39.2:=
-	>=dev-libs/pugixml-1.7
-	>=net-libs/gnutls-3.5.7
-	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
-	x11-misc/xdg-utils
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cppunit-1.13.0 )"
-BDEPEND="
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.22.1-debug.patch
-	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
-	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
-	"${FILESDIR}"/${PN}-3.52.2-slibtool.patch
-	"${FILESDIR}"/${PN}-3.60.1-desktop.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	setup-wxwidgets
-
-	local myeconfargs=(
-		--disable-autoupdatecheck
-		--with-pugixml=system
-		$(use_enable nls locales)
-		$(use_with dbus)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}

diff --git a/net-ftp/filezilla/filezilla-3.63.0.ebuild b/net-ftp/filezilla/filezilla-3.63.0.ebuild
deleted file mode 100644
index e6832f8a78e9..000000000000
--- a/net-ftp/filezilla/filezilla-3.63.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.2-gtk3"
-
-inherit autotools wxwidgets xdg
-
-MY_PV="${PV/_/-}"
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="dbus nls test"
-RESTRICT="!test? ( test )"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND="
-	>=dev-libs/nettle-3.1:=
-	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.40.0:=
-	>=dev-libs/pugixml-1.7
-	>=net-libs/gnutls-3.5.7
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	x11-misc/xdg-utils
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cppunit-1.13.0 )"
-BDEPEND="
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.22.1-debug.patch
-	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
-	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
-	"${FILESDIR}"/${PN}-3.52.2-slibtool.patch
-	"${FILESDIR}"/${PN}-3.60.1-desktop.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	setup-wxwidgets
-
-	local myeconfargs=(
-		--disable-autoupdatecheck
-		--with-pugixml=system
-		$(use_enable nls locales)
-		$(use_with dbus)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}

diff --git a/net-ftp/filezilla/filezilla-3.63.1.ebuild b/net-ftp/filezilla/filezilla-3.63.1.ebuild
deleted file mode 100644
index 43c5a48aba4d..000000000000
--- a/net-ftp/filezilla/filezilla-3.63.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.2-gtk3"
-
-inherit autotools wxwidgets xdg
-
-MY_PV="${PV/_/-}"
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="dbus nls test"
-RESTRICT="!test? ( test )"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND="
-	>=dev-libs/nettle-3.1:=
-	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.40.0:=
-	>=dev-libs/pugixml-1.7
-	>=net-libs/gnutls-3.5.7
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	x11-misc/xdg-utils
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cppunit-1.13.0 )"
-BDEPEND="
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.22.1-debug.patch
-	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
-	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
-	"${FILESDIR}"/${PN}-3.52.2-slibtool.patch
-	"${FILESDIR}"/${PN}-3.60.1-desktop.patch
-	"${FILESDIR}"/${PN}-3.63.1-wxversion.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	setup-wxwidgets
-
-	local myeconfargs=(
-		--disable-autoupdatecheck
-		--with-pugixml=system
-		$(use_enable nls locales)
-		$(use_with dbus)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}

diff --git a/net-ftp/filezilla/filezilla-3.63.2.1.ebuild b/net-ftp/filezilla/filezilla-3.63.2.1.ebuild
deleted file mode 100644
index 4574bc156fa6..000000000000
--- a/net-ftp/filezilla/filezilla-3.63.2.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.2-gtk3"
-
-inherit autotools wxwidgets xdg
-
-MY_PV="${PV/_/-}"
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="dbus nls test"
-RESTRICT="!test? ( test )"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND="
-	>=dev-libs/nettle-3.1:=
-	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.41.1:=
-	>=dev-libs/pugixml-1.7
-	>=net-libs/gnutls-3.5.7
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	x11-misc/xdg-utils
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cppunit-1.13.0 )"
-BDEPEND="
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.22.1-debug.patch
-	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
-	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
-	"${FILESDIR}"/${PN}-3.52.2-slibtool.patch
-	"${FILESDIR}"/${PN}-3.60.1-desktop.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	setup-wxwidgets
-
-	local myeconfargs=(
-		--disable-autoupdatecheck
-		--with-pugixml=system
-		$(use_enable nls locales)
-		$(use_with dbus)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-07-29  7:39 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-17 22:19 [gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/, net-ftp/filezilla/files/ Bernard Cafarelli
  -- strict thread matches above, loose matches on Subject: below --
2023-07-29  7:39 Bernard Cafarelli
2023-02-22 19:00 Bernard Cafarelli
2022-07-07 21:09 Bernard Cafarelli
2021-01-19  0:06 Lars Wendler
2020-05-09 14:25 Bernard Cafarelli
2017-03-07 18:11 Lars Wendler
2016-10-04  8:16 Lars Wendler
2015-08-17 15:21 Bernard Cafarelli

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox