4 files changed, 15 insertions, 42 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/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>