gentoo resync : 14.05.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-14 11:09:11 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-14 11:09:11 +0100
commit: deba8115d2c2af26df42966b91ef04ff4dd79cde (patch)
tree: 9a48f42594e1a9e6b2020d5535a784314434d7a7 /sci-libs
parent: 38423c67c8a23f6a1bc42038193182e2da3116eb (diff)
97 files changed, 2461 insertions, 987 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 4e703a1c8e0a..d1cf666121c2 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index 9060984e7a0c..b4ee5e8a3304 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1,7 +1,9 @@
 AUX cantera_2.4.0_env.patch 3559 BLAKE2B 07af1b751b653b1c92288286b9c82ef230ea0df7d9ea4036d23ac24338a221cc45c8e74f137fcf741bb9bb7148e7f3339f54234e9a92ac939956ba7c0ca8e157 SHA512 f2574c3de42d1666a2b64914c66d97045a2a3598f63678b3b60a701d111d7bfc9bd71031dd665a64e6791c9f311fb9514b1a0462a5713763a1b5f87fcd72e528
 AUX cantera_2.4.0_env_python_install.patch 1001 BLAKE2B bfe6e69332117526d8a7c330ae9610e26e72a9e250ce04beda564149fbd21f3262f36982971e5ec0c552e09f12804172b7f978ab03bfb98c0dbe92cd8c7d9401 SHA512 410a81b4ec69eb6eb2a60d55d142b266b836da5a7d4e4ae2fd8844fb87eff0f3544f6e370fc354d334c6cd5a61f8364842c8a9b3bd0dc2290f58ee7392a170f4
-AUX cantera_2.4.0_sundials4.patch 7504 BLAKE2B 55bfc58edaed97459a40a1adafcba545bc6513219e9ce1bbf4a529007c6c629ad295b4f85b9cac44da9a9399c721ca19547fa75948c0d0d518fc149862eb9b14 SHA512 4ddf7122df491f53bf67f299d8134b072751dc6f56ab0e4d7cfed733f35ad4b1fb7f005584b06f44d68dc2f29abc299bfb6a65b6b0b3daa828fc80fa52fac964
+AUX cantera_2.4.0_env_python_install_prefix.patch 943 BLAKE2B 06bc4ac2cc4aaa212325c3883b9cead668ed294f23a2ac768f28e593916d07f2322e21846b97b40e336dfc742ed45a9b95f8f49531cd82d2055499f810e13c2f SHA512 a7ebfd8f9a6fa406d5a5847ad98e91aa9cbf53d194ec87d8479b88ad322df13308947fae61574ebd6254eeaa1bcb49a4cd3e30db2981cebcbf13241ab8e050d6
+AUX cantera_2.4.0_sundials4.patch 8410 BLAKE2B dbee09305610bb0d74c1569d694782194c0cb3daf06b581fa385021faed9d54d8f900747bdcac64b0322dcc82fee20bc330b71bee1aa90fe9df68efc335427b7 SHA512 ec4b80b761c3d18cc03bb87ec59b7c860b6818c3a5503f3f7c759f0bfde7cc6c5ded3c64294f9844e28a649754f4a1c158738bc5a7c923bd4808a78c6a59c91a
 DIST cantera-2.4.0.tar.gz 2321316 BLAKE2B 40750e3864afa3d35817e6f5777a6ac235261e9d134ef749966dbd738a2af5efec2882e6dcc719851f88656b41469e2159d3bff3df32f6abdf57db3b0a2afcae SHA512 8bb0fee34fa5bc9ec78e6f21a100eaa77bdd966bd0b7f0fa27d452e4f122c69e61648beef847178490f5c5d56267a96f6081cac9ccd03cea153c32814e0e84e9
 EBUILD cantera-2.4.0-r1.ebuild 2929 BLAKE2B 57eb719f155c1c58024283cea0fd7a667888ce1749be056a644e80f466ac7ed66c854277ae67681a19f6d374ede9a3fb4394f80f4d5802bab77bc28e41807223 SHA512 f1d88be5b54a480735ae55da4a05267c3890abaa80776124234bb5dcb8dd539e6df9d3cf8dd29a1577f9008cc57581e0f6a575b14d1c432599e72f93cbd6967b
 EBUILD cantera-2.4.0-r4.ebuild 3028 BLAKE2B cacb43b61a63aba2ae8a55393ff8f0ea93c0bbea9266f182d3ac270e822b09a16865da60076e6ea059bc1c684c9a13e7291f3aed037ca2fa79c48d0844fd5051 SHA512 c3f361945f1d4756f8251fc3122a4b8ba36e5f5723c4d71742f8d089a41614669ecaf5462a8e2d5945b09611eda3a98f4d91736ca253202c44d1a6fd6cb22705
+EBUILD cantera-2.4.0-r5.ebuild 3072 BLAKE2B 44b04260688a25de14ad1bd53bc5831f4f3354bc0b9cda0c857f86456b7d64e644284e7748ac0949cc5a5b50e3c297bedfdd6f162621eeb8c5d32f3570e318d7 SHA512 a4f702e5a7f4e8bf7c1147bd6a96d2bc51ef99a7c60691deb1f24fd07a78ca8cfb6427a0758912611793272c58a8bf87d66dcaa47b888dc0a3204729c0bb8ecf
 MISC metadata.xml 794 BLAKE2B 4a92fb553aad7d87d4b7a8d77974dbd67d593b4010783f96324979d9c01067bccc60d2faedf604bd8d44a8ac4316356879301899af8bc08d0fcd548df6d3762d SHA512 a9e6f4e161519d0b3618fe8da7065195bc760ba889fa4356358d4047ea1970eb5fd78bdc5fbeb7c660f1bee48a68ab20ced636514e6f12848e88f6f4dabc9705
diff --git a/sci-libs/cantera/cantera-2.4.0-r5.ebuild b/sci-libs/cantera/cantera-2.4.0-r5.ebuild
new file mode 100644
index 000000000000..ac2a89b4ddd4
--- /dev/null
+++ b/sci-libs/cantera/cantera-2.4.0-r5.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD=90
+
+inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
+HOMEPAGE="https://www.cantera.org"
+SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cti fortran pch +python test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	python? ( cti )
+	${PYTHON_REQUIRED_USE}
+	"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	<sci-libs/sundials-5.3.0:0=
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-cpp/eigen:3
+	dev-libs/boost
+	dev-libs/libfmt
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	test? (
+		>=dev-cpp/gtest-1.8.0
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}_${PV}_env.patch"
+	"${FILESDIR}/${PN}_${PV}_env_python_install_prefix.patch"
+	"${FILESDIR}/${PN}_${PV}_sundials4.patch"
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+## Full list of configuration options of Cantera is presented here:
+## http://cantera.org/docs/sphinx/html/compiling/config-options.html
+
+src_configure() {
+	scons_vars=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		cc_flags="${CXXFLAGS}"
+		cxx_flags="-std=c++11"
+		debug="no"
+		FORTRAN="$(tc-getFC)"
+		FORTRANFLAGS="${FFLAGS}"
+		optimize_flags="-Wno-inline"
+		renamed_shared_libraries="no"
+		use_pch=$(usex pch)
+## In some cases other order can break the detection of right location of Boost: ##
+		system_fmt="y"
+		system_sundials="y"
+		system_eigen="y"
+		env_vars="all"
+		extra_inc_dirs="/usr/include/eigen3"
+	)
+	use test || scons_vars+=( googletest="none" )
+
+	scons_targets=(
+		f90_interface=$(usex fortran y n)
+		python2_package="none"
+	)
+
+	if use cti ; then
+		local scons_python=$(usex python full minimal)
+		scons_targets+=( python3_package="${scons_python}" python3_cmd="${EPYTHON}" )
+	else
+		scons_targets+=( python3_package="none" )
+	fi
+}
+
+src_compile() {
+	escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
+}
+
+src_test() {
+	escons test
+}
+
+src_install() {
+	escons install stage_dir="${D}" libdirname="$(get_libdir)" python3_prefix="$(python_get_sitedir)"
+	if ! use cti ; then
+		rm -r "${D}/usr/share/man" || die "Can't remove man files."
+	else
+		# Run the byte-compile of modules
+		python_optimize "${D}/$(python_get_sitedir)/${PN}"
+	fi
+}
+
+pkg_postinst() {
+	if use cti && ! use python ; then
+		elog "Cantera was build without 'python' use-flag therefore the CTI tool 'ck2cti'"
+		elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism."
+	fi
+
+	local post_msg=$(usex fortran "and Fortran " "")
+	elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
+
+	if use python ; then
+		elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories."
+	fi
+}
diff --git a/sci-libs/cantera/files/cantera_2.4.0_env_python_install_prefix.patch b/sci-libs/cantera/files/cantera_2.4.0_env_python_install_prefix.patch
new file mode 100644
index 000000000000..838907996361
--- /dev/null
+++ b/sci-libs/cantera/files/cantera_2.4.0_env_python_install_prefix.patch
@@ -0,0 +1,17 @@
+diff -Nur old/interfaces/cython/SConscript new/interfaces/cython/SConscript
+--- old/interfaces/cython/SConscript	2018-08-24 16:24:45.000000000 +0300
++++ new/interfaces/cython/SConscript	2019-08-14 04:28:41.000000000 +0300
+@@ -83,10 +83,10 @@
+             extra = ''
+         elif localenv['OS'] == 'Darwin':
+             extra = localenv.subst(' --prefix=${python%s_prefix}' % major)
+-        elif localenv['libdirname'] == 'lib64':
+-            # 64-bit RHEL / Fedora
++        elif localenv['libdirname'] != 'lib':
++            # 64-bit RHEL / Fedora etc. or e.g. x32 Gentoo profile
+             extra = localenv.subst(
+-                ' --prefix=${python%s_prefix} --install-lib=${python%s_prefix}/lib64/python%s.%s/site-packages' % (major, major, major, minor))
++                ' --prefix=${stage_dir}${prefix} --install-lib=${python%s_prefix}' % (major))
+         else:
+             extra = '--user'
+             localenv.AppendENVPath(
diff --git a/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch b/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch
index 8c44228019b8..0b4d3abf8541 100644
--- a/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch
+++ b/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch
@@ -1,6 +1,6 @@
-diff -Nur old/SConstruct new/SConstruct
---- old/SConstruct	2019-08-14 04:12:50.000000000 +0300
-+++ new/SConstruct	2019-08-14 04:38:55.000000000 +0300
+diff -Naur a/SConstruct b/SConstruct
+--- a/SConstruct	2020-04-21 13:55:06.000000000 +0300
++++ b/SConstruct	2020-04-21 13:55:54.000000000 +0300
 @@ -1013,23 +1013,29 @@
  
  import SCons.Conftest, SCons.SConf
@@ -42,18 +42,35 @@ diff -Nur old/SConstruct new/SConstruct
  
  # Checkout Sundials submodule if needed
  if (env['system_sundials'] == 'n' and
-@@ -1066,7 +1072,7 @@
+@@ -1066,13 +1072,14 @@
  
      # Ignore the minor version, e.g. 2.4.x -> 2.4
      env['sundials_version'] = '.'.join(sundials_version.split('.')[:2])
 -    if env['sundials_version'] not in ('2.4','2.5','2.6','2.7','3.0','3.1','3.2'):
-+    if env['sundials_version'] not in ('2.4','2.5','2.6','2.7','3.0','3.1','3.2','4.0','4.1','5.0','5.1'):
++    sundials_ver = LooseVersion(env['sundials_version'])
++    if sundials_ver < LooseVersion('2.4') or sundials_ver >= LooseVersion('6.0'):
          print("""ERROR: Sundials version %r is not supported.""" % env['sundials_version'])
          sys.exit(1)
      print("""INFO: Using system installation of Sundials version %s.""" % sundials_version)
-diff -Nur old/include/cantera/numerics/CVodesIntegrator.h new/include/cantera/numerics/CVodesIntegrator.h
---- old/include/cantera/numerics/CVodesIntegrator.h	2018-08-24 16:24:45.000000000 +0300
-+++ new/include/cantera/numerics/CVodesIntegrator.h	2019-08-14 04:39:50.000000000 +0300
+ 
+     #Determine whether or not Sundials was built with BLAS/LAPACK
+-    if LooseVersion(env['sundials_version']) < LooseVersion('2.6'):
++    if sundials_ver < LooseVersion('2.6'):
+         # In Sundials 2.4 / 2.5, SUNDIALS_BLAS_LAPACK is either 0 or 1
+         sundials_blas_lapack = get_expression_value(['"sundials/sundials_config.h"'],
+                                                        'SUNDIALS_BLAS_LAPACK')
+@@ -1690,7 +1697,7 @@
+ 
+ if env['system_sundials'] == 'y':
+     env['sundials_libs'] = ['sundials_cvodes', 'sundials_ida', 'sundials_nvecserial']
+-    if env['use_lapack'] and LooseVersion(env['sundials_version']) >= LooseVersion('3.0'):
++    if env['use_lapack'] and sundials_ver >= LooseVersion('3.0'):
+         if env.get('has_sundials_lapack'):
+             env['sundials_libs'].extend(('sundials_sunlinsollapackdense',
+                                          'sundials_sunlinsollapackband'))
+diff -Naur a/include/cantera/numerics/CVodesIntegrator.h b/include/cantera/numerics/CVodesIntegrator.h
+--- a/include/cantera/numerics/CVodesIntegrator.h	2018-08-24 16:24:45.000000000 +0300
++++ b/include/cantera/numerics/CVodesIntegrator.h	2020-04-21 13:55:54.000000000 +0300
 @@ -49,7 +49,6 @@
          m_maxord = n;
      }
@@ -62,9 +79,9 @@ diff -Nur old/include/cantera/numerics/CVodesIntegrator.h new/include/cantera/nu
      virtual void setMaxStepSize(double hmax);
      virtual void setMinStepSize(double hmin);
      virtual void setMaxSteps(int nmax);
-diff -Nur old/include/cantera/numerics/Integrator.h new/include/cantera/numerics/Integrator.h
---- old/include/cantera/numerics/Integrator.h	2018-08-24 16:24:45.000000000 +0300
-+++ new/include/cantera/numerics/Integrator.h	2019-08-14 04:44:27.000000000 +0300
+diff -Naur a/include/cantera/numerics/Integrator.h b/include/cantera/numerics/Integrator.h
+--- a/include/cantera/numerics/Integrator.h	2018-08-24 16:24:45.000000000 +0300
++++ b/include/cantera/numerics/Integrator.h	2020-04-21 13:55:54.000000000 +0300
 @@ -34,17 +34,6 @@
      Adams_Method //! Adams
  };
@@ -95,9 +112,9 @@ diff -Nur old/include/cantera/numerics/Integrator.h new/include/cantera/numerics
      //! Set the maximum step size
      virtual void setMaxStepSize(double hmax) {
          warn("setMaxStepSize");
-diff -Nur old/src/kinetics/ImplicitSurfChem.cpp new/src/kinetics/ImplicitSurfChem.cpp
---- old/src/kinetics/ImplicitSurfChem.cpp	2018-08-24 16:24:45.000000000 +0300
-+++ new/src/kinetics/ImplicitSurfChem.cpp	2019-08-14 04:45:57.000000000 +0300
+diff -Naur a/src/kinetics/ImplicitSurfChem.cpp b/src/kinetics/ImplicitSurfChem.cpp
+--- a/src/kinetics/ImplicitSurfChem.cpp	2018-08-24 16:24:45.000000000 +0300
++++ b/src/kinetics/ImplicitSurfChem.cpp	2020-04-21 13:55:54.000000000 +0300
 @@ -79,7 +79,6 @@
      // numerically, and use a Newton linear iterator
      m_integ->setMethod(BDF_Method);
@@ -106,9 +123,9 @@ diff -Nur old/src/kinetics/ImplicitSurfChem.cpp new/src/kinetics/ImplicitSurfChe
      m_work.resize(ntmax);
  }
  
-diff -Nur old/src/numerics/CVodesIntegrator.cpp new/src/numerics/CVodesIntegrator.cpp
---- old/src/numerics/CVodesIntegrator.cpp	2018-08-24 16:24:45.000000000 +0300
-+++ new/src/numerics/CVodesIntegrator.cpp	2019-08-14 04:49:02.000000000 +0300
+diff -Naur a/src/numerics/CVodesIntegrator.cpp b/src/numerics/CVodesIntegrator.cpp
+--- a/src/numerics/CVodesIntegrator.cpp	2018-08-24 16:24:45.000000000 +0300
++++ b/src/numerics/CVodesIntegrator.cpp	2020-04-21 13:55:54.000000000 +0300
 @@ -88,7 +88,6 @@
      m_type(DENSE+NOJAC),
      m_itol(CV_SS),
@@ -161,9 +178,9 @@ diff -Nur old/src/numerics/CVodesIntegrator.cpp new/src/numerics/CVodesIntegrato
              #if CT_SUNDIALS_USE_LAPACK
                  m_linsol = SUNLapackBand(m_y, (SUNMatrix) m_linsol_matrix);
              #else
-diff -Nur old/src/numerics/IDA_Solver.cpp new/src/numerics/IDA_Solver.cpp
---- old/src/numerics/IDA_Solver.cpp	2018-08-24 16:24:45.000000000 +0300
-+++ new/src/numerics/IDA_Solver.cpp	2019-08-14 04:51:01.000000000 +0300
+diff -Naur a/src/numerics/IDA_Solver.cpp b/src/numerics/IDA_Solver.cpp
+--- a/src/numerics/IDA_Solver.cpp	2018-08-24 16:24:45.000000000 +0300
++++ b/src/numerics/IDA_Solver.cpp	2020-04-21 13:55:54.000000000 +0300
 @@ -442,7 +442,11 @@
          #if CT_SUNDIALS_VERSION >= 30
              SUNLinSolFree((SUNLinearSolver) m_linsol);
@@ -177,9 +194,9 @@ diff -Nur old/src/numerics/IDA_Solver.cpp new/src/numerics/IDA_Solver.cpp
              #if CT_SUNDIALS_USE_LAPACK
                  m_linsol = SUNLapackBand(m_y, (SUNMatrix) m_linsol_matrix);
              #else
-diff -Nur old/src/zeroD/ReactorNet.cpp new/src/zeroD/ReactorNet.cpp
---- old/src/zeroD/ReactorNet.cpp	2018-08-24 16:24:45.000000000 +0300
-+++ new/src/zeroD/ReactorNet.cpp	2019-08-14 04:51:35.000000000 +0300
+diff -Naur a/src/zeroD/ReactorNet.cpp b/src/zeroD/ReactorNet.cpp
+--- a/src/zeroD/ReactorNet.cpp	2018-08-24 16:24:45.000000000 +0300
++++ b/src/zeroD/ReactorNet.cpp	2020-04-21 13:55:54.000000000 +0300
 @@ -28,7 +28,6 @@
      // numerically, and use a Newton linear iterator
      m_integ->setMethod(BDF_Method);
diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index 4da6bab71a19..4b8cbe441c1f 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1,5 +1,3 @@
-DIST ceres-solver-1.12.0.tar.gz 5008861 BLAKE2B 52b3954dde96386bd031543ab9d7370368f58f76f1dec9d24ef10803da787cc96f40a1c775626fde832b70ebd94cf4274c70a8fb4bd7e1bcf040e119cbec09f8 SHA512 485eece0471cf05d31b5dd7e133e23115a334a4ed557a3c1bd0b715a063f840738af8f507e935522a0dae90ce6851984c0002a25e9b445b90889792f68a05571
 DIST ceres-solver-1.14.0.tar.gz 5450130 BLAKE2B cfcfe07cecb267528081dfc6deb5283bc5a04b79d4595e45365960895b84a6dca2a3024b046868f06709fc81e8514730cbc409ab01cb0cbee488b5bad5b9f7cc SHA512 a2af9918d2730709361ec971431a2b22e6ca3ca440081be87fa52729ec43702020b021837bfe5a42a58db1ab89ea6aada11f2d1888da66bef614ec1f27ab30c6
-EBUILD ceres-solver-1.12.0.ebuild 2400 BLAKE2B 40d628872950995e250c6ad5ddac436e2c9b8fc9e4ad25c93d66851930370dabdcfad93ad1ca70c0b37a201ded641b2e547bb95b14a11418f910403c6c2d502e SHA512 e84db68bd83234e6ee272a07bb40a4a41ae225b61aaa7ecc42dd4b8a6996f0d72cf2805a3c69bd45db271f5b9974e2aa36eb52bf51070c93b0b753839f728b42
 EBUILD ceres-solver-1.14.0.ebuild 2322 BLAKE2B 86586d0e78b7a3bcd892ddc78ebfba929a50c17ff162f0063ff6c01101c29dfe75559c6b1172dfa3b75ea2afc8bf544682f1b1a7503c2abc2c80d91088101de3 SHA512 f4636950774524f3201ac63abb60ed76ab0380f0e765eb82d4aee3f82d577aba74d0fd7619e77b32989ed39c552393e6048b30a1af16d59d4b13f6c3d66087a6
-MISC metadata.xml 1525 BLAKE2B 46de33a7fa6513877e2427442e918d8e39871a6b6b8a15a18d14dcedd55c42bfb1bdeab7e1cc57c0ac03ba06d5c3628dd666b6f0787eac5c9dc75785e2a9e471 SHA512 4c95aef23ce327f9cd11b53638e1b6485eb789cd296ad8a571278b65c9001465f56c97b97db6e2c4a4ed76336f0e33684958adef593d74193cb73930e7ea5ad2
+MISC metadata.xml 1451 BLAKE2B c23657557890c4b62551c79eb7a3b07ef0921f5766b9d771d85e1cf156b03a9d783f6d307504ce5cfc810e096bd990f2aef58f7da6cf912df3fbafa7b63f257e SHA512 e9867b3e997e1c28e900f1148287ed052d5e29440c7f8d99b61432c8870d8f6d7368d387f9cc72bb948a412b77ad8e4cc2f418c41ad60f21c8027e23f36d71aa
diff --git a/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild b/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
deleted file mode 100644
index 05747c215b05..000000000000
--- a/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-multilib eutils python-any-r1 toolchain-funcs
-
-DESCRIPTION="Nonlinear least-squares minimizer"
-HOMEPAGE="http://ceres-solver.org/"
-SRC_URI="http://ceres-solver.org/${P}.tar.gz"
-
-LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
-SLOT="0/1"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxsparse c++11 doc examples gflags lapack openmp +schur sparse test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse !lapack )"
-
-RDEPEND="
-	dev-cpp/glog[gflags?,${MULTILIB_USEDEP}]
-	cxsparse? ( sci-libs/cxsparse )
-	lapack? ( virtual/lapack )
-	sparse? (
-		sci-libs/amd
-		sci-libs/camd
-		sci-libs/ccolamd
-		sci-libs/cholmod[metis(+)]
-		sci-libs/colamd
-		sci-libs/spqr
-	)"
-
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	doc? ( dev-python/sphinx dev-python/sphinx_rtd_theme )
-	lapack? ( virtual/pkgconfig )
-	${PYTHON_DEPS}"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		if [[ $(tc-getCXX) == *g++* ]] && ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-	fi
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# search paths work for prefix
-	sed -e "s:/usr:${EPREFIX}/usr:g" \
-		-i cmake/*.cmake || die
-
-	# remove Werror
-	sed -e 's/-Werror=(all|extra)//g' \
-		-i CMakeLists.txt || die
-
-	# respect gentoo doc install directory
-	sed -e "s:share/doc/ceres:share/doc/${PF}:" \
-		-i docs/source/CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# CUSTOM_BLAS=OFF EIGENSPARSE=OFF MINIGLOG=OFF CXX11=OFF
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_EXAMPLES=OFF
-		-DENABLE_TESTING="$(usex test)"
-		-DCXX11="$(usex c++11)"
-		-DBUILD_DOCUMENTATION="$(usex doc)"
-		-DGFLAGS="$(usex gflags)"
-		-DLAPACK="$(usex lapack)"
-		-DOPENMP="$(usex openmp)"
-		-DSCHUR_SPECIALIZATIONS="$(usex schur)"
-		-DCXSPARSE="$(usex cxsparse)"
-		-DSUITESPARSE="$(usex sparse)"
-	)
-	use sparse || use cxsparse || mycmakeargs+=( -DEIGENSPARSE=ON )
-	cmake-multilib_src_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-	dodoc README.md VERSION
-
-	if use examples; then
-		docinto /usr/share/doc/${PF}
-		docompress -x /usr/share/doc/${PF}/examples
-		doins -r examples data
-	fi
-}
diff --git a/sci-libs/ceres-solver/metadata.xml b/sci-libs/ceres-solver/metadata.xml
index 42d1cafcb8bf..57c1a1394e07 100644
--- a/sci-libs/ceres-solver/metadata.xml
+++ b/sci-libs/ceres-solver/metadata.xml
@@ -29,6 +29,5 @@
     <flag name="sparse">Enable support for sparse matrix algebra with various
   packages from SuiteSparse</flag>
     <flag name="gflags">Use <pkg>dev-cpp/gflags</pkg> for flag parsing</flag>
-    <flag name="c++11">Build ceres-solver using the C++11 standard</flag>
   </use>
 </pkgmetadata>
diff --git a/sci-libs/coinor-cbc/Manifest b/sci-libs/coinor-cbc/Manifest
index 8599e2ad1d62..4540587388ec 100644
--- a/sci-libs/coinor-cbc/Manifest
+++ b/sci-libs/coinor-cbc/Manifest
@@ -1,3 +1,3 @@
-DIST Cbc-2.8.9.tgz 8231882 BLAKE2B 1af837ae04fa129b605b00d91f80019d4d21148660fa64bd9ae8d7e928ba46508072d0f1e4ff70f30a0bb71f68b716b9d0cbc179900a9da3f58d5bf4fca545ba SHA512 ff537a46a8a266767817bc28d61f4541cfda6e8617c857fa0abef4c0b4ef8fbc728dd195645898d94130dfaedb258789bf55e189a0b9665590958355135f020e
-EBUILD coinor-cbc-2.8.9.ebuild 1818 BLAKE2B 02c82a02efd05dbf406555e762cdb29f0a1945f2edbdff2a4001a85c9bf68616b03831af0db0d06b135aec987af3634a2bbdc9f4c0d7c51727d0afaf6491cdda SHA512 cb028f3dfc609dd808d83de98063d16183e428a3da266dddec36b9db4e13c5d565f8bc2aa3b11c7c5bd41ea4b2f95528aaca3025c5ece4841ba283acdec31c04
-MISC metadata.xml 542 BLAKE2B 55fb8a6a4dc83e233b8e7cc04db618fd400649c253d08132b3aa6eabdbaa00248545948a0d2a15c33aa1587ede280db0a071e8d9f8a9cb08a8bbfd8f8bb185a7 SHA512 194a75891d6f076bf9771fdb55638db5dc0e94fbed8ea0bfaa8ca7b08634fe406635e58bf8773df9c6a54bbf85c0fe829ef8db675044dd899a1eed8020776bc1
+DIST coinor-cbc-2.10.5.tar.gz 1639188 BLAKE2B 92321f0fc0b6eedbb5ebd37cc44d7f10d91d272109474f5ec343e1648b2684dd5cf7002c05d0f72cada1636f9642503ac85165b23ba68caae906fdcad8bcd8f2 SHA512 114ee23ee6e53c337d17bc0930f62d4438e761115e0bf48a04b67732cd82f63dbcc51c3e5b8069bc99bd2e1197b5116ec0be0c2a0a897619c5b79bc1d1751a4e
+EBUILD coinor-cbc-2.10.5.ebuild 1952 BLAKE2B 064e6a4b51b8a39f43f08b2c0349406e6263bd0ac82b5b61a164acc7740170ba20c622872eb077786274ade0458526d9bab3611513edc76e1c0a6820d7ef1589 SHA512 a46b75ff49636db114761818138abb9f8f3b7a392334f1997d00a35c9f9d58a6f13f810699a54bb022578516a0892a6c2d9474fd51eee849f26828c21e1751f9
+MISC metadata.xml 633 BLAKE2B 618045082e1b54cdb063906459597ae42ce6621e9b0da855e7d3d80143fdebb3108b308d37fc7e34426c8baa7ec9cb6fca9349efc81f44af92c25e2e8508dddf SHA512 2abe15b65366a909ed8f2318dcf3feb1b3c7996b27fc1276e28cbe6c9c8853ada176002e13985d9741c6b3254e57c7be3eef85319d3fc91f9e699804ca7e38dc
diff --git a/sci-libs/coinor-cbc/coinor-cbc-2.10.5.ebuild b/sci-libs/coinor-cbc/coinor-cbc-2.10.5.ebuild
new file mode 100644
index 000000000000..694d822204fe
--- /dev/null
+++ b/sci-libs/coinor-cbc/coinor-cbc-2.10.5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Cbc
+
+DESCRIPTION="COIN-OR branch-and-cut mixed integer program solver"
+HOMEPAGE="https://github.com/coin-or/Cbc/"
+SRC_URI="https://github.com/coin-or/${MY_PN}/archive/releases/${PV}.tar.gz
+	-> ${P}.tar.gz"
+LICENSE="EPL-1.0"
+
+# major soname component
+SLOT="0/3"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples static-libs test"
+RESTRICT="!test? ( test )"
+
+# Fortran is NOT needed, but the ./configure scripts for all of the CoinOR
+# packages contain a check for it. Gentoo bug 601648 and upstream issue,
+#
+#   https://github.com/coin-or/CoinUtils/issues/132
+#
+BDEPEND="virtual/fortran
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	test? ( sci-libs/coinor-sample )"
+DEPEND="sci-libs/coinor-clp:=
+	sci-libs/coinor-cgl:=
+	sci-libs/coinor-dylp:=
+	sci-libs/coinor-osi:=
+	sci-libs/coinor-utils:=
+	sci-libs/coinor-vol:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}"
+
+src_prepare() {
+	# Needed to make the --with-coin-instdir in src_configure happy.
+	dodir /usr
+
+	# They don't need to guess at this, but they do, and get it wrong...
+	sed -e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
+		-i configure \
+		|| die "failed to fix the pkgconfig path in ${S}/configure"
+
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-dependency-linking
+		--with-coin-instdir="${ED}/usr"
+		$(use_with doc dot)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake all $(usex doc doxydoc "")
+}
+
+src_test() {
+	# NOT redundant! The build system has a "make check" target that does
+	# nothing, so if you don't specify "test" here, you'll get a no-op.
+	emake test
+}
+
+src_install() {
+	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
+
+	emake DESTDIR="${D}" install
+
+	# Duplicate junk, and in the wrong location.
+	rm -r "${ED}/usr/share/coin/doc/${MY_PN}" || die
+
+	use examples && dodoc -r examples
+}
diff --git a/sci-libs/coinor-cbc/coinor-cbc-2.8.9.ebuild b/sci-libs/coinor-cbc/coinor-cbc-2.8.9.ebuild
deleted file mode 100644
index 14beedc5d08e..000000000000
--- a/sci-libs/coinor-cbc/coinor-cbc-2.8.9.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib flag-o-matic
-
-MYPN=Cbc
-
-DESCRIPTION="COIN-OR Branch-and-Cut Mixed Integer Programming Solver"
-HOMEPAGE="https://projects.coin-or.org/Cbc/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="EPL-1.0"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-clp:=
-	sci-libs/coinor-cgl:=
-	sci-libs/coinor-dylp:=
-	sci-libs/coinor-osi:=
-	sci-libs/coinor-utils:=
-	sci-libs/coinor-vol:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	test? ( sci-libs/coinor-sample )"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-src_prepare() {
-	# needed for the --with-coin-instdir
-	dodir /usr
-	sed -i \
-		-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
-		configure || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-dependency-linking
-		--with-coin-instdir="${ED}"/usr
-		$(use_with doc dot)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	# hack for parallel build, to overcome not patching Makefile.am above
-	autotools-utils_src_compile -C src libCbc.la
-	autotools-utils_src_compile -C src libCbcSolver.la
-	autotools-utils_src_compile all $(usex doc doxydoc "")
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
-	# hack for parallel install, to overcome not patching Makefile.am above
-	autotools-utils_src_install -C src install-am
-	autotools-utils_src_install
-	# already installed
-	rm "${ED}"/usr/share/coin/doc/${MYPN}/{README,AUTHORS,LICENSE} || die
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/coinor-cbc/metadata.xml b/sci-libs/coinor-cbc/metadata.xml
index 4826a4e31bb4..24b280f305a5 100644
--- a/sci-libs/coinor-cbc/metadata.xml
+++ b/sci-libs/coinor-cbc/metadata.xml
@@ -6,9 +6,13 @@
     <name>Gentoo Science Project</name>
   </maintainer>
   <longdescription lang="en">
-  COIN-OR Branch-and-Cut is a Mixed integer linear programming
-  solver. It uses many of the COIN-OR components and is designed to be
-  used with COIN-OR CLP or COIN-OR Dylp. It is available as a library and as a
-  standalone solver.
-</longdescription>
+    COIN-OR Branch-and-Cut is a Mixed integer linear programming
+    solver. It uses many of the COIN-OR components and is designed to be
+    used with COIN-OR CLP or COIN-OR Dylp. It is available as a library and as a
+    standalone solver.
+  </longdescription>
+
+  <upstream>
+    <remote-id type="github">coin-or/Cbc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/coinor-cgl/Manifest b/sci-libs/coinor-cgl/Manifest
index 8c6837ecb6a9..155a783485ed 100644
--- a/sci-libs/coinor-cgl/Manifest
+++ b/sci-libs/coinor-cgl/Manifest
@@ -1,3 +1,3 @@
-DIST Cgl-0.58.6.tgz 5331274 BLAKE2B 6bd7218b7e87a700b74be322ab0b74dbab81590b0b77361d48247fc1d113db9ab9b878af987e22885ed3c2fde2e7d8641cd4e3977d5c4787fe1dcec3e2e3ef37 SHA512 28fe2e570cb2ebfa3109ca53e5ebb7dd3a38e2ddcfda4d7a9a1d78d4784abe1b6ab79734e6cbcee48e21791fe8353658df47d11253b04366ccb66c3e566db585
-EBUILD coinor-cgl-0.58.6.ebuild 1476 BLAKE2B 23341562e3ae4b551e4f65d00930b5da8aaa72d9efc1d01d39adac5a7404bb2fa009891c66bdcc2794da74ebcf2fc8a46dd58dfb84f5b930bc4f1f91b24024fe SHA512 65b25f3bc6a14c217f25a4994582ea0e06ae54a6d960f713f81f1c6f976e8a3dc0b2702704660c62964379cab6c2e6e99ee728d914f08bddfa9d3d4e6d704c31
-MISC metadata.xml 589 BLAKE2B 160f0447667b78356ac19e9df3f1909ec2b21abec109d785d62531e37de274e15c028a90338a6484241ae7b473c90cb76243dbc85755d6a3a966ca9203b2ddee SHA512 fa8229d1969d8076bd99381a22d70a73689eef2ac0d56235f0826491a89d5d4b8964339372c11bc586e08f99bab7c8e4e31ba016ec44f6f603b446ed768ca41f
+DIST coinor-cgl-0.60.3.tar.gz 1267590 BLAKE2B 54a215c98bc05c65d46b6c7a469e28f06d04372e257825122693f0953582c8f1be2ede91efccdd21635dc365671653f0321d314ac41d1da01b561c2173a42da4 SHA512 e34080b893cfe46f99ffee093235618679ed47b6bed9798ea2d0dc0678716d9b8d947a66f6a6b283fe41807eb323dfcb512ba39d8d73fda1efafad92c408be9d
+EBUILD coinor-cgl-0.60.3.ebuild 1911 BLAKE2B fbbf4703713e68a1093849df201015bbf75cc66e3fbb88cc945b761c2cdb876eefa364c8a1acce137bf5edb68aeeb29bca194146a3f1fb3ae7418e644a573450 SHA512 ce353fdaebc1e3f58d3fd021c6c4770732cff421720162a4fcc14c521826f9bb498388982f64e2d9e16b1c703759240c6131e2fdfbcedc74466199bcdf5da158
+MISC metadata.xml 687 BLAKE2B 1d88f6e1cd2d6ad15215bf93af32aa8cb5311237428086a52b37c82cd784589f4f2ee4ec6e8ec299767bb4baecddac280aea63cc44a6c429e9099385f9d48985 SHA512 dda7ba6fdb8137d11ba5a0fdcf17f698f3ac5e3c076fd810f176c3f0af39c0417447a1c256bcf109c27fe7dd60932984055747913a37dcf6d6717d8fac99b8db
diff --git a/sci-libs/coinor-cgl/coinor-cgl-0.58.6.ebuild b/sci-libs/coinor-cgl/coinor-cgl-0.58.6.ebuild
deleted file mode 100644
index 8b038be15c73..000000000000
--- a/sci-libs/coinor-cgl/coinor-cgl-0.58.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib
-
-MYPN=Cgl
-
-DESCRIPTION="COIN-OR cutting-plane generators library"
-HOMEPAGE="https://projects.coin-or.org/Cgl/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-clp:=
-	sci-libs/coinor-dylp:=
-	sci-libs/coinor-osi:=
-	sci-libs/coinor-utils:=
-	sci-libs/coinor-vol:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	test? ( sci-libs/coinor-sample )"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-src_prepare() {
-	# needed for the --with-coin-instdir
-	dodir /usr
-	sed -i \
-		-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
-		configure || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-dependency-linking
-		--with-coin-instdir="${ED}"/usr
-		$(use_with doc dot)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile all $(usex doc doxydoc "")
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
-	autotools-utils_src_install
-	# already installed
-	rm "${ED}"/usr/share/coin/doc/${MYPN}/{README,AUTHORS,LICENSE} || die
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/coinor-cgl/coinor-cgl-0.60.3.ebuild b/sci-libs/coinor-cgl/coinor-cgl-0.60.3.ebuild
new file mode 100644
index 000000000000..eba0819dcc2a
--- /dev/null
+++ b/sci-libs/coinor-cgl/coinor-cgl-0.60.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Cgl
+
+DESCRIPTION="COIN-OR cut-generation library"
+HOMEPAGE="https://projects.coin-or.org/Cgl/"
+SRC_URI="https://github.com/coin-or/${MY_PN}/archive/releases/${PV}.tar.gz
+	-> ${P}.tar.gz"
+LICENSE="EPL-1.0"
+
+# major soname component
+SLOT="0/1"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples static-libs test"
+RESTRICT="!test? ( test )"
+
+# Fortran is NOT needed, but the ./configure scripts for all of the CoinOR
+# packages contain a check for it. Gentoo bug 601648 and upstream issue,
+#
+#   https://github.com/coin-or/CoinUtils/issues/132
+#
+BDEPEND="virtual/fortran
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	test? ( sci-libs/coinor-sample )"
+
+DEPEND="sci-libs/coinor-clp:=
+	sci-libs/coinor-dylp:=
+	sci-libs/coinor-osi:=
+	sci-libs/coinor-utils:=
+	sci-libs/coinor-vol:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}"
+
+src_prepare() {
+	# Needed to make the --with-coin-instdir in src_configure happy.
+	dodir /usr
+
+	# They don't need to guess at this, but they do, and get it wrong...
+	sed -e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
+		-i configure \
+		|| die "failed to fix the pkgconfig path in ${S}/configure"
+
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-dependency-linking
+		--with-coin-instdir="${ED}/usr"
+		$(use_with doc dot)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake all $(usex doc doxydoc "")
+}
+
+src_test() {
+	# NOT redundant! The build system has a "make check" target that does
+	# nothing, so if you don't specify "test" here, you'll get a no-op.
+	emake test
+}
+
+src_install() {
+	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
+
+	emake DESTDIR="${D}" install
+
+	# Duplicate junk, and in the wrong location.
+	rm -r "${ED}/usr/share/coin/doc/${MY_PN}" || die
+
+	use examples && dodoc -r examples
+}
diff --git a/sci-libs/coinor-cgl/metadata.xml b/sci-libs/coinor-cgl/metadata.xml
index 33d5fc8331f3..d3478ff5d458 100644
--- a/sci-libs/coinor-cgl/metadata.xml
+++ b/sci-libs/coinor-cgl/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		The COIN-OR Cut Generation Library (Cgl) is an open collection of
-		cutting plane implementations ("cut generators") for use in teaching,
-		research, and applications. Cgl can be used with other COIN-OR
-		packages that make use of cuts, such as the mixed-integer linear
-		programming.
-	</longdescription>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    The COIN-OR Cut Generation Library (Cgl) is an open collection of
+    cutting plane implementations ("cut generators") for use in
+    teaching, research, and applications. Cgl can be used with other
+    COIN-OR packages that make use of cuts, such as the mixed-integer
+    linear programming.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">coin-or/Cgl</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/coinor-clp/Manifest b/sci-libs/coinor-clp/Manifest
index ad86adc04e73..26c6493171d2 100644
--- a/sci-libs/coinor-clp/Manifest
+++ b/sci-libs/coinor-clp/Manifest
@@ -1,5 +1,3 @@
-AUX coinor-clp-1.15.6-mpi-header.patch 323 BLAKE2B d187af841b0a328de78eac065dcd61f16b3f72534bd7defc55a4552d21b91669a485c3f4a159c0201b9ea6ad54c6a1930fc3b6dcebc1abd336f2d6661d7c5231 SHA512 1f18e00c1a303cffa0ec6244bf1f5dbac83f0a73d1c82f4bf7a4f4df3ce581012a47b044f1d61c140a282e2d262403e76be49892cccec41b191f02edc6fa63a3
-AUX coinor-clp-1.15.6-overflow.patch 349 BLAKE2B 97f501262285a9bcf6165fc13e13722a96c18a7709004b1331ec41397f11744f9ac54182e49cd746700e401de4b2e8e348aad8230e177211ab2413c286142085 SHA512 bc467ff47e0c963aa95c84c3321038327ce4bd99119ea7d66337a60aa329ad7ee8c774aa0405c6e089b081aba0c1e3be577661a7425519e8d56a9e7b05cbb01f
-DIST Clp-1.15.6.tgz 5644504 BLAKE2B 5d11d83f96d77a9a5ec7a65276699527757d7eb77f7e54d5199c26b27007ff49aca6bfc34c777aff62a4a82b876d318d9f49f14d8860fcc784b2733ab74465f9 SHA512 a0da0cc5dcdd409c67cb67dd0f126a3d96bf59851543e7e08adbdbf01012a25905b58ded66aac50b06462ee3a147bed912740c00681417f8c228992a917748db
-EBUILD coinor-clp-1.15.6-r1.ebuild 3029 BLAKE2B 4605453742b707a1e8b94ec16cf4eccd21aca0f7fe33c8e27194f075c556bd8da50a19e619cfc9b045c51c331afdd790bb61dd4790062dca98a8f06bf4e255e1 SHA512 580a1c3e60097e764e7b43ab7b247d61745047e23ba10dd8285cad2707642183d673563c990a9ba60e85f66bc5c8c3e763d3dc7f7d39a477cf4ee984cbca7f5c
-MISC metadata.xml 972 BLAKE2B e3116e8ba1a939f7b7b80e278d7e6d9a307b30a7684707a4f1364924e7c612ce87d0655029f0acc38f59ff40286ea48088355d78af3101e8b86ec03827a83d8e SHA512 45e693abd4af3cf838fb519b5fe9be04c1ebeca4b5494ba0f15b93768273b186d759e73670fef9adbeb3febe2773b33260b2d9e78cecd84a81c03ffe6d2028f3
+DIST coinor-clp-1.17.6.tar.gz 2158530 BLAKE2B b1bf6ecfdf3669ff4393e31c23d24f9160124dcd69df611c96feaa73acf796bc3a13a54542a5d0495e9a68789e762f5392bd7f23c0fee20c0699df2d0b084891 SHA512 8a799d87ba988a27e3ba526ded65425979b4364e374db4e943f41a523f3743efb88a9964eb575c058151e47f58be6ba0ac1b368177f0322850be3704be6f24d1
+EBUILD coinor-clp-1.17.6.ebuild 3799 BLAKE2B 56ce86a7c360da03022760aa1966fefcfce74b0e293f7fca912f91e1a9608c4d16b3596b60a6bf382ac53154389ca48edbb40a6d47744d0acd5bacf5da258885 SHA512 677c64320b62e1e11fb371faad35319073a750dbeb20d786620452f44a9ca14717ff7c8de0d123711de3fcc9ef52e0c7a0f89e728bdc78949fa744287300f677
+MISC metadata.xml 1118 BLAKE2B 04fd6128b056520e45ed7bfa076c756fe667a1251f3aad4568bdf587cf6209e845a3c5f1114e09e29729e7de238974452f13a2acf82692792e1ec2cee200c50d SHA512 1d15db43e8a887fb1c2130bd85cbcb8886f4153f0d157dca468b6d77cf1eed907473232a06fd41ca811743c6ee514ae61c356a8c7ac2795e43a40b2760fd6940
diff --git a/sci-libs/coinor-clp/coinor-clp-1.15.6-r1.ebuild b/sci-libs/coinor-clp/coinor-clp-1.15.6-r1.ebuild
deleted file mode 100644
index 77b81b3997d9..000000000000
--- a/sci-libs/coinor-clp/coinor-clp-1.15.6-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils eutils multilib toolchain-funcs
-
-MYPN=Clp
-
-DESCRIPTION="COIN-OR Linear Programming solver"
-HOMEPAGE="https://projects.coin-or.org/Clp/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="EPL-1.0"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples glpk metis mumps sparse static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-osi:=
-	sci-libs/coinor-utils:=
-	glpk? ( sci-mathematics/glpk:= sci-libs/amd )
-	metis? ( || ( sci-libs/metis sci-libs/parmetis ) )
-	mumps? ( sci-libs/mumps )
-	sparse? ( sci-libs/cholmod )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	test? ( sci-libs/coinor-sample )"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.15.6-mpi-header.patch
-	"${FILESDIR}"/${PN}-1.15.6-overflow.patch
-)
-
-src_prepare() {
-	# needed for the --with-coin-instdir
-	dodir /usr
-	if has_version sci-libs/mumps[-mpi]; then
-		ln -s "${EPREFIX}"/usr/include/mpiseq/mpi.h src/mpi.h
-	elif has_version sci-libs/mumps[mpi]; then
-		export CXX=mpicxx
-	fi
-	sed -i \
-		-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
-		configure || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-aboca
-		--enable-dependency-linking
-		--with-coin-instdir="${ED}"/usr
-		$(use_with doc dot)
-	)
-	if use glpk; then
-		myeconfargs+=(
-			--with-amd-incdir="${EPREFIX}"/usr/include
-			--with-amd-lib=-lamd
-			--with-glpk-incdir="${EPREFIX}"/usr/include
-			--with-glpk-lib=-lglpk )
-	else
-		myeconfargs+=( --without-glpk )
-	fi
-	if use sparse; then
-		myeconfargs+=(
-			--with-amd-incdir="${EPREFIX}"/usr/include
-			--with-amd-lib=-lamd
-			--with-cholmod-incdir="${EPREFIX}"/usr/include
-			--with-cholmod-lib=-lcholmod )
-	else
-		myeconfargs+=( --without-amd --without-cholmod )
-	fi
-	if use metis; then
-		myeconfargs+=(
-			--with-metis-incdir="$($(tc-getPKG_CONFIG) --cflags metis | sed s/-I//)"
-			--with-metis-lib="$($(tc-getPKG_CONFIG) --libs metis)" )
-	else
-		myeconfargs+=( --without-metis )
-	fi
-	if use mumps; then
-		myeconfargs+=(
-			--with-mumps-incdir="${EPREFIX}"/usr/include
-			--with-mumps-lib="-lmumps_common -ldmumps -lzmumps -lsmumps -lcmumps" )
-	else
-		myeconfargs+=( --without-mumps )
-	fi
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	# hack for parallel build, to overcome not patching Makefile.am above
-	#autotools-utils_src_compile -C src libClp.la
-	autotools-utils_src_compile all $(usex doc doxydoc "")
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
-	# hack for parallel install, to overcome not patching Makefile.am above
-	#autotools-utils_src_install -C src install-am
-	autotools-utils_src_install
-	# already installed
-	rm "${ED}"/usr/share/coin/doc/${MYPN}/{README,AUTHORS,LICENSE} || die
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild b/sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild
new file mode 100644
index 000000000000..7449be2ae9f2
--- /dev/null
+++ b/sci-libs/coinor-clp/coinor-clp-1.17.6.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PN=Clp
+
+DESCRIPTION="COIN-OR linear programming solver"
+HOMEPAGE="https://github.com/coin-or/Clp/"
+SRC_URI="https://github.com/coin-or/${MY_PN}/archive/releases/${PV}.tar.gz
+	-> ${P}.tar.gz"
+LICENSE="EPL-1.0"
+
+# major soname component
+SLOT="0/1"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples glpk metis mumps sparse static-libs test"
+RESTRICT="!test? ( test )"
+
+# Fortran is NOT needed, but the ./configure scripts for all of the CoinOR
+# packages contain a check for it. Gentoo bug 601648 and upstream issue,
+#
+#   https://github.com/coin-or/CoinUtils/issues/132
+#
+BDEPEND="virtual/fortran
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	test? ( sci-libs/coinor-sample )"
+
+# USE=mpi is disabled on sci-libs/mumps because mumps/scotch are in
+# total disarray, but in particular for bugs 670759 and 695962. There
+# used to be some conditional USE=mpi stuff in src_prepare() that will
+# need to be put back if you restore the ability to build against
+# mumps[mpi].
+DEPEND="sci-libs/coinor-osi:=
+	sci-libs/coinor-utils:=
+	glpk? ( sci-mathematics/glpk:= sci-libs/amd )
+	metis? ( || ( sci-libs/metis sci-libs/parmetis ) )
+	mumps? ( sci-libs/mumps[-mpi] )
+	sparse? ( sci-libs/cholmod )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}"
+
+src_prepare() {
+	# Needed to make the --with-coin-instdir in src_configure happy.
+	dodir /usr
+
+	# The file ClpCholeskyMumps.cpp does #include "mpi.h", and we
+	# need to point it to the right file. Our sci-libs/mumps ebuild
+	# is so ridiculous that I can't even tell if this is our fault
+	# or if it's something that should be reported upstream.
+	ln -s "${EPREFIX}"/usr/include/mpiseq/mpi.h src/mpi.h || die
+
+	# They don't need to guess at this, but they do, and get it wrong...
+	sed -e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
+		-i configure \
+		|| die "failed to fix the pkgconfig path in ${S}/configure"
+
+	default
+}
+
+src_configure() {
+	# The --enable-aboca flag is temporarily disabled, because the build
+	# is broken with it (see https://github.com/coin-or/Clp/issues/139).
+	# There's a fix, but I'm not going to bother with a patch for an
+	# an experimental feature.
+	local myeconfargs=(
+		--enable-dependency-linking
+		--with-coin-instdir="${ED}"/usr
+		$(use_with doc dot)
+	)
+	if use glpk; then
+		myeconfargs+=(
+			--with-amd-incdir="${EPREFIX}"/usr/include
+			--with-amd-lib=-lamd
+			--with-glpk-incdir="${EPREFIX}"/usr/include
+			--with-glpk-lib=-lglpk )
+	else
+		myeconfargs+=( --without-glpk )
+	fi
+	if use sparse; then
+		myeconfargs+=(
+			--with-amd-incdir="${EPREFIX}"/usr/include
+			--with-amd-lib=-lamd
+			--with-cholmod-incdir="${EPREFIX}"/usr/include
+			--with-cholmod-lib=-lcholmod )
+	else
+		myeconfargs+=( --without-amd --without-cholmod )
+	fi
+	if use metis; then
+		myeconfargs+=(
+			--with-metis-incdir="$($(tc-getPKG_CONFIG) --cflags metis | sed s/-I//)"
+			--with-metis-lib="$($(tc-getPKG_CONFIG) --libs metis)" )
+	else
+		myeconfargs+=( --without-metis )
+	fi
+	if use mumps; then
+		myeconfargs+=(
+			--with-mumps-incdir="${EPREFIX}"/usr/include
+			--with-mumps-lib="-lmumps_common -ldmumps -lzmumps -lsmumps -lcmumps -lmpiseq" )
+	else
+		myeconfargs+=( --without-mumps )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake all $(usex doc doxydoc "")
+}
+
+src_test() {
+	# NOT redundant! The build system has a "make check" target that does
+	# nothing, so if you don't specify "test" here, you'll get a no-op.
+	emake test
+}
+
+src_install() {
+	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
+
+	emake DESTDIR="${D}" install
+
+	# Duplicate junk, and in the wrong location.
+	rm -r "${ED}/usr/share/coin/doc/${MY_PN}" || die
+
+	use examples && dodoc -r examples
+}
diff --git a/sci-libs/coinor-clp/files/coinor-clp-1.15.6-mpi-header.patch b/sci-libs/coinor-clp/files/coinor-clp-1.15.6-mpi-header.patch
deleted file mode 100644
index 7ad03e8c76c4..000000000000
--- a/sci-libs/coinor-clp/files/coinor-clp-1.15.6-mpi-header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/ClpCholeskyMumps.cpp.orig	2013-06-19 09:58:02.834485943 -0700
-+++ src/ClpCholeskyMumps.cpp	2013-06-19 09:57:39.013355095 -0700
-@@ -14,8 +14,8 @@
- #define USE_COMM_WORLD -987654
- extern "C" {
- #include "dmumps_c.h"
--#include "mpi.h"
- }
-+#include "mpi.h"
- 
- #include "ClpCholeskyMumps.hpp"
- #include "ClpMessage.hpp"
diff --git a/sci-libs/coinor-clp/files/coinor-clp-1.15.6-overflow.patch b/sci-libs/coinor-clp/files/coinor-clp-1.15.6-overflow.patch
deleted file mode 100644
index cded22bf384c..000000000000
--- a/sci-libs/coinor-clp/files/coinor-clp-1.15.6-overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ClpPdco.cpp.orig	2014-01-14 11:44:22.717643715 -0800
-+++ src/ClpPdco.cpp	2014-01-14 11:43:12.543202133 -0800
-@@ -316,7 +316,7 @@
-      //bool useChol = (LSmethod == 1);
-      //bool useQR   = (LSmethod == 2);
-      bool direct  = (LSmethod <= 2 && ifexplicit);
--     char solver[6];
-+     char solver[7];
-      strcpy(solver, "  LSQR");
- 
- 
diff --git a/sci-libs/coinor-clp/metadata.xml b/sci-libs/coinor-clp/metadata.xml
index 49d8540dde00..00d23848636c 100644
--- a/sci-libs/coinor-clp/metadata.xml
+++ b/sci-libs/coinor-clp/metadata.xml
@@ -1,23 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>sci@gentoo.org</email>
-  <name>Gentoo Science Project</name>
-</maintainer>
-<longdescription lang="en">
-  Clp (Coin-or linear programming) is an open-source linear
-  programming solver written in C++. It is primarily meant to be used
-  as a callable library, but a basic, stand-alone executable version
-  is also available. It is designed to find solutions of constrained
-  linear mathematical optimization problems.
-</longdescription>
-<use>
-  <flag name="glpk">Enable GNU Linear Programming Kit
-  <pkg>sci-mathematics/glpk</pkg> support</flag>
-  <flag name="metis">Enable partitioning with
-  <pkg>sci-libs/metis</pkg></flag>
-  <flag name="mumps">Enable <pkg>sci-libs/mumps</pkg> support</flag>
-  <flag name="sparse">Enable support for sparse matrix with <pkg>sci-libs/cholmod</pkg></flag>
-</use>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Clp (Coin-OR linear programming) is an open-source linear
+    programming solver written in C++. It is primarily meant to be
+    used as a callable library, but a basic, stand-alone executable
+    version is also available. It is designed to find solutions of
+    constrained linear mathematical optimization problems.
+  </longdescription>
+  <use>
+    <flag name="glpk">
+      Enable GNU Linear Programming Kit
+      <pkg>sci-mathematics/glpk</pkg> support
+    </flag>
+    <flag name="metis">Enable partitioning with
+    <pkg>sci-libs/metis</pkg></flag>
+    <flag name="mumps">Enable <pkg>sci-libs/mumps</pkg> support</flag>
+    <flag name="sparse">
+      Enable support for sparse matrix with <pkg>sci-libs/cholmod</pkg>
+    </flag>
+  </use>
+    <upstream>
+    <remote-id type="github">coin-or/Clp</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/coinor-dylp/Manifest b/sci-libs/coinor-dylp/Manifest
index f9ae9d86017e..056e311a3127 100644
--- a/sci-libs/coinor-dylp/Manifest
+++ b/sci-libs/coinor-dylp/Manifest
@@ -1,3 +1,3 @@
-DIST DyLP-1.9.4.tgz 5049865 BLAKE2B 4e7ea46973845959bb4d0b0f24c380b10ec8245bd690a3fadf2fe14d136187a828e898e78afc5625543eec27a7af23d0a3def433259e61fb13d337ac4f4ccd93 SHA512 1dcad555f40b88aafaef0ca712731f3d4787900cefd2125eea9171d5dfdbea1888fd08b6767f50dcb915a0e2ad4e3430ed67d68026015b15af9032ed9231a069
-EBUILD coinor-dylp-1.9.4.ebuild 1402 BLAKE2B 1acdd084eb6c79347db0773ec15cad77e72363cc2ac08278b43a9d97e52cce27aa9a556a6e890d83fd1d10a6d497a05cd16c543971f75f9f75d3fcac428eba63 SHA512 dd9a925846010a5fb58df9497efedde8b6bb383d11783c103c8dcf4348a8a7fa8a2e7d1b17a8730516230a577dc0674f3db300c536fa7fe2d636127f293a1f6b
-MISC metadata.xml 621 BLAKE2B ab7383a1b4706a739b8095227d69c9d29bfadfa1451c5e996e482cb4928119d72b4b94097d918fad28d6a4c41905f7f9e9560110875fc7033a11d37339ce33c5 SHA512 6b577cfbd41c6107609ac4939409f4c0360948b3cd63ea29a87f51706673f2493bfd9e98dd23eebc3d90f314fff666c9ce3359fc43c59bffa82c18b791218e3c
+DIST coinor-dylp-1.10.4.tar.gz 2820973 BLAKE2B 29f74c314940e32b0e1c9c9bf6b9fc0515eeb98674d88e914445efaec2f97c92ff6e9de7d9b55f2427a1cf3d92fddb976915fbdc1ddd1df9fd0985e5b078ed2d SHA512 2fe3298007568cc9ed7626e72e7ed5c45611fb15120db06cdefd21e02b34a2c11a498b360489df1f00e8a897023419688e43dbb77edb690350b3ee2d4cd2781c
+EBUILD coinor-dylp-1.10.4.ebuild 1831 BLAKE2B 3e98611460bd593a5106fbc8b82046b6cb0b7a9a8a7b1a3d473958ec98a16f9791ed55b556ed805b4370c06b4023cd2419c2c6ba1057b4bfda9a12fe9fb9bcd7 SHA512 6221899f85c14622d11af1afb5d29fe583d39dde76edec96dcf9a717253a07ae70e176650f0e185835537744cb31ade525aa2805c4a6971848561537057770dc
+MISC metadata.xml 721 BLAKE2B b0973529c5d9e37c60104f7bf07e180989c2056519123f360f5d56f90151ec6422ed3817827b358f0dbd3c9ae33061781244c50251dd32799e47d1ccf4d69643 SHA512 3e78f356b87e72c5d92660ce283846dd83ef4fe28439d6076b2eebf9182efdaefeb04794578f7ececd14442dffa1e1250ea2da253feda07a1e7105990f980aa2
diff --git a/sci-libs/coinor-dylp/coinor-dylp-1.10.4.ebuild b/sci-libs/coinor-dylp/coinor-dylp-1.10.4.ebuild
new file mode 100644
index 000000000000..b36ea7976c84
--- /dev/null
+++ b/sci-libs/coinor-dylp/coinor-dylp-1.10.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=DyLP
+
+DESCRIPTION="COIN-OR dynamic simplex linear program solver"
+HOMEPAGE="https://github.com/coin-or/DyLP/"
+SRC_URI="https://github.com/coin-or/${MY_PN}/archive/releases/${PV}.tar.gz
+	-> ${P}.tar.gz"
+LICENSE="EPL-1.0"
+
+# major soname component
+SLOT="0/1"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples static-libs test"
+RESTRICT="!test? ( test )"
+
+# Fortran is NOT needed, but the ./configure scripts for all of the CoinOR
+# packages contain a check for it. Gentoo bug 601648 and upstream issue,
+#
+#   https://github.com/coin-or/CoinUtils/issues/132
+#
+BDEPEND="virtual/fortran
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	test? ( sci-libs/coinor-sample )"
+
+DEPEND="sci-libs/coinor-osi:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}"
+
+src_prepare() {
+	# Needed to make the --with-coin-instdir in src_configure happy.
+	dodir /usr
+
+	# They don't need to guess at this, but they do, and get it wrong...
+	sed -e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
+		-i configure \
+		|| die "failed to fix the pkgconfig path in ${S}/configure"
+
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-dependency-linking
+		--with-coin-instdir="${ED}"/usr
+		$(use_with doc dot)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake all $(usex doc doxydoc "")
+}
+
+src_test() {
+	# NOT redundant! The build system has a "make check" target that does
+	# nothing, so if you don't specify "test" here, you'll get a no-op.
+	emake test
+}
+
+src_install() {
+	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
+
+	emake DESTDIR="${D}" install
+
+	# Duplicate junk, and in the wrong location.
+	rm -r "${ED}/usr/share/coin/doc/${MY_PN}" || die
+
+	use examples && dodoc -r examples
+}
diff --git a/sci-libs/coinor-dylp/coinor-dylp-1.9.4.ebuild b/sci-libs/coinor-dylp/coinor-dylp-1.9.4.ebuild
deleted file mode 100644
index 6432f3ab4b26..000000000000
--- a/sci-libs/coinor-dylp/coinor-dylp-1.9.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib
-
-MYPN=DyLP
-
-DESCRIPTION="COIN-OR using the dynamic simplex linear programming solver"
-HOMEPAGE="https://projects.coin-or.org/DyLP/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="EPL-1.0"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sci-libs/coinor-osi:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	test? ( sci-libs/coinor-sample )"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-src_prepare() {
-	# needed for the --with-coin-instdir
-	dodir /usr
-	sed -i \
-		-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
-		configure || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-dependency-linking
-		--with-coin-instdir="${ED}"/usr
-		$(use_with doc dot)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile all $(usex doc doxydoc "")
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
-	autotools-utils_src_install
-	# already installed
-	rm "${ED}"/usr/share/coin/doc/${MYPN}/{README,AUTHORS,LICENSE} || die
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/coinor-dylp/metadata.xml b/sci-libs/coinor-dylp/metadata.xml
index 5faa1834a148..0766bb7d9751 100644
--- a/sci-libs/coinor-dylp/metadata.xml
+++ b/sci-libs/coinor-dylp/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		DyLp is designed to find solutions of constrained linear mathematical
-		optimization problems. To this end, it is using a full implementation
-		of the so called dynamic simplex algorithm for linear programming.
-		DyLP is part of the larger COIN-OR initiative (Computational
-		Infrastructure for Operations Research).
-	</longdescription>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    DyLP is designed to find solutions of constrained linear
+    mathematical optimization problems. To this end, it is using a
+    full implementation of the so called dynamic simplex algorithm for
+    linear programming.  DyLP is part of the larger COIN-OR initiative
+    (Computational Infrastructure for Operations Research).
+  </longdescription>
+  <upstream>
+    <remote-id type="github">coin-or/DyLP</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/coinor-osi/Manifest b/sci-libs/coinor-osi/Manifest
index 0248e5bbf9d5..abbbfe17ffd0 100644
--- a/sci-libs/coinor-osi/Manifest
+++ b/sci-libs/coinor-osi/Manifest
@@ -1,3 +1,3 @@
-DIST Osi-0.106.6.tgz 7490371 BLAKE2B 76579c536eb5ffe6b7a79e4e28ee438bf06cdae45f7934435a7174df7bfe4d2a03b2ea79454b4f15df893f968dad34cda6c66503b853842d9c7815702fd9d048 SHA512 25d2dd1791b73329fa9bc32f7b4a4f3d0600ce600868bd14d902dd0ea1c6f5a2eca4bff01ac65ea2843e725fd5c218fca6def9d6974e6af9692c47973b6202ef
-EBUILD coinor-osi-0.106.6.ebuild 1570 BLAKE2B 51b604620d8a55ce82e93fc027351b34e93fc9528baf0841903da4db90f274e8c231d07a1a8b87255e5a74de5eb5db4fba7c53684822eaf55470f08a40d52d5e SHA512 0461c77adaaf42e1241d56264f733f2ae4f7225676d049491189fbe56561eae64345fe666efa1a336689644e632631573250c954829168fbbc29ef62c42a44e5
-MISC metadata.xml 664 BLAKE2B 6c8ca87a619e6c895f1f494ab017645d964f88489f8d0c6e7ff05e547542b7c9bfec7ebacf5a4b1f9ca282fcd2a59aa4e70baf183d38e84cc06258098dc49d23 SHA512 ce3559d0d784f081f901b655c6c9b9005ebc8975838402a2e62c5c3f0874ba5a94b942023fa023850aa41a9c45e82932bd59af74fc6235c4366f16bd9a364626
+DIST coinor-osi-0.108.6.tar.gz 1015556 BLAKE2B b22e2afb3de728275c10163897deab7889be42bb595bc5c3a5f1163caca6da2ec454ce9c96378420bbfea272465b43d92c405a990351b05dc848dbd50dbbef5a SHA512 757a404487a58a99eaf778a08898befd3431d0a6b64e46c429d3bb83d57c99bd396736dda3a75a1f1c05d3e397925041b386280deef6e23fa1ba5277b81f1d8d
+EBUILD coinor-osi-0.108.6.ebuild 2112 BLAKE2B 408cefeb718746b5f16654ce7eb9aa259b10a7f3886865c386bae5797339b8bc17ec4a8ba6d556a81e240be499085e186561f31f647ee14555b6379e6b2bf7f1 SHA512 d268382e4ce08ceab7a88f81b8463489b7198a212d9729177d54defbcd359a2b3b988d75bf7642e591a0d659a76af9e1ad020320d616d0e7aa9883ccc2f62e31
+MISC metadata.xml 648 BLAKE2B 14e6b4ce99e8b331c45c4f37c05515171039b188602b9fb3971f4531b57ffa118c616e45c42b9add91a6b6e6695ccd2844cc242387b2a66070a2494808a39827 SHA512 a323cbe619c38019c3b5c66aa00bf9ac25fc607c944debbe03defe3ad6899cac1f00b3b1c57fad83f323c56cd52ca6b78c10ffaa65751a339d77f8e94b3a42f2
diff --git a/sci-libs/coinor-osi/coinor-osi-0.106.6.ebuild b/sci-libs/coinor-osi/coinor-osi-0.106.6.ebuild
deleted file mode 100644
index d7d293c7f43f..000000000000
--- a/sci-libs/coinor-osi/coinor-osi-0.106.6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib
-
-MYPN=Osi
-
-DESCRIPTION="COIN-OR Open Solver Interface"
-HOMEPAGE="https://projects.coin-or.org/Osi/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="EPL-1.0"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples glpk static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-utils:=
-	glpk? ( sci-mathematics/glpk:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	test? ( sci-libs/coinor-sample )"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-src_prepare() {
-	# needed for the --with-coin-instdir
-	dodir /usr
-	sed -i \
-		-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
-		configure || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-dependency-linking
-		--with-coin-instdir="${ED}"/usr
-		$(use_with doc dot)
-	)
-	if use glpk; then
-		myeconfargs+=(
-			--with-glpk-incdir="${EPREFIX}"/usr/include
-			--with-glpk-lib=-lglpk
-		)
-	else
-		myeconfargs+=( --without-glpk )
-	fi
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile all $(usex doc doxydoc "")
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
-	autotools-utils_src_install
-	# already installed
-	rm "${ED}"/usr/share/coin/doc/${MYPN}/{README,AUTHORS,LICENSE} || die
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/coinor-osi/coinor-osi-0.108.6.ebuild b/sci-libs/coinor-osi/coinor-osi-0.108.6.ebuild
new file mode 100644
index 000000000000..8b9cf0f637fc
--- /dev/null
+++ b/sci-libs/coinor-osi/coinor-osi-0.108.6.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Osi
+
+DESCRIPTION="COIN-OR Open Solver Interface"
+HOMEPAGE="https://github.com/coin-or/Osi/"
+SRC_URI="https://github.com/coin-or/${MY_PN}/archive/releases/${PV}.tar.gz
+	-> ${P}.tar.gz"
+LICENSE="EPL-1.0"
+
+# major soname component
+SLOT="0/1"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+# No USE=glpk because upstream only supports an ancient version of it. The
+# following issues were all closed by... documenting that it doesn't work:
+#
+#   * https://github.com/coin-or/Osi/issues/71
+#   * https://github.com/coin-or/Osi/issues/107
+#   * https://github.com/coin-or/Osi/issues/118
+#
+IUSE="doc examples static-libs test"
+RESTRICT="!test? ( test )"
+
+# Fortran is NOT needed, but the ./configure scripts for all of the CoinOR
+# packages contain a check for it. Gentoo bug 601648 and upstream issue,
+#
+#   https://github.com/coin-or/CoinUtils/issues/132
+#
+BDEPEND="virtual/fortran
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	test? ( sci-libs/coinor-sample )"
+DEPEND="sci-libs/coinor-utils:="
+REPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}"
+
+src_prepare() {
+	# Needed to make the --with-coin-instdir in src_configure happy.
+	dodir /usr
+
+	# They don't need to guess at this, but they do, and get it wrong...
+	sed -e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
+		-i configure \
+		|| die "failed to fix the pkgconfig path in ${S}/configure"
+
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-dependency-linking
+		--with-coin-instdir="${ED}"/usr
+		$(use_with doc dot)
+	)
+
+	econf "${myeconfargs[@]}"
+
+}
+
+src_compile() {
+	emake all $(usex doc doxydoc "")
+}
+
+src_test() {
+	# NOT redundant! The build system has a "make check" target that does
+	# nothing, so if you don't specify "test" here, you'll get a no-op.
+	emake test
+}
+
+src_install() {
+	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
+
+	emake DESTDIR="${D}" install
+
+	# Duplicate junk, and in the wrong location.
+	rm -r "${ED}/usr/share/coin/doc/${MY_PN}" || die
+
+	use examples && dodoc -r examples
+}
diff --git a/sci-libs/coinor-osi/metadata.xml b/sci-libs/coinor-osi/metadata.xml
index 17b9b82ecf17..af6af3b5df7c 100644
--- a/sci-libs/coinor-osi/metadata.xml
+++ b/sci-libs/coinor-osi/metadata.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>sci@gentoo.org</email>
-  <name>Gentoo Science Project</name>
-</maintainer>
-<longdescription lang="en">
-  The COIN-OR Open Solver Interface is a uniform API for interacting with
-  callable solver libraries. It supports linear programming solvers as
-  well as the ability to "finish off" a mixed-integer problem calling the
-  solver library's MIP solver.
-</longdescription>
-<use>
-  <flag name="glpk">Enable GNU Linear Programming Kit
-  <pkg>sci-mathematics/glpk</pkg> support</flag>
-</use>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    The COIN-OR Open Solver Interface is a uniform API for interacting
+    with callable solver libraries. It supports linear programming
+    solvers as well as the ability to "finish off" a mixed-integer
+    problem calling the solver library's MIP solver.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">coin-or/Osi</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/coinor-sample/Manifest b/sci-libs/coinor-sample/Manifest
index 43e97b3d9293..6a5a39f4cde5 100644
--- a/sci-libs/coinor-sample/Manifest
+++ b/sci-libs/coinor-sample/Manifest
@@ -1,3 +1,3 @@
-DIST Sample-1.2.9.tgz 367317 BLAKE2B e9d59e56fbead592c371cbbfed5d44b4981c6e738303a86d524b35bbb2820ec082960913f95215636534d11f7db20840249ca5b737eebdbd10c84a1e9e0722b3 SHA512 92af8ad524b8e7efb07a0064591fc8bfeea4235541d7a5f09f05bc33f759668378a49b459e72424ff33e775ab210c5a1ac139f4ff21bb0c9ec63656f4539d8df
-EBUILD coinor-sample-1.2.9.ebuild 431 BLAKE2B 614fc57576bf4eae6b81914712f090f5f2f3af108d1839e8ccac1e985528553334ace77a43725b37a919f4880aa202f4e9bb1f815661afbe78ebb3487b20a6b3 SHA512 0db57efdece103d7f7bcf1063c7b4a937c489307e25360e8bf67145f6b24b249a7adccba6aac568de7959da6eb83ae6d47102d5297ac3f45f6897623347adab6
-MISC metadata.xml 400 BLAKE2B 5f5f30f5bf227faa15e0109611d295d5dbee129f6f7b99b143f9a6e19b34a35846d800f6e17e366fe2c1d80dedb96858c5257e29c0383d761f866df53c76398f SHA512 21c90fd9dc731b47f2110e7add3507ccfc0c94bcee83081a589402d1d1bfe0b61bba22f0ef74de7b2251782e57df7027c3f6b87ecd89a1ff3aa58aefe082c675
+DIST coinor-sample-1.2.12.tar.gz 366746 BLAKE2B 2779320ae3b58acd9018f8e7129c334b0f9dc90ba836877e34704c467a863bea1d6eef1dd239bf8e2a7e7f71039bdedcb563aa4d3540df851ab23ad11829a541 SHA512 a15989da64ab9ebb32ae24ff7e999c03961b8688ff57b316956171a7d9145ddf723abc6d78c83879de6b018b92a4d1ab748f2dd7e2ed54b194d80ec460916ced
+EBUILD coinor-sample-1.2.12.ebuild 444 BLAKE2B d6ab164aa0b8d99ad4c7d9a2ddc5fc55195c185f91dc0c9ab6d0f6d59c6abd8556a780922580993c741535956dc6c9b4ebaa083e7d121441ba7f2f36394986a4 SHA512 9f5deac4684d03a4253f1eedd8ff6938b2d70633436c27d0688920e313eba2079d934c71075c80d8ced312387e3f04dc04db27a717bf9cfbdb7740fb3739185e
+MISC metadata.xml 585 BLAKE2B 0a38d0b81fde5b7ae487e0875724f6a03d7130530e6486146cd917666391dd60ee81da065edd4f5a25d505df458a9b7dc0181826537aea9e59973d1962cbe6b3 SHA512 4b121033d132af7c034681455abbdf8dd618c8cabe605139f5b741ff5b5552e2a92d60aece253ab7a93263fb7bd09c76960bcaefa1a5689bb739474d8272ea37
diff --git a/sci-libs/coinor-sample/coinor-sample-1.2.12.ebuild b/sci-libs/coinor-sample/coinor-sample-1.2.12.ebuild
new file mode 100644
index 000000000000..58c9923f0977
--- /dev/null
+++ b/sci-libs/coinor-sample/coinor-sample-1.2.12.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Data-Sample
+
+DESCRIPTION="COIN-OR Sample models"
+HOMEPAGE="https://github.com/coin-or-tools/Data-Sample/"
+SRC_URI="https://github.com/coin-or-tools/${MY_PN}/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-releases-${PV}"
diff --git a/sci-libs/coinor-sample/coinor-sample-1.2.9.ebuild b/sci-libs/coinor-sample/coinor-sample-1.2.9.ebuild
deleted file mode 100644
index 36c4c827e72c..000000000000
--- a/sci-libs/coinor-sample/coinor-sample-1.2.9.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-MYPN=Sample
-
-DESCRIPTION="COIN-OR Sample models"
-HOMEPAGE="https://projects.coin-or.org/svn/Data/Sample"
-SRC_URI="http://www.coin-or.org/download/source/Data/${MYPN}-${PV}.tgz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}/${MYPN}-${PV}"
diff --git a/sci-libs/coinor-sample/metadata.xml b/sci-libs/coinor-sample/metadata.xml
index a12f5c3b51e0..0c216ec09f0e 100644
--- a/sci-libs/coinor-sample/metadata.xml
+++ b/sci-libs/coinor-sample/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		The COmputational INfrastructure for Operations Research (COIN-OR)
-		sample models for testing.
-	</longdescription>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    The COmputational INfrastructure for Operations Research (COIN-OR)
+    sample models. These datasets are required to run the test suites
+    of most COIN-OR packages in Gentoo.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">coin-or-tools/Data-Sample</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/coinor-utils/Manifest b/sci-libs/coinor-utils/Manifest
index 717c88951fa4..797078c92536 100644
--- a/sci-libs/coinor-utils/Manifest
+++ b/sci-libs/coinor-utils/Manifest
@@ -1,3 +1,3 @@
-DIST CoinUtils-2.9.11.tgz 1740411 BLAKE2B 7adce4e17d31f8187c7959140f7cb5c537d6454b2e82c9cede7625bcff2b490e50dea190838f598b5fcc55a42ec2beea3982b14dc7bc8432e86ab82475462bc1 SHA512 3cbbce47cda4d5f63338644853601bf0a3dd9b9388e71a7aea7fedd51dfc007134359e5f12f24d8f6135d86b77a88a95bcb88249b1ba880eb3cd9cf41d039424
-EBUILD coinor-utils-2.9.11.ebuild 1940 BLAKE2B 5753a0e83714cbb4aed642f837a5ff00faf21b350efcf241c236157536a60465923695efa88b3868b663edaf3b14449c11ff4ca96e40942c6fe71cd8607c39cf SHA512 3385727a0a1b848f3edbf80f16b7314a5ddbd63a57eecb864636c92ab33f42379e06d595ae87d9e2c4f1fd37bc3f3aaf96fe4db079adb41dcef016252f70a20b
-MISC metadata.xml 653 BLAKE2B 937ed215f67bdd1d369d467af0f15ae05c8eb78726434509fc1fa2c2e777eb269eae21d09dda6ddcde589c3496e5f187a053dba7648a11efea9934940ff99bff SHA512 73fed876146a5d2aea6d7fd5bfb99d938f316cb92022e299c01e04aad218cb75b2745c8e064b9218a96c9b9f9c9e9efb089d38ba930677ce18b71f27667bd0c9
+DIST coinor-utils-2.11.4.tar.gz 1225148 BLAKE2B d55f9b3efbb3ce1c04fb9193ec70f62d8f130cd2f7ddf033c0df35f37006c542bd39e345662c271b4466b00c4bb1ec3cc14965bfe35f5b89370071d675113f4d SHA512 a7ac337b0f0bb11d578c44fd12d292ba8e77568362eaaaecbed8f4bc22ed85aaee911e2dd3153a2197b0165df082821969336d73fe1c5f0374a4636755d9a4ad
+EBUILD coinor-utils-2.11.4.ebuild 2468 BLAKE2B 20370781d360e6177492a20cc8f7cbb969855ce896ea219509f707e4bf47b7dd15e0f71bab6f748477fd5e96945123f3f4fb6f59417e6b1a6add85496854c3d1 SHA512 f8994e6f9d5f27fd084ebf62e6ba7f7904bd1fc03b4a74ca154a052ba18a9de1bf2440279fe0f67f8730d9824c854bf7b02e2067f8f4634f709593f7bc90f0f4
+MISC metadata.xml 765 BLAKE2B 874bf50ec76340996854eab79228aff15fa384d553c392384ff9ef6b04ef7eadd7f955e28b227dbc57ff80d2c4f3baf6172828e5c4d679ccdcc3848e71cd9f3b SHA512 e240fae1af1946c99dc5dd2574f9106c6d9cee1d2b29f0fb8b905a532c37a42e0c39a4b07df1d16f4ad321bd5c404c6d4bb4221f0b609529b5b3ceff6021ed03
diff --git a/sci-libs/coinor-utils/coinor-utils-2.11.4.ebuild b/sci-libs/coinor-utils/coinor-utils-2.11.4.ebuild
new file mode 100644
index 000000000000..d969f9d022ed
--- /dev/null
+++ b/sci-libs/coinor-utils/coinor-utils-2.11.4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PN=CoinUtils
+
+DESCRIPTION="COIN-OR Matrix, Vector and other utility classes"
+HOMEPAGE="https://github.com/coin-or/CoinUtils/"
+SRC_URI="https://github.com/coin-or/${MY_PN}/archive/releases/${PV}.tar.gz
+	-> ${P}.tar.gz"
+LICENSE="EPL-1.0"
+
+# major soname component
+SLOT="0/3"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 doc glpk blas lapack static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+# Fortran is NOT needed, but the ./configure scripts for all of the CoinOR
+# packages contain a check for it. Gentoo bug 601648 and upstream issue,
+#
+#   https://github.com/coin-or/CoinUtils/issues/132
+#
+BDEPEND="virtual/fortran
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	test? ( sci-libs/coinor-sample )"
+DEPEND="sys-libs/readline:0=
+	blas? ( virtual/blas )
+	bzip2? ( app-arch/bzip2 )
+	glpk? ( sci-mathematics/glpk:= )
+	lapack? ( virtual/lapack )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}"
+
+src_prepare() {
+	# Needed to make the --with-coin-instdir in src_configure happy.
+	dodir /usr
+
+	# They don't need to guess at this, but they do, and get it wrong...
+	sed -e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
+		-i configure \
+		|| die "failed to fix the pkgconfig path in ${S}/configure"
+
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-dependency-linking
+		--with-coin-instdir="${ED}/usr"
+		$(use_enable zlib)
+		$(use_enable bzip2 bzlib)
+		$(use_with doc dot)
+	)
+	if use blas; then
+		myeconfargs+=( --with-blas-lib="$($(tc-getPKG_CONFIG) --libs blas)" )
+	else
+		myeconfargs+=( --without-blas )
+	fi
+	if use glpk; then
+		myeconfargs+=(
+			--with-glpk-incdir="${EPREFIX}"/usr/include
+			--with-glpk-lib=-lglpk
+		)
+	else
+		myeconfargs+=( --without-glpk )
+	fi
+	if use lapack; then
+		myeconfargs+=( --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" )
+	else
+		myeconfargs+=( --without-lapack )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake all $(usex doc doxydoc "")
+}
+
+src_test() {
+	# NOT redundant! The build system has a "make check" target that does
+	# nothing, so if you don't specify "test" here, you'll get a no-op.
+	emake test
+}
+
+src_install() {
+	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
+
+	emake DESTDIR="${D}" install
+
+	# Duplicate junk, and in the wrong location.
+	rm -r "${ED}/usr/share/coin/doc/${MY_PN}" || die
+}
diff --git a/sci-libs/coinor-utils/coinor-utils-2.9.11.ebuild b/sci-libs/coinor-utils/coinor-utils-2.9.11.ebuild
deleted file mode 100644
index 29e79cb5bf8a..000000000000
--- a/sci-libs/coinor-utils/coinor-utils-2.9.11.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib toolchain-funcs
-
-MYPN=CoinUtils
-
-DESCRIPTION="COIN-OR Matrix, Vector and other utility classes"
-HOMEPAGE="https://projects.coin-or.org/CoinUtils/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="EPL-1.0"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 doc glpk blas lapack static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/readline:0=
-	bzip2? ( app-arch/bzip2 )
-	blas? ( virtual/blas )
-	glpk? ( sci-mathematics/glpk:= )
-	lapack? ( virtual/lapack )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	test? ( sci-libs/coinor-sample )"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-src_prepare() {
-	dodir /usr
-	sed \
-		-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
-		-i configure || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-dependency-linking
-		--with-coin-instdir="${ED}"/usr
-		$(use_enable zlib)
-		$(use_enable bzip2 bzlib)
-		$(use_with doc dot)
-	)
-	if use blas; then
-		myeconfargs+=( --with-blas-lib="$($(tc-getPKG_CONFIG) --libs blas)" )
-	else
-		myeconfargs+=( --without-blas )
-	fi
-	if use glpk; then
-		myeconfargs+=(
-			--with-glpk-incdir="${EPREFIX}"/usr/include
-			--with-glpk-lib=-lglpk
-		)
-	else
-		myeconfargs+=( --without-glpk )
-	fi
-	if use lapack; then
-		myeconfargs+=( --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" )
-	else
-		myeconfargs+=( --without-lapack )
-	fi
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile all $(usex doc doxydoc "")
-}
-
-psrc_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
-	autotools-utils_src_install
-	# already installed
-	rm "${ED}"/usr/share/coin/doc/${MYPN}/{README,AUTHORS,LICENSE} || die
-}
diff --git a/sci-libs/coinor-utils/metadata.xml b/sci-libs/coinor-utils/metadata.xml
index 871e40d0656c..c4ba4a30fb7c 100644
--- a/sci-libs/coinor-utils/metadata.xml
+++ b/sci-libs/coinor-utils/metadata.xml
@@ -6,13 +6,18 @@
     <name>Gentoo Science Project</name>
   </maintainer>
   <longdescription lang="en">
-  CoinUtils (Coin-or Utilities) is a collection of classes that are
-  generally useful to COmputational INfrastructure for Operations
-  Research (COIN-OR) projects. These include vector, matrix, mps file
-  reading classes.
-</longdescription>
+    CoinUtils (Coin-or Utilities) is a collection of classes that are
+    generally useful to COmputational INfrastructure for Operations
+    Research (COIN-OR) projects. These include vector, matrix, mps
+    file reading classes.
+  </longdescription>
   <use>
-    <flag name="glpk">Enable GNU Linear Programming Kit
-  <pkg>sci-mathematics/glpk</pkg> support</flag>
+    <flag name="glpk">
+      Enable GNU Linear Programming Kit
+      <pkg>sci-mathematics/glpk</pkg> support
+    </flag>
   </use>
+  <upstream>
+    <remote-id type="github">coin-or/CoinUtils</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/coinor-vol/Manifest b/sci-libs/coinor-vol/Manifest
index caacdfa57245..758bfb796cdf 100644
--- a/sci-libs/coinor-vol/Manifest
+++ b/sci-libs/coinor-vol/Manifest
@@ -1,3 +1,3 @@
-DIST Vol-1.4.4.tgz 3205621 BLAKE2B 187b8522d6fbcc287e3eb63e00553d2f90bb7c9add17e2ed604cef3e2ab2ba214a0d6e27ecd28457a983d0d11193ba31914f5defd841848fb9c2486d80ca4935 SHA512 20e04efac09694ddfa035496ec9b2920ef702e5a2ec4515cd88c52129c783efd3c25e044e6c2cec67ad800b297ebd03f3c3c377f58829790109d8d6dcb40cc39
-EBUILD coinor-vol-1.4.4.ebuild 1581 BLAKE2B 6a5f73df7a943d92a7722ff5af401fb797d0f53dd6145e2995f1550a38e3c59acd00ddde20d0ef3c2c71b283abe459f81327f82f640e1a45c3a70039468e6dde SHA512 12f74433fb38ed456a75c0466953afcd4fe05916608dfc214108620a354bc8d61eeb6afc62fc4ba9f58a92f6a6d01b4a32738245f25b8fd99761fb0e938dd1d2
-MISC metadata.xml 505 BLAKE2B ed047b858cd4d5ab9edb4706f5de6d7d0d327b81c0fb5a9d51a5b977468b2d2ccbc1f671c9bd5934c7c790f9d87251c52a390d5b473c2f4986edb958c3718110 SHA512 c31de615daba09af37d08828b2e58e2d6fdfeb0e6fb36b10023aa6eb04580c942103ce12b00a1ed40cddab0e2151c091dec1ce7ee65352d29685be2a07e50d0b
+DIST coinor-vol-1.5.4.tar.gz 983625 BLAKE2B b1c78f94d1232d773aa325227ac01ad469d3ff56571119ae95ddb9a34eb7d55d004111e81dc89bb4bae1b5754da29cd4e93983772e158afa131a4da0b187b03c SHA512 ba489b909dab45a9a48a32804a571fc9ad966b268ce8a81a391a743b523bce393bd649aaf15c51f401267fe05fb2ff7623a1f7208c0b9d6c24af9b659a230780
+EBUILD coinor-vol-1.5.4.ebuild 2102 BLAKE2B 1c37d117d976ccd271cc10dba41cb163ee2913586e8c65b0ecfd3a4dfaf051ca5a7322eddec1e8390b9395d83e563e489162c4f9d3d4fe8be153ca1428ac3a66 SHA512 eb65860ba325fc7f4c65d7281556ef39deb0bd223761781fe05a0ff6a27c2ebed01366d5ff07440a5cc25a073246591b2da60c72c67888ec43ca8513844a2c47
+MISC metadata.xml 599 BLAKE2B 8c6ca369668c22a14711428d81250752d9d8e0408bdb4c3c0650957df1e16a948d18777560003f25815555be1416d3d3fab52d23de342862d0fbc5f34a037e15 SHA512 2faa56ea8160351810393184d32fed0c5c3dbf18e21c1344624b7aa76d98c368a82a57a38b2c450adf96c55311e5b7aa0ad18261364ffef3e926e52aa06f88d8
diff --git a/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild b/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild
deleted file mode 100644
index ea1df608c973..000000000000
--- a/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib
-
-MYPN=Vol
-
-DESCRIPTION="COIN-OR Volume algorithm linear programming solver"
-HOMEPAGE="https://projects.coin-or.org/Vol"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="EPL-1.0"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-osi:=
-	sci-libs/coinor-utils:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	test? ( sci-libs/coinor-sample )"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-src_prepare() {
-	# needed for the --with-coin-instdir
-	dodir /usr
-	sed -i \
-		-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
-		configure || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-dependency-linking
-		--with-coin-instdir="${ED}"/usr
-		$(use_with doc dot)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	# hack for parallel build, to overcome not patching Makefile.am above
-	autotools-utils_src_compile -C src libVol.la
-	autotools-utils_src_compile all $(usex doc doxydoc "")
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
-	autotools-utils_src_install -C src install-am
-	autotools-utils_src_install
-	# already installed
-	rm "${ED}"/usr/share/coin/doc/${MYPN}/{README,AUTHORS,LICENSE} || die
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild b/sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild
new file mode 100644
index 000000000000..53276b0f38c4
--- /dev/null
+++ b/sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vol
+
+DESCRIPTION="COIN-OR volume algorithm linear program solver"
+HOMEPAGE="https://github.com/coin-or/Vol/"
+SRC_URI="https://github.com/coin-or/${MY_PN}/archive/releases/${PV}.tar.gz
+	-> ${P}.tar.gz"
+LICENSE="EPL-1.0"
+
+# major soname component
+SLOT="0/1"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples static-libs test"
+RESTRICT="!test? ( test )"
+
+# Fortran is NOT needed, but the ./configure scripts for all of the CoinOR
+# packages contain a check for it. Gentoo bug 601648 and upstream issue,
+#
+#   https://github.com/coin-or/CoinUtils/issues/132
+#
+BDEPEND="virtual/fortran
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	test? ( sci-libs/coinor-sample )"
+
+DEPEND="sci-libs/coinor-osi:=
+	sci-libs/coinor-utils:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}"
+
+src_prepare() {
+	# Needed to make the --with-coin-instdir in src_configure happy.
+	dodir /usr
+
+	# They don't need to guess at this, but they do, and get it wrong...
+	sed -e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
+		-i configure \
+		|| die "failed to fix the pkgconfig path in ${S}/configure"
+
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-dependency-linking
+		--with-coin-instdir="${ED}/usr"
+		$(use_with doc dot)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake all $(usex doc doxydoc "")
+}
+
+src_test() {
+	# NOT redundant! The build system has a "make check" target that does
+	# nothing, so if you don't specify "test" here, you'll get a no-op.
+	emake test
+}
+
+src_install() {
+	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
+
+	emake DESTDIR="${D}" install
+
+	# Duplicate junk, and in the wrong location.
+	rm -r "${ED}/usr/share/coin/doc/${MY_PN}" || die
+
+	# Portage still throws a warning for these, but it's a bug
+	# as far as I can tell: https://bugs.gentoo.org/721516
+	docompress -x "/usr/share/doc/${PF}/examples/Volume-LP/data.mps.gz"
+	docompress -x "/usr/share/doc/${PF}/examples/VolUfl/data.gz"
+	use examples && dodoc -r examples
+}
diff --git a/sci-libs/coinor-vol/metadata.xml b/sci-libs/coinor-vol/metadata.xml
index c0e9b5e1040c..3281553a97d6 100644
--- a/sci-libs/coinor-vol/metadata.xml
+++ b/sci-libs/coinor-vol/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Volume Algorithm is part of COIN-OR (COmputational INfrastructure
-		for Operations Research) project. Vol is an implementation of a
-		subgradient method that produces primal as well as dual solutions.
-	</longdescription>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Volume Algorithm is part of COIN-OR (COmputational INfrastructure
+    for Operations Research) project. Vol is an implementation of a
+    subgradient method that produces primal as well as dual solutions.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">coin-or/Vol</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 7029fb0c0e35..69fa2a7a7950 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -9,7 +9,7 @@ DIST fftw-3.3.6-pl2.tar.gz 4185261 BLAKE2B e2f877c13ab441ddf1ae731cf3ebdc5d1565f
 DIST fftw-3.3.8.tar.gz 4110137 BLAKE2B 555ac1401a5a41b7661afd0288c2353398f2c9b73695742459079ebf050dfa4c371484ea65324fd4b7d374f70d88a5942ff8abaad167b0d44d485bf1dc9e208c SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38
 EBUILD fftw-2.1.5-r9.ebuild 3146 BLAKE2B 8f899d8142cd8a90a887240756c501e2d736385d636734a9ddbcebb0b0d479e8006d5cbc75d20f41aa4deacfad469870ec5d387082da20f7a75333d667c190f1 SHA512 7648d4c60ad453a2b8be1a687918278941b54a99c06b59af5121dcdf259eb40f423969ab6d5b861668c4216fdfd9167043c72c51d3fbfb8e0da0cb50da6ce945
 EBUILD fftw-3.3.6_p2.ebuild 4459 BLAKE2B 0585c2fe679f1c849e60be3cf7ad87b5af8aac4d0e342fd064cd6d82c8c29f36fafc430222eb38de5f6bfaaa65547163d132635a818201b8f78d689aed33f957 SHA512 0f19ac77caf1a9e5e449b21498b582a7e6061ddc15754d4e626c89589477109cab56167aba8d9dd13c4729d390e713d5edf28095824a4a1b25520a6c8c1c37ab
-EBUILD fftw-3.3.8-r1.ebuild 4482 BLAKE2B 3d15c541c7ebd4da4d8c5db3d138ed34ac762fd69bc5deeeeab6be45b979568152558b42c67ede7ea61ff6166bc1e52b2e47374d9b845f931e29a4ca3d9bf4e7 SHA512 1121948acc7270f310aba04212848b2f4ae918a96c137cdaa7117296566272b67e90bf439e17cbaa1b3f25e2604be8fcb5c7f035ea3162c640847f3e0eba999a
+EBUILD fftw-3.3.8-r1.ebuild 4608 BLAKE2B dd7ca3f608059b79e03c1c38eaa507ea6f41a4e4fa9ae5e8c2d2ae6782fe3b6e76e226b1c48b43352764bb66a114edf79b457d438ee1fec399920b3199420ca6 SHA512 6f3250cdd35c1a828d5dd33b079db4df4463e829a65894fd22ddd68ca73eddcf469fba1ea74783cf7052af67b44b7fe45b575c815b6fe928692fcbd8a324e26a
 EBUILD fftw-3.3.8.ebuild 4487 BLAKE2B 3f88b09f0973e09ebd253128086307354e03d091cc8095dbcd2672582dec2fdeca3965324a1ce6860aba9500397a2a1ce494547793073557981238b41b7f501a SHA512 4998722cd488e98041d4a8ec4bf3a0888358c5558a44da0e1dbd9be9b1e42d7ce0ebb9c18179d48b324b3ffaaea2473b350b407d5f7af3ad44515176dfd72d30
 EBUILD fftw-9999.ebuild 4482 BLAKE2B 3d15c541c7ebd4da4d8c5db3d138ed34ac762fd69bc5deeeeab6be45b979568152558b42c67ede7ea61ff6166bc1e52b2e47374d9b845f931e29a4ca3d9bf4e7 SHA512 1121948acc7270f310aba04212848b2f4ae918a96c137cdaa7117296566272b67e90bf439e17cbaa1b3f25e2604be8fcb5c7f035ea3162c640847f3e0eba999a
 MISC metadata.xml 1088 BLAKE2B 308c6b8e2b7388d41c5ee6c3336b7b61037277b4563cb212cccaf25c894d350434eaa0f282172f943cf26496345b4c7e58afa55f50b9cf07fc04aea7a5d25244 SHA512 df52860deccf7e7139affaad8cfb837b7f3770a22c621f668db24d916cee5b27acc1486884797e8d0881d8887874627b919816f8245101982e963a8db43f3c98
diff --git a/sci-libs/fftw/fftw-3.3.8-r1.ebuild b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
index 9266b28d174d..f8105f1e1b41 100644
--- a/sci-libs/fftw/fftw-3.3.8-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
@@ -136,6 +136,10 @@ multilib_src_configure() {
 }
 
 src_configure() {
+	# upstream does not append proper -m flags
+	# https://bugs.gentoo.org/698572
+	use cpu_flags_x86_avx2 && append-flags -mavx2
+
 	multibuild_foreach_variant multilib-minimal_src_configure
 }
 
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index df94026cb65a..8b53b73baefd 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,5 +1,3 @@
-DIST geos-3.8.0.tar.bz2 2399403 BLAKE2B 0f9b6d7f9a4052b9b84e77d534be6e2909e5dc4995287f34e3b7e7c1537c9a73088d4a49f96f43034723eb37c88674aae469e26d7db3eb40efbcdf5551553a1a SHA512 c89b25b42092152ef261090f25ff64b229f30f67d42fdf44c2871e78b66bb2c42e23b9ae21f9aea0e48823bdb0267d609ab2ee77d310abcb76fa672c6614d8f1
 DIST geos-3.8.1.tar.bz2 2505407 BLAKE2B 43053ea9e29d190f41c37d5d382b689ef477e0256cfd5705f4f2f316cac21a1674660bcf0900c51db72909c41d46be7a41d297958de48e108ae6d6bd1ca9d247 SHA512 1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056
-EBUILD geos-3.8.0-r1.ebuild 1148 BLAKE2B 8fb0f023e255cb3cd5c90dc9f26f6ed1589c8d73c5cfb73cb7aa579fac03d7bac0951565ac13764ced5bc3e915af341007e44b56ee5f3689640058c616ac05b4 SHA512 ebbc36bb4a71b7612534ac6d6fa557d6fc413c50ac243deaf02f328f859bafafec50ae475388eabc10bc49ab1ea22e6300f826296f83234b1b47382ec1543bfa
-EBUILD geos-3.8.1.ebuild 1118 BLAKE2B 49c05deb35d5b4d56132375bc673e24937f3e596f052b3e6018a09df8311673f33a622df02907d0732e3de6d53b5f0b810a4c79214307bb3428c922b47feb47c SHA512 01f5f170b96f0ebd506bbac22edb64ab1f3b3c88bddc65a03a0634e88ff8d12a6f02a5d7f5c2619968beba26049a09729e642f7d1a391ba559eda90333af26cd
+EBUILD geos-3.8.1.ebuild 1112 BLAKE2B afa7d180906c86844c2b0f7a9b7305b30b32b91fef8f691449830e720a3547018440e323918e2453c8f138e7b2390246f97c83ba999a4cb6c5afa353ed2ae57a SHA512 78a60b83eed54e0882b2b168a85558c3fe6b24e208b8f6a70c9971f9e9015ad108ec6d591e898ae058e320478d702edecda44e9ed0c6f4ae14b76b2900f87278
 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c
diff --git a/sci-libs/geos/geos-3.8.0-r1.ebuild b/sci-libs/geos/geos-3.8.0-r1.ebuild
deleted file mode 100644
index 53a956cfd2d4..000000000000
--- a/sci-libs/geos/geos-3.8.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="http://trac.osgeo.org/geos/"
-SRC_URI="http://download.osgeo.org/geos/${PN}-${MY_PV}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc ruby static-libs"
-
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	ruby? ( dev-lang/swig:0 )
-"
-RDEPEND="
-	ruby? ( dev-lang/ruby:* )
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-src_prepare() {
-	default
-	echo "#!${EPREFIX}/bin/bash" > py-compile
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-python
-		$(use_enable ruby)
-		$(use_enable static-libs static)
-	)
-	use arm && myeconfargs+=( --disable-inline ) # bug 709368
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	use doc && emake -C doc doxygen-html
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/doxygen_docs/html/. )
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/geos/geos-3.8.1.ebuild b/sci-libs/geos/geos-3.8.1.ebuild
index f19227d4b289..d8be59bbb02f 100644
--- a/sci-libs/geos/geos-3.8.1.ebuild
+++ b/sci-libs/geos/geos-3.8.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://download.osgeo.org/geos/${PN}-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc ruby static-libs"
 
 BDEPEND="
diff --git a/sci-libs/ginkgo/Manifest b/sci-libs/ginkgo/Manifest
new file mode 100644
index 000000000000..ae0645747121
--- /dev/null
+++ b/sci-libs/ginkgo/Manifest
@@ -0,0 +1,5 @@
+AUX ginkgo-1.1.1-set_soname.patch 673 BLAKE2B 740cebca34c0eb3472bb5c5b1cd3908701df0acd5b3683d87ed67722912860a3ce298bef181e7bd26defa162ae9374e87cccb0ca5d0df7b1ed296e6bc61b7122 SHA512 294b6855239ffb9bc311cdfbdf49956dba10ec47b6e0d3a48bf3a8e002720bb58d9a03ae5ce68c85552e789818f26913ca3a9d3307c5e68dc86db3a5f1d703d5
+DIST ginkgo-1.1.1.tar.gz 11787690 BLAKE2B 75c2c9b2d1e9ba00e3b0a20859af621cdf4aefe7c6e5ec9c7fc34a5368e5bee70d7d2b86ed9b2d9075ab7cc1a3334434fe20329d780f693be45fd7707cdbe27f SHA512 ab8f2d36453f4e60a4e0a13eddc4a137006c1cc6c9c0db00997dd721dfc06f4401109c5a22ba23a838206cff576d5041d06edaed8823006e69f11e360d1dadce
+EBUILD ginkgo-1.1.1-r1.ebuild 1255 BLAKE2B 435703ad17ca61850b8a7bad01ef0ef763ed09eea57b99349f5af2098527a33a53ff8c4ce1e434c231e487cb31cd2581de002304a01a3783da5a8e22a2a44825 SHA512 c6f1343d676f70b0eec0e137c94273de1ffade68533e7c4022ffba4bfeb0522f8cd02eba8f38edac6b4453190a86f0adccd51239d71d2b18f6e3f54b30acdc76
+EBUILD ginkgo-9999.ebuild 1255 BLAKE2B 435703ad17ca61850b8a7bad01ef0ef763ed09eea57b99349f5af2098527a33a53ff8c4ce1e434c231e487cb31cd2581de002304a01a3783da5a8e22a2a44825 SHA512 c6f1343d676f70b0eec0e137c94273de1ffade68533e7c4022ffba4bfeb0522f8cd02eba8f38edac6b4453190a86f0adccd51239d71d2b18f6e3f54b30acdc76
+MISC metadata.xml 809 BLAKE2B 03a441e0dab912e0e44360d81aaae8a290cdf8b3545850e796df22c211ed433a74cccc535c0ed655dafe741aedc4b272d40617104d4df92c14c8fdab6e63d3ce SHA512 8d21f84fa4e7a4d94056cd09324e223f510ce2100f4b5ab2874280a0012b1b74cf891faf1802bd780c6fb3bd86751fda6598787fa328f5d1fcde0e853889f4f5
diff --git a/sci-libs/ginkgo/files/ginkgo-1.1.1-set_soname.patch b/sci-libs/ginkgo/files/ginkgo-1.1.1-set_soname.patch
new file mode 100644
index 000000000000..9feceee00f7b
--- /dev/null
+++ b/sci-libs/ginkgo/files/ginkgo-1.1.1-set_soname.patch
@@ -0,0 +1,14 @@
+diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
+index 8a8ad04..03c6db6 100644
+--- a/cmake/build_helpers.cmake
++++ b/cmake/build_helpers.cmake
+@@ -17,6 +17,9 @@ function(ginkgo_compile_features name)
+     if(GINKGO_WITH_IWYU AND GINKGO_IWYU_PATH)
+         set_property(TARGET "${name}" PROPERTY CXX_INCLUDE_WHAT_YOU_USE ${GINKGO_IWYU_PATH})
+     endif()
++    # Set an appropriate SONAME
++    set_property(TARGET "${name}" PROPERTY
++        SOVERSION "${Ginkgo_VERSION}")
+     if(GINKGO_CHANGED_SHARED_LIBRARY)
+         # Put all shared libraries and corresponding imported libraries into the specified path
+         set_property(TARGET "${name}" PROPERTY
diff --git a/sci-libs/ginkgo/ginkgo-1.1.1-r1.ebuild b/sci-libs/ginkgo/ginkgo-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..5348b9a51be6
--- /dev/null
+++ b/sci-libs/ginkgo/ginkgo-1.1.1-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Numerical linear algebra software package"
+HOMEPAGE="https://ginkgo-project.github.io/"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/ginkgo-project/ginkgo"
+	SRC_URI=""
+	KEYWORDS=""
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+IUSE="+openmp cuda"
+
+RDEPEND="
+	cuda? ( dev-util/nvidia-cuda-sdk )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.1-set_soname.patch
+)
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && \
+		use openmp && ! tc-has-openmp ; then
+			die "Need an OpenMP capable compiler"
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e "s#\"lib\"#\"$(get_libdir)\"#g" \
+		-e "s#\"lib/#\"$(get_libdir)/#g" \
+		cmake/install_helpers.cmake || die "sed failed"
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+
+	local mycmakeargs=(
+		-DGINKGO_DEVEL_TOOLS=OFF
+		-DGINKGO_BUILD_TESTS=OFF
+		-DGINKGO_BUILD_BENCHMARKS=OFF
+		-DGINKGO_BUILD_REFERENCE=ON
+		-DGINKGO_BUILD_OMP="$(usex openmp)"
+		-DGINKGO_BUILD_CUDA="$(usex cuda)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-libs/ginkgo/ginkgo-9999.ebuild b/sci-libs/ginkgo/ginkgo-9999.ebuild
new file mode 100644
index 000000000000..5348b9a51be6
--- /dev/null
+++ b/sci-libs/ginkgo/ginkgo-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Numerical linear algebra software package"
+HOMEPAGE="https://ginkgo-project.github.io/"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/ginkgo-project/ginkgo"
+	SRC_URI=""
+	KEYWORDS=""
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+IUSE="+openmp cuda"
+
+RDEPEND="
+	cuda? ( dev-util/nvidia-cuda-sdk )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.1-set_soname.patch
+)
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && \
+		use openmp && ! tc-has-openmp ; then
+			die "Need an OpenMP capable compiler"
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e "s#\"lib\"#\"$(get_libdir)\"#g" \
+		-e "s#\"lib/#\"$(get_libdir)/#g" \
+		cmake/install_helpers.cmake || die "sed failed"
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+
+	local mycmakeargs=(
+		-DGINKGO_DEVEL_TOOLS=OFF
+		-DGINKGO_BUILD_TESTS=OFF
+		-DGINKGO_BUILD_BENCHMARKS=OFF
+		-DGINKGO_BUILD_REFERENCE=ON
+		-DGINKGO_BUILD_OMP="$(usex openmp)"
+		-DGINKGO_BUILD_CUDA="$(usex cuda)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-libs/ginkgo/metadata.xml b/sci-libs/ginkgo/metadata.xml
new file mode 100644
index 000000000000..2b6a2c10b332
--- /dev/null
+++ b/sci-libs/ginkgo/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tamiko@gentoo.org</email>
+		<name>Matthias Maier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Ginkgo is a high-performance linear algebra library for manycore
+		systems, with a focus on sparse solution of linear systems. It is
+		implemented using modern C++, with GPU kernels implemented in CUDA.
+	</longdescription>
+	<use>
+		<flag name="cuda">Add support for cuda assimp (<pkg>dev-util/nvidia-cuda-sdk</pkg>)</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">ginkgo-project/ginkgo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/kim-api/Manifest b/sci-libs/kim-api/Manifest
index 49175204b4c0..31e460f8f35e 100644
--- a/sci-libs/kim-api/Manifest
+++ b/sci-libs/kim-api/Manifest
@@ -1,5 +1,5 @@
 DIST kim-api-2.1.3.txz 296492 BLAKE2B 707ae2eaeaa737865d9b4f48a7f1ed53fb6453fc3680dee3b5b41f315b60710dfa9546105bc871cf1a4667644434e4a8eab0c95976feef3bed73ff8401613ac3 SHA512 efbc0214234b43a65ed40d23d8faa5264ac1dbd056e9e340548ea7ee5dc530f9cfb2d85a1d9d47fba9dfc7aa660a8ec20374daf4aa8ee605e7c097ae2a12512d
 DIST kim-api-v1.8.2.tgz 1634997 BLAKE2B ab2db24b9bb619aac3fdad6868d36d9615f0b08a8325613cd311d32dadab2f23105fe92b73e32c442d0f64364fde32d1293cc063637ff49eb49760a46bcb4f4b SHA512 fed930d147bfbb7936548eb129fcc403df90d1a8010f0fd5b85eaa35c1529d76c9c7c10b098b8eb74d9878e6d3ba0fad3c10d2a3e5bc9b673841a2abc290bac3
 EBUILD kim-api-1.8.2.ebuild 642 BLAKE2B 8aee22e3c2032ca6df812a1c548420e84296d5a4ed78a499b61f5703ef0d40427b64fdedd705834df508251091ca5ba0f7ef74ed7d4cf59558fd88c1bdd45cee SHA512 3a6a1f11f40af004330ebb4a55edcd12a93249e8c816f695e5a42044096e864c23154dbdb4d0f024d8882e538ef29269fb0c3ab56f4b516ce79b7f5408530405
-EBUILD kim-api-2.1.3.ebuild 374 BLAKE2B 8f6f1d0939521bc8f4ed2143020fb658a19b6837252418894964ee72b1878214bddfad6ba85af0927241e7a75b85c91c332c6950fab29233f5efce17058f2815 SHA512 d6fbbaedcd990985797c6501685183124db9c92045966b93aa3f0e9def9ef53cf18e2edea5777db1912e64dad2e9240cefd8b655b28c887bf6b0f7f629bf26d6
+EBUILD kim-api-2.1.3.ebuild 384 BLAKE2B cb8fefd8a9141e7921422ec879388a2e604f40e1073d8ece7e7f48aec15454238152e10a8327bce6b887e619ffab3b911cad053fbcbec44f75c171e652accfda SHA512 dd4233a98b5ac9513e48f8761162e89e009c9dd3afbfeb974341df5a7fd2a95d8c290d3a5bdfd79727033ad2f109d80db6ec9795ee028ee1e8d5849112af73f1
 MISC metadata.xml 367 BLAKE2B cc3fc8e9dbc98eef49a88d43c68b358b5d2f658316247637a9a3925de3784eb2e82de849e0a49217d5b49be74c280b81a66abbfdd9310fd18b77d67451a480c2 SHA512 455c79e8837ba1ed980967e3236d4a0ac0edbd1b88b056a06d715894e03e7fc802079440752e60a06c9ce4acb62fd68d4020a7847a154a14065afd995257f685
diff --git a/sci-libs/kim-api/kim-api-2.1.3.ebuild b/sci-libs/kim-api/kim-api-2.1.3.ebuild
index e4d877d225c2..60c0e882f990 100644
--- a/sci-libs/kim-api/kim-api-2.1.3.ebuild
+++ b/sci-libs/kim-api/kim-api-2.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake-utils fortran-2
 
 DESCRIPTION="Application Programming Interface for atomistic simulations"
 HOMEPAGE="https://openkim.org"
diff --git a/sci-libs/klu/Manifest b/sci-libs/klu/Manifest
index 3bcd5e563100..e73ace0a33b4 100644
--- a/sci-libs/klu/Manifest
+++ b/sci-libs/klu/Manifest
@@ -1,5 +1,5 @@
 DIST klu-1.2.1.tar.bz2 612428 BLAKE2B 807bfc56deb5c4cbefd2f6c118cd8e929ba9b02d9b88e8eee8b9443991f16a2a3e9b4e1fa888b2b6e450aeda9fc4d12d6a5480f9f25bf366312f57cd8f380af0 SHA512 2837ade61596b5e738d0dd16a5486fd2b0089ec9ddeae4fa3b2c3671de6637c7cf2d55e44c0103c9393caa3f046039a76d9abc5b8094d236523db0c58cc58b70
 DIST klu-1.3.9.tar.bz2 635596 BLAKE2B 6c6c84cf1b30e78cbaaee6bebed21c806d1672bee5f7ea061e7ef057ff56fd456e8517ca2ff1018a14ebcbc8f96b9e87989e22d8996817394666e6d8d2d727dd SHA512 b7fd862fe8443596758c27f9c918e367b3b3816340836e74cf8d97a2e755fbe07d133778eea3d054bc70243fa15c2bd71f4fd90c1179879661ba2d624b8f0706
 EBUILD klu-1.2.1.ebuild 656 BLAKE2B 53d38f9b4a6b80b98c50a0eecf85ce3e0eb6ffa65134ef68d7c7b67c1ea1f402f11f8870f1a1720b9583c79c952c7820eae652ecd3ebf9bb399fa7f2d20c27fa SHA512 2e0dbdfb47e311c4f537aa9e064e2a383b5aa783b67c3ece14023b88512167bc9f897f707129d6a57de207152804d80e181398b7ca17ebd7a7e20985672fd717
-EBUILD klu-1.3.9.ebuild 620 BLAKE2B dc9d846658e801f3f74603292b837147af7b33e0f5c5816cb7cbb1366c10671e5ed7f1b4d4e6a80b8e1040340af3fc150e5f58ccbd5ef34609d6d4deaa545dcf SHA512 046556302481485fdf48e8a44395ee4963d21c00318f5bf136f238db76a401f8ffc2f6e35b97e2f86d23f4ad3ae69c81939056e7a97d2d3e83b7f7c17fe7077f
+EBUILD klu-1.3.9.ebuild 632 BLAKE2B c938185e332a7ad65903b2ec144ae8dd91c767b120cf3e99ac5ed2a3ba5ddc289bc648bcfd1c1d54f274ae94c63ec2fc756337102fe703d805d4184b37b82623 SHA512 fab7e0927e51b2d4fe24c7755a360683150edf3a5a7ae41dc225e32a716c6ace209a9144326d4cbc319c2ce3aedd2d4fabcf521ff6faeb9b23c822a814a9b516
 MISC metadata.xml 460 BLAKE2B f4d619f68a16bcbaaf2b44a9fd1156cc88dd02d38609da2e56f8b242df9744fbbe4b7befff2ae34f084b5895ab9a537e62182015008e596fddda33ea891698b5 SHA512 1e01a7e6576552beac665a8a0affe21809785f33316767ef6e0bcc59dd019e5100f1ed16ca1bd91ee1daf102de2122ed57ff0980dd6b4f21270f8c4c5f832db7
diff --git a/sci-libs/klu/klu-1.3.9.ebuild b/sci-libs/klu/klu-1.3.9.ebuild
index 14645153cd81..4c02aca283bf 100644
--- a/sci-libs/klu/klu-1.3.9.ebuild
+++ b/sci-libs/klu/klu-1.3.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/linbox/Manifest b/sci-libs/linbox/Manifest
new file mode 100644
index 000000000000..b2db4b133845
--- /dev/null
+++ b/sci-libs/linbox/Manifest
@@ -0,0 +1,4 @@
+AUX linbox-1.6.3-pc.patch 1082 BLAKE2B 7d5b055c0622b61245f193eb39d7e52951262c56456dceba5b3e72f54add82b2fc1660c4590eba2c4a97009bd78119893bfccb0909ed5374752f4bf563e75655 SHA512 5739738de34c28fb9970a869ee97a6ab528fd48e3f8b3d82f39966959fa97d6076a44263678d25c06bea3c46e06c8869ba4ea94484d5b57aee3a302df49fd06b
+DIST linbox-1.6.3.tar.gz 1968034 BLAKE2B 55fb83db7da375d8d97f2567c6a120ac48fefc41eb02db68152cc32f1f16009b8c8108a07bbc68087ad2ef3279108db61b48b805c9ce39f4c5f0072ab6e96304 SHA512 ccef3b4c7b9d8f999e5e4ce4e544f22cd869154513827501ecb7e1abf132ff585dfb3315cced963abe842feecda9331dda9081efb3948987365d338223a8305c
+EBUILD linbox-1.6.3.ebuild 3342 BLAKE2B 2907fff7074519568eef7747acccaad85c60ce62aea7c8d83160d050f52e2a701e1d96d019eb86526675a9cb2f5d7b0a8f0fea6a0c4c04f0d4f7baf59690522f SHA512 2fc91cb26475b5f7a5fd59e1990872c31fd6285fef6882568b9a9280c0e500b18f2fd698e0835e9b7c7435d1215b3f56fa30847f1922d7504a9b2285d12a22d8
+MISC metadata.xml 1242 BLAKE2B 456a3155a1206586e04e144f133659a107154d1064afc8cbb210eb5fb6930792e846e0ad58e55d20738f4a7fb078158c2d8398379f81d56b90c9aa7d09645426 SHA512 86b2f86c9f15b00fdd57c5041828f1b3a309d616b0580eee878a6ccbf917f2b500aae81c0cc96c4d10b5b40429b3bf997f0ea3468878d7b8e8b08c4624977b77
diff --git a/sci-libs/linbox/files/linbox-1.6.3-pc.patch b/sci-libs/linbox/files/linbox-1.6.3-pc.patch
new file mode 100644
index 000000000000..de0025108b89
--- /dev/null
+++ b/sci-libs/linbox/files/linbox-1.6.3-pc.patch
@@ -0,0 +1,25 @@
+From 8fb95a5dba51fbfcd37db10da4db69d518f7b0f4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= <frp.bissey@gmail.com>
+Date: Fri, 24 Apr 2020 14:10:05 +1200
+Subject: [PATCH] Remove @LINBOX_SAGE@ from linbox.pc.in. linbox_sage is gone
+ and the string stays as garbage in the final .pc file.
+
+---
+ linbox.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/linbox.pc.in b/linbox.pc.in
+index f54285e..1f83834 100644
+--- a/linbox.pc.in
++++ b/linbox.pc.in
+@@ -9,6 +9,6 @@ Description: Exact Linear Algebra library
+ URL: http://github.com/linbox-team/linbox
+ Version: @VERSION@
+ Requires: fflas-ffpack >= 2.4.0, givaro >= 4.1.0
+-Libs: -L${libdir} -llinbox @LINBOXSAGE_LIBS@ @NTL_LIBS@ @MPFR_LIBS@ @FPLLL_LIBS@ @IML_LIBS@ @FLINT_LIBS@ @OCL_LIBS@
++Libs: -L${libdir} -llinbox @NTL_LIBS@ @MPFR_LIBS@ @FPLLL_LIBS@ @IML_LIBS@ @FLINT_LIBS@ @OCL_LIBS@
+ Cflags: @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR -I${includedir} @NTL_CFLAGS@ @MPFR_CFLAGS@ @FPLLL_CFLAGS@  @IML_CFLAGS@ @FLINT_CFLAGS@ 
+ \-------------------------------------------------------
+-- 
+2.26.2
+
diff --git a/sci-libs/linbox/linbox-1.6.3.ebuild b/sci-libs/linbox/linbox-1.6.3.ebuild
new file mode 100644
index 000000000000..db82ccb781cd
--- /dev/null
+++ b/sci-libs/linbox/linbox-1.6.3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="C++ template library for integer and finite-field linear algebra"
+HOMEPAGE="https://linalg.org/"
+SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc opencl openmp static-libs cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+# The project README says that gmp, givaro, and blas/lapack are required
+# transitively via fflas-ffpack, but that's not true. The build system
+# checks for them, and `git grep` shows that they're used directly.
+DEPEND="dev-libs/gmp[cxx]
+	=sci-libs/givaro-4.1*
+	=sci-libs/fflas-ffpack-2.4*
+	virtual/cblas
+	virtual/lapack
+	opencl? ( virtual/opencl )
+	dev-libs/ntl:=
+	sci-libs/iml
+	dev-libs/mpfr:=
+	sci-mathematics/flint"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.6.3-pc.patch" )
+
+pkg_pretend() {
+	[[ "${MERGE_TYPE}" != "binary" ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	#
+	# The --with-all flag includes,
+	#
+	#   --with-givaro: used for finite fields, integer, etc. (required)
+	#   --with-fflas-ffpack:  small field dense linear algebra (required)
+	#   --with-ntl: used for finite field, polynomial arithmetic (optional)
+	#   --with-iml: used for fast integer/rational linear algebra (optional)
+	#   --with-mpfr: not sure, doesn't seem to be used? (optional)
+	#   --with-flint: used in algorithms/matrix-blas3 once (optional)
+	#   --with-fplll: an fplll interface not directly used (optional)
+	#   --with-doxygen: needed with --enable-doc to build them (optional)
+	#
+	# Some of these could be behind USE flags, but the ./configure output
+	# says that they're "not yet mandatory," which makes me think we might
+	# be overcomplicating things to make them optional right now.
+	#
+	# Note: after v1.6.3, we'll need to append --without-archnative to
+	# these flags to avoid -march=native being appended by default.
+	#
+	econf \
+		--with-docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--with-all="${EPREFIX}"/usr \
+		--without-fplll \
+		$(use_enable doc) \
+		$(use_enable openmp) \
+		$(use_with opencl ocl) \
+		$(use_enable cpu_flags_x86_fma3 fma) \
+		$(use_enable cpu_flags_x86_fma4 fma4) \
+		$(use_enable cpu_flags_x86_sse3 sse) \
+		$(use_enable cpu_flags_x86_sse3 sse2) \
+		$(use_enable cpu_flags_x86_sse3 sse3) \
+		$(use_enable cpu_flags_x86_ssse3 ssse3) \
+		$(use_enable cpu_flags_x86_sse4_1 sse41) \
+		$(use_enable cpu_flags_x86_sse4_2 sse42) \
+		$(use_enable cpu_flags_x86_avx avx) \
+		$(use_enable cpu_flags_x86_avx2 avx2) \
+		$(use_enable static-libs static)
+}
+
+src_install(){
+	default
+	find "${ED}" -name '*.la' -delete || die
+	if use doc; then
+		# These files are used for incremental doxygen builds but aren't
+		# part of the final output. Check on
+		#
+		#   https://github.com/linbox-team/linbox/issues/252
+		#
+		# periodically to see if this is pointless.
+		find "${ED}/usr/share/doc/${PF}" -type f -name '*.md5' -delete || die
+		find "${ED}/usr/share/doc/${PF}" -type f -name '*.map' -delete || die
+	fi
+}
diff --git a/sci-libs/linbox/metadata.xml b/sci-libs/linbox/metadata.xml
new file mode 100644
index 000000000000..b8fdd1af15d4
--- /dev/null
+++ b/sci-libs/linbox/metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+  </maintainer>
+  <!--
+      mjo: François maintained this package in the sage-on-gentoo overlay
+      long before I moved it into ::gentoo. You don't need an ACK from me
+      to merge his changes.
+  -->
+  <maintainer type="person">
+    <email>frp.bissey@gmail.com</email>
+    <name>François Bissey</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+
+  <use>
+    <flag name="opencl">
+      Enable the use of OpenCL in LinBox
+    </flag>
+  </use>
+
+  <longdescription lang="en">
+    LinBox is a C++ template library for exact, high-performance
+    linear algebra computation with dense, sparse, and structured
+    matrices over the integers and over finite fields. LinBox relies
+    on closely aligned libraries fflas-ffpack (exact dense matrix
+    linear algebra kernels), and Givaro (finite fields, integers, and
+    polynomials).
+  </longdescription>
+
+  <upstream>
+    <remote-id type="github">linbox-team/linbox</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index 408cebcf2e8a..d2871875d654 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,7 +1,9 @@
-AUX linux-gpib-modules-4.2.0_rc1-reallydie.patch 737 BLAKE2B 198c078a168071e04efcfdad11bf93c2682ab2f2160d7f93fc9c49fdcd2cbbe9174be53502fa5a2c0eedf448e0f438130646cfe902673383925156244a80bf5d SHA512 96b7e459da514f4a4f84e746a3121baa0076c479ad435fd182a90714aeec21d32dcdbb6871deacab532c722e89970aa7cbccbcbea494195dfa86c7ebb95142d9
 AUX linux-gpib-modules-4.3.0-kernel53.patch 1426 BLAKE2B 56d84daf8ca2f31db5e10a1f20b6d1fe5fed3efa98454e620ea7067378f408da2aa4db57ab062fdd139321b6e8bd738d22bfed1a61b2c5732fd4fbd10a39e299 SHA512 1cba793dc51957068a9613d9952937b1b58582d3833bd1e0c7e9ce6f3f2c54e827d67444bdaf413404c4b96aa3cfe4ce7faf7cb0f07ead7fdfe9eb3521dd3b27
-DIST linux-gpib-4.2.0.tar.gz 1431440 BLAKE2B 7b6adf562963e0785f960c072f3f3d67cb91df9090205d8fecb0dc3170d3a1ac3719732919bae112e06b47387499ffe49a0144e72caa27ba39c85c8b98e56786 SHA512 1505c2c04f16bf7e92b9dd474f09edd242520a96f9e4d8eea88ebd44d0a82d653055155c1bfcde69da5355d609d400e3cb682da8aae83f59f1e565307a3fc4a7
+AUX linux-gpib-modules-4.3.2-returntype.patch 2451 BLAKE2B bc366bf772147aab165273bf1a20c65a6664cef8ff1069c22069a14d1907486074a6b2602ac99c0d6b283c7a187051592e0cba1d04af06af88e6c4c0d88bc779 SHA512 24891ccfd5a73224702f9b5dd1469083999951689761d9bf5c6eb84445d54e73381b4f6b05703401df1908f5f23557f1cf62dcdce0c81272483f96ca39d722bf
 DIST linux-gpib-4.3.0.tar.gz 1375852 BLAKE2B e2daa444ddf4c0c34084f264247051d4ce1c8103d8ae5d91b02d4742131c1f92ded02775eb0f8b0ea29820e2ae7b61c3132c74084a876e86fbb4efaf11688773 SHA512 8db4eb6d606c68ffacc67988479684fec815fc552756a6c93466ef0dfc93368771bb551944e3afc31db83e72e464ec1fb289fdcf80b4a6be1617e734fe3b9d65
-EBUILD linux-gpib-modules-4.2.0.ebuild 1661 BLAKE2B 436455065ff0dd8a122800474d2afe27b2cffa5929acce605d9534b3a7fbefdce7a824639d60b6f80b5dfbd7128180a68c3fec7154828d96770248b646b974d5 SHA512 decedb321adf082dfdfe1dc6bf2ac3607c3efee166f74c39faa62931906929be86fbe8241d07c17f16b29de0d9aa0d0546f5e4f38326a64e2bd8fa99dff35a4f
-EBUILD linux-gpib-modules-4.3.0.ebuild 1401 BLAKE2B 24089b6de2e97f47539476c2e578ad7723dc0cfa60cc74a2605df827e77f11a938086846b536d538e8ef8fee86b35896a770f81ef8a60236b81b7d332aefebf7 SHA512 aa38c6c37e35b673217b21743b6d5db12963aac6b5c1a801793308265210aad3190d4ed20edaf4c69e9a51d95e140147fe85a2e839c73fbcc6d034ae305ce94b
-MISC metadata.xml 638 BLAKE2B 6367f8fe90e75e2a3593d5d79ae09e6c75fa990ae037b58cba80ecdc4f7023a5b116ee2d6eadcdd6960133cd08a5103ebd1870906e2136af064a048603bb2562 SHA512 0bce2e72363ccdec78efa46158bade5135cae3d2d7b97de6836c4708f5823f2c1539f7441f0382061c4e0c4c7b5b1498bc5a4be6949b7dea015c873381010744
+DIST linux-gpib-4.3.2.tar.gz 1377406 BLAKE2B 57ec8b3788606ffb42d204ad0e2476c432bc82f929b1854c6a1d48c73f48a149716d05b13906b4597a4bf03e4c10a0ffe2c66e6de8cf9a5891b86c3d459713fc SHA512 bf9963d885e0c974f41eed96359501bd41c7d4f051026f64d835e52f1031f39e6bba6ce976a27e660a8b36087e56b81205206066c68b42db9a1d578d351a8f8b
+DIST linux-gpib-4.3.3.tar.gz 1381420 BLAKE2B 0ee8c4d740272a55be03f07bd49c9a93d0ec4808465c9b0abc4ede2ee9ef4bcb8a48fb8c98617d007c8b7af970eae185de65094a8814b05cb81bfc983bf9df3e SHA512 91b2c345dc82778b757122dc41ae74138831223a73057ddf9f04d10b8f6a059760e17134378df46a1ecb13c42bec1383aced0f2446f803af425391193a77066e
+EBUILD linux-gpib-modules-4.3.0.ebuild 1400 BLAKE2B 99ec5d7cbb6ddd7e12808423d73783376c61c49e1be2e719667398095110a9ae8bd532a5429428f99b8c93e97e0b679bb83f4c249ae4328ded1805e5e17db5ef SHA512 f6f81aadcafad9758707dfc3cec89f94d289a9ae243d0fbf03e886749304444cbce26fd76c914395e23c1df7037e612ceb9684009321d6f6c45d38d945c2cd5d
+EBUILD linux-gpib-modules-4.3.2.ebuild 1396 BLAKE2B 638e0139519a31e5b49168be5da7dde18558bffa0fc44b35e3555e2d29bb65ca6b34c6d66e5eea11d59808ae51c90271904cfb352d6a60c6e2457e1636eeefe4 SHA512 d24837c4683527363011be674382c5471f759a46211068aa10fb21de6becf4cdece89858805a5d5aac64b7220cdd4f495f2ab832e5a140b108e44f67d5b12fa5
+EBUILD linux-gpib-modules-4.3.3.ebuild 1346 BLAKE2B 453e184d956a71b41db687f010b9725d38ca812986568f14bd98a944a7a9e41ffe458d68e38ff39b384286a0229d39b62cf36c1d2497e544085799d8d3274bcb SHA512 0f822dd05016faf6be35047abf0a9f4f3580e770679d245253ddaef6f32f148be1fe6f9060283680559f6714b5da904a12ef4ecaad957ff611858abcd6117d2d
+MISC metadata.xml 480 BLAKE2B 1a8b338e4e8ebe5e8f9a4457cee52af1997664818100f2f4a3d7d36c1381825e48b5def55047b0e3ca063eb396ee83a7b173980801f10b3d99535c2efb77486d SHA512 947365f6269816228b3e0bf5f6109a7ca58dfe25929a419449e5d8d7789b9b008ae289f1f74831a3de3cb26f7ce05983801e8722102c9609e80c2f6fbd2d8b7b
diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.2.0_rc1-reallydie.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.2.0_rc1-reallydie.patch
deleted file mode 100644
index cba29eece374..000000000000
--- a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.2.0_rc1-reallydie.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ruN linux-gpib-kernel-4.2.0_rc1.orig/drivers/Makefile.am linux-gpib-kernel-4.2.0_rc1/drivers/Makefile.am
---- linux-gpib-kernel-4.2.0_rc1.orig/drivers/Makefile.am	2018-10-02 11:32:11.000000000 +0200
-+++ linux-gpib-kernel-4.2.0_rc1/drivers/Makefile.am	2018-10-09 12:03:21.272433209 +0200
-@@ -14,10 +14,8 @@
- 
- -include $(top_srcdir)/util/linux_flags/flags
- 
--#ignore errors from kernel's make modules in all-local, to avoid failure of make install
--#on nfs filesystem with root_squash
- all-local:
--	-$(MAKE) -C $(LINUX_SRCDIR) V=1 modules\
-+	$(MAKE) -C $(LINUX_SRCDIR) V=1 modules\
- 		CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/compat/include" \
- 		CONFIG_GPIB_ISA="$(ENABLE_ISA)" \
- 		SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)"
diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.2-returntype.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.2-returntype.patch
new file mode 100644
index 000000000000..88aa18081574
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.2-returntype.patch
@@ -0,0 +1,50 @@
+https://sourceforge.net/p/linux-gpib/code/1901/
+
+Index: linux-gpib-kernel/drivers/gpib/eastwood/fluke_gpib.c
+===================================================================
+--- linux-gpib-kernel/drivers/gpib/eastwood/fluke_gpib.c	(revision 1900)
++++ linux-gpib-kernel/drivers/gpib/eastwood/fluke_gpib.c	(revision 1901)
+@@ -114,15 +114,15 @@
+ 	fluke_private_t *priv = board->private_data;
+ 	return nec7210_update_status( board, &priv->nec7210_priv, clear_mask );
+ }
+-void fluke_primary_address(gpib_board_t *board, unsigned int address)
++int fluke_primary_address(gpib_board_t *board, unsigned int address)
+ {
+ 	fluke_private_t *priv = board->private_data;
+-	nec7210_primary_address(board, &priv->nec7210_priv, address);
++	return nec7210_primary_address(board, &priv->nec7210_priv, address);
+ }
+-void fluke_secondary_address(gpib_board_t *board, unsigned int address, int enable)
++int fluke_secondary_address(gpib_board_t *board, unsigned int address, int enable)
+ {
+ 	fluke_private_t *priv = board->private_data;
+-	nec7210_secondary_address(board, &priv->nec7210_priv, address, enable);
++	return nec7210_secondary_address(board, &priv->nec7210_priv, address, enable);
+ }
+ int fluke_parallel_poll(gpib_board_t *board, uint8_t *result)
+ {
+Index: linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c
+===================================================================
+--- linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c	(revision 1900)
++++ linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c	(revision 1901)
+@@ -100,15 +100,15 @@
+ 	fmh_gpib_private_t *priv = board->private_data;
+ 	return nec7210_update_status( board, &priv->nec7210_priv, clear_mask );
+ }
+-void fmh_gpib_primary_address(gpib_board_t *board, unsigned int address)
++int fmh_gpib_primary_address(gpib_board_t *board, unsigned int address)
+ {
+ 	fmh_gpib_private_t *priv = board->private_data;
+-	nec7210_primary_address(board, &priv->nec7210_priv, address);
++	return nec7210_primary_address(board, &priv->nec7210_priv, address);
+ }
+-void fmh_gpib_secondary_address(gpib_board_t *board, unsigned int address, int enable)
++int fmh_gpib_secondary_address(gpib_board_t *board, unsigned int address, int enable)
+ {
+ 	fmh_gpib_private_t *priv = board->private_data;
+-	nec7210_secondary_address(board, &priv->nec7210_priv, address, enable);
++	return nec7210_secondary_address(board, &priv->nec7210_priv, address, enable);
+ }
+ int fmh_gpib_parallel_poll(gpib_board_t *board, uint8_t *result)
+ {
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0.ebuild
index 0625c4d14816..388a9a97a8c8 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/linux-gpib/linux-gpib-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="debug"
 
 COMMONDEPEND=""
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2.ebuild
index 6a02d3641937..031ea6766820 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit linux-info linux-mod autotools toolchain-funcs
+inherit linux-info linux-mod toolchain-funcs
 
 DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware"
 HOMEPAGE="https://linux-gpib.sourceforge.io/"
@@ -11,33 +11,29 @@ SRC_URI="mirror://sourceforge/linux-gpib/linux-gpib-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="isa pcmcia debug"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
 
 COMMONDEPEND=""
 RDEPEND="${COMMONDEPEND}
+	acct-group/gpib
 	!<sci-libs/linux-gpib-4.2.0_rc1
 "
 DEPEND="${COMMONDEPEND}
 	virtual/pkgconfig"
 
+S=${WORKDIR}/linux-gpib-kernel-${PV}
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.0_rc1-reallydie.patch
+	"${FILESDIR}/${P}-returntype.patch"
 )
 
-S=${WORKDIR}/linux-gpib-kernel-${PV}
-
 pkg_setup() {
 	linux-mod_pkg_setup
 
 	if kernel_is -lt 2 6 8; then
 		die "Kernel versions older than 2.6.8 are not supported."
 	fi
-
-	# https://sourceforge.net/p/linux-gpib/bugs/43/
-	if use pcmcia && kernel_is -ge 2 6 38; then
-		die "pcmcia support is broken on kernels newer 2.6.38"
-	fi
 }
 
 src_unpack() {
@@ -45,18 +41,13 @@ src_unpack() {
 	unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz"
 }
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_configure() {
 	set_arch_to_kernel
-	econf \
-		$(use_enable isa) \
-		$(use_enable pcmcia) \
-		$(use_enable debug driver-debug) \
-		--with-linux-srcdir=${KV_DIR}
+
+	my_gpib_makeopts=''
+	use debug && my_gpib_makeopts+='GPIB-DEBUG=1 '
+
+	my_gpib_makeopts+="LINUX_SRCDIR=${KERNEL_DIR} "
 }
 
 src_compile() {
@@ -64,7 +55,8 @@ src_compile() {
 	emake \
 		DESTDIR="${D}" \
 		INSTALL_MOD_PATH="${D}" \
-		docdir=/usr/share/doc/${PF}/html
+		docdir=/usr/share/doc/${PF}/html \
+		${my_gpib_makeopts}
 }
 
 src_install() {
@@ -73,16 +65,9 @@ src_install() {
 		DESTDIR="${D}" \
 		INSTALL_MOD_PATH="${D}" \
 		DEPMOD="/bin/true" \
-		docdir=/usr/share/doc/${PF}/html install
+		docdir=/usr/share/doc/${PF}/html \
+		${my_gpib_makeopts} \
+		install
 
 	dodoc ChangeLog AUTHORS README* NEWS
 }
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-	enewgroup gpib
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-}
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3.ebuild
new file mode 100644
index 000000000000..5b209c4c2813
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware"
+HOMEPAGE="https://linux-gpib.sourceforge.io/"
+SRC_URI="mirror://sourceforge/linux-gpib/linux-gpib-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+COMMONDEPEND=""
+RDEPEND="${COMMONDEPEND}
+	acct-group/gpib
+	!<sci-libs/linux-gpib-4.2.0_rc1
+"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/linux-gpib-kernel-${PV}
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	if kernel_is -lt 2 6 8; then
+		die "Kernel versions older than 2.6.8 are not supported."
+	fi
+}
+
+src_unpack() {
+	default
+	unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz"
+}
+
+src_configure() {
+	set_arch_to_kernel
+
+	my_gpib_makeopts=''
+	use debug && my_gpib_makeopts+='GPIB-DEBUG=1 '
+
+	my_gpib_makeopts+="LINUX_SRCDIR=${KERNEL_DIR} "
+}
+
+src_compile() {
+	set_arch_to_kernel
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		docdir=/usr/share/doc/${PF}/html \
+		${my_gpib_makeopts}
+}
+
+src_install() {
+	set_arch_to_kernel
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		DEPMOD="/bin/true" \
+		docdir=/usr/share/doc/${PF}/html \
+		${my_gpib_makeopts} \
+		install
+
+	dodoc ChangeLog AUTHORS README* NEWS
+}
diff --git a/sci-libs/linux-gpib-modules/metadata.xml b/sci-libs/linux-gpib-modules/metadata.xml
index b53300ac1ed5..0781b9a96b94 100644
--- a/sci-libs/linux-gpib-modules/metadata.xml
+++ b/sci-libs/linux-gpib-modules/metadata.xml
@@ -9,9 +9,6 @@
     <email>sci-electronics@gentoo.org</email>
     <name>Gentoo Electronics Project</name>
   </maintainer>
-  <use>
-    <flag name="isa">Build ISA kernel modules; from 3.12 on the setting is ignored and the decision based on the kernel configuration</flag>
-  </use>
   <upstream>
     <remote-id type="sourceforge">linux-gpib</remote-id>
   </upstream>
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index 738a70440902..618ea5d017e0 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -1,8 +1,9 @@
-AUX linux-gpib-3.2.16-perl.patch 471 BLAKE2B a4cd09e10bd539b1ccb06e0272df923f52a196853c37276242fbb7545bc53915c751e2df1da8d13611e014e8ec4faf6f94746509d1d08c3aca127ce5ba2ebc14 SHA512 0ad75078406a8eb6fc09470be108464dcb3e7601d7a3c0813f1c6ba1d9e8f3895dea4da37f5d4928e6ea398a3aeea315a63bb6009a5fa211bba592093a776d10
 AUX linux-gpib-4.3.0-perl.patch 546 BLAKE2B 9695c1a9f48a2a8bcb5f5998c40eb909e6b1b3624defe87a08bc4b91b34f53e8176531678dff3d4810b0b85b811eb477795c0dffe0275b864c0e4d4bac9b0ea9 SHA512 21bf64366d4b68dcfc2f4fa932480f8ff6af62bf792fe90c0dd0330606c3b95c073040dfa87bd1e277391a02ad324612d58b6d618d83c637b3df60c638289d06
 DIST gpib_firmware-2006-11-12.tar.gz 169357 BLAKE2B 05f1be78545e025d76e2b9819a5dcac5a6715dfbb6df5c6fbe8b78900adf8ca7b1c28db350674ff1dd9c77e24507e98b536ca1af8b558c9a46ef8c25034c9769 SHA512 164d6fcfb3af43933f0a16645276f7d527a7aa24ef311f6ae3dcd7f45c41f92c855cf221bc946772f43fc2f9524057abc34bbd7d805c89b33ed7e111bc6870af
-DIST linux-gpib-4.2.0.tar.gz 1431440 BLAKE2B 7b6adf562963e0785f960c072f3f3d67cb91df9090205d8fecb0dc3170d3a1ac3719732919bae112e06b47387499ffe49a0144e72caa27ba39c85c8b98e56786 SHA512 1505c2c04f16bf7e92b9dd474f09edd242520a96f9e4d8eea88ebd44d0a82d653055155c1bfcde69da5355d609d400e3cb682da8aae83f59f1e565307a3fc4a7
 DIST linux-gpib-4.3.0.tar.gz 1375852 BLAKE2B e2daa444ddf4c0c34084f264247051d4ce1c8103d8ae5d91b02d4742131c1f92ded02775eb0f8b0ea29820e2ae7b61c3132c74084a876e86fbb4efaf11688773 SHA512 8db4eb6d606c68ffacc67988479684fec815fc552756a6c93466ef0dfc93368771bb551944e3afc31db83e72e464ec1fb289fdcf80b4a6be1617e734fe3b9d65
-EBUILD linux-gpib-4.2.0.ebuild 4612 BLAKE2B 615e338921fc8e4ee0d8e1b05de672fda188304c2d7c32b5a69e61e8beca401fb41026f96c84b64c8342377f88377b63a23d63e3975cec5ba65a7f2a80a464f2 SHA512 ed9f110809fd08dfdac987d9dafc475207e4d58c4c72878c40dfe2b538fcfcb73bc51865a3cd4cd37f23900db24cdc3d0b699ed11b8774b21f241754219e6a30
-EBUILD linux-gpib-4.3.0.ebuild 4812 BLAKE2B 7935aa4744316215aa91f057cbb5b7efd49d12eec852d0ee1ed176b6c4dc4929c8c6c7b0d716d21706020d12bf00c9f46cd28894a272516266a07a8f3571f005 SHA512 13b3fa6233b0c85a96ea9280af8f1ecadadc7265587e7349b1da713ccab2f981baa44c685f9bf3a24549e6eb1b3417899f151fb72f0467c4a65d713bca36d463
+DIST linux-gpib-4.3.2.tar.gz 1377406 BLAKE2B 57ec8b3788606ffb42d204ad0e2476c432bc82f929b1854c6a1d48c73f48a149716d05b13906b4597a4bf03e4c10a0ffe2c66e6de8cf9a5891b86c3d459713fc SHA512 bf9963d885e0c974f41eed96359501bd41c7d4f051026f64d835e52f1031f39e6bba6ce976a27e660a8b36087e56b81205206066c68b42db9a1d578d351a8f8b
+DIST linux-gpib-4.3.3.tar.gz 1381420 BLAKE2B 0ee8c4d740272a55be03f07bd49c9a93d0ec4808465c9b0abc4ede2ee9ef4bcb8a48fb8c98617d007c8b7af970eae185de65094a8814b05cb81bfc983bf9df3e SHA512 91b2c345dc82778b757122dc41ae74138831223a73057ddf9f04d10b8f6a059760e17134378df46a1ecb13c42bec1383aced0f2446f803af425391193a77066e
+EBUILD linux-gpib-4.3.0.ebuild 4801 BLAKE2B 88f8ec7539c6122153a64ac9e98e8862b3d2305384d2078aa93ab527544b73a5b9b7f6cf0eea3066910df96851db2a28fdaefccdd5dc446381f21fd02432c0a6 SHA512 35c4aded7b76f99fd35284b82ef146b30e02eae6b048f3d3ed121107442a2a971fe24457821f33a6dc72bec95fa551cff5a3f306f9673c82bf6ed13e4a37da11
+EBUILD linux-gpib-4.3.2.ebuild 4802 BLAKE2B 3933dc6f69e8669db481d0a40aa45eb6dde87595c81ad0786a733c36a8d55c22cb1eeb22e42e34b827c439a848e269429f07880c64e1d62389f711b2531e51ec SHA512 6fcabb1a21a0e52fd09fa280303baea2efe31635e79689f827a46a243e00810ea0799860e42aac9d9eb7350487fe99896e65a8c489a8b2d4036fdb6b91b1e8cd
+EBUILD linux-gpib-4.3.3.ebuild 4802 BLAKE2B 3933dc6f69e8669db481d0a40aa45eb6dde87595c81ad0786a733c36a8d55c22cb1eeb22e42e34b827c439a848e269429f07880c64e1d62389f711b2531e51ec SHA512 6fcabb1a21a0e52fd09fa280303baea2efe31635e79689f827a46a243e00810ea0799860e42aac9d9eb7350487fe99896e65a8c489a8b2d4036fdb6b91b1e8cd
 MISC metadata.xml 547 BLAKE2B 1d0da80dd999dc402dbcdc80628e1fe97ec648b806cbd17cf20f6cbc33279afad81f71728e944a600108f28f90a61111e6bd9c36c7908a557d6cca6e41cdc759 SHA512 a88766b0372a88d090c032b45a973cf087a2172b088396fd1706a7c3818d6bf220de26848cb844d2ed555e3067bda6a00ffff598e0a0a59009ce33b3230b68a1
diff --git a/sci-libs/linux-gpib/files/linux-gpib-3.2.16-perl.patch b/sci-libs/linux-gpib/files/linux-gpib-3.2.16-perl.patch
deleted file mode 100644
index 16f2f15b0ad7..000000000000
--- a/sci-libs/linux-gpib/files/linux-gpib-3.2.16-perl.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -ruN linux-gpib-3.2.16.orig/language/Makefile.am linux-gpib-3.2.16/language/Makefile.am
---- linux-gpib-3.2.16.orig/language/Makefile.am	2009-09-16 19:26:53.000000000 +0200
-+++ linux-gpib-3.2.16/language/Makefile.am	2011-08-14 03:32:53.000000000 +0200
-@@ -67,4 +67,4 @@
- 	$(RM) perl/Makefile
- 
- perl/Makefile:
--	-(cd perl && $(PERL) Makefile.PL)
-+	-(cd perl && $(PERL) Makefile.PL PREFIX=$(EPREFIX)/usr INSTALLDIRS=vendor INSTALLMAN3DIR='none' DESTDIR="$(DESTDIR)" )
diff --git a/sci-libs/linux-gpib/linux-gpib-4.3.0.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.0.ebuild
index 7e91689d224e..ae944aeda719 100644
--- a/sci-libs/linux-gpib/linux-gpib-4.3.0.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-4.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="pcmcia static guile perl php python tcl doc firmware"
 
 S="${WORKDIR}/${PN}-user-${PV}"
diff --git a/sci-libs/linux-gpib/linux-gpib-4.2.0.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.2.ebuild
index df557833f062..91351386ba0b 100644
--- a/sci-libs/linux-gpib/linux-gpib-4.2.0.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-4.3.2.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
-inherit readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev user
+inherit readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev
 
 DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware"
 HOMEPAGE="https://linux-gpib.sourceforge.io/"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="pcmcia static guile perl php python tcl doc firmware"
 
 S="${WORKDIR}/${PN}-user-${PV}"
@@ -29,6 +29,7 @@ COMMONDEPEND="
 	python? ( ${PYTHON_DEPS} )
 	firmware? ( sys-apps/fxload )"
 RDEPEND="${COMMONDEPEND}
+	acct-group/gpib
 	~sci-libs/linux-gpib-modules-${PV}
 "
 DEPEND="${COMMONDEPEND}
@@ -39,7 +40,7 @@ DEPEND="${COMMONDEPEND}
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.16-perl.patch
+	"${FILESDIR}"/${PN}-4.3.0-perl.patch
 )
 
 pkg_setup() {
@@ -108,7 +109,6 @@ src_install() {
 	newins util/templates/gpib.conf gpib.conf.example
 
 	if use pcmcia; then
-		dodir /etc/pcmcia
 		insinto /etc/pcmcia
 		doins "${S}"/etc/pcmcia/*
 	fi
@@ -121,6 +121,14 @@ src_install() {
 	done
 
 	DOC_CONTENTS="
+As the udev rules were changed and refactored in this release it is
+necessary to remove any manually installed pre-4.3.0 gpib udev rules files
+in /etc/udev/rules.d/. The files to remove are:
+\n
+	99-agilent_82357a.rules\n
+	99-gpib-generic.rules\n
+	99-ni_usb_gpib.rules\n
+\n
 You need to run the 'gpib_config' utility to setup the driver before
 you can use it. In order to do it automatically you can add to your
 start script something like this (supposing the appropriate driver
@@ -165,11 +173,6 @@ gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bi
 	readme.gentoo_create_doc
 }
 
-pkg_preinst() {
-	use perl && perl_set_version
-	enewgroup gpib
-}
-
 pkg_postinst() {
 	readme.gentoo_print_elog
 }
diff --git a/sci-libs/linux-gpib/linux-gpib-4.3.3.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.3.ebuild
new file mode 100644
index 000000000000..91351386ba0b
--- /dev/null
+++ b/sci-libs/linux-gpib/linux-gpib-4.3.3.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+
+inherit readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev
+
+DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware"
+HOMEPAGE="https://linux-gpib.sourceforge.io/"
+SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
+	firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="pcmcia static guile perl php python tcl doc firmware"
+
+S="${WORKDIR}/${PN}-user-${PV}"
+
+COMMONDEPEND="
+	sys-libs/readline:=
+	tcl? ( dev-lang/tcl:0= )
+	guile? ( dev-scheme/guile:12 )
+	perl? ( dev-lang/perl:= )
+	php? ( dev-lang/php:= )
+	python? ( ${PYTHON_DEPS} )
+	firmware? ( sys-apps/fxload )"
+RDEPEND="${COMMONDEPEND}
+	acct-group/gpib
+	~sci-libs/linux-gpib-modules-${PV}
+"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/docbook-sgml-utils )
+	perl? ( virtual/perl-ExtUtils-MakeMaker )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.0-perl.patch
+)
+
+pkg_setup() {
+	use perl && perl_set_version
+	use python && python_setup
+}
+
+src_unpack() {
+	default
+	unpack "${WORKDIR}/${P}/${PN}-user-${PV}.tar.gz"
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static) \
+		$(use_enable guile guile-binding) \
+		$(use_enable perl perl-binding) \
+		$(use_enable php php-binding) \
+		$(use_enable python python-binding) \
+		$(use_enable tcl tcl-binding) \
+		$(use_enable doc documentation)
+}
+
+src_compile() {
+	FIRM_DIR=/usr/share/usb
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
+		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
+		USB_FIRMWARE_DIR=${FIRM_DIR} \
+		docdir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	FIRM_DIR=/usr/share/usb
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
+		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
+		USB_FIRMWARE_DIR=${FIRM_DIR} \
+		docdir=/usr/share/doc/${PF}/html install
+
+	if use perl; then
+		einfo "Installing perl module"
+		cd "${S}"/language/perl || die
+		DESTDIR=${D} emake install
+		perl_fix_packlist
+		perl_delete_emptybsdir
+		cd "${S}" || die
+	fi
+
+	echo "KERNEL==\"gpib[0-9]*\",	MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules
+	udev_dorules 99-gpib.rules
+
+	dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS
+
+	insinto /etc
+	newins util/templates/gpib.conf gpib.conf
+	newins util/templates/gpib.conf gpib.conf.example
+
+	if use pcmcia; then
+		insinto /etc/pcmcia
+		doins "${S}"/etc/pcmcia/*
+	fi
+
+	# fix rules files
+	local f
+	find "${D}$(get_udevdir)"/rules.d -type f -print0 | while read -rd '' f ; do
+		grep -q "${D}" "${f}" && einfo "File ${f} contains a temporary path, fixing."
+		sed -i -e "s:${D}:/:g" "${f}"
+	done
+
+	DOC_CONTENTS="
+As the udev rules were changed and refactored in this release it is
+necessary to remove any manually installed pre-4.3.0 gpib udev rules files
+in /etc/udev/rules.d/. The files to remove are:
+\n
+	99-agilent_82357a.rules\n
+	99-gpib-generic.rules\n
+	99-ni_usb_gpib.rules\n
+\n
+You need to run the 'gpib_config' utility to setup the driver before
+you can use it. In order to do it automatically you can add to your
+start script something like this (supposing the appropriate driver
+is loaded on the startup):
+\n
+		gpib_config --minor 0
+\n
+To give a user access to the computer's gpib board you will have to add
+them to the group 'gpib' or, you could change the permissions on the device
+files /dev/gpib[0-15] to something you like better, using 'chmod'
+\n
+Edit /etc/gpib.conf to match your interface board, and any devices you wish
+to open via ibfind().  See the documentation in /usr/share/linux-gpib/html for
+more information.
+\n
+"
+
+	if use pcmcia; then
+		DOC_CONTENTS+='
+For PCMCIA cards:\n
+All files needed for a PCMCIA board were copied to /etc/pcmcia.
+You may wish to edit the options passed to the gpib_config call in the
+/etc/pcmcia/linux-gpib-pcmcia script.
+You may need to send a SIGHUP signal to the cardmgr daemon to force it
+to reload the files in /etc/pcmcia \(alternatively you could use your
+pcmcia init.d script to restart the cardmgr, or you could just reboot\).
+The driver module will be loaded as needed by the cardmgr.
+
+'
+	fi
+
+	if use firmware; then
+		DOC_CONTENTS+='
+For Agilent \(HP\) 82341C and 82341D cards:
+The firmware for these boards is uploaded by passing the appropriate
+firmware file from /usr/share/linux-gpib/hp_82341 directory to
+gpib_config using the -I or --init-data command line option. Example:\n
+gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin
+'
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index dbf704875294..55f332f70562 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -2,5 +2,5 @@ AUX opencascade-7.4.0-find-qt.patch 3349 BLAKE2B 6520b3242927c86c4958f81f8a94e89
 AUX opencascade-7.4.0-fix-install.patch 7870 BLAKE2B 4842ad5123a06a53b81ca80e4152434ee6d78a9eb5436a7a9f899651fcdb45a6f403f31bd6e4225611c1085fb91eb7a5640e5bb3fd49b71295ad0868b8e018dd SHA512 5315e82bd03a8782df8c72bbfb334d9cf739dd53f3aa22649f087c1b8b7fa5f88f7a80850c1f2e0c9dffd80a77dd99fd36e9674463535cbf48b896596c24f38e
 AUX opencascade-7.4.0.env.in 4611 BLAKE2B 3593cd4e05d33e466a975cf4641c56cd8e686310a148cc684591d3e08f8c4efd86e4df13500f11845e425b056b9c2c42f0f27a2a4d8cea524dc8fbb1c7dad703 SHA512 25f65e2b1e91fa78313334dab7d19b115bb7ff97ccefe7d18c45ab1817e12e10fdbe36babcb22e2a0d52bf7a0fbbdd2937523b773ddbb37635c1dd0d14de6253
 DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f SHA512 eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a
-EBUILD opencascade-7.4.0.ebuild 3775 BLAKE2B f0a7df2574a439e4f948a11f883afcbc1314c482e1fa77f9344f41d7a0e2d5379fdcd9069c91f933cd07432ffc1bd5258c34a629d8611f245efc6c46367ee5f5 SHA512 68a3ef0d24c497c9184da1fec1206715212d9448994d0b904e42b174e0e177348af312d42b4e91faca5995e45508edd5cfa97ecdcb5605e5cb612a69037c7ff3
+EBUILD opencascade-7.4.0-r2.ebuild 3778 BLAKE2B a672398e2cfcfdf64d597d0ff8f6c5cc737cf92baa49dc2d8bfe91f69291244c1ad116ba2cf09121676d6f37a8ae202acad7a87181425435a004635792882c27 SHA512 506d962f3393526f73f19631c9c5416968a84e717da5d949e906b42b200b91acbe3c18a810adcf94ed335c41733243a92ea5e4dcfd8010c6a7608ede7b172e68
 MISC metadata.xml 887 BLAKE2B 1b9179667b3bb44f0b2c761f8dfed80f804c7313900087a2e61ce7a43ad140b7cb5a15ac0428d3ca0a7ba1087ac0f9014f0fa12d591a34b44a14edb90bfa57f5 SHA512 0d13482fbba741097d384878c333fbf4ed68bafbf4901dd296d1381953eee14112e03ec4bdeb817bdbba9ec5b0b2356d9eccc65cdebba4a47832446c263988f9
diff --git a/sci-libs/opencascade/opencascade-7.4.0.ebuild b/sci-libs/opencascade/opencascade-7.4.0-r2.ebuild
index 871c8a8e49c2..5abfadcc3ce5 100644
--- a/sci-libs/opencascade/opencascade-7.4.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r2.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 	virtual/glu
 	virtual/opengl
 	x11-libs/libXmu
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? ( media-video/ffmpeg )
 	freeimage? ( media-libs/freeimage )
 	java? ( virtual/jdk:1.8 )
 	qt5? (
@@ -92,7 +92,7 @@ src_configure() {
 		-DBUILD_Inspector=$(usex inspector)
 		-DBUILD_WITH_DEBUG=$(usex debug)
 		-DCMAKE_CONFIGURATION_TYPES="Gentoo"
-		-DCMAKE_INSTALL_PREFIX="/usr/$(get_libdir)/${PF}/ros"
+		-DCMAKE_INSTALL_PREFIX="/usr/$(get_libdir)/${P}/ros"
 		-DINSTALL_DIR_DOC="/usr/share/doc/${PF}"
 		-DINSTALL_DIR_CMAKE="/usr/$(get_libdir)/cmake"
 #		-DINSTALL_DOC_Overview=$(usex doc)
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 6ef3bb7d5691..25cd128228e9 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,8 +1,11 @@
 DIST proj-6.2.1.tar.gz 2698759 BLAKE2B 69867c05ef727df63351bbb8bc787d039c6a333a6e28b5fbbd1814fd9ca3ec279dd58ee7f0f79c3601ced270b6fa38619120e58f4407c49890a74996bbf88da5 SHA512 1e8632a9c6fa00c0354473f60d81e4644f173b42f6613856ba03e2404f429864fd5052aacba945ccd265173397bed2abdbe325320b54bc7b1c4a75ad95395a89
 DIST proj-6.3.0.tar.gz 2758388 BLAKE2B 33f9d6ce6aa885667b7c1337abd218ee802581320880288f948378073d04c46118927147794ce6c97616c906c683c33bf10984d08463faea214ffbe80b12d62b SHA512 679fd2e57f27feeb956d2a8843cb9028895a78f0dac104c920cc9060afade434b953fb381fed350e5c8ac15cd796f795220e0f1ad276a4f7482d6e7f5681d06e
+DIST proj-7.0.0.tar.gz 2893700 BLAKE2B a115bea09093cbd412cff439abb0f381fe7edc21aa118534e0d8844672a3497a9608ef8072e6aff850a3d70bc3df0fd4c4d4dbc3409ef2e975c84eac6a3dc83a SHA512 fd92937656c85c7f6969947323fa2752df0c931dd9c942b11c67dcae132f61f404c8da57ed7e7177aaa82f579e42b1c3611e6c2cc34d70454e548ad8afece243
 DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
 DIST proj-datumgrid-europe-1.4.tar.gz 26115747 BLAKE2B 3dfb5c19362f9d9cdfc4ee5469e536b97d963a5ac3bcf6652ef5935ec393f4035bc15abc444d62cfa477478faabd66a8effe64dbb8eb26b7d73a717b4eae2e53 SHA512 4043c0791af086541a3e08f7ad667b25968ed25e6595c1f047e1272f52838d28ab4010a076f9524882f97d7aa9104769c0b9cdf17394915c5b70b0dc13e019ee
 DIST proj-datumgrid-europe-1.5.tar.gz 187195036 BLAKE2B 0f88922435793930e21ace8488e0d1cd6a6325880f90d61a91d1592e51191514db7fc93e08c4a6c51699e3eb43762786d11eea425c181a8d3f73ec5ad7848092 SHA512 456a8c27dad7ef8fc1790ef822e7e8dcbc69b79e0a28df8c6b58d24b0ef4a3221cebd8e911a0d84b7f00694247b0fb8f4361a38d7369f921da000c838812f389
+DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d67e1913656c2380a3663b4359cb97576ff5954dbea5890862869bb1077f6cde760dada4d9f13201c5b2c29ef3458a8b43089e459c SHA512 463d2575d5ce6f5984e69897c34ef80ec31a77f5ba00a07a5f55e97c3033dbae40b7d17891e5495bc47e6faf917968b1cdb7b3be9b2a4838e3b093b74753c2a8
 EBUILD proj-6.2.1.ebuild 1118 BLAKE2B efc31b3a18898c9fbf064d556a51b660bfabb2db0d08352d01367a2f1c88376d993dfeeee67556d5d65b57e22997e150a9ab80b90d497bf7d2a65487ea8b1108 SHA512 88101056c9660c8c088fc05592fbcb7c258c837aaad55971f4d7939c1ae79b51bb5069b963b8c6cfbedbfb4a54a0b9ce7324c6b056a8f4883e01e273b5bddde4
 EBUILD proj-6.3.0.ebuild 1123 BLAKE2B 27a3e1372aa2c62063b16caf2d9479d8d67092f9a6e3a0f7a1a3f7f2b52bb08694a358567d36fb96c8c4a5e1fca3ef24f8eded6834f3a0f9c787bb8ba3d204f1 SHA512 7f4a6c73f17a96e95848a81be7c3821deae554719db75ae02649b2430bb5b3e73b1c27e80cf66841820c59de825a9caed11d39c707c29d988641554db7787872
+EBUILD proj-7.0.0.ebuild 1123 BLAKE2B b00047d3e07c603ffaa69a3a485e54fad0d2f4bcc3f583b1f50e6bd5d076a9a556a5661eda7077284d90f2cca81dcf6cf617e867956e5f06df6befe8a11ce8e8 SHA512 06c3f0e13d864155fd3164ddb826e479fc6db8e5256f9a0cc86010e8ffac1ac768cb6039ad93887b69ebb467a1cab5d00af4bfdc1e204672d985e917ce6ddaa3
 MISC metadata.xml 513 BLAKE2B 4068b4ddcb4e95578df8da19650ab86b4dbfdba294a3d03f10ada37a578a2113b0d71720545c269b1c097d3a37dbc66ee0cdfe61889466171c109413088707fd SHA512 e841ea4fb30d3632fecca7d584121fce35dff2b23ad8a1feeb98a47f0a3b1d78f57a05b0d303aeff47f981f5b7feb831deb14644ab6615644c0a8593a6e321b3
diff --git a/sci-libs/proj/proj-7.0.0.ebuild b/sci-libs/proj/proj-7.0.0.ebuild
new file mode 100644
index 000000000000..1864512c1dcd
--- /dev/null
+++ b/sci-libs/proj/proj-7.0.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
+EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.6.tar.gz"
+
+DESCRIPTION="PROJ coordinate transformation software"
+HOMEPAGE="https://proj4.org/"
+SRC_URI="
+	https://download.osgeo.org/proj/${P}.tar.gz
+	https://download.osgeo.org/proj/${DATUMGRID}
+	europe? ( https://download.osgeo.org/proj/${EUROPE_DATUMGRID} )
+"
+
+LICENSE="MIT"
+SLOT="0/19"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="europe static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( !europe )"
+
+RDEPEND="dev-db/sqlite:3"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"/data || die
+	mv README README.DATA || die
+	unpack ${DATUMGRID}
+	use europe && unpack ${EUROPE_DATUMGRID}
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--without-jni
+}
+
+src_install() {
+	default
+	cd data || die
+	dodoc README.{DATA,DATUMGRID}
+	use europe && dodoc README.EUROPE
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/scalapack/Manifest b/sci-libs/scalapack/Manifest
index 803c2f29f976..c5520bd7d9d6 100644
--- a/sci-libs/scalapack/Manifest
+++ b/sci-libs/scalapack/Manifest
@@ -1,4 +1,6 @@
 AUX scalapack-2.0.2-libdir.patch 2159 BLAKE2B e96c845a6e841b8a432268b76755d92158ef880cff11b8925c82651cb2fda736e60da94ea075b44eff9f7a0e00854ac81308d762523351b68b66a782e131aa3a SHA512 40fa841fe31c6665eab09065eed8f5aed8ed48a8e2211ee5fd9365c5c101a2d7167c9d084628ee5f5a26475599a210c4011ce4a207c8df677cf72a67b6a26cac
 DIST scalapack-2.0.2.tgz 4779534 BLAKE2B c2aabd87bc8f7c0d9af31bd8ad8c933703dcbba399658d15c1e5256da2350c1a0feac2ca4a205f697b1c48083df89cbcd64ba432da036081c0f33d5d2acddc9b SHA512 92c71d3de0900955511c527ab3ca57ff69d6d9edc390e69f93ac3769d32ce83a714326bcb6218c8c74b8874be2fdc8aad5e42c912a12581e8d4ce8829ea39248
+DIST scalapack-2.1.0.tgz 5307441 BLAKE2B 4aea055fc3e437bce7108d1555e93c50109bcfe84354903fd711509eedbe686349fda4030e2fa70faf1a9e7e3255e46e48c32b96a2916af6812b8aebceb750c2 SHA512 0e77fb535ebcc28e2d97499ef4bd5161f76ca0ba4a3e308c26ce5071cfc4be4f3814262f3fb38f378ce0b5b31c0913432fea00a1e9e3f7717b853d1182bdf5b4
 EBUILD scalapack-2.0.2-r1.ebuild 1650 BLAKE2B 994af8b82c1dd33292d34efd80394f8f641eec7d3735629c548c0a133943f56ad78582a2c21a7690f27577e3051800a454ce6bb0b3381bf43c792fa303dc184d SHA512 4a9e044a73dfe07273d4e5f5fab01895cb18e3e20ccbd077540571f75442e438ff8fa9e62259d085f1dd63f3901e2879366f9b1e2c28e409bf8c1d0d5f248897
+EBUILD scalapack-2.1.0.ebuild 1618 BLAKE2B d49a7ca245711d5b03cf59da0a4822ac697e2e9a5d5bb52b6df39f7303703b7e0a2b0e43e325556b2768aa919b189f02303976b8b34a996cf5e4e07655457e7d SHA512 aadafbf4591511d6d97fca62314ad142731509caf4c00ea516d53060480448cc3d0d1f94ecad9adc7dde175793885d835353def4d3b719d85af20b2c874b4a75
 MISC metadata.xml 662 BLAKE2B aacea4e0ad09d68f6d953ba2eeac01ffe9660d389271be5335686b2f2d1000ddc79e0a7f24e506749d57f5e6adc3c7f1f82f3d758fe1d62145dea29d5dcc05f4 SHA512 90820c7f860bfabd8b057277a967bffac6af9d12c334a5813ea4fc75cbdf90d63e5e8d8ec04d5c28e819785dafbbe698ca8e5933f97102c1369727a8a9eaa5b0
diff --git a/sci-libs/scalapack/scalapack-2.1.0.ebuild b/sci-libs/scalapack/scalapack-2.1.0.ebuild
new file mode 100644
index 000000000000..a1979a20ad64
--- /dev/null
+++ b/sci-libs/scalapack/scalapack-2.1.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils fortran-2 toolchain-funcs
+
+DESCRIPTION="Subset of LAPACK routines redesigned for heterogenous (MPI) computing"
+HOMEPAGE="https://www.netlib.org/scalapack/"
+SRC_URI="https://www.netlib.org/scalapack/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/lapack
+	virtual/mpi"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use static-libs; then
+		mkdir "${WORKDIR}/${PN}_static" || die
+	fi
+	# mpi does not have a pc file
+	sed -i -e 's/mpi//' scalapack.pc.in || die
+}
+
+src_configure() {
+	scalapack_configure() {
+		local mycmakeargs=(
+			-DUSE_OPTIMIZED_LAPACK_BLAS=ON
+			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
+			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
+			-DBUILD_TESTING=$(usex test)
+			$@
+		)
+		cmake-utils_src_configure
+	}
+
+	scalapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
+	use static-libs && \
+		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" scalapack_configure \
+		-DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use static-libs && \
+		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	use static-libs && \
+		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install
+
+	insinto /usr/include/blacs
+	doins BLACS/SRC/*.h
+
+	insinto /usr/include/scalapack
+	doins PBLAS/SRC/*.h
+}
diff --git a/sci-libs/scikits/Manifest b/sci-libs/scikits/Manifest
index 2e0abfd81f1f..cf5a81b059d4 100644
--- a/sci-libs/scikits/Manifest
+++ b/sci-libs/scikits/Manifest
@@ -1,4 +1,4 @@
 DIST scikits.example-0.1.tar.gz 2401 BLAKE2B 4c67adb2e74be9c94d68e99bf44017eb75c054608b69045523c5cfeee18edb01384640e8ed3cba4765bc181e7dfb9a2e70d1a97ad2b6176d2df7112172adce55 SHA512 9e5534a9f12f5a11e7f9d7c3d4f16cdbfa34293b29882e6bc9ec597b6e7ac306cc65e2b197da8c0bfc8e319b01db31f34b06018b5420c3ad68e8cc3f490259e1
 EBUILD scikits-0.1-r1.ebuild 738 BLAKE2B 567a32a5ab294ba1d053bcbebf68da3998c633f9e6a943180bc968a2ac0b2ea5140ace14456b77f499ecc4b20dd82417e74c8a5959c8245e43cfd95ec2fc9f0d SHA512 c2c03a129d86ca4e68a99302375a811abfa4a750750425713c91d51ef58ba203bbd46e4ddd2f9f2841b9d61f4a5c06da6b8bb9b2111e56111d581028d73d535b
-EBUILD scikits-0.1-r2.ebuild 744 BLAKE2B 8ac4c054c91c535cd0dd12bcc5463e9e709d8d7b32ed3ed8788c68b048ced9db8dd66a62b44f822eb5ba4b07c2ac15baf1aa5b8a49c8d1a7314928fa8425b0cc SHA512 464ec5457894c5676b1982d6a6b400f336b76ac914fc1d9b92f4485068143dd0aef78c419e708c703b761d46bca9422921cc1fb06cc413cf1c361fefc9a29ab7
+EBUILD scikits-0.1-r2.ebuild 742 BLAKE2B 7a9f7681cd5688149fed5f7a54abc1e955006e0dd466c0301892a2d0e2e78c433788112cfab1d7eb6e851dca08def7840ddeb919b82cbdb7c7b44010781d95ee SHA512 fa4fbb0adbc65ea1a747ed150b67d0d5457e2ed689df46b04d658ae6a8a4f6082c66335c6e70a090e1fddb3d914e284fa365897cd5f7f92f842f4cd81370ff03
 MISC metadata.xml 454 BLAKE2B 65b13370ebd7fdc79632a088b403f493076c87a0ccc49b64946c7ed0050fcfd85f7ac0fce2fa853e1be0944d0ee1628470dadb4124448e7a746bdb864ffe9977 SHA512 b33fed7d1199471c4a86dadf1aa90951035fe49c76df9310de4ed13c391b92782230308a55a33c7fa88f5bd42b8718fe5f6ac88c0a8c1818848a447c4c1d0eb8
diff --git a/sci-libs/scikits/scikits-0.1-r2.ebuild b/sci-libs/scikits/scikits-0.1-r2.ebuild
index 40d020bef608..fd16206e1caa 100644
--- a/sci-libs/scikits/scikits-0.1-r2.ebuild
+++ b/sci-libs/scikits/scikits-0.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}.example/${PN}.example-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index e6a480273e7c..eb90fd3650db 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -7,5 +7,5 @@ DIST scikits_learn-0.22.2_p1.tar.gz 7034850 BLAKE2B 41c362ef6594e837a9fc798837e6
 EBUILD scikits_learn-0.19.0-r1.ebuild 2836 BLAKE2B 06bc03dbe61c8afbf4c83f006d23bd4255979fa7a1091aceb9a78b051dee64f721215122196e66dc93b4a47fdac0337e2a75544693104825ea38879837fbbb30 SHA512 3c87b6a8cc2fd1af8614b809f5ff533d2db2f1d1240162a697aaa392b9143d6ac1e5680d423c104fd71051c70bc3fd4caa874b80a4c866341a6bd70bad575454
 EBUILD scikits_learn-0.20.2.ebuild 2888 BLAKE2B 91ecea16f8ca17dcd04519b510c61deb9e78d14362ea3e4f4902bce7a7189577ccb96dc92b530b547389a7c65b957ffa705ca25b680c777453fa1c29c876eefd SHA512 3deb10f3314abb6e82a4e118362724147f09b2104db90cdb7bfe98d804828136a590f0aec53ec873a3c8d718009ff946c660e9efd750d3d550be91c0847e03fc
 EBUILD scikits_learn-0.20.4.ebuild 2888 BLAKE2B 91ecea16f8ca17dcd04519b510c61deb9e78d14362ea3e4f4902bce7a7189577ccb96dc92b530b547389a7c65b957ffa705ca25b680c777453fa1c29c876eefd SHA512 3deb10f3314abb6e82a4e118362724147f09b2104db90cdb7bfe98d804828136a590f0aec53ec873a3c8d718009ff946c660e9efd750d3d550be91c0847e03fc
-EBUILD scikits_learn-0.22.2_p1.ebuild 1759 BLAKE2B 083162faf241e37c8ed611b9192fd6cd1fbb0112d56d315d2045c6b466e9d0bf7621577b4ff65ac37f9eee46f433b06891a8ad9961e1cc4cf017a0a76cab6025 SHA512 1ff3d30f691597e2bf262c8a3d4e792ee06319792f99fdd757114a020b024f1f1b537fb88bbbc90c1253a28414f856c28e2440fea021877a4ec17ac0bd4fb270
+EBUILD scikits_learn-0.22.2_p1.ebuild 1757 BLAKE2B 608ddd71de9cf35581e880e972ed4b93a3a1126ac7aa112ca6072ada218e4fc6fcaae060d1699347fd981d7f2d11f885d984a521857bcb03bc79b28d5c2605a3 SHA512 0c3fd91a18eb48545a0bb02ebc2739ac04873d46151101ec7eecac30e7ad2c9b67392d4919fb60e626dada56655cb53ef3558e32a71bf77505bc6ab1121386fa
 MISC metadata.xml 605 BLAKE2B 46a657647a79f0a23cc07b39877b1e57158cdf94d9478c3aa4e7af0dbdbf60acf996d1431076697db764d42bec0d5e0517c1247e91dc36e85823a45784d00e71 SHA512 e14b6835108fa80eca44bab635c9a229da65f048ffcee16cd4ad7736c3a0fb364c94ff0bd9630030653bd3cd78d8dced191c43c7e5aacb3a7f6e61ac45b5bb3d
diff --git a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
index 804ed2914a01..3e4407171f76 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/sci-libs/scipy-python2/Manifest b/sci-libs/scipy-python2/Manifest
index abf28d3aafa4..fbaf34f82f5c 100644
--- a/sci-libs/scipy-python2/Manifest
+++ b/sci-libs/scipy-python2/Manifest
@@ -1,3 +1,5 @@
 DIST scipy-1.1.0.tar.gz 15583560 BLAKE2B 477753e622ee26a3bc8c2cb6829410152df84b29ce17a6d53a66348f5536f7993fedf5d32b782405b54b3af3feabf9bc91c381ed39546076849c2fdb71039404 SHA512 72fe32c6c009613cb78202598e5db14f8e630b3218839cfe18d43d40550d94cc5aa100c6f5d41f40e86ae148e9b6a13431bb91b0f9be44b0569ccd7b725fe973
+DIST scipy-1.2.3.tar.gz 23335997 BLAKE2B 183a0e8266a6fa08ca4fa05511d28f51a5ff9b3e8d00c24a355d2db00327eb973befbefbcf47cb288aafd60718db903ac29f775f519484a7c6d0919693c0a21f SHA512 d7739fa2f25689fc14ddf09477207c990b39b593a85f5c74687df1ffe097f6eee1bb2123aaa286189309f6d3b25cdd7757053d8b1008d1d6b3367a8e3a0a53b1
 EBUILD scipy-python2-1.1.0.ebuild 3628 BLAKE2B c4fc9703dd9ca163fe298bb3d1d37c72ed7a0bd0b559029cbe988b91b2f705df438d5a8f3fc2e7a78975c93d8cdefc35cf05abfead68177a391e8ff2f0e16ea4 SHA512 dcacd321b5828901290078a4e41618d19d21a6253ee0d8db6c73c247477f31343b8a3c86e9f2098f04abc70f2bc27772b2e41d09722d2d5631cc7f9595d40395
+EBUILD scipy-python2-1.2.3.ebuild 3645 BLAKE2B 1046f2e2bf1fc8ca276706c50f7043ee83d105a384f6b473bf649d738a4f6201ccd719756d4bc77a91b8afb56cde1414a0c14e9640f7b6d8e497bf294a9fcf9d SHA512 2c629e5b399e8a86b15f0b12b1657c5e3cc362a79415ae75f20ba037f36037b39ebcfb3531fc7d3206bae060c7be82954d04fa3b96e8c7f3291dc4cbbc354d7b
 MISC metadata.xml 945 BLAKE2B 52bc24aea94ec233940c12969222f7ad3c8b9760b08a608bf6dc6d320b4a519a27103c2f11d720490c933f90a31fe3fb503694bd067136975617c50efa3c5d47 SHA512 7ab95c274799a7852968c63ca6f05c302d4e478d9e195980859b960ec2f2b1146c1c12674d737f324101383155387429ec1c05f779888819503feebf1e38e6c4
diff --git a/sci-libs/scipy-python2/scipy-python2-1.2.3.ebuild b/sci-libs/scipy-python2/scipy-python2-1.2.3.ebuild
new file mode 100644
index 000000000000..05b35f960a41
--- /dev/null
+++ b/sci-libs/scipy-python2/scipy-python2-1.2.3.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+
+MY_PN=${PN/-python2}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Scientific algorithms library for Python (py2 version)"
+HOMEPAGE="https://www.scipy.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="sparse test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+CDEPEND="
+	|| (
+		>=dev-python/numpy-python2-1.10[lapack,${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
+	)
+	sci-libs/arpack:0=
+	virtual/cblas
+	virtual/lapack
+	sparse? ( sci-libs/umfpack:0= )"
+DEPEND="${CDEPEND}
+	dev-lang/swig
+	>=dev-python/cython-0.22[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-36[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${CDEPEND}
+	!<sci-libs/scipy-1.4
+	dev-python/pillow[${PYTHON_USEDEP}]"
+
+DOCS=( HACKING.rst.txt THANKS.txt )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	# scipy automatically detects libraries by default
+	export {FFTW,FFTW3,UMFPACK}=None
+	use sparse && unset UMFPACK
+	# the missing symbols are in -lpythonX.Y, but since the version can
+	# differ, we just introduce the same scaryness as on Linux/ELF
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
+	# hack to force F77 to be FC until bug #278772 is fixed
+	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
+	export F90="${FC}"
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+	append-fflags -fPIC
+
+	local libdir="${EPREFIX}"/usr/$(get_libdir)
+	cat >> site.cfg <<-EOF || die
+		[blas]
+		include_dirs = $(pc_incdir cblas)
+		library_dirs = $(pc_libdir cblas blas):${libdir}
+		blas_libs = $(pc_libs cblas blas)
+		[lapack]
+		library_dirs = $(pc_libdir lapack):${libdir}
+		lapack_libs = $(pc_libs lapack)
+	EOF
+
+	# Drop hashes to force rebuild of cython based .c code
+	rm cythonize.dat || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	# FIXME: parallel python building fails, bug #614464
+	${EPYTHON} tools/cythonize.py || die
+	distutils-r1_python_compile \
+		${SCIPY_FCONFIG}
+}
+
+python_test() {
+	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
+	"${PYTHON}" -c \
+		'import numpy as np; print("relaxed strides checking:", np.ones((10,1),order="C").flags.f_contiguous)' \
+		|| die
+	"${EPYTHON}" -c \
+		"import scipy, sys; r = scipy.test('fast', verbose=2); sys.exit(r)" \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+	python_optimize
+}
+
+pkg_postinst() {
+	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
+	elog "to your prefered image viewer. Example:"
+	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
+}
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 6f32ffa5c330..809afb60e31f 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -5,6 +5,6 @@ DIST scipy-1.4.1-html.zip 61414053 BLAKE2B e1f0c1a7a8941958512dcc3c0f40ef4a590ba
 DIST scipy-1.4.1-ref.pdf 41100747 BLAKE2B 8e56af69d0bffbe6eff73bfc5bb674aed3b80bdd80d59b58a1835f996c992306a059c2992d74c411e762490c526262753d33273613ed389928845c65eb6546b2 SHA512 76946f3b506fe22a595b70e5a418982257dd59db1a2e9af508cc1cab59d47ba4fc5951388e676f2a513043a6b3391ef853242e78d7feb99a6c21d19f6dca2b58
 DIST scipy-1.4.1.tar.gz 24555206 BLAKE2B e35f6234404839cbd24d463c8cc2f1ea66aed91534e700fd54a623df40d069b14fc220f96af04c78d13b773bfc5461559e59b0bd9b836d7953f9249ccd7cae54 SHA512 79407a2cbb4ba29c0941570181df4d7835e5791e50a3abef9b63c2fc5b15308a2e4964eb71cdebbee8cd2dcb8e497cf92fe50ee21fb12cac3013ea5e0466b25d
 EBUILD scipy-1.1.0.ebuild 3988 BLAKE2B eb0714420ffe87dcd9d8704316be2feb69e24c4f8c76ada3c6d4c87c7d8617d887f18b030e9dd907ce1b5eb4684932f72a987c2449a9dbcc45270e462e1b8b87 SHA512 85823a954133330fc038e7a9b936b1454d3a2e368d709041f0f9195b9bb839a2e3aeef2f0d2a942b09df265d04cc5d4b474377e57ca4281317340272bfffce16
-EBUILD scipy-1.4.1.ebuild 4072 BLAKE2B 21c75bfbd592110e76d9c113c9fa898df20f4116634da28bf300d062a69c5874777b3cfe4cd8a114da387a2709966ff6707067e378eddd353c2f1f797f3429db SHA512 e59b75e3f56f487ab81a33432ee0a0f1c6657e363928cc4ad37fee9c4506946147205cd0b5280a3a1709015fd435a0121704a98ceff26db30950c6b124371844
+EBUILD scipy-1.4.1.ebuild 4070 BLAKE2B 91670aaa9dff2358f32b116a14e98435e9dfebce8730e0d74ecb52d528644f0dc596212af0092d970b8918e1311262e11f3a36c35d499da62f1b918865122d8a SHA512 0bcbddf8264d87fc38fe582904c18b9e8cbba49e4dbab4bc5371690540f38b191f7a55b89de5190105aba2ca07901751ea32075176094a1fd092053f6ac25d6e
 EBUILD scipy-9999.ebuild 3601 BLAKE2B 3a86b12c2989b9e64ff97119fbb6cea242179287362010f7d3e82ad0298c207a6318217f81626d18549252383a04cc107861b0283420eae2c1ce990fb7252f18 SHA512 3128f47231149e78818440f2ade24d4ca5c51f8e4a89c93e3e4da2fb2303e60a50f2f65b3c5bc32b42ebd0bd25c77cbb7017f2750367eaf7a21ffd3adcef947a
 MISC metadata.xml 931 BLAKE2B 3e358fcc4354b870a4794f13ed6c840f2c55ffdf4d6306977e6db3606b73e7df9b682a18973f0aa2a1d0d9eabb2d7d40c6aa5c6026813385361700bdc227afd8 SHA512 ae95726c4c661a2e5708a98b347f8ea25708574bbaf8ec86f315069551d6a0d68a43279b214be8b54cd20e5aacea1a9abd40a2de43d51f292a830cab0955d625
diff --git a/sci-libs/scipy/scipy-1.4.1.ebuild b/sci-libs/scipy/scipy-1.4.1.ebuild
index d00d7da75c79..5de99c92dbd7 100644
--- a/sci-libs/scipy/scipy-1.4.1.ebuild
+++ b/sci-libs/scipy/scipy-1.4.1.ebuild
@@ -23,7 +23,7 @@ LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc sparse test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 CDEPEND="
 	>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
diff --git a/sci-libs/suitesparse/Manifest b/sci-libs/suitesparse/Manifest
index 2d28517af5e9..91070a3edd79 100644
--- a/sci-libs/suitesparse/Manifest
+++ b/sci-libs/suitesparse/Manifest
@@ -1,4 +1,4 @@
 EBUILD suitesparse-4.0.2.ebuild 762 BLAKE2B b2eb7df499c9ac1f8e27f0bf90fa8178303090ea3819fc3945603b94d3c3a4259823f7f46f2d824d9d69ec6d457cd1c03a9781e98e4b04706147fd0adc6e2083 SHA512 57ac75b2b86bd6f5476144db5561c0d3197ecdfedccdd7673952c928f6d0c85858c348d8e2821384e802a107870157a0fd7aade95ca7d30aea374642af7af3a2
 EBUILD suitesparse-4.2.1.ebuild 762 BLAKE2B 598b35b6165b24cc5e34f9df5ab3f695d79cee04f693c55d0d302ca5d7e2d52f193ba99fc459af97cfd2fd9badc293e6d814b578b17277a35255a0a16e94fb78 SHA512 7232069fb3d9f5ebc31424d1c88a930b27756a4a111993c8c607b7c5e1df59e089e5c5f578e331f77837c910ad81718166d7c922fe95a571722885c6ff1cc951
-EBUILD suitesparse-5.4.0.ebuild 754 BLAKE2B 0ecc95375e4a6bbc5a4d5732802eddb292fe6e5e261da842a18578a4d6d7016ce3c9164a3ef7ce8c15d176980027af6423b2e14c981e308f1f0ee7ddd2827a32 SHA512 469d1d6f80d27382eb9c44bbe98873859ce0556b729a462a0e9abd2403066d3d9199cc84dd7f63211f1bdf102a3034cb60a737890cfe1ceb3f43b0a7ebea036c
+EBUILD suitesparse-5.4.0.ebuild 766 BLAKE2B 3a0229401066367f1c6caaaf1256331552254e0c2bdce232881d458559000b82ee620a830108336809b6048b0a66c531b09460fb73a07639e3b6610d6bf573fc SHA512 7b643c0c433718695790f669a3916aa79b822deeb9b5afe3efd71238764a38db216c32a495d118b697525e010e26bd2657a84aa3e165d6bd502246468bbc71a1
 MISC metadata.xml 1995 BLAKE2B 34721d419d77f93f3dac7d99cde6d41f8ea9ed7bdb87a8b88b02da1a151b9dce4b415da56176ba07ef83f55692b9520aea2dd2eaa0b90f5e6847585908e8c4be SHA512 855650d41560fa1a9ad9dd6d7136328f744eb07ea086a275485edb147da394787a92c56890bd8a8613ef2dbf94a32d9c94698c54916461150c5013504817aa03
diff --git a/sci-libs/suitesparse/suitesparse-5.4.0.ebuild b/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
index 2098b0804964..45a09d0f63b8 100644
--- a/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
+++ b/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
 LICENSE="metapackage"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc lapack partition tbb"
 DEPEND=""
 RDEPEND="
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index 1029d5599ae8..0fcf43d6b20b 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -3,14 +3,17 @@ AUX sundials-4.0.2-fix-license-install-path.patch 479 BLAKE2B d77b43b2d30978dce1
 AUX sundials-4.1.0-fix-license-install-path.patch 479 BLAKE2B c87cf483663f970aba2352e6831fcce7ead9ec7ce3c9a8e451e47481b0c663d698df98ffc62bbc9b6e6117188fcf1272a491b9df1a77d4acadf0625dbcdf2d26 SHA512 a8fa64f8d16e09b86b08910b395f17f2bfdcd82667b789a85bef87591ecdb9b0f01630f9dd65e7892f36261d3ef42ce12c95e980be29669dd74cc6469bd4ea87
 AUX sundials-5.0.0-fix-license-install-path.patch 434 BLAKE2B 29fbdab95a77d983eb95753202ef39f1bbeb0ff25fe6c7ddfef8fae340e8ea958bdc45ee4230f0e42218884bb8f04f9167d94d04ba8e14c77824242a4026332d SHA512 dba0893329c769eb90e03e9c6c2aa84ecd8554640979b0145cc75ba8facea1bba1d645a7876ff1975170df507653d501099a831688f0c8b7422ab69fd29eafc2
 AUX sundials-5.1.0-fix-license-install-path.patch 434 BLAKE2B d553fb3cb0c2653e161c27eac29bc3f15b261fe58c5f6f7cd4647ba7c319022b0377f621eca2a12d51078bfc375a12cb3dedb5ff23f0530686ea95cecd7fb6fb SHA512 41e09d72faa2e1f963f34b0919e72f64eaf55a5357e5b2111e0f020f8331297fffbe8053a0b0be745bbf9ccca1cfb46f6ca8bfbd2c2a2f502551b37957b874fb
+AUX sundials-5.2.0-fix-license-install-path.patch 468 BLAKE2B e2c9963f3c528cbe84a00e9ad98511bc6bfee8cd5d18c7d94661e25ea7cf6feae3c510a3c8532de61f40a2c351597ddee40a0c3fd35cec85002b9702352cbc3f SHA512 33c16064576d28d1768ec1c7232b5f1d9dbb786e24a390d970ba05b1b14df1b5589e6d6857ef84e66f2e4541a995509754f1abcf55e9e2e6dfbead81233efd8b
 DIST sundials-3.2.1.tar.gz 14958699 BLAKE2B ecc4b454ec589e9177acc9375e1db370ad6281f8d29580d9558ad3146dbbaab52794013e9cb56ad83f7309dbd3084a1ccaf6972c6b1468cefcc86bf30d3a460c SHA512 1f3e4b12f368e4f50c38b970c012f1702e339319ee0a858661bdf83e5739bb5b8a36f98b82e2ef76d1ce8a473123046347ee1b44f3cb685509823864f0af1384
 DIST sundials-4.0.2.tar.gz 17183377 BLAKE2B e322a978186f41d84a936faa55962ef6794bf99d6c6a108bfa2bd5615f27f32f7ab6ca4989802fa052d3132b53dca3069b7e4ec9941f95efb92de7bf0792dd88 SHA512 6d0a6fc49c695e70593da71892f0906585dee9c94899bb6b8c9a56c85f345809565166a62544647fdac411d22e37276b9b1bb78ba9be46eaeb28dcd3f6162ef5
 DIST sundials-4.1.0.tar.gz 17221960 BLAKE2B 598c7adc9e37fcfb1f44a3235f58af489ad907d053cb67ee0d3b076076621958374eb847e48318ddf7ced85a7601c5330ac640c7abe8723aaee7d650e3298b8d SHA512 1922dca3f0b8869098670aede802e48abec39607c96304e4efd9b03d195b16920175846fce10641aeebc48c216bda73c8691139dce57ffa7731a6bc8194b81b0
 DIST sundials-5.0.0.tar.gz 18820465 BLAKE2B 77bc7bd489b52ff316f3e889aad4ec27830c42650591270443d45a0aa958d06663e93931a8933ca2d228619263219be4d7441cb473eaaedeab958ae47418a44e SHA512 4962adabcde19207b5044d1e63758d58b5d3cfeefcd0eae65ddfe5499931bf19fa98bafbd4742045cc255f6b4a45653f41df7a7739f86d6eb47c79c9312b4471
 DIST sundials-5.1.0.tar.gz 18496945 BLAKE2B bfe2c88bd1a43c6e0b50e30a4498d23da9e495b4a27e67ff309a032f892cfd8ce54010f567f26b1ecd40a2e21e9364f0b75d0b5dde2771c9e35ad4912e7abf64 SHA512 ad2fef1197fe5680651b63a1da8fab0087416c943f9142e6d0ac8388113fb7e33a7297847f550585d7e8fed1d33111ab85235b3a2f94ac81004f5f3eb584c021
+DIST sundials-5.2.0.tar.gz 18639221 BLAKE2B c10e6deb5839993b8601347be94412d0b0c058084b4dc0d380681f7b4debd535f9736c2ef734e9fd84c6ddc190ab05f46abcb711225ec1f156a18d8edb6317fb SHA512 99163a104e436dab4779c77519502b5614b65d726324b29b14236315f6916beb5863fcd56b5acf19f62985c033b227fba1ebd3d3c4607ce991d94ee7739bb55f
 EBUILD sundials-3.2.1.ebuild 2053 BLAKE2B 5bb930c92705f0b30ef23379da27379c16e19d6ff58239d6da988cdd1463b64757313c6bb2f569229ffd98d979a863c8257e71dcd3696c108bb4e3dd992a4c12 SHA512 fd8f7a523d855d38d132b054d4b6fb6addb7e5f8266bf0eaf932a91cff1200ff4c665a3dafb5ea73d05989eef376b29f145c385cef426ac8e4c847231ce3e668
 EBUILD sundials-4.0.2.ebuild 2054 BLAKE2B 478d94f66348574f7f6f39acd026532a4b7cdb496473ad526db55b185bba569ebd17e5899b44b3841920152d65e690b863ac03a2030912850cbee8b956f17eeb SHA512 9931d3f771b41b7630513136a716326992e86182237053c6fc09f92f4598f2ce5906d35d095a952b785446bbe97038c50c926370ee99ad70449be11fca47cbac
 EBUILD sundials-4.1.0.ebuild 2054 BLAKE2B 478d94f66348574f7f6f39acd026532a4b7cdb496473ad526db55b185bba569ebd17e5899b44b3841920152d65e690b863ac03a2030912850cbee8b956f17eeb SHA512 9931d3f771b41b7630513136a716326992e86182237053c6fc09f92f4598f2ce5906d35d095a952b785446bbe97038c50c926370ee99ad70449be11fca47cbac
 EBUILD sundials-5.0.0.ebuild 1990 BLAKE2B 52ab23123248a3bc590ce5dea0bc0583bf3cd0b5587e8cbcda392a5f5b14b6229f88a247d3e2889cf8351e7f41290a09be1186857ebffaa31a3a513534d6994d SHA512 f1788b29f519eb1af18c2e2409e14bbce54e96b69144d9267840b9a9678c4fb6039dd44f03af987fb207498e23d631b4f689de0427bb77e8ef0eae6fdc360bdd
 EBUILD sundials-5.1.0.ebuild 2067 BLAKE2B 9f3324ddf9158af16d2489ac656a660859f80470077afaa59f0758b2f1c936110701d29bf24c482261055fc43c7b8b3e9bf7497137bacc2b3d487d87034418ca SHA512 2c1d0f672ca0c2a3b5da077557665b9f481cc9a3c8b5bc5f96e59c8cfcd05d5f9956afd2f367ffc141467961642b39d8443ffbe166850280fb12a8a0d05a0e41
+EBUILD sundials-5.2.0.ebuild 2067 BLAKE2B 9f3324ddf9158af16d2489ac656a660859f80470077afaa59f0758b2f1c936110701d29bf24c482261055fc43c7b8b3e9bf7497137bacc2b3d487d87034418ca SHA512 2c1d0f672ca0c2a3b5da077557665b9f481cc9a3c8b5bc5f96e59c8cfcd05d5f9956afd2f367ffc141467961642b39d8443ffbe166850280fb12a8a0d05a0e41
 MISC metadata.xml 1059 BLAKE2B 48ccadfac9b7ea4203334ffdadaa76ab3164273835c727e76085db3a5afc179404eb21c74aad77ceb368397377afb0efa27d798c849eab2ffc35153cd4fe7588 SHA512 47da8b9edc993c480a045642ad2746ff6180e54e1ad368823fd81b0d217e72c31394d7575cb4c2d5e5cfea065dffb01751bc8b1088f0f1a6feaaea15c2c7fb8f
diff --git a/sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch
new file mode 100644
index 000000000000..8fb6c977ca76
--- /dev/null
+++ b/sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch
@@ -0,0 +1,15 @@
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2020-04-01 00:03:37.000000000 +0300
++++ b/CMakeLists.txt	2020-04-21 13:27:58.000000000 +0300
+@@ -1146,9 +1146,9 @@
+ # install license and notice files
+ install(
+   FILES ${PROJECT_SOURCE_DIR}/LICENSE
+-  DESTINATION include/sundials
++  DESTINATION share/doc/sundials-5.2.0
+   )
+ install(
+   FILES ${PROJECT_SOURCE_DIR}/NOTICE
+-  DESTINATION include/sundials
++  DESTINATION share/doc/sundials-5.2.0
+   )
diff --git a/sci-libs/sundials/sundials-5.2.0.ebuild b/sci-libs/sundials/sundials-5.2.0.ebuild
new file mode 100644
index 000000000000..c6bc6848c819
--- /dev/null
+++ b/sci-libs/sundials/sundials-5.2.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD="77 90"
+# if FFLAGS and FCFLAGS are set then should be equal
+
+inherit cmake fortran-2 toolchain-funcs
+
+DESCRIPTION="Suite of nonlinear solvers"
+HOMEPAGE="https://computation.llnl.gov/projects/sundials"
+SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
+REQUIRED_USE="hypre? ( mpi )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	lapack? ( virtual/lapack )
+	mpi? ( virtual/mpi sci-libs/hypre:= )
+	sparse? ( sci-libs/klu )
+	superlumt? ( sci-libs/superlu_mt:= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+		ewarn "OpenMP is not available in your current selected gcc"
+		die "need openmp capable gcc"
+	fi
+}
+
+src_configure() {
+	mycmakeargs+=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_STATIC_LIBS="$(usex static-libs)"
+		-DCXX_ENABLE="$(usex cxx)"
+		-DFCMIX_ENABLE="$(usex fortran)"
+		-DF90_ENABLE="$(usex fortran)"
+		-DHYPRE_ENABLE="$(usex hypre)"
+		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
+		-DKLU_ENABLE="$(usex sparse)"
+		-DLAPACK_ENABLE="$(usex lapack)"
+		-DMPI_ENABLE="$(usex mpi)"
+		-DOPENMP_ENABLE="$(usex openmp)"
+		-DPTHREAD_ENABLE="$(usex threads)"
+		-DSUPERLUMT_ENABLE="$(usex superlumt)"
+		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
+		-DSUPERLUMT_LIBRARY="-lsuperlu_mt"
+		-DEXAMPLES_ENABLE="$(usex examples)"
+		-DEXAMPLES_INSTALL=ON
+		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
+		-DUSE_GENERIC_MATH=ON
+	)
+	use sparse && mycmakeargs+=( -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so" )
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	use doc && dodoc doc/*/*.pdf
+}
diff --git a/sci-libs/symengine/Manifest b/sci-libs/symengine/Manifest
index e31c7bf3d3d6..afc872e6b59e 100644
--- a/sci-libs/symengine/Manifest
+++ b/sci-libs/symengine/Manifest
@@ -1,3 +1,5 @@
 DIST symengine-0.5.0.tar.gz 761321 BLAKE2B ddff0e756188f375e966b92e6e7796936b8b6fe1a884c036066dc09d46183f157761c9813fe27366e625b7cc070381332964a12f14617be66b0f38f536c0518d SHA512 0b94b531f71adf9129440e0664a5b5ce23453de6c8d22ed385958b38cda9bc2b356a0182a80076f47b217e9f6b5a57f059b040fddf7d69694d5bd5857b0a046b
+DIST symengine-0.6.0.tar.gz 763481 BLAKE2B 37fe94ad08463b31c7387ab296b201a4dda821ba59dfa548d0c42e70d23958bae24df3f035bd3fffb46cc08cc010d13a25e607a9e0644e9b3c0602fa0eb363b3 SHA512 cc6f0468534e5bcd466a810d44f9884b17858ca6c7151cdcadb3af0f7d8faf0d96697d5887ab65fc9094de80df825f8243dabc54e3f5c387be544880f49b482b
 EBUILD symengine-0.5.0-r1.ebuild 2193 BLAKE2B 775daf836fc5fc1a0860645201ca905184383f5409e95c482b702cdc4891658f2fcd70e99ef8c5667d536598f5025616398405f0670ec69ddaf42549bef7c00d SHA512 b966d73b297cea26f9b7f1d85014f8753ec009a268844e777a8f453934e13c352803bca48d855933450529c64471da1f09b6fba1d828928187ceed2a71171b92
+EBUILD symengine-0.6.0.ebuild 2195 BLAKE2B d74c674072f87c95abf92e484989ded7e44907ca9da851713570259db4200683a1ddb7c51bf2caa88867eab8fb6de02d6b0dd10bebd839a3f75ed33ac9c45cfa SHA512 b1c283aac862460b2f6a250855a05164445ecd6949e1021ddb119cc429de955dca8134c5f919ecc4d025af028aecd5923142a6925bfc1681fb25e1f003da71be
 MISC metadata.xml 1265 BLAKE2B f91a4783ae464dee61dbca5f532bb73a217600b49633f0c80ee46f7650f27f2e37e32cd4f5e14e171e6a47eb4c612d686f883034378afb73520ed0c22862d564 SHA512 f2a634346a9f703565959b48d7648df6abb088a479819aa3f9818ae941df168dbfa3cb1867f48673fce9f24dc890d05134689d93edb0d6761f2a54f4c802037e
diff --git a/sci-libs/symengine/symengine-0.6.0.ebuild b/sci-libs/symengine/symengine-0.6.0.ebuild
new file mode 100644
index 000000000000..f1f0af9df4f9
--- /dev/null
+++ b/sci-libs/symengine/symengine-0.6.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+inherit cmake flag-o-matic toolchain-funcs
+
+DESCRIPTION="Fast symbolic manipulation library, written in C++"
+HOMEPAGE="https://github.com/sympy/symengine"
+SRC_URI="https://github.com/sympy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/0.4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="arb benchmarks boost debug doc ecm flint llvm mpc mpfr openmp test tcmalloc threads"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/gmp:=
+	sys-libs/binutils-libs:=
+	arb? ( sci-mathematics/arb:= )
+	boost? ( dev-libs/boost:= )
+	ecm? ( sci-mathematics/gmp-ecm )
+	flint? ( sci-mathematics/flint:= )
+	mpc? ( dev-libs/mpc:= )
+	tcmalloc? ( dev-util/google-perftools )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[dot] )
+"
+
+pkg_pretend() {
+	use openmp && [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "s|DESTINATION doc| DESTINATION share/doc/${PF}/html|" \
+		-e "s|/lib|/$(get_libdir)|g" \
+		-e "s|lib/|$(get_libdir)/|g" \
+		-e "/DESTINATION/s|lib|$(get_libdir)|g" \
+		-i CMakeLists.txt symengine/CMakeLists.txt \
+		symengine/utilities/teuchos/CMakeLists.txt || die
+}
+
+src_configure() {
+	# not in portage yet: piranha
+	local int_class
+	if use arb || use flint; then
+		int_class=flint
+	elif use mpfr; then
+		int_class=gmpxx
+	elif use boost; then
+		int_class=boostmp
+	else
+		int_class=gmp
+	fi
+	local mycmakeargs=(
+		-DINTEGER_CLASS="${int_class}"
+		-DBUILD_BENCHMARKS="$(usex benchmarks)"
+		-DBUILD_DOXYGEN="$(usex doc)"
+		-DBUILD_TESTS="$(usex test)"
+		-DWITH_ARB="$(usex arb)"
+		-DWITH_BFD="$(usex debug)"
+		-DWITH_SYMENGINE_ASSERT="$(usex debug)"
+		-DWITH_SYMENGINE_THREAD_SAFE="$(usex threads)"
+		-DWITH_FLINT="$(usex flint)"
+		-DWITH_OPENMP="$(usex openmp)"
+		-DWITH_MPFR="$(usex mpfr)"
+		-DWITH_MPC="$(usex mpc)"
+		-DWITH_LLVM="$(usex llvm)"
+		-DWITH_PTHREAD="$(usex threads)"
+		-DWITH_TCMALLOC="$(usex tcmalloc)"
+		-DWITH_ECM="$(usex ecm)"
+	)
+	use arb && mycmakeargs+=( -DARB_INCLUDE_DIR="${EPREFIX}/usr/include" )
+
+	test-flag-CXX -std=c++11 && append-cxxflags -std=c++11
+	cmake_src_configure
+}
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 09b7430a60a7..2c74bdd2e521 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,6 +1,12 @@
+AUX vtk-8.1.0-openmpi-4-compatibility.patch 473 BLAKE2B 2f4994b5c745746b0c1391666d155e8ff79f6c57969177862e3f64956cc370b2b12a0ba223bd344734a7700c5eb728ccaf1ac7188d0fd049815b7b22c7648203 SHA512 6a2e25263070747657aa319d80b333375b2c10bbbd58fc98a1ab6cdb563e996afe9af8d4ae28d4aab24a437508993cfa3cacfc9284562d7af8a9e29fded73837
 DIST VTK-8.1.0.tar.gz 33482506 BLAKE2B 82aecb497847254595f20294120ae793432348fc3fd881924b52c004335d9bae3d052f168bbe291b307af67845a80e740d8996d36991c38fbec7213438e2395d SHA512 3d5efd1a18939e21045278a387817421a98919cbaaa6ed65167c16999e1bb882b849b698d201a294da9920dbc96d1fbc987013462b1c7cbb12920bfff9b6f2a3
+DIST VTK-8.2.0.tar.gz 35511819 BLAKE2B 908ed9377d75da6d0bd84de0078ba90a1e9396fcc906ca2981102e2c79d9d3ba4b1297f98682cd2802c7c04f9dbec32ee70740e645c44180befd765f7cda34a6 SHA512 521bd4dabedbc24b0e80a314a34ecd7554b04af28a7973245e3a9cf99a09b995d1b8ac42305c8e53369f226a0a6da3cdb29105ba2c90b46492736ef717760286
 DIST VTKData-8.1.0.tar.gz 282986441 BLAKE2B 885f35c5386cc5db8db905a868a3ad79c246f1b0e41a3e5b81312b1f3de90483a1e34886d4764c60fe8006acaace2405b25acf047ec0e25a957f7a2d563d3380 SHA512 0a63f87896320aa38970932bf47c9e3f65a8bdd5413e51f95c53e321348b5b4e1eca2405d755eabb785c03939e1936245cc9f1b0f7ad0988c41362ac6f1e3047
+DIST VTKData-8.2.0.tar.gz 304287875 BLAKE2B 0292d84be40e11203326dcb1bf45f4a6ad2a785968130d4868a230f1cfbdcb600d0c03d4dae3519e2737dc7a964f29c51500c91b3da4291069608dd80a2bce45 SHA512 517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b
 DIST VTKLargeData-8.1.0.tar.gz 166992034 BLAKE2B ac98861ccac2aacfab7547a4b56de5c9e611b8655f077bb85e6ab850fb0cfd79f4722a0486f73eafcde2cd77d6be305201857f3e729b1f60f710c45bcf0bb63f SHA512 9dfd64b5125205ba7d8cba5665da40874d0a9781f3bd2595058d939207d96980c9a68009ce9ed1476931e1b929199c4888ccf6d590f23d2412873ca6907abc31
+DIST VTKLargeData-8.2.0.tar.gz 247522878 BLAKE2B 68dc90548604fbbb8419f2b400aea5d26599b48208b4104f41eaa90f99483689cd928cb00e3a7def396d65db2f03c9294d132854a27af74f66eb118c8319c4ce SHA512 8a7ea3d5870b1e4ccb31c77b4c270d00208349da1b2938e957210db3ec1449b678c66edc2faee1d4514aca6d725f642abc91e10ab0c151f6743cad1c53485588
 DIST vtkDocHtml-8.1.0.tar.gz 132655967 BLAKE2B a27d9631fa9fe42e9b8076aa3b33e03b3835db0f348ed60cfdc866ffe7accd9c5d99b6525523113a4d628253e28d6d9121e78942d89b6ee281d5e7ecee7c289e SHA512 c49338ad2c121ab16098195e5a1f2c9539137a85ae5edaa64d4a887ece0c64efb8840162942f47b70ab2d82d341bba2e706a6ff007fe6bdfbce12ad92bca883c
-EBUILD vtk-8.1.0-r5.ebuild 9192 BLAKE2B 0a04a86a6eef79dc1f361c15bfff52fe5b75a8422fa2f98cc4b7d78db87f34a32ad62b6c6bc343be0e993420b5459c28cc7d685789a06bab38f42997cbd327fe SHA512 d6e076a008dd7a56c88bb697b3535b6dc21c6f96a0b961e6e74c106882ef6612ce9f7cece9f1088860d72dfe7a1dbcd3642778a00fccdf488a03a96483885569
+DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b00943067f973115697f34770eefd42b5534a7d7e439e7745b32c5fa83daf5a5292b854792d18951af236d0aa77c3aa2b564 SHA512 45e198bde82948d1d8e47a8bdb64a2792c2bfdfc0d939ffe40ded79092d7ac5f497008c00c805baa09d27eabb419cdf0787eee1caf2ac44c5e8759ecf709a317
+EBUILD vtk-8.1.0-r7.ebuild 9242 BLAKE2B e7ba2acec19ff4808cf1bebd137c387769165ba9c1870caa5279fdb272da440fb38e8c0c27fb1ee760b92cc366b7e06db065eace71fb9089ef2eca95be12d8c5 SHA512 570281a2090406371f92d5f4d7b11c5649cbf0e7c1778b7b2a961a974a4d8e52463a2019505f751f5d33b2c908767ce62286f56deb6735907518a215f01d3467
+EBUILD vtk-8.2.0.ebuild 9034 BLAKE2B 7a2ddffb44db83c1a88c664f4a42a24d2647943fea5df02f209e248ea9ffdb7a2b4735d1eb9ae21da4c88545dd92698ef5f84a4cf922d2a6120f43789ed7d09e SHA512 6bfc12c34a26aec09347ec5ebd122b5011e4660df2874a5f952aa382c9f1acb21ba1e9b37b49c35e0701596dc947ff87ea2fb08ff831a3e0e9cf81b742179a94
 MISC metadata.xml 988 BLAKE2B 2533eda3936361d835dba2e30f1b1a19484facc289603d82b6c2012ee242e7778b1080d7136584c08113d7a82e0742d7bb2373984667301a4c7d52b4dbd8b087 SHA512 f4e29e15a05cfb49b24f4a8e24a6e43ac72ac0fa21ed640a70e5017263f23e21e514dedc489d963acd803407df8ee2bd2d6006c83eece795f91b4809d2ec2ff4
diff --git a/sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch b/sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch
new file mode 100644
index 000000000000..267c1d91b0cb
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch
@@ -0,0 +1,14 @@
+diff --git a/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h b/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h
+index 3173831..e8ee74b 100644
+--- a/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h
++++ b/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h
+@@ -141,4 +141,9 @@
+ 
+ #endif
+ 
++ #if OMPI_NUMVERSION >= 40000
++ #undef  PyMPI_HAVE_MPI_LB
++ #undef  PyMPI_HAVE_MPI_UB
++ #endif /* OMPI >= 4.0.0 */
++
+ #endif /* !PyMPI_CONFIG_OPENMPI_H */
diff --git a/sci-libs/vtk/vtk-8.1.0-r5.ebuild b/sci-libs/vtk/vtk-8.1.0-r7.ebuild
index f1fe50fd32e1..dc399b3e2c54 100644
--- a/sci-libs/vtk/vtk-8.1.0-r5.ebuild
+++ b/sci-libs/vtk/vtk-8.1.0-r7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 WEBAPP_OPTIONAL=yes
 WEBAPP_MANUAL_SLOT=yes
 
@@ -27,7 +27,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="
 	all-modules aqua boost doc examples imaging ffmpeg gdal java json mpi
-	mysql odbc offscreen postgres python qt5 rendering tbb theora tk tcl
+	odbc offscreen postgres python qt5 rendering tbb theora tk tcl
 	video_cards_nvidia views web R +X xdmf2"
 
 REQUIRED_USE="
@@ -66,10 +66,9 @@ RDEPEND="
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 	)
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? ( media-video/ffmpeg )
 	gdal? ( sci-libs/gdal )
 	java? ( >=virtual/jdk-1.7:* )
-	mysql? ( virtual/mysql )
 	odbc? ( dev-db/unixODBC )
 	offscreen? ( media-libs/mesa[osmesa] )
 	postgres? ( dev-db/postgresql:= )
@@ -116,6 +115,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/VTK-${PV}
 
+PATCHES=(
+	"${FILESDIR}"/vtk-8.1.0-openmpi-4-compatibility.patch
+)
+
 RESTRICT="test"
 
 pkg_setup() {
@@ -125,6 +128,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+
 	local x
 	# missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3
 	for x in constantly expat freetype hdf5 hyperlink incremental jpeg jsoncpp libharu libxml2 lz4 netcdf oggtheora png tiff Twisted txaio zlib ZopeInterface; do
@@ -196,7 +201,7 @@ src_configure() {
 		-DVTK_Group_Tk=$(usex tk)
 		-DVTK_Group_Views=$(usex views)
 		-DVTK_Group_Web=$(usex web)
-		-DVTK_WWW_DIR="${ED%/}/${MY_HTDOCSDIR}"
+		-DVTK_WWW_DIR="${ED}/${MY_HTDOCSDIR}"
 		-DVTK_WRAP_JAVA=$(usex java)
 		-DVTK_WRAP_PYTHON=$(usex python)
 		-DVTK_WRAP_PYTHON_SIP=$(usex python)
@@ -294,7 +299,7 @@ src_install() {
 
 	cmake-utils_src_install
 
-	use java && java-pkg_regjar "${ED%/}"/usr/$(get_libdir)/${PN}.jar
+	use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar
 
 	# Stop web page images from being compressed
 	use doc && docompress -x /usr/share/doc/${PF}/doxygen
diff --git a/sci-libs/vtk/vtk-8.2.0.ebuild b/sci-libs/vtk/vtk-8.2.0.ebuild
new file mode 100644
index 000000000000..ee000cf9d837
--- /dev/null
+++ b/sci-libs/vtk/vtk-8.2.0.ebuild
@@ -0,0 +1,335 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+WEBAPP_OPTIONAL=yes
+WEBAPP_MANUAL_SLOT=yes
+
+inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils toolchain-funcs cmake-utils virtualx webapp
+
+# Short package version
+SPV="$(ver_cut 1-2)"
+
+DESCRIPTION="The Visualization Toolkit"
+HOMEPAGE="https://www.vtk.org/"
+SRC_URI="
+	https://www.vtk.org/files/release/${SPV}/VTK-${PV}.tar.gz
+	doc? ( https://www.vtk.org/files/release/${SPV}/vtkDocHtml-${PV}.tar.gz )
+	examples? (
+		https://www.vtk.org/files/release/${SPV}/VTKData-${PV}.tar.gz
+		https://www.vtk.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
+	)"
+
+LICENSE="BSD LGPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="
+	all-modules aqua boost doc examples imaging ffmpeg gdal java json mpi
+	odbc offscreen postgres python qt5 rendering tbb theora tk tcl
+	video_cards_nvidia views web R +X xdmf2"
+
+REQUIRED_USE="
+	all-modules? ( python xdmf2 boost )
+	java? ( qt5 )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tcl? ( rendering )
+	examples? ( python )
+	tk? ( tcl )
+	web? ( python )
+	^^ ( X aqua offscreen )"
+
+RDEPEND="
+	app-arch/lz4
+	dev-libs/expat
+	dev-libs/jsoncpp:=
+	dev-libs/libxml2:2
+	>=media-libs/freetype-2.5.4
+	>=media-libs/libharu-2.3.0-r2
+	media-libs/libpng:0=
+	media-libs/libtheora
+	media-libs/mesa
+	media-libs/tiff:0
+	sci-libs/exodusii
+	sci-libs/hdf5:=
+	sci-libs/netcdf:0=
+	sci-libs/netcdf-cxx:3
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	boost? ( dev-libs/boost:=[mpi?] )
+	examples? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+	)
+	ffmpeg? ( media-video/ffmpeg )
+	gdal? ( sci-libs/gdal )
+	java? ( >=virtual/jdk-1.7:* )
+	odbc? ( dev-db/unixODBC )
+	offscreen? ( media-libs/mesa[osmesa] )
+	postgres? ( dev-db/postgresql:= )
+	R? ( dev-lang/R )
+	tbb? ( dev-cpp/tbb )
+	tcl? ( dev-lang/tcl:0= )
+	tk? ( dev-lang/tk:0= )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+	web? (
+		${WEBAPP_DEPEND}
+		$(python_gen_cond_dep '
+			dev-python/autobahn[${PYTHON_MULTI_USEDEP}]
+			dev-python/constantly[${PYTHON_MULTI_USEDEP}]
+			dev-python/hyperlink[${PYTHON_MULTI_USEDEP}]
+			dev-python/incremental[${PYTHON_MULTI_USEDEP}]
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+			dev-python/twisted[${PYTHON_MULTI_USEDEP}]
+			dev-python/txaio[${PYTHON_MULTI_USEDEP}]
+			dev-python/zope-interface[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	xdmf2? ( sci-libs/xdmf2 )
+	$(python_gen_cond_dep "
+		mpi? (
+			virtual/mpi[cxx,romio]
+			python? ( dev-python/mpi4py[\${PYTHON_MULTI_USEDEP}] )
+		)
+		python? (
+			${PYTHON_DEPS}
+			dev-python/sip[\${PYTHON_MULTI_USEDEP}]
+		)
+		qt5? (
+			dev-qt/designer:5
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtopengl:5
+			dev-qt/qtsql:5
+			dev-qt/qtx11extras:5
+			python? ( dev-python/PyQt5[\${PYTHON_MULTI_USEDEP}] )
+		)
+	")"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}"/VTK-${PV}
+
+PATCHES=(
+	"${FILESDIR}"/vtk-8.1.0-openmpi-4-compatibility.patch
+)
+
+RESTRICT="test"
+
+pkg_setup() {
+	use java && java-pkg-opt-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+	use web && webapp_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	local x
+	# missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3
+	for x in expat freetype hdf5 jpeg jsoncpp libharu libxml2 lz4 netcdf png tiff zlib; do
+		ebegin "Dropping bundled ${x}"
+		rm -r ThirdParty/${x}/vtk${x} || die
+		eend $?
+	done
+
+	if use doc; then
+		einfo "Removing .md5 files from documents."
+		rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
+		sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \
+			-i Utilities/Doxygen/CMakeLists.txt || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# general configuration
+	local mycmakeargs=(
+		-Wno-dev
+		-DVTK_DIR="${S}"
+		-DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
+		-DVTK_INSTALL_PACKAGE_DIR="$(get_libdir)/cmake/${PN}-${SPV}"
+		-DVTK_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DVTK_DATA_ROOT="${EPREFIX}/usr/share/${PN}/data"
+		-DVTK_CUSTOM_LIBRARY_SUFFIX=""
+		-DBUILD_SHARED_LIBS=ON
+		-DVTK_USE_SYSTEM_AUTOBAHN=ON
+		-DVTK_USE_SYSTEM_EXPAT=ON
+		-DVTK_USE_SYSTEM_FREETYPE=ON
+		-DVTK_USE_SYSTEM_FreeType=ON
+		# Use bundled gl2ps (bundled version is a patched version of 1.3.9. Post 1.3.9 versions should be compatible)
+		-DVTK_USE_SYSTEM_GL2PS=OFF
+		-DVTK_USE_SYSTEM_HDF5=ON
+		-DVTK_USE_SYSTEM_JPEG=ON
+		-DVTK_USE_SYSTEM_LIBPROJ=OFF
+		-DVTK_USE_SYSTEM_LIBXML2=ON
+		-DVTK_USE_SYSTEM_LibXml2=ON
+		-DVTK_USE_SYSTEM_NETCDF=ON
+		-DVTK_USE_SYSTEM_OGGTHEORA=ON
+		-DVTK_USE_SYSTEM_PNG=ON
+		-DVTK_USE_SYSTEM_TIFF=ON
+		-DVTK_USE_SYSTEM_TWISTED=ON
+		-DVTK_USE_SYSTEM_XDMF2=OFF
+		-DVTK_USE_SYSTEM_XDMF3=OFF
+		-DVTK_USE_SYSTEM_ZLIB=ON
+		-DVTK_USE_SYSTEM_ZOPE=ON
+		-DVTK_USE_SYSTEM_LIBRARIES=ON
+		# Use bundled diy2 (no gentoo package / upstream does not provide a Finddiy2.cmake or diy2Config.cmake / diy2-config.cmake)
+		-DVTK_USE_SYSTEM_DIY2=OFF
+		-DVTK_USE_GL2PS=ON
+		-DVTK_USE_LARGE_DATA=ON
+		-DVTK_USE_PARALLEL=ON
+		-DVTK_EXTRA_COMPILER_WARNINGS=ON
+		-DVTK_Group_StandAlone=ON
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_VTK_BUILD_ALL_MODULES_FOR_TESTS=off
+		-DVTK_BUILD_ALL_MODULES=$(usex all-modules)
+		-DUSE_DOCUMENTATION_HTML_HELP=$(usex doc)
+		-DVTK_Group_Imaging=$(usex imaging)
+		-DVTK_Group_MPI=$(usex mpi)
+		-DVTK_Group_Rendering=$(usex rendering)
+		-DVTK_Group_Tk=$(usex tk)
+		-DVTK_Group_Views=$(usex views)
+		-DVTK_Group_Web=$(usex web)
+		-DVTK_SMP_IMPLEMENTATION_TYPE="$(usex tbb TBB Sequential)"
+		-DVTK_WWW_DIR="${ED}/${MY_HTDOCSDIR}"
+		-DVTK_WRAP_JAVA=$(usex java)
+		-DVTK_WRAP_PYTHON=$(usex python)
+		-DVTK_WRAP_PYTHON_SIP=$(usex python)
+		-DVTK_WRAP_TCL=$(usex tcl)
+		-DVTK_USE_BOOST=$(usex boost)
+		-DUSE_VTK_USE_BOOST=$(usex boost)
+		-DModule_vtkInfovisBoost=$(usex boost)
+		-DModule_vtkInfovisBoostGraphAlgorithms=$(usex boost)
+		-DVTK_USE_ODBC=$(usex odbc)
+		-DModule_vtkIOODBC=$(usex odbc)
+		-DVTK_USE_OFFSCREEN=$(usex offscreen)
+		-DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
+		-DVTK_USE_OGGTHEORA_ENCODER=$(usex theora)
+		-DVTK_USE_NVCONTROL=$(usex video_cards_nvidia)
+		-DModule_vtkFiltersStatisticsGnuR=$(usex R)
+		-DVTK_USE_X=$(usex X)
+	# IO
+		-DVTK_USE_FFMPEG_ENCODER=$(usex ffmpeg)
+		-DModule_vtkIOGDAL=$(usex gdal)
+		-DModule_vtkIOGeoJSON=$(usex json)
+		-DModule_vtkIOXdmf2=$(usex xdmf2)
+		-DBUILD_TESTING=$(usex examples)
+	# Apple stuff, does it really work?
+		-DVTK_USE_COCOA=$(usex aqua)
+	)
+
+	if use java; then
+		local javacargs=$(java-pkg_javac-args)
+		mycmakeargs+=( -DJAVAC_OPTIONS=${javacargs// /;} )
+	fi
+
+	if use mpi; then
+		mycmakeargs+=( -DVTK_USE_SYSTEM_MPI4PY=ON )
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			-DVTK_INSTALL_PYTHON_MODULE_DIR="$(python_get_sitedir)"
+			-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+			-DPYTHON_LIBRARY="$(python_get_library_path)"
+			-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
+			-DSIP_INCLUDE_DIR="$(python_get_includedir)"
+			-DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
+			-DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
+			-DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX} --root=${D}"
+			-DVTK_USE_SYSTEM_SIX=ON
+		)
+	fi
+
+	if use qt5; then
+		mycmakeargs+=(
+			-DVTK_USE_QVTK=ON
+			-DVTK_USE_QVTK_OPENGL=ON
+			-DVTK_USE_QVTK_QTOPENGL=ON
+			-DQT_WRAP_CPP=ON
+			-DQT_WRAP_UI=ON
+			-DVTK_INSTALL_QT_DIR="$(basename $(qt5_get_libdir))/qt5/plugins/designer"
+			-DDESIRED_QT_VERSION=5
+			-DVTK_QT_VERSION=5
+			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
+			-DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
+			-DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt5"
+			-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
+			-DVTK_Group_Qt:BOOL=ON
+			-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
+		)
+	fi
+
+	if use R; then
+		mycmakeargs+=(
+			-DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so
+			-DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so
+		)
+	fi
+
+	append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE
+
+	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
+
+	if use mpi; then
+		export CC=mpicc
+		export CXX=mpicxx
+		export FC=mpif90
+		export F90=mpif90
+		export F77=mpif77
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	use web && webapp_src_preinst
+
+	cmake-utils_src_install
+
+	use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar
+
+	# Stop web page images from being compressed
+	use doc && docompress -x /usr/share/doc/${PF}/doxygen
+
+	if use tcl; then
+		# install Tcl docs
+		docinto vtk_tcl
+		docinto .
+	fi
+
+	# install examples
+	if use examples; then
+		einfo "Installing examples"
+		mv -v {E,e}xamples || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	# environment
+	cat >> "${T}"/40${PN} <<- EOF || die
+		VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
+		VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
+		VTKHOME=${EPREFIX}/usr
+		EOF
+	doenvd "${T}"/40${PN}
+
+	use web && webapp_src_install
+}
+
+# webapp.eclass exports these but we want it optional #534036
+pkg_postinst() {
+	use web && webapp_pkg_postinst
+}
+
+pkg_prerm() {
+	use web && webapp_pkg_prerm
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-14 11:09:11 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-14 11:09:11 +0100
commit	deba8115d2c2af26df42966b91ef04ff4dd79cde (patch)
tree	9a48f42594e1a9e6b2020d5535a784314434d7a7 /sci-libs
parent	38423c67c8a23f6a1bc42038193182e2da3116eb (diff)