gentoo resync : 28.04.2021

2 files changed, 22 insertions, 22 deletions

diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index e9fbcadaed83..52d564d41520 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -3,5 +3,5 @@ AUX smokeping.conf 32 BLAKE2B ea64af0cebbb847c89503b3d893c902ab2d761afbce6594731
 AUX smokeping.init.5 1360 BLAKE2B 4213a42dcd43c1166c5f10d287c9e50be37265f8be6db3a8b9e18351dfbe7259a8ca98eff044cd1c7ef657356e3960e60745aea63a79bdc73fd009b3bd746bd7 SHA512 64adf577c9d7d79c268cf46c40ed7db23c93cbd49897070d9028ee6636794b1c101d1a9d1ff6f92c24512e18bf0f06b10b67117090918920fb8b8189dec85d4f
 AUX smokeping.service 200 BLAKE2B 77110386e5d304c04d00114800c1f42bb5e8b5ce1eab419afd2fa7c59c1a569fe244c7f7c18e01519d82389bf66f5b6935dd212b3bf68ace9b480e981c311001 SHA512 2f8824143b8283ad02274107c5ed0e84f0c1465fc089823e36ef44a42fec68564d8cc4ff5fb0ad6dc0443e21fac5a8cbcbb0a9bea151b57efaff2a082d15f344
 DIST smokeping-2.7.3.tar.gz 6614710 BLAKE2B 7fa10c19487427a3092a1e5591422cb37f66a6eab86b8b43eebbc8af441d5426b99f3c7b54040660f6f150ade99b1ea2555b4fcd6f80d8306d6f86ac9f95974e SHA512 d46d61539ffdd9cac41391aa813364260f90f84443c328b1c9233ab6ba3a0c157861694614e6c33e18b153f6a6afc0769c5fc7752b3ab52f114d984e53232830
-EBUILD smokeping-2.7.3.ebuild 4124 BLAKE2B 3ef8badf51fe0bd58e7bccba59b4358d79d14e31e1f96de5bbbe8ecdd6387a2d8d11da5bf66f44e3b8fa6751e105951e04457cc8fb4cdfa0b33f8dc25ac21c41 SHA512 526d5a13df1a00b91634b307c1260648dff83363920942ad6ebf97149cfd151b215e3ee3b1aa98128f1c0a430cd459bad95c41d7869d3ce2d27a282ad062934d
+EBUILD smokeping-2.7.3.ebuild 4197 BLAKE2B ba54d0bbf60fdf40623a98015425bac299c8b864cc8c60ecd2f377089c6cd9b7c1708afd6b1525bb426b427b9259e37dff15ec5935554424fb0f9d570cbeb983 SHA512 0d405286984f37e95c2d51a9a19b0223097dd9b06489c65ef00a612bc1df0b2cdca21d91a055f0520d1c354a6fa392d37506d94079a0ba866c9a69440a74f18a
 MISC metadata.xml 468 BLAKE2B d219af56f99fd891f8990b2298c9daa86d8fa3f8433b04eeabab1d47492a4ba186906a265612422517f9fb373217473fd047412dc08b7b1bf3f2aaccc92ec2d9 SHA512 0ca877d24981625a5d601cd19fc18fe37b48526c7266c248ee0ba955ecc873b31ea5f06d3feb692566d228a481193fab1f70c53aaa0be089aee490d80f80e815
diff --git a/net-analyzer/smokeping/smokeping-2.7.3.ebuild b/net-analyzer/smokeping/smokeping-2.7.3.ebuild
index 1e78c5958201..ec3971888746 100644
--- a/net-analyzer/smokeping/smokeping-2.7.3.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.7.3.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools eutils multilib user systemd tmpfiles
+
+inherit autotools systemd tmpfiles user
 
 DESCRIPTION="A powerful latency measurement tool"
 HOMEPAGE="https://oss.oetiker.ch/smokeping/"
@@ -11,7 +12,6 @@ SRC_URI="https://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-
 IUSE="apache2 curl dig echoping ipv6 radius"
 
 DEPEND="
@@ -45,7 +45,6 @@ DEPEND="
 	ipv6? ( >=dev-perl/Socket6-0.20 )
 	radius? ( dev-perl/Authen-Radius )
 "
-
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
@@ -58,8 +57,9 @@ src_prepare() {
 
 	sed -i -e '/^SUBDIRS = / s|thirdparty||g' Makefile.am || die
 	sed -i -e '/^perllibdir = / s|= .*|= $(libdir)|g' lib/Makefile.am || die
-	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die # dev-perl/SNMP_Session
-	echo ${PV} > VERSION
+	# bundled(?) dev-perl/SNMP_Session
+	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die
+	echo ${PV} > VERSION || die
 
 	eautoreconf
 }
@@ -79,14 +79,14 @@ src_install() {
 	default
 
 	newinitd "${FILESDIR}"/${PN}.init.5 ${PN}
-	dotmpfiles "${FILESDIR}"/"${PN}".conf
-	systemd_dounit "${FILESDIR}"/"${PN}".service
+	dotmpfiles "${FILESDIR}"/${PN}.conf
+	systemd_dounit "${FILESDIR}"/${PN}.service
 
-	mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html"
-	mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config"
-	mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail"
-	mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets"
-	mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail"
+	mv "${ED}/etc/smokeping/basepage.html.dist" "${ED}/etc/smokeping/basepage.html" || die
+	mv "${ED}/etc/smokeping/config.dist" "${ED}/etc/smokeping/config" || die
+	mv "${ED}/etc/smokeping/smokemail.dist" "${ED}/etc/smokeping/smokemail" || die
+	mv "${ED}/etc/smokeping/smokeping_secrets.dist" "${ED}/etc/smokeping/smokeping_secrets" || die
+	mv "${ED}/etc/smokeping/tmail.dist" "${ED}/etc/smokeping/tmail" || die
 
 	sed -i \
 		-e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
@@ -98,27 +98,27 @@ src_install() {
 		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
 		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
 		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
-		"${D}/etc/${PN}/config" || die
+		"${ED}/etc/${PN}/config" || die
 
 	sed -i \
 		-e '/^<script/{s:cropper/:/cropper/:}' \
-		"${D}/etc/${PN}/basepage.html" || die
+		"${ED}/etc/${PN}/basepage.html" || die
 
 	sed -i \
 		-e 's/$FindBin::RealBin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
-		"${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die
+		"${ED}/usr/bin/smokeping" "${ED}/usr/bin/smokeping_cgi" || die
 
 	sed -i \
 		-e 's:etc/config.dist:/etc/smokeping/config:' \
-		"${D}/usr/bin/tSmoke" || die
+		"${ED}/usr/bin/tSmoke" || die
 
 	sed -i \
 		-e 's:/usr/etc/config:/etc/smokeping/config:' \
-		"${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die
+		"${ED}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die
 
 	dodir /var/www/localhost/cgi-bin
-		mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
-		"${D}/var/www/localhost/cgi-bin/smokeping.fcgi"
+	mv "${ED}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
+		"${ED}/var/www/localhost/cgi-bin/smokeping.fcgi" || die
 
 	fperms 700 /etc/${PN}/smokeping_secrets
 
@@ -142,6 +142,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
-	chmod 755 "${ROOT}/var/lib/${PN}"
+	chown smokeping:smokeping "${EROOT}"/var/lib/${PN} || die
+	chmod 755 "${EROOT}"/var/lib/${PN} || die
 }