Version bump. Thank armin76 for report. --dbdir is droped as you can do the same in configuration file.

Package-Manager: portage-2.1.3.19

6 files changed, 110 insertions, 27 deletions

diff --git a/net-analyzer/vnstat/ChangeLog b/net-analyzer/vnstat/ChangeLog
index 6415e764a827..d3d53302ec1e 100644
--- a/net-analyzer/vnstat/ChangeLog
+++ b/net-analyzer/vnstat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/vnstat
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/ChangeLog,v 1.25 2007/09/06 18:50:19 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/ChangeLog,v 1.26 2007/12/26 17:28:51 pva Exp $
+
+*vnstat-1.5 (26 Dec 2007)
+
+  26 Dec 2007; <pva@gentoo.org> metadata.xml, vnstat-1.4-r2.ebuild,
+  +vnstat-1.5.ebuild:
+  Version bump. Thank armin76 for report. --dbdir is droped as you can do the
+  same in configuration file.
 
   06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -vnstat-1.1.ebuild,
   -vnstat-1.4.ebuild, -vnstat-1.4-r1.ebuild:
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index b6b4db44f11c..78fe6b084f20 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX vnstat-1.4-dbdir.patch 5017 RMD160 dfb58aec61f9da4102f7d4841bfda8c07fcb59d7 SHA1 2a5ad56b10d4cf90a1080e49754da6231911454a SHA256 3cbe714b9762648d2108bdca3cda7ea016e499f848b8e89ead012c4c23b93b06
 MD5 b3f40edeb830c794b433651e7c9689d3 files/vnstat-1.4-dbdir.patch 5017
 RMD160 dfb58aec61f9da4102f7d4841bfda8c07fcb59d7 files/vnstat-1.4-dbdir.patch 5017
@@ -14,25 +11,26 @@ MD5 389e6b2723965358ef9876b4e78d3bfc files/vnstat.cron 220
 RMD160 124b6157c62cbb853d72e9d6e556fc38d3d51d54 files/vnstat.cron 220
 SHA256 b6b437c680606061b98af19758cbacc3f883f73cd86f0bbfbcfe756c982cd3fd files/vnstat.cron 220
 DIST vnstat-1.4.tar.gz 26237 RMD160 ff7c2ea0849b1d9e62fbdb695fecf62df9f902a0 SHA1 49a51c91dc655f5ff78615db778b982e6e4b2bc2 SHA256 2f63c326b34e92254552bd69772dcd8e24e9cc216ccfa182c9fa2523c37fcf37
-EBUILD vnstat-1.4-r2.ebuild 2043 RMD160 0b3ce507a1b913ce47f46fbcab377fd4441d1076 SHA1 18d01935c39caa8b7f8607b61262f2cba5547314 SHA256 fb96d426fe57fc98e7879caca52df7956bb20ebf85bdefe77736710c03cc18fa
-MD5 45c858a610d82c584011cb6064615d7e vnstat-1.4-r2.ebuild 2043
-RMD160 0b3ce507a1b913ce47f46fbcab377fd4441d1076 vnstat-1.4-r2.ebuild 2043
-SHA256 fb96d426fe57fc98e7879caca52df7956bb20ebf85bdefe77736710c03cc18fa vnstat-1.4-r2.ebuild 2043
-MISC ChangeLog 3287 RMD160 72e6409fb38e2c2cdbc7db1f09b85e4bc1883a31 SHA1 74f57cb02c7420a78e93c1c59e8603ef0bfccd60 SHA256 ca8cdd15a23cc26cd911bf3b8e5a5657c2de06caf04d4dccaf5e1890a5e8f7a8
-MD5 692f4953c1ac70789f8064f594640ee0 ChangeLog 3287
-RMD160 72e6409fb38e2c2cdbc7db1f09b85e4bc1883a31 ChangeLog 3287
-SHA256 ca8cdd15a23cc26cd911bf3b8e5a5657c2de06caf04d4dccaf5e1890a5e8f7a8 ChangeLog 3287
-MISC metadata.xml 271 RMD160 0f0d1bef8141a4ae01d9715ad405664bed07f19d SHA1 1a278254fba438197e5cece1208fbec10a500cfb SHA256 872f3e714878c148774970a491b760e6f3f547d3e76e79c1f54d0dcb1ed65161
-MD5 432c6dc3dfd22b4c6657ddcc6c37979e metadata.xml 271
-RMD160 0f0d1bef8141a4ae01d9715ad405664bed07f19d metadata.xml 271
-SHA256 872f3e714878c148774970a491b760e6f3f547d3e76e79c1f54d0dcb1ed65161 metadata.xml 271
+DIST vnstat-1.5.tar.gz 33491 RMD160 062ac9fc4355e67445c15ce36d97f54347f1dc28 SHA1 f3c72b02754e189387a192927c43cd0f093cf755 SHA256 a590048a97761fa97e9ecb89e3a81a5a56949b2f5e669446b15cf9d655901aa6
+EBUILD vnstat-1.4-r2.ebuild 2042 RMD160 ca47629e9b0bdacc74c94f6d3a4acfbf9788ef93 SHA1 ac315cb9f4e69539fa4d10228ebe48090d249a3a SHA256 3bc6f2083ca931456958e6a325148b71105ee236389ab696e3b25e97436af7ea
+MD5 ddf32965668e968de4161c0b30be905e vnstat-1.4-r2.ebuild 2042
+RMD160 ca47629e9b0bdacc74c94f6d3a4acfbf9788ef93 vnstat-1.4-r2.ebuild 2042
+SHA256 3bc6f2083ca931456958e6a325148b71105ee236389ab696e3b25e97436af7ea vnstat-1.4-r2.ebuild 2042
+EBUILD vnstat-1.5.ebuild 2044 RMD160 bc9c70578cd371499a2f6250711259b4399d0c1a SHA1 5979901ee99b67e5b17457f5cab65060b2724890 SHA256 365f001103c66e25c090ffb0753a56e2927d6b3f034ac578041f312bf66f851f
+MD5 edcd288ddd08b539ab93f10259fe1841 vnstat-1.5.ebuild 2044
+RMD160 bc9c70578cd371499a2f6250711259b4399d0c1a vnstat-1.5.ebuild 2044
+SHA256 365f001103c66e25c090ffb0753a56e2927d6b3f034ac578041f312bf66f851f vnstat-1.5.ebuild 2044
+MISC ChangeLog 3511 RMD160 dfb76984cd80d91cca39e6753f425d1ce05f1c39 SHA1 db70c861868fb9cad8815557ac06cfa611de43cb SHA256 676259fbf885d61dc4e0e08bdb7d07176bd347d25845cc82dded5fd19b6e5e81
+MD5 ba0223be1f2614f6878fd2b8e8b77dad ChangeLog 3511
+RMD160 dfb76984cd80d91cca39e6753f425d1ce05f1c39 ChangeLog 3511
+SHA256 676259fbf885d61dc4e0e08bdb7d07176bd347d25845cc82dded5fd19b6e5e81 ChangeLog 3511
+MISC metadata.xml 478 RMD160 2160f3a198353174ea16916049dbb29eabf0e52f SHA1 4c863c84cb01fc253ffdd3478e8c909411942dc3 SHA256 28925bec141a950acd9eff4f6c6bbf9732d4745134eb914501d60859408a49c4
+MD5 5d54579afc9a871990aea05bd773dfa0 metadata.xml 478
+RMD160 2160f3a198353174ea16916049dbb29eabf0e52f metadata.xml 478
+SHA256 28925bec141a950acd9eff4f6c6bbf9732d4745134eb914501d60859408a49c4 metadata.xml 478
 MD5 afc919918d97c89df58d8ba58280dcb3 files/digest-vnstat-1.4-r2 229
 RMD160 cb0f95558c2194ead6b7c7739fe0e1a9f998c586 files/digest-vnstat-1.4-r2 229
 SHA256 1ca41bcc3c561da005c6f75184b6a90e350056c8a81d1639bee1f0c182b7e06b files/digest-vnstat-1.4-r2 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
-
-iD8DBQFG4Evzz974XjDVpbkRAqCpAJ9Hek03H5ONciW8f5XFl+4scDGcGgCcDP9g
-xnDuXwyS+gylNJWU03fKqtY=
-=ImK+
------END PGP SIGNATURE-----
+MD5 e7133fd030a2c7ba970b6ce5e9f50886 files/digest-vnstat-1.5 229
+RMD160 e9b9b2251c2e41bab8ff5bc35752d0ab6450e485 files/digest-vnstat-1.5 229
+SHA256 164999769a585d28e3c9ac3d0cc33ba47cc44c2abe3187fccfce11192bc92930 files/digest-vnstat-1.5 229
diff --git a/net-analyzer/vnstat/files/digest-vnstat-1.5 b/net-analyzer/vnstat/files/digest-vnstat-1.5
new file mode 100644
index 000000000000..5b8720f4d58f
--- /dev/null
+++ b/net-analyzer/vnstat/files/digest-vnstat-1.5
@@ -0,0 +1,3 @@
+MD5 c9b435f2d12b23064d7005219d2d7371 vnstat-1.5.tar.gz 33491
+RMD160 062ac9fc4355e67445c15ce36d97f54347f1dc28 vnstat-1.5.tar.gz 33491
+SHA256 a590048a97761fa97e9ecb89e3a81a5a56949b2f5e669446b15cf9d655901aa6 vnstat-1.5.tar.gz 33491
diff --git a/net-analyzer/vnstat/metadata.xml b/net-analyzer/vnstat/metadata.xml
index dd2f3579ea22..ff2cafb5d05e 100644
--- a/net-analyzer/vnstat/metadata.xml
+++ b/net-analyzer/vnstat/metadata.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
-<longdescription>Console-based network traffic monitor that keeps statistics of network usage</longdescription>
+  <herd>netmon</herd>
+<longdescription>
+  vnStat is a network traffic monitor for Linux that keeps a log of daily
+  network traffic for the selected interface(s). vnStat isn't a packet sniffer.
+  The traffic information is analyzed from the /proc filesystem. That way vnStat
+  can be used even without root permissions.
+</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/vnstat/vnstat-1.4-r2.ebuild b/net-analyzer/vnstat/vnstat-1.4-r2.ebuild
index f22b50d8ddab..8ccfe6df81f9 100644
--- a/net-analyzer/vnstat/vnstat-1.4-r2.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/vnstat-1.4-r2.ebuild,v 1.9 2007/06/15 22:47:46 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/vnstat-1.4-r2.ebuild,v 1.10 2007/12/26 17:28:51 pva Exp $
 
 inherit eutils toolchain-funcs
 
@@ -36,7 +36,7 @@ src_install() {
 
 	dobin src/vnstat || die
 	exeinto /etc/cron.hourly
-	newexe ${FILESDIR}/vnstat.cron vnstat
+	newexe "${FILESDIR}"/vnstat.cron vnstat
 	doman man/vnstat.1
 
 	newdoc pppd/vnstat_ip-down ip-down.example
diff --git a/net-analyzer/vnstat/vnstat-1.5.ebuild b/net-analyzer/vnstat/vnstat-1.5.ebuild
new file mode 100644
index 000000000000..1c38773a6da7
--- /dev/null
+++ b/net-analyzer/vnstat/vnstat-1.5.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/vnstat-1.5.ebuild,v 1.1 2007/12/26 17:28:51 pva Exp $
+
+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=""
+
+RDEPEND="virtual/cron"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "Compilation failed"
+}
+
+src_install() {
+	dobin src/vnstat || die
+	exeinto /etc/cron.hourly
+	newexe "${FILESDIR}"/vnstat.cron vnstat
+
+	insinto /etc
+	doins cfg/vnstat.conf
+
+	doman man/vnstat.1
+
+	keepdir /var/lib/vnstat
+
+	newdoc pppd/vnstat_ip-up ip-up.example
+	newdoc pppd/vnstat_ip-down ip-down.example
+	dodoc CHANGES README UPGRADE FAQ
+	newdoc INSTALL README.setup
+}
+
+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
+		elog "vnStat db files moved from /var/spool/vnstat to /var/lib/vnstat"
+		elog
+	fi
+
+	elog "Repeat the following command for every interface you"
+	elog "wish to monitor (replace eth0):"
+	elog "   vnstat -u -i eth0"
+	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
+	else
+		elog "A cron script has been installed to /etc/cron.hourly/vnstat."
+		elog
+	fi
+	elog "To update your interface database automatically with"
+	elog "cron, uncomment the lines in /etc/cron.hourly/vnstat."
+	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)."
+}