commit: bc0526940c744f8255127432361ca5d304ce5268
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 22 22:16:07 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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
