Removed fortran eclass and switched to EAPI2

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sci-libs/pgplot/ChangeLog b/sci-libs/pgplot/ChangeLog
index 7a65a45707621a9df854f1b10e876bd598041631..5b20490231b0f797800e378aef3bac1dab9fe386 100644 (file)
--- a/sci-libs/pgplot/ChangeLog
+++ b/sci-libs/pgplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/pgplot
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.17 2009/02/23 17:30:38 bicatali Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.18 2010/03/15 05:45:42 bicatali Exp $
+
+  15 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  pgplot-5.2.2-r3.ebuild:
+  Removed fortran eclass and switched to EAPI2
 
   23 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
   pgplot-5.2.2-r3.ebuild:

diff --git a/sci-libs/pgplot/Manifest b/sci-libs/pgplot/Manifest
index 7ca8aafdf99a916e7b1232183909fb292fea40ae..7bdfa007f09d89be28f5fe666f4bf9793f8a0aa8 100644 (file)
--- a/sci-libs/pgplot/Manifest
+++ b/sci-libs/pgplot/Manifest
@@ -7,13 +7,13 @@ AUX pgplot-headers.patch 2716 RMD160 aaad73bfbea9b4f731346a02c390e0adc318f8d0 SH
 AUX pgplot-makemake.patch 4455 RMD160 5535ad4a42795d3395a79bbea5fd5dbe6357cd5f SHA1 e16937eebade8ae14d8242c9c37715f1dc260163 SHA256 c1a02f579910b793dcd6c9da606c0091ba6ff2f4f36a5a1661c9793371501bb4
 AUX pgplot-pgdisp.patch 332 RMD160 1bd3c2ed7770bb60be19c50c4610c35d67bf92e9 SHA1 891475823d011156aa919fc2b844d1786ae6d85f SHA256 3aac6127d35f4039023a13182553b24e1902d6e1b46530fbd68e034357d0b078
 DIST pgplot522.tar.gz 1197397 RMD160 4c21cad6613772f4104c65ac3d8d9a42e3c4afe1 SHA1 1f1c9aa17eeec9a2fb23fd15a0e4a91dcc49ddc1 SHA256 a5799ff719a510d84d26df4ae7409ae61fe66477e3f1e8820422a9a4727a5be4
-EBUILD pgplot-5.2.2-r3.ebuild 4627 RMD160 6d5cbf17459e80bbf381e14daab537ff3fb75ec2 SHA1 86b289e8050b10651f2d23e25989af8a92f4e1ac SHA256 e72eacdc34ab065b9e5fb8f6b291fce8628b340e1f766edb293642c82a59e1c6
-MISC ChangeLog 3367 RMD160 d4df7ce789961fa11f5f7928bce02d348f4c5c50 SHA1 19af82d8f8ae6d61f782a47aa87a44ee9e43c5c0 SHA256 a20511e71691aad51e48a0df9141807097b814a1e0b7246398e16b47a32bb4cf
+EBUILD pgplot-5.2.2-r3.ebuild 4574 RMD160 e350fbf5e854c5e44efda7a3a742c3f632ad9578 SHA1 1d304498856bc03a35ffe789f10f12ffb2edeb6d SHA256 4612507a3f907b19d6fd253844f97cdf50e161603004796ae984a60781e3afe8
+MISC ChangeLog 3496 RMD160 ece28ae3a0f505a87e5392376b0df4b638eb13cd SHA1 0f08270ddb1528b2a66b0780a6d8b046712e53f8 SHA256 98bd8df62a0e8325b74407565dd96ec8e2b982a7d013fe1aace012321503a1c0
 MISC metadata.xml 517 RMD160 27e91597c28b40b94a27548baeb7d1c6768eff77 SHA1 cabae2f60e330d39b41be431df8cf8b4ff84c642 SHA256 c0a4ba04ced31cde679aa0a17c19d313bbe9a5d4cd0771ba9b4af968c92c79f1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkth3ukACgkQ1ycZbhPLE2BR2QCgl2IfettO3Pxe9NMCWoebF3+w
-yZsAoK4Td758v4Mtce0N/2rEDrTIF93S
-=Egyn
+iEUEARECAAYFAkudyY8ACgkQ1ycZbhPLE2CjUQCYphtBrjtjlrhTh2xNmjetTSwG
+QgCglCAr7pAqcLNj/jUs8JhI7FkLcZI=
+=vb+j
 -----END PGP SIGNATURE-----

diff --git a/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild
index 7457250f81f5ce0e2a1c31a3adb498d97ead4b29..5a1fcd1b74a680bf28244a72238f4924902e6d03 100644 (file)
--- a/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild
+++ b/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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-r3.ebuild,v 1.4 2009/02/23 17:30:38 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r3.ebuild,v 1.5 2010/03/15 05:45:42 bicatali Exp $
 
-inherit eutils toolchain-funcs fortran
+EAPI=2
+inherit eutils toolchain-funcs
 
 MY_P="${PN}${PV//.}"
 DESCRIPTION="FORTRAN/C device-independent scientific graphic library"
@@ -22,19 +23,14 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${PN}"
 
-FORTRAN="g77 gfortran ifc"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
+src_prepare() {
        epatch "${FILESDIR}"/${PN}-drivers.patch
        epatch "${FILESDIR}"/${PN}-makemake.patch
        epatch "${FILESDIR}"/${PN}-compile-setup.patch
        epatch "${FILESDIR}"/${PN}-headers.patch
 
        # gfortran < 4.3 does not compile gif, pp and wd drivers
-       if [[ "${FORTRANC}" == gfortran ]] &&
+       if [[ "$(tc-getFC)" == gfortran ]] &&
                [[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]] ; then
                ewarn
                ewarn "Warning!"
@@ -60,11 +56,11 @@ src_unpack() {
        cp sys_linux/g77_gcc.conf local.conf
 
        sed -i \
-               -e "s:FCOMPL=.*:FCOMPL=\"${FORTRANC}\":g" \
+               -e "s:FCOMPL=.*:FCOMPL=\"$(tc-getFC)\":g" \
                -e "s:CCOMPL=.*:CCOMPL=\"$(tc-getCC)\":g" \
                local.conf || die "sed flags failed"
 
-       if [[ "${FORTRANC}" = if* ]]; then
+       if [[ "$(tc-getFC)" = if* ]]; then
                sed -i \
                        -e 's/-Wall//g' \
                        -e 's/TK_LIBS="/TK_LIBS="-nofor-main /' \