sci-astronomy/wcslib: Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the updated fortran-2.eclass

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

4 files changed, 16 insertions, 19 deletions

diff --git a/sci-astronomy/wcslib/ChangeLog b/sci-astronomy/wcslib/ChangeLog
index adeefe65c086..3529a8fb223f 100644
--- a/sci-astronomy/wcslib/ChangeLog
+++ b/sci-astronomy/wcslib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-astronomy/wcslib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.32 2012/10/17 06:25:43 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.33 2012/10/19 10:45:53 jlec Exp $
+
+  19 Oct 2012; Justin Lecher <jlec@gentoo.org> wcslib-4.14.ebuild,
+  wcslib-4.15.ebuild, metadata.xml:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
 *wcslib-4.15 (17 Oct 2012)
 
diff --git a/sci-astronomy/wcslib/metadata.xml b/sci-astronomy/wcslib/metadata.xml
index 312ebd3932ba..771ec2d60887 100644
--- a/sci-astronomy/wcslib/metadata.xml
+++ b/sci-astronomy/wcslib/metadata.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
-<longdescription lang="en">
+	<herd>sci-astronomy</herd>
+	<longdescription lang="en">
   WCSLIB is a C library, supplied with a full set of Fortran wrappers,
   that implements the "World Coordinate System" (WCS) convention in FITS
   (Flexible Image Transport System).  It also includes a PGPLOT-based routine,
   PGSBOX, for drawing general curvilinear coordinate graticules and a number of
   utility programs.
 </longdescription>
-<use>
-  <flag name='fits'>
+	<use>
+		<flag name="fits">
     Enable support for the FITS format through <pkg>sci-libs/cfitsio</pkg>
   </flag>
-  <flag name='pgplot'>
+		<flag name="pgplot">
     Builds routines for the  <pkg>sci-libs/pgplot</pkg> library
   </flag>
-</use>
+	</use>
 </pkgmetadata>
diff --git a/sci-astronomy/wcslib/wcslib-4.14.ebuild b/sci-astronomy/wcslib/wcslib-4.14.ebuild
index 8e3d1909bd8b..722f896de9ee 100644
--- a/sci-astronomy/wcslib/wcslib-4.14.ebuild
+++ b/sci-astronomy/wcslib/wcslib-4.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.14.ebuild,v 1.3 2012/10/14 18:56:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.14.ebuild,v 1.4 2012/10/19 10:45:53 jlec Exp $
 
 EAPI=4
 
@@ -17,16 +17,12 @@ LICENSE="LGPL-3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc fortran fits pgplot static-libs"
 
-RDEPEND="fortran? ( virtual/fortran )
+RDEPEND="
 	fits? ( sci-libs/cfitsio )
 	pgplot? ( sci-libs/pgplot )"
 DEPEND="${RDEPEND}
 	sys-devel/flex"
 
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
 src_prepare() {
 	sed -i -e 's/COPYING\*//' GNUmakefile || die
 }
diff --git a/sci-astronomy/wcslib/wcslib-4.15.ebuild b/sci-astronomy/wcslib/wcslib-4.15.ebuild
index 1ff038239d59..eca864f26c31 100644
--- a/sci-astronomy/wcslib/wcslib-4.15.ebuild
+++ b/sci-astronomy/wcslib/wcslib-4.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.15.ebuild,v 1.1 2012/10/17 06:25:43 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.15.ebuild,v 1.2 2012/10/19 10:45:53 jlec Exp $
 
 EAPI=4
 
@@ -17,16 +17,12 @@ LICENSE="LGPL-3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc fortran fits pgplot static-libs"
 
-RDEPEND="fortran? ( virtual/fortran )
+RDEPEND="
 	fits? ( sci-libs/cfitsio )
 	pgplot? ( sci-libs/pgplot )"
 DEPEND="${RDEPEND}
 	sys-devel/flex"
 
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
 src_prepare() {
 	sed -i -e 's/COPYING\*//' GNUmakefile || die
 }