gentoo resync : 27.03.2021

4 files changed, 15 insertions, 25 deletions

diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 226f365b86de..6828d3f0151b 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -11,7 +11,7 @@ AUX vnstatd.systemd 262 BLAKE2B e54c30a1bfa6c7a8bba32fa93c3d2417506c55e949975441
 AUX vnstatd.tmpfile 35 BLAKE2B c56373ebe1abe1111f6927839d79094b6ffd11527ce4e21016c31fc227f9564218ca479455b7cf4eb697d18d8389ba65266b91d71c5bf22c83a9337ae1d861d9 SHA512 e13b52e3c4fe8743074ab2704b6a6cbe0c855589fe19e05bba98f0193473437f350dfdc9675689172c54ed83491d9caef0cbb842f6c2533b98366cd78a4f0bac
 DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7964aad90fb76c407c5f7fb0085e6f9f54408e8ebc667475c15f260d701c5924737f20921ebc0a35affd52be SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3
 DIST vnstat-2.6.tar.gz 275751 BLAKE2B 7351b265d66e42d1e5450dae6f5eaa973a9cdc171b865689540b5838ddeb2629da968bc2ba655cb6ff909227a859f0334900a1597c78b772124a993343a4cf23 SHA512 1a62fc9c2379b050208945e85bad04f602a0f2c71e6bd069d241c1df77c76ec6258948fc3fdf633b15c52665782cae4f995a916103d330bfb46cab0291d3a1ea
-EBUILD vnstat-1.17.ebuild 1458 BLAKE2B 8e0eeae3c66850f4ad564c9e9d334cb8052e2ac760f0f94ab0a1bb244dfdde0bf1bf760ca373317b0797937745b3e74109c1a498893960aa25b8da24dac73d89 SHA512 46ed0c0025ec163d48d031cc65522e102385c34a479ab0f4615c869cdd6e05f9c7ff9837bde2c7711265976f7d7d580c0febdaf00dd9dde52aee3b7fed93b73e
-EBUILD vnstat-2.6.ebuild 1561 BLAKE2B 8ffd1de041cbadf89982365c8be947f4fe0cf537f03a4bbd98f70d7bf1cfddfce1971695d15e7bf2462b764e34ab41bba9eaa9ecaeb9d55407ff66e23344eb5e SHA512 e230dc2d432ab31a784087dda29021750df1128f73885baaaf84abd24c25ff985f173a63f22396076df8b3b05872d33399dde2464c644f6d06350a15db86bd2a
-EBUILD vnstat-9999.ebuild 1519 BLAKE2B a9bd990050d62fae537e76dc7e4c2b6dec908510180672779701503714bf5e9c1b17b36cf0343198010df4b27d9e0fdb6bfe9c78451531c944b5bc3d5df3fb08 SHA512 598c1e18075a2612bc97a5f5d5d15d190951d04ee64fe0c14b11db5d30c87061c3d32789875351de077230b325bfa2f089a7d278ea482b422306992a76c7fe65
+EBUILD vnstat-1.17.ebuild 1425 BLAKE2B 13d7096fa03fd28c39a211fa261bdd6bedace4d1cef1bfd614c26dc63d0a988838de339a1a4b19b09605791a0ab1f279be40c39ca5218c44a09d05ad24bb54bb SHA512 8bef70d7837e76272fedfad2fc00edb48bf9c56d6ccf6fb75430add66919254be9073bf95cacbb9c87b1428b86079618f404813cb2853a451445ed1b7dedd55a
+EBUILD vnstat-2.6.ebuild 1529 BLAKE2B 790c85573a76c6ec9d6ce9632c25094a5e61b0403cbac89c5831a846c2949c609209883148e5a50765fee2f55bfc8b5db1cf0ad0e85b3101e8e6c6dcf1847688 SHA512 026157cb62aed814f7291901f2ea82695b2242c7311dec3181024163f2882f2368beb475531d8c9262064fa20d69cf17fe18e551ca715ebb4b0db4a40752f547
+EBUILD vnstat-9999.ebuild 1488 BLAKE2B 11f18a3b2fcaf87fbffc266e55fdc87f05274ba7fa88e5327b8155c4a35de6d25cd21325c2755d67e92c74920c6aff69ca63c74c72d8e1410f5e4a7b194a99f9 SHA512 50d488474af7616b17fcc555c15ded4ec07d1c173c59edf8c5120ebe826218993e86845e7146090bdf9cb0178aa4534fdd1e8a6559c63a045fa87dbd6bb97926
 MISC metadata.xml 835 BLAKE2B 4798aa86fd444665d135f7b2ede84889049113260c965b01999a2f9000c826fefa6877e8d3267a813421df97b2a0076f0718278ad3e0cf376bfc91babaaf87f3 SHA512 1c51f11ba3524329dec2101494c89d26859eab16e862e36e49df9240ee3fddf0380bfd929ec1719fc0e21808fc26f381b3be06f5fc89127f4c7e2fd188b3e886
diff --git a/net-analyzer/vnstat/vnstat-1.17.ebuild b/net-analyzer/vnstat/vnstat-1.17.ebuild
index 161165265750..9207b1560e11 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 30d3f0bffd40..bf03bc30dc4a 100644
--- a/net-analyzer/vnstat/vnstat-2.6.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.6.ebuild
@@ -11,22 +11,19 @@ SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
+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 64355e68ca24..ff0d5392bc37 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