18 files changed, 45 insertions, 454 deletions
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 6de43e902a20..5793d68c0e4d 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/atftp/Manifest b/net-ftp/atftp/Manifest
index 476afe9494ab..f1d4117287ff 100644
--- a/net-ftp/atftp/Manifest
+++ b/net-ftp/atftp/Manifest
@@ -10,8 +10,9 @@ AUX atftp.confd 105 BLAKE2B 6672479bce2240d4c34c70853227a769fa45c06e4b5c04f7d5ae
 AUX atftp.init 438 BLAKE2B 1783431801dbf04353bde6c3766c7d0acdd06b8ec853c8fba5cf1bbfe6c7020b55305f44992e3921a63654f290a28c28373dd94f925188c72105c8a3dd047dca SHA512 b64f78658d2da17a4fe4237835c0a6a0cc59d0b7278e8f6f49673ffd8a97a9473e4773b43bcc70d312043ee4324d8105c50f0cfcf6055c0755ce598c9d7e5a23
 AUX atftp.service 233 BLAKE2B 4c9a1a8041ffc4cdf71a24800494f340121beb9bde9760fa090b9e515ef0b2aa7dd73173543c75fde465dbf9cc229b04acc9e72c296fa27cace2063128de06c6 SHA512 533372c4863e39d6139ddc491c2b2b2051f1094a90d9854879f28bae7975c8dc997696318794cd1136f9cc542a8f418ad8361b87dd6b3455445d8528d2cc993a
 AUX atftp.service.conf 45 BLAKE2B dd52bd3ef0d72f28d2e317282026d354b6023f8b51634d0374623c782afacae1284f5385967dfa91026553845f9283be59b4c7d96031da85261067b7be6544f7 SHA512 661befb6873eee6c0ed25fd5cb156e3d7c4ef801d2f58cda8df0f0c5fd851c7eb28089a9399529164c61505963e9d10143df2195d57ff66f85ad0e2750fbbd57
+DIST atftp-0.7.dfsg.tar.gz 187992 BLAKE2B 8196c333ea8042879196ca9f9c656b4d60a332ed1d64a5738870e1d4fd5f108716da6769bf52759626ad3efce11946b5d6285ac9fbe46cb63e6e2d051fc7aeb3 SHA512 40d231c0bc0478fedb3eff9b4c540c62dd9bd6c40d9738e2db1813797a5d48e201720d43a48970ce250f1bb5b15460bb9b3d631c06f96c1a74775ecfb6d13f82
 DIST atftp-0.7.tar.gz 202234 BLAKE2B 65ff486b6ef2b42b2a4737f121c2c36e8ff73838f3c10592c11020acdf2afdf0883fda8b39613e1cc35b47141fd29543a7ef2c3e2ead857033ad4f7181c91d04 SHA512 81c51b613a640f7db4d26da0fb891bda345d11d3f39e0af37f393d2abf619094c1de83f92f04ac75367f546cc70e37d7d47c1535c241c941036fd4df7863a440
 DIST atftp_0.7-11.diff.gz 26055 BLAKE2B c9be58836b5a7e3943dd28dd4661abab5e86b1941c9a2b58786eebe702ab515cf1bc08bf44c8ab4157584a437e861e24eb0c833c1fa1bc774f7f8a2134b6cd27 SHA512 28747f8f3ef2fc3b122361f682fe26ba93acf09b190f61efb3cfcbb6bdeef78cfe1348aeaf1699003a7e02586579be670d85b65baad1b1165a4bec9a9279adb5
-EBUILD atftp-0.7-r3.ebuild 1850 BLAKE2B 532cf664672143ffb7ba4a6ead87201ee4d3061afb5a4fc9a15eb1763cf8988a38f5bb7df18a626a1f1418187a6494181c3925684c6c2927179ee33e7ea51065 SHA512 794f4787698f65a5801cff0fd7f18504376064d0c8397f855f837c5eefe9e8f24b14fe42a8afd06802cdddd989f5d5f313ec2724c069566a3bd63b937bb94464
-EBUILD atftp-0.7-r5.ebuild 1768 BLAKE2B 052c826507b9b79edea36b2817e2e6e066e1cc8c2d196f232855fdaac1b05e5628b77cd70c33aa06a290a7d84a8e4b202967cb920fa1be14d29b468f53d49de2 SHA512 7c82f1c78379147739054075ea0402b702a2f8b5574131e52cbbba1243feba8646aa70d41667b1be369d759c343c6d364142ca7f0f7507abfc70faf3b34db466
+EBUILD atftp-0.7-r5.ebuild 1765 BLAKE2B e16085096afbc2172f6974978ff4dfe0120b16a81b66e3a86c3f5bdea5d76f28c6ae6233379294c07dbd1371d438335d11a7401a771e1a4e310ca811ddcf3b03 SHA512 064e9c15c2d8c298f33c505b12ef32f986da77404aa63663c19aac884c2176e1e4f372ffdf7d2bbf13f6b0c048685dc795a4fd3e97a2e925206f7c829c538037
+EBUILD atftp-0.7-r6.ebuild 1831 BLAKE2B 076b4853e8a1066d359b8ebac48eb9551e9b9b8083833752b4ba050e67b05e971b9979b95878e7e6176e193a243768544a16c9acf48e18b88a3167f4fdd45003 SHA512 e0f2cfe21ac0d293620850cba2994d2436fc33812e6e04b42cb719458c5c2aa5ec1075f70cc388ae7ecb328666aad87d88c8a48c562e009da5a0d71ec2da800c
 MISC metadata.xml 215 BLAKE2B 8f7aa1a33da6c92db40f6122e500209464b76f7520190c109e697a9aa6f9a4447581098bd3eeb775c306855401f6b419b501c69dd0b37c9d55d083d3df316487 SHA512 dfbc3b8198f877d6f858c9228f92e82926664db8f0f19cd6ba97ce06b52d93a998e78c44fd502f20bf249cd70d612f1c0bdc01c9d66ea8495c54dab399b62116
diff --git a/net-ftp/atftp/atftp-0.7-r5.ebuild b/net-ftp/atftp/atftp-0.7-r5.ebuild
index 98408a1a5019..c72eba363adf 100644
--- a/net-ftp/atftp/atftp-0.7-r5.ebuild
+++ b/net-ftp/atftp/atftp-0.7-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-ftp/atftp/atftp-0.7-r3.ebuild b/net-ftp/atftp/atftp-0.7-r6.ebuild
index 785ff81f7e82..64badd5fa1e9 100644
--- a/net-ftp/atftp/atftp-0.7-r3.ebuild
+++ b/net-ftp/atftp/atftp-0.7-r6.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic systemd
+EAPI=6
+inherit autotools flag-o-matic systemd
 
 DEBIAN_PV="11"
-DEBIAN_A="${PN}_${PV}-${DEBIAN_PV}.diff.gz"
+DEBIAN_A="${PN}_${PV}-${DEBIAN_PV}.diff"
 
 DESCRIPTION="Advanced TFTP implementation client/server"
-HOMEPAGE="ftp://ftp.mamalinux.com/pub/atftp/"
-SRC_URI="ftp://ftp.mamalinux.com/pub/atftp/${P}.tar.gz
-	mirror://debian/pool/main/a/${PN}/${DEBIAN_A}"
+HOMEPAGE="https://sourceforge.net/projects/atftp/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.dfsg.tar.gz
+	mirror://debian/pool/main/a/${PN}/${DEBIAN_A}.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,7 +18,7 @@ KEYWORDS="amd64 arm ppc ppc64 ~s390 sparc x86"
 IUSE="selinux tcpd readline pcre"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	readline? ( sys-libs/readline )
+	readline? ( sys-libs/readline:0= )
 	pcre? ( dev-libs/libpcre )"
 RDEPEND="${DEPEND}
 	!net-ftp/netkit-tftp
@@ -26,23 +26,33 @@ RDEPEND="${DEPEND}
 	!net-ftp/uftpd
 	selinux? ( sec-policy/selinux-tftp )"
 
+PATCHES=(
+	"${WORKDIR}/${DEBIAN_A}"
+	"${FILESDIR}/${P}-pcre.patch"
+	"${FILESDIR}/${P}-password.patch"
+	"${FILESDIR}/${P}-tests.patch"
+	"${FILESDIR}/${P}-glibc24.patch"
+	"${FILESDIR}/${P}-blockno.patch"
+	"${FILESDIR}/${P}-spaced_filename.patch"
+	"${FILESDIR}/${P}-illreply.patch"
+	"${FILESDIR}/${P}-CFLAGS.patch"
+)
+
+src_unpack() {
+	default
+	mv atftp-0.7.dfsg atftp-0.7 || die
+}
+
 src_prepare() {
-	epatch "${DISTDIR}"/${DEBIAN_A}
-	epatch "${FILESDIR}"/${P}-pcre.patch
-	epatch "${FILESDIR}"/${P}-password.patch
-	epatch "${FILESDIR}"/${P}-tests.patch
-	epatch "${FILESDIR}"/${P}-glibc24.patch
-	epatch "${FILESDIR}"/${P}-blockno.patch
-	epatch "${FILESDIR}"/${P}-spaced_filename.patch
-	epatch "${FILESDIR}"/${P}-illreply.patch
-	# remove upstream's broken CFLAGS
-	sed -i.orig -e \
-	  '/^CFLAGS="-g -Wall -D_REENTRANT"/s,".*","",g' \
-	  "${S}"/configure
+	append-cppflags -D_REENTRANT -DRATE_CONTROL
+	# fix #561720 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+
+	default
+	eautoreconf
 }
 
 src_configure() {
-	append-flags -D_REENTRANT -DRATE_CONTROL
 	econf \
 		$(use_enable tcpd libwrap) \
 		$(use_enable readline libreadline) \
@@ -50,12 +60,8 @@ src_configure() {
 		--enable-mtftp
 }
 
-src_compile() {
-	emake CFLAGS="${CFLAGS}"
-}
-
 src_install() {
-	emake install DESTDIR="${D}"
+	default
 
 	newinitd "${FILESDIR}"/atftp.init atftp
 	newconfd "${FILESDIR}"/atftp.confd atftp
@@ -67,6 +73,6 @@ src_install() {
 	dodoc "${S}"/docs/*
 
 	docinto test
-	cd "${S}"/test
+	cd "${S}"/test || die
 	dodoc load.sh mtftp.conf pcre_pattern.txt test.sh test_suite.txt
 }
diff --git a/net-ftp/axyftp/Manifest b/net-ftp/axyftp/Manifest
deleted file mode 100644
index b763624aff7e..000000000000
--- a/net-ftp/axyftp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX axyftp-0.5.1-built-in-function-exit.patch 725 BLAKE2B 3d765447849e3744ff6fb0018202e7d4c4aa511aa76745214aa385f3e7f69145ebe38739dd432240f27d53a00e8d4a872abba442af9d33994105ae81ef679176 SHA512 0b8a748d94b8fbfa1e7ca070b52cb60a79dad0eb52d1ebdd84be3f845cde57c7f5e43b89fbff10ff0791ada02f9c146f0ea679b89ab614ecfe676c7335375273
-DIST axyftp-0.5.1.tar.gz 518736 BLAKE2B 32060290d326c2f663e82ed152c29b7d6179a8e30a62c1d3fe7394a920530ec464602bc301df81219288b61859754fb4a427fc642349aa487341f090a78d635c SHA512 b818537dd8aff34996bdbc770ee01f5927d0c8be05ff5b1220fc72741c07a141cc41c86432c0da60ca3289f34fc5f516c4b35fcf20178efa7c7e96f1d84477b7
-EBUILD axyftp-0.5.1-r2.ebuild 902 BLAKE2B 649ca53400f21be49f07deed5f1c9b76601b76a9af89e95bfc2c538e1d44f095bffc41bf80897dcec5dd27180599059bc1a2634fcd3dbe4016e49b73908dce08 SHA512 a714a8359b10f73667f2102e1cf6c8770f3cb28a42f45d12f6eb851872105eacaa73597e947dafde1f4ed4e3b596b58c1402456196f4a45e224d94e768006dd5
-MISC metadata.xml 240 BLAKE2B 54e7cd28539e2c80b18514717beb75eda93d991b945e1017ec8bb6449375698599b06d9e60e2701f4e680864aaf519efefcc6866816462f790cf2288f3ba839b SHA512 5a1895a23b9d1f47a8c59c55fa81175f06a9a7d92c892e686fc3cfdd57467d432d8fc2b63b4b45adac8b1e4d76047fe5c66fbf88f475e67d039d9ed3a2c3fd7c
diff --git a/net-ftp/axyftp/axyftp-0.5.1-r2.ebuild b/net-ftp/axyftp/axyftp-0.5.1-r2.ebuild
deleted file mode 100644
index f25ebe2821cc..000000000000
--- a/net-ftp/axyftp/axyftp-0.5.1-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="GUI FTP client for X Window System (former WXftp)"
-HOMEPAGE="http://freecode.com/projects/axyftp/ http://www.wxftp.seul.org"
-SRC_URI="http://www.wxftp.seul.org/download/${P}.tar.gz"
-
-LICENSE="Artistic LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/motif-2.3:0
-	x11-libs/libXt
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-built-in-function-exit.patch
-}
-
-src_configure(){
-	econf --with-help=/usr/share/doc/${PF}/html \
-		--with-gui=motif
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc CHANGES README TODO
-	newicon icons/${PN}-ball64.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "AxY FTP" ${PN} "Network;FileTransfer;Motif"
-}
diff --git a/net-ftp/axyftp/files/axyftp-0.5.1-built-in-function-exit.patch b/net-ftp/axyftp/files/axyftp-0.5.1-built-in-function-exit.patch
deleted file mode 100644
index 8937114251e3..000000000000
--- a/net-ftp/axyftp/files/axyftp-0.5.1-built-in-function-exit.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur axyftp-0.5.1.orig/src/buttonbar.c axyftp-0.5.1/src/buttonbar.c
---- axyftp-0.5.1.orig/src/buttonbar.c	2000-01-17 21:50:04.000000000 +0200
-+++ axyftp-0.5.1/src/buttonbar.c	2008-01-17 15:46:22.000000000 +0200
-@@ -1,4 +1,5 @@
- /* Copyright (c) 1998   Alexander Yukhimets. All rights reserved. */
-+#include<stdlib.h>
- #include"axyftp.h"
- #include"utils.h"
- #include"multi.h"
-diff -ur axyftp-0.5.1.orig/src/utils.c axyftp-0.5.1/src/utils.c
---- axyftp-0.5.1.orig/src/utils.c	2000-01-17 22:03:59.000000000 +0200
-+++ axyftp-0.5.1/src/utils.c	2008-01-17 15:45:51.000000000 +0200
-@@ -1,4 +1,5 @@
- /* Copyright (c) 1998   Alexander Yukhimets. All rights reserved. */
-+#include<stdlib.h>
- #include<string.h>
- #include<stdio.h>
- 
diff --git a/net-ftp/axyftp/metadata.xml b/net-ftp/axyftp/metadata.xml
deleted file mode 100644
index 8d7df8a51210..000000000000
--- a/net-ftp/axyftp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="freecode">axyftp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 49ebd44f692a..1dca16f7a04f 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,14 +1,10 @@
 AUX filezilla-3.22.1-debug.patch 349 BLAKE2B 2a38aba4ddc49cbe97d3d6ce1348d94588a3bb2821ad1643e5e5d43cd18adfe5911309a24822368fd38176aaf2af99d7b098864bc5ae2d6f94ffb481a4d25340 SHA512 009946fbb676698e404b1c91bb6b14767234751cbecb7faa097692b382a65af7ab31b54f1aac81fdb72c1492db4698d24f5fa9b1966f69bffa1f4b6073283e00
 DIST FileZilla_3.34.0_src.tar.bz2 4869893 BLAKE2B 43f017a833191126526195636607b7ba4ebc73859f48745126ddd284940da90d692e0bf2373096f5262e6ebe2e6655d9cf2dbbf4b0aa6299730f47b1f04c63e8 SHA512 577118bd053c3aedbe77082b138c30abc6a759b20ea905abc4e9bef965cbca3cf73023186c389ded7d906b7cf76e4f3d4462c00fae62c7b1ae695ad171c88764
-DIST FileZilla_3.35.1_src.tar.bz2 4963273 BLAKE2B dd7a30bf6916d7b2a6db0733856c8241a5363f40e8d089975a06a683b13c32dbad6fd009a3ec526d9f0c7f4268e277576a5eac878b55f4f5ddd43ebb563d6632 SHA512 e039a00ac64b6d1b99f50a5f94268a7e11c839e75465f76ff865700071aa0ee7733c89a5f5b8e16ef5deb3cd1b30873b48c3c8a42a73ed9a6b6a05e3e35cf2a1
-DIST FileZilla_3.35.2_src.tar.bz2 4968449 BLAKE2B 1c06b0a67177fc2b91e037eef02c0835702f79d9a36f9af1eed27a4999986db2a351c073e866cb0359c6b415f737a07344619741018537c0e5a59c81c589c48c SHA512 dfd962cc1ed86b4198c339560482d722ca6fa81dfeaae47dbdb8867c7c4ce516cecff393e9bda7abf2148e32f6b423ed76296346e22570db1f292de06c5bc0b8
-DIST FileZilla_3.36.0_src.tar.bz2 4981429 BLAKE2B f297671ead361b4b1b1063bca2c78ad1e8c029f9eb3eae2a6bd4bd56c794cfb4e9b70ee4cf9addda60635e12d7e37cf42b34763316d73beab37a24ab94eb03d8 SHA512 d5c9ebd49944b3f2b55f5b494113ffde13b61f5d98e3be0507731e0dfc0d18f1f36ec5d4bf0f9ce2bbcf9d9b91b92b93b192739fb89c99c6cced80e131b58322
 DIST FileZilla_3.37.4_src.tar.bz2 4983335 BLAKE2B 16929caca3aabfdea406469a4128878f3cc48b347084d5d362ad206a7549be129195e8f111324b259e64d8e9324d9decd4bb51d088367fcaa560ec1feeb03570 SHA512 3f6697fd411b898f0db375bba7e6a34157c73274ee463832c38a4897240d990654c447baad8b0024492cb882106e7e63757d54401c487cfad96038d1f5eabfea
 DIST FileZilla_3.38.1_src.tar.bz2 4983087 BLAKE2B a19b80b35535485fd1c03aa36a85aa1f894b106d09d1b78ab7e02fec6cec3e78e0612c343694e5fabaa2202802d2ba2cd2aa4e4d0840342f17c60c06c0c8bcf8 SHA512 a224c6f65253ceeef1f3049fd6304533a7efb427707c73481d3973d06e3b887f2511bc705e718a1018b287940c3d682794c6cf3d0e8d9e3c403a1e2f14ed01fc
+DIST FileZilla_3.39.0_src.tar.bz2 4995713 BLAKE2B d89aaa1f57187cd926ae1c4dd34624b404baa291334c652293d2dcfaedc4a5dffb401f8727b5d5d1fb483bdd503f35124efb75bdd7dd750d68e517fcb57fb8c0 SHA512 a0360634517ffd07878082abae024dbb4896035edcbd9abe6d8adfc9d37b73d01d95f6c5ca031175d88b6e4badefafcc43b5ddce3d9dbddde4deab5f0cc97e83
 EBUILD filezilla-3.34.0.ebuild 1803 BLAKE2B c04510be956992888544049b5b6c837c377f72b695fb5800471c6f727b1a9c2926aef3db754846bcff850e7cfb3ea5a4c505272b76aaa35be19ec940cbf13561 SHA512 fd8e85a7b5d9755bab0379ed38a79750d0b9baf4b0a244779e0c49f72df566cefb14bea83eb00c20ff1bb9ad3f318c680b94c73fc5222025e25c6f1a40e5ec7e
-EBUILD filezilla-3.35.1.ebuild 1805 BLAKE2B 2630f6ea5376235b2cb3d842ac95446e0c80e3646f4510b55a9413583cd9060aaf4bdbac4b83ba027c1081fc7b5802c21889f6d24cee49712ba9683754e51bce SHA512 9f225e9c755485dea83b21d97e7be035d2db284e883415069cd5b38a63bcbcda19ce7aad670fa43970d3e93e0b03534b6d4a887ed0582a04b5f22156630d37cc
-EBUILD filezilla-3.35.2-r1.ebuild 1792 BLAKE2B 4752154db30ce86b898d543438e049cf19a8d347c84576eeaa30e341027cc4511b5556109c4220b88867c298883039f5cbfdf4f1a4a5389ff755408834adef69 SHA512 523a6202e22abbe2e5203bdc0e778b02a2118981eb5720e7ef4af7958159eeee59a74ece39615ebcb2301b09ca207c96056ee3531a4dd81bf767a9c579e4b802
-EBUILD filezilla-3.36.0.ebuild 1776 BLAKE2B 50665257d912c1242d41f64f030db667fd1adc1f54c1178486758ee2f8bde72baf8ba87213d75bb6216d02254a77442680f6d9668923350c4115b0e647ef74de SHA512 5d26cf0646a8b452fb4477ea7b7e1a286129013492cffaf012a5f428e47485db55a8ad89dacbad51628481f1e698a915188c2eb061088011c0d755955c9bdc8b
 EBUILD filezilla-3.37.4.ebuild 1773 BLAKE2B f4047b62f61357055ef3dd02bb1c86c73e8813ba9fd1af34dc605b9925aeaff810d61c920672ce614174cae80ba3366b0d6cc8db3872227f3d2b0ae4c34211b3 SHA512 99bbd32e2a1c4f2944dbbe15b21b0ca6e572614e536270763de8b1bb863bafd333c7865df4282171b15adfe5e4e8421e8ce59dfd63e36d3bdba65d8799674265
 EBUILD filezilla-3.38.1.ebuild 1773 BLAKE2B 237c7d4f03842a478d3fbcacc77dd851f682b4ff8e5743f5a85f4275dbb73507d45d77a2ea39138076f3137435c8fd63063720d9469e1e0b6a006937220c1f4d SHA512 6de6bf7356480bcbfc8e9123fc9def256710c0335357aa401b958425e9532617e286574e041b39b2ff8260fa1fc13d23de4beb3bc8007e28e8112f6bf454787a
+EBUILD filezilla-3.39.0.ebuild 1773 BLAKE2B ee08653a3cb9bd33a4f1534389bf330877dfa3fa92c22217a0e43046ed8d42523904b74525cd84f18612ebace2d266003e1e6ec8290d1b723366c4efad7ffaae SHA512 0fba922d5f4be687e8870c8faf69a19a7601b2e8af75fba1f4a5a37fc2be125dd29fa3382bbea052cd4f425047e73e866f2734210054c10f957a0f61b4125431
 MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/filezilla-3.35.1.ebuild b/net-ftp/filezilla/filezilla-3.35.1.ebuild
deleted file mode 100644
index 848832deae50..000000000000
--- a/net-ftp/filezilla/filezilla-3.35.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-inherit autotools eutils flag-o-matic gnome2-utils multilib wxwidgets
-
-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 ~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.13.0
-	>=dev-libs/pugixml-1.7
-	net-dns/libidn:=
-	>=net-libs/gnutls-3.4.15
-	>=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 )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-DOCS=(AUTHORS ChangeLog NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.22.1-debug.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() {
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-pugixml=system \
-		--disable-autoupdatecheck
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-ftp/filezilla/filezilla-3.35.2-r1.ebuild b/net-ftp/filezilla/filezilla-3.35.2-r1.ebuild
deleted file mode 100644
index 8912d876a8b7..000000000000
--- a/net-ftp/filezilla/filezilla-3.35.2-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools eutils flag-o-matic gnome2-utils multilib wxwidgets
-
-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 ~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.13.0
-	>=dev-libs/pugixml-1.7
-	>=net-libs/gnutls-3.4.15
-	>=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 )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-DOCS=(AUTHORS ChangeLog NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.22.1-debug.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() {
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-pugixml=system \
-		--disable-autoupdatecheck
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-ftp/filezilla/filezilla-3.36.0.ebuild b/net-ftp/filezilla/filezilla-3.39.0.ebuild
index b765e3c20dc4..eb9f18cd0673 100644
--- a/net-ftp/filezilla/filezilla-3.36.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.39.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ IUSE="dbus nls test"
 RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
 	>=dev-libs/nettle-3.1:=
 	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.13.0
+	>=dev-libs/libfilezilla-0.15.1
 	>=dev-libs/pugixml-1.7
 	>=net-libs/gnutls-3.4.15
 	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
diff --git a/net-ftp/oftpd/Manifest b/net-ftp/oftpd/Manifest
index fc709cf76715..f605358c57f9 100644
--- a/net-ftp/oftpd/Manifest
+++ b/net-ftp/oftpd/Manifest
@@ -10,4 +10,4 @@ AUX oftpd-0.3.7-unistd.patch 448 BLAKE2B 4f69ab2c867f2c443c0a5cfc0637b92a486a757
 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 243 BLAKE2B f6898ed42cda5e8c4bb81d5737f88ff6118fe3507e7ddcebf4686fa26effb75d03176ee091289e1011788f1a98cab52d5374e29dc04c2c298112c47a2c336f02 SHA512 efed1be9deecfbfc884a140e4ecb918eb473ec755a7910ab9afd29fa236d3c34c09c8d11454a0f8c26331539cbad1461f4824ff348b7fb7335cc88fb51d3882b
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-ftp/oftpd/metadata.xml b/net-ftp/oftpd/metadata.xml
index 3c3d5ced6412..7a38bb900964 100644
--- a/net-ftp/oftpd/metadata.xml
+++ b/net-ftp/oftpd/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index d4bc58e2d2ca..de09d58f233c 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -1,11 +1,8 @@
 AUX pure-ftpd-1.0.28-pam.patch 568 BLAKE2B cb7a9540e5646d7e9b734f893d4449e11cad60f897b39ed111559877edb4cf22e607fcf15d6ed7eea6dbf7a03a430c9182d6405ced13cf9c6614d15a45e17a49 SHA512 c331837c4c8988e0623a6a4f4222263dd161a49a2748079d3c539db2025b7b048ca5976b4450dd32cab5755932c7e59f6976d9d3bda2e5e87f1869789f8e00ba
-AUX pure-ftpd-1.0.45-openssl-1.1.patch 1184 BLAKE2B 94750ec0312d42347d094b28ab283cf59ca7bb2bc6cbd879e2a76a9a6c7faa97f8fa99ebf8358c4b6d396af0e7c769730e5c0b8394e0bfbbe3eb322c726032bc SHA512 e6876cd2dd8551f7ad37ad52dfad142d19d7294c2ef226b394d1ea064ab89408b90ad84a7b560be0eb4ac955606f9aeb44b28009a712b681acceafa7410fb053
 AUX pure-ftpd-1.0.47-MAX_DATA_SIZE.patch 787 BLAKE2B bac7b7d788e2928c7c5a4f9af593b6841475d0850b1b3c09f6c6e3f7a575db13975fccfabbcb5813482c326f355dadcd33aa30184da9c098764480b95a9730ac SHA512 1124ba66f8c98935acf3f9bc11b7c90370e2e0dee05fa0c25ae517d198ef1bf47b7d93b3abbe79a3e98356588bd12a6f44584ff85a5fe241e2561c5805876624
 AUX pure-ftpd.conf_d-3 3728 BLAKE2B a9bfa8208bdf7fcb053cd48e17638f787388804c57788ac594fae096cc824e347979b251b2c8e9d753308bfb63a37111f9690aabe684dc3eb614f68949d3983b SHA512 a5cc8e59178a5d0f7b5909d09009ef6ace1f8e6874bd733e21bc30f4899447e70b020a0369077132751ceb28afa971588efedcce3dea83e9b043b1545caf3393
 AUX pure-ftpd.rc11 1990 BLAKE2B a0f4bccad43ae3f767188326ec1853c516165c0268e31756b573470bd9b49dea848c74e1b04a8241df873977938011aed2c5acc9084d1e1c2d0aa7ea0de44692 SHA512 39e076b3ecc511646e6e14884852313ba6126810841ed9667a53ac061232418e8e53e2cf9191b35d7655168680d961ee2edf67bff5e16b295f8a00752032e253
 AUX pure-ftpd.xinetd 247 BLAKE2B aa2b0f8b4b6ff45e9b8dd632af5ff680ddd5abe51647dda91ca78bf3cb9ba9a090b20433f460213e95b8e57958d711f4bd7fa594b3d33fae818b853ec5aaee5d SHA512 e8ac0527daf1e182e7514d17f04bd20e789231e627cc7228ac23a241a4c420204a61ef9438c57e63f402eb3608ae0acc15a72fe484c99bb4e172bbd5ece2b72d
-DIST pure-ftpd-1.0.45.tar.bz2 497695 BLAKE2B c905675253d992757e44baf1fae42d8363789ce3eb4d71d6f0e5c994a63efd307af69fb81aadb1875f0f2da952c0b3c8fbbc79c9c5c0b22c2d2f82029b417f11 SHA512 bb22b6b88778e2586411318905aa165e590185f7a87ac30761d6250f4de22a1deec6be5441926eae28011d3a5a923bad2ac366e237cc96a4d7932e3dbc9a1f2a
 DIST pure-ftpd-1.0.47.tar.bz2 489177 BLAKE2B 06e71ead47b87dedf47a84e488b2de127fcd297c2e9ca7a617c2ee2760cf55b816884763721826c512558d016cbd38a87a11ca0e8c2334d93145edc6f88d9287 SHA512 c1920a3f67f04635fde600fe226a7730b801e7e64658b25f1d9f9c0b35a704664be4adfb0b291594f7e0f10beade25eae9a5e6cc3b6777a3b413f3c2d9574e63
-EBUILD pure-ftpd-1.0.45-r3.ebuild 3989 BLAKE2B e04df8a23930d4a75bc721f033803d575208d5d3a7b9c054baee09551a3ccd6a1e1cab4d4c8e1fec87e670911f5fec11532b708ca44c488387e22eadb7c0f195 SHA512 71fba70f9dd1c0719c01230f93d9eeb37743d8a4ee7254685939043dfccdca18cbf377cee2b5adc5ac9ef2b9501b073062f0ebbdd22b3fab20a081a63d701f0b
-EBUILD pure-ftpd-1.0.47-r2.ebuild 3961 BLAKE2B 7749f5cf0d5c8fae4caaf3558e78cb0358f3245f92bc6ce19ddcdd80f644a5a9b943988a21fe94d116f14670198d501bbdb270e1c37cb36e8d60895f9e966de2 SHA512 b60521b7ff4621050a90e56eb1a04ca5b747df07860e08b91893ada3371395e2d09063bbf80b971e74ae2e216f4defa7968a42cbd835472615a1152248560435
+EBUILD pure-ftpd-1.0.47-r2.ebuild 3955 BLAKE2B f063cd0ba2697090bdcc17dd8f42443e0bd8bfb09cd4fe7e8946e659ce3d73b31b048b5d5c0a29f23eee8a02745ee552fea9dfc0138ae6748dfa4cdd67ac3577 SHA512 6a0233381908f2ef3ef75d78d3b1f9c0d3653e13b79f60c2ed327ff1366886f2bc07741cc0b6831c2eb50b0abe374feba72c70136e4f706d7d4f511a0de3f225
 MISC metadata.xml 1233 BLAKE2B 02ea0260dacca81d5b2eef251f98756f151b03ee7abcf3ccc46832167848b8aa80dba90d855c118908b87ce7085921cae81f3a747402c5e0fb70401dd668150b SHA512 ce47470d3c8bfeba9c02f6d6638e7b0bb6e0ddeddd1aaf0362342aadf07e823f1093523a1432c703bd410c3b760049a1e1c32e3f36718844b3a1ba44144afea4
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.45-openssl-1.1.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.45-openssl-1.1.patch
deleted file mode 100644
index 714809f37af1..000000000000
--- a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.45-openssl-1.1.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 54cc692f997c72eb530f38e62de38ed444eb152e Mon Sep 17 00:00:00 2001
-From: Frank Denis <github@pureftpd.org>
-Date: Wed, 5 Apr 2017 12:30:32 -0700
-Subject: [PATCH] Add strict support for the OpenSSL 1.1 API
-
----
- src/tls.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/tls.c b/src/tls.c
-index 3c87bbb..21c83b2 100644
---- a/src/tls.c
-+++ b/src/tls.c
-@@ -258,9 +258,17 @@ int tls_init_library(void)
- 
-     tls_cnx_handshook = 0;
-     tls_data_cnx_handshook = 0;
-+# if OPENSSL_VERSION_NUMBER < 0x10100000L
-     SSL_library_init();
-     SSL_load_error_strings();
-     OpenSSL_add_all_algorithms();
-+# else
-+    OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS |
-+		     OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
-+    OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS |
-+			OPENSSL_INIT_ADD_ALL_DIGESTS |
-+			OPENSSL_INIT_LOAD_CONFIG, NULL);
-+# endif
-     while (RAND_status() == 0) {
-         rnd = zrand();
-         RAND_seed(&rnd, (int) sizeof rnd);
-@@ -347,7 +355,9 @@ void tls_free_library(void)
-         SSL_CTX_free(tls_ctx);
-         tls_ctx = NULL;
-     }
-+# if OPENSSL_API_COMPAT < 0x10100000L
-     EVP_cleanup();
-+# endif
- }
- 
- int tls_init_new_session(void)
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r3.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r3.ebuild
deleted file mode 100644
index 045d7c6b7ed4..000000000000
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r3.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
-
-DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
-HOMEPAGE="http://www.pureftpd.org/"
-SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
-	http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-
-IUSE="anondel anonperm anonren anonres caps charconv implicittls ldap libressl mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
-
-REQUIRED_USE="implicittls? ( ssl )"
-
-DEPEND="caps? ( sys-libs/libcap )
-	charconv? ( virtual/libiconv )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( || (
-		dev-db/mariadb-connector-c
-		dev-db/mysql-connector-c
-	) )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:= )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] )
-		libressl? ( dev-libs/libressl:= )
-	)
-	sysquota? ( sys-fs/quota[-rpc] )
-	xinetd? ( virtual/inetd )"
-
-RDEPEND="${DEPEND}
-	dev-libs/libsodium:=
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.28-pam.patch"
-	"${FILESDIR}/${P}-openssl-1.1.patch"
-	"${FILESDIR}/${PN}-1.0.47-MAX_DATA_SIZE.patch"
-)
-
-src_configure() {
-	# adjust max user length to something more appropriate
-	# for virtual hosts. See bug #62472 for details.
-	sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" \
-		-i "${S}/src/ftpd.h" || die "sed failed"
-
-	# Those features are only configurable like this, see bug #179375.
-	use anondel && append-cppflags -DANON_CAN_DELETE
-	use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS
-	use anonren && append-cppflags -DANON_CAN_RENAME
-	use anonres && append-cppflags -DANON_CAN_RESUME
-	use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS
-
-	# Do not auto-use SSP -- let the user select this.
-	export ax_cv_check_cflags___fstack_protector_all=no
-
-	local myeconfargs=(
-		--enable-largefile
-		--with-altlog
-		--with-cookie
-		--with-diraliases
-		--with-extauth
-		--with-ftpwho
-		--with-language=${PUREFTPD_LANG:=english}
-		--with-peruserlimits
-		--with-privsep
-		--with-puredb
-		--with-quotas
-		--with-ratios
-		--with-throttling
-		--with-uploadscript
-		--with-virtualhosts
-		$(use_with charconv rfc2640)
-		$(use_with ldap)
-		$(use_with mysql)
-		$(use_with pam)
-		$(use_with paranoidmsg)
-		$(use_with postgres pgsql)
-		$(use_with ssl tls)
-		$(use_with implicittls)
-		$(use_with vchroot virtualchroot)
-		$(use_with sysquota sysquotas)
-		$(usex caps '' '--without-capabilities')
-		$(usex noiplog '--without-iplogging' '')
-		$(usex xinetd '' '--without-inetd')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local DOCS=( AUTHORS CONTACT ChangeLog FAQ HISTORY INSTALL README* NEWS )
-
-	default
-
-	newinitd "${FILESDIR}/pure-ftpd.rc11" ${PN}
-	newconfd "${FILESDIR}/pure-ftpd.conf_d-3" ${PN}
-
-	if use implicittls ; then
-		sed -i '/^SERVER/s@21@990@' "${ED}"/etc/conf.d/${PN} \
-			|| die "Adjusting default server port for implicittls usage failed!"
-	fi
-
-	keepdir /var/lib/run/${PN}
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/pure-ftpd.xinetd" ${PN}
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins pureftpd.schema
-		insinto /etc/openldap
-		insopts -m 0600
-		doins pureftpd-ldap.conf
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog
-		elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!"
-		elog
-		ewarn "It's *really* important to read the README provided with Pure-FTPd!"
-		ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
-		ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
-		ewarn
-		if use charconv ; then
-			ewarn "Charset conversion is an *experimental* feature!"
-			ewarn "Remember to set a valid charset for your filesystem in the configuration!"
-		fi
-	fi
-}
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r2.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r2.ebuild
index 8a2caff2d76d..864c1ad82373 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r2.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
 
 DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
 HOMEPAGE="http://www.pureftpd.org/"