Version bump.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 123 insertions, 6 deletions

diff --git a/net-analyzer/vnstat/ChangeLog b/net-analyzer/vnstat/ChangeLog
index 9e86b434f880..02bc64913a7e 100644
--- a/net-analyzer/vnstat/ChangeLog
+++ b/net-analyzer/vnstat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/vnstat
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/ChangeLog,v 1.68 2014/11/02 20:28:20 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/ChangeLog,v 1.69 2015/01/20 16:51:08 jer Exp $
+
+*vnstat-1.13 (20 Jan 2015)
+
+  20 Jan 2015; Jeroen Roovers <jer@gentoo.org> +vnstat-1.13.ebuild,
+  +files/vnstatd.initd-r1:
+  Version bump.
 
   02 Nov 2014; Jeroen Roovers <jer@gentoo.org> vnstat-1.12.ebuild:
   Add USE=selinux (bug #527916).
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index e1f70802e912..3441f4b8db97 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -4,16 +4,19 @@ Hash: SHA256
 AUX vnstat.cron 220 SHA256 b6b437c680606061b98af19758cbacc3f883f73cd86f0bbfbcfe756c982cd3fd SHA512 c901385f97323d1a686cee63d015eaf9ad38ed195a1c0e25dae671dd7061ebc918498684c55b90b0674960891dfca4b83f458174892c1b9efb48cd362fdb8477 WHIRLPOOL 1432dfdfdf2f121deeff6f8147b344ff61838a8fe54d7bc5bb3ac6c1b9675a64b6e331bd3e33ee0e9fe2488bde42ad8c4e279ea3b1d1d5ed304b4b2ef4205429
 AUX vnstatd.confd 216 SHA256 2cd5b91f86bc26aca85166a50de89faaccbf1ea8f219efb48b50b7ed0f3fe377 SHA512 d645817913d5b52e928561b3d6a0e869d8ae5db81b97af91c1ebfc6a8cd2df666c1653e6dc5f91c0a890033a89692f77eaf081c1cae5590446c69a70ea263946 WHIRLPOOL 3a974a3dc30a33a3a2ca22db551068f1df3444f4248e896482e26d1c5b0bd717706ef30e18f5a6ee193966bef1466a13d3c6ad35e86f42f025ebb3c02e622a22
 AUX vnstatd.initd 924 SHA256 a2922d55f8339c93243b7b33b56e990789dc24bb64a3dc1f936e688ee78f44fb SHA512 5184d177ecf2c6895e16023ab22869625b8b9e9f21b03fb1eaf389ee6602b6fb8407989e95998b9afd5e816761b8830ccb2cef7026896b930e5dc983454176c2 WHIRLPOOL d0b7d6b025e5081985a1bd3d1c95d1f74f39a1f69c2ad92534a59a0c96c90fddc0f7507bd0efb205f0c98e9ea7affb76809ff6d255d7bb6e379efd0078e2a369
+AUX vnstatd.initd-r1 980 SHA256 04348007015cfa35a4c1835f94b18a82c67cd4308ca6f374dfab9b97e7d85f94 SHA512 75d5d9c4d678fdabaa53bd14e2582e1b981a687e37aa62b2b373d718a5bd27d6d26e21d38719e04285b6465e8b083aa2da4ccd6b2ec13f09d7151e870c50bfc8 WHIRLPOOL 565bc0730872d92c71b4cfabaf6f97729fbd93f347ab8aa84c06792904b31ad9c2da449d5d7276df69b8009b9247b7d5dc1257581fb398d60834db90d55468da
 DIST vnstat-1.11.tar.gz 79075 SHA256 b71876d817bbb6a16d31b4236e22a2eb6c39666a7f7bfea581f5ff441cade026 SHA512 f16a0cc5065665c46de9781b6d92e96f0966520e5448fc529150ced886574fe07d0695df5051828b58183d06a707b7b2e94562b06db1898dacb858517a5485b1 WHIRLPOOL bc93704b8f9c39830f1ba8c2d39cc7ba7d0b317d35941547870bd5cf8c2f374050cdbae7c8ce444765cd5fb22c78d28e6099f32b06aee9d836451b399216e6ef
 DIST vnstat-1.12.tar.gz 98435 SHA256 af1050d9c1b22d4b9742fe0d1818de9eb1037b8e7f9ba67b962e108d8527be69 SHA512 0d6b5f362bbcbb4a104f82b8e350f5d8b071e974a3fdfb100333c3d8e5a096a71a97360543d2594fd3f2108df8bb03ffffc4c52d396f28723005a5d1bf605eb1 WHIRLPOOL 590197dc62b077268e0814d7ce15f5f519d53328a68e57743c1a3375082410239d75e28674094dbb7d14b27d17769f7de6d0eccd716a05d50d86f5d06274c9a0
+DIST vnstat-1.13.tar.gz 101568 SHA256 6f4e2599ebb195b25f499d3e2e865aa14da336dfc9cc03a79181aa71f7ed99cd SHA512 b9620349247db292b13cd06db1921b4e5921a473957ac387f6adfc21acdc441910f73b97dfa5f024d7ba7a6521d1d9d97e2b25337673f423bcdbd064207f01a4 WHIRLPOOL 6b9aeb96790eeef2b287cdffeb4d41b2db22803e7218dafb27944bb14acf255bf590dcb82220c72f388c8cc387045b87335a2e4973a07c5ef1e1c98c710e068d
 EBUILD vnstat-1.11-r2.ebuild 2374 SHA256 848f1fb9a3c8d6e800d946b305dc2161a17fb450a91e95b37e5fc8a402cfe607 SHA512 adfae6936d8df919c4bd54c9e739c5a5ef04a12aefa5380a7c09f07ac600792f089f0a9492b6fe50ff0e747fc367826d3439201ef0ff8bfb90e931f2204f30c4 WHIRLPOOL 21c306a7e77e95c68ce2dd98d00f58818164e1f717757685da6b048416d9cda66dad87de9b11e253e5d3cc36805417191afae75f810a252b6230266db8c4a233
 EBUILD vnstat-1.12.ebuild 2353 SHA256 e16d0669df6c8c73a66b5a8cf86e911a5e832d52651f794a268c7534baee75e1 SHA512 dc49aefb4f8468d81c3ddb98bdf4f8a7ab542bd92c0272487535b3281c5eeb181743f8dc983a30b1612f2724b2346b0127a69d2c06e9f9f1183ce8c2249cce38 WHIRLPOOL 751fb68c20024cc6cd8d91da2fe001ddd716083ded7577dc95caa58afcf533f3f274043e92c533cba83791aa3169956d12fc3fb0c14e38c84d75e3fc249c2093
-MISC ChangeLog 8916 SHA256 52e57d7ff539ba331625594bbfcc01e2d8aef9453aae1ff148906e54de9a632a SHA512 66343fd20f62f18e6d2d6c494df551c51ad1106678198f7ed43c9055dddcb78dbc0b9adbaef0cd81dd09f16ce5d655cdfc2a7ad11dea24736faa38589056ab63 WHIRLPOOL 692147170bebec086d055bb4cf2af561d91bf04c9754e142a9f7d3827381e1ba4a53ff7dc6889aff616a625ad0020a65b459a06d6913d87b64afe5e935a96813
+EBUILD vnstat-1.13.ebuild 1552 SHA256 4a0736844f58b94a51276c078e8dfbda138aff7947ce046e201fda49a633e3cf SHA512 e563379a3c5909151fc542c3faebb3c5ca76e17395826114ed2f377658f473bcce544a888013fa32d0a8c7ffefd99ca58135d472320c449c5bb79520ee56fabe WHIRLPOOL 92da60a19bc1fef06a8838382e1f2d66bcca851d5686142875a0f39a6747e531d005c265fa8e0c3762d31113846e99ce4e70024a52b3e3432402e22bc959446a
+MISC ChangeLog 9056 SHA256 0b1bdd4a3d068b0c6d0533a6965a0336ee10a16b97a3e97d4ce2bab010674c92 SHA512 3a630979de1ec6f4cae14ff0c3c012494988403284691e6b136a2e9e3827c29fc9c0117900860bba9594d278c42606b6e68796245c91769a566e1960eb807444 WHIRLPOOL 7d59c3709e1931d35d33865f53f6108e4716884d7ddd7ab9fb50aaef7fd781fcc4f4bf37e721ba32999e0e3a11ad5facdfe84cccff27f7944f4b2849a8c1e8aa
 MISC metadata.xml 478 SHA256 28925bec141a950acd9eff4f6c6bbf9732d4745134eb914501d60859408a49c4 SHA512 3be8e26d8634675dff55dd6efcffdef02a4d7c39ee2cd9844f9a6cad9c1f40a9fd3649d46b2a609d008f0184f7161d6d712b9af77d74b3c7048a2207d2478054 WHIRLPOOL 5f0038a2caa31895f3efb393836b4c0a0ff027e3c6266f8f1edd118634c2f532d38eb1bdb9fea9fbb5fd406914280cc8b0cb5b6c271ffcb871317c0981f01cf2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRWlBEACgkQVWmRsqeSphMt7QCfdonvVXLV2j5FPmaRUa2TIGkN
-btIAn0c+Pkb2Mjyat6XkgsUqI6RbGQIR
-=fmBT
+iEYEAREIAAYFAlS+h30ACgkQVWmRsqeSphNM5ACggGOXFmN9aUWWlV/1kCnQ+Ji3
+McwAnjm4u+5jkBhEwmB/LF9CL27T/LWU
+=z6//
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/vnstat/files/vnstatd.initd-r1 b/net-analyzer/vnstat/files/vnstatd.initd-r1
new file mode 100644
index 000000000000..4b8aa7a11080
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstatd.initd-r1
@@ -0,0 +1,38 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/files/vnstatd.initd-r1,v 1.1 2015/01/20 16:51:08 jer Exp $
+
+extra_started_commands="reload"
+
+depend() {
+	use net
+}
+
+VNSTATD_PIDFILE="${VNSTATD_PIDFILE:-/run/vnstatd/vnstatd.pid}"
+
+start() {
+	ebegin "Starting vnstatd"
+	checkpath -q -d -m 755 -o vnstat:vnstat /run/vnstatd
+	checkpath -q -d -m 755 -o vnstat:vnstat /var/lib/vnstat
+	start-stop-daemon --start --quiet \
+		--pidfile "${VNSTATD_PIDFILE}" \
+		--user vnstat --group vnstat \
+		--nicelevel ${VNSTATD_NICELEVEL:-0} \
+		--exec /usr/bin/vnstatd -- \
+		-d ${VNSTATD_EXTRAOPTS} -p ${VNSTATD_PIDFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping vnstatd"
+	start-stop-daemon --stop --quiet \
+		--pidfile "${VNSTATD_PIDFILE}"
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading vnstatd configuration"
+	kill -HUP $(cat "${VNSTATD_PIDFILE}") 2>&1 >/dev/null
+	eend $?
+}
diff --git a/net-analyzer/vnstat/vnstat-1.13.ebuild b/net-analyzer/vnstat/vnstat-1.13.ebuild
new file mode 100644
index 000000000000..46eff954aa5b
--- /dev/null
+++ b/net-analyzer/vnstat/vnstat-1.13.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/vnstat-1.13.ebuild,v 1.1 2015/01/20 16:51:08 jer Exp $
+
+EAPI=5
+inherit toolchain-funcs user
+
+DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
+HOMEPAGE="http://humdi.net/vnstat/"
+SRC_URI="http://humdi.net/vnstat/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gd selinux test"
+
+COMMON_DEPEND="
+	gd? ( media-libs/gd[png] )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-libs/check )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-vnstatd )
+"
+
+pkg_setup() {
+	enewgroup vnstat
+	enewuser vnstat -1 -1 /dev/null vnstat
+}
+
+src_prepare() {
+	tc-export CC
+
+	sed -i \
+		-e 's|vnstat[.]log|vnstatd.log|' \
+		-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
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" $(usex gd all '')
+}
+
+src_install() {
+	use gd && dobin src/vnstati
+	dobin src/vnstat src/vnstatd
+
+	exeinto /etc/cron.hourly
+	newexe "${FILESDIR}"/vnstat.cron vnstat
+
+	insinto /etc
+	doins cfg/vnstat.conf
+	fowners root:vnstat /etc/vnstat.conf
+
+	newconfd "${FILESDIR}"/vnstatd.confd vnstatd
+	newinitd "${FILESDIR}"/vnstatd.initd-r1 vnstatd
+
+	use gd && doman man/vnstati.1
+	doman man/vnstat.1 man/vnstatd.1
+
+	newdoc INSTALL README.setup
+	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
+}