From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BA8341382C5 for ; Sat, 3 Apr 2021 16:10:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE785E08BF; Sat, 3 Apr 2021 16:10:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 88F9FE08BF for ; Sat, 3 Apr 2021 16:10:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4F052335D16 for ; Sat, 3 Apr 2021 16:10:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A93F9634 for ; Sat, 3 Apr 2021 16:10:41 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1617466225.d99341d0768d900e70b496fd1d6cdae92e5259b2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/smokeping/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/smokeping/smokeping-2.7.3.ebuild X-VCS-Directories: net-analyzer/smokeping/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d99341d0768d900e70b496fd1d6cdae92e5259b2 X-VCS-Branch: master Date: Sat, 3 Apr 2021 16:10:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 77cfd37b-945c-4e33-b9bd-70ba12bcde36 X-Archives-Hash: 068e18e35131076cc96f1ccc045bd4b4 commit: d99341d0768d900e70b496fd1d6cdae92e5259b2 Author: Sam James gentoo org> AuthorDate: Fri Apr 2 01:14:19 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat Apr 3 16:10:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d99341d0 net-analyzer/smokeping: eutils--, multilib--, QA fixes * Drop eutils, multilib (unused) * ${D} -> ${ED} * Sort inherits * Fix overquoting * Missing || dies Signed-off-by: Sam James gentoo.org> net-analyzer/smokeping/smokeping-2.7.3.ebuild | 42 +++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/net-analyzer/smokeping/smokeping-2.7.3.ebuild b/net-analyzer/smokeping/smokeping-2.7.3.ebuild index 1e78c595820..ec397188874 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 '/^