gentoo resync : 02.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-08-02 19:14:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-08-02 19:14:55 +0100
commit: b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree: 0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /sci-libs
parent: 121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)
33 files changed, 53 insertions, 1131 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 68259fffab0c..ba723163916e 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/blis/Manifest b/sci-libs/blis/Manifest
index 458f14b39227..7cdd8c43ea9f 100644
--- a/sci-libs/blis/Manifest
+++ b/sci-libs/blis/Manifest
@@ -9,4 +9,4 @@ DIST blis-0.5.2.tar.gz 3502383 BLAKE2B b09fda20711086c8bde0d4efc3f3c9b0f6072e1dd
 DIST blis-0.6.0.tar.gz 5107257 BLAKE2B cd589ad1216486e8bb0cf574cc096c1e1f2bb9587b182c2bcff44db322468d9f027323c0bf2d22ea0fabb1902dc047d2bf62253ef1c2797fc3de9ba53d7fc34a SHA512 74e9da5146f7986cbd11651d7cd0837562a1603c667b9e6d3f79b5057443de657b60d7463cb2d64daf3eff7d33fc05a64e6d8eb807f4cabe0c3121517924a206
 EBUILD blis-0.5.2.ebuild 2681 BLAKE2B f33e967ea3a24689deac7d282f9b6740c5ee37a7cc8e6a8d9440050f7ea006a0acf9e577642b81e354c25efd920373963d0d26a4ebfa5998d201848cafed46da SHA512 47f73b98f61dfcb657c37c5bf4ac043a8b01c4c7c01c67e4d7a747eb7f56dc5eda2d8964928b1649fa5625184c6a727895fb43beb5f7420c697156b8ee24e09e
 EBUILD blis-0.6.0.ebuild 2639 BLAKE2B d98cb1522bb6c947ecb96163f72a9434d9b0ddd791cba397106f99280ec0abbbfa5f674f6b4da93b9adccd8530edd0ae97c909f93038b13f43528c1cd85cfc94 SHA512 cb692569282023fa6a728d2066f2dc83bd0f34f005c6906fa3175554171f17fd20759f63c168f3301470596cc4921c84651e3d04e9e37f240fd41bafb4f182ea
-MISC metadata.xml 1488 BLAKE2B 334661ee6cecdd0450cedac8c660fba1cb56f9f5f9fd68373f929e0c4c83b6eece8696e88cd8d282662858c8037da25a6699dd25ce800b42969d73379d9b1bda SHA512 2c218e0e2c7c28f9a6acb8c42f20823ab2205670e9dd85be578dd213a5709367b8486b10905ae3e2d34770ad9e0283d7a25712288b3c068849f15d549257eb18
+MISC metadata.xml 1608 BLAKE2B c8026b4a933bd7f14e7c446ea5d4bda580532252e52194b058d97daaa38969c661d5dbd86d230f44d2c77d52798962ca2953b1d88490fe284629777e763a5ee7 SHA512 b7ce333449f22acb746fed9913850e226e2e6bd6573537996f43f402b055f20b5ca5fe511eda8aa220939dd8194937eb65e8bec34bf61280ddf90722563ab037
diff --git a/sci-libs/blis/metadata.xml b/sci-libs/blis/metadata.xml
index 21ba26e3bdd6..7fcaa00de866 100644
--- a/sci-libs/blis/metadata.xml
+++ b/sci-libs/blis/metadata.xml
@@ -9,6 +9,10 @@
     <name>Mo Zhou</name>
     <email>lumin@debian.org</email>
   </maintainer>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
     BLIS is a portable software framework for instantiating high-performance
     BLAS-like dense linear algebra libraries. The framework was designed to
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index 976ab9e4faeb..0de1aac66598 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1,6 +1,4 @@
 AUX cantera_2.4.0_env.patch 3559 BLAKE2B 07af1b751b653b1c92288286b9c82ef230ea0df7d9ea4036d23ac24338a221cc45c8e74f137fcf741bb9bb7148e7f3339f54234e9a92ac939956ba7c0ca8e157 SHA512 f2574c3de42d1666a2b64914c66d97045a2a3598f63678b3b60a701d111d7bfc9bd71031dd665a64e6791c9f311fb9514b1a0462a5713763a1b5f87fcd72e528
-AUX cantera_2.4.0_libdirname_variable.patch 1252 BLAKE2B 324ff20163a45f7a23fce17b291f36278c3f4a1afbefc09a62b9570230f030c023e77a70dbc034a8006579c6bd4664bda25ff7c9b963a9289bc8d01a03f6edb4 SHA512 19f4909cd5a9edeafbf5bc6f1af7192b30196d59c1e154d6c7dd80c69ee71d15dc8f799e97940c1c0f29905177bb60405be2e8640fc29a215957a4de8f097fdc
 DIST cantera-2.4.0.tar.gz 2321316 BLAKE2B 40750e3864afa3d35817e6f5777a6ac235261e9d134ef749966dbd738a2af5efec2882e6dcc719851f88656b41469e2159d3bff3df32f6abdf57db3b0a2afcae SHA512 8bb0fee34fa5bc9ec78e6f21a100eaa77bdd966bd0b7f0fa27d452e4f122c69e61648beef847178490f5c5d56267a96f6081cac9ccd03cea153c32814e0e84e9
 EBUILD cantera-2.4.0-r1.ebuild 2845 BLAKE2B b3761011ca55477721c6611d0f808bc4b9c95e62518c4c1cbe69f1bc27ec37ea03955a7995699634d0c6aae1fe35cc9781e7e694d255fde018e590c9519628e6 SHA512 92f3cc1d2e71d02474fec596f1787536c4246f8f4d2902e57c38f25f737efe3b3bc085c61869939148f7be2fa3321b92a30f742471c44b89b5b7fca9f9e824d3
-EBUILD cantera-2.4.0.ebuild 3304 BLAKE2B d8d1ffaa3a7d70bb34e6c2982ad2640e9a1db9b94bb6e9a9eff3c2c3361398362858a4b700b33413c7b7ee8bd6d03410d0e9eaad0f73b5328f74ba7a1f140eaf SHA512 a81c574f2858a7999647d9bf340b13eb24436575016632526d8a132359f257654da084b9aaa5026adc627d2240dd5ced5294e6788a01e55229769becf55bf698
 MISC metadata.xml 792 BLAKE2B 8f5617f3f6d8047a15e0fcd14a2e11647fc2a7442759434fb98ce2492b962edf38ba662570bfa627c7db10ef00cf945d73029ade83a5c34d8e21adadaae26454 SHA512 0bc11e72add5ab1e31e0ac5ec7b2c85be2757c0cc4d56d0df16e9a7afdea89f5ec6fd2f46a730d4caf25eeba66de0405631acf64fe271272f2348f3fdeaf7515
diff --git a/sci-libs/cantera/cantera-2.4.0.ebuild b/sci-libs/cantera/cantera-2.4.0.ebuild
deleted file mode 100644
index 6e83a5c6988c..000000000000
--- a/sci-libs/cantera/cantera-2.4.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-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="http://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"
-
-REQUIRED_USE="
-	cti? ( ${PYTHON_REQUIRED_USE} )
-	python? ( cti )
-	${PYTHON_REQUIRED_USE}
-	"
-
-RDEPEND="
-	python? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	sci-libs/sundials:0=
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-cpp/eigen
-	dev-libs/boost
-	dev-libs/libfmt
-	python? (
-		dev-python/cython[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-cpp/gtest-1.8.0
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}_${PV}_libdirname_variable.patch" )
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# patch to work 'scons test' properly in case of set up 'renamed_shared_libraries="no"' option
-	sed -i "s/, libs=\['cantera_shared'\]//" "${S}"/test_problems/SConscript || die "failed to modify 'test_problems/SConscript'"
-	# patch env to pass CCACHE_DIR variable
-	sed -i "s/ENV={'PATH': os.environ\['PATH'\]}/ENV={'PATH': os.environ\['PATH'\], 'CCACHE_DIR': os.environ.get('CCACHE_DIR','')}/" "${S}"/SConstruct || die "failed to modify 'SConstruct'"
-}
-
-## 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="${CXXFLAGS}"
-		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)"
-	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_libdirname_variable.patch b/sci-libs/cantera/files/cantera_2.4.0_libdirname_variable.patch
deleted file mode 100644
index a16f5670b550..000000000000
--- a/sci-libs/cantera/files/cantera_2.4.0_libdirname_variable.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur old/SConstruct new/SConstruct
---- old/SConstruct	2018-08-24 16:24:45.000000000 +0300
-+++ new/SConstruct	2018-11-05 03:07:07.000000000 +0300
-@@ -327,6 +327,10 @@
-         'prefix',
-         'Set this to the directory where Cantera should be installed.',
-         defaults.prefix, PathVariable.PathAccept),
-+    PathVariable(
-+        'libdirname',
-+        'Set this to the directory where Cantera libraries should be installed.',
-+        '', PathVariable.PathAccept),
-     EnumVariable(
-         'python_package',
-         """If you plan to work in Python, then you need the ``full`` Cantera Python
-@@ -1465,10 +1469,9 @@
- # *** Set additional configuration variables ***
- # **********************************************
- 
--# Some distributions (e.g. Fedora/RHEL) use 'lib64' instead of 'lib' on 64-bit systems
--if any(name.startswith('/usr/lib64/python') for name in sys.path):
--    env['libdirname'] = 'lib64'
--else:
-+# Some distributions use 'lib64' (e.g. Fedora/RHEL) or something else instead of 'lib' on 64-bit systems.
-+# If user didn't set 'libdirname' configuration variable set it to default value 'lib'
-+if not env['libdirname']:
-     env['libdirname'] = 'lib'
- 
- # On Debian-based systems, need to special-case installation to
diff --git a/sci-libs/libcerf/Manifest b/sci-libs/libcerf/Manifest
index fa88146cbc99..05ce41ef95af 100644
--- a/sci-libs/libcerf/Manifest
+++ b/sci-libs/libcerf/Manifest
@@ -1,8 +1,4 @@
 AUX libcerf-1.3-autotools.patch 2758 BLAKE2B 29bb371d1ce1794762df0a18b25110cd8833e96072c65d7660eac53139f6ef2ce8ea726b22faf8d26e97d9790e437acd92e7eb135014c03ee5f85d9f9b9fa4d6 SHA512 f4e99359d9ac5719138108c88f9e1b9f88e986df9e024633ca929a7f09dac826022ac1017f67af55115739d2cf0d4e0de56d751b219c3e4f620948df8cfd74fa
-DIST libcerf-1.3.tgz 385600 BLAKE2B ffc0671cd86866c3bc7c488251a60ce1339064954a24309dd1bc03732640de4fdf6f31e5ca4727a72976e751bb29058bf9a38a2b7be587b9f5648ebf87a9b79f SHA512 274fa7f3b149bb27582a54a39fe76b478cd5acc6716dd0588a2f637b77c87a6bbc4f467b52bb067ebad2d1ba18750211cc71c6a6feef75fa08d01ac1dbf5dc56
-DIST libcerf-1.4.tgz 386065 BLAKE2B dc33523ba37133dd210e9aeb2ebaf75b630032ff7acfabc4e4c81f04ea27063929dd9a5793b4160d8a33efb34333011c0ce72e1713a884d64103a01a0745e7ef SHA512 93d7b03898c0f88e436947b204db7fb5097dc901928aedde48bf0a04552e1c041fdfcdbe6318fdc21508e1349b6c205f557660550e72d6e86b078d9d0dde0faa
 DIST libcerf-1.5.tgz 413926 BLAKE2B 1208c77658625d00d37f95f5dda9e07f99c91dc6b6fede4b8f936637dddd7450fa42c0ed3c8ff4c72bca0abe0195d6ebb58fdaa8c1bd535d8a488344fcccafad SHA512 bb97a1142d26dd2507a3fabc543accd5416f5ef3565bad6ea68ca8a62e13cb480b6e05bd8fe2215ed0133f43d4107fdc72efaedfcff7ffc0314492e97a92a8a3
-EBUILD libcerf-1.3.ebuild 620 BLAKE2B 261a0d3b341ba163968d3139272c334b3d9014cab43edcb31d19052c6411ee1d1809f238b9449f19adb2d25f081f8f140e68d2f172a68970fe032d05b743b704 SHA512 f2911dde75cc0e1450d3099e50efcd4454056f778f67dbad83bc98c93efbcfeecc4b08003790db7690c56c12d41be3ae89729b0b251e978d1c79422384be3fd7
-EBUILD libcerf-1.4.ebuild 718 BLAKE2B ee5b6ad87be49bcee3ff1a942b19ec6b1ff1bb3b39fa25d0b91ec75d83121bbd28ed62dbbf4fd73c9b7ac4b7c2f3a3b22805f441948fbce1d48ebefe93b67599 SHA512 3b7e679d0538a1a34d147c4b0596e1269271be6d3feaaf5ea95cc240004d5ff529a5a1642e2e7994058a58d9c7d8948697f2df3a51b14d5f9042f8ce044629aa
-EBUILD libcerf-1.5.ebuild 792 BLAKE2B 8d965690d43e8e94c16b2f024e6d7d32c06736fee3b2d443233b0edcf6cc106d389fb4c60aad8909f0d1b1137cf3d180c1865ab4ac5fd7fbb014d821004e636c SHA512 bab411ebd561cf699aeed57a50e1f20fcc165f9582f732f575214e53053711b01f75b69f953f061549180c7760d358f13664c28257439619883c0428b6d76ffb
+EBUILD libcerf-1.5.ebuild 790 BLAKE2B d234c270e4337b69389da38374a857566688f69d44f64c77654e5cfa63d2b895e8d5d5560035e1b35e9fee4bfa508d072961be21a4ff0b4b85d54498d28a69f9 SHA512 152b236600c89cdef0907208d2151975c99dfc890eb596784cc90fcbf7e7aa1bf9bf8484057b20bf7df1f7cbed9f824e00d3db563ad81a02581d68cbd400da32
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/libcerf/libcerf-1.3.ebuild b/sci-libs/libcerf/libcerf-1.3.ebuild
deleted file mode 100644
index acbe684d255e..000000000000
--- a/sci-libs/libcerf/libcerf-1.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib
-
-DESCRIPTION="Efficient and accurate implementation of complex error functions"
-HOMEPAGE="http://apps.jcns.fz-juelich.de/doku/sc/libcerf"
-SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc static-libs test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-autotools.patch" )
-AUTOTOOLS_AUTORECONF=1
diff --git a/sci-libs/libcerf/libcerf-1.4.ebuild b/sci-libs/libcerf/libcerf-1.4.ebuild
deleted file mode 100644
index bbfc6adc3233..000000000000
--- a/sci-libs/libcerf/libcerf-1.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Efficient and accurate implementation of complex error functions"
-HOMEPAGE="http://apps.jcns.fz-juelich.de/doku/sc/libcerf"
-SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc static-libs test"
-
-src_install() {
-	autotools-utils_src_install
-	mv "${ED}"/usr/share/man/man3/{,${PN}-}cerf.3 || die #collision with sys-apps/man-pages
-	use doc || rm "${ED}"/usr/share/doc/${P}/*.html || die
-}
diff --git a/sci-libs/libcerf/libcerf-1.5.ebuild b/sci-libs/libcerf/libcerf-1.5.ebuild
index 7258929a081b..9892a6e1cb65 100644
--- a/sci-libs/libcerf/libcerf-1.5.ebuild
+++ b/sci-libs/libcerf/libcerf-1.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 s390 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs test"
 
 src_configure() {
diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index 05c7b4c30a8a..82ddbb2226bd 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -1,8 +1,6 @@
 AUX Doxyfile 9282 BLAKE2B 0dcda644c528df5bd495db1785ce0f3213f0ce0c3551205e9c043a52151b59e82704545d55521f1983ca2b77a93c20dc0e9ddcc6b446a6485e942f301e19e165 SHA512 cc0324c682d5f45f516f0a71311a9b6527c5c4cd6c1a4113503ad9023b72c64ef9c257008cda95d565723183f932f61f79aab73e123e7b7ecf8b7fdb30457fee
-DIST libgeotiff-1.4.0.tar.gz 1517881 BLAKE2B 5340029481b1d529626170e61b73948a620cf24e86297178eb84a76e4988dd5bde2c278f995d39fa598a84eaaac69e93a62e7d091a77830c5fd16a43cb20a750 SHA512 1336e9b5345d69c47807f350d2f757c753543fecc477a6fc036743e78fbfca7b7f99db1b0fdf03e80418fbd4c66db100d04ac7c3338913f9a2b922b9c9f91f1b
 DIST libgeotiff-1.4.1.tar.gz 1674928 BLAKE2B 6c83ca77728c40995bf262d165c8566573c995f0d0116a3756f688b5686ff6529295d3340afdd771268c80050fb81b10953f7ae7339c46ed23d44dbd73cf302d SHA512 4a68bd7b9adf7453fdcb8f98cdeb79289b5f21315d1ef91d54fcc01724c8d687d243826c05a5523bb08c930296335959d2290916d46b6d802e63ac9be727c628
 DIST libgeotiff-1.5.1.tar.gz 528083 BLAKE2B 24dd812c4b12a942b21640c031fd890bb2151f6dfedfd98d0b54cf41d6341ee4d352edd427d350f36542169f822a360f8d0c9f3bb13019a422db77f43e7bd893 SHA512 6599ec89dd39d975ba389584778dd084ded628d3304b302e3af25bb7d156cf583c56b52f1c89c253b041df43f99d6893190ee1556398dab1ba044f12ef8b8dc1
-EBUILD libgeotiff-1.4.0.ebuild 1507 BLAKE2B af67acd8b1095a41d858b412cb9b8056e364056c9a646f160e6b3e2f8eca16b94b3ccbba05cf67ed190d5200683d82635b593bd822c7e07ff91ede7f15fa362b SHA512 1f07cae9b9c412e3efa268f3517ccd6c744551496d2c4bd4235ec03c126515b2b173b767bd12533a4958abf11ab2b9c0e0be2c7b2a6ad345aaa52a109aa88bc0
-EBUILD libgeotiff-1.4.1-r1.ebuild 1281 BLAKE2B c3cbdba953235eb15c5f76ea021be22cc4276188ca6d708ca2d1f30e62a29fbcf2412fd7a054f6466869d07cf22a2041f42de5d788a7092d39d3dddee79195cb SHA512 8f1ba70d03e67c1e3994b3964c23eadf9a7e947141ea62463d5fb51289f81d2a2778237bbc120f3da8e931b81c96b814542720df78f2e31fc97bc0a818f6bcb9
+EBUILD libgeotiff-1.4.1-r1.ebuild 1280 BLAKE2B 4a9b5b8eddf22a9c0e1d3578029036146c00bec8883a1a59d09a274f28ef573dde917e2cc0daddf771d2ac94fc0de6fd9612cb3c1ce6130d6e4a958d3afb7df4 SHA512 ef13ec278afe453581231b4eab2d0e5d69eafc539025e902db6ca411842e105e20f5fd3f9fc085b50ddaf2d220435eb740f16779091428351ff1a5e37d828580
 EBUILD libgeotiff-1.5.1-r1.ebuild 1287 BLAKE2B f25dc592b8ea6f624a35a0a4e269d4b44705aa441d9844ee412c3891784d2f75b714fbb6cfba2235ca2ad7be89e45bcea1173a0ddc9e59750e86f8457b09eb9f SHA512 e0ffc07f1150e0b91443921674ef85533139184f43baa0736b03351acfc20b1b7d66dfc123b4aa3bd788e5f4cae1b142d46d7ac7164d855f1d97d07dfee2ba7b
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
diff --git a/sci-libs/libgeotiff/libgeotiff-1.4.0.ebuild b/sci-libs/libgeotiff/libgeotiff-1.4.0.ebuild
deleted file mode 100644
index c7aebcf4ce30..000000000000
--- a/sci-libs/libgeotiff/libgeotiff-1.4.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils
-
-MY_P=${P/_rc/RC}
-
-DESCRIPTION="Library for reading TIFF files with embedded tags for geographic information"
-HOMEPAGE="http://geotiff.osgeo.org/"
-SRC_URI="http://download.osgeo.org/geotiff/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc static-libs"
-
-RDEPEND="
-	virtual/jpeg
-	>=media-libs/tiff-3.9.1:0
-	sci-libs/proj
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${MY_P/RC*/}
-
-DOCS=( README ChangeLog )
-
-src_prepare() {
-	epatch_user
-	sed -i \
-		-e "s:-O3::g" \
-		configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--enable-debug=$(use debug && echo yes || echo no) \
-		--with-jpeg="${EPREFIX}"/usr/ \
-		--with-zip="${EPREFIX}"/usr/
-
-}
-src_compile() {
-	default
-
-	if use doc; then
-		mkdir -p docs/api
-		cp "${FILESDIR}"/Doxyfile Doxyfile
-		doxygen -u Doxyfile || die "updating doxygen config failed"
-		doxygen Doxyfile || die "docs generation failed"
-	fi
-}
-
-src_install() {
-	default
-
-	use doc && dohtml docs/api/*
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	echo
-	ewarn "You should rebuild any packages built against ${PN} by running:"
-	ewarn "# revdep-rebuild"
-	ewarn "or using preserved-rebuild features of portage-2.2:"
-	ewarn "# emerge @preserved-rebuild"
-	echo
-}
diff --git a/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild
index 87d53b8e09f3..aaa7845a9a1d 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.osgeo.org/geotiff/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc static-libs"
 
 RDEPEND="
diff --git a/sci-libs/lmfit/Manifest b/sci-libs/lmfit/Manifest
index f3725a4f022f..5ef2f04bf19b 100644
--- a/sci-libs/lmfit/Manifest
+++ b/sci-libs/lmfit/Manifest
@@ -7,5 +7,5 @@ DIST lmfit-8.2.2.tgz 31970 BLAKE2B 67eebc0e58d3d78057afcd84f35adcfea783c8501a5f8
 EBUILD lmfit-5.1.ebuild 516 BLAKE2B 51a6715eeca7a7c3b6172530af4d6c908bdbcb3b3a5339e60c1af9bf60277b4275f49cfbf68eb3072f7f3f7864f9890ab486093253c72f0988673ea764b2513f SHA512 3ff7c3bb21bf2c95ce466f3168c2362a5fd3a0e8085621e0bae0d6b28191bc5d7368f4e09afc87ffe0720ac4740cdfeb27ee4bdc5cd83006f6837c2ac46775f9
 EBUILD lmfit-6.4.ebuild 516 BLAKE2B 51a6715eeca7a7c3b6172530af4d6c908bdbcb3b3a5339e60c1af9bf60277b4275f49cfbf68eb3072f7f3f7864f9890ab486093253c72f0988673ea764b2513f SHA512 3ff7c3bb21bf2c95ce466f3168c2362a5fd3a0e8085621e0bae0d6b28191bc5d7368f4e09afc87ffe0720ac4740cdfeb27ee4bdc5cd83006f6837c2ac46775f9
 EBUILD lmfit-7.0.ebuild 547 BLAKE2B ca24a9539256e249cb06d88ae1077a13a0c3ff62257d9eaa0751b3b56ecb6e4fd6bba4d8fa8553493eeefbd361b10e4fa056d807f151fce0077084d9220400e2 SHA512 1c4440f1d2a3a9ab910a740b731ae83645d7a62a38417639080cf5845880c5e498be08ac8a5a58545f6daeec963f9f784d19ed03054952ad4230ffdb7f5e1c86
-EBUILD lmfit-8.2.2.ebuild 541 BLAKE2B 162fd814df43ab1bdb8d700c73cb21efb283fbdd6a177bbc52d8e02029af9b32f589908585c451adbf45053b87e74ed58a992404d5e64a4f8463edac2e80e73c SHA512 282f2d2cc7407162adbd5a50a0f1dacfc71e750933555aa23bbf70e1a505e37b116bf507b14de270ab3f69c7766eb01e3f70f3e9ba02fbd75c6adbe8ec4fdf53
+EBUILD lmfit-8.2.2.ebuild 540 BLAKE2B 4ed1e259446562f1a977c5996cf903fd6ae82cbe37cbcbd9b037ee4e58a3fe2f88d2b720a1aa2207aeaad8fd63a6aac258137a93e9a580f84fda5d6267e84826 SHA512 b89e706570aba767ebcc5cc0bf0561a6c0301d7c7fedbad9ce9120903f83eeae875e0b033de8fe5c7c42d838af19b23063722b153663918cdbf1c953759e89e0
 MISC metadata.xml 328 BLAKE2B fe29c76e5725821e31de0e2b14e0b975d5b8838e9907bf9ddacdb40cddc0529550fe83468226bf045fcf7ad95b2e56d31dc564dcf7e6d9a0401317313e2f0f27 SHA512 e6cf20d6c9130a16ce37c44890f928cb5dca1bb67425d8cdcc1ab7db22f7c8e2ac513b11c33b0f0495e25dd389ac926f2099d0253288eb1ed290f30e655a1c4f
diff --git a/sci-libs/lmfit/lmfit-8.2.2.ebuild b/sci-libs/lmfit/lmfit-8.2.2.ebuild
index 85318700f5eb..5a79ce239e5d 100644
--- a/sci-libs/lmfit/lmfit-8.2.2.ebuild
+++ b/sci-libs/lmfit/lmfit-8.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://apps.jcns.fz-juelich.de/src/lmfit/${P}.tgz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
diff --git a/sci-libs/mkl-rt/Manifest b/sci-libs/mkl-rt/Manifest
index c639b882ecb7..3578eb2364d6 100644
--- a/sci-libs/mkl-rt/Manifest
+++ b/sci-libs/mkl-rt/Manifest
@@ -1,3 +1,3 @@
 DIST mkl-rt-2019.4.243.tar.bz2 213996111 BLAKE2B 04c04cd521d73b9c51341f60e69f41e3093403dcace370f2379db2cbceadcd3d64f6c06b25f8ffcbec31edbf0f0a46a9e454450e7f282cf91436093e770ea207 SHA512 a1f33806de2e1437cd3c1de088cbf117a5a3c41cf5f0003f680385d51c793d745229ec8fbd6587f03acfd25b7973912fdffbc0cf1f2360063edf2f4b0df0aa9d
 EBUILD mkl-rt-2019.4.243.ebuild 2826 BLAKE2B b9be7077728d1c7ed8117dc4fb162ea981a4229be7dd70fd38b7f1bf52896c09262ba3887e7d081f16e5dbcf20ccdfc107a4cdc1eb550796a54421492bafb864 SHA512 8b736357200e6472f618bbbdf3c347029f23a75dca26aa32996e8d408663c0328b52c1398b81b28339a4ab224f96a7c79e224738ebe89686168c4e5cad0279b6
-MISC metadata.xml 730 BLAKE2B f81fa24d633cc68db2f1c29a6370f460e86ec5c5d28678853db0274078be89320fa16f935e9a197b21289697a6f7877af478e37dad70bfd4052d3f7f95271685 SHA512 e77c975f8c7d99c831ef0ec5fa41a0debdb5c706ef2ec30d3bfe0fe6ba64c77f754538e12030c999cfc9d6436c272fd9f136bf39913489db3e4d702a6301bec9
+MISC metadata.xml 850 BLAKE2B 301845865622ecd3df5c60efe21fcbfedfc4bb0d79768cf448b812a9dece914f5cfa5c8e118df9eebd220f1b1330662299ffb4ce85c0e8d63c62ca58cde3b0e5 SHA512 4858c7e8927fa955485edeff87a469980b316e2e76b278a2dbb07e9210964a6c4efa11dd7704eb85ce6ffba80a4c098c3d1bff380a4103aff11ee5251c647f4a
diff --git a/sci-libs/mkl-rt/metadata.xml b/sci-libs/mkl-rt/metadata.xml
index 9798851ed06c..4a1062679d53 100644
--- a/sci-libs/mkl-rt/metadata.xml
+++ b/sci-libs/mkl-rt/metadata.xml
@@ -10,6 +10,10 @@
     <name>Mo Zhou</name>
     <email>lumin@debian.org</email>
   </maintainer>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 
   <longdescription>
     Intel® Math Kernel Library (Intel® MKL) optimizes code with minimal
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index aad287883f3e..60a690d43e9b 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -1,6 +1,4 @@
 AUX shared-blas-lapack.patch 5557 BLAKE2B 1e41b18e5a9c12eec9283c835e9b09e4ca89c6512f47a2f158f29c8a8a822d0365ad350177e379bec13f7c7574d8debd55a2f612027ff661c67ac7b226bb2370 SHA512 baa23f0c2bc8b7bc3384d7b8fa20eb5e095f20e1d8859badb55e680ccd435a851da6099b20aa203e46d62096ac93663ea130bea04dabf19432522e53139d393b
-DIST openblas-0.3.5.tar.gz 11853101 BLAKE2B a9b249bc397fcb1d80401d1c60c6985803016e4fd0908649fe6386ae84a09a53569814b3af65fd8fbfa92f2cdd5d4af313ba91a80f7daa7e481a7941cbb9af2c SHA512 15520c3eca79b002f1afbee64257afa24705dec667a89bd46acfcdae426e29342816fb586db98ff256fcc9d0fd744b14b347fed23995958e7646a5e3e7310cf4
 DIST openblas-0.3.6.tar.gz 11923774 BLAKE2B 0133b83a4449fd7f86d6379129be4e4477df338d0a402a7787eec317838922b175315c6e6b014a2c7ed6aa1c58509a28f6b48c641e043af067434c4315f1fdb1 SHA512 e432ae8bfbdc8e8c6336553e05181ab38576164c140ef2a6ddb2a66479f724bd4e60a2c90f7bc15bf18eefa7045e7775dedae421fb71296b8d250132c2407b07
-EBUILD openblas-0.3.5.ebuild 3221 BLAKE2B d4331c0020077a88662d3c996f3f6dec4d5de177dbef427b77a9943381c7cbb0b1e8dbc7f99079e1aead19485e79ab526d21a2e975276b3a5d1b6cc6b7828d4b SHA512 4dac7b61401cf93a4ad9cb817ba591d5852353984601608d7330ac716ab8157c7fc050fb12b56c7b36d30994ca94be032f585c1741945a779b18f4c4926cb7a1
-EBUILD openblas-0.3.6.ebuild 3221 BLAKE2B d4331c0020077a88662d3c996f3f6dec4d5de177dbef427b77a9943381c7cbb0b1e8dbc7f99079e1aead19485e79ab526d21a2e975276b3a5d1b6cc6b7828d4b SHA512 4dac7b61401cf93a4ad9cb817ba591d5852353984601608d7330ac716ab8157c7fc050fb12b56c7b36d30994ca94be032f585c1741945a779b18f4c4926cb7a1
-MISC metadata.xml 871 BLAKE2B 80b2e7933a3ace1dd587c566c106c4b6804a3526b4bf17d8429ab7cf4eb722d8f03d3f1c39eca7ca19f4ef6d39965af5aecd574c55f156577eecd4785207f431 SHA512 b7c5e3332d37d710f4e5978df7eeade29947654adcfa23eb5a533c6333fe7c528f0b821c16560e0a74bd4437a9957f4365bc8fe264e0256b4559eaa7fcd5657f
+EBUILD openblas-0.3.6.ebuild 3508 BLAKE2B f0aad5a9f8977bea411144cc47d977e8fdf83e76a8475bbfec70efabfdb9db8c880ffe2cd03276e94f553f5dce9229719193b05c8b91d59cf12e2e437427bc3a SHA512 c74c40f9b3a9b7b3cc1adf697af94b87bb4f090f921b5084b7a20a429f8ab5276cfb637b89a312639d951e8fc78b5ae5063f6e6de58ae5afc8e36885ec699c0a
+MISC metadata.xml 945 BLAKE2B 19efdde0fefe0a22b2b9a1ceee091c037f6e1be3c9611263daf977b81a0620fe1e603cfa94277adbdef2bbfc47ab69488502f2f73fa61ec203193a90f87d9a19 SHA512 596ed3aca0e52076aac15a3ff3a10dd40a8da00b1069b2b120a690a91a735f4009f87cf5ef2236f2069883c7a39d3e0f4079148a171e3560f53cee180514326b
diff --git a/sci-libs/openblas/metadata.xml b/sci-libs/openblas/metadata.xml
index 987eb126d9c1..95b34d1ccda3 100644
--- a/sci-libs/openblas/metadata.xml
+++ b/sci-libs/openblas/metadata.xml
@@ -17,6 +17,7 @@
 		<flag name="pthread">Build with pthread threadding model</flag>
 		<flag name="serial">Build without multi-thraedding</flag>
 		<flag name="eselect-ldso">Enable BLAS/LAPACK runtime switching</flag>
+		<flag name="index-64bit">Compile a separate INTERFACE64 OpenBLAS</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">xianyi/OpenBLAS</remote-id>
diff --git a/sci-libs/openblas/openblas-0.3.5.ebuild b/sci-libs/openblas/openblas-0.3.5.ebuild
deleted file mode 100644
index ba14ee30b531..000000000000
--- a/sci-libs/openblas/openblas-0.3.5.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-SRC_URI="https://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="dynamic openmp pthread serial static-libs eselect-ldso"
-REQUIRED_USE="?? ( openmp pthread serial )"
-
-RDEPEND="
-eselect-ldso? ( >=app-eselect/eselect-blas-0.2
-				!app-eselect/eselect-cblas
-				>=app-eselect/eselect-lapack-0.2 )
-"
-DEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/shared-blas-lapack.patch" )
-
-openblas_flags() {
-	local flags=()
-	use dynamic && \
-		flags+=( DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 NO_AFFINITY=1 )
-	if use openmp; then
-		flags+=( USE_THREAD=1 USE_OPENMP=1 )
-	elif use pthread; then
-		flags+=( USE_THREAD=1 USE_OPENMP=0 )
-	else
-		flags+=( USE_THREAD=0 ) # serial
-	fi
-	flags+=( DESTDIR="${D}" PREFIX="${EPREFIX}/usr" )
-	flags+=( OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} )
-	flags+=( OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir) )
-	echo "${flags[@]}"
-}
-
-src_unpack () {
-	default
-	find "${WORKDIR}" -maxdepth 1 -type d -name \*OpenBLAS\* && \
-		mv "${WORKDIR}"/*OpenBLAS* "${S}" || die
-}
-
-src_compile () {
-	emake $(openblas_flags)
-	emake -Cinterface shared-blas-lapack $(openblas_flags)
-}
-
-src_install () {
-	emake install $(openblas_flags)
-
-	if use eselect-ldso; then
-		dodir /usr/$(get_libdir)/blas/openblas/
-		insinto /usr/$(get_libdir)/blas/openblas/
-		doins interface/libblas.so.3
-		dosym libblas.so.3 usr/$(get_libdir)/blas/openblas/libblas.so
-		doins interface/libcblas.so.3
-		dosym libcblas.so.3 usr/$(get_libdir)/blas/openblas/libcblas.so
-
-		dodir /usr/$(get_libdir)/lapack/openblas/
-		insinto /usr/$(get_libdir)/lapack/openblas/
-		doins interface/liblapack.so.3
-		dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so
-	fi
-}
-
-pkg_postinst () {
-	use eselect-ldso || return
-	local libdir=$(get_libdir) me="openblas"
-
-	# check blas
-	eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
-	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
-	if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then
-		eselect blas set ${libdir} ${me}
-		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
-	else
-		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
-		elog "To use blas [${me}] implementation, you have to issue (as root):"
-		elog "\t eselect blas set ${libdir} ${me}"
-	fi
-
-	# check lapack
-	eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
-	local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
-	if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then
-		eselect lapack set ${libdir} ${me}
-		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
-	else
-		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
-		elog "To use lapack [${me}] implementation, you have to issue (as root):"
-		elog "\t eselect lapack set ${libdir} ${me}"
-	fi
-}
-
-pkg_postrm () {
-	if use eselect-ldso; then
-		eselect blas validate
-		eselect lapack validate
-	fi
-}
diff --git a/sci-libs/openblas/openblas-0.3.6.ebuild b/sci-libs/openblas/openblas-0.3.6.ebuild
index ba14ee30b531..19c3b79f2584 100644
--- a/sci-libs/openblas/openblas-0.3.6.ebuild
+++ b/sci-libs/openblas/openblas-0.3.6.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+inherit toolchain-funcs
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
@@ -10,7 +11,7 @@ SRC_URI="https://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="dynamic openmp pthread serial static-libs eselect-ldso"
+IUSE="dynamic openmp pthread serial static-libs eselect-ldso index-64bit"
 REQUIRED_USE="?? ( openmp pthread serial )"
 
 RDEPEND="
@@ -27,6 +28,7 @@ openblas_flags() {
 	use dynamic && \
 		flags+=( DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 NO_AFFINITY=1 )
 	if use openmp; then
+		tc-check-openmp
 		flags+=( USE_THREAD=1 USE_OPENMP=1 )
 	elif use pthread; then
 		flags+=( USE_THREAD=1 USE_OPENMP=0 )
@@ -41,13 +43,18 @@ openblas_flags() {
 
 src_unpack () {
 	default
-	find "${WORKDIR}" -maxdepth 1 -type d -name \*OpenBLAS\* && \
-		mv "${WORKDIR}"/*OpenBLAS* "${S}" || die
+	mv "${WORKDIR}"/*OpenBLAS* "${S}" || die
+	if use index-64bit; then
+		cp -aL "${S}" "${S}-index-64bit" || die
+	fi
 }
 
 src_compile () {
 	emake $(openblas_flags)
 	emake -Cinterface shared-blas-lapack $(openblas_flags)
+	if use index-64bit; then
+		emake -C"${S}-index-64bit" $(openblas_flags) INTERFACE64=1 LIBPREFIX=libopenblas64
+	fi
 }
 
 src_install () {
@@ -66,6 +73,11 @@ src_install () {
 		doins interface/liblapack.so.3
 		dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so
 	fi
+
+	if use index-64bit; then
+		insinto /usr/$(get_libdir)/
+		dolib.so "${S}-index-64bit"/libopenblas64*.so*
+	fi
 }
 
 pkg_postinst () {
diff --git a/sci-libs/shapelib/Manifest b/sci-libs/shapelib/Manifest
index 81b73d67093e..d1597be36e9b 100644
--- a/sci-libs/shapelib/Manifest
+++ b/sci-libs/shapelib/Manifest
@@ -1,7 +1,7 @@
 DIST shapelib-1.4.0.tar.gz 548990 BLAKE2B 0e75481d35f8dc5687eee23696d46a780d4b185a81ca1246e5c19f01e58f4a55dc7b69347c9effa01ac1786c5271dfe3907798cc81fe9314979c502bcb9d982d SHA512 206b81fe859a837e821e449ab1b2dbd5a3aa7abd1871da4aec69e130b6fad6300697429884ce359c90e4b76bca90e2108f32b9fdbd3b92013fa5a39f3bedeeb1
 DIST shapelib-1.4.1.tar.gz 549831 BLAKE2B e579704bd71c2525133f87628261e78f39e8063cd7e8a57997e90a8ca4a6ebb5de3a4d1ab8da5d00afe1363d9eb22e8c7a9a66ac109c300b72b6d26bd87b61fd SHA512 791c1a0d6c5ff09341176f68349ebd760ae91e8749a9f844299d7ac38a42c4f1131e63479c384a8a8b05a89e90d02e9fd92c526cab417eb80b171d639b4a4422
 DIST shapelib-1.5.0.tar.gz 547686 BLAKE2B 3f962ee701d8cfb86a56aa1c0b2156bc2288a2bc908bb1a8303e491812845241f5281b0b8650befcc53e9dfc408b652a56f5e2fdc5ac7c2ff6eb99170696e437 SHA512 6dbd5fc7929ca403e65017ef58211f351608d9ad08221bf68bde047ceecfd27013ce731f9ae4edcfd040bc3db7fe9054b5d96e46128d2968788bef19532b1721
-EBUILD shapelib-1.4.0-r1.ebuild 739 BLAKE2B f3149e901a0d974e94d00ff64dea46355070ff537abe36b03b4ae9ededadf4a679633eebb6d9696de00e932e153d8f8bf9905cd8c2e790b36a0dc9e0a9396324 SHA512 587239c58c93654f82a4ec81015e92eabcfdb47f82c5b4c4ca32b9e2e91d67de4cc170d2609531cf4e0dc5ca564f40158c3b549de292362234fc8ca1fe64a8ff
+EBUILD shapelib-1.4.0-r1.ebuild 742 BLAKE2B f33456a8183125ff6e433aa4e482de668065b4f3809d44e045d8daf52561988f393906490e81db485643cbaf790596b72808c0448c796dc864260d49591bd9ed SHA512 1da0d9051b110b909b6d81cb69870602035ca1dfa33c92eada298680a1af178aac56391e9bc8f1b5f00a5d2acb048a8dfa3fbfc7e017aebf1f2a25e7a02b6143
 EBUILD shapelib-1.4.1.ebuild 747 BLAKE2B d7c24d2a6d9d1e6a2782932c808551875335c95f83c71265b410e167273b058e80099fabbfe03ca5613bce18e3bf6a09ad5a9ff95a834ba3b5f3c48182a7808f SHA512 0faec499f5ab12ecdd2e9909723734552c9b22e6d36597869051862629a07dbe178d415b372cdcb84b2099092889485360fa693e8ccbb3a8a28edcf07b919339
 EBUILD shapelib-1.5.0.ebuild 745 BLAKE2B 9e9fce7b2dda007154d3536a4546034a13683ea6b4afc025e31e4d9fb05978eda85b86b5d4fcc1774948023d685ea1a1089da752f8518fd31d164510d180abcc SHA512 562faebaf4811461449fcde8269c102c078d8efacd96ea852e140b9e66626e13713a38a678771524b7089e65ba70d7765afdc2407c998597d8d0dcf557897c6a
 MISC metadata.xml 405 BLAKE2B ed97fadfd57934dab768c271f100531eb2f5c9e98564b54d73c2396d0959c62b39ee7ce5ad96495f1133cf8c3de8ad2ffcb0d13353c1a32c9be92ad81bd80995 SHA512 9581a1f8123cdcc6b68de0fdc03dfa866c64668222f1d90b55160cdaf8d36e1441f0530fced6b149681fef88321bf33879996199685eb6e26cefae975b704adb
diff --git a/sci-libs/shapelib/shapelib-1.4.0-r1.ebuild b/sci-libs/shapelib/shapelib-1.4.0-r1.ebuild
index dca20e97ec45..1e7039e6fa54 100644
--- a/sci-libs/shapelib/shapelib-1.4.0-r1.ebuild
+++ b/sci-libs/shapelib/shapelib-1.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://download.osgeo.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0/2"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 RDEPEND="sci-libs/proj"
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index 22e4ccc853f0..e1de506801e1 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -1,20 +1,10 @@
-AUX sundials-2.7.0-underlinking-libdir.patch 19659 BLAKE2B 9dab5796e7f64528df06a435433719bbd34f6f9868ab6d88ec59e32777c4513c995bebe3f4e32b91cfb000328c6ae307a1c29cd34acd21cd9485668c3783b991 SHA512 95bc36d359b672b725391d75540304fac6b2610960f67a636cf5656e30904a2ed309a75175f4d20b9199d70d45fa817e53e86433ff18dfcf28ef76840b9d0dba
-AUX sundials-3.1.2-fix-license-install-path.patch 388 BLAKE2B f4d1e6eacc87c0978b3311bb24876db5ff77d0e0c2e6a369746a7320c0279ec4c46cf359fa81677c0eda63d28e37f5d283dea9809ff0c5126e4386addabab63e SHA512 9a675e33d93a8c1c6500d6297e362abdf4d81d56575175eb05c8b51a9d1f993406cd8fcb80a5d7be68d9578db11233f0857ae74bba2df96a7a95691fde51222d
 AUX sundials-3.2.1-fix-license-install-path.patch 335 BLAKE2B ac9a2c33fabf13cb55876f39836006b1b145395311800bd052f5e0784b7926fab4ffd4abf2bb0047d69fbd5feccdec026bf7f7c115fb4f130c8419c6e8986dcb SHA512 7ac45a8932a273330fcf6fecb355cbbcf83038240fd06db6e20eb54a51a137266d033c7fe513f73b72e252509b0105d4de48fffedb4adff2ce8e5187e26b7ac3
-AUX sundials-4.0.2-fix-license-install-path.patch 320 BLAKE2B 59274a4354f1a9bf6424e0eba19fdd8e01ec97f505c0439d4aff409c842d8052520938abe35652012ddd040625c77c0fd62a00f706a42c06ba7ec7dcafa58050 SHA512 714ff9c373991ebec9917ff68244af11ddd152f46c6286d45b8bcbfa08f7ca85e3de6f2f77733a44f845024dcd8c21f7acad705950ecead914ddab16167fe2dc
-AUX sundials-4.1.0-fix-license-install-path.patch 320 BLAKE2B 954793b037653c8cadd5a35a0cdec7c90a1c2cb5a0b584f974d2aa0888a605b502e684949b17431a2278dc28f3bb77b654b8a38574dca385234692b8577dc15b SHA512 5945e9a21748368b8004a4f768409c1b6de2da0d61198ecdc7cfcc0cff8a5b6c1536fcb5558fc8dbe79dd01107cf2d629d0823e57583f652f2d82c3182437476
-DIST sundials-2.7.0.tar.gz 12258093 BLAKE2B 331fcf255f2bb8bcc798818b05db114feda7aacb6585177a836f17a9b58477f504099b4a33c7d71cab6e70eeb6fe47a76d101c08aa6219ee6fbac630524d5928 SHA512 c86c167538065a4109b36ae7c8f60f3d92184133cfa661b5acfccee052c38f40be865412a1746bb57907b61602c212c0f15e1e30ef29e8a49db6d46a75a28e69
-DIST sundials-3.0.0.tar.gz 12996039 BLAKE2B 0557190f6f7550bd4d7d3df10f727c6f235ff4917f2cfd35ca77785037edc43236a82383664f6fe1579bb5b07a148875b82b22f5a9e4f5f2a0607838e8a3b286 SHA512 3c86c7f27e64c2e6732546b0b1e87ea092502e361cae09b3b7eb29795c978edf494e17be13b78541dc91cc0709d928006bd0fc62ea968f2b621efa51856cdd60
-DIST sundials-3.1.0.tar.gz 13033516 BLAKE2B 41294c1022ab09db6fbfa0d41c169d2ead3483693653a9c0cc26fdffec61918fed5e93241f64f9bfdc6ff22812fb846f3ea8deecd82c28d179dded85ec2c69ba SHA512 288427e00f58c512583cc14d81385e82b0fdeaa4e9adca588a108ad0752341b7be62c9fa2740924ec733e3e0d5794f305dc582fc72e244e675e5ea00ac0d08ca
-DIST sundials-3.1.2.tar.gz 18212893 BLAKE2B cee897f59920d6530553e4005b043fe615bf86ed6cc4ecb829afc25ea46c1a37cefd5a05584bd763af29689980d7bb03442ad22c4b83dd3af2406e786540652a SHA512 b65989998b440b2b5c5d000f4b86d8bcbf03215fcee4e348cd4b8ff935ea3471a3593ab8bd0e7d5f8ba519b5a1285cc93d41ec622d0b51592d7593c7579af082
+AUX sundials-4.0.2-fix-license-install-path.patch 479 BLAKE2B d77b43b2d30978dce198f51917286b208cc1baccb4230a2eaf9f1e656a23e1b1980bf7c86a4a4bd16a5210b16083aec4e05b316af5a42f6a64631a843d79f7f9 SHA512 99baa802dd367159a82c57997421aad938b52babf3c2444957f46fe9affcd57e9524a6ef0fecdf3ef973e95a032f3dec37487794e397e45db515db01af2893dd
+AUX sundials-4.1.0-fix-license-install-path.patch 479 BLAKE2B c87cf483663f970aba2352e6831fcce7ead9ec7ce3c9a8e451e47481b0c663d698df98ffc62bbc9b6e6117188fcf1272a491b9df1a77d4acadf0625dbcdf2d26 SHA512 a8fa64f8d16e09b86b08910b395f17f2bfdcd82667b789a85bef87591ecdb9b0f01630f9dd65e7892f36261d3ef42ce12c95e980be29669dd74cc6469bd4ea87
 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
-EBUILD sundials-2.7.0.ebuild 2065 BLAKE2B 54faae8f12f0594f7fb97a5bcaadfad2851872d9371e151bd64b5b350ee46d3bcbee8b203770f1ca538d7a7bcdb55dd23db5d457ac5ec52da078e3bdb2e011f3 SHA512 38671b242ca205636353097386b2f185cdcc9448aef1c7fe3d8f1977f4877274202708a6c89ddfc7bf8cc17e4609a5d107456364150f7a8fb67c3a3a62c67742
-EBUILD sundials-3.0.0.ebuild 2253 BLAKE2B e546ea8f864ac81002528ab329f820d9ad10ecc57625a5110f4b97152901b5b3da8191d44299f85ac95b7e9a1c036c5de8c7a3ef5c46647611a48f8fd9f995e3 SHA512 1e4e9db8640c3d29a8001c088de40f8feba6ce3bda6d76d20d462ea1d7f84213bc644c8499ec99a8125618d180202de010003f819c98b21833c3b4538f976100
-EBUILD sundials-3.1.0.ebuild 2227 BLAKE2B 88fbb7206514de8b715e641585507f5cd662676ddadd0bfbad91539e770823456e5412a7e9620f425c8651a226cfa53bbb6bc3f8c56b523454863916de521a25 SHA512 22db26dd50955f3fe6debbe7fcaba20e54bfed4427f64d5b8ebc337f3f6ba240434c18381dc9abdf336ea30dfc011a346fc8d7cd7f0d88da638ba7a6f45ed50c
-EBUILD sundials-3.1.2.ebuild 2277 BLAKE2B 70f0f03abd27d68479491239dec51534472e77e8da5e83ccf9684612eb0993bbb7eb8a227dd34088c1a988b0287ba421ac767517040d7d4fe9a6e298e2791cc8 SHA512 d39a91985d42808f6514d755e5d94e0650e90e11193afa8b39b677015f914fcc8d5ca2d4460027feb4333da18ff928b6a0308f37bc36ac6fefc63f011de4456f
 EBUILD sundials-3.2.1.ebuild 2054 BLAKE2B 478d94f66348574f7f6f39acd026532a4b7cdb496473ad526db55b185bba569ebd17e5899b44b3841920152d65e690b863ac03a2030912850cbee8b956f17eeb SHA512 9931d3f771b41b7630513136a716326992e86182237053c6fc09f92f4598f2ce5906d35d095a952b785446bbe97038c50c926370ee99ad70449be11fca47cbac
 EBUILD sundials-4.0.2.ebuild 2054 BLAKE2B 478d94f66348574f7f6f39acd026532a4b7cdb496473ad526db55b185bba569ebd17e5899b44b3841920152d65e690b863ac03a2030912850cbee8b956f17eeb SHA512 9931d3f771b41b7630513136a716326992e86182237053c6fc09f92f4598f2ce5906d35d095a952b785446bbe97038c50c926370ee99ad70449be11fca47cbac
 EBUILD sundials-4.1.0.ebuild 2054 BLAKE2B 478d94f66348574f7f6f39acd026532a4b7cdb496473ad526db55b185bba569ebd17e5899b44b3841920152d65e690b863ac03a2030912850cbee8b956f17eeb SHA512 9931d3f771b41b7630513136a716326992e86182237053c6fc09f92f4598f2ce5906d35d095a952b785446bbe97038c50c926370ee99ad70449be11fca47cbac
-MISC metadata.xml 1063 BLAKE2B 9fcc89ceb3553bf23a0f1074eaca3a76707ddcd7cdbce253c6710e2db8422fff558a0e761fe93eb00bf385bd6f30fcb53decc5323c425c609f419be92855799a SHA512 d81c64ac7241460ebc7bcd61f1b398ef55a1e9b5a5a9bb0ede400bfe06889d2db781c43853bf33069510f2461140ab8b7a47a4553cdafca64c1ed7bd0f16d742
+MISC metadata.xml 1059 BLAKE2B 48ccadfac9b7ea4203334ffdadaa76ab3164273835c727e76085db3a5afc179404eb21c74aad77ceb368397377afb0efa27d798c849eab2ffc35153cd4fe7588 SHA512 47da8b9edc993c480a045642ad2746ff6180e54e1ad368823fd81b0d217e72c31394d7575cb4c2d5e5cfea065dffb01751bc8b1088f0f1a6feaaea15c2c7fb8f
diff --git a/sci-libs/sundials/files/sundials-2.7.0-underlinking-libdir.patch b/sci-libs/sundials/files/sundials-2.7.0-underlinking-libdir.patch
deleted file mode 100644
index db47ac3b350d..000000000000
--- a/sci-libs/sundials/files/sundials-2.7.0-underlinking-libdir.patch
+++ /dev/null
@@ -1,395 +0,0 @@
-diff -Nur sundials-2.7.0.orig/src/arkode/CMakeLists.txt sundials-2.7.0/src/arkode/CMakeLists.txt
---- sundials-2.7.0.orig/src/arkode/CMakeLists.txt	2016-09-26 22:16:52.000000000 +0000
-+++ sundials-2.7.0/src/arkode/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -127,7 +127,7 @@
-     PROPERTIES OUTPUT_NAME sundials_arkode CLEAN_DIRECT_OUTPUT 1)
- 
-   # Install the ARKODE library
--  INSTALL(TARGETS sundials_arkode_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_arkode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_STATIC_LIBS)
- 
-@@ -146,8 +146,10 @@
-   SET_TARGET_PROPERTIES(sundials_arkode_shared
-     PROPERTIES VERSION ${arkodelib_VERSION} SOVERSION ${arkodelib_SOVERSION})
- 
-+  TARGET_LINK_LIBRARIES(sundials_arkode_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-+
-   # Install the ARKODE library
--  INSTALL(TARGETS sundials_arkode_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_arkode_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_SHARED_LIBS)
- 
-diff -Nur sundials-2.7.0.orig/src/arkode/fcmix/CMakeLists.txt sundials-2.7.0/src/arkode/fcmix/CMakeLists.txt
---- sundials-2.7.0.orig/src/arkode/fcmix/CMakeLists.txt	2016-09-26 22:16:52.000000000 +0000
-+++ sundials-2.7.0/src/arkode/fcmix/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -70,7 +70,7 @@
-   PROPERTIES OUTPUT_NAME sundials_farkode CLEAN_DIRECT_OUTPUT 1)
- 
- # Install the FARKODE library
--INSTALL(TARGETS sundials_farkode_static DESTINATION lib)
-+INSTALL(TARGETS sundials_farkode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- #
- MESSAGE(STATUS "Added ARKODE FCMIX module")
-diff -Nur sundials-2.7.0.orig/src/cvode/CMakeLists.txt sundials-2.7.0/src/cvode/CMakeLists.txt
---- sundials-2.7.0.orig/src/cvode/CMakeLists.txt	2016-09-26 22:17:07.000000000 +0000
-+++ sundials-2.7.0/src/cvode/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -134,7 +134,7 @@
-     PROPERTIES OUTPUT_NAME sundials_cvode CLEAN_DIRECT_OUTPUT 1)
- 
-   # Install the CVODE library
--  INSTALL(TARGETS sundials_cvode_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_cvode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_STATIC_LIBS)
- 
-@@ -153,8 +153,10 @@
-   SET_TARGET_PROPERTIES(sundials_cvode_shared
-     PROPERTIES VERSION ${cvodelib_VERSION} SOVERSION ${cvodelib_SOVERSION})
- 
-+  TARGET_LINK_LIBRARIES(sundials_cvode_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-+
-   # Install the CVODE library
--  INSTALL(TARGETS sundials_cvode_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_cvode_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_SHARED_LIBS)
- 
-diff -Nur sundials-2.7.0.orig/src/cvode/fcmix/CMakeLists.txt sundials-2.7.0/src/cvode/fcmix/CMakeLists.txt
---- sundials-2.7.0.orig/src/cvode/fcmix/CMakeLists.txt	2016-09-26 22:17:07.000000000 +0000
-+++ sundials-2.7.0/src/cvode/fcmix/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -57,7 +57,7 @@
-   PROPERTIES OUTPUT_NAME sundials_fcvode CLEAN_DIRECT_OUTPUT 1)
- 
- # Install the FCVODE library
--INSTALL(TARGETS sundials_fcvode_static DESTINATION lib)
-+INSTALL(TARGETS sundials_fcvode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- #
- MESSAGE(STATUS "Added CVODE FCMIX module")
-diff -Nur sundials-2.7.0.orig/src/cvodes/CMakeLists.txt sundials-2.7.0/src/cvodes/CMakeLists.txt
---- sundials-2.7.0.orig/src/cvodes/CMakeLists.txt	2016-09-26 22:17:15.000000000 +0000
-+++ sundials-2.7.0/src/cvodes/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -121,7 +121,7 @@
-     PROPERTIES OUTPUT_NAME sundials_cvodes CLEAN_DIRECT_OUTPUT 1)
- 
-   # Install the CVODES library
--  INSTALL(TARGETS sundials_cvodes_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_cvodes_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_STATIC_LIBS)
- 
-@@ -140,8 +140,9 @@
-   SET_TARGET_PROPERTIES(sundials_cvodes_shared
-     PROPERTIES VERSION ${cvodeslib_VERSION} SOVERSION ${cvodeslib_SOVERSION})
- 
-+  TARGET_LINK_LIBRARIES(sundials_cvodes_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-   # Install the CVODES library
--  INSTALL(TARGETS sundials_cvodes_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_cvodes_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_SHARED_LIBS)
- 
-diff -Nur sundials-2.7.0.orig/src/ida/CMakeLists.txt sundials-2.7.0/src/ida/CMakeLists.txt
---- sundials-2.7.0.orig/src/ida/CMakeLists.txt	2016-09-26 22:17:26.000000000 +0000
-+++ sundials-2.7.0/src/ida/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -124,7 +124,7 @@
-     PROPERTIES OUTPUT_NAME sundials_ida CLEAN_DIRECT_OUTPUT 1)
- 
-   # Install the IDA library
--  INSTALL(TARGETS sundials_ida_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_ida_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_STATIC_LIBS)
- 
-@@ -143,8 +143,10 @@
-   SET_TARGET_PROPERTIES(sundials_ida_shared
-     PROPERTIES VERSION ${idalib_VERSION} SOVERSION ${idalib_SOVERSION})
- 
-+  TARGET_LINK_LIBRARIES(sundials_ida_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-+  
-   # Install the IDA library
--  INSTALL(TARGETS sundials_ida_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_ida_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_SHARED_LIBS)
- 
-diff -Nur sundials-2.7.0.orig/src/ida/fcmix/CMakeLists.txt sundials-2.7.0/src/ida/fcmix/CMakeLists.txt
---- sundials-2.7.0.orig/src/ida/fcmix/CMakeLists.txt	2016-09-26 22:17:26.000000000 +0000
-+++ sundials-2.7.0/src/ida/fcmix/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -56,6 +56,6 @@
-   PROPERTIES OUTPUT_NAME sundials_fida CLEAN_DIRECT_OUTPUT 1)
- 
- # Install the FIDA library
--INSTALL(TARGETS sundials_fida_static DESTINATION lib)
-+INSTALL(TARGETS sundials_fida_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- #
- MESSAGE(STATUS "Added IDA FCMIX module")
-diff -Nur sundials-2.7.0.orig/src/idas/CMakeLists.txt sundials-2.7.0/src/idas/CMakeLists.txt
---- sundials-2.7.0.orig/src/idas/CMakeLists.txt	2016-09-26 22:17:32.000000000 +0000
-+++ sundials-2.7.0/src/idas/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -126,7 +126,7 @@
-     PROPERTIES OUTPUT_NAME sundials_idas CLEAN_DIRECT_OUTPUT 1)
- 
-   # Install the IDA library
--  INSTALL(TARGETS sundials_idas_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_idas_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_STATIC_LIBS)
- 
-@@ -145,8 +145,10 @@
-   SET_TARGET_PROPERTIES(sundials_idas_shared
-     PROPERTIES VERSION ${idaslib_VERSION} SOVERSION ${idaslib_SOVERSION})
- 
-+  TARGET_LINK_LIBRARIES(sundials_idas_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-+  
-   # Install the IDAS library
--  INSTALL(TARGETS sundials_idas_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_idas_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_SHARED_LIBS)
- 
-diff -Nur sundials-2.7.0.orig/src/kinsol/CMakeLists.txt sundials-2.7.0/src/kinsol/CMakeLists.txt
---- sundials-2.7.0.orig/src/kinsol/CMakeLists.txt	2016-09-26 22:17:39.000000000 +0000
-+++ sundials-2.7.0/src/kinsol/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -134,7 +134,7 @@
-     PROPERTIES OUTPUT_NAME sundials_kinsol CLEAN_DIRECT_OUTPUT 1)
- 
-   # Install the KINSOL library
--  INSTALL(TARGETS sundials_kinsol_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_kinsol_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_STATIC_LIBS)
- 
-@@ -153,8 +153,10 @@
-   SET_TARGET_PROPERTIES(sundials_kinsol_shared
-     PROPERTIES VERSION ${kinsollib_VERSION} SOVERSION ${kinsollib_SOVERSION})
- 
-+  TARGET_LINK_LIBRARIES(sundials_kinsol_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-+  
-   # Install the KINSOL library
--  INSTALL(TARGETS sundials_kinsol_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_kinsol_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_SHARED_LIBS)
- 
-diff -Nur sundials-2.7.0.orig/src/kinsol/fcmix/CMakeLists.txt sundials-2.7.0/src/kinsol/fcmix/CMakeLists.txt
---- sundials-2.7.0.orig/src/kinsol/fcmix/CMakeLists.txt	2016-09-26 22:17:39.000000000 +0000
-+++ sundials-2.7.0/src/kinsol/fcmix/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -54,7 +54,7 @@
-   PROPERTIES OUTPUT_NAME sundials_fkinsol CLEAN_DIRECT_OUTPUT 1)
- 
- # Install the FKINSOL library
--INSTALL(TARGETS sundials_fkinsol_static DESTINATION lib)
-+INSTALL(TARGETS sundials_fkinsol_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- #
- MESSAGE(STATUS "Added KINSOL FCMIX module")
-diff -Nur sundials-2.7.0.orig/src/nvec_openmp/CMakeLists.txt sundials-2.7.0/src/nvec_openmp/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_openmp/CMakeLists.txt	2016-09-26 22:16:50.000000000 +0000
-+++ sundials-2.7.0/src/nvec_openmp/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -51,7 +51,7 @@
-   ADD_LIBRARY(sundials_nvecopenmp_static STATIC ${nvecopenmp_SOURCES} ${shared_SOURCES})
-   SET_TARGET_PROPERTIES(sundials_nvecopenmp_static
-     PROPERTIES OUTPUT_NAME sundials_nvecopenmp CLEAN_DIRECT_OUTPUT 1)
--  INSTALL(TARGETS sundials_nvecopenmp_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecopenmp_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
- 
- # Rules for building and installing the shared library:
-@@ -65,7 +65,8 @@
-     PROPERTIES OUTPUT_NAME sundials_nvecopenmp CLEAN_DIRECT_OUTPUT 1)
-   SET_TARGET_PROPERTIES(sundials_nvecopenmp_shared
-     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--  INSTALL(TARGETS sundials_nvecopenmp_shared DESTINATION lib)
-+  TARGET_LINK_LIBRARIES(sundials_nvecopenmp_shared -lm)
-+  INSTALL(TARGETS sundials_nvecopenmp_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
- 
- # Install the NVECOPENMP header files
-@@ -78,7 +79,7 @@
-     ADD_LIBRARY(sundials_fnvecopenmp_static STATIC ${fnvecopenmp_SOURCES})
-     SET_TARGET_PROPERTIES(sundials_fnvecopenmp_static
-       PROPERTIES OUTPUT_NAME sundials_fnvecopenmp CLEAN_DIRECT_OUTPUT 1)
--    INSTALL(TARGETS sundials_fnvecopenmp_static DESTINATION lib)
-+    INSTALL(TARGETS sundials_fnvecopenmp_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_STATIC_LIBS)
-   IF(BUILD_SHARED_LIBS)
-     ADD_LIBRARY(sundials_fnvecopenmp_shared ${fnvecopenmp_SOURCES})
-@@ -86,7 +87,8 @@
-       PROPERTIES OUTPUT_NAME sundials_fnvecopenmp CLEAN_DIRECT_OUTPUT 1)
-     SET_TARGET_PROPERTIES(sundials_fnvecopenmp_shared 
-       PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--    INSTALL(TARGETS sundials_fnvecopenmp_shared DESTINATION lib)
-+    TARGET_LINK_LIBRARIES(sundials_fnvecopenmp_shared -lm)
-+    INSTALL(TARGETS sundials_fnvecopenmp_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_SHARED_LIBS)
- ENDIF(FCMIX_ENABLE AND F77_FOUND)
- 
-diff -Nur sundials-2.7.0.orig/src/nvec_par/CMakeLists.txt sundials-2.7.0/src/nvec_par/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_par/CMakeLists.txt	2016-09-26 22:16:50.000000000 +0000
-+++ sundials-2.7.0/src/nvec_par/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -52,7 +52,7 @@
-   ADD_LIBRARY(sundials_nvecparallel_static STATIC ${nvecparallel_SOURCES} ${shared_SOURCES})
-   SET_TARGET_PROPERTIES(sundials_nvecparallel_static
-     PROPERTIES OUTPUT_NAME sundials_nvecparallel CLEAN_DIRECT_OUTPUT 1)
--  INSTALL(TARGETS sundials_nvecparallel_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecparallel_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
- 
- # Rules for building and installing the shared library:
-@@ -66,7 +66,8 @@
-     PROPERTIES OUTPUT_NAME sundials_nvecparallel CLEAN_DIRECT_OUTPUT 1)
-   SET_TARGET_PROPERTIES(sundials_nvecparallel_shared 
-     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--  INSTALL(TARGETS sundials_nvecparallel_shared DESTINATION lib)
-+  TARGET_LINK_LIBRARIES(sundials_nvecparallel_shared -lm)
-+  INSTALL(TARGETS sundials_nvecparallel_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
- 
- # Install the NVECPARALLEL header files
-@@ -79,7 +80,7 @@
-     ADD_LIBRARY(sundials_fnvecparallel_static STATIC ${fnvecparallel_SOURCES})
-     SET_TARGET_PROPERTIES(sundials_fnvecparallel_static
-       PROPERTIES OUTPUT_NAME sundials_fnvecparallel CLEAN_DIRECT_OUTPUT 1)
--    INSTALL(TARGETS sundials_fnvecparallel_static DESTINATION lib)
-+    INSTALL(TARGETS sundials_fnvecparallel_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_STATIC_LIBS)
-   IF(BUILD_SHARED_LIBS)
-     ADD_LIBRARY(sundials_fnvecparallel_shared SHARED ${fnvecparallel_SOURCES})
-@@ -87,7 +88,7 @@
-       PROPERTIES OUTPUT_NAME sundials_fnvecparallel CLEAN_DIRECT_OUTPUT 1)
-     SET_TARGET_PROPERTIES(sundials_fnvecparallel_shared
-       PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--    INSTALL(TARGETS sundials_fnvecparallel_shared DESTINATION lib)
-+    INSTALL(TARGETS sundials_fnvecparallel_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_SHARED_LIBS)
- ENDIF(FCMIX_ENABLE AND MPIF_FOUND)
- #
-diff -Nur sundials-2.7.0.orig/src/nvec_parhyp/CMakeLists.txt sundials-2.7.0/src/nvec_parhyp/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_parhyp/CMakeLists.txt	2016-09-26 22:16:50.000000000 +0000
-+++ sundials-2.7.0/src/nvec_parhyp/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -53,7 +53,7 @@
-   ADD_LIBRARY(sundials_nvecparhyp_static STATIC ${nvecparhyp_SOURCES} ${shared_SOURCES})
-   SET_TARGET_PROPERTIES(sundials_nvecparhyp_static
-     PROPERTIES OUTPUT_NAME sundials_nvecparhyp CLEAN_DIRECT_OUTPUT 1)
--  INSTALL(TARGETS sundials_nvecparhyp_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecparhyp_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
- 
- # Rules for building and installing the shared library:
-@@ -67,7 +67,7 @@
-     PROPERTIES OUTPUT_NAME sundials_nvecparhyp CLEAN_DIRECT_OUTPUT 1)
-   SET_TARGET_PROPERTIES(sundials_nvecparhyp_shared 
-     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--  INSTALL(TARGETS sundials_nvecparhyp_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecparhyp_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
- 
- # Install the NVECPARHYP header files
-diff -Nur sundials-2.7.0.orig/src/nvec_petsc/CMakeLists.txt sundials-2.7.0/src/nvec_petsc/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_petsc/CMakeLists.txt	2016-09-26 22:16:50.000000000 +0000
-+++ sundials-2.7.0/src/nvec_petsc/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -53,7 +53,7 @@
-   ADD_LIBRARY(sundials_nvecpetsc_static STATIC ${nvecpetsc_SOURCES} ${shared_SOURCES})
-   SET_TARGET_PROPERTIES(sundials_nvecpetsc_static
-     PROPERTIES OUTPUT_NAME sundials_nvecpetsc CLEAN_DIRECT_OUTPUT 1)
--  INSTALL(TARGETS sundials_nvecpetsc_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecpetsc_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
- 
- # Rules for building and installing the shared library:
-@@ -67,7 +67,7 @@
-     PROPERTIES OUTPUT_NAME sundials_nvecpetsc CLEAN_DIRECT_OUTPUT 1)
-   SET_TARGET_PROPERTIES(sundials_nvecpetsc_shared 
-     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--  INSTALL(TARGETS sundials_nvecpetsc_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecpetsc_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
- 
- # Install the NVECPARHYP header files
-diff -Nur sundials-2.7.0.orig/src/nvec_pthreads/CMakeLists.txt sundials-2.7.0/src/nvec_pthreads/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_pthreads/CMakeLists.txt	2016-09-26 22:16:50.000000000 +0000
-+++ sundials-2.7.0/src/nvec_pthreads/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -44,7 +44,7 @@
-   ADD_LIBRARY(sundials_nvecpthreads_static STATIC ${nvecpthreads_SOURCES} ${shared_SOURCES})
-   SET_TARGET_PROPERTIES(sundials_nvecpthreads_static
-     PROPERTIES OUTPUT_NAME sundials_nvecpthreads CLEAN_DIRECT_OUTPUT 1)
--  INSTALL(TARGETS sundials_nvecpthreads_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecpthreads_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
- 
- # Rules for building and installing the shared library:
-@@ -58,7 +58,8 @@
-     PROPERTIES OUTPUT_NAME sundials_nvecpthreads CLEAN_DIRECT_OUTPUT 1)
-   SET_TARGET_PROPERTIES(sundials_nvecpthreads_shared
-     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--  INSTALL(TARGETS sundials_nvecpthreads_shared DESTINATION lib)
-+  TARGET_LINK_LIBRARIES(sundials_nvecpthreads_shared -lm -lpthread)
-+  INSTALL(TARGETS sundials_nvecpthreads_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
- 
- # Install the NVECPTHREADS header files
-@@ -71,7 +72,7 @@
-     ADD_LIBRARY(sundials_fnvecpthreads_static STATIC ${fnvecpthreads_SOURCES})
-     SET_TARGET_PROPERTIES(sundials_fnvecpthreads_static
-       PROPERTIES OUTPUT_NAME sundials_fnvecpthreads CLEAN_DIRECT_OUTPUT 1)
--    INSTALL(TARGETS sundials_fnvecpthreads_static DESTINATION lib)
-+    INSTALL(TARGETS sundials_fnvecpthreads_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_STATIC_LIBS)
-   IF(BUILD_SHARED_LIBS)
-     ADD_LIBRARY(sundials_fnvecpthreads_shared ${fnvecpthreads_SOURCES})
-@@ -79,7 +80,8 @@
-       PROPERTIES OUTPUT_NAME sundials_fnvecpthreads CLEAN_DIRECT_OUTPUT 1)
-     SET_TARGET_PROPERTIES(sundials_fnvecpthreads_shared 
-       PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--    INSTALL(TARGETS sundials_fnvecpthreads_shared DESTINATION lib)
-+    TARGET_LINK_LIBRARIES(sundials_fnvecpthreads_shared -lm -lpthread)
-+    INSTALL(TARGETS sundials_fnvecpthreads_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_SHARED_LIBS)
- ENDIF(FCMIX_ENABLE AND F77_FOUND)
- 
-diff -Nur sundials-2.7.0.orig/src/nvec_ser/CMakeLists.txt sundials-2.7.0/src/nvec_ser/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_ser/CMakeLists.txt	2016-09-26 22:16:49.000000000 +0000
-+++ sundials-2.7.0/src/nvec_ser/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -44,7 +44,7 @@
-   ADD_LIBRARY(sundials_nvecserial_static STATIC ${nvecserial_SOURCES} ${shared_SOURCES})
-   SET_TARGET_PROPERTIES(sundials_nvecserial_static
-     PROPERTIES OUTPUT_NAME sundials_nvecserial CLEAN_DIRECT_OUTPUT 1)
--  INSTALL(TARGETS sundials_nvecserial_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecserial_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
- 
- # Rules for building and installing the shared library:
-@@ -58,7 +58,8 @@
-     PROPERTIES OUTPUT_NAME sundials_nvecserial CLEAN_DIRECT_OUTPUT 1)
-   SET_TARGET_PROPERTIES(sundials_nvecserial_shared
-     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--  INSTALL(TARGETS sundials_nvecserial_shared DESTINATION lib)
-+  TARGET_LINK_LIBRARIES(sundials_nvecserial_shared -lm)
-+  INSTALL(TARGETS sundials_nvecserial_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
- 
- # Install the NVECSERIAL header files
-@@ -71,7 +72,7 @@
-     ADD_LIBRARY(sundials_fnvecserial_static STATIC ${fnvecserial_SOURCES})
-     SET_TARGET_PROPERTIES(sundials_fnvecserial_static
-       PROPERTIES OUTPUT_NAME sundials_fnvecserial CLEAN_DIRECT_OUTPUT 1)
--    INSTALL(TARGETS sundials_fnvecserial_static DESTINATION lib)
-+    INSTALL(TARGETS sundials_fnvecserial_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_STATIC_LIBS)
-   IF(BUILD_SHARED_LIBS)
-     ADD_LIBRARY(sundials_fnvecserial_shared ${fnvecserial_SOURCES})
-@@ -79,7 +80,8 @@
-       PROPERTIES OUTPUT_NAME sundials_fnvecserial CLEAN_DIRECT_OUTPUT 1)
-     SET_TARGET_PROPERTIES(sundials_fnvecserial_shared 
-       PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--    INSTALL(TARGETS sundials_fnvecserial_shared DESTINATION lib)
-+    TARGET_LINK_LIBRARIES(sundials_fnvecserial_shared -lm)
-+    INSTALL(TARGETS sundials_fnvecserial_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_SHARED_LIBS)
- ENDIF(FCMIX_ENABLE AND F77_FOUND)
- 
diff --git a/sci-libs/sundials/files/sundials-3.1.2-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-3.1.2-fix-license-install-path.patch
deleted file mode 100644
index 188e29999fca..000000000000
--- a/sci-libs/sundials/files/sundials-3.1.2-fix-license-install-path.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -ru sundials-3.1.2.orig/CMakeLists.txt sundials-3.1.2/CMakeLists.txt
---- sundials-3.1.2.orig/CMakeLists.txt	2018-07-31 17:25:19.000000000 -0000
-+++ sundials-3.1.2/CMakeLists.txt	2019-04-17 12:18:58.894563957 -0000
-@@ -1629,4 +1629,4 @@
- # install license file
- INSTALL(
-   FILES ${PROJECT_SOURCE_DIR}/LICENSE
--  DESTINATION include/sundials)
-+  DESTINATION share/doc/sundials-3.1.2)
diff --git a/sci-libs/sundials/files/sundials-4.0.2-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-4.0.2-fix-license-install-path.patch
index 97cc6f715c4e..fbcf53c410cf 100644
--- a/sci-libs/sundials/files/sundials-4.0.2-fix-license-install-path.patch
+++ b/sci-libs/sundials/files/sundials-4.0.2-fix-license-install-path.patch
@@ -1,7 +1,12 @@
 diff -Nur old/CMakeLists.txt new/CMakeLists.txt
 --- old/CMakeLists.txt	2019-01-23 01:05:44.000000000 +0300
 +++ new/CMakeLists.txt	2019-06-23 00:35:57.000000000 +0300
-@@ -1214,6 +1214,6 @@
+@@ -1210,10 +1210,10 @@
+ # install license and notice files
+ INSTALL(
+   FILES ${PROJECT_SOURCE_DIR}/LICENSE
+-  DESTINATION include/sundials
++  DESTINATION share/doc/sundials-4.0.2
    )
  INSTALL(
    FILES ${PROJECT_SOURCE_DIR}/NOTICE
diff --git a/sci-libs/sundials/files/sundials-4.1.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-4.1.0-fix-license-install-path.patch
index 72b5f5915c87..6eb75ce59cff 100644
--- a/sci-libs/sundials/files/sundials-4.1.0-fix-license-install-path.patch
+++ b/sci-libs/sundials/files/sundials-4.1.0-fix-license-install-path.patch
@@ -1,7 +1,12 @@
 diff -Nur old/CMakeLists.txt new/CMakeLists.txt
 --- old/CMakeLists.txt	2019-02-12 21:50:51.000000000 +0300
 +++ new/CMakeLists.txt	2019-06-23 00:39:23.000000000 +0300
-@@ -1172,6 +1172,6 @@
+@@ -1168,10 +1168,10 @@
+ # install license and notice files
+ INSTALL(
+   FILES ${PROJECT_SOURCE_DIR}/LICENSE
+-  DESTINATION include/sundials
++  DESTINATION share/doc/sundials-4.1.0
    )
  INSTALL(
    FILES ${PROJECT_SOURCE_DIR}/NOTICE
diff --git a/sci-libs/sundials/metadata.xml b/sci-libs/sundials/metadata.xml
index b4735cc5086b..a817ac12febc 100644
--- a/sci-libs/sundials/metadata.xml
+++ b/sci-libs/sundials/metadata.xml
@@ -17,6 +17,6 @@
   <use>
     <flag name="hypre">Build with <pkg>sci-libs/hypre</pkg> conditioners</flag>
     <flag name="sparse">Enable support for <pkg>sci-libs/klu</pkg> sparse solver</flag>
-    <flag name="superlumt">Build with <pkg>sci-libs/superlu_mt</pkg></flag>    
+    <flag name="superlumt">Build with <pkg>sci-libs/superlu_mt</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/sci-libs/sundials/sundials-2.7.0.ebuild b/sci-libs/sundials/sundials-2.7.0.ebuild
deleted file mode 100644
index 3b5df344e82c..000000000000
--- a/sci-libs/sundials/sundials-2.7.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit cmake-utils toolchain-funcs fortran-2 versionator
-
-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/$(get_major_version)"
-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 )"
-
-RDEPEND="
-	lapack? ( virtual/lapack )
-	mpi? ( virtual/mpi sci-libs/hypre:= )
-	sparse? ( sci-libs/klu:= )
-	superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-underlinking-libdir.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"
-		-DHYPRE_LIBRARY="HYPRE"
-		-DKLU_ENABLE="$(usex sparse)"
-		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
-		-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="superlu_mt"
-		-DEXAMPLES_ENABLE="$(usex examples)"
-		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
-		-DUSE_GENERIC_MATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc doc/*/*.pdf
-	cd src
-	for r in */README; do
-		newdoc ${r} README-${r%/*}
-	done
-}
diff --git a/sci-libs/sundials/sundials-3.0.0.ebuild b/sci-libs/sundials/sundials-3.0.0.ebuild
deleted file mode 100644
index 5be731414779..000000000000
--- a/sci-libs/sundials/sundials-3.0.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit cmake-utils toolchain-funcs fortran-2 versionator
-
-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/$(get_major_version)"
-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 )"
-
-RDEPEND="
-	lapack? ( virtual/lapack )
-	mpi? ( virtual/mpi sci-libs/hypre:= )
-	sparse? ( sci-libs/klu:= )
-	superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( )
-
-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"
-		-DHYPRE_LIBRARY="HYPRE"
-		-DKLU_ENABLE="$(usex sparse)"
-		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
-		-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="superlu_mt"
-		-DEXAMPLES_ENABLE="$(usex examples)"
-		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
-		-DUSE_GENERIC_MATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc doc/*/*.pdf
-	cd src
-	for r in */README; do
-		newdoc ${r} README-${r%/*}
-	done
-
-	# Use a sledgehammer, patching the buildsystem is too annoyoing (the
-	# CMake build systems consists of 2000 "lib" DESTINATIONS...)
-	if [[ lib != $(get_libdir) ]]; then
-		mv "${ED%/}"/usr/lib "${ED%/}"/usr/$(get_libdir) || die
-	fi
-}
diff --git a/sci-libs/sundials/sundials-3.1.0.ebuild b/sci-libs/sundials/sundials-3.1.0.ebuild
deleted file mode 100644
index 6285504725e0..000000000000
--- a/sci-libs/sundials/sundials-3.1.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit cmake-utils toolchain-funcs fortran-2 versionator
-
-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/$(get_major_version)"
-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 )"
-
-RDEPEND="
-	lapack? ( virtual/lapack )
-	mpi? ( virtual/mpi sci-libs/hypre:= )
-	sparse? ( sci-libs/klu:= )
-	superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( )
-
-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)"
-		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
-		-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="superlu_mt"
-		-DEXAMPLES_ENABLE="$(usex examples)"
-		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
-		-DUSE_GENERIC_MATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc doc/*/*.pdf
-	cd src
-	for r in */README; do
-		newdoc ${r} README-${r%/*}
-	done
-
-	# Use a sledgehammer, patching the buildsystem is too annoyoing (the
-	# CMake build systems consists of 2000 "lib" DESTINATIONS...)
-	if [[ lib != $(get_libdir) ]]; then
-		mv "${ED%/}"/usr/lib "${ED%/}"/usr/$(get_libdir) || die
-	fi
-}
diff --git a/sci-libs/sundials/sundials-3.1.2.ebuild b/sci-libs/sundials/sundials-3.1.2.ebuild
deleted file mode 100644
index e5ad2325ff83..000000000000
--- a/sci-libs/sundials/sundials-3.1.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit cmake-utils toolchain-funcs fortran-2 versionator
-
-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/$(get_major_version)"
-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 )"
-
-RDEPEND="
-	lapack? ( virtual/lapack )
-	mpi? ( virtual/mpi sci-libs/hypre:= )
-	sparse? ( sci-libs/klu:= )
-	superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-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)"
-		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
-		-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="superlu_mt"
-		-DEXAMPLES_ENABLE="$(usex examples)"
-		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
-		-DUSE_GENERIC_MATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc doc/*/*.pdf
-	cd src
-	for r in */README; do
-		newdoc ${r} README-${r%/*}
-	done
-
-	# Use a sledgehammer, patching the buildsystem is too annoyoing (the
-	# CMake build systems consists of 2000 "lib" DESTINATIONS...)
-	if [[ lib != $(get_libdir) ]]; then
-		mv "${ED%/}"/usr/lib "${ED%/}"/usr/$(get_libdir) || die
-	fi
-}
author	V3n3RiX <venerix@redcorelinux.org>	2019-08-02 19:14:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-08-02 19:14:55 +0100
commit	b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree	0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /sci-libs
parent	121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)