sci-physics/atompaw: Add missing eutils.eclass, bump to EAPI=4, remove unnecessary bits

(Portage version: 2.2.0_alpha107/git/Linux x86_64, unsigned Manifest commit)

5 files changed, 22 insertions, 86 deletions

diff --git a/sci-physics/atompaw/ChangeLog b/sci-physics/atompaw/ChangeLog
index 4b4190ad1..91aeda882 100644
--- a/sci-physics/atompaw/ChangeLog
+++ b/sci-physics/atompaw/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 May 2012; Justin Lecher <jlec@gentoo.org> -atompaw-3.0.1.3.ebuild,
+  atompaw-3.0.1.4.ebuild, metadata.xml:
+  Add missing eutils.eclass, bump to EAPI=4, remove unnecessary bits
+
 *atompaw-3.0.1.4 (18 Apr 2012)
 
   18 Apr 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
diff --git a/sci-physics/atompaw/Manifest b/sci-physics/atompaw/Manifest
index 248f57934..5c355704b 100644
--- a/sci-physics/atompaw/Manifest
+++ b/sci-physics/atompaw/Manifest
@@ -1,5 +1,3 @@
-DIST atompaw-3.0.1.3.tar.gz 3786758 SHA256 1b5bcdf2c3927c93f518ef23b448c04513c74a71f32454c3f381e0fc2b7163b8 SHA512 1a5b6d8bbbbdb4987a7a5b2c2f04abed30e9e287f0dc57b3134a23ab7f4ceac2326df6c157c086f0a6f5414a66477e7bf2d9bf4f96f258dd8bec4feeeb929722 WHIRLPOOL 95b4c9468fa39ddaa0c0f6db1349796204fa34a81f6441b20df367d69da7653d2ec7eace0b1a538384b7cba4f6909bad8df30eef7137942b416119116b5959ae
 DIST atompaw-3.0.1.4.tar.gz 3785477 SHA256 69c303d28c3698e3ec640b8405b3bfe78a61c2e5a1f5abef92be652040b634db SHA512 adb4fb99647214cae48e81102ca46dfd8500adb5c6a97a62feb0ce2fe48a7fb699f3c873a6b8cef6cd4f856095ab6bbd85f2a941ebcd43ef3d212de22352ed17 WHIRLPOOL 9bfcc48f6d917b33360938186fc55f9982aa25df874380706c17cfe0d6a784379504de737ec2a0eb281e3866011130bf63a92958ff8d6b0308306e4ff1198052
-DIST atompaw-usersguide.pdf 164944 SHA256 f58a989a865e0acb7c58de49ae949446df12660bb93a12f0f59cee2f92ab4afa SHA512 8403647887e0330e75010e989a43bd4b2aa49f0351d7338086715fa05a47580eaa4f733df4211d39d19d742bba3663854c1375c19b374dc29692a9cbe2a83095 WHIRLPOOL 42e379fc40f8d03cdc9022b91dfba34209e320026abdd49d0367626442091a0b8fcd73d3628d2fd9949e654d95dd29ec29183b1a307157769837fc1e54390373
 DIST atompaw.pdf 334715 SHA256 10a70f0c31e4a0a06e31b2b922b938742daf8635c87b95f5a48609555d9397ed SHA512 287f521a10b144bf8c6f59f21a025a8b1e0f6a23d576abe347be8fd41f8577dec0febd289618384d6e7796f0f68bfb41672c9d6d7bf1658f245cff20463ffff7 WHIRLPOOL ae9280374777fd61751d60b4944f3d21aceb86d3b6f4879ced1c26200e33d8ebb08b99e81cffd562e43643274f83bd6d4263360d399acee7eefad3f36791606a
 DIST atompawEqns.pdf 198480 SHA256 181af33190b77b630c1fb94882d0cbc5f79281346f93c25ef4d645806f2c1dc6 SHA512 e0b7fcbce906ceda953e000378786d3b679b68a5dd3d1a53b8d41a61e80bfa5a83fa04a6b8945b274ffe351491bffe3bdd801937f1b838f90b21e462fb09b9e9 WHIRLPOOL 9ba9c90df0c368b935fce573a6be30c492819fda4245f10d217bff3576f82b21036aeee837c28e5b694220f2749a6cf7e26b797b2690624dbfbc3bb598cc2bdd
diff --git a/sci-physics/atompaw/atompaw-3.0.1.3.ebuild b/sci-physics/atompaw/atompaw-3.0.1.3.ebuild
deleted file mode 100644
index 1b26df15b..000000000
--- a/sci-physics/atompaw/atompaw-3.0.1.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit eutils fortran-2 multilib toolchain-funcs
-
-DESCRIPTION="PAW atomic data generator"
-HOMEPAGE="http://www.wfu.edu/~natalie/papers/pwpaw/man.html"
-SRC_URI="http://www.wfu.edu/~natalie/papers/pwpaw/${P}.tar.gz
-	doc? ( http://www.wfu.edu/~natalie/papers/pwpaw/atompaw.pdf
-		http://www.wfu.edu/~natalie/papers/pwpaw/atompaw-usersguide.pdf
-		http://www.wfu.edu/~natalie/papers/pwpaw/notes/atompaw/atompawEqns.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc libxc"
-
-RDEPEND="virtual/lapack
-	virtual/blas
-	libxc? ( sci-libs/libxc[fortran] )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if use doc; then
-		cp "${DISTDIR}"/atompaw.pdf "${S}"/
-		cp "${DISTDIR}"/atompaw-usersguide.pdf "${S}"/
-		cp "${DISTDIR}"/atompawEqns.pdf "${S}"/
-	fi
-}
-
-src_prepare() {
-	cd ${S}
-	epatch ${FILESDIR}/3.0.1-longplot.patch	      
-}
-
-src_configure() {
-	local modules="-I/usr/$(get_libdir)/finclude"
-	econf $(use_enable libxc) \
-	--with-linalg-flavor=atlas \
-	--with-linalg-libs="$(pkg-config --libs lapack)" \
-	--with-libxc-incs="${modules}" \
-	--with-libxc-libs="${libs} -lxc" \
-	FC="$(tc-getFC)" FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}}" \
-	CC="$(tc-getCC)" LDFLAGS="${LDFLAGS:- ${CFLAGS:- -O2}}"
-}
-
-src_compile() {
-	emake -j1 || die "Make failed"
-}
-
-src_test() {
-	emake check || die "Test failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc README || die "dodoc failed"
-
-	if use doc; then
-		dodoc atompaw.pdf atompaw-usersguide.pdf atompawEqns.pdf || die "PDF doc failed"
-	fi
-}
diff --git a/sci-physics/atompaw/atompaw-3.0.1.4.ebuild b/sci-physics/atompaw/atompaw-3.0.1.4.ebuild
index 3e7a2d945..c9e0cfcc3 100644
--- a/sci-physics/atompaw/atompaw-3.0.1.4.ebuild
+++ b/sci-physics/atompaw/atompaw-3.0.1.4.ebuild
@@ -4,12 +4,14 @@
 
 EAPI=4
 
-inherit autotools-utils fortran-2 multilib toolchain-funcs
+inherit autotools-utils eutils fortran-2 multilib toolchain-funcs
 
 DESCRIPTION="PAW atomic data generator"
 HOMEPAGE="http://www.wfu.edu/~natalie/papers/pwpaw/man.html"
-SRC_URI="http://www.wfu.edu/~natalie/papers/pwpaw/${P}.tar.gz
-	doc? ( http://www.wfu.edu/~natalie/papers/pwpaw/atompaw.pdf
+SRC_URI="
+	http://www.wfu.edu/~natalie/papers/pwpaw/${P}.tar.gz
+	doc? (
+		http://www.wfu.edu/~natalie/papers/pwpaw/atompaw.pdf
 		http://www.wfu.edu/~natalie/papers/pwpaw/notes/atompaw/atompawEqns.pdf )"
 
 LICENSE="GPL-2"
@@ -17,26 +19,26 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc libxc"
 
-RDEPEND="virtual/lapack
+RDEPEND="
 	virtual/blas
+	virtual/lapack
 	libxc? ( sci-libs/libxc[fortran] )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-DOCS=( README  )
+DOCS=( README )
 
 FORTRAN_STANDARD=90
 
 src_unpack() {
 	unpack ${P}.tar.gz
 	if use doc; then
-		cp "${DISTDIR}"/atompaw.pdf "${S}"/doc/
-		cp "${DISTDIR}"/atompawEqns.pdf "${S}"/doc/
+		cp "${DISTDIR}"/atompaw.pdf "${DISTDIR}"/atompawEqns.pdf "${S}"/doc/ || die
 	fi
 }
 
 src_prepare() {
-	epatch ${FILESDIR}/3.0.1-longplot.patch
+	epatch "${FILESDIR}"/3.0.1-longplot.patch
 }
 
 src_configure() {
@@ -64,7 +66,5 @@ src_test() {
 src_install() {
 	autotools-utils_src_install
 
-	if use doc; then
-		dodoc doc/atompaw.pdf doc/atompawEqns.pdf || die "PDF doc failed"
-	fi
+	use doc && dodoc doc/atompaw.pdf doc/atompawEqns.pdf
 }
diff --git a/sci-physics/atompaw/metadata.xml b/sci-physics/atompaw/metadata.xml
index a38eb47fa..6969910d3 100644
--- a/sci-physics/atompaw/metadata.xml
+++ b/sci-physics/atompaw/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
-<maintainer>
-  <email>sci@gentoo.org</email>
-</maintainer>
-<use><flag name='libxc'>Use libxc for something</flag></use>
+	<herd>sci-physics</herd>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="libxc">Use libxc for something</flag>
+	</use>
 </pkgmetadata>