7 files changed, 123 insertions, 1 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index aa1eced90984..d7732218faf7 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 27818169e312..843f75a5193a 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -2,5 +2,5 @@ AUX gdal-2.2.3-bashcomp-path.patch 621 BLAKE2B 0f825aa27d68e35afdcbd7c5d3239b6b6
 AUX gdal-2.2.3-json-c-0.13.patch 3733 BLAKE2B 34921f8e2717a446bead6d8b07c6a8e2455752bd4534d066c4bb6150f1cd03856269a8510535517cbf60e609053e470107e9ce62d58358afcb48aa819a546563 SHA512 f4beaa11431b1eb2c6986c3da24a696cdade04f025a9bdeb9726c392aecdf597126c7735b1b2c1175bd0de71a2441b2c1e5d01e597acd7869e9c75644660994d
 AUX gdal-2.2.3-soname.patch 2062 BLAKE2B 159b3d8eec126a141ff21c908d45193411bdbcc50e03386131c313cbd71861859a1b8a5a5648307868fee484b8a1dd816b580bb2304cb7e1e72e42df40cea042 SHA512 0f06d8de537ddc19c6c4ee800c0c4b084ceb04a47fd24f28c3095909219e27634e66086158f80f011ccfb7865fc559a966770bfa95d3a8fd144f3f8a3d34571d
 DIST gdal-2.2.3.tar.gz 13754766 BLAKE2B d9482e7ee40bb5558fbbb43b750dfb95344abe45142c19e1f767535d3fc127fa9d6ed4496d730a25cb4132980efbffb4685e8663798fa05515b8548edb689e42 SHA512 841e5ba3c1a442b678dcaabac719ea7707b817f3dc717a34430dc7ba1f2c27fa88e27b7a8645075fae6e16373b36e6c50f674bdd6b70d10059e6bc4be7a72046
-EBUILD gdal-2.2.3-r1.ebuild 7517 BLAKE2B de76801dcafcafb9d50b03bc2ad3ce9b84fae5fadb68b405e0d67da43a01ba264ca07b3956a13ae061e5bce5a93084e2169f77873fc03e0d76eb027296114e8a SHA512 75cc5b64d5456f55b201d6de1415bdb10af4f32cd2709177a20dcac2dc1897be2c92eb5d66f1400f2d98f76e1ed6c064fa44441d02c535ba7cfb000fe6bb5af2
+EBUILD gdal-2.2.3-r1.ebuild 7556 BLAKE2B e8f07d634b9db3159a282d5e47b48a125ee2048ebb7378ac7e772b46c792fe482f557d408b18c15ca879ecae967c54f835d20c49accaf4434413a6581a3109b3 SHA512 955f994cbf9ac8b3e4ca1fc0f03727aabd93b868ea29d83503efd05d864c044ff4942a365a4e16b38f4f56b8705e0e2b48977e244e6580a29728771828817e40
 MISC metadata.xml 1522 BLAKE2B b67678f81739e2fb2866cc6ca49545368fce4a85b145ba3f8228b8a39ecb2d7f75b55500f13768838c9ed11a47f586ab7b05eb31e2dbf6fcd4d29c5d8896107f SHA512 091112e555a5a77c5643cbd4465046bfd9fe287e209b42f5410787a2f1a2e4d7ec640efad93c277f0f6581db2264fa104d5aba2e8cbc4126c2c14fe4d86afcee
diff --git a/sci-libs/gdal/gdal-2.2.3-r1.ebuild b/sci-libs/gdal/gdal-2.2.3-r1.ebuild
index 57ee4454007f..7084e66a8f50 100644
--- a/sci-libs/gdal/gdal-2.2.3-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.2.3-r1.ebuild
@@ -154,6 +154,7 @@ src_configure() {
 		--with-geotiff \
 		--with-grib \
 		--with-hide-internal-symbols \
+		--with-libjson-c="${EPREFIX}/usr/" \
 		--with-libtiff \
 		--with-libtool \
 		--with-libz="${EPREFIX}/usr/" \
diff --git a/sci-libs/shapelib/Manifest b/sci-libs/shapelib/Manifest
index 8f40dfa6b226..be37e69cc02c 100644
--- a/sci-libs/shapelib/Manifest
+++ b/sci-libs/shapelib/Manifest
@@ -1,3 +1,5 @@
 DIST shapelib-1.4.0.tar.gz 548990 BLAKE2B 0e75481d35f8dc5687eee23696d46a780d4b185a81ca1246e5c19f01e58f4a55dc7b69347c9effa01ac1786c5271dfe3907798cc81fe9314979c502bcb9d982d SHA512 206b81fe859a837e821e449ab1b2dbd5a3aa7abd1871da4aec69e130b6fad6300697429884ce359c90e4b76bca90e2108f32b9fdbd3b92013fa5a39f3bedeeb1
+DIST shapelib-1.4.1.tar.gz 549831 BLAKE2B e579704bd71c2525133f87628261e78f39e8063cd7e8a57997e90a8ca4a6ebb5de3a4d1ab8da5d00afe1363d9eb22e8c7a9a66ac109c300b72b6d26bd87b61fd SHA512 791c1a0d6c5ff09341176f68349ebd760ae91e8749a9f844299d7ac38a42c4f1131e63479c384a8a8b05a89e90d02e9fd92c526cab417eb80b171d639b4a4422
 EBUILD shapelib-1.4.0-r1.ebuild 739 BLAKE2B f3149e901a0d974e94d00ff64dea46355070ff537abe36b03b4ae9ededadf4a679633eebb6d9696de00e932e153d8f8bf9905cd8c2e790b36a0dc9e0a9396324 SHA512 587239c58c93654f82a4ec81015e92eabcfdb47f82c5b4c4ca32b9e2e91d67de4cc170d2609531cf4e0dc5ca564f40158c3b549de292362234fc8ca1fe64a8ff
+EBUILD shapelib-1.4.1.ebuild 743 BLAKE2B 92e0233f81145769d3d3076c9a0feb0029fddad4c16b6b0e8c07a77b106b92ffbe7f4496f312b6ce47763b536b5185ef64a3581d9337cc2bf51d2f462b9c6712 SHA512 355e1105ad9d377f0794c7713eb53c15612dc13aae9a5046eb52e6b1587f795e89e8385ec87940ed3fa9547cd44c68306b3d891934bff919c4b929812f0422f8
 MISC metadata.xml 405 BLAKE2B ed97fadfd57934dab768c271f100531eb2f5c9e98564b54d73c2396d0959c62b39ee7ce5ad96495f1133cf8c3de8ad2ffcb0d13353c1a32c9be92ad81bd80995 SHA512 9581a1f8123cdcc6b68de0fdc03dfa866c64668222f1d90b55160cdaf8d36e1441f0530fced6b149681fef88321bf33879996199685eb6e26cefae975b704adb
diff --git a/sci-libs/shapelib/shapelib-1.4.1.ebuild b/sci-libs/shapelib/shapelib-1.4.1.ebuild
new file mode 100644
index 000000000000..87fe28c275f3
--- /dev/null
+++ b/sci-libs/shapelib/shapelib-1.4.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Library for manipulating ESRI Shapefiles"
+HOMEPAGE="http://shapelib.maptools.org/"
+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"
+IUSE="doc static-libs"
+
+RDEPEND="sci-libs/proj"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	rm -r m4/* || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--includedir=/usr/include/libshp
+}
+
+src_install() {
+	use doc && HTML_DOCS=( web/. )
+	default
+
+	if ! use static-libs; then
+		find "${D}" \( -name '*.la' -o -name '*.a' \) -delete || die
+	fi
+}
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index 4697948ec082..b7366dfa54e2 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -1,4 +1,6 @@
 AUX sundials-2.7.0-underlinking-libdir.patch 19659 BLAKE2B 9dab5796e7f64528df06a435433719bbd34f6f9868ab6d88ec59e32777c4513c995bebe3f4e32b91cfb000328c6ae307a1c29cd34acd21cd9485668c3783b991 SHA512 95bc36d359b672b725391d75540304fac6b2610960f67a636cf5656e30904a2ed309a75175f4d20b9199d70d45fa817e53e86433ff18dfcf28ef76840b9d0dba
 DIST sundials-2.7.0.tar.gz 12258093 BLAKE2B 331fcf255f2bb8bcc798818b05db114feda7aacb6585177a836f17a9b58477f504099b4a33c7d71cab6e70eeb6fe47a76d101c08aa6219ee6fbac630524d5928 SHA512 c86c167538065a4109b36ae7c8f60f3d92184133cfa661b5acfccee052c38f40be865412a1746bb57907b61602c212c0f15e1e30ef29e8a49db6d46a75a28e69
+DIST sundials-3.0.0.tar.gz 12996039 BLAKE2B 0557190f6f7550bd4d7d3df10f727c6f235ff4917f2cfd35ca77785037edc43236a82383664f6fe1579bb5b07a148875b82b22f5a9e4f5f2a0607838e8a3b286 SHA512 3c86c7f27e64c2e6732546b0b1e87ea092502e361cae09b3b7eb29795c978edf494e17be13b78541dc91cc0709d928006bd0fc62ea968f2b621efa51856cdd60
 EBUILD sundials-2.7.0.ebuild 2063 BLAKE2B 1ca9f283e24c399dadadf6f00835a4e2d25da64b3d660fa2f69daa632b6873bacdd73c329451036379523c3f76a6272c25833db312390e488b5330c862dbd174 SHA512 cd92701c6c400fa5c75610c6d35117b182be293821ce7bd0d15fb8c4807ca5359bd5413e36c2cc12af85321a331a90a2d514b1d31409ed70d9203728b61a995f
+EBUILD sundials-3.0.0.ebuild 2251 BLAKE2B 0550d1728013a3ad574668c1902fe3b416f8ed1842057cf7ea44bafe599e1c056db45dcdde822edb71b6094135d4d7b168ae70f575bf0cb2c41efc09eb449197 SHA512 ad1382f72bd6893788dca8706d1316a23be35f62b33bf0492675d089b506a15191550081999810dfaeff90ecaa84f8d823bae55f2de94d8446a0a1ad1e1a5381
 MISC metadata.xml 1063 BLAKE2B 9fcc89ceb3553bf23a0f1074eaca3a76707ddcd7cdbce253c6710e2db8422fff558a0e761fe93eb00bf385bd6f30fcb53decc5323c425c609f419be92855799a SHA512 d81c64ac7241460ebc7bcd61f1b398ef55a1e9b5a5a9bb0ede400bfe06889d2db781c43853bf33069510f2461140ab8b7a47a4553cdafca64c1ed7bd0f16d742
diff --git a/sci-libs/sundials/sundials-3.0.0.ebuild b/sci-libs/sundials/sundials-3.0.0.ebuild
new file mode 100644
index 000000000000..35e90af469e9
--- /dev/null
+++ b/sci-libs/sundials/sundials-3.0.0.ebuild
@@ -0,0 +1,79 @@
+# 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="http://computation.llnl.gov/projects/sundials"
+SRC_URI="http://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
+}