Removed ifc use flag (see bug #97929)

Package-Manager: portage-2.1.4.4

3 files changed, 31 insertions, 27 deletions

diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog
index 618b9882fe42..3ec1112aefbd 100644
--- a/sci-libs/plplot/ChangeLog
+++ b/sci-libs/plplot/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/plplot
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.12 2007/08/14 03:37:21 markusle Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.13 2008/04/05 19:56:56 bicatali Exp $
+
+  05 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org> plplot-5.5.2.ebuild:
+  Removed ifc use flag (see bug #97929)
 
   14 Aug 2007; Markus Dittrich <markusle@gentoo.org>
   +files/plplot-5.5.2-macro-fix.patch, plplot-5.5.2.ebuild:
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 901458cf9e9f..f7fe24068c92 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX plplot-5.5.1-gcc-3.4-fix.patch 1396 RMD160 8854c2f315a5443cc5c29082a949e2ee359e6746 SHA1 ee321d24c5534bb4a86f9dda17579ae21965ef43 SHA256 1142ad469f6cc6dbf6331de9ceac0967e0128bef26e1ece2bb6b4f200f7e638f
 AUX plplot-5.5.2-macro-fix.patch 534 RMD160 71ffcec74770cab421a4756355f22818032e6e5c SHA1 0c1be25c54c94667371bbe386278960ed6cb4bdb SHA256 4a0d75b9e6d7ffeddfb38dcd58d9e440cde02ec93ce5ee22e48a3379c236874b
 DIST plplot-5.5.2.tar.gz 5891255 RMD160 55ea8e7dde5c0542ce8f360228a676049ad7d701 SHA1 72e0830b12d7d50ff9ac5b54e49aa1813a580786 SHA256 267d9c4070b8b6de75590efc24388da670dd5d0039a5dc21ecb803366d14730c
-EBUILD plplot-5.5.2.ebuild 5538 RMD160 c9a268005b37f055e8d74b5cc9194d60847ddf06 SHA1 3149eca32b1b6e430241dc6966f0fb4391853f2f SHA256 ca19621359e0c8601182c0fd617c19d43f7a4a137e9523d9db2cd8c89e016ec8
-MISC ChangeLog 2246 RMD160 fc88dda80cafcad1717dfa223cc2893441736bbb SHA1 e6902992764798eec39375f1a947aae04e25c67c SHA256 37ebfc977361e373af6593a6a545125e0fe7eacc5dd75379b17a15ae5fd256f3
+EBUILD plplot-5.5.2.ebuild 5126 RMD160 80427b35bc118f2020947846817a80e83fc1de9c SHA1 3b9f2a59e580343d5287c4ca82d0b90f52701907 SHA256 661de1a5bc786480948afe6023c9bd33e61eeb3801064e6a5dfe0e40baecc6ab
+MISC ChangeLog 2363 RMD160 8f29b12d029b2321a420c34da76962aad94bbdd6 SHA1 2b39f2bd5435dcb1ddf6a2c448493a45c522a360 SHA256 97a27fe31e0c6efc9a23470dbc29115135c1bcf3bb557e39a7a6162663409d27
 MISC metadata.xml 1063 RMD160 3af3224cba8a6f6b4fda4a216a9343372ca6f962 SHA1 fe669fef8974ff0705f3fbebf387f3d0efd5fc97 SHA256 45416c40b8f8bbf8d850d976889600a8b90c87a4f43d098866d622acf7fdc381
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH99mR1ycZbhPLE2ARAqwbAJwOayxdwZ5ccnwDheCzydIp12kpHQCfYilZ
+yEX+cmmOLzKSzZKNudwITQk=
+=Wkur
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/plplot/plplot-5.5.2.ebuild b/sci-libs/plplot/plplot-5.5.2.ebuild
index 21b06e9e4e1c..0dbd11c8ad74 100644
--- a/sci-libs/plplot/plplot-5.5.2.ebuild
+++ b/sci-libs/plplot/plplot-5.5.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.5.2.ebuild,v 1.11 2007/08/14 21:44:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.5.2.ebuild,v 1.12 2008/04/05 19:56:56 bicatali Exp $
 
-inherit eutils
+inherit eutils fortran
 
 # Known problems with this ebuild:
 # - No support for libqhull.
@@ -15,17 +15,17 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE="X debug doc fortran ifc itcl java jpeg octave png python tk tetex truetype"
+IUSE="X debug doc fortran itcl java jpeg octave png python tk tetex truetype"
 
 RDEPEND="virtual/libc
 		 dev-lang/perl
-	  	 python? ( dev-python/numeric )
-	  	 java? ( virtual/jre )
-	  	 tetex? ( app-text/jadetex )
-	  	 octave? ( sci-mathematics/octave )
-	  	 jpeg? ( media-libs/gd )
-	  	 png? ( media-libs/gd )
-	  	 truetype? ( media-libs/freetype )
+		 python? ( dev-python/numeric )
+		 java? ( virtual/jre )
+		 tetex? ( app-text/jadetex )
+		 octave? ( sci-mathematics/octave )
+		 jpeg? ( media-libs/gd )
+		 png? ( media-libs/gd )
+		 truetype? ( media-libs/freetype )
 		 X? ( x11-libs/libX11
 				x11-libs/libXau
 				x11-libs/libXdmcp
@@ -36,7 +36,6 @@ RDEPEND="virtual/libc
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	ifc? ( dev-lang/ifc )
 	virtual/man
 	app-text/opensp
 	java? ( virtual/jdk )
@@ -46,14 +45,8 @@ DEPEND="${RDEPEND}
 	# qhull? ( media-libs/qhull )
 
 pkg_setup() {
-	# If the fortran interface is wanted, the gnu f77 compiler
-	# is needed unless ifc is used (which is taken care of in
-	# the dependencies).
-	use fortran && ! use ifc || if [[ -z $(type -P g77) ]]; then
-		eerror "GNU fortran 77 compiler not found on the system."
-		eerror "Please add fortran to your USE flags and reemerge gcc."
-		die
-	fi
+	FORTRAN="gfortran g77 ifc"
+	use fortran && fortran_pkg_setup
 }
 
 src_unpack() {
@@ -102,9 +95,7 @@ src_compile() {
 	EXTRA_CONF="${EXTRA_CONF} $(use_enable python)"
 	EXTRA_CONF="${EXTRA_CONF} $(use_enable java)"
 	EXTRA_CONF="${EXTRA_CONF} $(use_enable octave)"
-	if use ifc; then
-		EXTRA_CONF="${EXTRA_CONF} --enable-f77 F77=/opt/intel/compiler70/ia32/bin/ifc"
-	elif use fortran; then
+	if use fortran; then
 		EXTRA_CONF="${EXTRA_CONF} --enable-f77"
 	else
 		EXTRA_CONF="${EXTRA_CONF} --disable-f77"