Version bump thanks to Fabian Henze (bug #297565 again).

Package-Manager: portage-2.2_rc61/cvs/Linux i686

3 files changed, 115 insertions, 3 deletions

diff --git a/net-analyzer/vnstat/ChangeLog b/net-analyzer/vnstat/ChangeLog
index 6b173944d399..34e5896dcc58 100644
--- a/net-analyzer/vnstat/ChangeLog
+++ b/net-analyzer/vnstat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/vnstat
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/ChangeLog,v 1.36 2009/12/20 17:48:12 jer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/ChangeLog,v 1.37 2010/01/03 18:10:36 jer Exp $
+
+*vnstat-1.10 (03 Jan 2010)
+
+  03 Jan 2010; Jeroen Roovers <jer@gentoo.org> +vnstat-1.10.ebuild:
+  Version bump thanks to Fabian Henze (bug #297565 again).
 
 *vnstat-1.9 (20 Dec 2009)
 
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 30a915b27f1e..21fc61123f73 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -1,13 +1,15 @@
 AUX vnstat.cron 220 RMD160 124b6157c62cbb853d72e9d6e556fc38d3d51d54 SHA1 ae4e13a7865195f18909d1f1a1a8fde662605777 SHA256 b6b437c680606061b98af19758cbacc3f883f73cd86f0bbfbcfe756c982cd3fd
 AUX vnstatd.confd 216 RMD160 f365818a8305454943fc1a6ee67dba681d367028 SHA1 401da9e79bca8e618399efe0de80000350c74c1c SHA256 2cd5b91f86bc26aca85166a50de89faaccbf1ea8f219efb48b50b7ed0f3fe377
 AUX vnstatd.initd 960 RMD160 33c715340a7b3ebb0057e90182b9f6bd0ba274a6 SHA1 2402afd35c90580193f6469e32ae912324f3b15a SHA256 0ec3229b95ce7fca944557145f9379c8bd89fdb0b41b345959a2c4ae43ed96ed
+DIST vnstat-1.10.tar.gz 77685 RMD160 1fddc4343cb3206cce42516f7ff61024c65eed3f SHA1 813177fb55296deaf5059bb111885616f4d8a86f SHA256 150883f9a6f5fe2430707baa26bd148f3781423f09d27cb5285096ad943cbea2
 DIST vnstat-1.6.tar.gz 36888 RMD160 4aa0b4664a29a4201adbf7bb2184ff4858a60d46 SHA1 cadf3cb0c5bf1c19a47739ce611fe9eb6e2852a4 SHA256 80bac32b80c4b7bdead7a5a54229728a6bc11a9285493cd39946fe94b303d3c8
 DIST vnstat-1.7.tar.gz 61879 RMD160 6df5a34d706da506f6360e0ef5c06bf7000fa1b0 SHA1 6238cc975c05f10951bb217ecf8635fb594a85f0 SHA256 146ed44226dbb83e42a1f73052e674e5c859f6ff3700501c1429f7af1d3952ca
 DIST vnstat-1.9.tar.gz 76166 RMD160 5f9166b0c83b270ee9900dea171d54b693a29b61 SHA1 e415369053775855dd4f88a0b20b2a56cf3df290 SHA256 0193e9042e4bc3e21616a8f39610c31a9d1bdaec370ad1ce1a3abcc841f52fd6
+EBUILD vnstat-1.10.ebuild 3310 RMD160 41dc8c0f8be047eeccbf31b390750caf419fd4a8 SHA1 da85b7b3b95143ace7b06aaa4309fada0b484468 SHA256 3e4cd9fb52142632e8e921d548b9eccc9799cbba888075758d464c6d61316a83
 EBUILD vnstat-1.6.ebuild 2043 RMD160 520d6a4b87baabe06c0ad61a26a5c3e317c3a0b5 SHA1 b2effe34a69231cc462414230a14bd220de75bdd SHA256 bdf31413d55be76691b6b067afdae8296a7b01d5f55c87bfaecedb933a223877
 EBUILD vnstat-1.7-r1.ebuild 2351 RMD160 b5d6fe9f90bd71bea36de6526b31220ab1e51482 SHA1 8338e8b563db1707db835c2ada1a456227f0e00b SHA256 c3afa7f38e5066a99b030127a79d3a1116d649d02a71c7de01b8030dac2bc665
 EBUILD vnstat-1.7-r2.ebuild 3312 RMD160 80231c7cd2d3ffc0bec50d466466dbc1439ec831 SHA1 e5f3593ae0c2cab8949faafcc0ce109cf8403674 SHA256 717f1d67d8bc2aa1a5ca6b8a338235eec17029465bc524d42758af011ce0f1db
 EBUILD vnstat-1.7.ebuild 2048 RMD160 1fc070747147437bc8a72bfa8b007b2a11a10afa SHA1 39ee66764b4e34660a84f7f2a56d59eca43e1b16 SHA256 0ef5f8a625c8b14c7d4561f36845b7f21396803e0f7c2d461d878e5e820c506f
 EBUILD vnstat-1.9.ebuild 3309 RMD160 97fce9c8b97298fdaeec3ff3678dcc8a7a1421ac SHA1 508ba505c288f2c99ed39a614b8f724169c3f848 SHA256 68ad2b53e5767b96ff6ebbb8ea573530ac1b3ade40d040604d891f62e76d7109
-MISC ChangeLog 4884 RMD160 f2ef676d0475e9289a494fc63ec6f2197407c617 SHA1 984cbeb580dc285a287e74fb33787d3180963134 SHA256 386d80555cd022877858601bb8bf0529418f1265760eb18d34511fe31eb1236a
+MISC ChangeLog 5040 RMD160 aa68923e6af9e6105d84201b1f8fbb5c0b088719 SHA1 35e98c28def00de055fb2955af5a289f46221228 SHA256 6ecbebc4ce5ff6fb6347a787e2595988b631b4bbcbd0608af4b34f3ad8dc6d36
 MISC metadata.xml 478 RMD160 2160f3a198353174ea16916049dbb29eabf0e52f SHA1 4c863c84cb01fc253ffdd3478e8c909411942dc3 SHA256 28925bec141a950acd9eff4f6c6bbf9732d4745134eb914501d60859408a49c4
diff --git a/net-analyzer/vnstat/vnstat-1.10.ebuild b/net-analyzer/vnstat/vnstat-1.10.ebuild
new file mode 100644
index 000000000000..1bcad9a486bc
--- /dev/null
+++ b/net-analyzer/vnstat/vnstat-1.10.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/vnstat-1.10.ebuild,v 1.1 2010/01/03 18:10:36 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+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 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gd"
+
+DEPEND="
+	gd? ( media-libs/gd[png] )"
+RDEPEND="${DEPEND}
+	virtual/cron"
+
+pkg_setup() {
+	enewgroup vnstat
+	enewuser vnstat -1 -1 /dev/null vnstat
+}
+
+src_compile() {
+	sed -i 's:vnstat[.]log:vnstatd.log:' cfg/vnstat.conf || die
+	sed -i 's:vnstat[.]pid:vnstatd/vnstatd.pid:' cfg/vnstat.conf || die
+
+	if use gd; then
+		emake all CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake all failed"
+	else
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+	fi
+}
+
+src_install() {
+	if use gd; then
+		dobin src/vnstati || die "vnstati dobin failed"
+	fi
+	dobin src/vnstat src/vnstatd || die "dobin failed"
+	exeinto /etc/cron.hourly
+	newexe "${FILESDIR}"/vnstat.cron vnstat || die
+
+	insinto /etc
+	doins cfg/vnstat.conf || die
+	fowners root:vnstat /etc/vnstat.conf
+
+	newconfd "${FILESDIR}/vnstatd.confd" vnstatd || die
+	newinitd "${FILESDIR}/vnstatd.initd" vnstatd || die
+
+	keepdir /var/lib/vnstat
+	keepdir /var/run/vnstatd
+	fowners vnstat:vnstat /var/lib/vnstat
+	fowners vnstat:vnstat /var/run/vnstatd
+
+	use gd && { doman man/vnstati.1 || die; }
+	doman man/vnstat.1 man/vnstatd.1 || die
+
+	newdoc examples/vnstat_ip-up ip-up.example || die
+	newdoc examples/vnstat_ip-down ip-down.example || die
+	newdoc INSTALL README.setup || die
+	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi || die
+}
+
+pkg_postinst() {
+	# compatibility for 1.1 ebuild
+	if [[ -d ${ROOT}/var/spool/vnstat ]]; then
+		mv -f "${ROOT}"/var/spool/vnstat/* "${ROOT}"/var/lib/vnstat/ \
+			&& rmdir "${ROOT}"/var/spool/vnstat
+		ewarn "vnStat db files have been moved from /var/spool/vnstat to /var/lib/vnstat"
+		ewarn
+	fi
+
+	# Workaround feature/bug #141619
+	chown -R vnstat:vnstat "${ROOT}/var/lib/vnstat"
+	chown vnstat:vnstat "${ROOT}/var/run/vnstatd"
+	ewarn "vnStat db files owning user and group has been changed to \"vnstat\"."
+
+	elog
+	elog "Repeat the following command for every interface you"
+	elog "wish to monitor (replace eth0):"
+	elog "   vnstat -u -i eth0"
+	elog "and set correct permissions after that, e.g."
+	elog "   chown -R vnstat:vnstat /var/lib/vnstat"
+	elog
+	elog "Note: if an interface transfers more than ~4GB in"
+	elog "the time between cron runs, you may miss traffic"
+	elog
+
+	if [[ -e ${ROOT}/etc/cron.d/vnstat ]] ; then
+		elog "vnstat's cron script is now installed as /etc/cron.hourly/vnstat."
+		elog "Please remove /etc/cron.d/vnstat."
+		elog
+	fi
+	elog "To update the interfaces database automatically with cron, uncomment"
+	elog "lines in /etc/cron.hourly/vnstat and set cron job to run it as"
+	elog "frequently as required. Alternatively you can use vnstatd. Init script"
+	elog "was installed into /etc/init.d/vnstatd for your convenience."
+	elog
+	elog "Starting with version 1.5 --dbdir option is droped. You can do the same"
+	elog "with DatabaseDir directive in configuration file (/etc/vnstat.conf)."
+}