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 5A49E13835A for ; Tue, 23 Mar 2021 04:53:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7FA60E081E; Tue, 23 Mar 2021 04:53:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 675AAE081E for ; Tue, 23 Mar 2021 04:53:25 +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 01E0233BEC5 for ; Tue, 23 Mar 2021 04:53:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 42FCE5CE for ; Tue, 23 Mar 2021 04:53:22 +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: <1616474919.bc0526940c744f8255127432361ca5d304ce5268.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/vnstat/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/vnstat/vnstat-1.17.ebuild net-analyzer/vnstat/vnstat-2.6.ebuild net-analyzer/vnstat/vnstat-9999.ebuild X-VCS-Directories: net-analyzer/vnstat/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: bc0526940c744f8255127432361ca5d304ce5268 X-VCS-Branch: master Date: Tue, 23 Mar 2021 04:53:22 +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: 0441c4d1-3d2d-4217-b49a-4c994e763683 X-Archives-Hash: 54f3aa014a9b4d419e6b028c51820551 commit: bc0526940c744f8255127432361ca5d304ce5268 Author: Sam James gentoo org> AuthorDate: Mon Mar 22 22:16:07 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 23 04:48:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc052694 net-analyzer/vnstat: port to EAPI 7 Signed-off-by: Sam James gentoo.org> net-analyzer/vnstat/vnstat-1.17.ebuild | 14 +++++--------- net-analyzer/vnstat/vnstat-2.6.ebuild | 9 +++------ net-analyzer/vnstat/vnstat-9999.ebuild | 9 +++------ 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/net-analyzer/vnstat/vnstat-1.17.ebuild b/net-analyzer/vnstat/vnstat-1.17.ebuild index 16116526575..9207b1560e1 100644 --- a/net-analyzer/vnstat/vnstat-1.17.ebuild +++ b/net-analyzer/vnstat/vnstat-1.17.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit toolchain-funcs user @@ -15,17 +15,12 @@ KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc x86" IUSE="gd selinux test" RESTRICT="!test? ( test )" -COMMON_DEPEND=" - gd? ( media-libs/gd[png] ) -" +RDEPEND="gd? ( media-libs/gd[png] )" DEPEND=" - ${COMMON_DEPEND} + ${RDEPEND} test? ( dev-libs/check ) " -RDEPEND=" - ${COMMON_DEPEND} - selinux? ( sec-policy/selinux-vnstatd ) -" +RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )" pkg_setup() { enewgroup vnstat @@ -42,6 +37,7 @@ src_prepare() { -e 's|vnstat[.]pid|vnstatd/vnstatd.pid|' \ -e 's|/var/run|/run|' \ cfg/${PN}.conf || die + sed -i \ -e '/PIDFILE/s|/var/run|/run|' \ src/common.h || die diff --git a/net-analyzer/vnstat/vnstat-2.6.ebuild b/net-analyzer/vnstat/vnstat-2.6.ebuild index 4ccbbb50586..bf03bc30dc4 100644 --- a/net-analyzer/vnstat/vnstat-2.6.ebuild +++ b/net-analyzer/vnstat/vnstat-2.6.ebuild @@ -15,18 +15,15 @@ KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86" IUSE="gd selinux test" RESTRICT="!test? ( test )" -COMMON_DEPEND=" +RDEPEND=" dev-db/sqlite gd? ( media-libs/gd[png] ) " DEPEND=" - ${COMMON_DEPEND} + ${RDEPEND} test? ( dev-libs/check ) " -RDEPEND=" - ${COMMON_DEPEND} - selinux? ( sec-policy/selinux-vnstatd ) -" +RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )" PATCHES=( "${FILESDIR}"/${PN}-2.2-conf.patch diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild index 64355e68ca2..ff0d5392bc3 100644 --- a/net-analyzer/vnstat/vnstat-9999.ebuild +++ b/net-analyzer/vnstat/vnstat-9999.ebuild @@ -14,18 +14,15 @@ SLOT="0" IUSE="gd selinux test" RESTRICT="!test? ( test )" -COMMON_DEPEND=" +RDEPEND=" dev-db/sqlite gd? ( media-libs/gd[png] ) " DEPEND=" - ${COMMON_DEPEND} + ${RDEPEND} test? ( dev-libs/check ) " -RDEPEND=" - ${COMMON_DEPEND} - selinux? ( sec-policy/selinux-vnstatd ) -" +RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )" PATCHES=( "${FILESDIR}"/${PN}-2.2-conf.patch