gentoo resync : 28.11.2020

5 files changed, 2 insertions, 84 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 3bc0c6e22bf2..d1833d29aad8 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/frox/Manifest b/net-ftp/frox/Manifest
index 3dcdaf11c886..acce18eaad94 100644
--- a/net-ftp/frox/Manifest
+++ b/net-ftp/frox/Manifest
@@ -4,6 +4,5 @@ AUX frox-0.7.18-config.patch 1960 BLAKE2B a6ca1b8bd15f39a3dc5b3b10cb4a578447ce30
 AUX frox-0.7.18-no-common.patch 1644 BLAKE2B a84e686a1bffa8d8adb92bbc030b1fa61df6dd978f84490f48e102e9fcc3efbd77b3cbf09071ca7c1dcf15bb20cd149c576680d7705beb4c8814bc15e8afbc44 SHA512 99c2157206f1cf14bb5bef5b2fef656c4322077363d531c2798091d871e1931a81df8dd5a21f9b57ecba22c5379ad72ddf36c10d78e9efcdfee7e1e29fbf6108
 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 1863 BLAKE2B 48fba76ac94415e82046d0486d9afe2c4b84a6e2e1694b7a30b9bda22ee70a373fa1a055fa5ac8865d0a344a85e8b9dcc7fa3dc892e8ac96239476dc843be63f SHA512 3490ec5fd9d7e25825b8d69ee23113dc565b2d7925b335441ce0b2b54051ce7d1d75e148a23f7471d90dec0d85af0ed8e78233c141f067183e28d5418f1acf98
 EBUILD frox-0.7.18-r6.ebuild 2013 BLAKE2B 9c2fe42c27b654496c210c602f92f60aac7365d52cc3315dd77c81fda5774266765db2c4c1f8fcdb3b9d24cfd7e5082a7e9c35a6966d6ff1fd8d84c916ccfe17 SHA512 b169215a9a56ce571ecea073d9d35e7c47c46975ba11a2e490e0206d67f3e8c178616d74477f30446b9de746885474673333b6afa7895f141b9d9b5ec1dc3071
 MISC metadata.xml 593 BLAKE2B 65aeb3bac2df8a84512c91c24632a9d4b744344c95afe91c1631d442bcef11d19f922eb61ad85052ec14e9908bbbbe43f57a20a89a4fa39e3b8591734fc09bd6 SHA512 eb6aa83ad2cafe20d5348ff946f4f8d9c8b24dea6c0cd43de4ca9cfb27cd134e595874f09576a156b0936add5dab9b3924bbee40605095da899f28ced299943f
diff --git a/net-ftp/frox/frox-0.7.18-r5.ebuild b/net-ftp/frox/frox-0.7.18-r5.ebuild
deleted file mode 100644
index 7bcc20fb9761..000000000000
--- a/net-ftp/frox/frox-0.7.18-r5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils user
-
-DESCRIPTION="A transparent ftp proxy"
-SRC_URI="http://frox.sourceforge.net/download/${P}.tar.bz2"
-HOMEPAGE="http://frox.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-IUSE="clamav ssl transparent"
-
-DEPEND="clamav? ( >=app-antivirus/clamav-0.80 )
-	ssl? ( dev-libs/openssl )
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6 )"
-RDEPEND="${DEPEND}"
-
-# INSTALL has useful filewall rules
-DOCS=(
-	BUGS README
-	doc/CREDITS doc/ChangeLog doc/FAQ doc/INSTALL
-	doc/INTERNALS doc/README.transdata doc/RELEASE
-	doc/SECURITY doc/TODO
-)
-
-pkg_setup() {
-	enewgroup ftpproxy
-	enewuser ftpproxy -1 -1 /var/spool/frox ftpproxy
-
-	use clamav && ewarn "Virus scanner potentialy broken in chroot - see bug #81035"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-respect-CFLAGS.patch"
-	epatch "${FILESDIR}/${PV}-netfilter-includes.patch"
-	epatch "${FILESDIR}/${P}-config.patch"
-
-	if use clamav ; then
-		sed -i -e "s:^# VirusScanner.*:# VirusScanner '\"/usr/bin/clamscan\" \"%s\"':" \
-			"src/${PN}.conf" || die
-	fi
-
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-http-cache --enable-local-cache \
-		--enable-procname \
-		--enable-configfile=/etc/frox.conf \
-		$(use_enable !kernel_linux libiptc) \
-		$(use_enable clamav virus-scan) \
-		$(use_enable ssl) \
-		$(use_enable transparent transparent-data) \
-		$(use_enable !transparent ntp)
-}
-
-src_install() {
-	default
-
-	keepdir /var/{log,spool}/"${PN}"
-
-	fperms 700 /var/spool/frox
-	fowners ftpproxy:ftpproxy /var/{log,spool}/frox
-
-	dohtml doc/*.html doc/*.sgml
-
-	newman "doc/${PN}.man" "${PN}.man.8"
-	newman "doc/${PN}.conf.man" "${PN}.conf.man.5"
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-
-	insinto /etc
-	newins "src/${PN}.conf" "${PN}.conf.example"
-}
diff --git a/net-ftp/gproftpd/Manifest b/net-ftp/gproftpd/Manifest
index 9a0dadccea9d..df0abc582349 100644
--- a/net-ftp/gproftpd/Manifest
+++ b/net-ftp/gproftpd/Manifest
@@ -3,5 +3,5 @@ AUX gproftpd-8.3.2-fno-common.patch 509 BLAKE2B d4dff154f0f15426e3f6c7cf610626c1
 AUX gproftpd-8.3.2-install.patch 1791 BLAKE2B 8d2b3ef4e3f3a70a0ed887cd384e8f58a8b02886aee541f850451317fc09100c49154cb73d1b5f586d4c3d8736fccab2218b85fb8864ddf7e9e8344e93de6868 SHA512 bd19623a3ac000a9055d3d79078d3e9fe142d0da342cb30cf53cb04ff5ec849ca040787f0f3271526b7af12bf9b48466eedcdd48dee5b114c9113bf8e43ca18c
 DIST gproftpd-8.3.2.tar.gz 605797 BLAKE2B 76d15fb01fb73ebbb639e4ecc6ddf8399ef5bc2b904fb5d2ae433aa14c40db49d9b352ffdf558d45aa784b21e5248dfc453d2f87863c3c886dc2cd6c746d6109 SHA512 71a3b80b2bf18ec17719b1484d45fb6110764d28492edafcd97538ad99ad7cc182ed25723b721226329b61f29e511b48e0153cf01f90c3c7f5ce939f7b233f59
 EBUILD gproftpd-8.3.2-r1.ebuild 1464 BLAKE2B e6ac1423d2b72bcd3af9f0b34bea695d675568a313a2131e14b775f68c2ead076f4a03d4173c430f397a9f5d3ac3279c6233ebc5d5b4ce31a08c1a786ea17c69 SHA512 499040c17b64e7d89c79e681df93664dd422caa0b140b8680f7ec514b40cb1bd2448c211af1f575c120399cfac1acd87bf1d910f989aabf430fe6c6433dc1523
-EBUILD gproftpd-8.3.2-r2.ebuild 1071 BLAKE2B 422554bf06d88404762858e3b17eebc6e9ce4b55835472a7a5fcad3ae433b8d53ccc29ee1b7959e71fd8593917220c69e9207c339997e5a890127abcaf359232 SHA512 2d5c8e9eba3e71ba0e2ec4ac05c10c68c6fbdb90acb363774f580155b5b0239072ddbe18e041be0a07ffce6a85052954cbcdf3d41d34d924027c5d0859b6b5f1
+EBUILD gproftpd-8.3.2-r2.ebuild 1070 BLAKE2B 3dc38e21f686b2d8c5bea85f40978218407b0ce64912bf2a618b04692bebcff3992451a75f12948664250e28d262730e86a9c690c18e53293b82cf19b2cae675 SHA512 d20be32a018a655f1fc0b82f1e5cf7ee5bcab7fa0130f9444b9708685c97285856ba26a95e8fef475e79f9a5c0236232044c39f0df8ca3b875005a803639ffe2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild b/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild
index c801cf286c72..9f6648c9fb75 100644
--- a/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild
+++ b/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="GTK frontend to proftpd"
 HOMEPAGE="https://mange.dynalias.org/linux/gproftpd"
 SRC_URI="http://mange.dynup.net/linux/gproftpd/${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 SLOT="0"
 
 RDEPEND="