gentoo auto-resync : 24:10:2022 - 15:52:09

4 files changed, 97 insertions, 2 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 06ea5a08e735..1a6ecbcce007 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 9e640811acc2..e330322cb1b4 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -4,8 +4,11 @@ AUX vnstatd.confd-r1 569 BLAKE2B 8f30a05a587477d8c76f97542017aece78ef3c69a608e97
 AUX vnstatd.initd-r2 874 BLAKE2B 4ce5936af3a375d30bc8ab1b5ea1ddf1c2b4910394b8a9e67f94998f8af0e9ca2968a65618e3fbd3ead2f2c3a6e8d674b861dc85b0a57c9fcb63a3e6ce93887b SHA512 1d670980c73a40c92029a3b2141e84d428f41d68528daf199fb6659f164bec903eeef437200da4043d2e6fd3f5abf32c7b6e75dc00054417ff4f38ad55b0a535
 AUX vnstatd.systemd 262 BLAKE2B e54c30a1bfa6c7a8bba32fa93c3d2417506c55e9499754419b24179147a5b35f0c51cf61a3f7c4840c88f81d09101c427ba64b41f0922303b8c353caafb883db SHA512 35f9714641d1b3288bed659bd010ef1b8f0316f915622dcf5d3250e1acdd3b438762ae934fab2f6cd350274c7ec0f70a7d8946448bbc6db67be6f91cd86aa47c
 AUX vnstatd.tmpfile 35 BLAKE2B c56373ebe1abe1111f6927839d79094b6ffd11527ce4e21016c31fc227f9564218ca479455b7cf4eb697d18d8389ba65266b91d71c5bf22c83a9337ae1d861d9 SHA512 e13b52e3c4fe8743074ab2704b6a6cbe0c855589fe19e05bba98f0193473437f350dfdc9675689172c54ed83491d9caef0cbb842f6c2533b98366cd78a4f0bac
+DIST vnstat-2.10.tar.gz 304464 BLAKE2B 82fcb54cf00a8122f31dc27f41f830ef68b92452bf7ae22bf2f1be13a1526bd12e8365002edef7766156f2df15472b189b3f219074532cb00a81156775b08997 SHA512 86c761290ec059a3252049b4f2a0a2aecdd7f8c159ee3db904339b1a9b14157a2125b919dd52754a29320ccdb41c89739bca78548b5a44b158b493f48be24a78
+DIST vnstat-2.10.tar.gz.asc 833 BLAKE2B bb3b7ef9d52c7ba4e8fb3ae7c8693e36803374c0ced0a0d6c4c16c8ca554290ab805e6f732ea2d188d78246e34b7a747673cf99725fcb74f65192cba1fbaeac4 SHA512 2b3c0f381bad8ce542cc0fa287a7a9a16f4381a8aecb342dbb5622464131a7c7cdbf01cb12f5b75964d0e2b6792d28e37f4f8e6ca607cb8122462013b0077773
 DIST vnstat-2.9.tar.gz 300796 BLAKE2B 1671fe49f3add0087431b57aaa69d4c6280066a299e6899c00cd5bf6ec21380d1457295f884f683ebfb89959eea08a9d900e898a865e3f6ff2a82ecf354d974a SHA512 883f273c02f6d91478991d95deffba9d90457a1bb0b9dd818c01398365df97ffb72dda88299231d9076756192b05524b6f8820470c9caf6ee6a12e5914a82176
 DIST vnstat-2.9.tar.gz.asc 833 BLAKE2B 4dd17e02e6c0c5232354ea8c4dea1d86ac43015ac66c60dc227b143aa5352e5a1eb0870932662778b2350928b124e2bbc56dfa13cfe7c2fd74538d84c00f9b4c SHA512 bf57974afb028fef7ec311a15bb1dcf275f10b845c5512efe73711b622b5912c4de0ff0553db4152389d2421a468c888191eab8fca08212e164f997ad1e04778
+EBUILD vnstat-2.10.ebuild 1988 BLAKE2B f6a1eec6f4af0fed11eb24ec5ea5d77572b8e58e70a5098d3508c974b776cbe152ee4a80ea36adeb13d86e96fefe3b456aa64df4cbda0d00b0f2a622cf70458d SHA512 c0cdb810fe2560b1713258e7980a478a79ff5231f2d786ca750de972978e19b7cc716c366cdee7a97209e67a988c7ed2dff564b500764dd41f81d4693fdce579
 EBUILD vnstat-2.9.ebuild 1815 BLAKE2B 9be3168b107e6104b5cffba20c184deb102d1d0e0c65fe801c6d00924ff22b53f560b5a746babc84a16818b0c02ceed587036cdcbae0895a1ef79150283491e5 SHA512 ef0dadfb970c72a758faded22a3dde9c229c9e9a69ae4ae39dae6567873add83432ea097f07faab68b5c82a375c0daf32775fb5e882043cdc46cc0d3b237411f
-EBUILD vnstat-9999.ebuild 1823 BLAKE2B b8d0a5fabc933e6be298e19ea314631e24dd4fac256c4c22dc5b164dbf593bf17fd80a8a123b95af77ee68b1f8683e975b48af88a97cf2ce7b86707d91c3a4cf SHA512 d39be391d90d488dd8c26ccc523cd81fe8ba2f9a2c3c01c750b1c2b05ae1e2e4de402e9d52e9f43abd4e3ac3a6d57110b3d02fa45c60aa2f59f6cec68df96d5c
+EBUILD vnstat-9999.ebuild 1988 BLAKE2B f6a1eec6f4af0fed11eb24ec5ea5d77572b8e58e70a5098d3508c974b776cbe152ee4a80ea36adeb13d86e96fefe3b456aa64df4cbda0d00b0f2a622cf70458d SHA512 c0cdb810fe2560b1713258e7980a478a79ff5231f2d786ca750de972978e19b7cc716c366cdee7a97209e67a988c7ed2dff564b500764dd41f81d4693fdce579
 MISC metadata.xml 836 BLAKE2B f87c7da72d6510825ef2a437e02a0b29febae258debbf922885923aac4032eda5f122f29d6f0d0cf4c9876fdba09b030246f851083ae424ec1859073273e0e30 SHA512 21e9f14e00563ea52ebe117d0b80739566d043956c16cc95ad7a67bf9df6360e96ad700d2c739ab20ae2dc2c321432f5c98b67c5cc59853b1fdced8ca70fce01
diff --git a/net-analyzer/vnstat/vnstat-2.10.ebuild b/net-analyzer/vnstat/vnstat-2.10.ebuild
new file mode 100644
index 000000000000..2db2af4d81b3
--- /dev/null
+++ b/net-analyzer/vnstat/vnstat-2.10.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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=${BROOT}/usr/share/openpgp-keys/teemutoivola.asc
+	inherit verify-sig
+
+	SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
+	SRC_URI+=" https://github.com/vergoh/vnstat/releases/download/v${PV}/${P}.tar.gz"
+	SRC_URI+=" verify-sig? (
+			https://humdi.net/vnstat/${P}.tar.gz.asc
+			https://github.com/vergoh/vnstat/releases/download/v${PV}/${P}.tar.gz.asc
+		)"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+	BDEPEND="verify-sig? ( sec-keys/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.9-conf.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
+}
+
+pkg_postinst() {
+	tmpfiles_process vnstatd.conf
+}
diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild
index 3ff50568be35..2db2af4d81b3 100644
--- a/net-analyzer/vnstat/vnstat-9999.ebuild
+++ b/net-analyzer/vnstat/vnstat-9999.ebuild
@@ -16,7 +16,11 @@ else
 	inherit verify-sig
 
 	SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )"
+	SRC_URI+=" https://github.com/vergoh/vnstat/releases/download/v${PV}/${P}.tar.gz"
+	SRC_URI+=" verify-sig? (
+			https://humdi.net/vnstat/${P}.tar.gz.asc
+			https://github.com/vergoh/vnstat/releases/download/v${PV}/${P}.tar.gz.asc
+		)"
 
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"