sci-mathematics/drgeo: Moved to EAPI=4, dropped unnessecary die

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

3 files changed, 17 insertions, 15 deletions

diff --git a/sci-mathematics/drgeo/ChangeLog b/sci-mathematics/drgeo/ChangeLog
index 3954f07a6526..bfbb43089703 100644
--- a/sci-mathematics/drgeo/ChangeLog
+++ b/sci-mathematics/drgeo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/drgeo
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/drgeo/ChangeLog,v 1.21 2011/07/20 16:04:45 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/drgeo/ChangeLog,v 1.22 2012/04/25 18:47:43 jlec Exp $
+
+  25 Apr 2012; Justin Lecher <jlec@gentoo.org> drgeo-1.1.0.ebuild,
+  metadata.xml:
+  Moved to EAPI=4, dropped unnessecary die
 
   20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #70723
diff --git a/sci-mathematics/drgeo/drgeo-1.1.0.ebuild b/sci-mathematics/drgeo/drgeo-1.1.0.ebuild
index 0955f17e2a4c..b00b156e71b3 100644
--- a/sci-mathematics/drgeo/drgeo-1.1.0.ebuild
+++ b/sci-mathematics/drgeo/drgeo-1.1.0.ebuild
@@ -1,8 +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-mathematics/drgeo/drgeo-1.1.0.ebuild,v 1.8 2011/03/02 13:55:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/drgeo/drgeo-1.1.0.ebuild,v 1.9 2012/04/25 18:47:43 jlec Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit eutils
 
@@ -11,12 +11,13 @@ DOCV="1.5"
 DOC="${DOCN}-${DOCV}"
 
 DESCRIPTION="Interactive geometry package"
-LICENSE="GPL-2"
 HOMEPAGE="http://www.ofset.org/drgeo"
-SRC_URI="mirror://sourceforge/ofset/${P}.tar.gz
+SRC_URI="
+	mirror://sourceforge/ofset/${P}.tar.gz
 	mirror://sourceforge/ofset/${DOC}.tar.gz"
 
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="nls"
 
@@ -28,7 +29,6 @@ RDEPEND="
 		>=dev-scheme/guile-1.8[deprecated]
 		=dev-scheme/guile-1.6*
 	)"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -42,17 +42,15 @@ src_configure() {
 	# yet in portage. Fortunately HTML is already compiled for us in the
 	# tarball and so can be installed. Just create the make install target.
 	cd "${WORKDIR}"/${DOC}
-	econf || die "docs econf failed."
+	econf
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed."
-	dodoc AUTHORS ChangeLog README NEWS TODO || die
+	default
 	if use nls; then
 		cd "${WORKDIR}"/${DOC}
 	else
 		cd "${WORKDIR}"/${DOC}/c
 	fi
-	emake install DESTDIR="${D}" || die "emake docs installation failed"
-
+	emake install DESTDIR="${D}"
 }
diff --git a/sci-mathematics/drgeo/metadata.xml b/sci-mathematics/drgeo/metadata.xml
index de906e3a2ec8..4eed29af3f63 100644
--- a/sci-mathematics/drgeo/metadata.xml
+++ b/sci-mathematics/drgeo/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
-  <longdescription lang="en">
+	<herd>sci-mathematics</herd>
+	<longdescription lang="en">
     Dr. Geo is a GTK2 interactive geometry software. It allows one to
     create geometric figure plus the interactive manipulation of
     such figure in respect with their geometric constraints. It is