Defined RDEPEND, bumped EAPI, corrected die

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

4 files changed, 28 insertions, 21 deletions

diff --git a/sci-libs/gaul-devel/ChangeLog b/sci-libs/gaul-devel/ChangeLog
index 4506bf3d7df0..bb19b5717ae6 100644
--- a/sci-libs/gaul-devel/ChangeLog
+++ b/sci-libs/gaul-devel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/gaul-devel
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gaul-devel/ChangeLog,v 1.10 2010/02/13 16:42:19 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gaul-devel/ChangeLog,v 1.11 2011/06/26 14:47:52 jlec Exp $
+
+  26 Jun 2011; Justin Lecher <jlec@gentoo.org> gaul-devel-0.1849-r1.ebuild,
+  gaul-devel-0.1849-r2.ebuild, metadata.xml:
+  Defined RDEPEND, bumped EAPI, corrected die
 
 *gaul-devel-0.1849-r2 (13 Feb 2010)
 
diff --git a/sci-libs/gaul-devel/gaul-devel-0.1849-r1.ebuild b/sci-libs/gaul-devel/gaul-devel-0.1849-r1.ebuild
index e2c494e010c9..6a3d0ce85176 100644
--- a/sci-libs/gaul-devel/gaul-devel-0.1849-r1.ebuild
+++ b/sci-libs/gaul-devel/gaul-devel-0.1849-r1.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gaul-devel/gaul-devel-0.1849-r1.ebuild,v 1.5 2009/09/23 20:06:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gaul-devel/gaul-devel-0.1849-r1.ebuild,v 1.6 2011/06/26 14:47:52 jlec Exp $
 
 inherit eutils
 
 DESCRIPTION="Genetic Algorithm Utility Library"
 HOMEPAGE="http://GAUL.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gaul/${P}-0.tar.bz2"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
-
 KEYWORDS="~x86 ~amd64"
-
 IUSE="debug slang"
 
-DEPEND=">=sys-apps/sed-4
-	slang? ( >=sys-libs/slang-2.1.3 )"
+DEPEND="
+	sys-apps/sed
+	slang? ( sys-libs/slang )"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${P}-0
 
@@ -34,11 +34,11 @@ src_compile() {
 	else
 		myconf="${myconf} --enable-g=no"
 	fi
-	econf ${myconf} || die "econf failed"
+	econf ${myconf}
 	emake || die "emake failed"
 }
 
 src_install() {
 	emake -j1 DESTDIR="${D}" install || die "Install failed"
-	dodoc README
+	dodoc README || die
 }
diff --git a/sci-libs/gaul-devel/gaul-devel-0.1849-r2.ebuild b/sci-libs/gaul-devel/gaul-devel-0.1849-r2.ebuild
index f7b10c0bb48d..8720550184e3 100644
--- a/sci-libs/gaul-devel/gaul-devel-0.1849-r2.ebuild
+++ b/sci-libs/gaul-devel/gaul-devel-0.1849-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gaul-devel/gaul-devel-0.1849-r2.ebuild,v 1.1 2010/02/13 16:42:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gaul-devel/gaul-devel-0.1849-r2.ebuild,v 1.2 2011/06/26 14:47:52 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit autotools eutils
 
@@ -15,14 +15,17 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="debug slang"
 
-DEPEND=">=sys-apps/sed-4
-	slang? ( >=sys-libs/slang-2.1.3 )"
+DEPEND="
+	sys-apps/sed
+	slang? ( sys-libs/slang )"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${P}-0
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-slang2-error.patch
-	epatch "${FILESDIR}"/${P}-as-needed.patch
+	epatch \
+		"${FILESDIR}"/${P}-slang2-error.patch \
+		"${FILESDIR}"/${P}-as-needed.patch
 	eautoreconf
 }
 
@@ -38,6 +41,6 @@ src_configure() {
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" install || die
-	dodoc README || die
+	MAKEOPTS+=" -j1"
+	default
 }
diff --git a/sci-libs/gaul-devel/metadata.xml b/sci-libs/gaul-devel/metadata.xml
index b229aec85b8f..d369d068ffb8 100644
--- a/sci-libs/gaul-devel/metadata.xml
+++ b/sci-libs/gaul-devel/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>