gentoo resync : 18.05.2019

7 files changed, 95 insertions, 7 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 20dc71c507fa..2aff933f5f00 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 08bc071399be..8894d93b54f3 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,10 +1,12 @@
 AUX filezilla-3.22.1-debug.patch 349 BLAKE2B 2a38aba4ddc49cbe97d3d6ce1348d94588a3bb2821ad1643e5e5d43cd18adfe5911309a24822368fd38176aaf2af99d7b098864bc5ae2d6f94ffb481a4d25340 SHA512 009946fbb676698e404b1c91bb6b14767234751cbecb7faa097692b382a65af7ab31b54f1aac81fdb72c1492db4698d24f5fa9b1966f69bffa1f4b6073283e00
 DIST FileZilla_3.39.0_src.tar.bz2 4995713 BLAKE2B d89aaa1f57187cd926ae1c4dd34624b404baa291334c652293d2dcfaedc4a5dffb401f8727b5d5d1fb483bdd503f35124efb75bdd7dd750d68e517fcb57fb8c0 SHA512 a0360634517ffd07878082abae024dbb4896035edcbd9abe6d8adfc9d37b73d01d95f6c5ca031175d88b6e4badefafcc43b5ddce3d9dbddde4deab5f0cc97e83
 DIST FileZilla_3.40.0_src.tar.bz2 4997647 BLAKE2B 88ff2461d33369c435645f1dd5afa98c566141bf825e74898f870bd4c09cc7b47a70f605afbaf7be28855385812a28ea24303b6ec7f0ba605a793160c3b76027 SHA512 7aeb0c340111a47c435e8d8cbf379e83d2fc6c0a94038e085664df34c2fe1f8ef8496ea894f5e4cfd576d034e8935fe29661bb9eff9f22416032f45f5a66db2f
-DIST FileZilla_3.41.1_src.tar.bz2 4994973 BLAKE2B 9aa8ad78125e69347055872790a13d46599415977d0f9064488efbdfc8cc052ac9e8ac4c03fe813f5947cb0b978db0872e45bf905bf02cd7d800fd52ca09b5f2 SHA512 6407ae883d10308529227a33ab4bfd36c564a68b322e896751ea21d106d04b0b8e095f1cb864063f59e0c64d0943f48a82cd63ae50c4be4561210659ba2f8ca0
 DIST FileZilla_3.41.2_src.tar.bz2 4994803 BLAKE2B 34f8331d3dfe3bdf483d234a0473074e17954b7d16abb7276ee6276221091f085c802d8cb0d397e00159b408d2737f5e23f2e50ad19d344c82472c09eea4dcd1 SHA512 c4b8284896942ba46f8f88fc5d60c6893c719e28ab94463848060850b6f9b2f4d3d13f580551dc3b21ab25ffc0cb1f43a2750500b5be2117952e14512a7ee40c
-EBUILD filezilla-3.39.0.ebuild 1771 BLAKE2B 05145bb2d43f0a6d24142732d4d1247a9073d53085b043e7ccc64c53933d3d77c3835e0ca226e363ed8f2b8739d674a1ee8d53b134251deb8c28745e0770ac53 SHA512 06fd729193fb6d0d130bc18b3f6a1a6d323a823d5eb34ce4e65e0f9151162186430fdbc960f6d0ebbe7c06115d33d0222e5a722fea100dd27c6a4faa2400b2fc
-EBUILD filezilla-3.40.0.ebuild 1773 BLAKE2B f3d7b9724a434a96c8a084cbee5039b6275b4855c38547a43bcae0575e6b1a1b51350ee52564c956514763b2805848d668e93c23b779d268a14f730b4e03024c SHA512 51a72bd06eb89c7e1e72d11ff526e31d5869efa55d9fda2e81a64d8b8cdd964dcc9ce1bbe1f49875188fed14ae6b534842a73a510be00c8a8c30f6ec52d637c2
-EBUILD filezilla-3.41.1.ebuild 1826 BLAKE2B efa0925d3551644ad2aef5d02a34fe9743362e354201f7417a654e6c80bc08464dd4cc78275e993b02eb9ff1fa4d4aec741af9fadd04d84a5cf6ce1bd755491f SHA512 91c1b0a634835392dc289eb4071d9cbc1c24514a8e5e5949fa441c4e0c9cb2475d750008e6fabca03c61cb9ae8a020f459da4e780a85224565000f0b92b295b1
-EBUILD filezilla-3.41.2.ebuild 1826 BLAKE2B efa0925d3551644ad2aef5d02a34fe9743362e354201f7417a654e6c80bc08464dd4cc78275e993b02eb9ff1fa4d4aec741af9fadd04d84a5cf6ce1bd755491f SHA512 91c1b0a634835392dc289eb4071d9cbc1c24514a8e5e5949fa441c4e0c9cb2475d750008e6fabca03c61cb9ae8a020f459da4e780a85224565000f0b92b295b1
+DIST FileZilla_3.42.0_src.tar.bz2 4985999 BLAKE2B 3713b732d9021fa61c71bfa0fae04e9ee743cc887c3807311a8d5fee5d6ee4e67159a0e6cf6b5048df3f68f44ddcb22744b6f5c7c74c90bf4103c1b85cf9afb4 SHA512 d3a273fc17d53785de693c67bfc318f281ee73694a136b440049f4efb32ee1e1f8a625141353ac33b5404303a786adb38d6b44659dda6b83788f39f7001342fd
+DIST FileZilla_3.42.1_src.tar.bz2 4987250 BLAKE2B 8cc6fd0a0cec336f34793520fe4be52a36a91ba5a4a3d41092d78c00a25899f73abd03f8d6339da40bc98a618dbae98063de2844a83cacb1431fc53f3b962383 SHA512 0dc9b3a6347803f60a71c56bb759700fb2b1b019dc29794aa639ce892ccd1ae53041112987f9d5e8e75ec7e07702a5aac8e1c131796bbc5f210d75d286276deb
+EBUILD filezilla-3.39.0.ebuild 1802 BLAKE2B f15137701d47484e96588c8f306511d913e6fb23077e5a72680adbbde91a004ae59bc6f4b084df90a782fcd9fd852845ca0ddbf7457e7f0088631643bca5175d SHA512 f858b3d7b283a215e4a2eeba84f8a1f64959eff1b7c55e14f3eae219cfe3688f3ce319b7c3b924ac6d1c8e49f85397c2e91f85f5726ae325abe04b0d76af8d17
+EBUILD filezilla-3.40.0.ebuild 1804 BLAKE2B 2ed7f491b4667124b32cf4045d2ee681d5b662e44e134ec00f1297eb320025c655d2ddd36a9341e5fb66dd3d96a1b76f5dc4b39f6eb4cbfef313458e7cdb5f36 SHA512 51ce67a0f1b896c8aa2098f1d7b3021482ec2eb1c7c2039ccb57efd2fe3773f8225300c29b7a59d0f5ff134b4464ee51a072c1f4f57dcffd069e360d471a314f
+EBUILD filezilla-3.41.2.ebuild 1857 BLAKE2B 31fdd12cd442bc32b70f8b1625ff41e0a97d0e1706bd1f5ab7d1c1d39ee9ba1add619acfc9068e8b8baf500ab5d11af042b254fa660db184f75a26ac6009903b SHA512 b1cbdef23ac4f5eb596fa809584e10285b151b4b2beb3817f2b8f44424ee13047a3dab5c8e2372dc5f89c87b5601e2bf66ee74b0dbd6dd2744487eae8863c6be
+EBUILD filezilla-3.42.0.ebuild 1825 BLAKE2B de50d7fd91f780f0234e685a7da6a394e5c7138a9d7b426e8b97a9272a0a5a8d3ce55d7c71231fb9d49418f175fda216c401f0bbbf322e3efc1d33cb66629c21 SHA512 20837be17a1ae55afc38c495e3256401c225b915ee1d2e5aa0089aee41bbe216ed8d5c3603241abac782d5f6dda5b522ffe300136e864deb379ed69f76c92fee
+EBUILD filezilla-3.42.1.ebuild 1825 BLAKE2B de50d7fd91f780f0234e685a7da6a394e5c7138a9d7b426e8b97a9272a0a5a8d3ce55d7c71231fb9d49418f175fda216c401f0bbbf322e3efc1d33cb66629c21 SHA512 20837be17a1ae55afc38c495e3256401c225b915ee1d2e5aa0089aee41bbe216ed8d5c3603241abac782d5f6dda5b522ffe300136e864deb379ed69f76c92fee
 MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/filezilla-3.39.0.ebuild b/net-ftp/filezilla/filezilla-3.39.0.ebuild
index ade4fafc2863..73d5f0b6ec99 100644
--- a/net-ftp/filezilla/filezilla-3.39.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.39.0.ebuild
@@ -24,6 +24,7 @@ RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
 	>=dev-libs/nettle-3.1:=
 	>=dev-db/sqlite-3.7
 	>=dev-libs/libfilezilla-0.15.1
+	<dev-libs/libfilezilla-0.16.0
 	>=dev-libs/pugixml-1.7
 	>=net-libs/gnutls-3.4.15
 	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
diff --git a/net-ftp/filezilla/filezilla-3.40.0.ebuild b/net-ftp/filezilla/filezilla-3.40.0.ebuild
index aa2e664800ab..17ac010ad2c7 100644
--- a/net-ftp/filezilla/filezilla-3.40.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.40.0.ebuild
@@ -24,6 +24,7 @@ RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
 	>=dev-libs/nettle-3.1:=
 	>=dev-db/sqlite-3.7
 	>=dev-libs/libfilezilla-0.15.1
+	<dev-libs/libfilezilla-0.16.0
 	>=dev-libs/pugixml-1.7
 	>=net-libs/gnutls-3.4.15
 	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
diff --git a/net-ftp/filezilla/filezilla-3.41.2.ebuild b/net-ftp/filezilla/filezilla-3.41.2.ebuild
index 2cdd971b5a38..7d792e1d1c53 100644
--- a/net-ftp/filezilla/filezilla-3.41.2.ebuild
+++ b/net-ftp/filezilla/filezilla-3.41.2.ebuild
@@ -24,6 +24,7 @@ RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
 	>=dev-libs/nettle-3.1:=
 	>=dev-db/sqlite-3.7
 	>=dev-libs/libfilezilla-0.15.1
+	<dev-libs/libfilezilla-0.16.0
 	>=dev-libs/pugixml-1.7
 	>=net-libs/gnutls-3.4.15
 	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
diff --git a/net-ftp/filezilla/filezilla-3.41.1.ebuild b/net-ftp/filezilla/filezilla-3.42.0.ebuild
index 2cdd971b5a38..7110b88b8ab8 100644
--- a/net-ftp/filezilla/filezilla-3.41.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.42.0.ebuild
@@ -23,9 +23,9 @@ 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.15.1
+	>=dev-libs/libfilezilla-0.16.0
 	>=dev-libs/pugixml-1.7
-	>=net-libs/gnutls-3.4.15
+	>=net-libs/gnutls-3.5.7
 	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
 	x11-misc/xdg-utils
 	dbus? ( sys-apps/dbus )"
diff --git a/net-ftp/filezilla/filezilla-3.42.1.ebuild b/net-ftp/filezilla/filezilla-3.42.1.ebuild
new file mode 100644
index 000000000000..7110b88b8ab8
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.42.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 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 ~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.16.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 )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+DOCS=(AUTHORS ChangeLog NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.22.1-debug.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
+}