Update to EAPI 4 and remove old warnings.

(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)

2 files changed, 20 insertions, 36 deletions

diff --git a/net-analyzer/vnstat/ChangeLog b/net-analyzer/vnstat/ChangeLog
index f8ce18b6abc3..59fd91270c69 100644
--- a/net-analyzer/vnstat/ChangeLog
+++ b/net-analyzer/vnstat/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/vnstat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/ChangeLog,v 1.46 2011/06/06 02:14:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/ChangeLog,v 1.47 2011/06/06 07:41:54 radhermit Exp $
+
+  06 Jun 2011; Tim Harder <radhermit@gentoo.org> vnstat-1.11.ebuild:
+  Update to EAPI 4 and remove old warnings.
 
 *vnstat-1.11 (06 Jun 2011)
 
diff --git a/net-analyzer/vnstat/vnstat-1.11.ebuild b/net-analyzer/vnstat/vnstat-1.11.ebuild
index 794509b666ce..e61569006a24 100644
--- a/net-analyzer/vnstat/vnstat-1.11.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.11.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/vnstat-1.11.ebuild,v 1.1 2011/06/06 02:14:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/vnstat-1.11.ebuild,v 1.2 2011/06/06 07:41:54 radhermit Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils toolchain-funcs
 
@@ -30,50 +30,40 @@ src_compile() {
 	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"
+		emake all CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 	else
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 	fi
 }
 
 src_install() {
-	if use gd; then
-		dobin src/vnstati || die "vnstati dobin failed"
-	fi
-	dobin src/vnstat src/vnstatd || die "dobin failed"
+	use gd && dobin src/vnstati
+	dobin src/vnstat src/vnstatd
 	exeinto /etc/cron.hourly
-	newexe "${FILESDIR}"/vnstat.cron vnstat || die
+	newexe "${FILESDIR}"/vnstat.cron vnstat
 
 	insinto /etc
-	doins cfg/vnstat.conf || die
+	doins cfg/vnstat.conf
 	fowners root:vnstat /etc/vnstat.conf
 
-	newconfd "${FILESDIR}/vnstatd.confd" vnstatd || die
-	newinitd "${FILESDIR}/vnstatd.initd" vnstatd || die
+	newconfd "${FILESDIR}/vnstatd.confd" vnstatd
+	newinitd "${FILESDIR}/vnstatd.initd" vnstatd
 
 	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
+	use gd && doman man/vnstati.1
+	doman man/vnstat.1 man/vnstatd.1
 
-	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
+	newdoc examples/vnstat_ip-up ip-up.example
+	newdoc examples/vnstat_ip-down ip-down.example
+	newdoc INSTALL README.setup
+	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
 }
 
 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"
@@ -89,17 +79,8 @@ pkg_postinst() {
 	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)."
 }