media-radio/wspr: Removed almost deprecated fortran.eclass

svn path=/sunrise/; revision=11813

diff --git a/media-radio/wspr/ChangeLog b/media-radio/wspr/ChangeLog
index c247a6d6c957daed2883f39f747749a6bbbc551d..861087a4258c0d81ba3da91dc2d4936e14dcd54b 100644 (file)
--- a/media-radio/wspr/ChangeLog
+++ b/media-radio/wspr/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for media-radio/wspr
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Mar 2011; Justin Lecher <jlec@gentoo.org> wspr-2.00.ebuild:
+  Removed almost deprecated fortran.eclass
+
   01 Apr 2010; Thomas Beierlein (TomJBE) <tb@forth-ev.de> wspr-2.00.ebuild:
   fix for changes in python.eclass
 

diff --git a/media-radio/wspr/Manifest b/media-radio/wspr/Manifest
index 64bfa052033d3b807aa1a31371391f75d5ab913f..93b8d679c2f4af98247f2b010aabe22c4df782f3 100644 (file)
--- a/media-radio/wspr/Manifest
+++ b/media-radio/wspr/Manifest
@@ -1,4 +1,4 @@
 DIST wspr-2.00.r1714.tgz 2096056 RMD160 71bc7ca20157a09cd3b837c822e18b3474685007 SHA1 d5f70e6118d8550c02d695adc76bbeed4c8c1a0e SHA256 6a0e13f354d4e228337ee550851f36027281e268385961505a6757fda1ffc423
-EBUILD wspr-2.00.ebuild 1595 RMD160 df62ebc2f39f57f45634bdfdc90caea00c49f618 SHA1 ae52b1b482f262d6b64843fafdcb76b4d89eee40 SHA256 d4ee94630c6291913880baa6792da6bd9d8ff5e1ba8759c4f2666c4db4028eb8
-MISC ChangeLog 1242 RMD160 613a10c7e981b4ce6e466d56486ccb4e1914dad7 SHA1 c2b0e527cc7c198ebdb4e45a99d249453b8e4299 SHA256 cab234aff11233ea2dd7de88a30a3887c41d803f1a62e77ddb7874cdb6133a18
+EBUILD wspr-2.00.ebuild 1756 RMD160 512c117862958c01596b21d7420c41bd71863bd9 SHA1 eb40810e8381e9232b8ebb732fb23ccacb4f315f SHA256 e95089d93f8f724091762485a80ec3a0869db68ff5fd7b589a88168025490471
+MISC ChangeLog 1351 RMD160 842d6a9b98f43ad26ff1fe4f1e12b45904a8f570 SHA1 d3acd97a14c0ebd614f9881283d96ad0bfc73c1d SHA256 0b85b94b435b1cadc176959b2cdd2e2e6cfdd90880882387f96fa5326577d475
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f

diff --git a/media-radio/wspr/wspr-2.00.ebuild b/media-radio/wspr/wspr-2.00.ebuild
index b679fa370a8110c3ad7e73a20509cc73f8852913..50e95c422255d5a4c5daead078490d80ec539a94 100644 (file)
--- a/media-radio/wspr/wspr-2.00.ebuild
+++ b/media-radio/wspr/wspr-2.00.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="2"
 
 PYTHON_DEPEND="2"
-inherit autotools distutils flag-o-matic multilib python fortran
+inherit autotools distutils flag-o-matic multilib python toolchain-funcs
 
 MY_P=${P}.r1714
 
@@ -30,7 +30,19 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+get_fcomp() {
+       case $(tc-getFC) in
+       *gfortran* )
+       FCOMP="gfortran" ;;
+       * )
+       FCOMP=$(tc-getFC) ;;
+       esac
+}
+
 src_prepare() {
+       tc-export FC
+       get_fcomp
+       export FC="${FCOMP}"
        # upstream confused LIBDIRS with LDFLAGS in Makefile. f2py wants only
        # LIBDIRS as parameter and takes LDFLAGS only from environment.
        sed -i \