net-analyzer/vnstat: add 2.7

Signed-off-by: Sam James <sam@gentoo.org>

3 files changed, 94 insertions, 10 deletions

diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 5d92ab134173..303e92c6e949 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -2,3 +2,5 @@ DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7
 DIST vnstat-1.17.tar.gz.asc 819 BLAKE2B 3186e28dc29edb37eb0bbef9b29f1ea682e4a9de208b69b83a8bc99c81f272eb6865176aaa30e415bf8423d94f385e0725e1256eeb822c3152638eaace23b749 SHA512 c26af29daefe6431c1769812d04ba5bff92ac1241a6a49df11e28f0e51b21d4eb84ff1f1fb133a388fd8ac59967162bc5d60d5f02c409d34be5414acd34f7818
 DIST vnstat-2.6.tar.gz 275751 BLAKE2B 7351b265d66e42d1e5450dae6f5eaa973a9cdc171b865689540b5838ddeb2629da968bc2ba655cb6ff909227a859f0334900a1597c78b772124a993343a4cf23 SHA512 1a62fc9c2379b050208945e85bad04f602a0f2c71e6bd069d241c1df77c76ec6258948fc3fdf633b15c52665782cae4f995a916103d330bfb46cab0291d3a1ea
 DIST vnstat-2.6.tar.gz.asc 833 BLAKE2B 5e79d1b622dd4d37603a209b78018a3e88f2c404c700e1f439e4b98e2c2dd5bdf26e8ecd3b1b1242e14a725d7839c5a8b3b5448dc27e1f917cbeaf6012546656 SHA512 c643152bec14b70317465f8adc2256b41b8686e106b35ce492ad5030c2d5b32162441ac5fb2f309071da855efdf444076288cf075d8073bad0c0907067366e7f
+DIST vnstat-2.7.tar.gz 287304 BLAKE2B f7b50cccfe4b62bce45751e6029650dc6d8ac7b7925cc4177fb1772c6d842b5201f6834d5e6374016b4c42374660b1c127d5b021adffe873de0a4c484171b6b3 SHA512 3d1674ddb5269d29d4d758551dc3e58fb1858a7dd790914c7d74047443b25d242c91f8ab20bdede9c1b061d6b682d73f3d6c1a8aa656a9676bc33c0ed9b1b2d4
+DIST vnstat-2.7.tar.gz.asc 833 BLAKE2B ae9bb28ccd9f10e7ac0c32e9895140cdd9d8498ef18d9b716ffbed3c6693ff08e5ddb08c377ec009df881f7fc1666f09da48cee75857566bdd4f1a2be30a97b9 SHA512 dd1ae2d94400aee9622c28385a103680ca87abfb66b5c92e8ce7240b97f28e81ac1a9cfc97fff7cd6d3934bfa639f46c835acbf855c7a4a29309946d7cbd80d4
diff --git a/net-analyzer/vnstat/vnstat-2.7.ebuild b/net-analyzer/vnstat/vnstat-2.7.ebuild
new file mode 100644
index 000000000000..189549001483
--- /dev/null
+++ b/net-analyzer/vnstat/vnstat-2.7.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd tmpfiles
+
+DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
+HOMEPAGE="https://humdi.net/vnstat/"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/vergoh/vnstat"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc
+	inherit verify-sig
+
+	SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+	BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gd selinux test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/vnstat
+	acct-user/vnstat
+	dev-db/sqlite
+	gd? ( media-libs/gd[png] )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-libs/check )
+"
+RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2-conf.patch
+	"${FILESDIR}"/${PN}-2.2-drop-root.patch
+	"${FILESDIR}"/${PN}-2.2-run.patch
+)
+
+src_compile() {
+	emake \
+		${PN} \
+		${PN}d \
+		$(usex gd ${PN}i '')
+}
+
+src_install() {
+	use gd && dobin vnstati
+	dobin vnstat vnstatd
+
+	exeinto /usr/share/${PN}
+	newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron
+
+	insinto /etc
+	doins cfg/vnstat.conf
+	fowners root:vnstat /etc/vnstat.conf
+
+	keepdir /var/lib/vnstat
+	fowners vnstat:vnstat /var/lib/vnstat
+
+	newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd
+	newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd
+
+	systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service
+	newtmpfiles "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf
+
+	use gd && doman man/vnstati.1
+
+	doman man/vnstat.1 man/vnstatd.8
+
+	newdoc INSTALL README.setup
+	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
+}
diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild
index ef79532e70ff..189549001483 100644
--- a/net-analyzer/vnstat/vnstat-9999.ebuild
+++ b/net-analyzer/vnstat/vnstat-9999.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/"
@@ -29,6 +29,8 @@ IUSE="gd selinux test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	acct-group/vnstat
+	acct-user/vnstat
 	dev-db/sqlite
 	gd? ( media-libs/gd[png] )
 "
@@ -44,13 +46,11 @@ 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 '')
+	emake \
+		${PN} \
+		${PN}d \
+		$(usex gd ${PN}i '')
 }
 
 src_install() {
@@ -75,8 +75,8 @@ src_install() {
 
 	use gd && doman man/vnstati.1
 
-	doman man/vnstat.1 man/vnstatd.1
+	doman man/vnstat.1 man/vnstatd.8
 
-	newdoc INSTALL.md README.setup
-	dodoc CHANGES README.md UPGRADE.md FAQ examples/vnstat.cgi
+	newdoc INSTALL README.setup
+	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
 }