gentoo resync : 25.11.2020

4 files changed, 3 insertions, 184 deletions

diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 354d5eb26d02..b4316add69cb 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -2,13 +2,9 @@ AUX filezilla-3.22.1-debug.patch 349 BLAKE2B 2a38aba4ddc49cbe97d3d6ce1348d94588a
 AUX filezilla-3.47.0-disable-shellext_conf.patch 699 BLAKE2B 9d0209166f8e76b0575be47e8a13b1d07f159ed05aaf9e8624030fa1ea2ce1ab63a7283336511bc14b6a922c8536d9ac992a231cf53f9c825299b4b588512c62 SHA512 3c0e6178f8fcc3793cbc722fcb91b2b2834eccda17ab6260243d1262198debe3c71ced1c2443ada8245a7bcf02b5fbb5fffdb16bdab948dc3badc149576ab027
 AUX filezilla-3.47.0-metainfo.patch 309 BLAKE2B b36d7f3e5446c76cc9e20be01b3a5005f140bef005b264c2956485cc9c33ed76d05319b53f51eea2b57606a6573e802e52bee94d373baefb5a317fcddd163090 SHA512 32e1a9e41dcd01322fd75cdb5d5bf16a1ce1241266d52a39e017c5eff64ae06592ae6799acfc6aaa935eb61023efc5fb3fcfadd43a9765a309a12c3fa3ee725c
 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
-DIST FileZilla_3.48.1_src.tar.bz2 4774251 BLAKE2B a77b821640aae3deaad3350809f34dbac8ed63c336435f92393017301509b91ef5e613ea64cb934dd2385b55fe7ba711269f85b7523d43ef451ab0cf6634ab0a SHA512 58792f92bb4f6102166924abaf843c023faeca7f2979aaa47c26f2bb3f8449902b4a43c50a800d56584d39c9ddf64a6d3334558e46f56bda3b8515c7a3ff0a12
-DIST FileZilla_3.49.1_src.tar.bz2 4788452 BLAKE2B 63ee0ba462f918a357342f8e53dccb40e01a7cab52e25891e1b17bddb863d0386a51c67e09d0c875a4abf9b4e443a03c6616be3d7d39e585324e7343d19dfd14 SHA512 e6e69858aff3be6f557cc338ac4cd4391699d171742a2e815dff15e029a76cb1cc0651c15a3b4fb95644371b4e84b913e34a70846454a7fd5de6f05a7f461add
 DIST FileZilla_3.50.0_src.tar.bz2 4791977 BLAKE2B c0352eea9c4cd0a10d25b21b0a6982a762df6353a8da0703179270ef27be71bf151591011c45aae6e303437ac5ecca6a340635c392e2ed6db1a4a9d4002f4d7b SHA512 5edcb18aa7e4a0a59678d589d20996d7f6311f717e55a70c9dacafe42e3df6cba79be778bef34ff399672941dfb78a4732b83f21016b721702c763f0408b3e40
+DIST FileZilla_3.51.0_src.tar.bz2 4808717 BLAKE2B 67f614032145abe7f715254fd47756d3a537d2eca63be976c29351f79e15d3620e77c1bb7beccc2b61a1df8b86484334a3e77639402c93e8ce28d4b12eb8884f SHA512 b5e0f80b61eb168b41f7582bf10bf0067da76aec3165ffe13819e20eb842ffc0fb12b01c54843b3ec4e7355111c36be249db3526e2ea2eaa77ba4274ffa03e93
 EBUILD filezilla-3.47.2.1.ebuild 1991 BLAKE2B f3d922bc88cf3de4cb7c7b97713006d7699025cb9240f3602b2aebbda21e470a5b0f85980adfcc0c5548054e732bb4e0c2f56f4c515ceab73d0169dc5bacac9d SHA512 57275acd8ee50c2f5d4e42faf3e5b834d3d68267dac42c141f42a0d45da32be23f9b612c0ba54623b0b2ae672f45a060d2ec5245a02ed75bc5a5e22a63b21ee5
-EBUILD filezilla-3.48.0.ebuild 1994 BLAKE2B 97aac6517d88b3495cd8456a3d049dc0e6104794970a103dc4873d957b0965df66102becb3288466aa0ed32fc26fd6d922e82456abd85d921d8291de202c10aa SHA512 d5a7647862bee21f4b4af00c163a2ea8e7d0edb892779a4b8158bdca29fb75504f26947f80bc41146e9c4337d584aa0f9f92782d245cc5be07032b2d5731ea7e
-EBUILD filezilla-3.48.1.ebuild 1994 BLAKE2B 31e6def69a7904d2d8a3f3db5a5d555bb3cdee3944955cb1e1a03c9df512f83009c6fe2b2a16c97b5024d9501ff02cdf450d64285ff8a6600694ad05d26262f1 SHA512 253ae3736744b3b0e5181b3764275a9551ffd20b207688647920b8d80d2625d3222817e6eda96a7ae41334f5725f676b5e45d6b98c0efcad39f7f7d78205e3ae
-EBUILD filezilla-3.49.1.ebuild 1994 BLAKE2B 4bffcb92f92116e1f63f3978fd53a396e9f585a089ea9ef263608300e4bb00e170bc63a6250e97807efb9dc9112c44e2192b4dec01d7d07e9b722db76cffab91 SHA512 67140c7df984284b74556ad54b1de67ee59af0e6a21099d507decc749b703dbbad8015adb0bb2096d6e716a4e194d49b6949461ec835f84d0d8d00e1e8b8837d
 EBUILD filezilla-3.50.0.ebuild 1961 BLAKE2B af10edbedc83cd229573186d94fbc595e3860475ac0b0de392903dffb21a92dac9b22588ee4b5edbd4b55e3ec168c58a8203155db35cd751738c7bd42aa0539c SHA512 2f97de78b3c0b7907c05f988c3c07c788366975241f425beeee54127593fa0fc9a323477e0af64e73b766d011a13b32d3d9ca25aa75e2a18a665f6c43186dd87
+EBUILD filezilla-3.51.0.ebuild 1961 BLAKE2B 9e072f2cb2f0d21a53e3a420691b0731f89d999c0c594715b114e465ea28238a9e2723af936444af7614e81819aa3bd5ac2680836712079f23126246111760aa SHA512 0416cf2e4294bdbd422620981b59a654224d68b1bd4de5097f1436945e12846495c88ca2367efb6f3a5814dcd6c64e48fad2d90251a6fd60347b274cf5a0038d
 MISC metadata.xml 459 BLAKE2B 71b683a0a48407daa9577a84b6d08bb6bcbcea46b9805fd31256e4f55666c0716b4fe43cbd30617ec1b88cc8697eb9a4254f7bd3e399ecdfcd81e92db24b4cd2 SHA512 e1f653c9a5dd7631ebea96be29472e2824cc6377c9e8783cd56913c1d7951eb9d80cbdaff05affc766c6f38277b6aea5b8a23e8b808840f29249eb7e0cfdfe3f
diff --git a/net-ftp/filezilla/filezilla-3.48.1.ebuild b/net-ftp/filezilla/filezilla-3.48.1.ebuild
deleted file mode 100644
index d5eb40b08dda..000000000000
--- a/net-ftp/filezilla/filezilla-3.48.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools flag-o-matic 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"
-
-LICENSE="GPL-2"
-SLOT="0"
-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.22.0:=
-	<dev-libs/libfilezilla-0.23.0:=
-	>=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}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( >=dev-util/cppunit-1.13.0 )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-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() {
-	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() {
-	setup-wxwidgets
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-autoupdatecheck
-		--with-pugixml=system
-		$(use_enable nls locales)
-		$(use_with dbus)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/net-ftp/filezilla/filezilla-3.49.1.ebuild b/net-ftp/filezilla/filezilla-3.49.1.ebuild
deleted file mode 100644
index 94b326890dae..000000000000
--- a/net-ftp/filezilla/filezilla-3.49.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools flag-o-matic 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"
-
-LICENSE="GPL-2"
-SLOT="0"
-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.23.0:=
-	<dev-libs/libfilezilla-0.24.0:=
-	>=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}
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )
-	test? ( >=dev-util/cppunit-1.13.0 )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-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() {
-	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() {
-	setup-wxwidgets
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-autoupdatecheck
-		--with-pugixml=system
-		$(use_enable nls locales)
-		$(use_with dbus)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/net-ftp/filezilla/filezilla-3.48.0.ebuild b/net-ftp/filezilla/filezilla-3.51.0.ebuild
index 9e6b4b3a1bff..3639ea6627fa 100644
--- a/net-ftp/filezilla/filezilla-3.48.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.51.0.ebuild
@@ -23,8 +23,7 @@ IUSE="dbus nls test"
 RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
 	>=dev-libs/nettle-3.1:=
 	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.21.0:=
-	<dev-libs/libfilezilla-0.22.0:=
+	>=dev-libs/libfilezilla-0.25.0:=
 	>=dev-libs/pugixml-1.7
 	>=net-libs/gnutls-3.5.7
 	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]