keyword amd64-linux, x86-linux, switch to EAPI4

Package-Manager: portage-2.2.01.20796-prefix/cvs/Linux x86_64

3 files changed, 27 insertions, 23 deletions

diff --git a/sci-calculators/pcalc/ChangeLog b/sci-calculators/pcalc/ChangeLog
index 2e2ba8b887d3..34604b755df4 100644
--- a/sci-calculators/pcalc/ChangeLog
+++ b/sci-calculators/pcalc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-calculators/pcalc
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/pcalc/ChangeLog,v 1.24 2011/08/07 13:08:55 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/pcalc/ChangeLog,v 1.25 2012/08/04 22:29:20 bicatali Exp $
+
+  04 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> pcalc-2.ebuild:
+  keyword amd64-linux, x86-linux, switch to EAPI4
 
   07 Aug 2011; Mike Frysinger <vapier@gentoo.org> pcalc-1.3.ebuild,
   pcalc-2.ebuild:
diff --git a/sci-calculators/pcalc/Manifest b/sci-calculators/pcalc/Manifest
index e791546f14ae..39cd59d528c4 100644
--- a/sci-calculators/pcalc/Manifest
+++ b/sci-calculators/pcalc/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST pcalc-1.2.tar.bz2 95921 RMD160 11062a3f85ea96f5395d67733c18d5f663948ecb SHA1 627929559d74d233728c2164b6e472a3781c59bb SHA256 ae7548463492c931c24b89143a2c3301f0c0a035a97907bf6d30fa5feffbc5f0
-DIST pcalc-1.3.tar.lzma 88669 RMD160 be65a822e270d2e73595457c2dcfe1bdf9a10b9b SHA1 9ef2fccb96b55d7116953ccd1366e6ace5f877f8 SHA256 3016d257062094292269b9637b21ae5cd34dd8efd2844ba802d12f1a4dd91810
-DIST pcalc-2.tar.lzma 92758 RMD160 0e77885fe3296a59a8db55c2cd01eca19de87268 SHA1 0400459ecb985d2a638179f8ac2c4f35f9ca3a0e SHA256 be93062e8a15029ea50e4f9f9d0fd4fdbab82c927b7b93afa6f7fa398081c78f
-EBUILD pcalc-1.2.ebuild 575 RMD160 ebfc3cb10d8ff2d3573d0c6fa0a10988c0710960 SHA1 8d19a6907df0d2fc1cedc10b09ae2304fb10edb5 SHA256 4484ae50061824232d8317f722aca0c4b610126efcb1f84da635067573d25e9a
-EBUILD pcalc-1.3.ebuild 674 RMD160 9821b81d9b7c45427e5cfb232ffc005d3e1b2aba SHA1 ba741685e407142ac55e085c207690a29146db4f SHA256 0a86f0b2d2c0391b6f81ad0bfc2a0761a1e1e4ae83b37b7ce685b28f7597daa5
-EBUILD pcalc-2.ebuild 684 RMD160 efea526ffca10046741d2b6fee778250cfe90a8b SHA1 046d66a8c5a3319f63537681457c7ead8cfb10bc SHA256 acd5157d98535d034ca8dad5daf4c41a25f4d0be8fc05e48af40453cf9b5c0cd
-MISC ChangeLog 3030 RMD160 039d2ac895d5c34ec3af31902fe9c51b74a96d32 SHA1 972cd700f47f1c08f4e943d36092b351013a72f8 SHA256 632e41cd54548ef3df23042317ad3cdc651886fa20d32af2e81ab8cfa78a8cf1
-MISC metadata.xml 217 RMD160 e59c012ba8ec27b36439e65a1b5bbf0ff095353e SHA1 b036cf281dafc05a23dd9e447afa2b2c97d38d4d SHA256 0ae4a6bf75b6b017febdd961c518071b702eaddde696b88720d0d40ba569255b
+DIST pcalc-1.2.tar.bz2 95921 SHA256 ae7548463492c931c24b89143a2c3301f0c0a035a97907bf6d30fa5feffbc5f0
+DIST pcalc-1.3.tar.lzma 88669 SHA256 3016d257062094292269b9637b21ae5cd34dd8efd2844ba802d12f1a4dd91810
+DIST pcalc-2.tar.lzma 92758 SHA256 be93062e8a15029ea50e4f9f9d0fd4fdbab82c927b7b93afa6f7fa398081c78f SHA512 f36db3d960a2feeaad5717349a6fff461f01ca074d016a3faab1141729e9f25d17e650f0e108c950f5ae7115ac4a778427687639fde52b2d28419cb9b9526adb WHIRLPOOL 7b8256d9a478f56ae5f3ef2f92276ee3487ad3146922e80ab836ad9731da92770c7c47ba97a604f4a05fb39dd4779f33879d4873df95d86abbc9e69447430739
+EBUILD pcalc-1.2.ebuild 575 SHA256 4484ae50061824232d8317f722aca0c4b610126efcb1f84da635067573d25e9a SHA512 166d15b2f717c34e7cb3880879aa1dc31b3dd13ab250ac26d929c542379bb371c7d7aa4bde1a46d9d5b841ab058040a4fb26e1bb0e0c0fb80c0124c06ba3f82f WHIRLPOOL 20f9658c3eb9ab7aa4d408c138336925942c8e4a0efb7c60885fcfd381521b26cc2792d8870713711791a989518b957aad80aca886be295e1656ad0aa9bc39ac
+EBUILD pcalc-1.3.ebuild 674 SHA256 0a86f0b2d2c0391b6f81ad0bfc2a0761a1e1e4ae83b37b7ce685b28f7597daa5 SHA512 af997f5726f06dd42c9002229fb70366f7f0509eae49c799e30ada0af48aca1fbb72554f10d71623aec9027f3a3e3f586416e900ee021139530915179f860ef1 WHIRLPOOL d382af25ba015aeb6ab26fc34364d94e062d641e1572063e937990fca8535b0fb34092ed7761b1a25d835c49968d997bc7a1dd0967b42f59e279555f9e83e685
+EBUILD pcalc-2.ebuild 687 SHA256 f28364c3c4885f1474f905ef6d2b047575392b381f304d45c7f22826445448a5 SHA512 452fb2d7b11e86822ec8bf23832151f655bb88ea369689a05b32f0e3a2af58438986d9235016242ee2e24816c0984243a2bdbc7ffbd42b1080e3321ab3e7afaa WHIRLPOOL 9488f5258c4b6f1cc24070e94fc5fe312b09e1f26a813079c0fc1b3ab86f93a7d0418805172e7bc4d8b15c9911697aa87216bbc30edb17ebba1b2dbbbcd86c9b
+MISC ChangeLog 3154 SHA256 d2b5a7002557f9e845ee263c759f91bcc369b033ecf16d9ba47102236fd093c8 SHA512 ec3ff10311703319b907085305e7b00d198d6137f574190a40588d200067991808ca06039aca3515d8846ad2d7913016151b4a5a84c74b5075e23edaf2e9ac98 WHIRLPOOL da0495e629dc4fbeab227aa6dccce47c3e4c1af837eb998297b393f29c7c8a0b69062b50fa53d454dbe572f568b3e41528d2ae5f933933b5dee057e3e54ab9be
+MISC metadata.xml 217 SHA256 0ae4a6bf75b6b017febdd961c518071b702eaddde696b88720d0d40ba569255b SHA512 0761c22d46a634cf74fb971600937705c64bb0220971b350d1158220cea6b5d917d64c046f687e17e7ce078dea3f12a417db8d776d5b63259399fdb4e5f5c2a2 WHIRLPOOL c6a8cb37b54b60c7973cae34242fc99dfc0ad36fc43c9aab0ca5cebfd6e54c5587228f527d3de61a293f5954b9ea7938f83825be34253446430a72c9425f2821
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk4+jmIACgkQaC/OocHi7JZdDgD+LoLImVu07IkvkNihfH440Wlb
-fbxmb6gg5+CJsL1QpkoA/jCvAj/LJDeIYTE/10gvdk32KEZ2nPy+1Yy/WW2wBY0Q
-=D2NR
+iEYEAREIAAYFAlAdokYACgkQ1ycZbhPLE2DnfwCfbG1UOHqOXL7Fyx3Alln5jSfh
+89oAnjNg4KBsq4MX2nKTeE1A6WaC1b11
+=LQSs
 -----END PGP SIGNATURE-----
diff --git a/sci-calculators/pcalc/pcalc-2.ebuild b/sci-calculators/pcalc/pcalc-2.ebuild
index 67270dfbf960..83f423a8683d 100644
--- a/sci-calculators/pcalc/pcalc-2.ebuild
+++ b/sci-calculators/pcalc/pcalc-2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/pcalc/pcalc-2.ebuild,v 1.2 2011/08/07 13:08:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/pcalc/pcalc-2.ebuild,v 1.3 2012/08/04 22:29:20 bicatali Exp $
+
+EAPI=4
 
 inherit toolchain-funcs
 
@@ -10,18 +12,17 @@ SRC_URI="mirror://sourceforge/pcalc/${P}.tar.lzma"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="sys-devel/flex"
 RDEPEND=""
 
-src_compile() {
-	tc-export CC
-	emake pcalc || die
+src_prepare() {
+	sed -i -e "s:/usr:${EPREFIX}/usr:g" Makefile || die
 }
 
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog EXAMPLE README
+src_compile() {
+	tc-export CC
+	emake pcalc
 }