gentoo resync : 12.07.2021

2 files changed, 23 insertions, 20 deletions

diff --git a/net-ftp/frox/Manifest b/net-ftp/frox/Manifest
index 7e6f0f756e09..42dbfc85a18e 100644
--- a/net-ftp/frox/Manifest
+++ b/net-ftp/frox/Manifest
@@ -4,5 +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-r7.ebuild 1947 BLAKE2B 088a5809d10e2641f34f461071ae6649f7e558053beb8c87912f7e5bdc225a2d3b99d05d75ca6145abd82f159f6aa996f0f46392f35e712334ee1121890e3113 SHA512 b9f07edf9959356a8d55eaafab79e59f3fd29cef11bf6bb8595307db7aafdd955c3a8604338e2f1fdefc109ce397142415df356d0af3c98b8a2346173cf56ad7
+EBUILD frox-0.7.18-r8.ebuild 1899 BLAKE2B 69b44a1a481786424b4da09b3c31c450eaf24a7ab4a00c064d5a676606187494d5e5fffa27de48326ca25ad23401f35864df879ec4824715d9030dc8ea5d0551 SHA512 150792890883cefe7c5ee7c0e4a5bb3ab214b35b08cd728151697261da68c225250cbe27345cae160da47b6a42570998ea94398070f5ed71f4ac1f7eb3eb203e
 MISC metadata.xml 623 BLAKE2B fe1b6aaccdc85accf5b392e79b85e18233eee2e86c6f2c60284ca95805f107408ac9adc1e56900390b75583c86bccd322deb6cdd0bab773e35c896b4d3e04511 SHA512 62a239cfde0893981edef12942251ea54fd4260254e32b726ff9b424f57b37795cd3b188005f1bc1b4fa42c99c89c5eaa63b0239d34b32dd7270ea336f34e8b1
diff --git a/net-ftp/frox/frox-0.7.18-r7.ebuild b/net-ftp/frox/frox-0.7.18-r8.ebuild
index b0221a94fd79..f6b1a1a13c43 100644
--- a/net-ftp/frox/frox-0.7.18-r7.ebuild
+++ b/net-ftp/frox/frox-0.7.18-r8.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools user
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A transparent ftp proxy"
 SRC_URI="http://frox.sourceforge.net/download/${P}.tar.bz2"
@@ -14,12 +15,15 @@ KEYWORDS="amd64 ~ppc x86"
 IUSE="clamav ssl transparent"
 
 DEPEND="
+	acct-group/ftpproxy
+	acct-user/ftpproxy
 	clamav? ( >=app-antivirus/clamav-0.80 )
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6 )
 	ssl? (
 		dev-libs/openssl:0=
 	)
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6 )
 "
+
 RDEPEND="${DEPEND}"
 
 # INSTALL has useful filewall rules
@@ -31,9 +35,6 @@ DOCS=(
 )
 
 pkg_setup() {
-	enewgroup ftpproxy
-	enewuser ftpproxy -1 -1 /var/spool/frox ftpproxy
-
 	use clamav && ewarn "Virus scanner potentialy broken in chroot - see bug #81035"
 }
 
@@ -48,8 +49,8 @@ src_prepare() {
 	eapply "${FILESDIR}/${P}-no-common.patch"
 
 	if use clamav ; then
-		sed -i -e "s:^# VirusScanner.*:# VirusScanner '\"/usr/bin/clamscan\" \"%s\"':" \
-			"src/${PN}.conf" || die
+		sed -e "s:^# VirusScanner.*:# VirusScanner '\"/usr/bin/clamscan\" \"%s\"':" \
+			-i "src/${PN}.conf" || die
 	fi
 
 	mv configure.in configure.ac || die
@@ -57,24 +58,26 @@ src_prepare() {
 }
 
 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) \
+	local myeconfargs=(
+		--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)
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
 
-	keepdir /var/{log,spool}/"${PN}"
+	keepdir /var/log/"${PN}"
 
-	fperms 700 /var/spool/frox
-	fowners ftpproxy:ftpproxy /var/{log,spool}/frox
+	fowners ftpproxy:ftpproxy /var/log/frox
 
 	newman "doc/${PN}.man" "${PN}.man.8"
 	newman "doc/${PN}.conf.man" "${PN}.conf.man.5"