gentoo resync : 16.04.2022

4 files changed, 3 insertions, 66 deletions

diff --git a/net-ftp/tnftp/Manifest b/net-ftp/tnftp/Manifest
index 9433bbf81b99..f0b4f6ca5bbd 100644
--- a/net-ftp/tnftp/Manifest
+++ b/net-ftp/tnftp/Manifest
@@ -1,7 +1,3 @@
-DIST tnftp-20141104.tar.gz 613180 BLAKE2B d9882b7793873abcd0cd00273a29adb2427ea5cdab822c744b02de08ccc88fb62a064ff42ceeec3ea20df68101a2ac5c8cb34bda8c9948078aab2f19f4206fab SHA512 e3d99215d36d27d3d841d946975c2a2723c6ca227cc7d9469f30dbc398f32bdd5c0922933dd12d9e822d7e85826a74619fb7712a6c5a97d1ee721c79d5728d55
-DIST tnftp-20151004.tar.gz 613482 BLAKE2B 3f63a4a57d11b4bfa871fdcac0de6cd4f20743f0e4e02c2b36d341c72dd12d45227ab813c59704b5da07cfed35f2e6e7777c9f34896960bc8f2acbb8ed46acbd SHA512 0702dc26c072599eebbe8731924452575eab93ab72245d4703497daa6e5e4a2c050b28278c0a20b4dbb86cee25949f216fc80a581ed73457a78c1616f484ed6e
 DIST tnftp-20210827.tar.gz 699171 BLAKE2B fe1d4f9f972f349c18e98dbc40305c867511339cb661936fbd255c4a76d9df61f1eae7e723479ef67a96dd05886a079daa4b7367d0c8768d33bc08faa743e5e8 SHA512 9b33f48e237ff49fe3cf502635b948cf7d5e20e2f38a6a429288e3f4374099ac9fb910a9e5b88de4420f1570f6f92ec1fc7ab16f0b93dfe8c6f32d11f0fc0e47
-EBUILD tnftp-20141104.ebuild 739 BLAKE2B 3b8f4756e5389f28175a3c8aa9c18fe69da00efed9d332c980c08951b43887a1d5118ca0d26bdf7b9edaadb140e42b10693d82a911c92f5fc9ca62e3bfbcd714 SHA512 3669ebb2ab0ad5375635b2dd95bac8877c9f42d2f563d46152f8c54d43b735d70a850f049b2bed3d22f5b8d460534c95de934bf8be25eae652059a4f6fca00c9
-EBUILD tnftp-20151004.ebuild 742 BLAKE2B f5c528e41a668414456e61cc7e6e0b4fea33c806e7c0cc868e022e7c52e6e3e050940597b126d2d61b8818bf51bfbdf978311e5e2bffd2ad51a4cd0978dfa6ac SHA512 391bc2f036516de650609c25a87658ba4fb4051f8991ff8b7a6308f66db3267b9b2b4937a41de930a09c5789b0cbcd363d461bce391ed8ce215541d2b3a6792d
-EBUILD tnftp-20210827.ebuild 797 BLAKE2B 51df5a31de124b51cacbd514b92cc22a5b6605dcfe5425d417b7f6645ec1c3c0f61254dd75fbb2e49813552047dcb180874519d57b63263e2304b988f1ba8132 SHA512 7ae97215cc27afbd82b30ec2a2aaee9a66a650728b48abd334974c129230f50de139f98c1ec92d88ce4094dcea56ddf9049350305f708e70a06faa12ef97aa76
+EBUILD tnftp-20210827.ebuild 827 BLAKE2B 11d07e0873d7539687576b4b95a301fba6257e5ebedf61b123b93ff82802a39481b84234717dfca40c00ef54daefab7f737fe1e6bc517e0488d2d08a7ff6f683 SHA512 a525852f56618fe4bc67cd72e7259a1716c4a530e848e382300d8b198b03f2105f546c4e4f44c72b45e93abd259f462c6b1e4eb75980e3a6b119392551e70e33
 MISC metadata.xml 245 BLAKE2B 6458c0b0aca10d6fe15ed3c72599e6144d86236c49c69d8fa210ea09790b43658adadd645b98f3444fd2a097894c8b7da37de1728fbe0f1cb49f311e6a3968cb SHA512 abec8962af24666c9c0c3d373d94d951504906d03e83bfc474bd4906b7c45b731d4c711588ff4156bb526e6303715abbbe1afebb5537a76ce9b05393800a524b
diff --git a/net-ftp/tnftp/tnftp-20141104.ebuild b/net-ftp/tnftp/tnftp-20141104.ebuild
deleted file mode 100644
index c83cf2e1b931..000000000000
--- a/net-ftp/tnftp/tnftp-20141104.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="NetBSD FTP client with several advanced features"
-SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/${P}.tar.gz
-	ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/old/${P}.tar.gz"
-HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
-
-SLOT="0"
-LICENSE="BSD-4 BSD ISC"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ipv6 socks5"
-
-DEPEND=">=sys-libs/ncurses-5.1
-	socks5? ( net-proxy/dante )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--enable-editcomplete \
-		$(use_enable ipv6) \
-		$(use_with socks5 socks)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc ChangeLog README THANKS
-}
diff --git a/net-ftp/tnftp/tnftp-20151004.ebuild b/net-ftp/tnftp/tnftp-20151004.ebuild
deleted file mode 100644
index a6e7d8ae08d3..000000000000
--- a/net-ftp/tnftp/tnftp-20151004.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="NetBSD FTP client with several advanced features"
-SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/${P}.tar.gz
-	ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/old/${P}.tar.gz"
-HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
-
-SLOT="0"
-LICENSE="BSD-4 BSD ISC"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ipv6 socks5"
-
-DEPEND=">=sys-libs/ncurses-5.1
-	socks5? ( net-proxy/dante )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--enable-editcomplete \
-		$(use_enable ipv6) \
-		$(use_with socks5 socks)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc ChangeLog README THANKS
-}
diff --git a/net-ftp/tnftp/tnftp-20210827.ebuild b/net-ftp/tnftp/tnftp-20210827.ebuild
index ff6a5f77bfbb..0c915cffcf44 100644
--- a/net-ftp/tnftp/tnftp-20210827.ebuild
+++ b/net-ftp/tnftp/tnftp-20210827.ebuild
@@ -10,8 +10,9 @@ HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
 
 SLOT="0"
 LICENSE="BSD-4 BSD ISC"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 socks5 ssl"
+REQUIRED_USE="socks5? ( !ipv6 )"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	dev-libs/libedit