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 DA1BC13835A for ; Mon, 17 May 2021 00:39:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F018DE0814; Mon, 17 May 2021 00:39:36 +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 DA5B4E0814 for ; Mon, 17 May 2021 00:39:36 +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 BAE96340F13 for ; Mon, 17 May 2021 00:39:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2631678D for ; Mon, 17 May 2021 00:39:34 +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: <1621211831.84b3c8ea900896452c2fafac4710ecf6dafd0349.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-r1.ebuild net-analyzer/vnstat/vnstat-1.17.ebuild net-analyzer/vnstat/vnstat-2.6-r1.ebuild net-analyzer/vnstat/vnstat-2.6.ebuild X-VCS-Directories: net-analyzer/vnstat/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 84b3c8ea900896452c2fafac4710ecf6dafd0349 X-VCS-Branch: master Date: Mon, 17 May 2021 00:39:34 +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: 35ed50cd-e61a-49b6-b850-0dc0f5823461 X-Archives-Hash: d9fedb6e61be0364fffe505632d7365e commit: 84b3c8ea900896452c2fafac4710ecf6dafd0349 Author: Sam James gentoo org> AuthorDate: Mon May 17 00:35:38 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon May 17 00:37:11 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84b3c8ea net-analyzer/vnstat: port 1.17, 2.6 to GLEP 81 too Signed-off-by: Sam James gentoo.org> .../vnstat/{vnstat-1.17.ebuild => vnstat-1.17-r1.ebuild} | 11 ++++------- .../vnstat/{vnstat-2.6.ebuild => vnstat-2.6-r1.ebuild} | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/net-analyzer/vnstat/vnstat-1.17.ebuild b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild similarity index 89% rename from net-analyzer/vnstat/vnstat-1.17.ebuild rename to net-analyzer/vnstat/vnstat-1.17-r1.ebuild index 5a1f12b3e07..fceff0f93ca 100644 --- a/net-analyzer/vnstat/vnstat-1.17.ebuild +++ b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild @@ -4,7 +4,7 @@ EAPI=7 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc -inherit toolchain-funcs user verify-sig +inherit toolchain-funcs verify-sig DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" HOMEPAGE="https://humdi.net/vnstat/" @@ -22,14 +22,11 @@ DEPEND=" ${RDEPEND} test? ( dev-libs/check ) " -RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )" +RDEPEND+=" acct-group/vnstat + acct-user/vnstat + selinux? ( sec-policy/selinux-vnstatd )" BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )" -pkg_setup() { - enewgroup vnstat - enewuser vnstat -1 -1 /dev/null vnstat -} - src_prepare() { default diff --git a/net-analyzer/vnstat/vnstat-2.6.ebuild b/net-analyzer/vnstat/vnstat-2.6-r1.ebuild similarity index 91% rename from net-analyzer/vnstat/vnstat-2.6.ebuild rename to net-analyzer/vnstat/vnstat-2.6-r1.ebuild index e1ce66f909c..3d37feff320 100644 --- a/net-analyzer/vnstat/vnstat-2.6.ebuild +++ b/net-analyzer/vnstat/vnstat-2.6-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit systemd user tmpfiles +inherit systemd tmpfiles DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" HOMEPAGE="https://humdi.net/vnstat/" @@ -36,7 +36,9 @@ DEPEND=" ${RDEPEND} test? ( dev-libs/check ) " -RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )" +RDEPEND+=" acct-group/vnstat + acct-user/vnstat + selinux? ( sec-policy/selinux-vnstatd )" PATCHES=( "${FILESDIR}"/${PN}-2.2-conf.patch @@ -44,11 +46,6 @@ PATCHES=( "${FILESDIR}"/${PN}-2.2-run.patch ) -pkg_setup() { - enewgroup vnstat - enewuser vnstat -1 -1 /var/lib/vnstat vnstat -} - src_compile() { emake ${PN} ${PN}d $(usex gd ${PN}i '') }