gentoo resync : 16.09.2020

18 files changed, 9 insertions, 308 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 5f283ce60a13..9aa71c788e1f 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/cmdftp/Manifest b/net-ftp/cmdftp/Manifest
index 0b3bef2b6545..4dc9dbc3138e 100644
--- a/net-ftp/cmdftp/Manifest
+++ b/net-ftp/cmdftp/Manifest
@@ -1,3 +1,3 @@
 DIST cmdftp-0.9.8.tar.gz 145985 BLAKE2B cc5869cc8c43208161886020b2a3c4df9151d48053ab3c6d4e7d0759bb47a23a687c09eda2c202ac93167f26c33a6c4ac49568f356a9fe16ef09237d499f04c8 SHA512 8c8bb670988c439838493f1c6d31e47ae01e3fd6a1521602267dc8cb8dcc6ed18605277bdbf22a06b3af61e33a676ff3f188648f54af5d0839c7039eaab6b262
 EBUILD cmdftp-0.9.8.ebuild 460 BLAKE2B d45e2d2e03959be50d745fa07b38c07a00743243ec300dd9ce492c9dcea932ebcbad7df7cea20a8d99155f070be53d795bd66bdcdddff52d99d3a4b289066772 SHA512 1fcd97c077db38727423c7eed70202176db1434ea3e62db55adf6681a2f1d66d037babd1495dc6af72960fcf8faedb33b140a13af0ca08ff3c7e7700eb431d3e
-MISC metadata.xml 293 BLAKE2B 0089cfa2bdd58e719ee1a13ed7e2f95b3b61343c4f9b8a6b4c7e383df377d8e03f866573108752091636c33307f86294b05dbb79c34a2cf9f05cb48486908faf SHA512 01e38ab096f216f988b87309b37964f88d2856e0d4d7618598350e0184bdf4f6507fcdb57ddba37831a6ad85ccf51d4e6aa20571472eb3d0be1b21a61a508f9e
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-ftp/cmdftp/metadata.xml b/net-ftp/cmdftp/metadata.xml
index 88ccef8f8274..6f49eba8f496 100644
--- a/net-ftp/cmdftp/metadata.xml
+++ b/net-ftp/cmdftp/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
-<longdescription lang="en">
-  Light weight, yet robust command line FTP client with shell-like
-  functions.
-</longdescription>
 </pkgmetadata>
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 6e5f82b95e56..354d5eb26d02 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -11,4 +11,4 @@ EBUILD filezilla-3.48.0.ebuild 1994 BLAKE2B 97aac6517d88b3495cd8456a3d049dc0e610
 EBUILD filezilla-3.48.1.ebuild 1994 BLAKE2B 31e6def69a7904d2d8a3f3db5a5d555bb3cdee3944955cb1e1a03c9df512f83009c6fe2b2a16c97b5024d9501ff02cdf450d64285ff8a6600694ad05d26262f1 SHA512 253ae3736744b3b0e5181b3764275a9551ffd20b207688647920b8d80d2625d3222817e6eda96a7ae41334f5725f676b5e45d6b98c0efcad39f7f7d78205e3ae
 EBUILD filezilla-3.49.1.ebuild 1994 BLAKE2B 4bffcb92f92116e1f63f3978fd53a396e9f585a089ea9ef263608300e4bb00e170bc63a6250e97807efb9dc9112c44e2192b4dec01d7d07e9b722db76cffab91 SHA512 67140c7df984284b74556ad54b1de67ee59af0e6a21099d507decc749b703dbbad8015adb0bb2096d6e716a4e194d49b6949461ec835f84d0d8d00e1e8b8837d
 EBUILD filezilla-3.50.0.ebuild 1961 BLAKE2B af10edbedc83cd229573186d94fbc595e3860475ac0b0de392903dffb21a92dac9b22588ee4b5edbd4b55e3ec168c58a8203155db35cd751738c7bd42aa0539c SHA512 2f97de78b3c0b7907c05f988c3c07c788366975241f425beeee54127593fa0fc9a323477e0af64e73b766d011a13b32d3d9ca25aa75e2a18a665f6c43186dd87
-MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
+MISC metadata.xml 459 BLAKE2B 71b683a0a48407daa9577a84b6d08bb6bcbcea46b9805fd31256e4f55666c0716b4fe43cbd30617ec1b88cc8697eb9a4254f7bd3e399ecdfcd81e92db24b4cd2 SHA512 e1f653c9a5dd7631ebea96be29472e2824cc6377c9e8783cd56913c1d7951eb9d80cbdaff05affc766c6f38277b6aea5b8a23e8b808840f29249eb7e0cfdfe3f
diff --git a/net-ftp/filezilla/metadata.xml b/net-ftp/filezilla/metadata.xml
index 13541a402eae..ed978e333973 100644
--- a/net-ftp/filezilla/metadata.xml
+++ b/net-ftp/filezilla/metadata.xml
@@ -9,9 +9,6 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
-  <longdescription lang="en">
-  The native linux ftp/sftp client GUI built on wxGTK
-</longdescription>
   <upstream>
     <remote-id type="sourceforge">filezilla</remote-id>
   </upstream>
diff --git a/net-ftp/ftpbase/Manifest b/net-ftp/ftpbase/Manifest
index a3490b5c18a8..ebfdfce5d5db 100644
--- a/net-ftp/ftpbase/Manifest
+++ b/net-ftp/ftpbase/Manifest
@@ -2,4 +2,4 @@ AUX ftp-pamd 700 BLAKE2B c867c659cac367c51021504dd4da0a9dc90609564613f580a0a01a9
 AUX ftp-pamd-include 632 BLAKE2B 28aa913499698f136e784e8ed420748fe1415d0ddeb64761b8ed71b869e4b9afb6b86df4b8a8a748ec3a740d99c000fcc4789ee45c3a302f81ffbaab07c7e106 SHA512 adc59c544b815bd88b7e91a43cb5620008d1f83d15a08620f56242d74991ba413e56b31bcca8e5fcfe71f05362bbad89b02d5289260f08649d38965c8951ec76
 AUX ftpusers 300 BLAKE2B 02489b8eed29bfd4cea148b1b4214ac5ba798faa44da1be68cea06c18680e44f0054c952107810e4a199398b6ba382c649a481cf9d7388cd5caa10ace50e06d3 SHA512 29a8bdca1a6bb516c5189e6c69969cba3c220ea878e352e78bb6ea5cb2ac7476306736240155dc6d3f7512aac48164354db68721ea952d1010639e8ae14635e0
 EBUILD ftpbase-0.01-r3.ebuild 926 BLAKE2B d4cc4a0a8c3fe1ad44e4bee6be419edea881da518b9c75672187ff6cd3e040b4d2526265f417f74207d0ecb0926887a9274d2c6e2ae33e6780f562fcfe48c531 SHA512 c08ef2e103c314b24b483b0c17e521bbf5dcdec83fb16c63381f98b7bac5efe523a8b3edd149050c3de3798e2c0d76d789e9958a671e5de4a9491ef6e16f0acb
-MISC metadata.xml 235 BLAKE2B da947ee7650abf01b4eee1667349a14d2d8d496ec234acd60db66c1059d42d6e9a1d30403068b7977a397f4e0a2934fe4e7c2c04d356b2c23a5e8a87ac7266a1 SHA512 fa78af8197737bd5d9b44305bac24dacac9034fd96284af1e3c89428fc418e17a4bea91fa53f07dce02e6ab8afe6455343db364d031ab342225a26d0364c23da
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-ftp/ftpbase/metadata.xml b/net-ftp/ftpbase/metadata.xml
index ba090926742a..7a38bb900964 100644
--- a/net-ftp/ftpbase/metadata.xml
+++ b/net-ftp/ftpbase/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		FTP base package
-	</longdescription>
 </pkgmetadata>
diff --git a/net-ftp/linksys-tftp/Manifest b/net-ftp/linksys-tftp/Manifest
index 558dd17105de..d6bbabfb0e07 100644
--- a/net-ftp/linksys-tftp/Manifest
+++ b/net-ftp/linksys-tftp/Manifest
@@ -2,4 +2,4 @@ AUX linksys-tftp-1.2.1-r1-Makefile.patch 734 BLAKE2B 3ac66fa3b8f2693d07283603178
 AUX linksys-tftp-1.2.1-r1-header.patch 959 BLAKE2B 7db548e0ecc70528c0ca974ca6cc1244615138aaead1f7f0e6384e35217532493f1e6d5fc167e54ab44e36cf241e5e821400cd60ec1ac900aee217e7e8478725 SHA512 8d59f13f16b9b512488d5773904ac0f617d2bbbff567040e009e8033012435c713d0ebac5ea145add5adb8881a66eefef4926a8aab2adc6590826744549356f7
 DIST linksys-tftp-1.2.1.tar.bz2 11124 BLAKE2B 44a3bb1a11c9dae6014c3ec5f0c56c2a056e542f2f7f1d7a805479925beedebe9a79a8cddc64ce2455b459d8fa4436f16d52c6d86d8595fa1f05aa747f14bc78 SHA512 7d99cd7cc2144396fe008ed0fbc21053ef4e614021d6d2e24adca799d8eabd1b3c177b4bee20e14034170bc234d36e9eeaaf8e825513ef6f37e73643b91667fc
 EBUILD linksys-tftp-1.2.1-r3.ebuild 616 BLAKE2B b7a96d3a5ecaa211600678e7ffe96b25c2ae51a7eb059fe565a3a0828241801a1b424d0ef19d7afe760094e83c2cfb6d8959c0722ac5a565190675f8bb049995 SHA512 e116e13d1ed342dbfae4ebb2f8e4288ea35990bf7ac08738958e8b177398fb09ab5b87724d2ab9791a03bdd11e6743e48885ce52db18fbeea27f051adf3e03d1
-MISC metadata.xml 341 BLAKE2B 1cec9d55108607f56161a8ed04f1ae80bf14574770b28c0713d1ff93bf4d9e0ed292797e240e2efd7fa4387385098c6556e2d8840733524edf180e62c619eeae SHA512 2a53ba435993e13fadce62e4aaed9f5cb635cf86a0793ed8ad06aa25ee1f7622ecad595c1952760bdfd3573c19a8a0296ba46b6db3200357e80a70da50eb22bb
+MISC metadata.xml 257 BLAKE2B c0414223216e6f9feab05fa4f6837713d195308a1c2cb561240dc05f212872da091cccb2d2dba14263dc989d67a756e0b6e7e06089544301b0ff04b0416fc2a7 SHA512 4c898784a8a98208bf3efdfed832bd66ece4f6af70d271946741e23947c080d850073f3859b8859717ba2ea74aa032cdd17e5950fe08bd26b45d30b6c636eff6
diff --git a/net-ftp/linksys-tftp/metadata.xml b/net-ftp/linksys-tftp/metadata.xml
index b2a49e29541c..f4717d71fa10 100644
--- a/net-ftp/linksys-tftp/metadata.xml
+++ b/net-ftp/linksys-tftp/metadata.xml
@@ -5,5 +5,4 @@
     <email>embedded@gentoo.org</email>
     <name>Embedded Gentoo</name>
   </maintainer>
-  <longdescription>An extended version of BSD tftp with passwords</longdescription>
 </pkgmetadata>
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 04cdf9f9b1f0..8a9e1fcb86cb 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -16,11 +16,9 @@ AUX proftpd.xinetd 295 BLAKE2B 4863cea66df5c32efba61647bbc854953dff28e154fab284c
 DIST mod_gss-1.3.9.tar.gz 117158 BLAKE2B f957fa465f9a9b06ceb9c190ab60c7f67fdeeef79dce7f51bcfed8dc726cb01a231232c65821ca3a240b77a5019fa22f31b45496c128a06627bd24dc960b566f SHA512 44615983b0f67939b110e54c4a83b3056263bad72ba78de1b16f9f8590f5504c60e679f55484708d49e694c528d4715d9abd0cb75cfe439982ea9e02e0c18891
 DIST mod_vroot-0.9.4.tar.gz 29461 BLAKE2B eb4d3f6425ab0a1a61ca607e4655b5f8ff6ea342ca49d49598e7a4c5596382aa2c1d4e8228a1cdcfff324feb92dac80fcc58e35bbb77155069749afdd7cc41fb SHA512 f5de392c9fe39f0a03b0783a7092bbfe17ea6db991f4b4e4a2d8f092f073d27ef2c64dd6484d5665b5abc808c0caba016d4fc3fab3da3810f5ebe5249bb4cbce
 DIST proftpd-1.3.7a.tar.gz 20414571 BLAKE2B 829f3ff79cf74bc9cacfc611877cd1373daefb022b10eb427be56325d455dc7ba2f87a7dbefed06dca0c4cf06597043aac9141e4156e775a4f343bbb07a29375 SHA512 abb53c494677001b6d8d5a15af4ae47e2527025c952667b8c42e144452266d2b7f89b57e68c96177e6054733eb5e5d04cc1c0cf61ff7c3697910e0a525a9de87
-DIST proftpd-1.3.7rc4.tar.gz 20407496 BLAKE2B fd98b2ca3f4b6448b8739ff39db72d06f508e2507c156043a022ef5275d21775bdecc50c4434173f40fe1e40f439aebc58c9efaa6a5e6946dd15d5b52a36bda0 SHA512 8a782c27fae757b940396a9dd74a7336cac982f0fb3b28afd6a0b3837c8e93fc74c329ac520dd69f051740303ab776da2d9368d0b46814d264cad5ac0ac7003b
 DIST proftpd-mod-case-0.7.tar.gz 13184 BLAKE2B bf2118d9b8ed97a5b192b92b515d17ac7a0d75e154288e5afb3a1c3d686e635093df9501cc1c9b077f87c14326e31e8b9f751803dfca1eae9643f12333eb633f SHA512 c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc
 DIST proftpd-mod-diskuse-0.9.tar.gz 18596 BLAKE2B 38c704c8607f0f93b080e77fe793cfe0125c88acc6f818ecb059c6c21a983e040ff5f2c1b91e34ef4ba2666a808d896018c364d1f12ea38f0c477e79bdaa2120 SHA512 d41976bf2810e4b783e775e8c767ca2030c3b5df116219fd31cbbac7feaf9922c315bf4ea092881b0d6cf43f2f4c5dbcae61be3c3a833058d12f962a3024b975
 DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a523997a0b7d5b53b9470b4744b919adcf03d5bcee2df85ba88c4a4c20a9fc30dc01459ffb58c5dae8e78a52a7379bf36f11 SHA512 38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012
 DIST proftpd-mod_clamav-0.14rc2.tar.gz 19710 BLAKE2B 3435e198cf029337904d4666910414124a3b7e1529d4b12f7acd8a9be563009fff4d9a30eb132a2d7361d2c830e5601c4a00a8814282585b6915e991cc29bc13 SHA512 b8e56880fadf36513215fa4c20be6db7cdf1274337072a9b29c3c3477b3de4743ebcdb1179572ec4cb1501fac0064330c855b1f818bf0cc52f0e91170f059772
-EBUILD proftpd-1.3.7_rc4-r1.ebuild 8729 BLAKE2B 4e19a3950869b1796a1e5a242f6365d76d70763ab349358bdddca56bdf0a65efdbdfee1bf9576e5729a289fb30c37a43d4a6b08040e756c390ff2731ec6c7f2b SHA512 c0d5c4cdffb42e047626cef2201984b6fe856eff8b4c195ec171d9346a1a789cc11cb5326ef6dfc7536cde954cfc9bf1df6380a94beee27aeca3033e2a15ef46
-EBUILD proftpd-1.3.7a.ebuild 8630 BLAKE2B e490d9fdc9deeb4781cdb174746e8d39447dcc3ff752deb7f81fb66c955e3c69dc353297b2974430984313d025fd5375d9aeb3161d61eb297e6bb6406d1bd2bd SHA512 6e4cfbe4cc442e6e917f303f6dc894f6478f99b5bc09490585aa531603c21b18f806a10086637dd927dd336afb4dfcfdb02c2fbea406bec43d03ba7495308cf3
+EBUILD proftpd-1.3.7a.ebuild 8628 BLAKE2B a9c6fa50bb840b0dc4dfdb7a1a6a8c5a8b8c594ac65f0effa077ec3cb67f451eb877fd5f46ccf7f9ce342d88ecac7f9b70ccb97e0d497dc4087c50269cbdd562 SHA512 ec0dd832a4eb23e19a328e2e693482be601dd45bd1606f343d902a86d5f0a927c316f126cc48334fcb89d1f46c43f4db960787ad14bce11ab064ea4c0635fce9
 MISC metadata.xml 2930 BLAKE2B f3f8218a737f50599ff687030bd8c84f1818b290d6d89bd6627ab8eb02598d196f1bae03d7b15e4eb02967fb7e0d826cdda10588c8bfe4f8a387a49d70d9cab0 SHA512 c90941671532512e4d085f3c6b4f56f3c2a252a613bf5c978d763fb0f8f9190431a41816f4fddde47e28eaeddcd17a7aef52064e5825499801bcdfbd72745be8
diff --git a/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild
deleted file mode 100644
index 805cd6c69ab2..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib systemd tmpfiles toolchain-funcs
-
-MOD_CASE="0.7"
-MOD_CLAMAV="0.14rc2"
-MOD_DISKUSE="0.9"
-MOD_GSS="1.3.9"
-MOD_MSG="0.4.1"
-MOD_VROOT="0.9.4"
-
-DESCRIPTION="An advanced and very configurable FTP server"
-HOMEPAGE="http://www.proftpd.org/
-	http://www.castaglia.org/proftpd/
-	https://github.com/jbenden/mod_clamav
-	http://gssmod.sourceforge.net/"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
-	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
-	clamav? ( https://github.com/jbenden/mod_clamav/archive/v${MOD_CLAMAV}.tar.gz -> ${PN}-mod_clamav-${MOD_CLAMAV}.tar.gz )
-	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
-	msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz )
-	vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/v${MOD_VROOT}.tar.gz -> mod_vroot-${MOD_VROOT}.tar.gz )"
-LICENSE="GPL-2"
-
-SLOT="0"
-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 libressl 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"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( ssl )
-	shaper? ( ctrls )
-
-	mysql? ( ssl )
-	postgres? ( ssl )
-	sqlite? ( ssl )
-"
-
-CDEPEND="acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	memcache? ( >=dev-libs/libmemcached-0.41 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nls? ( virtual/libiconv )
-	ncurses? ( sys-libs/ncurses:0= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	pam? ( sys-libs/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:= )
-	sodium? ( dev-libs/libsodium:0= )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${CDEPEND}
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-S="${WORKDIR}/${P/_/}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.6-use-trace.patch
-	"${FILESDIR}"/${PN}-1.3.7_rc4-ldap_mod-SEGV.patch
-	"${FILESDIR}"/${PN}-1.3.7_rc4-str-sentinel.patch
-)
-
-RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
-
-in_dir() {
-	pushd "${WORKDIR}/${1}" || die
-	shift
-	"$@"
-	popd
-}
-
-src_prepare() {
-	# Skip 'install-conf' / Support LINGUAS
-	sed -i -e "/install-all/s/ install-conf//" Makefile.in || die
-	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in || die
-
-	# Prepare external modules
-	if use case; then
-		cp -v "${WORKDIR}"/mod_case/mod_case.c contrib || die
-		cp -v "${WORKDIR}"/mod_case/mod_case.html doc/contrib || die
-	fi
-
-	if use clamav ; then
-		cp -v "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib || die
-		eapply -p0 "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/001-add-mod_clamav-to-tests.patch
-	fi
-
-	if use diskuse; then
-		in_dir mod_diskuse eapply "${FILESDIR}"/${PN}-1.3.6_rc4-diskuse-refresh-api.patch
-
-		# ./configure will modify files. Symlink them instead of copying
-		ln -sv "${WORKDIR}"/mod_diskuse/mod_diskuse.h "${S}"/contrib || die
-
-		cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.c "${S}"/contrib || die
-		cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.html "${S}"/doc/contrib || die
-	fi
-
-	if use msg; then
-		in_dir mod_msg eapply "${FILESDIR}"/${PN}-1.3.6_rc4-msg-refresh-api.patch
-
-		cp -v "${WORKDIR}"/mod_msg/mod_msg.c contrib || die
-		cp -v "${WORKDIR}"/mod_msg/mod_msg.html doc/contrib || die
-	fi
-
-	if use vroot; then
-		in_dir ${PN}-mod_vroot-${MOD_VROOT} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-vroot-refresh-api.patch
-
-		cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.c contrib || die
-		cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.html doc/contrib || die
-	fi
-
-	if use kerberos ; then
-		# in_dir mod_gss-${MOD_GSS} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-gss-refresh-api.patch
-
-		# Support app-crypt/heimdal / Gentoo Bug #284853
-		sed -i -e "s/krb5_principal2principalname/_\0/" "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c.in || die
-
-		# Remove obsolete DES / Gentoo Bug #324903
-		# Replace 'rpm' lookups / Gentoo Bug #391021
-		sed -i -e "/ac_gss_libs/s/ -ldes425//" \
-			-e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
-			-e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" "${WORKDIR}"/mod_gss-${MOD_GSS}/configure{,.ac}  || die
-
-		# ./configure will modify files. Symlink them instead of copying
-		ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c "${S}"/contrib || die
-		ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.c "${S}"/contrib || die
-		ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.h "${S}"/include || die
-
-		cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/README.mod_{auth_gss,gss} "${S}" || die
-		cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.html "${S}"/doc/contrib || die
-		cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/rfc{1509,2228}.txt "${S}"/doc/rfc || die
-	fi
-
-	default
-
-	tc-export CC
-}
-
-src_configure() {
-	local c m
-
-	use acl && m="${m}:mod_facl"
-	use ban && m="${m}:mod_ban"
-	use case && m="${m}:mod_case"
-	use clamav && m="${m}:mod_clamav"
-	use copy && m="${m}:mod_copy"
-	use ctrls && m="${m}:mod_ctrls_admin"
-	use deflate && m="${m}:mod_deflate"
-	if use diskuse ; then
-		in_dir mod_diskuse econf
-		m="${m}:mod_diskuse"
-	fi
-	use dynmasq && m="${m}:mod_dynmasq"
-	use exec && m="${m}:mod_exec"
-	use ifsession && m="${m}:mod_ifsession"
-	use ifversion && m="${m}:mod_ifversion"
-	if use kerberos ; then
-		in_dir mod_gss-${MOD_GSS} econf
-		m="${m}:mod_gss:mod_auth_gss"
-	fi
-	use ldap && m="${m}:mod_ldap"
-	use log-forensic && m="${m}:mod_log_forensic"
-	use msg && m="${m}:mod_msg"
-	if use mysql || use postgres || use sqlite ; then
-		m="${m}:mod_sql:mod_sql_passwd"
-		use mysql && m="${m}:mod_sql_mysql"
-		use postgres && m="${m}:mod_sql_postgres"
-		use sqlite && m="${m}:mod_sql_sqlite"
-	fi
-	use qos && m="${m}:mod_qos"
-	use radius && m="${m}:mod_radius"
-	use ratio && m="${m}:mod_ratio"
-	use readme && m="${m}:mod_readme"
-	use rewrite && m="${m}:mod_rewrite"
-	if use sftp ; then
-		m="${m}:mod_sftp"
-		use pam && m="${m}:mod_sftp_pam"
-		use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
-	fi
-	use shaper && m="${m}:mod_shaper"
-	use sitemisc && m="${m}:mod_site_misc"
-	use snmp && m="${m}:mod_snmp"
-	if use softquota ; then
-		m="${m}:mod_quotatab:mod_quotatab_file"
-		use ldap && m="${m}:mod_quotatab_ldap"
-		use radius && m="${m}:mod_quotatab_radius"
-		use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
-	fi
-	if use ssl ; then
-		m="${m}:mod_tls:mod_tls_shmcache"
-		use memcache && m="${m}:mod_tls_memcache"
-	fi
-	if use tcpd ; then
-		m="${m}:mod_wrap2:mod_wrap2_file"
-		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
-	fi
-	use unique-id && m="${m}:mod_unique_id"
-	use vroot && m="${m}:mod_vroot"
-
-	if [[ -n ${PROFTP_CUSTOM_MODULES} ]]; then
-		einfo "Adding user-specified extra modules: '${PROFTP_CUSTOM_MODULES}'"
-		m="${m}:${PROFTP_CUSTOM_MODULES}"
-	fi
-
-	[[ -z ${m} ]] || c="${c} --with-modules=${m:1}"
-
-	econf --localstatedir=/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
-		$(use_enable acl facl) \
-		$(use_enable authfile auth-file) \
-		$(use_enable caps cap) \
-		$(use_enable ctrls) \
-		$(use_enable dso) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable memcache) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable ssl openssl) \
-		$(use_enable pam auth-pam) \
-		$(use_enable pcre) \
-		$(use_enable sodium) \
-		$(use_enable test tests) \
-		--enable-trace \
-		$(use_enable userland_GNU shadow) \
-		$(use_enable userland_GNU autoshadow) \
-		${c:1}
-}
-
-src_test() {
-	emake api-tests -C tests
-}
-
-src_install() {
-	default
-	[[ -z ${LINGUAS-set} ]] && rm -r "${ED}"/usr/share/locale
-	rm -rf "${ED}"/run "${ED}"/var/run
-
-	newinitd "${FILESDIR}"/proftpd.initd-r1 proftpd
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/proftpd.xinetd proftpd
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
-	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
-
-	docinto html
-	dodoc doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
-
-	docinto rfc
-	dodoc doc/rfc/*.txt
-
-	systemd_dounit       "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf-r1 ${PN}.conf
-}
-
-pkg_postinst() {
-	# Create /var/run files at package merge time: bug #650000
-	tmpfiles_process ${PN}.conf
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.7a.ebuild b/net-ftp/proftpd/proftpd-1.3.7a.ebuild
index ec1525dece50..926aa7970caa 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a.ebuild
@@ -26,7 +26,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 libressl 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/pureadmin/Manifest b/net-ftp/pureadmin/Manifest
index 990b3e0a03d8..6f3c5d388d70 100644
--- a/net-ftp/pureadmin/Manifest
+++ b/net-ftp/pureadmin/Manifest
@@ -2,4 +2,4 @@ AUX pureadmin-0.4-QA-desktop-file.patch 186 BLAKE2B 964d5fa4353b6514dd70f997f251
 AUX pureadmin-0.4-gold.patch 842 BLAKE2B 43a20608f3d86ae4fa0ad3b9bb21f17e0643521a15e727ff206dcada573aad24ad525c36bdb4dde4910d5e591f145dfe651d42a46f0ea2ac5b7da58724086f1a SHA512 1c6848987cf21c023cabecd8107d9f4292e704164c4330bd8c43217b7ebd1a6d74a5476c8ab1586e2a1f683f7e35926dfe8c3cbae91b01617e6689dc966e8851
 DIST pureadmin-0.4.tar.gz 386739 BLAKE2B e0699210d6f22f4043bd667e82993b019e8a58b16d42157be42f4497ee383e1da7935beca77491e105a1b3537ef1920cbe57b0cc8ce1e48fb30c01c491f9605e SHA512 46fd4caff0d6c123412478690411409038d5590cc7388993eed35fc33a34302b8310ae1ede971ed31cbf29ba4ef3b4c21ce5b8c9b225659b3110c6abcd1e78c6
 EBUILD pureadmin-0.4-r1.ebuild 1293 BLAKE2B d29a24337ed7162606ecdff73eca78c63695d7bbacbfa2628ad124c4aa43b12d03a6c028d5d439cd85cee0e9533a326bb4ee60b7f1f47892e945761852ae0128 SHA512 fb1889e5bb130b02c6d67471b4e125a1830389d88b00dfe293358e59876a9ca8cc8d4903d6735d57de0f1038dcfdf010ae85d4b476f2c73dc3bce5733fea1284
-MISC metadata.xml 351 BLAKE2B 12ae9cba9bfff7f31147307074ea8ecdd9e9fed5df1f19fda1e2000d64ad58a8b181a27418b0e69114909385f9f85b45d7792d65d36f820b9a0b75a9ba84d6f2 SHA512 572cec5a1abc7ebd7cb0db74ab3e3cadefe7c85ab92f38a76bbdf37049961eb2e82c8f392fca6c15cecc59a78b01237d1a760d0d6cf381b9ba19781537bcd86b
+MISC metadata.xml 243 BLAKE2B 92e4be4dc62f417ee02761d2b2c43ab9b95775a33959160c8ca1af42923063413b128c2169b5d10dfa5b9a14753686f2df8ce32648935924e2e985800b2d6914 SHA512 b51712ea8ad59d4f1138caaa9889a7f35c9b3dea5ba47ee1e93b44d66f4d4d1faee4f52ff95c9c09041593086cf8cb3ba5eeca655a58a754df5e9f956b6867f2
diff --git a/net-ftp/pureadmin/metadata.xml b/net-ftp/pureadmin/metadata.xml
index 674860b13fd5..c4ee328654fd 100644
--- a/net-ftp/pureadmin/metadata.xml
+++ b/net-ftp/pureadmin/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription>Graphical tool used to make the management of PureFTPd a little easier.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">purify</remote-id>
 	</upstream>
diff --git a/net-ftp/tlswrap/Manifest b/net-ftp/tlswrap/Manifest
index a90f1b817006..7604b5c60250 100644
--- a/net-ftp/tlswrap/Manifest
+++ b/net-ftp/tlswrap/Manifest
@@ -5,4 +5,4 @@ AUX tlswrap-1.04-openssl11.patch 1949 BLAKE2B 45b36c5f43285221cb2bf5d77f4ca18122
 AUX tlswrap.init 395 BLAKE2B c43439a23c748d820fb5375b6183b6f3a992ee9d0324e23eb85f9a2c938d6579bb296e332dd7e042b9355e75fd94b2bf6f91a625ff98b3169e95c4df13334b8e SHA512 6699101e5a628cf91013575e31f85c13a254854814240e7d7bf7006d1bb6f73eab8ecb80fe1d168e952c7c6ffc001495a6a6bc0e591de2e84d40591fccf02fae
 DIST tlswrap-1.04.tar.gz 129507 BLAKE2B fafbe0185f3b2e1a440cd1ad3892c005435eecc371ecd5094d81f3dac08f1c6186cd5d873e02ae35d9dfb987168ae0c6c7a4233420c874d171d3a8fe8004e885 SHA512 f6d2a54cd77fef42174726cbe7ddd5109bb8a9c2289ddf22eddb2d240edba4a5de2e857d940ab44298e4c48da142e638d9b91fd971e5f328a36c6a557f4a257a
 EBUILD tlswrap-1.04-r3.ebuild 820 BLAKE2B 9a7c1a4be52bfe44353575b3a6ebe59d6448da1d1d2e084795bca7e37a98e0264cfa8c7541bbad106f907b18fcb6020f8899c6aa01e2dc23eb8f4732c0114925 SHA512 1d90fa0ad9bd65b7a7a77a08801302a65f786b247f0c6048af52774737546997153367015a735506d938a6ef63fc06ae7eaffa42ee81ce992efb676222ef88f5
-MISC metadata.xml 305 BLAKE2B bb4951030887c06d701bb0906badf2ae1ece916b99cfa5b1cd76c09ba49122325cfb721c868519c4eac297f71b564598e56c682564ccc6c6575e6fd9a113d506 SHA512 4a622677eeb69709c3ca1f15cadadc536f5478afcbcf673bd0f4247c9f8f099f267343634c61942104989dd428b39082fd05b4d048694c55698a5e30a9530c95
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-ftp/tlswrap/metadata.xml b/net-ftp/tlswrap/metadata.xml
index b960b5a2c17d..7a38bb900964 100644
--- a/net-ftp/tlswrap/metadata.xml
+++ b/net-ftp/tlswrap/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		TLSWRAP is a TLS/SSL FTP wrapper/proxy which allows to use TLS with
-		every FTP client
-	</longdescription>
 </pkgmetadata>
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index fc711fa16a3d..b625c1da487b 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -17,4 +17,4 @@ AUX vsftpd.xinetd 321 BLAKE2B 3a91c0e65a511ed5ca0feed429550b0ce6e1bd2cc133460e26
 AUX vsftpd_at.service 328 BLAKE2B 826daeaa5b388273c6cefcfcee7415353773db5b9937b3ee714bcf76dd8b061c0693bc9d4b60742fcf5cc946543e69dbb7caacc4ba07b5503d8b66c7db4174df SHA512 5a39e853405bd5028f2c52183eb91ad559fb8edbaacfff5d5146e686417c208bb894bd86d5830a61720a1aaa9ba901160c75ed2bf47eec459b2a49ed217b9cb1
 DIST vsftpd-3.0.3.tar.gz 196649 BLAKE2B dbf96e788494c29d78ca49fad6a03641c9725f9a5b01a4059ad009870fdc28520cd467cd8288a8a9a520c411c495a42c3fff57ee1069efc65840adb245792dca SHA512 5a4410a88e72ecf6f60a60a89771bcec300c9f63c2ea83b219bdf65fd9749b9853f9579f7257205b55659aefcd5dab243eba878dbbd4f0ff8532dd6e60884df7
 EBUILD vsftpd-3.0.3-r3.ebuild 3692 BLAKE2B 3ad2c105fcd94f52d1f629b01aa25578508507e7e97a7a5d2ab97632760f3a504f378c49790ab47e4124470f914326831a2b2213ce408a349913de1bec9b9123 SHA512 ce9508fb84021805449dd80973a07e602f8a26c04ca591efb0594f7b41018c32a80ab39c42d15e110d0af4ba372e4442a6180c9f7d3245df4a8a304730dccfa7
-MISC metadata.xml 289 BLAKE2B 3792154c21dd99e4a6e68a711493e3086ddf124a40275c43d8d6aca47f01dd76e7992eea16b235302d83529483a13843c8fb254ae2e436e9c2bd398908d65bcf SHA512 89cacd404713612a2347edb25dccf6c25c565d2b18ecdceb8614b5b5c5a913cd5ac0fe0b2ca32918854a69817e7b43300612eb6248655b59cf147b6d03922360
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-ftp/vsftpd/metadata.xml b/net-ftp/vsftpd/metadata.xml
index 6d628fb373e0..7a38bb900964 100644
--- a/net-ftp/vsftpd/metadata.xml
+++ b/net-ftp/vsftpd/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Very Secure FTP Daemon written with speed, size and security
-		in mind
-	</longdescription>
 </pkgmetadata>