sci-calculators/hexcalc: Move to EAPI=4, remove unnesecarry die

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

5 files changed, 23 insertions, 51 deletions

diff --git a/sci-calculators/hexcalc/ChangeLog b/sci-calculators/hexcalc/ChangeLog
index 2c076effc670..4cbee9d406a6 100644
--- a/sci-calculators/hexcalc/ChangeLog
+++ b/sci-calculators/hexcalc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-calculators/hexcalc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/ChangeLog,v 1.13 2010/07/19 19:09:21 josejx Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/ChangeLog,v 1.14 2012/04/26 16:40:50 jlec Exp $
+
+  26 Apr 2012; Justin Lecher <jlec@gentoo.org> -hexcalc-1.11.ebuild,
+  hexcalc-1.11-r2.ebuild, metadata.xml:
+  Move to EAPI=4, remove unnesecarry die
 
   19 Jul 2010; Joseph Jezak <josejx@gentoo.org> hexcalc-1.11-r2.ebuild:
   Marked ppc stable for bug #328439.
diff --git a/sci-calculators/hexcalc/Manifest b/sci-calculators/hexcalc/Manifest
index 4e13e45c115d..71124629f492 100644
--- a/sci-calculators/hexcalc/Manifest
+++ b/sci-calculators/hexcalc/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX hexcalc-keypad.diff 3787 RMD160 f13d192b48cb2fa4c441d4774982bd45c5e01a06 SHA1 d6682c87510ebe6ceebe6fea3a03e1de3058e35c SHA256 9a4d797d5807ec04814b2c33793614a53782d8c74c23fe38eae4da8eb87897e7
 AUX hexcalc-order.diff 972 RMD160 ea7b1b4fb9d85efce3da4363e1fe9d042f50a585 SHA1 efb7774446e573cfcd06dd5da1178c25e0ae8093 SHA256 d7a7b4317b97b2ba45a8fb6180b772fb213d08d11efc151aa72223e15fd66ff9
 DIST hexcalc.tar.Z 18033 RMD160 8a31ed80478e79995d76d8e64a9671fc84ad161c SHA1 7212f58cea26252db6b9233b3931a0474874465c SHA256 726dae5803538cdae658e6b8b9184ec34f23af7fdfdc4412fecae040d66c5480
-EBUILD hexcalc-1.11-r2.ebuild 849 RMD160 ff14252470a99bdacc44dfdfaca90b7342e28832 SHA1 960a3c38fc5b4cfe99ebdfce005c611bf49758ab SHA256 d48b71c3e3dd8069c896064ef3f38ca20eb9d3d8ef456e7485dbaedecfff6aac
-EBUILD hexcalc-1.11.ebuild 639 RMD160 769d47764f0e804475ab53f210888c55de15416d SHA1 6d81635117726b65591591147bf88886c5fe4765 SHA256 6026fd852944d014e4ce56802b5f937f2306c205ddb5eb02fbcc33534253a03c
-MISC ChangeLog 2001 RMD160 9c7faf81384f2ee8da1f9867168b90da683436cf SHA1 164550ddc8cef2680dde49e87d11f9a3228b4eb0 SHA256 63a0fc916bcd98935c46900338576239d3f36b5525f560e3e8fa7d7f6cd04789
-MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
+EBUILD hexcalc-1.11-r2.ebuild 793 RMD160 9eb11bba4ba1f39684422871523915289f57df03 SHA1 df87a4059e87f45f76c73c3d98d168a7970eafa7 SHA256 9b726a32a17da406dddf9196c0fa11cb4c5bf3c0bf3ab63b90c588e30c032506
+MISC ChangeLog 2150 RMD160 56abcdb05c630cc3f3b4c44a828d73c521e324a1 SHA1 9296a732380f0de56bfcc8b730255bb12056c721 SHA256 ebc0701261d9361fa88996e53d86fe380e72f6b2f9116ce9a53a6c45f4b0457c
+MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAkxEouAACgkQcsIHjyDViGQjUACeMbWieWePXSQ+Aizicv+BSPEL
-IWQAn0xTGHwkaxXJ6YVRjJwxuad2YXYk
-=WM5x
+iEYEAREKAAYFAk+ZepgACgkQgAnW8HDreRaeuACfSNs02S83EHuMWeNLDIaYHPNF
+c1sAnREmLdCheYLrBRxKXWWxoCXxpLzE
+=T4on
 -----END PGP SIGNATURE-----
diff --git a/sci-calculators/hexcalc/hexcalc-1.11-r2.ebuild b/sci-calculators/hexcalc/hexcalc-1.11-r2.ebuild
index 2496fc9e587e..11a37c9d2fa1 100644
--- a/sci-calculators/hexcalc/hexcalc-1.11-r2.ebuild
+++ b/sci-calculators/hexcalc/hexcalc-1.11-r2.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2010 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/hexcalc/hexcalc-1.11-r2.ebuild,v 1.4 2010/07/19 19:09:21 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/hexcalc-1.11-r2.ebuild,v 1.5 2012/04/26 16:40:51 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="A simple hex calculator for X"
 HOMEPAGE="ftp://ftp.x.org/R5contrib/"
 SRC_URI="ftp://ftp.x.org/R5contrib/${PN}.tar.Z"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
@@ -22,7 +23,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}
 
 src_prepare() {
-	epatch ${FILESDIR}/${PN}-* || die
+	epatch "${FILESDIR}"/${PN}-*
 }
 
 src_compile() {
@@ -31,12 +32,10 @@ src_compile() {
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
 		CCLINK="$(tc-getCC)" \
-		LDOPTIONS="${LDFLAGS}" \
-		|| die
+		LDOPTIONS="${LDFLAGS}"
 }
 
 src_install() {
-	dobin hexcalc || die
-	mv hexcalc.man hexcalc.1
-	doman hexcalc.1 || die
+	dobin ${PN}
+	newman ${PN}.{man,1}
 }
diff --git a/sci-calculators/hexcalc/hexcalc-1.11.ebuild b/sci-calculators/hexcalc/hexcalc-1.11.ebuild
deleted file mode 100644
index ee4c0ca1ea89..000000000000
--- a/sci-calculators/hexcalc/hexcalc-1.11.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/hexcalc-1.11.ebuild,v 1.7 2007/07/22 07:29:44 dberkholz Exp $
-
-DESCRIPTION="A simple hex calculator for X"
-HOMEPAGE="ftp://ftp.x.org/R5contrib/"
-SRC_URI="ftp://ftp.x.org/R5contrib/${PN}.tar.Z"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	x11-misc/imake
-	app-text/rman"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	xmkmf || die
-	make || die
-}
-
-src_install() {
-
-	dobin hexcalc
-	mv hexcalc.man hexcalc.1
-	doman hexcalc.1
-}
diff --git a/sci-calculators/hexcalc/metadata.xml b/sci-calculators/hexcalc/metadata.xml
index b229aec85b8f..d369d068ffb8 100644
--- a/sci-calculators/hexcalc/metadata.xml
+++ b/sci-calculators/hexcalc/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+	<herd>sci</herd>
 </pkgmetadata>