gentoo resync : 02.02.2022

8 files changed, 71 insertions, 8 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 851a0114629d..9affbe227f01 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index 03475d41c99e..3991b335c1b7 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -1,4 +1,5 @@
 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
-MISC metadata.xml 663 BLAKE2B 22922772d7e64fb89bfe8d6b807b62b1ac4ddf9b570b707a731ae17ad7d1623ddb90ac91f3ce1e8e33e6b94035e59f3a733bbb8c17270ca48adcba51f3c73b44 SHA512 828ea8fb732cb91334f50e522bdb02f0570d7fc5f76060dfa9a5afb6ebbcd9b7ad3c2ee990fece2749fda770b0b5c3f69d7ebedfd7eb52d32a75f2987d045858
+EBUILD ncftp-3.2.6-r4.ebuild 1136 BLAKE2B 7ab6416c4f98975b7e676db2c81ee8824b8771239d3fded5f97eda4a68083b9a5693cc075af7f06f3dc60e0d05764fa1dbcdb021aeb4e77790c780b5089e25f3 SHA512 ee239d39d32012f7744abd1f781bafd719e01afe75fca1607d99d20578eac46ce13a89d01e13483c789ed6a880ce430d3047c92e658f35ca8c51b84c563d5540
+MISC metadata.xml 901 BLAKE2B fe2e37f11f7dc951509759b8f2954b99db7296843928ad0cd5efafaa84e0e284cef9fbb584ec272b0938b3baaf84cd2702cab8c3ae4287aa5d1fe2efad57a811 SHA512 d5617d76fcda26a6ad44b5869102fca50793d59518f8095bcaf390269eb2a99448bcea37dbed0f58458f6a47958d3a2f926509347f70efee48b071c58d89a758
diff --git a/net-ftp/ncftp/metadata.xml b/net-ftp/ncftp/metadata.xml
index 17eb3eeb039e..454915700044 100644
--- a/net-ftp/ncftp/metadata.xml
+++ b/net-ftp/ncftp/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>
+	<maintainer type="person" proxied="yes">
+		<email>ceamac.paragon@gmail.com</email>
+		<name>Viorel Munteanu</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
 NcFTP Client (also known as just NcFTP) is a set of FREE application 
 programs implementing the File Transfer Protocol (FTP).
 
@@ -11,5 +18,5 @@ popular alternative to the FTP program, /usr/bin/ftp. NcFTP offers many
 ease-of-use and performance enhancements over the stock ftp client, and 
 runs on a wide variety of UNIX platforms as well as operating systems 
 such as Microsoft Windows and Apple Mac OS X.
-</longdescription>
+	</longdescription>
 </pkgmetadata>
diff --git a/net-ftp/ncftp/ncftp-3.2.6-r4.ebuild b/net-ftp/ncftp/ncftp-3.2.6-r4.ebuild
new file mode 100644
index 000000000000..ec444773157b
--- /dev/null
+++ b/net-ftp/ncftp/ncftp-3.2.6-r4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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
+	# 727774
+	sed -i -e 's/STRIP=".*"/STRIP=":"/' 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/proftpd/Manifest b/net-ftp/proftpd/Manifest
index c801c941b3f8..3c37b25d6e52 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -29,5 +29,5 @@ EBUILD proftpd-1.3.7a-r2.ebuild 8651 BLAKE2B a6ffc21ccf8e6ffee545168ca28178f368a
 EBUILD proftpd-1.3.7b-r1.ebuild 8590 BLAKE2B da51907a856ea5f2a73e0848eeb823a98c1e5d83e306e4504a6efce66d6d49ab8bba9751a6c0624b8bad2f72636d48e41f1b6d528d1923339a9b571a20678275 SHA512 1b5463956071ffb58e936cfdfb89b3f69acc34c2bf25e8d4226005314cb80885fece23f6a62f5bfba5a68e6c655e78af882f355d5477424b160cae63bf616f72
 EBUILD proftpd-1.3.7c.ebuild 8584 BLAKE2B 2214ba19259e6a5f440038b97ba68b8147f6e76d0f84647cd3f29540607425c2673aa8bb31755cb2d39e3c8119444060adb61ca65efa705d8566375b1cd9897f SHA512 e954c9baea7a2cda0629576e70bcecb2f90f7228fe0016909b0e094168d9b1da26aeb0a1073f0b9bcb8dd3cb77c9909df79d2780035dc53f02557b60c0c1a772
 EBUILD proftpd-1.3.8_rc1-r1.ebuild 8547 BLAKE2B 08fcf0ce70873b8fbffc6cebc7a537a45067668c43aa99e73d0ec3dd365b4864e5f1d08e722ba3a5ad07681d7c0c24b4582f0383e0f0cb44829cc7faa2963261 SHA512 18e885afaff12e443d4c9999872e7d9dfb4b4805b8811c00514b69198b3ce6a74027d7d804caecf23303bfb4e64549b527be0c052e1029b1e602b34623ff14aa
-EBUILD proftpd-1.3.8_rc2.ebuild 8547 BLAKE2B 08fcf0ce70873b8fbffc6cebc7a537a45067668c43aa99e73d0ec3dd365b4864e5f1d08e722ba3a5ad07681d7c0c24b4582f0383e0f0cb44829cc7faa2963261 SHA512 18e885afaff12e443d4c9999872e7d9dfb4b4805b8811c00514b69198b3ce6a74027d7d804caecf23303bfb4e64549b527be0c052e1029b1e602b34623ff14aa
+EBUILD proftpd-1.3.8_rc2.ebuild 8541 BLAKE2B 8c6678359518eb55a50e6b9e5ba81385074e7bed7f7aac10f84fc2d32a6144b665742ed04c8e2e8539eb29179c83ee97eaacc99c96086ce5498d04988cbf7f83 SHA512 690e13e55ba9a3fccdb154e478dc7acd0e6deac5589ac569bad1a6b7ff626514131d93e8a452e3c2b28ea717805794b60fab07bb44dfa4a0c7bc694fcff47fa1
 MISC metadata.xml 2890 BLAKE2B 8d8df910c291d064a62eab80f05ba0524fbfc777eae7a0dc65809bd01eccc23f356dbbe4a1af4df43f2d83d964370cd38eb40421c7851dd130aefc5011eb6722 SHA512 99679d7d9c8ed947aa736e79da5031fccf4555a558ea8891b059f4a2989037e6a266a197d5e168f7a9c4d787f8dafb53277bcd4418532d91d8f089e3e56a57c9
diff --git a/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild b/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
index 24743199c475..1dfcd3c17181 100644
--- a/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
 	kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
 	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 0f4d89078b9f..f8ebe389432d 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -25,5 +25,5 @@ DIST vsftpd-3.0.4.tar.gz 197637 BLAKE2B 3a2457bd74076de8ffba7ad2861009157c80dd9f
 DIST vsftpd-3.0.5.tar.gz 197778 BLAKE2B c197a070f7eef8c97ef0adc1ebb883520e7613d67ba0eabb1380b3adaae272f4ef79110e79ce4aad5ddebd6100fb059308d905203249c5445d3ea64c29dc5ec2 SHA512 9e9f9bde8c460fbc6b1d29ca531327fb2e40e336358f1cc19e1da205ef81b553719a148ad4613ceead25499d1ac3f03301a0ecd3776e5c228acccb7f9461a7ee
 EBUILD vsftpd-3.0.3-r4.ebuild 3700 BLAKE2B afd82fb42398d3ff80e3ac6caea0353be89742c79a419876d415c9eb2283ef2548fec791d945a78e2039cb66b39a7348b5e2d2b41422122032ef743c0fd1f8fb SHA512 29ee6f8547e35bad5861bc7ae2818b6f55aee69cdb909965931c698c3c05e40504b8b198869819531a223f03850d73350d03e7f7baaeccf3c2aaa74222bcc8f2
 EBUILD vsftpd-3.0.4-r1.ebuild 3691 BLAKE2B c59a4d4579e99b2e6137658b70d2f6341c4d907f6f492a0ec6e57a7090d072dde5cd0a9e5c333bad96f1fe025ff838c9f6c4f6ac737d85648bcf8480d5ba4973 SHA512 8c6b75ea2f16ed9f916194e3d2e9a266f455459c4effee22ec13c7a31324c722f3f4c7d439fead4cf507ec6860d10ade01a5e1f3c0bc8d5686dec337ca58eb3e
-EBUILD vsftpd-3.0.5-r1.ebuild 2329 BLAKE2B beb3d2addd0705ddff874642e9a4d24fb8a89614ae2947632084bc82cef4006aba0709e7ee9cd57a43b102febb1d9824f1da46e33fe523dc7d543e728bc7763e SHA512 f68968096e0c0d7a569fa87bb1aa1002565a93d5f838848ad3518a2bba7d7374748f66f50b7eff9b3f51fdd6547e16f2eabd3a68d159fcbaccbb1140eef15f0a
+EBUILD vsftpd-3.0.5-r1.ebuild 2325 BLAKE2B f6fe9c84d80997c8461d0a9877380c3592850f66f72127fc8ac5561bb8b0cfb34ec6180db18f71537fc9ec3e8847e560a1e81564a0c0fc830b1c7c81c5b740a0 SHA512 f0f5fb74c81c4c516890e8d012f5b1ad3b18f99fb1a9830469e50f1399198dd270a0c945339a84e2cdef3ee5131e08e4a706767dd03b29877ff30953b846a62e
 MISC metadata.xml 219 BLAKE2B 92feec299114ee9e14d6e84d01a8b845b76d520cb5c0d7ca7efcb519e0b49c63a5900724b51ec250bf48275083031b1bae2dfd3b38eb188393275eb6538f966e SHA512 d57180760f0844d3cba2a9680717aa134fc2592573c7bec1c5ef5dff1d02d5b7bedf6b3846e27b1db05aa5a519e5c1e37f70932742e083bfab2a8d8915b6df0b
diff --git a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
index 7b213e6d4c26..42443b775d2e 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="pam ssl tcpd"
 
 DEPEND="