Defined RDEPEND, bumped EAPI

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

4 files changed, 28 insertions, 17 deletions

diff --git a/sci-libs/camd/ChangeLog b/sci-libs/camd/ChangeLog
index afe2d7c39dbc..d1323e79130f 100644
--- a/sci-libs/camd/ChangeLog
+++ b/sci-libs/camd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/camd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/camd/ChangeLog,v 1.18 2011/02/23 19:47:09 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/camd/ChangeLog,v 1.19 2011/06/26 11:08:45 jlec Exp $
+
+  26 Jun 2011; Justin Lecher <jlec@gentoo.org> camd-2.2.0.ebuild,
+  camd-2.2.2.ebuild, metadata.xml:
+  Defined RDEPEND, bumped EAPI
 
   23 Feb 2011; Sébastien Fabbro <bicatali@gentoo.org> +camd-2.2.2.ebuild:
   Bump
diff --git a/sci-libs/camd/camd-2.2.0.ebuild b/sci-libs/camd/camd-2.2.0.ebuild
index 6c72049c4ef0..6d3c05c66934 100644
--- a/sci-libs/camd/camd-2.2.0.ebuild
+++ b/sci-libs/camd/camd-2.2.0.ebuild
@@ -1,19 +1,22 @@
-# 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/camd/camd-2.2.0.ebuild,v 1.14 2010/07/09 10:05:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/camd/camd-2.2.0.ebuild,v 1.15 2011/06/26 11:08:45 jlec Exp $
 
 inherit autotools eutils
 
 MY_PN=CAMD
+
 DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/camd"
+HOMEPAGE="http://www.cise.ufl.edu/research/sparse/camd/"
 SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc"
+
 DEPEND="sci-libs/ufconfig"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_PN}"
 
diff --git a/sci-libs/camd/camd-2.2.2.ebuild b/sci-libs/camd/camd-2.2.2.ebuild
index c2a1606c826c..cec903760ad2 100644
--- a/sci-libs/camd/camd-2.2.2.ebuild
+++ b/sci-libs/camd/camd-2.2.2.ebuild
@@ -1,34 +1,38 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/camd/camd-2.2.2.ebuild,v 1.1 2011/02/23 19:47:09 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/camd/camd-2.2.2.ebuild,v 1.2 2011/06/26 11:08:45 jlec Exp $
+
+EAPI=4
 
 inherit autotools eutils
 
 MY_PN=CAMD
+
 DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/camd"
+HOMEPAGE="http://www.cise.ufl.edu/research/sparse/camd/"
 SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc"
+
 DEPEND="sci-libs/ufconfig"
+RDEPEND="${DEPEND}"
+
+DOCS="dodoc README.txt Doc/ChangeLog"
 
 S="${WORKDIR}/${MY_PN}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.2.0-autotools.patch
 	eautoreconf
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README.txt Doc/ChangeLog || die "dodoc failed"
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins Doc/CAMD_UserGuide.pdf || die "pdf install failed"
-	fi
+	default
+
+	use doc && \
+		insinto /usr/share/doc/${PF} && \
+		doins Doc/CAMD_UserGuide.pdf
 }
diff --git a/sci-libs/camd/metadata.xml b/sci-libs/camd/metadata.xml
index 29134883ffec..6bba916b6b86 100644
--- a/sci-libs/camd/metadata.xml
+++ b/sci-libs/camd/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</herd>
-<longdescription lang="en">
+	<herd>sci</herd>
+	<longdescription lang="en">
   CAMD is a set of routines for ordering a sparse matrix prior to
   Cholesky factorization (or for LU factorization with diagonal
   pivoting). There are versions in both C and Fortran.