Remove fortran.eclass

(Portage version: 2.2.0_alpha27/git/Linux x86_64, signed Manifest commit with key 70EB7916)

5 files changed, 47 insertions, 21 deletions

diff --git a/sci-libs/libxc/ChangeLog b/sci-libs/libxc/ChangeLog
index 09d066bed..21317e989 100644
--- a/sci-libs/libxc/ChangeLog
+++ b/sci-libs/libxc/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Mar 2011; Justin Lecher <jlec@gentoo.org> libxc-1.0.ebuild,
+  libxc-9999.ebuild, +metadata.xml:
+  Remove fortran.eclass
+
+  14 Mar 2011; Justin Lecher <jlec@gentoo.org> libxc-1.0.ebuild,
+  libxc-9999.ebuild:
+  Remove fortran.eclass
+
 *libxc-9999 (17 Jan 2011)
 *libxc-1.0 (17 Jan 2011)
 
diff --git a/sci-libs/libxc/Manifest b/sci-libs/libxc/Manifest
index 60176742a..4e2aa670a 100644
--- a/sci-libs/libxc/Manifest
+++ b/sci-libs/libxc/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST libxc-1.0.tar.gz 502757 RMD160 0e48a6ab484d1c9f6e305dfc9c860e46c01aa330 SHA1 48a54c718bfb8784bf5e6aadf82d62ffb70bc5a2 SHA256 890544853fc8ff81d895fc973b5f1ed293f957b035301aad2d6caea1ce1efdaa
-EBUILD libxc-1.0.ebuild 1255 RMD160 b5c3b28845f9b518c1eea6f1995984f66801e4f1 SHA1 e39d5334025af49c20e3d522db4e1742adb1d988 SHA256 ee96bb47b1655837202f5a856f3fad99c1141a8025c0a810a5f1b22aa57e8528
-EBUILD libxc-9999.ebuild 991 RMD160 e901d55d4b2c31d4ad8ece88aea75e97f684e966 SHA1 f83a7c5f5932873ba1a4674f8cb96f6258b52254 SHA256 f39d9b3e7eca682b9f648f5a55725e0fa08cf8d28ff5e80620c6dbeaecfcd43d
-MISC ChangeLog 307 RMD160 a331fd2e22a7440110c3043157221616815e7d8f SHA1 e8dcf7e64956a3133de72bbbcf9d97123ecd7a86 SHA256 d7d8494a901e301039eed38ee601808a6750860bcb9af5c94ac9f40c16123888
+EBUILD libxc-1.0.ebuild 1197 RMD160 c9475ecce56d079b99f6eb504ed158c4d36a2d3c SHA1 9bf197c2a41eee5cf3e17745af5551ef7717963a SHA256 c17722014c7f8141752eeb6e1eaf204f611e4abc9968c90c30dc4ab331ba0d34
+EBUILD libxc-9999.ebuild 930 RMD160 3a3ffdbe40a82fb65c6a98e24bb7f49e2a89547d SHA1 569715d7f66e01c7532ce54979988858f59dac88 SHA256 83a9389d6479efbb1f6dff421bebacab5537243537cd08d9d7f6556c6e0f24ab
+MISC ChangeLog 544 RMD160 60919b013c5dd49e84b8bb60787648d088c491e4 SHA1 0a47dc1d503a03dde49ef89b1b7ab084c18b4d84 SHA256 1537205a815bf42ac7e846c8349656f56ae244040ecc9477de24798b76d9f721
+MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1/PewACgkQgAnW8HDreRZUwwCgkpZC6ZrxJMz0qUYZcvE59DrD
+eoIAn0pNMWL+mxR9E4Tr6I8N0Q2jTc/x
+=Yy8x
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/libxc/libxc-1.0.ebuild b/sci-libs/libxc/libxc-1.0.ebuild
index 6a3f194cb..2cbf8ff1f 100644
--- a/sci-libs/libxc/libxc-1.0.ebuild
+++ b/sci-libs/libxc/libxc-1.0.ebuild
@@ -3,41 +3,42 @@
 
 EAPI="2"
 
-inherit fortran multilib
+inherit multilib toolchain-funcs
 
 MY_P=${P//_/-}
 
 DESCRIPTION="A library of exchange-correlation functionals for use in DFT"
 HOMEPAGE="http://www.tddft.org/programs/octopus/wiki/index.php/Libxc"
-SRC_URI="http://www.tddft.org/programs/octopus/down.php?file=${PN}/${MY_P}.tar.gz"
+SRC_URI="http://www.tddft.org/programs/octopus/download/${PN}/${P}.tar.gz"
+
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="fortran"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-MAKEOPTS="-j1"
 
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
 	if use fortran ; then
-		FORTRAN="gfortran ifc g77 pgf77 pgf90"
-		fortran_pkg_setup
+		tc-export FC
 	fi
 }
 
 src_configure() {
 	econf \
-		"$(use_enable fortran)" \
+		$(use_enable fortran) \
 		FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}}"
 }
 
-## Upstream recommends not running the test suite because it requires 
-## human expert interpretation to determine whether output is an error or 
+## Upstream recommends not running the test suite because it requires
+## human expert interpretation to determine whether output is an error or
 ## expected under certain circumstances.
 # src_test() { :; }
 
+src_compile() {
+	emake -j1 || die
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
 
diff --git a/sci-libs/libxc/libxc-9999.ebuild b/sci-libs/libxc/libxc-9999.ebuild
index ba15e67dd..0a7a5d149 100644
--- a/sci-libs/libxc/libxc-9999.ebuild
+++ b/sci-libs/libxc/libxc-9999.ebuild
@@ -3,30 +3,28 @@
 
 EAPI="2"
 
-inherit fortran eutils multilib toolchain-funcs flag-o-matic autotools subversion
+inherit eutils multilib toolchain-funcs flag-o-matic autotools subversion
 
 DESCRIPTION="The ETSF library of exchange-correlation functionals"
 HOMEPAGE="http://www.tddft.org/programs/octopus/wiki/index.php/Libxc"
 ESVN_REPO_URI="http://www.tddft.org/svn/octopus/trunk/${PN}/"
 ESVN_BOOTSTRAP="eautoreconf -i"
 
-LICENSE="LGPL"
+LICENSE="LGPL-3"
 SLOT="0"
 IUSE="fortran debug"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
 pkg_setup() {
 	if use fortran ; then
-		FORTRAN="gfortran ifc g77 pgf77 pgf90"
-		fortran_pkg_setup
+		tc-export FC
 	fi
 }
 
 src_configure() {
-	econf "$(use_enable fortran)" || die "econf failed"
+	econf \
+		$(use_enable fortran) \
+		FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}}"
 }
 
 src_compile() {
diff --git a/sci-libs/libxc/metadata.xml b/sci-libs/libxc/metadata.xml
new file mode 100644
index 000000000..efb490d78
--- /dev/null
+++ b/sci-libs/libxc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<maintainer>
+  <email>sci@gentoo.org</email>
+</maintainer>
+</pkgmetadata>