Move to EAPI=4

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

diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index b6998596eb98b3ff2fcf0e54064bff94e0519725..49e9bde2e9561031ec4e3713e70071a3a9463c33 100644 (file)
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qwt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.87 2011/12/19 22:02:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.88 2011/12/19 23:02:01 jlec Exp $
+
+  19 Dec 2011; Justin Lecher <jlec@gentoo.org> qwt-5.2.1.ebuild,
+  qwt-6.0.0.ebuild:
+  Move to EAPI=4
 
 *qwt-6.0.1 (19 Dec 2011)
 

diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index c320ac158cf0b0f2c8be58a4d7c7216cd23a13da..5481bade9df1a1a20623965f66b9e1ec438eb37d 100644 (file)
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -6,15 +6,15 @@ DIST qwt-5.2.1.tar.bz2 1926453 RMD160 28e07ea12323a5217118a38e1a7d730a8ce50fee S
 DIST qwt-6.0.0.tar.bz2 2723203 RMD160 c0e3c31fcc39e6f9a33b23e91d5f8c8125fb4f69 SHA1 306957fc06c90f2049aec57e13a971f54c3cb21a SHA256 d041d63029ea5f6a64d06be9bfe788e5d8bed8bac1fa129d82466aa09ab4092e
 DIST qwt-6.0.1.tar.bz2 2437570 RMD160 54b815d131fd7e7c8bfd1a49fbf3bc7c0ccc9c7a SHA1 301cca0c49c7efc14363b42e082b09056178973e SHA256 3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2
 EBUILD qwt-5.2.0.ebuild 1819 RMD160 c7725389288afbc2c563131cb3f48dc909d31814 SHA1 aff5a880d7bb286d1bb49711b50c45cbeda647a6 SHA256 ce8c4755ced518300725034b9ba12195642e52c769bd142c5cba520e359f79df
-EBUILD qwt-5.2.1.ebuild 1813 RMD160 87005c27005bb7a520a3462aef15bcee6392223b SHA1 9859ad1e627586ae91c07de0e11d2e37bb96a973 SHA256 2c8f00bf2476534e3ce59ba21996616b55d85ada4b120f04e754b355a27ff1fa
-EBUILD qwt-6.0.0.ebuild 2313 RMD160 1d97e9633c4d51991053fb080ef34a31ce73eca1 SHA1 95d3d550f4ff509041a3f8b9b7a2977f5152764b SHA256 d04a96e813e8cf333ea416050d3e88e9b4dde8f814b5dc9f54b737acb6cfb656
+EBUILD qwt-5.2.1.ebuild 1738 RMD160 469a1cab998874e1ccce273d9fac36a0986a98d5 SHA1 3d517e20cb6fb009663202f48d97d95406ea590f SHA256 62e783aaaeef04c4225ef1ebdc4b82148227cf3ce8ae13f9a24ca2a8888edd53
+EBUILD qwt-6.0.0.ebuild 2245 RMD160 43e039aa60569d8b0648839d98acbac8b44c1878 SHA1 78a7e0a0d8f7ea53b34b8498f2859121a487ba1a SHA256 ecbcef4af1c104530be0bae34f5973ffe9b309e8bfa9520ba017f37369e5ac65
 EBUILD qwt-6.0.1.ebuild 2313 RMD160 ffc61e4aca7208cb8fff7acffb5e522d2a16fb62 SHA1 6656c9c3e115197f2ef2c9ca3865b0b833173fee SHA256 8dbf532fb67159cbb3b695deacd540e505d670eb47d67916724ee105c5a79369
-MISC ChangeLog 11749 RMD160 6e526dd045c9583b6753c480cbcf98bfee2f12b4 SHA1 b5bde712ea8de4e3d3834d8fb66ee9041b51b738 SHA256 3c8b51dea1b20f90a8a10fcc1fc9536b93f7ea313af034473b3902216930a4f2
+MISC ChangeLog 11852 RMD160 7a5a4035a4c16fe3b211ea31fa8f60a5645abdaa SHA1 391baba82feecff7b265c63f45e5dadb7b0fc696 SHA256 0cff0da3f50ce899dcef4d15be8e2eabb09f46a7542ec612abf332ec24be3f89
 MISC metadata.xml 510 RMD160 7a1780387ea1057ad0c03ebb0893b8b784dbb240 SHA1 33685ae6f5525901140d7edac99e3f1a0b01d430 SHA256 381cae2dbb6c2d0f63af9aa9f11f51c32cca49c390bf6c89d3b2534f31fd7466
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk7vtIQACgkQgAnW8HDreRZncQCcCn/ojpqKBvDaG/hv0rijAK/e
-0NQAn2Xl9kZjqRw2NcTkMKuTjybViQ7+
-=RDTl
+iEYEAREKAAYFAk7vwnQACgkQgAnW8HDreRaw4wCeKg/W+q1JwMzF6S89BXOOPpWG
+NaEAn0bAgu0Q5cDU/iSsj/Xe1W+0kV2X
+=yBph
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/qwt/qwt-5.2.1.ebuild b/x11-libs/qwt/qwt-5.2.1.ebuild
index 5891a23f615ad690f790d1a231ccd20b29426789..9ce6ba9305ea382e62af454ed29b3fe79e063633 100644 (file)
--- a/x11-libs/qwt/qwt-5.2.1.ebuild
+++ b/x11-libs/qwt/qwt-5.2.1.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/x11-libs/qwt/qwt-5.2.1.ebuild,v 1.7 2011/06/15 06:15:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild,v 1.8 2011/12/19 23:02:01 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit eutils qt4-r2
 
@@ -49,8 +49,8 @@ src_prepare() {
 
 src_compile() {
        # split compilation to allow parallel building
-       emake sub-src || die "emake library failed"
-       emake || die "emake failed"
+       emake sub-src
+       emake
 }
 
 src_install () {
@@ -58,10 +58,10 @@ src_install () {
        insinto /usr/share/doc/${PF}
        if use doc; then
                rm doc/man/*/*license*
-               doman doc/man/*/* || die
-               doins -r doc/html || die
+               doman doc/man/*/*
+               doins -r doc/html
        fi
        if use examples; then
-               doins -r examples || die
+               doins -r examples
        fi
 }

diff --git a/x11-libs/qwt/qwt-6.0.0.ebuild b/x11-libs/qwt/qwt-6.0.0.ebuild
index efaf5d9769d4295b956297e4fcff722796056242..2cce62548813613d240962563d49d4e8bc34aa5c 100644 (file)
--- a/x11-libs/qwt/qwt-6.0.0.ebuild
+++ b/x11-libs/qwt/qwt-6.0.0.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/x11-libs/qwt/qwt-6.0.0.ebuild,v 1.1 2011/05/23 09:01:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.0.ebuild,v 1.2 2011/12/19 23:02:01 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit eutils qt4-r2
 
@@ -73,17 +73,17 @@ src_prepare() {
 
 src_compile() {
        # split compilation to allow parallel building
-       emake sub-src || die "emake library failed"
-       emake || die "emake failed"
+       emake sub-src
+       emake
 }
 
 src_install () {
        qt4-r2_src_install
        if use doc; then
-               dohtml -r doc/html/* || die
+               dohtml -r doc/html/*
        fi
        if use examples; then
                insinto /usr/share/doc/${PF}
-               doins -r examples || die
+               doins -r examples
        fi
 }