sci-mathematics/axiom: Moved to EAPI=4, dropped unnecessary die

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

3 files changed, 18 insertions, 17 deletions

diff --git a/sci-mathematics/axiom/ChangeLog b/sci-mathematics/axiom/ChangeLog
index bb420f13f908..1ea180737160 100644
--- a/sci-mathematics/axiom/ChangeLog
+++ b/sci-mathematics/axiom/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/axiom
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.22 2008/08/30 13:17:33 markusle Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.23 2012/04/25 18:51:42 jlec Exp $
+
+  25 Apr 2012; Justin Lecher <jlec@gentoo.org> axiom-200805.ebuild,
+  metadata.xml:
+  Moved to EAPI=4, dropped unnecessary die
 
   30 Aug 2008; Markus Dittrich <markusle@gentoo.org> axiom-200803.ebuild,
   axiom-200805.ebuild:
diff --git a/sci-mathematics/axiom/axiom-200805.ebuild b/sci-mathematics/axiom/axiom-200805.ebuild
index 7c2cc41f2577..d0ad53a5e5c0 100644
--- a/sci-mathematics/axiom/axiom-200805.ebuild
+++ b/sci-mathematics/axiom/axiom-200805.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/axiom-200805.ebuild,v 1.6 2008/08/30 13:17:33 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/axiom-200805.ebuild,v 1.7 2012/04/25 18:51:42 jlec Exp $
+
+EAPI=4
 
 inherit eutils multilib flag-o-matic
 
@@ -21,6 +23,7 @@ DEPEND="virtual/latex-base
 	x11-libs/libXaw
 	sys-apps/debianutils
 	sys-process/procps"
+RDEPEND=""
 
 S="${WORKDIR}"/${PN}
 
@@ -48,25 +51,20 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	cp "${FILESDIR}"/noweb-2.9-insecure-tmp-file.patch.input \
 		"${S}"/zips/noweb-2.9-insecure-tmp-file.patch \
 		|| die "Failed to fix noweb"
 	cp "${FILESDIR}"/${PN}-200711-gcl-configure.patch \
 		"${S}"/zips/gcl-2.6.7.configure.in.patch \
 		|| die "Failed to fix gcl-2.6.7 configure"
-	epatch "${FILESDIR}"/noweb-2.9-insecure-tmp-file.Makefile.patch \
-		|| die "Failed to patch noweb security issue!"
-}
+	epatch "${FILESDIR}"/noweb-2.9-insecure-tmp-file.Makefile.patch
 
-src_compile() {
 	# lots of strict-aliasing badness
 	append-flags -fno-strict-aliasing
+}
 
-	econf || die "Failed to configure"
+src_compile() {
 	# use gcl 2.6.7
 	sed -e "s:GCLVERSION=gcl-2.6.8pre$:GCLVERSION=gcl-2.6.7:" \
 		-i Makefile.pamphlet Makefile \
@@ -77,12 +75,11 @@ src_compile() {
 		|| die "Failed to fix libXpm lib paths"
 
 	# Let the fun begin...
-	AXIOM="${S}"/mnt/linux emake -j1 || die "emake failed"
+	AXIOM="${S}"/mnt/linux emake -j1
 }
 
 src_install() {
-	emake DESTDIR="${D}"/opt/axiom COMMAND="${D}"/opt/axiom/mnt/linux/bin/axiom install \
-		|| die 'Failed to install Axiom!'
+	emake DESTDIR="${D}"/opt/axiom COMMAND="${D}"/opt/axiom/mnt/linux/bin/axiom install
 
 	mv "${D}"/opt/axiom/mnt/linux/* "${D}"/opt/axiom \
 		|| die "Failed to mv axiom into its final destination path."
diff --git a/sci-mathematics/axiom/metadata.xml b/sci-mathematics/axiom/metadata.xml
index 5a2f1c7b832e..2b0bd5314823 100644
--- a/sci-mathematics/axiom/metadata.xml
+++ b/sci-mathematics/axiom/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-mathematics</herd>
+	<herd>sci-mathematics</herd>
 </pkgmetadata>