gentoo resync : 05.01.2018

9 files changed, 89 insertions, 11 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 186e9fa7d155..f0ea963fcaa9 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index a1873f27ec2d..01c2c4f620c8 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,5 +1,7 @@
 AUX filezilla-3.22.1-debug.patch 349 BLAKE2B 2a38aba4ddc49cbe97d3d6ce1348d94588a3bb2821ad1643e5e5d43cd18adfe5911309a24822368fd38176aaf2af99d7b098864bc5ae2d6f94ffb481a4d25340 SHA512 009946fbb676698e404b1c91bb6b14767234751cbecb7faa097692b382a65af7ab31b54f1aac81fdb72c1492db4698d24f5fa9b1966f69bffa1f4b6073283e00
 DIST FileZilla_3.25.2_src.tar.bz2 4712781 BLAKE2B c4e346442596eb2c1c7f5b541dc1386be5be13a3564187d5d7f275b5e1223cf1c95e11e27120c98276ea550d0b1c65122ffd62b5471a886faf1ebea0ab217522 SHA512 6c6feeec0b1bd15ff2c3fecbec22bca9c79f4263e0d1855c6d27a3df54128cfd837f0a546d1540b87b4645e620b57961b8ac0f01bd52748832f5625139c39764
-EBUILD filezilla-3.25.2-r1.ebuild 1782 BLAKE2B 7bc563a728e775851208f1b35af2adda3c7e73373d60826affb756d9b45d656f70306a594a2d4c7c8286d21996ceb677b0fbd2d52ab0dcc8b74a7e58cac99773 SHA512 ca7850798b85a029c09feee2b528d3fe6bf470775eaf2335e21db62a593b95eecccb214f25edfb998ba010c859b9cd7eb7997d8de0df69df4065fc20b2e84d5f
-EBUILD filezilla-3.25.2.ebuild 1765 BLAKE2B 9dabcdb6b12a290533c45c802100034c84b2ce93bc9456256e976b71ea24c103fce931d0b5a0ff78e808de48fd9c5796363d768d60a72166e56917d747949612 SHA512 f285161a89138b5f5be8f138612408b133a87bc9b86afdf887282b6a5f285ac65253b7e52f3de87495df0a5a7e452462feb871062bf926446693cee84a4f5d7b
+DIST FileZilla_3.29.0_src.tar.bz2 4832040 BLAKE2B b956ac69d22c3ec5ef32827594ad70aaeeef8c9359f557162a95aba053fafbf13621ba34fd73201b0b15529e7379b77c18d808c304a6c398f8927f8f903e2e53 SHA512 d1906cb18cfebb0ac9f92b1b97e11ffe2f5bf1b70d9cf1454e627f141a0fe9b3d1ba473a0464d5727e8fccf992643a64cfb729d93187a010fcb4f59603589349
+EBUILD filezilla-3.25.2.ebuild 1763 BLAKE2B 10561c18f24e8e61b578958230e3e3c0abd9e20bdcf2613c27b15fd39510bab96eabe89b55f7458e1dbd546f57f0652961da0a6f1290cda6eb114221094206dc SHA512 2887aff49281fb97ca2d3c203b2b963469427b39bc3368c6b577f4d5ad72ec8dc18cde3e3ff38c119a88d587e35f3f139e3865cc39811d8967eb9f87b388a02c
+EBUILD filezilla-3.29.0-r300.ebuild 1778 BLAKE2B 8b58db3424613e944c18a268f572385c0efb24682648a40a5a55de4b7044f3d65ea0e01a7b7ad2d48f03624100dfc5f5c751b9adff70aa867f16e98b8f31548d SHA512 66dc78b9e34125e9b813f9208c40011a6a2bea9d347cf073a607cc03aace48bccab2eb5a7966d919577e4d20b69911b67246fa4d3257772582f035bf0a2e825b
+EBUILD filezilla-3.29.0.ebuild 1773 BLAKE2B 17e13fcd425bf647c26a708e404a70788cf3b1588748dc8c6c0ae01796a0cbebbd8153b0273e3ed472df7fd0d70d8c6169269e9ecc568137d38fa9c531189722 SHA512 3fb00ada211c68961ed5ce1acefe52736ac0ba6f445fd70e2fab06e3f44a12c65052f890ee850955c029c3b3cfe455aa9cad778828c08ce6ab3b030092829699
 MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/filezilla-3.25.2.ebuild b/net-ftp/filezilla/filezilla-3.25.2.ebuild
index 61eb63e204bc..a135befc759f 100644
--- a/net-ftp/filezilla/filezilla-3.25.2.ebuild
+++ b/net-ftp/filezilla/filezilla-3.25.2.ebuild
@@ -23,7 +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.9.1
+	=dev-libs/libfilezilla-0.9*
 	>=dev-libs/pugixml-1.7
 	net-dns/libidn
 	>=net-libs/gnutls-3.4.0
diff --git a/net-ftp/filezilla/filezilla-3.25.2-r1.ebuild b/net-ftp/filezilla/filezilla-3.29.0-r300.ebuild
index a39e198691d0..e8d4a166ca00 100644
--- a/net-ftp/filezilla/filezilla-3.25.2-r1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.29.0-r300.ebuild
@@ -23,11 +23,11 @@ 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.9.1
+	>=dev-libs/libfilezilla-0.10.0
 	>=dev-libs/pugixml-1.7
 	net-dns/libidn
 	>=net-libs/gnutls-3.4.0
-	>=x11-libs/wxGTK-3.0.2.0-r1:${WX_GTK_VER}[X]
+	>=x11-libs/wxGTK-3.0.3:${WX_GTK_VER}[X]
 	x11-misc/xdg-utils
 	dbus? ( sys-apps/dbus )"
 DEPEND="${RDEPEND}
diff --git a/net-ftp/filezilla/filezilla-3.29.0.ebuild b/net-ftp/filezilla/filezilla-3.29.0.ebuild
new file mode 100644
index 000000000000..85207f6b65be
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.29.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+inherit autotools eutils flag-o-matic gnome2-utils 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 ~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.10.0
+	>=dev-libs/pugixml-1.7
+	net-dns/libidn
+	>=net-libs/gnutls-3.4.0
+	>=x11-libs/wxGTK-3.0.3:${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 )"
+
+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() {
+	econf $(use_with dbus) $(use_enable nls locales) \
+		--with-pugixml=system \
+		--disable-autoupdatecheck
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-ftp/ftpbase/Manifest b/net-ftp/ftpbase/Manifest
index 64c677439c4b..a90dfa26f2fb 100644
--- a/net-ftp/ftpbase/Manifest
+++ b/net-ftp/ftpbase/Manifest
@@ -1,5 +1,5 @@
 AUX ftp-pamd 700 BLAKE2B c867c659cac367c51021504dd4da0a9dc90609564613f580a0a01a94d2a87d0df903f22486561f23722901df4df06a33d7d7b643ffa4562cf426f2058391d887 SHA512 61aceee28610cb7a6989fca0ee82702df1118dd2e964bb26fe5cfcb508250599e9e1cdb9aa5dfb61df9c5fef25af4334a87d5f1f4065f693193912dfe172bb68
 AUX ftp-pamd-include 632 BLAKE2B 28aa913499698f136e784e8ed420748fe1415d0ddeb64761b8ed71b869e4b9afb6b86df4b8a8a748ec3a740d99c000fcc4789ee45c3a302f81ffbaab07c7e106 SHA512 adc59c544b815bd88b7e91a43cb5620008d1f83d15a08620f56242d74991ba413e56b31bcca8e5fcfe71f05362bbad89b02d5289260f08649d38965c8951ec76
 AUX ftpusers 300 BLAKE2B 02489b8eed29bfd4cea148b1b4214ac5ba798faa44da1be68cea06c18680e44f0054c952107810e4a199398b6ba382c649a481cf9d7388cd5caa10ace50e06d3 SHA512 29a8bdca1a6bb516c5189e6c69969cba3c220ea878e352e78bb6ea5cb2ac7476306736240155dc6d3f7512aac48164354db68721ea952d1010639e8ae14635e0
-EBUILD ftpbase-0.01-r2.ebuild 1443 BLAKE2B 22737d68abb59fb5f713d3785e0bac9c397f467c24f93a9ea34b005758e4a3a246afc6536fa915fd9df577bc0067182740233ce845f1b4787c8d1430decd11a1 SHA512 92f4b1a732393e0df1fe25a2effd54920d700fffe5595339ff5d755cb00c5cda60805122d6460cfb02b6130061157c41db4ad70f6693ea2580aa80e85eaeb3c9
+EBUILD ftpbase-0.01-r2.ebuild 1450 BLAKE2B f23bf7b57646cad7624e81b829ed228ef73bf9aa8216d088fb030bb19360fe9a7d11a25b7ab96885c957b1e2e70862b5fda4deeacd6b70a0cd14488de8d555a3 SHA512 95f6a079d5bbcf58ddb44142c5f4348470284f21ec9a5181bcd046269897548917392c8f33a67bd6947a03193d827863c4c2b81e41f1d4e713c73f60beb282a5
 MISC metadata.xml 235 BLAKE2B da947ee7650abf01b4eee1667349a14d2d8d496ec234acd60db66c1059d42d6e9a1d30403068b7977a397f4e0a2934fe4e7c2c04d356b2c23a5e8a87ac7266a1 SHA512 fa78af8197737bd5d9b44305bac24dacac9034fd96284af1e3c89428fc418e17a4bea91fa53f07dce02e6ab8afe6455343db364d031ab342225a26d0364c23da
diff --git a/net-ftp/ftpbase/ftpbase-0.01-r2.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r2.ebuild
index 392c27075c28..272622d32030 100644
--- a/net-ftp/ftpbase/ftpbase-0.01-r2.ebuild
+++ b/net-ftp/ftpbase/ftpbase-0.01-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils pam user
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="pam"
 
 DEPEND="pam? ( virtual/pam )
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index 8b42f3e206bf..ffecac4c9e37 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -8,5 +8,5 @@ DIST pure-ftpd-1.0.46.tar.bz2 490337 BLAKE2B c0b1fcbf46343dd49fcc9ecec44807c9474
 DIST pure-ftpd-1.0.47.tar.bz2 489177 BLAKE2B 06e71ead47b87dedf47a84e488b2de127fcd297c2e9ca7a617c2ee2760cf55b816884763721826c512558d016cbd38a87a11ca0e8c2334d93145edc6f88d9287 SHA512 c1920a3f67f04635fde600fe226a7730b801e7e64658b25f1d9f9c0b35a704664be4adfb0b291594f7e0f10beade25eae9a5e6cc3b6777a3b413f3c2d9574e63
 EBUILD pure-ftpd-1.0.45-r1.ebuild 3896 BLAKE2B 5898ca67bad41a51f0c40cc49c5f56aefde1948be2ea24b2d0f948734e86742de28a68c37a04a8b4ae93d238da8c5bd91608528abba436f3dcc5c9b3a81134f9 SHA512 285cfa299ff0f5554b1b54163e4d0c9824f404c2eee76cb77831c6989b8bbc089f45b6c0acc969ac35bfc77065082d6a0288ec35c38427204edc0bcef7354176
 EBUILD pure-ftpd-1.0.46.ebuild 3867 BLAKE2B fbfedba995ca14f2c9e6b8e5ce1bba53631d5451c3be6d1ca18d237073c072da67899b79b53137fb6a4b8dd2047e8fbf42244a92699cd89f9f0da1af64b2d240 SHA512 baae36d4332ba3e44b913691fe90e382f55eeff34da12cbbf1d81361db5db8e0d1014329d915972010656131519071f1c983bf7177a59f2bed9ad04ed625859c
-EBUILD pure-ftpd-1.0.47.ebuild 3860 BLAKE2B 035d130b0a22ec131a0e12175eebf0ac1c88b1e32c6fd84dc8d5fa7961ce554aac67e7393a9aabf2f8cb9025670eaddab7b306c07583598a55f675d9515c1007 SHA512 707620f81960db785302ba0f2b4705f9c02a93011cd3e2697166ab8e097a48a46328bb7575b9b1be9c5345bc7a8333dca47dcdc38802ce3efdc218c322e9f4dc
+EBUILD pure-ftpd-1.0.47.ebuild 3867 BLAKE2B 0c1930e2ddc0aa3efbbe1388d6017fcd5fe0e75b399819676c23c14b9b26eb4a9e2d124c086454fe522d56b2c75940e0fae6d6501ef26a82d8ae9d04c7289afa SHA512 02420399d83ba5e5d54fdca2b57dc87a28f23bd7a39f2ad28960feb30603a5b8ebc6614bae77fedc87a4a73f1ac3c75a5a878a815908a6440e0ed7a59df6d855
 MISC metadata.xml 1233 BLAKE2B 02ea0260dacca81d5b2eef251f98756f151b03ee7abcf3ccc46832167848b8aa80dba90d855c118908b87ce7085921cae81f3a747402c5e0fb70401dd668150b SHA512 ce47470d3c8bfeba9c02f6d6638e7b0bb6e0ddeddd1aaf0362342aadf07e823f1093523a1432c703bd410c3b760049a1e1c32e3f36718844b3a1ba44144afea4
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.47.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.47.ebuild
index 6e61fbe0d05f..230c6974a75f 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.47.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.47.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit flag-o-matic
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
 HOMEPAGE="http://www.pureftpd.org/"