sci-chemistry/smmp: Bump to EAPI=5 and python-r1.eclass

Package-Manager: portage-2.2.0_alpha180

4 files changed, 23 insertions, 33 deletions

diff --git a/sci-chemistry/smmp/ChangeLog b/sci-chemistry/smmp/ChangeLog
index cddd7bfbb..375ec723b 100644
--- a/sci-chemistry/smmp/ChangeLog
+++ b/sci-chemistry/smmp/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-chemistry/smmp
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Jun 2013; Justin Lecher <jlec@gentoo.org> smmp-3.0.5.ebuild, metadata.xml:
+  Bump to EAPI=5 and python-r1.eclass
+
   24 Jun 2011; Justin Lecher <jlec@gentoo.org> smmp-3.0.5.ebuild:
   Streamlined fortran-2 eclass usage
 
diff --git a/sci-chemistry/smmp/Manifest b/sci-chemistry/smmp/Manifest
index 879b9f85b..1b54b5bcf 100644
--- a/sci-chemistry/smmp/Manifest
+++ b/sci-chemistry/smmp/Manifest
@@ -1 +1 @@
-DIST SMMP-3.0.5.tar.bz2 233378 SHA256 70d6b719d2c2ef1d34fd9897ad1c89a37c4d7531d80c904eee39dc8855aca31c
+DIST SMMP-3.0.5.tar.bz2 233378 SHA256 70d6b719d2c2ef1d34fd9897ad1c89a37c4d7531d80c904eee39dc8855aca31c SHA512 7a6701f267fc09ee966ec34854ca12443725dc01e3bdf6283eaac7fc82764030abbc10bd0c6eefef2652bb64a70d5a09dc338448ce9d0c31021219358d40920d WHIRLPOOL 1c2b390b85ad5a9cc4f00df6838f92b8dd29403648ca1a07bf8d71b409cc396fb3671201f271a65f4fecc70a99d25ed0be95c9f26ab15d6ce431c220c9e1d991
diff --git a/sci-chemistry/smmp/metadata.xml b/sci-chemistry/smmp/metadata.xml
index 0fbe927f0..d410f1573 100644
--- a/sci-chemistry/smmp/metadata.xml
+++ b/sci-chemistry/smmp/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-chemistry</herd>
-<maintainer>
-  <email>sci@gentoo.org</email>
-</maintainer>
+  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/smmp/smmp-3.0.5.ebuild b/sci-chemistry/smmp/smmp-3.0.5.ebuild
index 8f49f3d29..95dda9950 100644
--- a/sci-chemistry/smmp/smmp-3.0.5.ebuild
+++ b/sci-chemistry/smmp/smmp-3.0.5.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=5
 
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit eutils fortran-2 python toolchain-funcs
+inherit eutils fortran-2 python-r1 toolchain-funcs
 
 MY_PN="SMMP"
 MY_P="${MY_PN}-${PV}"
@@ -18,13 +16,11 @@ HOMEPAGE="http://smmp.berlios.de/"
 SRC_URI="mirror://berlios/${PN}/${MY_P}.tar.bz2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc mpi test"
 
-RDEPEND="
-	virtual/fortran
-	mpi? ( virtual/mpi )"
+RDEPEND="mpi? ( virtual/mpi )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
@@ -42,31 +38,22 @@ src_compile() {
 		target="${PN}"
 	fi
 
-	tc-export FC
-
-	emake ${target} || die
+	emake ${target}
 }
 
 src_test() {
-	emake examples || die
+	emake examples
 	cd EXAMPLES
 	bash smmp.cmd || die
 }
 
 src_install() {
-	dobin ${PN} || die
+	dobin ${PN}
 	installation() {
-		insinto $(python_get_sitedir)/${PN}
-		doins *.py || die
+		python_moduleinto ${PN}
+		python_domodule *.py
+		python_optimize
 	}
-	python_execute_function installation
-	dodoc README || die
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
+	python_foreach_impl installation
+	dodoc README
 }