sys-apps/dstat: Bump EAPI to 4 to use mod_optimize on non multi ABI installs, #413745

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

4 files changed, 24 insertions, 20 deletions

diff --git a/sys-apps/dstat/ChangeLog b/sys-apps/dstat/ChangeLog
index bebab4853e85..603cf5e25d79 100644
--- a/sys-apps/dstat/ChangeLog
+++ b/sys-apps/dstat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/dstat
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/ChangeLog,v 1.38 2012/01/02 13:58:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/ChangeLog,v 1.39 2012/04/27 16:04:59 jlec Exp $
+
+  27 Apr 2012; Justin Lecher <jlec@gentoo.org> dstat-0.6.9-r1.ebuild,
+  dstat-0.7.2-r1.ebuild:
+  Bump EAPI to 4 to use mod_optimize on non multi ABI installs, #413745
 
   02 Jan 2012; Justin Lecher <jlec@gentoo.org> dstat-0.6.9-r1.ebuild,
   -dstat-0.7.2.ebuild, dstat-0.7.2-r1.ebuild, metadata.xml:
diff --git a/sys-apps/dstat/Manifest b/sys-apps/dstat/Manifest
index f048548a9cde..f66f659031cb 100644
--- a/sys-apps/dstat/Manifest
+++ b/sys-apps/dstat/Manifest
@@ -4,14 +4,14 @@ Hash: SHA512
 AUX dstat-0.6.9-CVE-2009-3894.patch 721 RMD160 54b21dc985dde85554c04404ce1e693fa26777c0 SHA1 534cbc712b24fe5d5aeaaae17ab6291dae425693 SHA256 74f067376ed3276ebdeb71439b1f5b805e0a7ae6e6149779b63e7234d4ff9f26
 DIST dstat-0.6.9.tar.bz2 74060 RMD160 e90757d3273127acead60b9ec2ff1448d87845a7 SHA1 296a46edcee28525c4f6e3dcd615aa268bfeec5d SHA256 edb2c17d081ee2b0b4fc2c57c2ed6dc36628853abd76c838026e99b3d1ea897c
 DIST dstat-0.7.2.tar.bz2 85870 RMD160 553312dd0cb4bf05f5865a78187594a0ffe9fa30 SHA1 10baf061e3d38e1234fb99182fc53509adf07269 SHA256 34a986d9d7c028bd9dcb6b2ef1c740f7220de5c9cf976870a2b62aca23b33bae
-EBUILD dstat-0.6.9-r1.ebuild 1004 RMD160 7af970e34519700973e4dbeab618c44791b543f3 SHA1 f8d232ae71168c47d0ed64b00eb570ad39e6d89d SHA256 056d2e4b214e09d95c964ff6e8d47351d1e3c2278552acd04f407dd626a3a25d
-EBUILD dstat-0.7.2-r1.ebuild 1091 RMD160 cba4e1917cf1725ae1bac7d8a292360eaa4a63e0 SHA1 64fec29d67a612fd4e103e04c2ba27832dc0eb1c SHA256 f37c69395b571e3405bf3974a4266085c59a24b7e17062746dd96fe75c39e5c3
-MISC ChangeLog 5123 RMD160 749b9426cb0989510038a9371149744e0e9f1303 SHA1 b9762e8877925a5ab48cb6e1a6485604501bf889 SHA256 ce5138954d2db6d653d5185e87aba45c6bd20b8f9b47d45d0723146379fbb7f3
+EBUILD dstat-0.6.9-r1.ebuild 944 RMD160 29c34217af7fc7d6298d42b15603b2154fa7cd47 SHA1 a6b80fc528aa0876ab7aee7ef9f1a9c5bd0123d1 SHA256 74541f4af0a2d707774efa647016b77e5b7dd90930351dde886e4f404eb93569
+EBUILD dstat-0.7.2-r1.ebuild 1031 RMD160 cba234df33131604b96faa29d8143880232078d3 SHA1 0626b6faa93fc847fb786924ff4da37baa951d39 SHA256 62cd07ef50a25a4dadd9aa00f265a06d7db46a050fa095c71c34532435c4c4ff
+MISC ChangeLog 5291 RMD160 e86ef4ec0009e48d7c0ee98ca3648bb646f9ad2b SHA1 d5ea50021e1cd8246ce59fd42d0db479c0fc1106 SHA256 9efb109b29fe7c10221160db6d27e3445f07e02b1860a9b77ff687cdbfa141c4
 MISC metadata.xml 930 RMD160 adb19e0711d586019e15047612c6a74fccaea47e SHA1 e2f3f0a4a4c4c9f0aed26a9037ff59b340a43bd0 SHA256 abf91fbd7022ce5ba28daf37dc4bc86988c0d2932195bb81fb79c937298aad3f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk8BuBAACgkQgAnW8HDreRYW8QCgldr57s9M1eFFYkarmYQ8er+Z
-gEgAoKtoix5pt7UI5cFK+Mm0XjJZMJDf
-=Odar
+iEYEAREKAAYFAk+aw7EACgkQgAnW8HDreRZv1ACfUFgoqfipLtBUJLNTv+DxCW2B
+PpwAoKwsUk5gMYARectlAFXOH2CVgGK9
+=2xBW
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dstat/dstat-0.6.9-r1.ebuild b/sys-apps/dstat/dstat-0.6.9-r1.ebuild
index bd1fae78293c..ee2198222d9f 100644
--- a/sys-apps/dstat/dstat-0.6.9-r1.ebuild
+++ b/sys-apps/dstat/dstat-0.6.9-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/dstat-0.6.9-r1.ebuild,v 1.3 2012/01/02 13:58:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/dstat-0.6.9-r1.ebuild,v 1.4 2012/04/27 16:04:59 jlec Exp $
 
-EAPI=2
+EAPI=4
 
 PYTHON_DEPEND="2"
 
@@ -19,6 +19,7 @@ IUSE=""
 
 pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {
@@ -26,13 +27,12 @@ src_prepare() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install
 
 	dodoc \
 		AUTHORS ChangeLog README TODO \
-		examples/{mstat,read}.py docs/*.txt \
-		|| die "dodoc failed"
-	dohtml docs/*.html || die "dohtml failed"
+		examples/{mstat,read}.py docs/*.txt
+	dohtml docs/*.html
 }
 
 pkg_postinst() {
diff --git a/sys-apps/dstat/dstat-0.7.2-r1.ebuild b/sys-apps/dstat/dstat-0.7.2-r1.ebuild
index 377359fe7970..1382e5723ac0 100644
--- a/sys-apps/dstat/dstat-0.7.2-r1.ebuild
+++ b/sys-apps/dstat/dstat-0.7.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/dstat-0.7.2-r1.ebuild,v 1.4 2012/01/02 13:58:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/dstat-0.7.2-r1.ebuild,v 1.5 2012/04/27 16:04:59 jlec Exp $
 
-EAPI=3
+EAPI=4
 
 PYTHON_DEPEND="2"
 
@@ -22,6 +22,7 @@ DEPEND=""
 
 pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_compile() {
@@ -29,14 +30,13 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}" install || die "make install failed"
+	emake DESTDIR="${ED}" install
 	python_convert_shebangs 2 "${ED}usr/bin/dstat"
 
 	dodoc \
 		AUTHORS ChangeLog README TODO \
-		examples/{mstat,read}.py docs/*.txt \
-		|| die "dodoc failed"
-	dohtml docs/*.html || die "dohtml failed"
+		examples/{mstat,read}.py docs/*.txt
+	dohtml docs/*.html
 }
 
 pkg_postinst() {