Improved 1.7 ebuild by Sebastian Mair, bumped to eapi2 for use-deps. Closes #266116

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

3 files changed, 94 insertions, 2 deletions

diff --git a/net-analyzer/vnstat/ChangeLog b/net-analyzer/vnstat/ChangeLog
index c37f2f283296..b4aa21d02a14 100644
--- a/net-analyzer/vnstat/ChangeLog
+++ b/net-analyzer/vnstat/ChangeLog
@@ -1,6 +1,12 @@
 # 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.33 2009/04/18 15:30:14 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/ChangeLog,v 1.34 2009/04/26 19:56:03 patrick Exp $
+
+*vnstat-1.7-r1 (26 Apr 2009)
+
+  26 Apr 2009; Patrick Lauer <patrick@gentoo.org> +vnstat-1.7-r1.ebuild:
+  Improved 1.7 ebuild by Sebastian Mair, bumped to eapi2 for use-deps.
+  Closes #266116
 
 *vnstat-1.7 (18 Apr 2009)
 
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index a84dd724ccbf..bd6967674eac 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -2,6 +2,7 @@ AUX vnstat.cron 220 RMD160 124b6157c62cbb853d72e9d6e556fc38d3d51d54 SHA1 ae4e13a
 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
 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.ebuild 2048 RMD160 1fc070747147437bc8a72bfa8b007b2a11a10afa SHA1 39ee66764b4e34660a84f7f2a56d59eca43e1b16 SHA256 0ef5f8a625c8b14c7d4561f36845b7f21396803e0f7c2d461d878e5e820c506f
-MISC ChangeLog 4284 RMD160 017930acafda9ebacdb1b634d4ac5c471b9f23b4 SHA1 462ccd4daf3bb7e515ea6fdc33b9d57fa1d68cf3 SHA256 9db84894b40d6e70949dcfd6117b697dbe913077deccd68838be38954e6f6131
+MISC ChangeLog 4476 RMD160 61d0d8313fae980c0cbd838d30ba0d7721d39198 SHA1 7a5614f14bf0fe01d8e3ac7ff529142805705bb1 SHA256 868d45c75efb6381c36cb9fffcc3378a1349aed6a94fb3adf6754867c15dd75c
 MISC metadata.xml 478 RMD160 2160f3a198353174ea16916049dbb29eabf0e52f SHA1 4c863c84cb01fc253ffdd3478e8c909411942dc3 SHA256 28925bec141a950acd9eff4f6c6bbf9732d4745134eb914501d60859408a49c4
diff --git a/net-analyzer/vnstat/vnstat-1.7-r1.ebuild b/net-analyzer/vnstat/vnstat-1.7-r1.ebuild
new file mode 100644
index 000000000000..80fdf06c51bc
--- /dev/null
+++ b/net-analyzer/vnstat/vnstat-1.7-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/vnstat-1.7-r1.ebuild,v 1.1 2009/04/26 19:56:03 patrick 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"
+
+src_compile() {
+	if use gd; then
+		emake all CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+	else
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+	fi
+}
+
+src_install() {
+	if use gd; then
+		dobin src/vnstati || die "dobin failed"
+	fi
+	dobin src/vnstat src/vnstatd || die "dobin failed"
+	exeinto /etc/cron.hourly
+	newexe "${FILESDIR}"/vnstat.cron vnstat
+
+	insinto /etc
+	doins cfg/vnstat.conf
+
+	if use gd; then
+		doman man/vnstati.1
+	fi
+	doman man/vnstat.1 man/vnstatd.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)."
+}