10 files changed, 8 insertions, 113 deletions
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index e55cbe0a15af..856f5b0b70f7 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index b4316add69cb..14ee2618a17c 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -6,5 +6,5 @@ DIST FileZilla_3.50.0_src.tar.bz2 4791977 BLAKE2B c0352eea9c4cd0a10d25b21b0a6982
 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.50.0.ebuild 1961 BLAKE2B af10edbedc83cd229573186d94fbc595e3860475ac0b0de392903dffb21a92dac9b22588ee4b5edbd4b55e3ec168c58a8203155db35cd751738c7bd42aa0539c SHA512 2f97de78b3c0b7907c05f988c3c07c788366975241f425beeee54127593fa0fc9a323477e0af64e73b766d011a13b32d3d9ca25aa75e2a18a665f6c43186dd87
-EBUILD filezilla-3.51.0.ebuild 1961 BLAKE2B 9e072f2cb2f0d21a53e3a420691b0731f89d999c0c594715b114e465ea28238a9e2723af936444af7614e81819aa3bd5ac2680836712079f23126246111760aa SHA512 0416cf2e4294bdbd422620981b59a654224d68b1bd4de5097f1436945e12846495c88ca2367efb6f3a5814dcd6c64e48fad2d90251a6fd60347b274cf5a0038d
+EBUILD filezilla-3.51.0.ebuild 1957 BLAKE2B 2e3089f2a70a43ef4dafc954204a2c770fbf0969f1510d1f10d11c1d133314699431a439d83bf8a124fd0df001dcbfe9da1cb794219545269e855599420a0e97 SHA512 c0892524296e0449e20148bd3723a603fe78b7dd2c96cf4dc0bc040c661cfe36483ca94a251af9ac761d31534d994be0a88a9c45785f87665e62a0c887a348ca
 MISC metadata.xml 459 BLAKE2B 71b683a0a48407daa9577a84b6d08bb6bcbcea46b9805fd31256e4f55666c0716b4fe43cbd30617ec1b88cc8697eb9a4254f7bd3e399ecdfcd81e92db24b4cd2 SHA512 e1f653c9a5dd7631ebea96be29472e2824cc6377c9e8783cd56913c1d7951eb9d80cbdaff05affc766c6f38277b6aea5b8a23e8b808840f29249eb7e0cfdfe3f
diff --git a/net-ftp/filezilla/filezilla-3.51.0.ebuild b/net-ftp/filezilla/filezilla-3.51.0.ebuild
index 3639ea6627fa..f500915b3135 100644
--- a/net-ftp/filezilla/filezilla-3.51.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.51.0.ebuild
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86"
 IUSE="dbus nls test"
 
 # pugixml 1.7 minimal dependency is for c++11 proper configuration
diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index 09e5f88e5875..f363ab3159f9 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -1,7 +1,4 @@
 AUX ncftp-3.2.6-fno-common.patch 1818 BLAKE2B 620e3fbc7e297d3186fe9eef8855e2a663a5abcd680269101d5547ab9f6b9addcfe6040ba35e16e8e540784796e34304a9377b1149f7ac00fe0859627a141200 SHA512 c6bf0cc4324583d9aae3f3a57c900437a78d30138d0b9da06fea66cd5fbf57a79ea420afe33536a5bbcf2ace61aaca30ea04155df638daeae125ed9ca90b1c25
 DIST ncftp-3.2.6-src.tar.xz 420564 BLAKE2B ce6d8d2bf06761f884e9edfe6d0bb0230f5d515078a787c4e6faf7716b760166acdd0accf3de1e1f5f3d892c8c86348cdbbefeac6be05e6806011a3e8f4c9b02 SHA512 8e6091ce2ea1eb463edea322d1b5dde813475fd22096d67f0bfd2f5101ae09747ff25d38816d0b9b1077e6a5a256078361691f816aa2eefa38638aa523b4b382
-DIST ncftp-3.2.6.tar.xz 418836 BLAKE2B f0ffa0cc26617ee4007fe8589dbbc8d122edbfc8106a8618a66eab5d9def258d2ee9c2b709e1a637b9d833513ef87b652f4ab0ff518dc9d67d90a7dd43941d3c SHA512 040db7e2ca2ee78b79d682a951fd98c1e0ee2936b64462259992d70c51241fa50ae06c66b4f40933ad0ab7122f581bbb8ba7cda764dba5f70a1f8c7d3d751199
-EBUILD ncftp-3.2.6-r1.ebuild 975 BLAKE2B 30ff54992100b50c7b9a55300f324b369b8a5d6bc4e6084a00c5982648595211839262463d4f44b0474cfc86b63dbebb6ac650b2c7a9ab32c2cdb59fee3dc73b SHA512 9cf1333cd5ab061dabbc252df65598d0411a7a254596b35601a41dace0c713d0b0f503956f0fe26f2acfddfda1b8bde1d1d7da4fd0345ba8066d1b23263555a9
-EBUILD ncftp-3.2.6-r2.ebuild 1045 BLAKE2B 95a5cbb7076d58369e0586dff649fb9f1fbbab8167be4898ddb39f1b9eb88725e2280866a21b9323a20048aa8c071337b5e2422931bf7265139d1bdbcf6ad130 SHA512 0871a21bff14f4d0c9d6cf59369b1c3fab6b1097ffae9284b514d155d7c9b988c099d11617977843a368691f9f12b71cb38f97bda64baf34940f7fa674b978e1
-EBUILD ncftp-3.2.6.ebuild 1043 BLAKE2B b5b30ecd0d33201c30a5ccfa13ddddbc9134b2176f4097be558659182538d5604d4ba9adf9ceb69a1c596695b4aad38e24e5184c9b389dfafb24f887cccbaa89 SHA512 e9912f780ccd6f0658a227d451934ba95ac0b29f27098300af44abaf8375a893992ef1aed4e13db43d59dadcbcb2dab3f60512383fcc4ece14d72eed612e0dfd
+EBUILD ncftp-3.2.6-r2.ebuild 1042 BLAKE2B 7e80b44f1aa36b8343ac572e3f23fc606973ab122b850089586bcb4f73bfd7267e86f495b3c97d32bdd6f025eb88ce2c860a7916d9ff30e23321081b72e820e8 SHA512 9f2df48df2b76c4a8534e6715bd5c5303f58e8a322e3bb7d21ed19e3ed9fc279ddc590f9031e6929b35ee0c7171bd9df8e8385fa2fac6b3189d236c127b8b0c0
 MISC metadata.xml 662 BLAKE2B e41a84c3553efba6d4425c73d7aefeabc235057178408f63a649a2580110f8e7af365b41bea7ec150091b2a57f871ad81476607bbfe73dc7d2ee123a9f175ada SHA512 a3a91d842e2865916280524c6d844c83133f136cf6f9fd59e6246026295f4fe9f5ab535944b79c7c5417b50672de5edc25b5dc34df069721a535342b30b6ab98
diff --git a/net-ftp/ncftp/ncftp-3.2.6-r1.ebuild b/net-ftp/ncftp/ncftp-3.2.6-r1.ebuild
deleted file mode 100644
index 1d4e5c3cf8fe..000000000000
--- a/net-ftp/ncftp/ncftp-3.2.6-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools toolchain-funcs
-
-DESCRIPTION="An extremely configurable ftp client"
-HOMEPAGE="http://www.ncftp.com/"
-SRC_URI="
-	ftp://ftp.${PN}.com/${PN}/${P}-src.tar.xz -> ${P}.tar.xz
-"
-
-LICENSE="Clarified-Artistic"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
-IUSE="pch"
-
-DEPEND="
-	sys-libs/ncurses:*
-"
-RDEPEND="
-	${DEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.6-fno-common.patch
-)
-
-src_prepare() {
-	default
-
-	AT_M4DIR=autoconf_local/ eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	LC_ALL="C" \
-	LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
-		econf \
-		$(use_enable pch precomp) \
-		--disable-ccdv \
-		--disable-universal
-}
-
-src_install() {
-	default
-	dodoc README.txt doc/*.txt
-	docinto html
-	dodoc doc/html/*.html
-}
diff --git a/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild b/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild
index 14f9f6aedf07..2de409549084 100644
--- a/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild
+++ b/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="Clarified-Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="pch"
 
 DEPEND="
diff --git a/net-ftp/ncftp/ncftp-3.2.6.ebuild b/net-ftp/ncftp/ncftp-3.2.6.ebuild
deleted file mode 100644
index 7623cbf8ac32..000000000000
--- a/net-ftp/ncftp/ncftp-3.2.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="An extremely configurable ftp client"
-HOMEPAGE="http://www.ncftp.com/"
-SRC_URI="
-	ftp://ftp.${PN}.com/${PN}/${P}-src.tar.xz -> ${P}.tar.xz
-"
-
-LICENSE="Clarified-Artistic"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
-IUSE="pch"
-
-DEPEND="
-	sys-libs/ncurses:*
-"
-RDEPEND="
-	${DEPEND}
-"
-
-src_prepare() {
-	default
-
-	tc-export CC
-
-	sed -i \
-		-e "s:CC=gcc:CC ?= ${CC}:" \
-		-e 's:@SFLAG@::' \
-		-e 's:@STRIP@:true:' \
-		Makefile.in */Makefile.in || die
-
-	AT_M4DIR=autoconf_local/ eautoreconf
-}
-
-src_configure() {
-	LC_ALL="C" \
-	LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
-		econf \
-		$(use_enable pch precomp) \
-		--disable-ccdv \
-		--disable-universal
-}
-
-src_install() {
-	default
-	dodoc README.txt doc/*.txt
-	docinto html
-	dodoc doc/html/*.html
-}
diff --git a/net-ftp/tnftp/Manifest b/net-ftp/tnftp/Manifest
index c434c22ab486..8076f13956bd 100644
--- a/net-ftp/tnftp/Manifest
+++ b/net-ftp/tnftp/Manifest
@@ -1,5 +1,5 @@
 DIST tnftp-20141104.tar.gz 613180 BLAKE2B d9882b7793873abcd0cd00273a29adb2427ea5cdab822c744b02de08ccc88fb62a064ff42ceeec3ea20df68101a2ac5c8cb34bda8c9948078aab2f19f4206fab SHA512 e3d99215d36d27d3d841d946975c2a2723c6ca227cc7d9469f30dbc398f32bdd5c0922933dd12d9e822d7e85826a74619fb7712a6c5a97d1ee721c79d5728d55
 DIST tnftp-20151004.tar.gz 613482 BLAKE2B 3f63a4a57d11b4bfa871fdcac0de6cd4f20743f0e4e02c2b36d341c72dd12d45227ab813c59704b5da07cfed35f2e6e7777c9f34896960bc8f2acbb8ed46acbd SHA512 0702dc26c072599eebbe8731924452575eab93ab72245d4703497daa6e5e4a2c050b28278c0a20b4dbb86cee25949f216fc80a581ed73457a78c1616f484ed6e
-EBUILD tnftp-20141104.ebuild 742 BLAKE2B 8787830d0e606dc05c16eafb9a7366e04545727d5e25937d7b8680789c5792dbc05e1ef7f37ae4835ab133d109034c1de126de2d6d4a761819ab3b796614ca22 SHA512 69f193a4c674c77bbd23a02d7c2e0beb8cad38bc714845488d18abeae01cdac714c6911981235bac409dc6ce611edf8302be77e56ea0de941010bb1fe6dab8fe
-EBUILD tnftp-20151004.ebuild 745 BLAKE2B 311f98f80b07e68ef5e7c6c4abbbd2205aafb24029c5b8255b6822d10c6b590e51ef3a1c0e4b383afac20c6954884ba4287b1d5b5bd0ff16879e00640530df93 SHA512 1de732849e9fb4ac61669bfb35bbfe22e3c4958c1184ddc2108bc9fb4310ac3a72c9d1a4dae82a58f05629916cddde38829f4cb4159f20751d9e8356b9d38813
+EBUILD tnftp-20141104.ebuild 739 BLAKE2B 3b8f4756e5389f28175a3c8aa9c18fe69da00efed9d332c980c08951b43887a1d5118ca0d26bdf7b9edaadb140e42b10693d82a911c92f5fc9ca62e3bfbcd714 SHA512 3669ebb2ab0ad5375635b2dd95bac8877c9f42d2f563d46152f8c54d43b735d70a850f049b2bed3d22f5b8d460534c95de934bf8be25eae652059a4f6fca00c9
+EBUILD tnftp-20151004.ebuild 742 BLAKE2B f5c528e41a668414456e61cc7e6e0b4fea33c806e7c0cc868e022e7c52e6e3e050940597b126d2d61b8818bf51bfbdf978311e5e2bffd2ad51a4cd0978dfa6ac SHA512 391bc2f036516de650609c25a87658ba4fb4051f8991ff8b7a6308f66db3267b9b2b4937a41de930a09c5789b0cbcd363d461bce391ed8ce215541d2b3a6792d
 MISC metadata.xml 244 BLAKE2B b8494e7c2226498b1c13fbe3ed6fee9604ac640c457c28d1068d8ecdcdf020979e3839c7de35b3839763cf45ee9c9cc92f7885aa2db543d18ae51861fc648b4f SHA512 adc80bf7dbc87f746bd124d3c0c2d6d2191501671ae7f944dfb34aae5343b2fa66a796ca8df729a9661e7c97113f6a2fbb6007f67c8f0aa6d67cad771a22d13a
diff --git a/net-ftp/tnftp/tnftp-20141104.ebuild b/net-ftp/tnftp/tnftp-20141104.ebuild
index b8180b5c2ab6..c83cf2e1b931 100644
--- a/net-ftp/tnftp/tnftp-20141104.ebuild
+++ b/net-ftp/tnftp/tnftp-20141104.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/net-ftp/tnftp/tnftp-20151004.ebuild b/net-ftp/tnftp/tnftp-20151004.ebuild
index fff01fa2c0b8..a6e7d8ae08d3 100644
--- a/net-ftp/tnftp/tnftp-20151004.ebuild
+++ b/net-ftp/tnftp/tnftp-20151004.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"