gentoo resync : 28.04.2021

2 files changed, 30 insertions, 33 deletions

diff --git a/net-proxy/wwwoffle/Manifest b/net-proxy/wwwoffle/Manifest
index 0f144a53d60a..3d29ef0542b7 100644
--- a/net-proxy/wwwoffle/Manifest
+++ b/net-proxy/wwwoffle/Manifest
@@ -3,5 +3,5 @@ AUX wwwoffle-online.confd 305 BLAKE2B 42037033ca0b12993cc0c1c6e5d1d6f7665df07233
 AUX wwwoffle-online.initd 576 BLAKE2B e929f32ba1fef07faf66b505e59e75243eafd35f1bc0c35d0996479e3f905c00f4a11ab41dc951cfc750a7587d43844222ae4a14454a8236affe3bec62ec1087 SHA512 bd5950969e19e8b99b798939e00c00d0325369502a5552507066900ab02b67e06ee8ae25f450fc7df48ce9dd19e4fc6aae969f9fd3e055564fea000a34904af8
 AUX wwwoffle.initd 426 BLAKE2B e92e7ad6fae5e25e1862664e0411a697be5d4440e3b6450adaab5b9118f30a57be31ad7e33775ce96d7ace85bc9167beca2e3f27393de5b99a29b03f5653f9f9 SHA512 3fc856cdb481a21a39c9874c2170148750968a776d54b43e7f0add51c2f3d4274d8050e04001241401878fa45369063b2e0736b8d84aa6d9f1c939a7b59589df
 DIST wwwoffle-2.9i.tgz 1113771 BLAKE2B 5acf6e14f362fe87d8f91599aaf113ce8ea5a178ed08eb21d4371d0edfc77a5c0a38e8e0053b51cf6426b0b701ba4fbbddfc84240161877a892aa2da303a5ecf SHA512 c9e9d67df9a0e40b584916857221a9a728f36a677cba28527f8c2febea1a23379d3b112d96723bf01ec1718a0897d8980715864ac7ef898b2585dd3f01d9a456
-EBUILD wwwoffle-2.9i-r1.ebuild 3418 BLAKE2B 44db34afd5b4d98fac8e465ad986401402cb47dd7380697eb480a52e18133b43a4b57edc1f5a556a2e6866b79703eba62c21070a187248cac050a58efbfc961e SHA512 a694771a9cf60a2a39fc330a32b551388fed6822db148f00658eabba893a3f05612210d1d3617e92a60ac8667262460b0944e892edeec76576d8d9d951867709
+EBUILD wwwoffle-2.9i-r2.ebuild 3301 BLAKE2B 9ddb027d83887d00d6826090b0334bc31c652bbc279fafd65f94a8c7d8ae029fda9ea15d069112ecdf01948df7f9c35a12a9fd893343f9f8c820170725c31519 SHA512 3f1dd00589393c57f79569a338ac49dac9981e16f9021c2bbe96dc33c81c70c839385484a30192bf6362027e153c9c821539d17edc07760a6206ac5967721ca9
 MISC metadata.xml 411 BLAKE2B e496e1af92583008ac4b5a911875b4ff673a185f40fa11f220dfb4f8cfa48863978831f5d94da2182adc68d41fc7f352d78770492cc13653c6de1da4d2a672df SHA512 5fda409241cb042a9d6fc2e40f1af97a92b75294477b15303d4413ea4a2cf358e52c64ade1dff386afa8582f84e7c7b75034bb95e1032e65de0bf5bf61c50d7e
diff --git a/net-proxy/wwwoffle/wwwoffle-2.9i-r1.ebuild b/net-proxy/wwwoffle/wwwoffle-2.9i-r2.ebuild
index 9ad5008d950c..a9ea1c3fbe98 100644
--- a/net-proxy/wwwoffle/wwwoffle-2.9i-r1.ebuild
+++ b/net-proxy/wwwoffle/wwwoffle-2.9i-r2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils user
+EAPI=7
 
 DESCRIPTION="Web caching proxy suitable for non-permanent Internet connections"
 HOMEPAGE="https://www.gedanken.org.uk/software/wwwoffle/"
@@ -13,27 +12,34 @@ SLOT="0"
 LICENSE="GPL-2"
 IUSE="gnutls ipv6 zlib"
 
-RDEPEND="gnutls? ( net-libs/gnutls )
-	zlib? ( sys-libs/zlib )"
-DEPEND="dev-lang/perl
+RDEPEND="
+	acct-group/wwwoffle
+	acct-user/wwwoffle
+	gnutls? ( net-libs/gnutls )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	dev-lang/perl
 	sys-devel/flex
-	${RDEPEND}"
-
+	${RDEPEND}
+"
 # Unsure whether to depend on >=www-misc/htdig-3.1.6-r4 or not
 
+PATCHES=( "${FILESDIR}"/${PN}-2.9i-define.patch )
+
 src_prepare() {
-	eapply "${FILESDIR}"/${PN}-2.9i-define.patch
-	sed -i cache/Makefile.in \
-		-e 's#$(TAR) xpf #$(TAR) --no-same-owner -xpf #' \
-		|| die
 	default
+	sed -e 's#$(TAR) xpf #$(TAR) --no-same-owner -xpf #' -i cache/Makefile.in || die
 }
 
 src_configure() {
-	econf \
-		$(use_with gnutls) \
-		$(use_with ipv6) \
+	local myeconfargs=(
+		$(use_with gnutls)
+		$(use_with ipv6)
 		$(use_with zlib)
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -57,30 +63,23 @@ src_install() {
 	done
 
 	# empty dirs are removed during update
-	keepdir \
-		/var/spool/wwwoffle/search/{mnogosearch/db,htdig/tmp,htdig/db-lasttime,htdig/db,namazu/db}
+	keepdir /var/spool/wwwoffle/search/{mnogosearch/db,htdig/tmp,htdig/db-lasttime,htdig/db,namazu/db}
 
-	touch \
-		"${D}/var/spool/wwwoffle/search/htdig/wwwoffle-htdig.log" \
-		"${D}/var/spool/wwwoffle/search/mnogosearch/wwwoffle-mnogosearch.log" \
-		"${D}/var/spool/wwwoffle/search/namazu/wwwoffle-namazu.log"
+	touch "${D}/var/spool/wwwoffle/search/htdig/wwwoffle-htdig.log"
+	touch "${D}/var/spool/wwwoffle/search/mnogosearch/wwwoffle-mnogosearch.log"
+	touch "${D}/var/spool/wwwoffle/search/namazu/wwwoffle-namazu.log"
 
 	# TODO htdig indexing as part of initscripts
 
 	# robots.txt modification - /var/spool/wwwoffle/html/en
-	# 		- remove Disallow: /index
-	sed -i -e "s|Disallow:.*/index|#Disallow: /index|" "${D}/var/spool/wwwoffle/html/en/robots.txt"
+	# - remove Disallow: /index
+	sed -e "s|Disallow:.*/index|#Disallow: /index|" -i "${D}/var/spool/wwwoffle/html/en/robots.txt" || die
 }
 
 pkg_preinst() {
-	# Add a wwwoffle user
-	enewgroup wwwoffle
-	enewuser wwwoffle -1 -1 /var/spool/wwwoffle wwwoffle
-
 	# Changing the user:group to wwwoffle:woffle
 	fowners -R wwwoffle:wwwoffle /var/spool/wwwoffle /etc/wwwoffle
-	sed -i -e 's/^[# \t]\(run-[gu]id[ \t]*=[ \t]*\)[a-zA-Z0-9]*[ \t]*$/ \1wwwoffle/g' \
-		"${D}/etc/wwwoffle/wwwoffle.conf"
+	sed -e 's/^[# \t]\(run-[gu]id[ \t]*=[ \t]*\)[a-zA-Z0-9]*[ \t]*$/ \1wwwoffle/g' -i "${D}/etc/wwwoffle/wwwoffle.conf" || die
 
 }
 
@@ -93,10 +92,8 @@ pkg_postinst() {
 		[ ! -d "${ROOT}/var/spool/wwwoffle/prevout${number}" ] && \
 			keepdir "${ROOT}/var/spool/wwwoffle/prevout${number}"
 	done
-	chown -R wwwoffle:wwwoffle "${ROOT}/var/spool/wwwoffle" "${ROOT}/etc/wwwoffle"
 
-	[ -f "${T}/stopped" ] && \
-		ewarn "wwwoffled was stopped. /etc/init.d/wwwoffled start to restart AFTER etc-update"
+	[ -f "${T}/stopped" ] && ewarn "wwwoffled was stopped. /etc/init.d/wwwoffled start to restart AFTER etc-update"
 
 	einfo "wwwoffled should run as an ordinary user now. The run-uid and run-gid should be set"
 	einfo "to \"wwwoffle\" in your /etc/wwwoffle/wwwoffle.conf. Please uncomment this if it hasn't been already"