gentoo resync : 21.01.2020

3 files changed, 71 insertions, 0 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index ac7f68bf1647..7b81b1d76956 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 868333387c5e..b2af48b7036f 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -12,8 +12,10 @@ AUX vnstatd.tmpfile 35 BLAKE2B c56373ebe1abe1111f6927839d79094b6ffd11527ce4e2101
 DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7964aad90fb76c407c5f7fb0085e6f9f54408e8ebc667475c15f260d701c5924737f20921ebc0a35affd52be SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3
 DIST vnstat-2.4.tar.gz 270907 BLAKE2B 4666c39c05cb0bd2a89db7e57bfd72b542ccda02ba09a9da6097b58957141042a5e63a2ee4863bb61b686b3e4c374a690d798398136760699755187fdca5e27c SHA512 e2f23b375a6afcd9e51770769c741d3a5fc139aec22e535bc98da09e4a6677a0c820fb04727a79f23569be29f031e9ee897b6d569146c42ed917f5f83399b7b6
 DIST vnstat-2.5.tar.gz 274765 BLAKE2B 65117717d5522ce17e40f05f62d0328f74f5cc3ab42353c93b7a2af0e74df1d36b3a64dd778cd4def2985120bfbc6e1cf8e83a7615ef236ea1af1dbd8d898965 SHA512 5f44f2ee7fa4bdaf0cfd48b35927ec590f5344cc497b5e02a999ece40e53812a7bf725cf1ddaf08c7316bf83ed567f370a72f00b279553cb1d06dfec26c3c1c8
+DIST vnstat-2.6.tar.gz 275751 BLAKE2B 7351b265d66e42d1e5450dae6f5eaa973a9cdc171b865689540b5838ddeb2629da968bc2ba655cb6ff909227a859f0334900a1597c78b772124a993343a4cf23 SHA512 1a62fc9c2379b050208945e85bad04f602a0f2c71e6bd069d241c1df77c76ec6258948fc3fdf633b15c52665782cae4f995a916103d330bfb46cab0291d3a1ea
 EBUILD vnstat-1.17.ebuild 1456 BLAKE2B 33050a01343457432c73bd2018a443a649faa7d34c8f68bda4f0eed5285dbd2c21dc6166fe94f8cc7011b957c4c4c60b51e3ba369899ae3e0b68f65b86d79053 SHA512 8465ee23f4ceadb1e9fb485bc992eb9196b75e747c7833c9d2a9ad12e86c79255667ed706b62b1131301d3b8d29221d6517fb4fd36bc1b06f52e13c2e29d3c2c
 EBUILD vnstat-2.4.ebuild 1552 BLAKE2B 84bc2e8bbbc9dd8187865e7c7850ef9392c1adcc81b5c3af7001630389115d0ea076e20a89127ca32de26cf8713e0ab910408bb5d9ae6e991beea8b737185868 SHA512 b3dcdda38271d8e1f454c1d99270967e9c1a361533425cf57eea490e7094a2ce6ff96611c9766e0ab25a33a78fdff86a17e38c3ed087cccac1501e93339e12dc
 EBUILD vnstat-2.5.ebuild 1552 BLAKE2B e1a12480531ea51b8faab7877a3f2f2fa619afb9f0a940b4b280ef8dba508bc5591537e3730eb4cbaa8abfb5fd0a37ecca01eac16fe1163d95092586b5686526 SHA512 38404752568f265e3b589e72e957f95a917736177abfce0e02dd643c0c90849e6ac54f1e4ca557ad51465ea8d7b59ad1c661b5d771897068150f27ecc3d07c67
+EBUILD vnstat-2.6.ebuild 1552 BLAKE2B e1a12480531ea51b8faab7877a3f2f2fa619afb9f0a940b4b280ef8dba508bc5591537e3730eb4cbaa8abfb5fd0a37ecca01eac16fe1163d95092586b5686526 SHA512 38404752568f265e3b589e72e957f95a917736177abfce0e02dd643c0c90849e6ac54f1e4ca557ad51465ea8d7b59ad1c661b5d771897068150f27ecc3d07c67
 EBUILD vnstat-9999.ebuild 1529 BLAKE2B ebc7b0f707be6e17a4592107c159e128420350e3ed03963bd60915ed044df6d65485beb008113864ebe40de4b9d7b642f4a46dd818bb68edb519f38a4986b9c4 SHA512 3491048ea7993c399e220760774814e8df47d416dcfedf99bddf074be1d4c6addbf804fbd0179b13c809ea6df9b6e01c8e60f5368a556fe789ffad460452a143
 MISC metadata.xml 603 BLAKE2B 6cd01f8334d5768e057d6866f9c8d739af3680787d9159638a504eeeb74b2f01a36775bfa3e2afeb169d2948e290e8995b2100d572603eaa5ffa44c96b15b385 SHA512 7dbda5d3a317201c8eb0000f2b55af6b2de6fd44368ab39b08c60ee8eb1355264a8886d9a484ab75d47c0c0ce3f41059a8f354f7d6480ae20e469e4c29ca31e2
diff --git a/net-analyzer/vnstat/vnstat-2.6.ebuild b/net-analyzer/vnstat/vnstat-2.6.ebuild
new file mode 100644
index 000000000000..12983f11d965
--- /dev/null
+++ b/net-analyzer/vnstat/vnstat-2.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd user
+
+DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
+HOMEPAGE="https://humdi.net/vnstat/"
+SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gd selinux test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-db/sqlite
+	gd? ( media-libs/gd[png] )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-libs/check )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	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
+)
+
+pkg_setup() {
+	enewgroup vnstat
+	enewuser vnstat -1 -1 /var/lib/vnstat vnstat
+}
+
+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
+	systemd_newtmpfilesd "${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
+}