gentoo resync : 10.01.2018

6 files changed, 158 insertions, 3 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 0d44f6770378..4b928246e3fa 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 01c2c4f620c8..4816dcbb7e3a 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,7 +1,10 @@
 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
 DIST FileZilla_3.29.0_src.tar.bz2 4832040 BLAKE2B b956ac69d22c3ec5ef32827594ad70aaeeef8c9359f557162a95aba053fafbf13621ba34fd73201b0b15529e7379b77c18d808c304a6c398f8927f8f903e2e53 SHA512 d1906cb18cfebb0ac9f92b1b97e11ffe2f5bf1b70d9cf1454e627f141a0fe9b3d1ba473a0464d5727e8fccf992643a64cfb729d93187a010fcb4f59603589349
+DIST FileZilla_3.30.0_src.tar.bz2 4855577 BLAKE2B fb146c05eccdb6bfee1fb8abebbe164440bf4bd2a2a54769218ec2b2d988dc8d32ebb711de878dfd5448befeec9858953157977aab10a6b936c5ec5d42cfae96 SHA512 e045ed07d3ca550881238935d80a9f6e972d67a40449a2bab72b29519240785e89c573af53fad702ab066cc26b7077452868bb50bfc76d371c29c86f908060fe
 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
+EBUILD filezilla-3.30.0-r300.ebuild 1778 BLAKE2B 8b58db3424613e944c18a268f572385c0efb24682648a40a5a55de4b7044f3d65ea0e01a7b7ad2d48f03624100dfc5f5c751b9adff70aa867f16e98b8f31548d SHA512 66dc78b9e34125e9b813f9208c40011a6a2bea9d347cf073a607cc03aace48bccab2eb5a7966d919577e4d20b69911b67246fa4d3257772582f035bf0a2e825b
+EBUILD filezilla-3.30.0.ebuild 1773 BLAKE2B 17e13fcd425bf647c26a708e404a70788cf3b1588748dc8c6c0ae01796a0cbebbd8153b0273e3ed472df7fd0d70d8c6169269e9ecc568137d38fa9c531189722 SHA512 3fb00ada211c68961ed5ce1acefe52736ac0ba6f445fd70e2fab06e3f44a12c65052f890ee850955c029c3b3cfe455aa9cad778828c08ce6ab3b030092829699
 MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/filezilla-3.30.0-r300.ebuild b/net-ftp/filezilla/filezilla-3.30.0-r300.ebuild
new file mode 100644
index 000000000000..e8d4a166ca00
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.30.0-r300.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-gtk3"
+
+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/filezilla/filezilla-3.30.0.ebuild b/net-ftp/filezilla/filezilla-3.30.0.ebuild
new file mode 100644
index 000000000000..85207f6b65be
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.30.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/ftp/Manifest b/net-ftp/ftp/Manifest
index 738e9b1fd60c..e02f9bf57c86 100644
--- a/net-ftp/ftp/Manifest
+++ b/net-ftp/ftp/Manifest
@@ -3,5 +3,5 @@ DIST netkit-ftp-0.17-patches-2.tar.bz2 4307 BLAKE2B d7febb30807dab2dd66b6fe19916
 DIST netkit-ftp-0.17.tar.gz 53934 BLAKE2B 451f90f26cd5cc1a6693fea7c31d47127d8b89b4b00a2f863af61d46d87f6e416141db1c6f6bb320021665a99f0d9e00dc4a5c3b0bb209df0ae74aad97a45f20 SHA512 ba8e411d0230c78e9e4555c03dc1036c6e506ef8edb72ecee4d6a7559d85143721bffbe8b8a6e42918b3098072ac8f207584be9e3a241f6bd31e361c92de6554
 DIST netkit-ftp-ssl_0.17.23+0.2-1.debian.tar.gz 48189 BLAKE2B 7894f64308ae14c72e2fcf7e18225fa36680d2d88a3e59c4b7edac3669e051e3196a2acda3f8da083bd3d8405e9f28f67be10d70684854e8bbc7008f8189cb8d SHA512 c2fa882c185987298a73e7cef8c073ab0aee7627b60b412be90eef8619bf02d97721c15197fe4f443eab53bcca87876633924872f3102ef9e92dc7511c065228
 EBUILD ftp-0.17-r7.ebuild 1101 BLAKE2B dd8e5a6b01520d66e9b55aa2896324a81c8070794086105ae3658e7f5b3eef4e65549e52090b575e21d00a819a1f361f553122bfe5024da993a7f9a2cfb8e8a5 SHA512 eefe5c6d58ee734d556edcf4b800b72147664b6bd4371e12a65816238d9eb3134be57aea71fb0c8d5567d76d91ad1154780c83b0053e0f73ebfdf9906a8de1f9
-EBUILD ftp-0.17.23.0.2.1.ebuild 1568 BLAKE2B ac4f109bdbb4831242c2f26cee5068dfff820dce889075119cbfc2ee0e2162d283d09fad4c1979ff6307d22628cec8e36e8f5350ca2ffdfddd36041ad7121f1e SHA512 587de0789eaaa462b2e4caf61c8081c0a0bedacde6ca78711b5fcfe0e861f2cee9696c0c5d9784498b6f8604e6720e2eec197c0de435ce35dbc26a4d35fd73e2
+EBUILD ftp-0.17.23.0.2.1.ebuild 1564 BLAKE2B 2bba15fd4ee62256ef3a67f6c79a1e11cb08c8c0a3a57b8b275ed1df4349aa01af96b75b6a94a0de4a178d694d96e068bef0cc138952e7c45c7abe33a68d2f03 SHA512 662080aef34129aab479f753fab9bac077c8981ce1779e53801c71d618f0491522d3333a964e0889d06be92b3bee9b591d2a6dac31b968dc7b6475fbd26cee3a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
index c158c31e7f80..ef69ed73c8e2 100644
--- a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,7 +19,7 @@ SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="ipv6 libressl readline ssl"
 
 RDEPEND="