Update to EAPI 4 and remove old warnings.

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

3 files changed, 29 insertions, 41 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/Manifest b/net-analyzer/vnstat/Manifest
index fd4395f2a29e..694114916de9 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -7,13 +7,17 @@ AUX vnstatd.initd 960 RMD160 33c715340a7b3ebb0057e90182b9f6bd0ba274a6 SHA1 2402a
 DIST vnstat-1.10.tar.gz 77685 RMD160 1fddc4343cb3206cce42516f7ff61024c65eed3f SHA1 813177fb55296deaf5059bb111885616f4d8a86f SHA256 150883f9a6f5fe2430707baa26bd148f3781423f09d27cb5285096ad943cbea2
 DIST vnstat-1.11.tar.gz 79075 RMD160 c7a8602c6ed86c674b14b2b8708e97f5999fb0e5 SHA1 92494f38a752dcf60053af2a6d8977737da7e616 SHA256 b71876d817bbb6a16d31b4236e22a2eb6c39666a7f7bfea581f5ff441cade026
 EBUILD vnstat-1.10.ebuild 3318 RMD160 172815575dda53a472a74e2070d2f39415e7bd8c SHA1 0a0d25a863bceacea5853b280684d2c31b36526a SHA256 e3c3eaf5ab14f5e7418204487bbf6863d2e54148f4c5876b163e64ee1b35e4ee
-EBUILD vnstat-1.11.ebuild 3321 RMD160 52b039b77728c27961d354ae1d218d592b76e274 SHA1 48d3544e8f2e157bfb6ba1c7b3365e430a93e2b5 SHA256 40bd78110be341c2d331d8d3184179b0ce7228507224e117de7f5c9dc39bec0d
-MISC ChangeLog 6113 RMD160 56955485694542c2cc7d7369a4cbb4521343fe3a SHA1 7a8224e46772a3d6723e3b30591c5f75022253d2 SHA256 f01994cd11b63214d9ee5ee671b243e6966ac3253102814dc2b724ecbb58fc74
+EBUILD vnstat-1.11.ebuild 2524 RMD160 2a92efd85e5ed25b4b6dd422253d38cc17664365 SHA1 c90e8d91ec726f09f4fb9fc4eee23f053d4122c1 SHA256 e6bc4fa9ac800c807aacf91013c8b4e81139b81ed7fdec10763e9ceb2500361b
+MISC ChangeLog 6233 RMD160 c54b7bb6c7ca0dc4f5dbacd17d336dceaf0f5942 SHA1 153f30c6309015b05b65b1a08371b16f9dd88b14 SHA256 410bad54a0d48722a649bceef36b34a39bf43df6e23e70b1aab2bdbab36ca960
 MISC metadata.xml 478 RMD160 2160f3a198353174ea16916049dbb29eabf0e52f SHA1 4c863c84cb01fc253ffdd3478e8c909411942dc3 SHA256 28925bec141a950acd9eff4f6c6bbf9732d4745134eb914501d60859408a49c4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3sOBgACgkQVWmRsqeSphMxAQCfT7gAUDXvhhs76Qm21+vwjSeU
-ZmIAn2QbgZL5laGVLZ7BGNHFLcfY5lLy
-=QXi6
+iQEcBAEBAgAGBQJN7ITMAAoJEEqz6FtPBkyjWvMIAI0nVO4GUV4XS+F7z7AJ1MHx
+Gdc+IigSUacd5w3BcUWA7RobDDfHHYunoQRVurf3BsQcfny5oqeL9pZzTvwQUAte
+b90NWy5SnJj0XOzjXjiEmscZTx9O9BQQHJWRQzxjOhEYKiFxGP9wMkUE99C0BdPu
+kqT3C4z4RN4rtSvRhw/HHQ1g4/m/Rcwp7rpWUs7rOs16ynQNLdqAU2ChxGkubn9p
+F2B8vSeV5F0hdnOS1fUtU4VPoZvbIRm9YvTtp+QizQNaq520ccyijzZOA4fwTyjg
+WfyzBvfjuJ40K8NvK04PYwaGcLX//uhanR22Uzo+IA1H7Y4auB8IlO7ZpkfMvlI=
+=NLTf
 -----END PGP SIGNATURE-----
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)."
 }