gentoo (leap year) resync : 29.02.2020

26 files changed, 419 insertions, 613 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 44a01377dcce..6d5188f39cd2 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 9bd11fdb7cdb..04dc88f3b286 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,12 +1,15 @@
 AUX filezilla-3.22.1-debug.patch 349 BLAKE2B 2a38aba4ddc49cbe97d3d6ce1348d94588a3bb2821ad1643e5e5d43cd18adfe5911309a24822368fd38176aaf2af99d7b098864bc5ae2d6f94ffb481a4d25340 SHA512 009946fbb676698e404b1c91bb6b14767234751cbecb7faa097692b382a65af7ab31b54f1aac81fdb72c1492db4698d24f5fa9b1966f69bffa1f4b6073283e00
+AUX filezilla-3.47.0-metainfo.patch 309 BLAKE2B b36d7f3e5446c76cc9e20be01b3a5005f140bef005b264c2956485cc9c33ed76d05319b53f51eea2b57606a6573e802e52bee94d373baefb5a317fcddd163090 SHA512 32e1a9e41dcd01322fd75cdb5d5bf16a1ce1241266d52a39e017c5eff64ae06592ae6799acfc6aaa935eb61023efc5fb3fcfadd43a9765a309a12c3fa3ee725c
 DIST FileZilla_3.39.0_src.tar.bz2 4995713 BLAKE2B d89aaa1f57187cd926ae1c4dd34624b404baa291334c652293d2dcfaedc4a5dffb401f8727b5d5d1fb483bdd503f35124efb75bdd7dd750d68e517fcb57fb8c0 SHA512 a0360634517ffd07878082abae024dbb4896035edcbd9abe6d8adfc9d37b73d01d95f6c5ca031175d88b6e4badefafcc43b5ddce3d9dbddde4deab5f0cc97e83
 DIST FileZilla_3.44.2_src.tar.bz2 4619337 BLAKE2B 11d61b14fcf464706dabe491fa8cbfa28fb516c3e1aafd887679ed6f1a80ba835dc43403c32b1344854f00f5b56f7e27c72bbca197cfadc92e69d92ebb0b1458 SHA512 9d4678a3a06f0ecac5ecfbae33f83df5f07e26da4f4a7e922fe5b00a5e59d5728af028667f6fa56210a23ecaa1c2a661d1874b218c2511a783644ed2b03e36ad
 DIST FileZilla_3.45.1_src.tar.bz2 4649083 BLAKE2B 8d3113e5ce96d2115a6ec02109f2617d3d58109464c527284baecacea733d2f564206779cd32be4060171d7fcd8768b0296b445842b8c2964b173ca360983082 SHA512 feb267b85ad2843baea0c6df66ed86866121f33e2295fcb9003a8bc2603ad684f4fe801ea842cb291e3fb5cd7195ccb2d21bfa95711a61be6b4debfd4e1c7822
 DIST FileZilla_3.46.0_src.tar.bz2 4661100 BLAKE2B ccda60b590e85afd7de0edd064ee7b993e663e43643f262378db6d26a019730ec493518e0e2b39bce0710acafe888f47f84ecb098e35d3b32061f089a99a6a30 SHA512 26ffb039b4a6d51d6d1011ee452f3690f74514c91a9e58c79880dbf778296cfc81283fade52f65f81654b828449e2b7e703b1d6c1e2e84c08f54681d2aa92674
 DIST FileZilla_3.46.3_src.tar.bz2 4720329 BLAKE2B 92369d2fb3b8c9eded37f912bbd25a0e995a5fc1ab86ef6aa746a8eb239f17e8fafa78de00529b0f3af102fe268b51a60ce40ac967cf9b2fbbd6fa7900898ffc SHA512 35b61c3bfd1d40848e7846b4533da8844df0e4873cb89286b90330cbc29dffeff96fcab10aec908a08d9129198bb2d80df8f223d8ebc1a0863a4083cb06abffc
+DIST FileZilla_3.47.1_src.tar.bz2 4732088 BLAKE2B 3db5247a9e2d9a7bf296091317b8faf049dbe9dca328536671dba5e5ab7b32d16d273348d0cbcf89342262a34dcf7d90198b4dfb98e67bfb683febf07b7b680e SHA512 32573e847bc23acb86bdea8eb4de102e4f673465e0b86738d954b47eacdf6e534854a9065bddf8b586eba315bf65b1bfc4f17f9379819a6c9bd43ae6ed8f388a
 EBUILD filezilla-3.39.0.ebuild 1830 BLAKE2B f3456ceeac58ed5fb0ebdb16091bdfd64282112179c74849cdef2750ef8b70217a747945f193b4852568c0cd7d022e155e3d5a9e8c829162c4405a09fce05576 SHA512 76ecbf6aee36f8000fdbcdfdee9fbc55628c5b6885148d4726a3cdc64be9a21272c0351fd39315fb54aea7215d7a5b5f71828fb7359aae201a5422f8a9c4ce5d
 EBUILD filezilla-3.44.2.ebuild 1884 BLAKE2B 5175bcabdcbb34dc8c6c2ee967b4aa2a487f04a5148469656b8f8014e325d5055cef22103d808a92d2323549b02d1b2cc8fd3a02fed89109ba604b36f378596d SHA512 25ca53bffa1e9729e4f9f3613f7b81582842fdd1bd076905a841bf1f993b8564d67833691316281f4603a6c93ac573ec626431e334d7f2de6d97a09ccb3d2485
 EBUILD filezilla-3.45.1.ebuild 1888 BLAKE2B 3a89bb7289cdb392e74572a707621c30afbdfacb3cb93510d18683a07039b286ede6ee8b62c63ee64f1c31bf1bc80f959a0fbbbcbbf2452cc46b87abf3c50c6b SHA512 ff7bdce8a143dd46860cd112283f69e02251b79879c12e850945b0f03af97bcbfac4400b789cc045c735d01bd2fde9203e58a0019fe2fe502a318fdb29dd1e51
 EBUILD filezilla-3.46.0.ebuild 1888 BLAKE2B 9682974c356117d373fa3b0db1f702689e779703152651190d5d667131cd6f2c573943e485d79221e2c86d5bb751035df2f91bccad436e93ab2fc37e002c13ce SHA512 cc272b8acdb871132fba72529fd3afcedae057502da09eb00b4740e21dda814a68d534c3697ceabaa288382cf266877abacbdd78a5082a39a7afc89b482a1be6
 EBUILD filezilla-3.46.3.ebuild 1895 BLAKE2B 62393dba06d50ec02917d54851592ae850b4a919c9e85137684904fe913be20e2cff1b00a547e237fcb556204e6f8ebc33043c61dea30b5b5fbf19ba17ea8b02 SHA512 53f08f568ae779249224d664c48093663cf00c0f6fdfd0020283da2713c44fd104ddf7349815b5bae3e21709f459f62c1bc858ef11c2bce1527de99d400cd0c3
+EBUILD filezilla-3.47.1.ebuild 1938 BLAKE2B 6ed7c1e29b623d3a27847ed154b4db6ba0decc1b0e5f32099d36656f88daae0823bc29aabc7ac250149e62aa506dfeb8146f3b39bfab250f5bfeeba679eaa001 SHA512 939329857bcc97baa25909bf39639b46b8a22ed09202a0e26d53a9d468d616ab3f165fc05cd7f9ae6063ffe57ca570cc603b3776a62c04662761b4f955ffc4f8
 MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/files/filezilla-3.47.0-metainfo.patch b/net-ftp/filezilla/files/filezilla-3.47.0-metainfo.patch
new file mode 100644
index 000000000000..309c66815e3c
--- /dev/null
+++ b/net-ftp/filezilla/files/filezilla-3.47.0-metainfo.patch
@@ -0,0 +1,11 @@
+--- filezilla-3.47.0/data/Makefile.am
++++ filezilla-3.47.0/data/Makefile.am
+@@ -75,7 +75,7 @@
+ desktopentrydir = $(datadir)/applications
+ dist_desktopentry_DATA = filezilla.desktop
+ 
+-appdatadir = $(datadir)/appdata
++appdatadir = $(datadir)/metainfo
+ dist_appdata_DATA = filezilla.appdata.xml
+ 
+ clean-local:
diff --git a/net-ftp/filezilla/filezilla-3.47.1.ebuild b/net-ftp/filezilla/filezilla-3.47.1.ebuild
new file mode 100644
index 000000000000..9f99a47ff441
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.47.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools flag-o-matic wxwidgets xdg
+
+MY_PV=${PV/_/-}
+MY_P="FileZilla_${MY_PV}"
+
+DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
+HOMEPAGE="https://filezilla-project.org/"
+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"
+IUSE="dbus nls test"
+
+# pugixml 1.7 minimal dependency is for c++11 proper configuration
+RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
+	>=dev-libs/nettle-3.1:=
+	>=dev-db/sqlite-3.7
+	>=dev-libs/libfilezilla-0.20.0:=
+	<dev-libs/libfilezilla-0.21.0:=
+	>=dev-libs/pugixml-1.7
+	>=net-libs/gnutls-3.5.7
+	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
+	x11-misc/xdg-utils
+	dbus? ( sys-apps/dbus )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-1.4
+	nls? ( >=sys-devel/gettext-0.11 )
+	test? ( >=dev-util/cppunit-1.13.0 )"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+DOCS=(AUTHORS ChangeLog NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.22.1-debug.patch
+	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_prepare() {
+	setup-wxwidgets
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-autoupdatecheck
+		--with-pugixml=system
+		$(use_enable nls locales)
+		$(use_with dbus)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/net-ftp/frox/Manifest b/net-ftp/frox/Manifest
index b336cd69ceb2..8363d4921361 100644
--- a/net-ftp/frox/Manifest
+++ b/net-ftp/frox/Manifest
@@ -3,6 +3,6 @@ AUX 0.7.18-respect-CFLAGS.patch 332 BLAKE2B 14e47c8f0362bb69293163f9f1964cfbf494
 AUX frox-0.7.18-config.patch 1960 BLAKE2B a6ca1b8bd15f39a3dc5b3b10cb4a578447ce306f9f82262e99ead6a57bceb007da44172648e66fde609e4c71c839625b4ca28b35d8fd8750d8b9b0334f0a7b82 SHA512 69210560adaa38cc94960f4e76ba4ae9f20b5044c0d3d84e835a107554ae3f5315f9463c7730ada716c63615cab782d140e8df8c2b9f9bcf6e844a7bd7033666
 AUX frox.initd 873 BLAKE2B 1f4182a11bd42d091b9d6cbba4b2115327766787f329c6c113e43070f8fc6a8867017bdf009a2c97a94b16e958888384dc604dfc06ecf5df0cc711f212b11d76 SHA512 26bc18f28cf46184b0c387196958f9236ec0cd70fe43ac8b18de66e69c42d73087ed5063f3ecc1b1d5c0880b2047293403e4cfbb15f5a23ca5d6fc521021f364
 DIST frox-0.7.18.tar.bz2 173355 BLAKE2B 70e51ef14fd16dfeb8c2b8c42acf32b4fc8456622f6258aca7faee49e59ccd4e3cb563620a50a4cb877401d9154311dd2f88e76a94c48974bf9b77ad558a6d9f SHA512 bdffe4b70c91b920378a422dcf386088c3bb34f26e10de8ff57f487ccef6356803c93057eee2b3801a79120a6b2e1618a51dde5bc8c42e13211abf4182c4ff8c
-EBUILD frox-0.7.18-r5.ebuild 1867 BLAKE2B b2094fde34f507c376028d1364ee3607f9a0f4a19190bcf18d080aa9d740729b18c958041ccbb4ae9403cb3df6814389292054fc0ea1d697b3930f2e892a4958 SHA512 052b7ec3c474dad56403188bc69f377752d6f9a24d40f87c25c54feff23c9d4187c61fff0dd759c09eb0326e2719b425a6165c370e57e299bc8ffb1967ba6f57
-EBUILD frox-0.7.18-r6.ebuild 1976 BLAKE2B 1dbe36ae4d591c745e8166c741a8e7525ffe9d52f07634e920517a953fc5043e663b8c496e826d12f2387b6ea799435fdaf2d1311796ae46b263427dccbce07b SHA512 e998e2d9a6a548756534994bfc7359b983fe3d6d98dc208398a9ee366132cd1da50ca7ff0e760c9f86350c6ebb201d5e6c9e7043c832b7c8087ea0f515412c6f
+EBUILD frox-0.7.18-r5.ebuild 1863 BLAKE2B 48fba76ac94415e82046d0486d9afe2c4b84a6e2e1694b7a30b9bda22ee70a373fa1a055fa5ac8865d0a344a85e8b9dcc7fa3dc892e8ac96239476dc843be63f SHA512 3490ec5fd9d7e25825b8d69ee23113dc565b2d7925b335441ce0b2b54051ce7d1d75e148a23f7471d90dec0d85af0ed8e78233c141f067183e28d5418f1acf98
+EBUILD frox-0.7.18-r6.ebuild 1972 BLAKE2B 003ece373a12d8e295d874b1d042455d5878c5c2d240351c22e27db03c06086c75e75eef21423e1328a265e0d17d01b7cb9078c42a2865ad2abb72179966e4fc SHA512 883072a3b61878ee675f4c0093ae0358b948c99e0f4814c2d545cb44ce62fccd63c0dcc6ecb99705a96946d00cecba3d476633a4ade6dc7b2e72cae8b846b612
 MISC metadata.xml 656 BLAKE2B 0df7615c3cc7c5abf83bd69242e2ef175436f184858a7c7501f9328ff29a0c131622142ff89764069de5c3a90299b46b9192b8152bad3f00578722349cb0ce07 SHA512 c4e9a07f7e868c032e8830b70d3ccc876a54d685790e74aac5ea5554710af473004a176ffb9501e87fa6b32010464e274a111f34f318e12be97f86a96df58f3a
diff --git a/net-ftp/frox/frox-0.7.18-r5.ebuild b/net-ftp/frox/frox-0.7.18-r5.ebuild
index 6ae5baf2c80e..7bcc20fb9761 100644
--- a/net-ftp/frox/frox-0.7.18-r5.ebuild
+++ b/net-ftp/frox/frox-0.7.18-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,7 +35,7 @@ pkg_setup() {
 	use clamav && ewarn "Virus scanner potentialy broken in chroot - see bug #81035"
 }
 
-src_prepare () {
+src_prepare() {
 	epatch "${FILESDIR}/${PV}-respect-CFLAGS.patch"
 	epatch "${FILESDIR}/${PV}-netfilter-includes.patch"
 	epatch "${FILESDIR}/${P}-config.patch"
diff --git a/net-ftp/frox/frox-0.7.18-r6.ebuild b/net-ftp/frox/frox-0.7.18-r6.ebuild
index 0a5b6ace383a..943286654f7b 100644
--- a/net-ftp/frox/frox-0.7.18-r6.ebuild
+++ b/net-ftp/frox/frox-0.7.18-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,7 +37,7 @@ pkg_setup() {
 	use clamav && ewarn "Virus scanner potentialy broken in chroot - see bug #81035"
 }
 
-src_prepare () {
+src_prepare() {
 	HTML_DOCS=( doc/*.html doc/*.sgml )
 
 	default
diff --git a/net-ftp/gftp/Manifest b/net-ftp/gftp/Manifest
index d7c2b24cec40..7c8a5ddb43e8 100644
--- a/net-ftp/gftp/Manifest
+++ b/net-ftp/gftp/Manifest
@@ -1,5 +1,6 @@
 AUX gftp-2.0.19-desktop.patch 837 BLAKE2B a9199ab915aa43dfc9138066da05524020a443f8053aed3e71a910df947f912118f2d82988580e91c4d06c3c3d9169157f887e2f96f26db1f122c5b0033a25e9 SHA512 c71c10eca36e767e4778c4664723f04ea23a20cb6b96e2b0e45c439ed83a1daa325919683663695c17ab26317021090d4855f9f5b6e952f70a400980b0ebfe69
 AUX gftp-2.0.19-gftp-expand-path-sigsegv.patch 640 BLAKE2B 4733b21dae4e801ac9b22c0bf460f0de23ffcc95ca184035cb19ca331e84a0deba9a8d22c8aa67b279cb3b92f9706a08bede3e374659b296598ad5297b3a0e47 SHA512 4ee09d50955fc91dea33bb71d8bd65a7c481f02c7bdf6dce53bbd630307c2ab898b533babe7597b1e434d0defdde3be6e145c0c5344d21e8a23c1537eb5f2bbf
+AUX gftp-2.0.19-glibc-2.30.patch 908 BLAKE2B 3bea073b519b2fe64571ef58a2bbb10b978ad7615ef7cbcce8448eff97db186f21153171e405181f275f73a0cfc274f9d048030da2ae18b9f5e535b93626444f SHA512 ec024c09e06874ac955b9fccae3fb95b05ecab6da186a9e28c4802dbc3f14d95d32d44dc60e7152b1560517a8971f61859aa715b7802ebe0884823112ab68fdc
 DIST gftp-2.0.19.tar.bz2 1687167 BLAKE2B b7cd5409c7dfe4672a383417554c39a848b9afa341de498eea76bd02a2099559f14d7d0ceebe13d52842c311a4b242a0d558aa017dd7062a3369a7c2c3af19a0 SHA512 59968786d66aaf6fb520f73d52ed0f8b57751a5ed222a5c65a7257628cd9addfd0ff3213206311bfd24441d7e6cc6d245d74d6687a1ad9739361da61ca078172
-EBUILD gftp-2.0.19-r3.ebuild 933 BLAKE2B 422c0c19eb70ddc0c631ac93d74a90b03a2841fc0d351e272b648099f5e283933748c564f589de107478be18a1c61de2a3eb99969155405b728ee6ad331d1955 SHA512 b72dc0a2bfc77ad712218caa37ee8ab93c8bc561494aa56e6875bdb51d663a10ed319ae7c238617210bbf7223a386bc44e5b025e2c81654ea047b5a33936897e
+EBUILD gftp-2.0.19-r3.ebuild 1002 BLAKE2B bea749f75d98f7a7f5db3b9b4f6a79aee89c4bfea076a9e9ded89f01a7dd1b8b3bd935c29a999918a965ad3aa3c443e9239274ccaf08bed574f30ac932f6fa5c SHA512 5f3c25ac0cac0e32a65b8c1f43ce0bd0780601a69a042b69577a95fde7a2f8f4cc7205d0345de1de6e0424382a44d17e39422c648e85cafd685bd079c3edef10
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-ftp/gftp/files/gftp-2.0.19-glibc-2.30.patch b/net-ftp/gftp/files/gftp-2.0.19-glibc-2.30.patch
new file mode 100644
index 000000000000..ee1d596a03c3
--- /dev/null
+++ b/net-ftp/gftp/files/gftp-2.0.19-glibc-2.30.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/692230
+https://github.com/masneyb/gftp/commit/371c494a34c1820544d6563fb7ef5ca51a0ee199
+
+From 371c494a34c1820544d6563fb7ef5ca51a0ee199 Mon Sep 17 00:00:00 2001
+From: Brian Masney <masneyb@onstation.org>
+Date: Thu, 21 Jul 2016 05:05:18 -0400
+Subject: [PATCH] fixed compiling on some versions of Linux. Patch picked up
+ from the Fedora Project at
+ https://github.com/repoforge/rpms/blob/master/specs/gftp/gftp-stropts.patch
+
+---
+ lib/pty.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/pty.c b/lib/pty.c
+index f7cb1f9..f9d609b 100644
+--- a/lib/pty.c
++++ b/lib/pty.c
+@@ -61,7 +61,7 @@ _gftp_ptys_open (int fdm, int fds, char *pts_name)
+ 
+ #elif HAVE_GRANTPT
+ 
+-#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__))
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__linux__))
+ #include <stropts.h>
+ #endif
+ 
diff --git a/net-ftp/gftp/gftp-2.0.19-r3.ebuild b/net-ftp/gftp/gftp-2.0.19-r3.ebuild
index 57a51c790a94..a79b3a00b48c 100644
--- a/net-ftp/gftp/gftp-2.0.19-r3.ebuild
+++ b/net-ftp/gftp/gftp-2.0.19-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,9 @@ PATCHES=(
 
 	# https://bugzilla.gnome.org/show_bug.cgi?id=740785
 	"${FILESDIR}/${P}-desktop.patch"
+
+	# https://bugs.gentoo.org/692230
+	"${FILESDIR}"/${P}-glibc-2.30.patch
 )
 
 src_configure() {
diff --git a/net-ftp/gproftpd/Manifest b/net-ftp/gproftpd/Manifest
index 73698ae6ebb6..d48e56e689d4 100644
--- a/net-ftp/gproftpd/Manifest
+++ b/net-ftp/gproftpd/Manifest
@@ -1,3 +1,3 @@
 DIST gproftpd-8.3.2.tar.gz 605797 BLAKE2B 76d15fb01fb73ebbb639e4ecc6ddf8399ef5bc2b904fb5d2ae433aa14c40db49d9b352ffdf558d45aa784b21e5248dfc453d2f87863c3c886dc2cd6c746d6109 SHA512 71a3b80b2bf18ec17719b1484d45fb6110764d28492edafcd97538ad99ad7cc182ed25723b721226329b61f29e511b48e0153cf01f90c3c7f5ce939f7b233f59
-EBUILD gproftpd-8.3.2-r1.ebuild 1468 BLAKE2B 8befcc7caa53b180c10111b74fba19f263911f892a98055486f5a40eb7db77bcb1d2dfbd50a28d76106a1e81d6faca2cf8a45de59145b0ce4d06aaf14f836683 SHA512 bb2a0c5f4784109796549dce1396c675b6721dd720556548de1443f4f1dcfbfb4ce728b32c8f5c325628830f38d0f50c9e29475fd02936993403510ecd8aa21b
+EBUILD gproftpd-8.3.2-r1.ebuild 1464 BLAKE2B e6ac1423d2b72bcd3af9f0b34bea695d675568a313a2131e14b775f68c2ead076f4a03d4173c430f397a9f5d3ac3279c6233ebc5d5b4ce31a08c1a786ea17c69 SHA512 499040c17b64e7d89c79e681df93664dd422caa0b140b8680f7ec514b40cb1bd2448c211af1f575c120399cfac1acd87bf1d910f989aabf430fe6c6433dc1523
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-ftp/gproftpd/gproftpd-8.3.2-r1.ebuild b/net-ftp/gproftpd/gproftpd-8.3.2-r1.ebuild
index a41eee3c7d3a..a67b5076d1b1 100644
--- a/net-ftp/gproftpd/gproftpd-8.3.2-r1.ebuild
+++ b/net-ftp/gproftpd/gproftpd-8.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -41,7 +41,7 @@ src_configure() {
 		--with-includes=${includes}
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 
 #         Add the Gnome menu entry
diff --git a/net-ftp/oftpd/Manifest b/net-ftp/oftpd/Manifest
deleted file mode 100644
index f605358c57f9..000000000000
--- a/net-ftp/oftpd/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-AUX conf.d.oftpd-r7 978 BLAKE2B a2bc79f57fdd7f9f1f127ad7606b44330afd41c32acae998d86eead6871724c371f438cd03aa89b68f9124cae2a7673e454497c721405e31d7e53948bc0d4617 SHA512 6f864b2a6010cd81e0f767bc769200a26793540f77f95deb4678254d48acb93814eb214e4d3df46825c647483fac1bfcbdfd1c32d4da11af6596331408f75e0f
-AUX init.d.oftpd-r7 526 BLAKE2B 307a2e104555815cf833a5adafbe3d2fd065ff18efa33723b3d0e246f31e4a267d957a2531fe8c034d2e11bb48f17358ff5d6a3c28962b028f4f7d0fe3331bc3 SHA512 be48a7a04be71eff0330dbea622d79b15d75bf033de901158199862c8c049a1126021a069009152b938a8c55138c36db7862410f836570c65d2729f737112142
-AUX oftpd-0.3.7-delay-root-check.patch 778 BLAKE2B 90935612d7bbd82cc13cdac7f0929b76402b5d9b6b7894abc3217accec76cbe06c41f1de3e07d7b982cdbc0304824136461330ac1320ead837faeaeb98787ea8 SHA512 ea420fdec8df42d6482bf41409571769b1f4011e2bcf9157cd32f68c68c582edd0908cb13286618248647922023f72b029a4523464ce15a5adbfa4ce0bb9f326
-AUX oftpd-0.3.7-error-output.patch 706 BLAKE2B da3f667f837cef0be59939939e46d0739db3b7c92829157e35786b61cdde23ab904220306c606568edf7e42d3f8d5620ea0ef60f7799f96bd3e503d42e2dd2f7 SHA512 36c996038784a0e6b6a17e1f52c346dde741f812588254441c3419f0859daf63c75135e156684f014a576315560da0227aa184870edb3a0c95a18968d9e62a52
-AUX oftpd-0.3.7-family-1.patch 936 BLAKE2B 6609049281ce1886f29a81b4d68a08e64e1cd4e5e7265958fe7e154a904183c5b9d14c9761b82f8f876da6390aa94250e84354dc0fe696c5c7138bc94747d735 SHA512 045eb48da94b3f888ff3f9dab17170338d078284d136d2fb684fac09dedaef55dd186080a520072bf2906be17770f70e66a311e19b86da766f49fe68174857e2
-AUX oftpd-0.3.7-htons.patch 458 BLAKE2B cacdc7339f3d6e1005a9539d3ea4bbcd8bb1c419c881b907a44d7d17f0bb0cdf88f7cbe619b4c099d548f08d5011fa139dcf8c40808264b8ca2618117e6e2b72 SHA512 75da3b40206b5c495a2edab531d6c7d2a41e30729a03605e514ec12e20499e4f7f3fb03859b19c5fc5cdb1ea591243abcbf18decefddc03c977254a924ff2109
-AUX oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch 14107 BLAKE2B 800e260b7c89f96f451d8fa2b12a963736ad25014e255e8bc3e2d0988e1f77606542b57f6f9e7b0cb03a53cac5fc964bd555ddddf0d82b38c17fff0c3a8177b4 SHA512 c752bdeb0227c036268e3840c3aac9a19e875b9fa37e4f6440211aed312c42836982ff7e8a8e97a1f12f172552f96b290fb17bb139ded5d75999d49270facfc8
-AUX oftpd-0.3.7-pthread-cancel.patch 797 BLAKE2B 07b08302c9cb1b50454031c16b2b01d1e42523e11bc530771c452c223408134bb53483d938face450037c84a1a9dc1c58f3a09fc79774d8053aa44c61a1307ac SHA512 7920c04bb3eb5ed3b832d140d7ff7808c3d214f804a04569706815d07fb505b7134d283c944c5a76fd64b1da55820ccda872d89a3be6e2363e31a386c320a161
-AUX oftpd-0.3.7-unistd.patch 448 BLAKE2B 4f69ab2c867f2c443c0a5cfc0637b92a486a757d43a39d5b02ba81ebde87535949e4d0f6e5afa9a0d7c248477746f917a92091ca36d764f1896f60a007495662 SHA512 0e0ad78eecb9f2be425fcda44e624fe118ceb0ccb094a05bce96a9bb1268bf58e4a8efab553e767d4ad2165e9bc5b360f5d36ad28b21ccfee35f9a2809a96d7e
-DIST oftpd-0.3.6-ipv6rel2.patch.gz 12478 BLAKE2B 1d367979261fff05bdfa22201cf06ae537d7bc7cd656708cd2c672b8c437ec8b42d94c84c387ee450da140feab4af98e4601a1126077acdd93959284a28548b2 SHA512 76d12b82424a9a338f151534df55310511d3138a1e80851e6ebb8f4a841cd075892ab1a02851d871772a2229c107ec35de2d5fb3572c72207a65629e10e55dba
-DIST oftpd-0.3.7.tar.gz 97364 BLAKE2B 4fef7204d905d248f5fbf1e641d015c0549dfcc08b0ad98ac3557250ca91dda2e25d0aaffe09c9d68d47318b977a637f693e5bbd359c20e894a656a412fccf59 SHA512 36bfd15dbe84043aee9678acbcc2c1312091887b381bee36a6a57f2516a5ec742a1733bf570c7cc71aaa28bd053d686976e6bfd549443a8bb398f8176db1a6a8
-EBUILD oftpd-0.3.7-r10.ebuild 1300 BLAKE2B a91dac4853eafd26eee790ed50adc993ba0a9dc4ce4ae76c52c2b3db4ec42fdc81f1593908c20ada6a1f2876d6e6bcc6ae07de300a452d8ef273baf81902fd1f SHA512 b7a7edeb28fc46bd16d574b67ad04248bf7c6b023cd7cf539a876e13949a50e2842014b7ba0e10b36a72370f6cfec1054b44151f8e8191fd7922dfe4dda81a8b
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-ftp/oftpd/files/conf.d.oftpd-r7 b/net-ftp/oftpd/files/conf.d.oftpd-r7
deleted file mode 100644
index a8daed0f4f53..000000000000
--- a/net-ftp/oftpd/files/conf.d.oftpd-r7
+++ /dev/null
@@ -1,26 +0,0 @@
-# Please read the oftpd(8) man page for a more detailed explaination of these
-# variables.
-#
-# FTPUSER (user-name in the man page):
-# Set this variable to the user to run the ftp daemon as
-FTPUSER=ftp
-
-# FTPROOT (root-directory in the man page):
-# The server uses chroot(2) to change the root directory of the server to this
-# directory. When a user connects, this is the directory that they  will start
-# in, and is the top of their directory tree.
-#
-FTPROOT=/home/ftp
-
-# FTPPORT (TCP port)
-# 21 is the standard ftp port, but you can change it here to something else
-FTPPORT=21
-
-## Uncoment this line to activate oftpd service
-# Note: in order for passive connections to work, you must specify an IP address
-# here with the -i flag.  You can make it listen to all IPv4 addresses:
-#  -i 0.0.0.0
-# or make it listen to all IPv6 addresses:
-#  -i ::1
-# By default, oftpd listens to all IPv4/IPv6 addresses, but passive mode fails.
-#OFTPD_OPTS="-p ${FTPPORT} ${FTPUSER} ${FTPROOT}"
diff --git a/net-ftp/oftpd/files/init.d.oftpd-r7 b/net-ftp/oftpd/files/init.d.oftpd-r7
deleted file mode 100644
index 3a395c83712c..000000000000
--- a/net-ftp/oftpd/files/init.d.oftpd-r7
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ -z "${OFTPD_OPTS}" ] ; then
-		eerror "You need to setup OFTPD_OPTS /etc/conf.d/oftpd"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting oftpd"
-       	start-stop-daemon --start --exec /usr/sbin/oftpd -- ${OFTPD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping oftpd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/oftpd
-	eend $?
-}
diff --git a/net-ftp/oftpd/files/oftpd-0.3.7-delay-root-check.patch b/net-ftp/oftpd/files/oftpd-0.3.7-delay-root-check.patch
deleted file mode 100644
index 56ab51e4d6c3..000000000000
--- a/net-ftp/oftpd/files/oftpd-0.3.7-delay-root-check.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-check for root after processing args so non-root can run --help
-
---- a/src/oftpd.c
-+++ b/src/oftpd.c
-@@ -56,12 +56,6 @@ int main(int argc, char *argv[])
-         exe_name = argv[0];
-     }
- 
--    /* verify we're running as root */
--    if (geteuid() != 0) {
--        fprintf(stderr, "%s: program needs root permission to run\n", exe_name);
--        exit(1);
--    }
--
-     /* default command-line arguments */
-     port = FTP_PORT;
-     user_ptr = NULL;
-@@ -187,6 +181,12 @@ int main(int argc, char *argv[])
-         exit(1);
-     }
- 
-+    /* verify we're running as root */
-+    if (geteuid() != 0) {
-+        fprintf(stderr, "%s: program needs root permission to run\n", exe_name);
-+        exit(1);
-+    }
-+
-     /* become a daemon */
-     if (detach) {
-         daemonize();
diff --git a/net-ftp/oftpd/files/oftpd-0.3.7-error-output.patch b/net-ftp/oftpd/files/oftpd-0.3.7-error-output.patch
deleted file mode 100644
index ab62220b553e..000000000000
--- a/net-ftp/oftpd/files/oftpd-0.3.7-error-output.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-fix writing of the error message to stderr by processing the varargs
-
---- a/src/error.c
-+++ b/src/error.c
-@@ -23,7 +23,6 @@ void error_init(error_t *err, int error_code, const char *desc_fmt, ...)
- {
-     va_list args;
- 
--    fprintf(stderr, "error_init: %d %s", error_code, desc_fmt);
-     daemon_assert(err != NULL);
-     daemon_assert(error_code >= 0);
-     daemon_assert(desc_fmt != NULL);
-@@ -32,6 +31,7 @@ void error_init(error_t *err, int error_code, const char *desc_fmt, ...)
-     va_start(args, desc_fmt);
-     vsnprintf(err->desc, sizeof(err->desc), desc_fmt, args);
-     va_end(args);
-+    fprintf(stderr, "error_init: %d %s\n", error_code, err->desc);
- 
-     daemon_assert(invariant(err));
- }
diff --git a/net-ftp/oftpd/files/oftpd-0.3.7-family-1.patch b/net-ftp/oftpd/files/oftpd-0.3.7-family-1.patch
deleted file mode 100644
index 490612d8752e..000000000000
--- a/net-ftp/oftpd/files/oftpd-0.3.7-family-1.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
-Date: 2010-01-05
-Initial Package Version: 0.3.7
-Origin: http://gentoo.mirror.solnet.ch/net-ftp/oftpd/files/oftpd-0.3.7-family.patch
-Upstream Status: unkonwn
-Description: dont crash on wrong protocol family
- 
-diff -Naur oftpd-0.3.7.orig/src/ftp_session.c oftpd-0.3.7/src/ftp_session.c
---- oftpd-0.3.7.orig/src/ftp_session.c	2010-01-05 21:56:48.540303543 +0000
-+++ oftpd-0.3.7/src/ftp_session.c	2010-01-05 21:57:29.995553119 +0000
-@@ -708,10 +708,12 @@
-     if ((((struct sockaddr *)host_port)->sa_family != AF_INET) && 
-         (((struct sockaddr *)host_port)->sa_family != AF_INET6)) {
-         reply(f, 521, "Only IPv4 and IPv6 supported, address families (4,6)");
-+        return;
-     }
- #else
-     if (((struct sockaddr *)host_port)->sa_family != AF_INET) {
-         reply(f, 521, "Only IPv4 supported, address family (4)");
-+        return;
-     }
- #endif
- 
diff --git a/net-ftp/oftpd/files/oftpd-0.3.7-htons.patch b/net-ftp/oftpd/files/oftpd-0.3.7-htons.patch
deleted file mode 100644
index 584e0a72497c..000000000000
--- a/net-ftp/oftpd/files/oftpd-0.3.7-htons.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- oftpd-0.3.7/src/ftp_listener.c
-+++ oftpd-0.3.7/src/ftp_listener.c
-@@ -159,11 +159,11 @@
- 	switch (family) {
- #ifdef INET6
- 	case AF_INET6:
--		((struct sockaddr_in6*)&sock_addr)->sin6_port = port;
-+		((struct sockaddr_in6*)&sock_addr)->sin6_port = htons(port);
- 		break;
- #endif
- 	case AF_INET:
--		((struct sockaddr_in*)&sock_addr)->sin_port = port;
-+		((struct sockaddr_in*)&sock_addr)->sin_port = htons(port);
- 		break;
- 	default:
- 		/* handle error */
diff --git a/net-ftp/oftpd/files/oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch b/net-ftp/oftpd/files/oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch
deleted file mode 100644
index e3ed8df775f8..000000000000
--- a/net-ftp/oftpd/files/oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch
+++ /dev/null
@@ -1,354 +0,0 @@
-Difference from upstream mentioned patch for version 0.3.6
-ftp://ftp.deepspace6.net/pub/ds6/sources/oftpd/oftpd-0.3.6-ipv6rel2.patch.gz
-to Mario Fetka (geos_one) (mario dot fetka at gmail dot com) at 
-http://bugs.gentoo.org/attachment.cgi?id=220543&action=view
-
---- oftpd-0.3.6-ipv6rel2.patch	2010-09-01 11:17:37.137000090 +0200
-+++ oftpd-0.3.6-ipv6rel2.patch	2010-09-01 11:15:21.900000084 +0200
-@@ -1,146 +1,10 @@
--diff -urN oftpd-0.3.6-orig/Makefile.in oftpd-0.3.6/Makefile.in
----- oftpd-0.3.6-orig/Makefile.in	Mon May 28 00:53:40 2001
--+++ oftpd-0.3.6/Makefile.in	Fri Jun  8 19:09:50 2001
--@@ -72,8 +72,8 @@
-- CONFIG_HEADER = ./src/config.h
-- CONFIG_CLEAN_FILES = 
-- DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
---Makefile.in NEWS TODO acconfig.h aclocal.m4 configure configure.in \
---install-sh missing mkinstalldirs src/config.h.in src/stamp-h.in
--+Makefile.in NEWS TODO aclocal.m4 configure configure.in install-sh \
--+missing mkinstalldirs
-- 
-- 
-- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--@@ -83,9 +83,9 @@
-- all: all-redirect
-- .SUFFIXES:
-- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
---	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
--+	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
-- 
---Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
--+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-- 	cd $(top_builddir) \
-- 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-- 
--@@ -97,34 +97,6 @@
-- $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-- 	cd $(srcdir) && $(AUTOCONF)
-- 
---src/config.h: src/stamp-h
---	@if test ! -f $@; then \
---		rm -f src/stamp-h; \
---		$(MAKE) src/stamp-h; \
---	else :; fi
---src/stamp-h: $(srcdir)/src/config.h.in $(top_builddir)/config.status
---	cd $(top_builddir) \
---	  && CONFIG_FILES= CONFIG_HEADERS=src/config.h \
---	     $(SHELL) ./config.status
---	@echo timestamp > src/stamp-h 2> /dev/null
---$(srcdir)/src/config.h.in: $(srcdir)/src/stamp-h.in
---	@if test ! -f $@; then \
---		rm -f $(srcdir)/src/stamp-h.in; \
---		$(MAKE) $(srcdir)/src/stamp-h.in; \
---	else :; fi
---$(srcdir)/src/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
---	cd $(top_srcdir) && $(AUTOHEADER)
---	@echo timestamp > $(srcdir)/src/stamp-h.in 2> /dev/null
---
---mostlyclean-hdr:
---
---clean-hdr:
---
---distclean-hdr:
---	-rm -f src/config.h
---
---maintainer-clean-hdr:
---
-- # This directory's subdirectories are mostly independent; you can cd
-- # into them and run `make' without going through this Makefile.
-- # To change the values of `make' variables: instead of editing Makefiles,
--@@ -252,6 +224,11 @@
-- 	-rm -rf $(distdir)
-- 	mkdir $(distdir)
-- 	-chmod 777 $(distdir)
--+	here=`cd $(top_builddir) && pwd`; \
--+	top_distdir=`cd $(distdir) && pwd`; \
--+	distdir=`cd $(distdir) && pwd`; \
--+	cd $(top_srcdir) \
--+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
-- 	$(mkinstalldirs) $(distdir)/dist $(distdir)/init
-- 	@for file in $(DISTFILES); do \
-- 	  d=$(srcdir); \
--@@ -309,32 +286,32 @@
-- 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-- 
-- maintainer-clean-generic:
---mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
--+mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-- 
-- mostlyclean: mostlyclean-recursive
-- 
---clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
--+clean-am:  clean-tags clean-generic mostlyclean-am
-- 
-- clean: clean-recursive
-- 
---distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
--+distclean-am:  distclean-tags distclean-generic clean-am
-- 
-- distclean: distclean-recursive
-- 	-rm -f config.status
-- 
---maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
---		maintainer-clean-generic distclean-am
--+maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
--+		distclean-am
-- 	@echo "This command is intended for maintainers to use;"
-- 	@echo "it deletes files that may require special tools to rebuild."
-- 
-- maintainer-clean: maintainer-clean-recursive
-- 	-rm -f config.status
-- 
---.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
---install-data-recursive uninstall-data-recursive install-exec-recursive \
---uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
---all-recursive check-recursive installcheck-recursive info-recursive \
---dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
--+.PHONY: install-data-recursive uninstall-data-recursive \
--+install-exec-recursive uninstall-exec-recursive installdirs-recursive \
--+uninstalldirs-recursive all-recursive check-recursive \
--+installcheck-recursive info-recursive dvi-recursive \
--+mostlyclean-recursive distclean-recursive clean-recursive \
-- maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-- distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-- dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
--diff -urN oftpd-0.3.6-orig/man/Makefile.in oftpd-0.3.6/man/Makefile.in
----- oftpd-0.3.6-orig/man/Makefile.in	Mon May 28 00:53:44 2001
--+++ oftpd-0.3.6/man/Makefile.in	Fri Jun  8 19:09:50 2001
--@@ -84,9 +84,9 @@
-- all: all-redirect
-- .SUFFIXES:
-- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
---	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps man/Makefile
--+	cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile
-- 
---Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
--+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-- 	cd $(top_builddir) \
-- 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-- 
--@@ -138,6 +138,11 @@
-- subdir = man
-- 
-- distdir: $(DISTFILES)
--+	here=`cd $(top_builddir) && pwd`; \
--+	top_distdir=`cd $(top_distdir) && pwd`; \
--+	distdir=`cd $(distdir) && pwd`; \
--+	cd $(top_srcdir) \
--+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu man/Makefile
-- 	@for file in $(DISTFILES); do \
-- 	  d=$(srcdir); \
-- 	  if test -d $$d/$$file; then \
-+Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
-+Date: 2010-01-05
-+Initial Package Version: 0.3.6
-+Origin: ftp://ftp.deepspace6.net/pub/ds6/sources/oftpd/oftpd-0.3.6-ipv6rel2.patch.gz
-+Upstream Status: unknown
-+Description: add better ipv6 support to oftpd
-+ 
- diff -urN oftpd-0.3.6-orig/src/Makefile.am oftpd-0.3.6/src/Makefile.am
- --- oftpd-0.3.6-orig/src/Makefile.am	Wed Apr 18 01:05:16 2001
- +++ oftpd-0.3.6/src/Makefile.am	Fri Jun  8 19:09:45 2001
-@@ -148,158 +12,6 @@
-  bin_PROGRAMS = oftpd
- -oftpd_SOURCES = file_list.c file_list.h ftp_command.c ftp_command.h ftp_listener.c ftp_listener.h ftp_session.c ftp_session.h oftpd.c oftpd.h telnet_session.c telnet_session.h watchdog.c watchdog.h error.c error.h af_portability.h daemon_assert.c daemon_assert.h
- +oftpd_SOURCES = file_list.c file_list.h ftp_command.c ftp_command.h ftp_listener.c ftp_listener.h ftp_session.c ftp_session.h oftpd.c oftpd.h telnet_session.c telnet_session.h watchdog.c watchdog.h error.c error.h af_portability.h af_portability.c daemon_assert.c daemon_assert.h
--diff -urN oftpd-0.3.6-orig/src/Makefile.in oftpd-0.3.6/src/Makefile.in
----- oftpd-0.3.6-orig/src/Makefile.in	Mon May 28 00:53:42 2001
--+++ oftpd-0.3.6/src/Makefile.in	Fri Jun  8 19:09:50 2001
--@@ -66,7 +66,7 @@
-- VERSION = @VERSION@
-- 
-- bin_PROGRAMS = oftpd
---oftpd_SOURCES = file_list.c file_list.h ftp_command.c ftp_command.h ftp_listener.c ftp_listener.h ftp_session.c ftp_session.h oftpd.c oftpd.h telnet_session.c telnet_session.h watchdog.c watchdog.h error.c error.h af_portability.h daemon_assert.c daemon_assert.h
--+oftpd_SOURCES = file_list.c file_list.h ftp_command.c ftp_command.h ftp_listener.c ftp_listener.h ftp_session.c ftp_session.h oftpd.c oftpd.h telnet_session.c telnet_session.h watchdog.c watchdog.h error.c error.h af_portability.h af_portability.c daemon_assert.c daemon_assert.h
-- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-- CONFIG_HEADER = config.h
-- CONFIG_CLEAN_FILES = 
--@@ -78,7 +78,8 @@
-- LDFLAGS = @LDFLAGS@
-- LIBS = @LIBS@
-- oftpd_OBJECTS =  file_list.o ftp_command.o ftp_listener.o ftp_session.o \
---oftpd.o telnet_session.o watchdog.o error.o daemon_assert.o
--+oftpd.o telnet_session.o watchdog.o error.o af_portability.o \
--+daemon_assert.o
-- oftpd_LDADD = $(LDADD)
-- oftpd_DEPENDENCIES = 
-- oftpd_LDFLAGS = 
--@@ -93,6 +94,10 @@
-- 
-- TAR = gtar
-- GZIP_ENV = --best
--+DEP_FILES =  .deps/af_portability.P .deps/daemon_assert.P .deps/error.P \
--+.deps/file_list.P .deps/ftp_command.P .deps/ftp_listener.P \
--+.deps/ftp_session.P .deps/oftpd.P .deps/telnet_session.P \
--+.deps/watchdog.P
-- SOURCES = $(oftpd_SOURCES)
-- OBJECTS = $(oftpd_OBJECTS)
-- 
--@@ -100,9 +105,9 @@
-- .SUFFIXES:
-- .SUFFIXES: .S .c .o .s
-- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
---	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
--+	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
-- 
---Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
--+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-- 	cd $(top_builddir) \
-- 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-- 
--@@ -160,9 +165,6 @@
-- 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-- 	done
-- 
---.c.o:
---	$(COMPILE) -c $<
---
-- .s.o:
-- 	$(COMPILE) -c $<
-- 
--@@ -217,6 +219,11 @@
-- subdir = src
-- 
-- distdir: $(DISTFILES)
--+	here=`cd $(top_builddir) && pwd`; \
--+	top_distdir=`cd $(top_distdir) && pwd`; \
--+	distdir=`cd $(distdir) && pwd`; \
--+	cd $(top_srcdir) \
--+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
-- 	@for file in $(DISTFILES); do \
-- 	  d=$(srcdir); \
-- 	  if test -d $$d/$$file; then \
--@@ -228,6 +235,37 @@
-- 	  fi; \
-- 	done
-- 
--+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
--+
--+-include $(DEP_FILES)
--+
--+mostlyclean-depend:
--+
--+clean-depend:
--+
--+distclean-depend:
--+	-rm -rf .deps
--+
--+maintainer-clean-depend:
--+
--+%.o: %.c
--+	@echo '$(COMPILE) -c $<'; \
--+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
--+	tr ' ' '\012' < .deps/$(*F).pp \
--+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--+	    >> .deps/$(*F).P; \
--+	rm .deps/$(*F).pp
--+
--+%.lo: %.c
--+	@echo '$(LTCOMPILE) -c $<'; \
--+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
--+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
--+	  < .deps/$(*F).pp > .deps/$(*F).P; \
--+	tr ' ' '\012' < .deps/$(*F).pp \
--+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--+	    >> .deps/$(*F).P; \
--+	rm -f .deps/$(*F).pp
-- info-am:
-- info: info-am
-- dvi-am:
--@@ -268,24 +306,26 @@
-- 
-- maintainer-clean-generic:
-- mostlyclean-am:  mostlyclean-hdr mostlyclean-binPROGRAMS \
---		mostlyclean-compile mostlyclean-tags \
--+		mostlyclean-compile mostlyclean-tags mostlyclean-depend \
-- 		mostlyclean-generic
-- 
-- mostlyclean: mostlyclean-am
-- 
-- clean-am:  clean-hdr clean-binPROGRAMS clean-compile clean-tags \
---		clean-generic mostlyclean-am
--+		clean-depend clean-generic mostlyclean-am
-- 
-- clean: clean-am
-- 
-- distclean-am:  distclean-hdr distclean-binPROGRAMS distclean-compile \
---		distclean-tags distclean-generic clean-am
--+		distclean-tags distclean-depend distclean-generic \
--+		clean-am
-- 
-- distclean: distclean-am
-- 
-- maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-binPROGRAMS \
-- 		maintainer-clean-compile maintainer-clean-tags \
---		maintainer-clean-generic distclean-am
--+		maintainer-clean-depend maintainer-clean-generic \
--+		distclean-am
-- 	@echo "This command is intended for maintainers to use;"
-- 	@echo "it deletes files that may require special tools to rebuild."
-- 
--@@ -296,10 +336,11 @@
-- maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
-- mostlyclean-compile distclean-compile clean-compile \
-- maintainer-clean-compile tags mostlyclean-tags distclean-tags \
---clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
---check-am installcheck-am installcheck all-recursive-am install-exec-am \
---install-exec install-data-am install-data install-am install \
---uninstall-am uninstall all-redirect all-am all installdirs \
--+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
--+distclean-depend clean-depend maintainer-clean-depend info-am info \
--+dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
--+install-exec-am install-exec install-data-am install-data install-am \
--+install uninstall-am uninstall all-redirect all-am all installdirs \
-- mostlyclean-generic distclean-generic clean-generic \
-- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-- 
- diff -urN oftpd-0.3.6-orig/src/af_portability.c oftpd-0.3.6/src/af_portability.c
- --- oftpd-0.3.6-orig/src/af_portability.c	Thu Jan  1 01:00:00 1970
- +++ oftpd-0.3.6/src/af_portability.c	Fri Jun  8 19:01:31 2001
-@@ -376,7 +88,7 @@
- diff -urN oftpd-0.3.6-orig/src/config.h.in oftpd-0.3.6/src/config.h.in
- --- oftpd-0.3.6-orig/src/config.h.in	Sun May 27 23:04:05 2001
- +++ oftpd-0.3.6/src/config.h.in	Fri Jun  8 19:03:43 2001
--@@ -100,14 +100,14 @@
-+@@ -97,15 +97,15 @@
-  /* Define if you have the <limits.h> header file.  */
-  #undef HAVE_LIMITS_H
-  
-@@ -388,12 +100,13 @@
-  
-  /* Define if you have the <sys/types.h> header file.  */
-  #undef HAVE_SYS_TYPES_H
---
-+ 
- -/* Define if you have the <syslog.h> header file.  */
- -#undef HAVE_SYSLOG_H
-- 
-+-
-  /* Define if you have the <unistd.h> header file.  */
-  #undef HAVE_UNISTD_H
-+ 
- diff -urN oftpd-0.3.6-orig/src/error.c oftpd-0.3.6/src/error.c
- --- oftpd-0.3.6-orig/src/error.c	Wed Apr 18 23:41:04 2001
- +++ oftpd-0.3.6/src/error.c	Thu Jun 21 20:57:09 2001
-@@ -1436,7 +1149,7 @@
-  	}
-  #else
-  	if (memcmp(&f->client_addr.sin_addr, 
--@@ -1803,20 +1893,69 @@
-+@@ -1811,20 +1901,69 @@
-      }
-  }
-  
diff --git a/net-ftp/oftpd/files/oftpd-0.3.7-pthread-cancel.patch b/net-ftp/oftpd/files/oftpd-0.3.7-pthread-cancel.patch
deleted file mode 100644
index 586885c3c08c..000000000000
--- a/net-ftp/oftpd/files/oftpd-0.3.7-pthread-cancel.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-in order for pthread_cancel to work (which oftpd uses to close inactive
-connections), most ports need to load libgcc_s.so.1.  but when oftpd uses
-a chroot, that file is no longer available (in fact, it'll try to load it
-from the chroot itself which is kind of a security issue).  so have the
-code proactively link against libgcc_s when it is found so that the lib
-is already loaded when we cancel.
-
---- a/configure.in
-+++ b/configure.in
-@@ -39,6 +39,7 @@ AC_FUNC_STRFTIME
- AC_CHECK_FUNCS(getcwd gettimeofday select socket strerror localtime_r gmtime_r)
- dnl AC_CHECK_LIB(pthread, pthread_create)
- dnl AC_SEARCH_LIBS(pthread_create, [ pthread pthreads thread threads ])
-+AC_CHECK_LIB(gcc_s, _Unwind_Resume)
- AC_SEARCH_LIBS(socket, socket)
- AC_SEARCH_LIBS(inet_ntoa, nsl)
- AC_CHECK_FUNCS(inet_aton)
diff --git a/net-ftp/oftpd/files/oftpd-0.3.7-unistd.patch b/net-ftp/oftpd/files/oftpd-0.3.7-unistd.patch
deleted file mode 100644
index e7f858febd91..000000000000
--- a/net-ftp/oftpd/files/oftpd-0.3.7-unistd.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- oftpd-0.3.7/src/daemon_assert.c
-+++ oftpd-0.3.7/src/daemon_assert.c
-@@ -3,6 +3,7 @@
- #include <pthread.h>
- #include <syslog.h>
- #include <stdio.h>
-+#include <unistd.h>
- 
- #ifndef NDEBUG
- void daemon_assert_fail(const char *assertion,
-@@ -13,7 +13,7 @@
- {
-     syslog(LOG_CRIT, "%s:%d: %s: %s", file, line, function, assertion);
-     fprintf(stderr, "%s:%d: %s: %s\n", file, line, function, assertion);
--    exit(1);
-+    _exit(1);
- }
- #endif
- 
diff --git a/net-ftp/oftpd/metadata.xml b/net-ftp/oftpd/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/net-ftp/oftpd/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-ftp/oftpd/oftpd-0.3.7-r10.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r10.ebuild
deleted file mode 100644
index b8a810ca1888..000000000000
--- a/net-ftp/oftpd/oftpd-0.3.7-r10.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="Secure, small, anonymous only ftpd"
-HOMEPAGE="http://www.time-travellers.org/oftpd"
-SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz
-	ftp://ftp.deepspace6.net/pub/ds6/sources/${PN}/${PN}-0.3.6-ipv6rel2.patch.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 sh sparc x86"
-IUSE="ipv6"
-
-DEPEND="net-ftp/ftpbase"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	epatch "${FILESDIR}"/oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch
-
-	cd "${S}" || die
-	epatch "${WORKDIR}"/${PN}-0.3.6-ipv6rel2.patch
-	epatch "${FILESDIR}"/${PN}-0.3.7-delay-root-check.patch
-	epatch "${FILESDIR}"/${PN}-0.3.7-error-output.patch
-	epatch "${FILESDIR}"/${PN}-0.3.7-pthread-cancel.patch
-
-	# Don't crash when using an unsupported address family, #159178.
-	# updated in bug #157005
-	epatch "${FILESDIR}"/${P}-family-1.patch
-
-	# htons patch #371963
-	epatch "${FILESDIR}"/${P}-htons.patch
-
-	epatch "${FILESDIR}"/${P}-unistd.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf --bindir=/usr/sbin $(use_enable ipv6)
-}
-
-src_install() {
-	default
-	keepdir /home/ftp
-	newinitd "${FILESDIR}"/init.d.oftpd-r7 oftpd
-	newconfd "${FILESDIR}"/conf.d.oftpd-r7 oftpd
-}
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index fa1197c07d53..02d2417a1cc9 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -18,9 +18,11 @@ 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.6b.tar.gz 20260731 BLAKE2B 03ef212bcb1bcc53dd6d1dc4472c5565682b1c6b99af737f4ad09c280f1038f0658a8cc9609634e9b4a2a1cb56f76d83278056af0a9d136b957f853615e46cac SHA512 51511f05f481a038fa3826bdf1bdb866423d9f8df48071a8a263347a1ed096a553e66daefcc95dfdfcde503e664ed4140cdbb2a4f95ade8b7aadf2007aa3a671
+DIST proftpd-1.3.6c.tar.gz 20271908 BLAKE2B 64f0aa70df844a376d333804100e18a28af6ab2b17a3d6f250817141db3952835740c15dcd68f71498b076238a668bdaf9672b4fd7d6fe61f8632d813e221573 SHA512 9b10e603b26d527b594682a4905e70dc0a8361372ed80a8e2617167305047bf94ea16b441f9d5782ae04dd50768d32e12f9cb68708c1f80dcd219b09e0d4fd15
 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.6b-r1.ebuild 8683 BLAKE2B 59bdfbebe224ffdd843c3abcfaaba5461899ef76eff40144807598b2740717373e068962ca5f1b276526c21b769b0624068b5655f4a998c09af5901b4592f8bc SHA512 abd5fa622034cda491f3bd8200b433b910ff0e78605817e29010975ab1284e4dc4b92e74b0e18d18d6286944820a0c765c95ea0103c697bd02a76c06f011c81f
+EBUILD proftpd-1.3.6c.ebuild 8643 BLAKE2B b6e8543ca2a377bf74fed26a8d2e0b7b527b49337ce81e4ab387e72838d9c5a231c85f4ca7259d0f06a2a858eebe7fa61be50552a798f33a932367d5a7ad5edf SHA512 b2c48642c8dfc857450201e1079aac8656da19d9c2caed23f5fa1515b38c639670f2cc9ba35aa8bd7d32b7578c1dd271cbd122a86b60a5a6e4ba50ebae447958
 MISC metadata.xml 2930 BLAKE2B f3f8218a737f50599ff687030bd8c84f1818b290d6d89bd6627ab8eb02598d196f1bae03d7b15e4eb02967fb7e0d826cdda10588c8bfe4f8a387a49d70d9cab0 SHA512 c90941671532512e4d085f3c6b4f56f3c2a252a613bf5c978d763fb0f8f9190431a41816f4fddde47e28eaeddcd17a7aef52064e5825499801bcdfbd72745be8
diff --git a/net-ftp/proftpd/proftpd-1.3.6c.ebuild b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
new file mode 100644
index 000000000000..5c8f9eb610d3
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib systemd tmpfiles
+
+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.6a-fix-libcheck.patch
+)
+
+RESTRICT=test # tests corrupt memory. need to be fixed upstream first
+
+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
+}
+
+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=/var/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}"/var/run
+
+	newinitd "${FILESDIR}"/proftpd.initd 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 ${PN}.conf
+}
+
+pkg_postinst() {
+	# Create /var/run files at package merge time: bug #650000
+	tmpfiles_process ${PN}.conf
+}