gentoo resync : 20.03.2022

3 files changed, 2 insertions, 56 deletions

diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index 3991b335c1b7..e71b68b2f700 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -1,5 +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
-EBUILD ncftp-3.2.6-r3.ebuild 1050 BLAKE2B 5ce5712e148ff10ad2ebbcf10360336bf4891fa22f16e80ae14fa44877031fafbc4b5b7f399b5f3cf04a9ffc76e647d9a90363d36eca68eae2f94b8c2f052881 SHA512 5cedc52dc0d30a0c86f1d3c02e6042625331a2ef91d52612d7546e9d86cd3e27cb6b3b9839c5b6c7ffac0b35cff72133c61192c3c2507b5183a5b8f647a8d1e0
-EBUILD ncftp-3.2.6-r4.ebuild 1136 BLAKE2B 7ab6416c4f98975b7e676db2c81ee8824b8771239d3fded5f97eda4a68083b9a5693cc075af7f06f3dc60e0d05764fa1dbcdb021aeb4e77790c780b5089e25f3 SHA512 ee239d39d32012f7744abd1f781bafd719e01afe75fca1607d99d20578eac46ce13a89d01e13483c789ed6a880ce430d3047c92e658f35ca8c51b84c563d5540
+EBUILD ncftp-3.2.6-r4.ebuild 1137 BLAKE2B 122bbe66f3611d353bd9f0d3786953f55a1a7be641d746f121fbf6cb8c8da0f9e7ffb5c10aa46547f85ea61e1d50a4c83bc082b2c3dca1769ae1f4253ad36a33 SHA512 a744fd7ac84b8e5cdbaf10cca9955ed19c52318cb1c4cf22bc38476cb06b22098b47e68868c3d53edc66313460398bcbdd65eab1d4abdf230443f9a535a805c2
 MISC metadata.xml 901 BLAKE2B fe2e37f11f7dc951509759b8f2954b99db7296843928ad0cd5efafaa84e0e284cef9fbb584ec272b0938b3baaf84cd2702cab8c3ae4287aa5d1fe2efad57a811 SHA512 d5617d76fcda26a6ad44b5869102fca50793d59518f8095bcaf390269eb2a99448bcea37dbed0f58458f6a47958d3a2f926509347f70efee48b071c58d89a758
diff --git a/net-ftp/ncftp/ncftp-3.2.6-r3.ebuild b/net-ftp/ncftp/ncftp-3.2.6-r3.ebuild
deleted file mode 100644
index de6863dacda0..000000000000
--- a/net-ftp/ncftp/ncftp-3.2.6-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 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="https://www.ncftp.com/"
-SRC_URI="
-	https://ftp.mirrorservice.org/sites/ftp.${PN}.com/${PN}/${P}-src.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 ~sparc-solaris ~x86-solaris"
-IUSE="pch"
-
-DEPEND="
-	sys-libs/ncurses:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.6-fno-common.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e '/^AR=/d' autoconf_local/aclocal.m4 || die
-
-	AT_M4DIR=autoconf_local/ eautoreconf
-}
-
-src_configure() {
-	tc-export AR 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-r4.ebuild b/net-ftp/ncftp/ncftp-3.2.6-r4.ebuild
index ec444773157b..29fce062b84f 100644
--- a/net-ftp/ncftp/ncftp-3.2.6-r4.ebuild
+++ b/net-ftp/ncftp/ncftp-3.2.6-r4.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 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="pch"
 
 DEPEND="