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

Package-Manager: portage-2.2.0_alpha138/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

4 files changed, 20 insertions, 22 deletions

diff --git a/sci-libs/pgplot/ChangeLog b/sci-libs/pgplot/ChangeLog
index a384ab60d67b..a33d539a70bf 100644
--- a/sci-libs/pgplot/ChangeLog
+++ b/sci-libs/pgplot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/pgplot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.25 2012/08/17 20:59:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.26 2012/10/16 20:26:04 jlec Exp $
+
+  16 Oct 2012; Justin Lecher <jlec@gentoo.org> pgplot-5.2.2-r5.ebuild,
+  metadata.xml:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
   17 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org>
   files/pgplot-makemake.patch:
diff --git a/sci-libs/pgplot/Manifest b/sci-libs/pgplot/Manifest
index 5b2bc1221d7b..772fed42fbb6 100644
--- a/sci-libs/pgplot/Manifest
+++ b/sci-libs/pgplot/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX pgplot-compile-setup.patch 3034 SHA256 d42ec9479298e8a4a2acb0165d457422fa484a700ac05e53b90dde786c1a044f SHA512 9ee9b1166193e3eea5568693365574bf1ba427d232fd4c09fb728e16df5675e127590dba89c1c78518c6edab791828075f7c7e904c1a3a8f6f3bf48e958ddf97 WHIRLPOOL fc20795f71a4f88a2c16a33738d4b78f2dcdbed66577dda4f7b1abb94012059d78c1b26353e6a71dc2191dc97af7a8f9c8febe2a2faf5ac6449b36394601a153
 AUX pgplot-drivers.patch 7431 SHA256 19cabb29fd05c2c44cbb0492167ee3e45ab8890390b1e98de672f2ca2588baed SHA512 a730c2cb9e555b92912a9603bb58267f2feb683f5e7313736ab85c1c8595258779125a957cec20634bfe96390770d5f8e0edabe9c0fa16eef7ced2e37b0e1e07 WHIRLPOOL 652b29fe5b0eb54cbc9d8c9b123b95a8a66486400d8a1eeb52a39d9b5ad76abbc5b052a9df69b1abcfbb54ce7141ad05a1352766f43d53a34b79ff7ef929ea45
 AUX pgplot-headers.patch 2716 SHA256 e92a07e38fff278218c09b84453d5c75be663576bdbe19ed9259615bd7a0be7c SHA512 7601d1c2362bc805f04e3977d08bfd1411c9d2a2733d21c853efe8a25b8c86e303f953a088429c9214390814b2281f2937179f3bb9cb92ca749f51640bd1a3b8 WHIRLPOOL eab406164a252ff0b5eb988d2d80df3ec48f28fb09399d58a8448768b80f57c676fb9f42933abb9eb5ee6d4438ee8d52505e05a43fdeea655d357c17d790524a
@@ -8,13 +5,6 @@ AUX pgplot-libpng15.patch 370 SHA256 6cc1734ed629c0d93f25509be87ed1285fd8f49e8c5
 AUX pgplot-makemake.patch 7903 SHA256 7431b0820f3e784a56b6b7276af2b0ace7dbdcbc43a9432ddef3c6f6fc9601fc SHA512 c6f775003a89580ac85a10f39e695295d5ca2a68d0a0875cd680fbeafb9e8deb4e9e304cfd10490954f7aa276b8b0e60e8fdd531b5c0e72bfdffd3c461840de1 WHIRLPOOL db094a7787510991041d4c3a9788cbebc677ba195b94abd7040e4528c053044644cae72c01ec86d7249127f3bb44ae2ab51ac35e6770511509e0c43856aa29f3
 AUX pgplot-pgdisp.patch 332 SHA256 3aac6127d35f4039023a13182553b24e1902d6e1b46530fbd68e034357d0b078 SHA512 e8735c108366002da67e45a0d931c6e0dfd14ec3a6b16c6c242e041b4641acdcc257ddd0637a6ef71febf4445319cff0ac5a09acb4a96ee996d7906a27ac75ee WHIRLPOOL 51e4420194bd584897c849fb45c187797b44fdf05fed63c2e1fde8482fc6897a7982e8ee1c01b7a8e3fd9bf677abfeaa81ff6fc528f81ad1b3764e0bcc92bc66
 DIST pgplot522.tar.gz 1197397 SHA256 a5799ff719a510d84d26df4ae7409ae61fe66477e3f1e8820422a9a4727a5be4 SHA512 03a075c84506ead1d665a7105cd41c7cfbe19d12094cb36fb7459a0f6ee0df0638543b7eca92aaf80677984cc47a07b968f854db8eaa90ec605f78d89c615d1f WHIRLPOOL ced06d5fc275530fae0ed839aaaa360a1c560a102126c8cad6936c1d6494403c97489e6f248e28e64ca5cc2950677e5b336861876cc554965bb9c05b1bf0fba9
-EBUILD pgplot-5.2.2-r5.ebuild 4413 SHA256 5dafd06e2dbe08fd3d6db039c7ce6fc257db28e5f2101b61e1131ffe916ecbc4 SHA512 3450a60b653f2b96cd47df430c070302747bb290d8633b527065fd6b88897065855c591df3daebf2bac02ba822c24a1508186f499c976006d39e3475292beb88 WHIRLPOOL a7ff214efde055e0b6d38991523e78ec15d4970dd548d347b103901972b676fadf2cb52949919b2c268db16c34fa5711f47927ae3890c7f4837006ea7d68eb7d
-MISC ChangeLog 4729 SHA256 e27c850b0cd2d820e75bf52dbea9920a8a456f60f91ad7273e552cb5987ae70d SHA512 6b0b5085c7e6bed7aa7420a94066abea9f77d409fe6d303d143b582b55f00793653446f637367f4b3d6aa8c0acc7a571b2e7316f3efefb2d5ae5522740da40e5 WHIRLPOOL 3373fc5620f12064fc2153442897592eb451f1a95aaa25ab432acbb2623860f98568f3945cd0c6258914d0817f8dc33f7fe9482a3d02f0978d9546ce6d263ac3
-MISC metadata.xml 517 SHA256 c0a4ba04ced31cde679aa0a17c19d313bbe9a5d4cd0771ba9b4af968c92c79f1 SHA512 fc14b4107d828230c72caee18a1e22c5b3a79626e5bc25c5304e435e9403a0d6f44f45082ffff74d5c4ee092108c32c6901099fc4ceb82697cb7b290c612ad84 WHIRLPOOL 0b9c070841255f909cde6cf7966c44c0609b8fbfb7e87a7b4f0636357212cb6f12bd48058c89a0de1e262a772828f9931fd326219e6380b52302a3e3e9c159bc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlAusKcACgkQ1ycZbhPLE2AS/ACdHqxGw5tfTlimRu7xuYGZfyDw
-rYcAn2GuBCnaFSE6zK9h2rfyDQTTZwV9
-=J9fz
------END PGP SIGNATURE-----
+EBUILD pgplot-5.2.2-r5.ebuild 4395 SHA256 d6abfeaff6b46eb3869a5b86185a1733a7af9fa0e63882fd1b427446ff4be70b SHA512 60f12fc8432b9db5c0d72030c09c6d93c733a11d63327241778c0479b90b5242a8429949f59963373d60cfff8b239996cecc697121bbd32c6e884bc1aec2758a WHIRLPOOL ca9ed813ffbe5559fa28e184ae56d78d904cf346aa09a0d8d23a1e05a2af6c6804ded933e9ed2047882a9fe8f3dc7afb2c1afb7fbaf15ee41306a379eb0cae44
+MISC ChangeLog 4918 SHA256 4115aebeec21c8134246458bef609f796e30faffaf515aa80c50c25e25d8f860 SHA512 61babd68fa15ab8f48de7c6199c6f2acbfdf58a8e9a48f1da124105d63a2f4f9ab10cb8447b1b0096f915aa6c972cdef27949f9dddcc8dd1163d51db254faa76 WHIRLPOOL 0ab33d64d644b6ebd84ceae6e5d05d02f7d9f0de8822f4fb0403c12aa67377be22f66f767d6e1939db93f8fc8d0b103eb885ba4a2895835f0a2a0a51346b2028
+MISC metadata.xml 519 SHA256 041708fb011c37c9fe581d8c34bab321b432a18fc68c98eb92d69f0231975abd SHA512 d861526195f93bfdaa991aff6ed56951bfaaa04ef11d6cc6478f81b4c53c37b4e4fa9eb5e5ea4adad5e735f57e80d80479c8e9f69df168c203161cf32242ca4b WHIRLPOOL 5ae5bec5ae8be8e766ec585624e1118ddf8be45d20f542d5aeb98774da90805fe8c2f7709f2c55e3cd820aff4e6701eeb15832137bea87a096871e634c8c48d7
diff --git a/sci-libs/pgplot/metadata.xml b/sci-libs/pgplot/metadata.xml
index 87378f8463a9..05a8a5d33331 100644
--- a/sci-libs/pgplot/metadata.xml
+++ b/sci-libs/pgplot/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</herd>
-<longdescription lang="en">
+	<herd>sci</herd>
+	<longdescription lang="en">
   PGPLOT is a Fortran subroutine package for drawing graphs on a variety
   of display devices. The CPGPLOT library adds an intermediate level of
   wrapper functions between C programs and the PGPLOT library. These
diff --git a/sci-libs/pgplot/pgplot-5.2.2-r5.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r5.ebuild
index ec76d44aa6e9..2147ffbca9c7 100644
--- a/sci-libs/pgplot/pgplot-5.2.2-r5.ebuild
+++ b/sci-libs/pgplot/pgplot-5.2.2-r5.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r5.ebuild,v 1.1 2012/07/05 22:00:11 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r5.ebuild,v 1.2 2012/10/16 20:26:04 jlec Exp $
 
 EAPI=4
+
 inherit eutils fortran-2 toolchain-funcs multilib
 
 MY_P="${PN}${PV//.}"
@@ -10,12 +11,14 @@ MY_P="${PN}${PV//.}"
 DESCRIPTION="FORTRAN/C device-independent scientific graphic library"
 HOMEPAGE="http://www.astro.caltech.edu/~tjp/pgplot/"
 SRC_URI="ftp://ftp.astro.caltech.edu/pub/pgplot/${MY_P}.tar.gz"
-LICENSE="free-noncomm"
+
 SLOT="0"
+LICENSE="free-noncomm"
 KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc motif static-libs tk"
-RDEPEND="media-libs/libpng
-	virtual/fortran
+
+RDEPEND="
+	media-libs/libpng
 	x11-libs/libX11
 	x11-libs/libXt
 	motif? ( >=x11-libs/openmotif-2.3:0 )
@@ -36,12 +39,12 @@ src_prepare() {
 	# gfortran < 4.3 does not compile gif, pp and wd drivers
 	if [[ $(tc-getFC) == *gfortran* ]] &&
 		[[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]] ; then
-		ewarn
+		echo
 		ewarn "Warning!"
 		ewarn "gfortran < 4.3 selected: does not compile all drivers"
 		ewarn "disabling gif, wd, and ppd drivers"
 		ewarn "if you want more drivers, use gfortran >= 4.3"
-		ewarn
+		echo
 		sed -i \
 			-e 's/GIDRIV/! GIDRIV/g' \
 			-e 's/PPDRIV/! GIDRIV/g' \