2021-05-20 02:56:45 UTC

20 files changed, 39 insertions, 19 deletions

diff --git a/metadata/md5-cache/sci-libs/amd-2.4.6 b/metadata/md5-cache/sci-libs/amd-2.4.6
index 5c8e2ddf6d43..285d7b7372a4 100644
--- a/metadata/md5-cache/sci-libs/amd-2.4.6
+++ b/metadata/md5-cache/sci-libs/amd-2.4.6
@@ -4,11 +4,12 @@ DEPEND=>=sci-libs/suitesparseconfig-5.4.0 virtual/fortran
 DESCRIPTION=Library to order a sparse matrix prior to Cholesky factorization
 EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
+INHERIT=fortran-2
 IUSE=doc fortran
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=sci-libs/suitesparseconfig-5.4.0 virtual/fortran
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/amd-2.4.6.tar.bz2
-_eclasses_=fortran-2	b4796813ccda91c9c0d3463fc90aa969	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	fortran-2	b4796813ccda91c9c0d3463fc90aa969
 _md5_=21a6d46c779da5249592f77ce267e10d
diff --git a/metadata/md5-cache/sci-libs/buddy-2.4-r1 b/metadata/md5-cache/sci-libs/buddy-2.4-r1
index 822345ae0af3..f94bf1491b3c 100644
--- a/metadata/md5-cache/sci-libs/buddy-2.4-r1
+++ b/metadata/md5-cache/sci-libs/buddy-2.4-r1
@@ -3,11 +3,12 @@ DEPEND=virtual/fortran
 DESCRIPTION=Binary Decision Diagram Package
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/buddy/
+INHERIT=fortran-2
 IUSE=doc examples
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=buddy
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=mirror://sourceforge/buddy/buddy-2.4.tar.gz
-_eclasses_=fortran-2	b4796813ccda91c9c0d3463fc90aa969	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	fortran-2	b4796813ccda91c9c0d3463fc90aa969
 _md5_=4d55bb0c1d7c81f697a7e6fd08a699b0
diff --git a/metadata/md5-cache/sci-libs/cholmod-3.0.13 b/metadata/md5-cache/sci-libs/cholmod-3.0.13
index 5e796d7d67e1..3a5efb8007b6 100644
--- a/metadata/md5-cache/sci-libs/cholmod-3.0.13
+++ b/metadata/md5-cache/sci-libs/cholmod-3.0.13
@@ -4,11 +4,12 @@ DEPEND=>=sci-libs/amd-2.4 >=sci-libs/colamd-2.9 cuda? ( x11-drivers/nvidia-drive
 DESCRIPTION=Sparse Cholesky factorization and update/downdate library
 EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
+INHERIT=toolchain-funcs
 IUSE=cuda doc +lapack +matrixops +modify +partition
 KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )
 RDEPEND=>=sci-libs/amd-2.4 >=sci-libs/colamd-2.9 cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) lapack? ( virtual/lapack ) partition? ( >=sci-libs/camd-2.4 >=sci-libs/ccolamd-2.9 || ( >=sci-libs/metis-5.1.0 sci-libs/parmetis ) )
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/cholmod-3.0.13.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=05d791dbc3f21f386b40debe79836985
diff --git a/metadata/md5-cache/sci-libs/cholmod-3.0.14 b/metadata/md5-cache/sci-libs/cholmod-3.0.14
index fa847533bd9e..ce2a354d149b 100644
--- a/metadata/md5-cache/sci-libs/cholmod-3.0.14
+++ b/metadata/md5-cache/sci-libs/cholmod-3.0.14
@@ -4,11 +4,12 @@ DEPEND=sci-libs/amd sci-libs/colamd cuda? ( dev-util/nvidia-cuda-toolkit x11-dri
 DESCRIPTION=Sparse Cholesky factorization and update/downdate library
 EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
+INHERIT=toolchain-funcs
 IUSE=cuda doc +lapack +matrixops +modify +partition
 KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )
 RDEPEND=sci-libs/amd sci-libs/colamd cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) lapack? ( virtual/lapack ) partition? ( sci-libs/camd sci-libs/ccolamd || ( >=sci-libs/metis-5.1.0 sci-libs/parmetis ) )
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/cholmod-3.0.14.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=99b04407ca7c7d5ab5fab40a199e70c4
diff --git a/metadata/md5-cache/sci-libs/cmpfit-1.2-r1 b/metadata/md5-cache/sci-libs/cmpfit-1.2-r1
index 0437f024b6aa..056817acebe8 100644
--- a/metadata/md5-cache/sci-libs/cmpfit-1.2-r1
+++ b/metadata/md5-cache/sci-libs/cmpfit-1.2-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install test
 DESCRIPTION=MINPACK-1 Least Squares Fitting Library in C
 EAPI=6
 HOMEPAGE=http://www.physics.wisc.edu/~craigm/idl/cmpfit.html
+INHERIT=toolchain-funcs
 IUSE=static-libs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain minpack
 SLOT=0
 SRC_URI=http://www.physics.wisc.edu/~craigm/idl/down/cmpfit-1.2.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=467dbfe34d6da72607c2b33fc3905ca3
diff --git a/metadata/md5-cache/sci-libs/coinor-clp-1.17.6 b/metadata/md5-cache/sci-libs/coinor-clp-1.17.6
index 60676b52ffb7..8cdaa4ca1c44 100644
--- a/metadata/md5-cache/sci-libs/coinor-clp-1.17.6
+++ b/metadata/md5-cache/sci-libs/coinor-clp-1.17.6
@@ -4,6 +4,7 @@ DEPEND=sci-libs/coinor-osi:= sci-libs/coinor-utils:= glpk? ( sci-mathematics/glp
 DESCRIPTION=COIN-OR linear programming solver
 EAPI=7
 HOMEPAGE=https://github.com/coin-or/Clp/
+INHERIT=toolchain-funcs
 IUSE=doc examples glpk metis mumps sparse static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=EPL-1.0
@@ -11,5 +12,5 @@ RDEPEND=sci-libs/coinor-osi:= sci-libs/coinor-utils:= glpk? ( sci-mathematics/gl
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/coin-or/Clp/archive/releases/1.17.6.tar.gz -> coinor-clp-1.17.6.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=ac909571f5f8bc762a656d2f6615930e
diff --git a/metadata/md5-cache/sci-libs/coinor-couenne-0.5.8-r1 b/metadata/md5-cache/sci-libs/coinor-couenne-0.5.8-r1
index 39d1cf1198d4..99d17a726d14 100644
--- a/metadata/md5-cache/sci-libs/coinor-couenne-0.5.8-r1
+++ b/metadata/md5-cache/sci-libs/coinor-couenne-0.5.8-r1
@@ -4,11 +4,12 @@ DEPEND=sci-libs/coinor-bonmin:= sci-libs/coinor-cbc:= sci-libs/coinor-cgl:= sci-
 DESCRIPTION=COIN-OR Convex Over and Under ENvelopes for Nonlinear Estimation
 EAPI=7
 HOMEPAGE=https://projects.coin-or.org/Couenne/
+INHERIT=fortran-2
 IUSE=doc
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=EPL-1.0
 RDEPEND=sci-libs/coinor-bonmin:= sci-libs/coinor-cbc:= sci-libs/coinor-cgl:= sci-libs/coinor-clp:= sci-libs/coinor-osi:= sci-libs/coinor-utils:= sci-libs/ipopt:=[lapack] virtual/blas virtual/fortran
 SLOT=0/1
 SRC_URI=https://github.com/coin-or/Couenne/archive/releases/0.5.8.tar.gz -> coinor-couenne-0.5.8.tar.gz
-_eclasses_=fortran-2	b4796813ccda91c9c0d3463fc90aa969	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	fortran-2	b4796813ccda91c9c0d3463fc90aa969
 _md5_=703251557336fff8b4c1c8cf57a6466f
diff --git a/metadata/md5-cache/sci-libs/coinor-utils-2.11.4 b/metadata/md5-cache/sci-libs/coinor-utils-2.11.4
index d059462e7be9..03dcfb206abd 100644
--- a/metadata/md5-cache/sci-libs/coinor-utils-2.11.4
+++ b/metadata/md5-cache/sci-libs/coinor-utils-2.11.4
@@ -4,6 +4,7 @@ DEPEND=sys-libs/readline:0= blas? ( virtual/blas ) bzip2? ( app-arch/bzip2 ) glp
 DESCRIPTION=COIN-OR Matrix, Vector and other utility classes
 EAPI=7
 HOMEPAGE=https://github.com/coin-or/CoinUtils/
+INHERIT=toolchain-funcs
 IUSE=bzip2 doc glpk blas lapack static-libs test zlib
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=EPL-1.0
@@ -11,5 +12,5 @@ RDEPEND=sys-libs/readline:0= blas? ( virtual/blas ) bzip2? ( app-arch/bzip2 ) gl
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/coin-or/CoinUtils/archive/releases/2.11.4.tar.gz -> coinor-utils-2.11.4.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=b6f5c5ea445f5cb36ee31ab72f84e62e
diff --git a/metadata/md5-cache/sci-libs/dsdp-5.8-r3 b/metadata/md5-cache/sci-libs/dsdp-5.8-r3
index 662b4615a0bb..95397f437e0a 100644
--- a/metadata/md5-cache/sci-libs/dsdp-5.8-r3
+++ b/metadata/md5-cache/sci-libs/dsdp-5.8-r3
@@ -3,11 +3,12 @@ DEPEND=virtual/lapack virtual/pkgconfig
 DESCRIPTION=Software for interior-point for semidefinite programming
 EAPI=6
 HOMEPAGE=https://www.mcs.anl.gov/hs/software/DSDP/
+INHERIT=multilib toolchain-funcs versionator
 IUSE=doc examples
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=virtual/lapack
 SLOT=0
 SRC_URI=https://www.mcs.anl.gov/hs/software/DSDP/DSDP5.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=7dd49b976fcb9287977952c57ab52ea4
diff --git a/metadata/md5-cache/sci-libs/galib-2.4.7-r1 b/metadata/md5-cache/sci-libs/galib-2.4.7-r1
index 4f9d43e73fd0..0809c39c7a49 100644
--- a/metadata/md5-cache/sci-libs/galib-2.4.7-r1
+++ b/metadata/md5-cache/sci-libs/galib-2.4.7-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Library for genetic algorithms in C++ programs
 EAPI=6
 HOMEPAGE=http://lancet.mit.edu/ga/
+INHERIT=toolchain-funcs
 IUSE=doc examples
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD examples? ( GPL-2 )
 SLOT=0
 SRC_URI=http://lancet.mit.edu/ga/dist/galib247.tgz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=596bd6ec749f0adb4c7725dbb48917a9
diff --git a/metadata/md5-cache/sci-libs/htslib-1.10.2 b/metadata/md5-cache/sci-libs/htslib-1.10.2
index 1311f106d107..87d55205321a 100644
--- a/metadata/md5-cache/sci-libs/htslib-1.10.2
+++ b/metadata/md5-cache/sci-libs/htslib-1.10.2
@@ -3,11 +3,12 @@ DEPEND=bzip2? ( app-arch/bzip2:= ) curl? ( net-misc/curl ) lzma? ( app-arch/xz-u
 DESCRIPTION=C library for high-throughput sequencing data formats
 EAPI=7
 HOMEPAGE=http://www.htslib.org/
+INHERIT=toolchain-funcs
 IUSE=+bzip2 curl +lzma
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=bzip2? ( app-arch/bzip2:= ) curl? ( net-misc/curl ) lzma? ( app-arch/xz-utils:= )
 SLOT=0/3
 SRC_URI=mirror://sourceforge/samtools/1.10.2/htslib-1.10.2.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=23b94cf7e1e965cd1a0196a498381a08
diff --git a/metadata/md5-cache/sci-libs/jama-1.2.5 b/metadata/md5-cache/sci-libs/jama-1.2.5
index b04e61a90873..041c1326d138 100644
--- a/metadata/md5-cache/sci-libs/jama-1.2.5
+++ b/metadata/md5-cache/sci-libs/jama-1.2.5
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Java-like matrix C++ templates
 EAPI=6
 HOMEPAGE=https://math.nist.gov/tnt/
+INHERIT=versionator
 IUSE=doc
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain
diff --git a/metadata/md5-cache/sci-libs/libexcelformat-101016 b/metadata/md5-cache/sci-libs/libexcelformat-101016
index d21e245148db..6f865f612f8c 100644
--- a/metadata/md5-cache/sci-libs/libexcelformat-101016
+++ b/metadata/md5-cache/sci-libs/libexcelformat-101016
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=reading, writing, and editing of XLS (BIFF8 format) files using C++
 EAPI=6
 HOMEPAGE=https://www.codeproject.com/Articles/42504/ExcelFormat-Library
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=CPOL
 SLOT=0
 SRC_URI=mirror://gentoo/libexcelformat-101016.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=7d3f30f1515b3f4760348c282ce1ebce
diff --git a/metadata/md5-cache/sci-libs/libpdb++-040728-r1 b/metadata/md5-cache/sci-libs/libpdb++-040728-r1
index d81d7d9538a1..3c934bddf58e 100644
--- a/metadata/md5-cache/sci-libs/libpdb++-040728-r1
+++ b/metadata/md5-cache/sci-libs/libpdb++-040728-r1
@@ -3,10 +3,11 @@ DEPEND=app-arch/sharutils
 DESCRIPTION=PDB Record I/O Libraries -- c++ version
 EAPI=6
 HOMEPAGE=http://www.cgl.ucsf.edu/Overview/software.html
+INHERIT=multilib toolchain-funcs
 IUSE=static-libs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://gentoo/libpdb++-040728.shar
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=6a898b56f1363b0d1a06ce2650bbee9b
diff --git a/metadata/md5-cache/sci-libs/lrslib-071 b/metadata/md5-cache/sci-libs/lrslib-071
index c236bc5d4915..a711146f29d7 100644
--- a/metadata/md5-cache/sci-libs/lrslib-071
+++ b/metadata/md5-cache/sci-libs/lrslib-071
@@ -3,11 +3,12 @@ DEPEND=gmp? ( dev-libs/gmp:0= mpi? ( virtual/mpi ) )
 DESCRIPTION=Self-contained C implementation of the reverse search algorithm
 EAPI=7
 HOMEPAGE=http://cgm.cs.mcgill.ca/~avis/C/lrs.html
+INHERIT=toolchain-funcs
 IUSE=gmp mpi
 KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=gmp? ( dev-libs/gmp:0= mpi? ( virtual/mpi ) )
 SLOT=0
 SRC_URI=http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-071.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=726acafd1469757b4160d8c9a1e9a6ca
diff --git a/metadata/md5-cache/sci-libs/nfft-3.5.2 b/metadata/md5-cache/sci-libs/nfft-3.5.2
index 0697f59fdaba..0a86bf225241 100644
--- a/metadata/md5-cache/sci-libs/nfft-3.5.2
+++ b/metadata/md5-cache/sci-libs/nfft-3.5.2
@@ -3,11 +3,12 @@ DEPEND=sci-libs/fftw:3.0[threads,openmp?]
 DESCRIPTION=library for nonequispaced discrete Fourier transformations
 EAPI=7
 HOMEPAGE=https://www-user.tu-chemnitz.de/~potts/nfft/
+INHERIT=toolchain-funcs
 IUSE=doc openmp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sci-libs/fftw:3.0[threads,openmp?]
 SLOT=0
 SRC_URI=https://github.com/NFFT/nfft/releases/download/3.5.2/nfft-3.5.2.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=d770522e70ab59a9b00c60b02241e4ec
diff --git a/metadata/md5-cache/sci-libs/openlibm-0.7.4 b/metadata/md5-cache/sci-libs/openlibm-0.7.4
index 9c37993874f1..48dc1ba52bfb 100644
--- a/metadata/md5-cache/sci-libs/openlibm-0.7.4
+++ b/metadata/md5-cache/sci-libs/openlibm-0.7.4
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=High quality system independent, open source libm
 EAPI=7
 HOMEPAGE=https://github.com/JuliaLang/openlibm
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain MIT ISC BSD-2 LGPL-2.1+
 SLOT=0/3
 SRC_URI=https://github.com/JuliaMath/openlibm/archive/v0.7.4.tar.gz -> openlibm-0.7.4.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=a9c0592ebaaeb8deb1f571720fbc6dd3
diff --git a/metadata/md5-cache/sci-libs/taucs-2.2-r1 b/metadata/md5-cache/sci-libs/taucs-2.2-r1
index a2348169aebc..385331c64a38 100644
--- a/metadata/md5-cache/sci-libs/taucs-2.2-r1
+++ b/metadata/md5-cache/sci-libs/taucs-2.2-r1
@@ -4,6 +4,7 @@ DEPEND=virtual/blas virtual/lapack || ( sci-libs/metis sci-libs/parmetis ) virtu
 DESCRIPTION=C library of sparse linear solvers
 EAPI=7
 HOMEPAGE=http://www.tau.ac.il/~stoledo/taucs/
+INHERIT=fortran-2 toolchain-funcs
 IUSE=doc
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
@@ -11,5 +12,5 @@ RDEPEND=virtual/blas virtual/lapack || ( sci-libs/metis sci-libs/parmetis ) virt
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.tau.ac.il/~stoledo/taucs/2.2/taucs.tgz -> taucs-2.2.tgz
-_eclasses_=fortran-2	b4796813ccda91c9c0d3463fc90aa969	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	fortran-2	b4796813ccda91c9c0d3463fc90aa969
 _md5_=70cb1a13db6d7ab0ae66ad91fe219481
diff --git a/metadata/md5-cache/sci-libs/umfpack-5.7.9 b/metadata/md5-cache/sci-libs/umfpack-5.7.9
index 1045593927f0..c995d8057496 100644
--- a/metadata/md5-cache/sci-libs/umfpack-5.7.9
+++ b/metadata/md5-cache/sci-libs/umfpack-5.7.9
@@ -4,11 +4,12 @@ DEPEND=sci-libs/amd >=sci-libs/suitesparseconfig-5.4.0 virtual/blas cholmod? ( s
 DESCRIPTION=Unsymmetric multifrontal sparse LU factorization library
 EAPI=7
 HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
+INHERIT=toolchain-funcs
 IUSE=+cholmod doc
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=sci-libs/amd >=sci-libs/suitesparseconfig-5.4.0 virtual/blas cholmod? ( sci-libs/cholmod )
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/umfpack-5.7.9.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=79126e5bca4a2022f7370017d3658b39
diff --git a/metadata/md5-cache/sci-libs/xgks-pmel-2.5.5 b/metadata/md5-cache/sci-libs/xgks-pmel-2.5.5
index 78ea446f2b3f..78b033475e83 100644
--- a/metadata/md5-cache/sci-libs/xgks-pmel-2.5.5
+++ b/metadata/md5-cache/sci-libs/xgks-pmel-2.5.5
@@ -4,11 +4,12 @@ DEPEND=x11-libs/libX11 virtual/fortran
 DESCRIPTION=PMEL fork of XGKS, an X11-based version of the ANSI Graphical Kernel System
 EAPI=7
 HOMEPAGE=http://www.gentoogeek.org/viewvc/Linux/xgks-pmel/
+INHERIT=fortran-2 toolchain-funcs
 IUSE=doc
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=UCAR-Unidata
 RDEPEND=x11-libs/libX11 virtual/fortran
 SLOT=0
 SRC_URI=http://www.gentoogeek.org/files/xgks-pmel-2.5.5.tar.gz
-_eclasses_=fortran-2	b4796813ccda91c9c0d3463fc90aa969	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	fortran-2	b4796813ccda91c9c0d3463fc90aa969
 _md5_=6798d96d728f3a3bc3c681b23dca9e17