gentoo auto-resync : 21:08:2023 - 09:43:30

3 files changed, 102 insertions, 7 deletions

diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index ead59b7a560b..078b75d582ac 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -6,6 +6,9 @@ AUX vnstatd.systemd 262 BLAKE2B e54c30a1bfa6c7a8bba32fa93c3d2417506c55e949975441
 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.11.tar.gz 312821 BLAKE2B 6eeed45d628641c9d88cf33ae1fc14871109b1e9fd0ac4a46fe8e2c194bb4600878b69408ed177bcde38ca859d0a3165d0095cab9b0bb6c036f7788fbfcb47e6 SHA512 d1ec9fd7e57598712df50601247c9904a371b7a2e5cb33efab2d44d330294d8ea3facf914de3d8d3a0381061b14642c613948478bf0c8d7f5e599a83321aad34
+DIST vnstat-2.11.tar.gz.asc 833 BLAKE2B ded1462ee51dc6fde349ae6e21a6b45bdab268ff024804394268f515b618beead7d4582721ffa26d3f9cc7a8434a0f7145d31dcf9c95c575145e4903bdbd5460 SHA512 8b15f73d412e05c50e2e5a514bc96daa2dceae49af95ed7f09e742f3bbc8b34b856bb2d0a33a7146a8b19f714d47863388cfcb63821dac670c9e020ca60f4785
 EBUILD vnstat-2.10.ebuild 1980 BLAKE2B 5f079567a4a08e734f68d419ade7a73f501b85d3da8189ba773fe3a4c25dcd384231bf24a7a5290dfe0c72603dfa74c1e4ea6cfb7f7e54a53d8ecdadcfb7a1cb SHA512 d7be34a5776aac20e908e3727571745f70359e6ce8d5c3890011c0f32c440f6bd4b05496e98b5575cd307304e646cbe62f25f69f04d150b73d00e8b2ad1a4de7
-EBUILD vnstat-9999.ebuild 1988 BLAKE2B f6a1eec6f4af0fed11eb24ec5ea5d77572b8e58e70a5098d3508c974b776cbe152ee4a80ea36adeb13d86e96fefe3b456aa64df4cbda0d00b0f2a622cf70458d SHA512 c0cdb810fe2560b1713258e7980a478a79ff5231f2d786ca750de972978e19b7cc716c366cdee7a97209e67a988c7ed2dff564b500764dd41f81d4693fdce579
+EBUILD vnstat-2.11.ebuild 1968 BLAKE2B 72a24c2a98a55e9938345056f45732c90653092d8fdd7363aec2b656cca112b6c70b3c1e2af7cc3bbd518f7c9e65d8efb093a9456b0f6321434847bcc41863ad SHA512 a5ba8a5004d5a7c6fafe4827aa294bc6a7297d16b24a5b8cfcf6ba7033597f1f3064022ae8a2d98b30be77848664e70d65da405cdfb7ac1dd08e13091d4e1772
+EBUILD vnstat-9999.ebuild 1968 BLAKE2B 72a24c2a98a55e9938345056f45732c90653092d8fdd7363aec2b656cca112b6c70b3c1e2af7cc3bbd518f7c9e65d8efb093a9456b0f6321434847bcc41863ad SHA512 a5ba8a5004d5a7c6fafe4827aa294bc6a7297d16b24a5b8cfcf6ba7033597f1f3064022ae8a2d98b30be77848664e70d65da405cdfb7ac1dd08e13091d4e1772
 MISC metadata.xml 836 BLAKE2B f87c7da72d6510825ef2a437e02a0b29febae258debbf922885923aac4032eda5f122f29d6f0d0cf4c9876fdba09b030246f851083ae424ec1859073273e0e30 SHA512 21e9f14e00563ea52ebe117d0b80739566d043956c16cc95ad7a67bf9df6360e96ad700d2c739ab20ae2dc2c321432f5c98b67c5cc59853b1fdced8ca70fce01
diff --git a/net-analyzer/vnstat/vnstat-2.11.ebuild b/net-analyzer/vnstat/vnstat-2.11.ebuild
new file mode 100644
index 000000000000..9ba136577512
--- /dev/null
+++ b/net-analyzer/vnstat/vnstat-2.11.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 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
+		https://github.com/vergoh/vnstat/releases/download/v${PV}/${P}.tar.gz
+		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 \
+		$(usev 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 2db2af4d81b3..9ba136577512 100644
--- a/net-analyzer/vnstat/vnstat-9999.ebuild
+++ b/net-analyzer/vnstat/vnstat-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,12 +15,14 @@ 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? (
+	SRC_URI="
+		https://humdi.net/vnstat/${P}.tar.gz
+		https://github.com/vergoh/vnstat/releases/download/v${PV}/${P}.tar.gz
+		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"
 
@@ -52,7 +54,7 @@ src_compile() {
 	emake \
 		${PN} \
 		${PN}d \
-		$(usex gd ${PN}i '')
+		$(usev gd ${PN}i)
 }
 
 src_install() {