gentoo resync : 22.12.2021

6 files changed, 75 insertions, 65 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 670b2644bac3..83e1be6d1090 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index bfd4d753c593..df6a1461a030 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -8,10 +8,12 @@ DIST FileZilla_3.55.0_src.tar.bz2 4910040 BLAKE2B 9955ddff5bfdd7fe7fadf5dad73638
 DIST FileZilla_3.55.1_src.tar.bz2 4910935 BLAKE2B 7a901f7c73c6223c92100138989cedc83f8abf0f9657e08b31e8454892c39f2dccf6880350bb42742639dcec0326f50c46d1afd2d9d931529f11378f7e18bfa0 SHA512 07f1ccc596cac64aca0e82a97725f2ade26de78116441ba5aefaa8bd1396a483be88d9820820b9767e77686abbfd0eb6190684303e1f4d9ec45ef0b1f2cf0170
 DIST FileZilla_3.56.0_src.tar.bz2 4918048 BLAKE2B c671f1a2d0164f7083841d03e6e3780e778b620cf9525b96c15c7c86fc2ca4a4e5908b7bbe30a37b44209f30494c6adedc9292ae0ee5cf03043e18c73dc6e036 SHA512 390aceee80151bbf5e8f00cdfe48fafc20afdfab8b78f627a96215e74bc7d4ff7310dd67400b1deb531dde0fa4a100ac4cd04ff4e6166860badac68438ed23db
 DIST FileZilla_3.56.2_src.tar.bz2 4919610 BLAKE2B 1034500f3f4c2c747db663a8b4fe234e7f24db570186625b40cca84143c3b3119a9d1c7206069bfe1837056e134f2df4641beeb9c437fb0b1bb48872cec89d51 SHA512 6aab8a0a8b2205ac5428c6b5ef698010cb9a42759913254ac5981be85ffb8d725251724c1972c9b9ba6c88029573ef2c8a36f6814252b8080476f0b080a9d2f1
+DIST FileZilla_3.57.0_src.tar.bz2 4922294 BLAKE2B c9eba7f5815702e6d46f25a176f768cbbd77d0f82b37beaf07c038035f46f3963405bf4c1a4254406dbda3ff28bed1192e50dbe2238b87ecd1fa88a9fece1f79 SHA512 4c3a5c4f4c1551cb81283f2886555c0e4857be55c60c4489d4cbe817ea6ebc0c9104088408766d5f9b3e6434f0fcf47986c62afc858e7095225f2db6f6753377
 EBUILD filezilla-3.53.1-r1.ebuild 1571 BLAKE2B dd9d203963419932e93af9455b7a445dc6df94523d9f6b5c2f127e774ba7d428d996dcd03c2689bc8220882581fbb0b2a72b041d96e41f4b5ab3dcd0f475beb9 SHA512 3d462010456db814b7a043cfb6af5e31e3c4f1670f8cee8932edf4a69dcb4632516aec829c89dbb9ff8fc637b9c63f4176a4ffea3872e044520d14db8ea2fc85
 EBUILD filezilla-3.54.1.ebuild 1575 BLAKE2B 5c88143cc929ddcebb2c98828a8f9337fc55a7bffee83aa12096d9b3d7ba4283c00eb26715abfb48bfeca93af509c71f7890b1f1066505422638f5d0447b02ce SHA512 9110f108f3a2e47ece4eec3933b3c137a03de8f1bb4cae66bca913abd6fb252220fab2ccf50ce186cda7860eec7c3c60b4c5891d7eb9dd9080d547c0d952d80b
 EBUILD filezilla-3.55.0.ebuild 1575 BLAKE2B 2d02d23713d4dca30ab3a8044d711b52b8cb31d2aa1742b615ff63862a2cdaaf99711d1bf18ceacec9413b6543a441e2e2384d76f99bce769faad7bfd2d02b5c SHA512 7313ec741aca650db99b3acee996de1d1d67e53e9eeb599c448d20a2597752ea5d7cc1e08d371f7d56dbbf7dbd1a54dff6f43883b6ca741de87134b8799a2478
 EBUILD filezilla-3.55.1.ebuild 1575 BLAKE2B 5b04084b76567e4da05930aa1d9bf65648f072c7042b62b18fb48de24042605b8378a422f0d634c7cf666526de02e229b0fd592efab2fd28a9b5477b1d417c21 SHA512 27a8211978188750665bc5fe2e232474a96ce61aefbdcb489f0ef0940811f20ac483065b8f03547048e786e5d474c0de90adcfb37f5be7dfe8b07aced877f89e
 EBUILD filezilla-3.56.0.ebuild 1575 BLAKE2B f28646fdfa607ddc764edd52f1e8fc8579782ecb1a2a15e2ffcf3c75feb6fb569b0059c99ca6e21b4888cef3f74249570bd538615185eac4b4147d3e9df4371d SHA512 83f219692ebd35de23cd6922440e324b293e491a79406fedebba0a3d8b1ef1c472fe969db00195871aa05c263718142d831535d70c7f05aeb70b0de185110f6e
 EBUILD filezilla-3.56.2.ebuild 1575 BLAKE2B df0cd70ac3470ee498456100773c3fa0d1e833e3e34e41f51f93acc77b96d9a6067a0711ba53f73d10a2e5dbf6c6c2cb96a5974e5118bbf4010193452317a6b3 SHA512 830d610fc41467007cc3152443786330df0859def3fd2e2e32ae980d6d43abb0e77a9d5054e10463c5478af63ac3a139c66726b6d18536a21b2f30bcc93c5824
+EBUILD filezilla-3.57.0.ebuild 1562 BLAKE2B 6956e1ba7e274ab825636011cde1065d5495ccae6280bc689749c139efb172e3f88c0c1d0d1a1a3cc787d87cfdee63db2f9f73a20c79e6586a5fbf3673702f7a SHA512 89b05733cce322ec6a2693e54153337c9033eda4d423207ea2a08a442995ca7d6bc41c7dd9a4444e5348ea09bede0cd661667ec163781dd40c4ab13b82903765
 MISC metadata.xml 460 BLAKE2B 7690f57ee9bf1ea095d672904d4361d4563969d28fc61a9afbf9efaa4965eb1aee775c6555b7959fb2bd17ae80827cd84874dbc79657cd8884b96b7e6740dfe4 SHA512 4afeb15bd88c8926ff25032d2c1cfcd4915cfba862fed4f54e68b471249e03da9d487ab1c0a05350cd4a289eb5b06cab1cc597e5aeab226655405e49a1088338
diff --git a/net-ftp/filezilla/filezilla-3.57.0.ebuild b/net-ftp/filezilla/filezilla-3.57.0.ebuild
new file mode 100644
index 000000000000..54d6c4421bad
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.57.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~ia64 ~ppc ~ppc64 ~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.35.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}
+	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
+)
+
+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/ftp/Manifest b/net-ftp/ftp/Manifest
index 0ba9e8502822..5c616b99c18a 100644
--- a/net-ftp/ftp/Manifest
+++ b/net-ftp/ftp/Manifest
@@ -1,8 +1,5 @@
-DIST netkit-ftp-0.17-patches-2.tar.bz2 4307 BLAKE2B d7febb30807dab2dd66b6fe1991675b37cdea63703769f228895d7722f46b56dd2f5a7774d92740ff3f9ff7797a64660a580cb231582d2b9b912da35c209746a SHA512 6a9adfd33eae4ac2e1a9e070ed89467804dc484eda084694398bb7e3ebbaf04bf70d00ffaa637bace078c4c0024115ba3620fd75d4a3558a44dc991798885461
 DIST netkit-ftp-0.17-patches-3.tar.bz2 4082 BLAKE2B d70c0340641647ab993a7b2aa1c49be2a1ff16e7b6b3038ebe9eff329bf4796cfa21d8c8d88f123c2f633cc1ba3b5ecdd4b1be78a7fda63b77ece077d643fca5 SHA512 083796f89c6d02f2b094616a6b7c9ef8ef7d0edbe337521cf311deb03f1af2000f12b85e3978a5eb1c56c64f2a2a105c0b7735fd6ea31d626d171a047cd858c3
 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
 DIST netkit-ftp-ssl_0.17.34+0.2-5.1.debian.tar.xz 48976 BLAKE2B 30c867a3a8fabc55ba05603c54b5e4153d198e8e92d55353bf02cbf0494a41de1362c945aef013edfa3a6f0b1c78e5041ec7127db5eb99bac5351f57bb526c2d SHA512 6061b9b22fe8463a7d4542988685e108b282b6d2908d67cc70951fc23b1d842a70aee44af989d1e683e80c050ffe284fbfa776581e0120439bec98d479672718
-EBUILD ftp-0.17.23.0.2.1.ebuild 1495 BLAKE2B aceff27473bba089c3cb5d92b3c98563bd40ce959e1be4f60b5558b212d4abea68faf37520e6a5f1b7c329e62d6c62b15d8fb94dfd50300c433822a64cd9b07a SHA512 dbb1dc09a22f6825c6d4bd354124084e2f6194b56aac60f7d3637d48a2280efd73fe8d2e1e932229d6cdb4a13ed5889086341419c5dbd188683952127a5dd98a
-EBUILD ftp-0.17.34.0.2.5.1.ebuild 1506 BLAKE2B fe9b96cce8798671fbe06a3f1738cb6d72f9546a6c7c3edebba85153b2c5e72ec437b75c20891334527d9af99c70c9c9805e1bd533aa8bb48bebc958f8c2f19f SHA512 20014497945799716fd3c5ce1caacddb4cbc399e32cb456d5a7359038ace7f527ad4e05416f005d5b8e65e418fb6ba59c24343f8d3d85dfcecd133ce90e3d9e3
+EBUILD ftp-0.17.34.0.2.5.1.ebuild 1500 BLAKE2B f5bf5def80db031f48d9abbe0d003dbb931b264e43733c805b9ced619369cb4f27a6f32e27fee124f46a68bcb95654e7bf929001bea8fa5fb532a084884e4f90 SHA512 d8d09c710b516097d77b1159ac80cb24ded127eca81e8cc1b0bedcba225c4cc8538982d231d8366a375a36043421b49731561e3cc3a213e0a8aceb4478d7cfb8
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
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
deleted file mode 100644
index 875892a83db6..000000000000
--- a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit epatch toolchain-funcs flag-o-matic versionator
-
-PATCH_VER="2"
-MY_PN="netkit-ftp"
-MY_PV="$(get_version_component_range 1-2)"
-MY_P="netkit-${PN}-${MY_PV}"
-DEB_PN="${MY_PN}-ssl"
-DEB_PV="$(get_version_component_range 1-3)+$(get_version_component_range 4-5)-$(get_version_component_range 6)"
-DESCRIPTION="Standard Linux FTP client"
-HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
-SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
-	mirror://debian/pool/main/n/${DEB_PN}/${DEB_PN}_${DEB_PV}.debian.tar.gz
-	mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="ipv6 readline ssl"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.2:=
-	readline? ( sys-libs/readline:0= )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="diff" epatch "${WORKDIR}"/debian/patches
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	sed -i \
-		-e 's:echo -n:printf %s :' \
-		configure || die
-}
-
-src_configure() {
-	append-lfs-flags #101038
-	tc-export CC
-	# not an autoconf script
-	./configure \
-		--prefix=/usr \
-		$(use_enable ipv6) \
-		$(use_enable readline) \
-		$(use_enable ssl) \
-		|| die
-}
-
-src_install() {
-	dobin ftp/ftp
-	doman ftp/ftp.1 ftp/netrc.5
-	dodoc ChangeLog README BUGS
-}
diff --git a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
index 5c394dd064b5..d722a0bce751 100644
--- a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
@@ -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 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="ipv6 readline ssl"
 
 RDEPEND="