gentoo resync : 03.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-03 13:42:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-03 13:42:34 +0000
commit: 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch)
tree: 3cb05783d73b2c33589ba305144a31c718e123cd /sci-libs
parent: 16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff)
49 files changed, 443 insertions, 611 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 1f7621eb9c66..8b647476f407 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/arprec/Manifest b/sci-libs/arprec/Manifest
index 42188dc66f0e..455787d15a02 100644
--- a/sci-libs/arprec/Manifest
+++ b/sci-libs/arprec/Manifest
@@ -3,6 +3,6 @@ AUX arprec-2.2.18-gold.patch 545 BLAKE2B 26ec85a03bb693bdc484fa14d360e90b5571d17
 AUX arprec-2.2.19-gold.patch 477 BLAKE2B 128d84824143a6af222f92462efd58d22ae014e359555b59380bd0060faea249a879244baca3cf7c2d81510070647c49414c4589efce5ce40328a6f3871e387f SHA512 f8a6408916b26a395832a6bd55f43de7153ceab5a343df1f974a2dd9e6ae3eec1b2533db36a11061e74f15f471dcff52a3247681e8872b15dfb8115f9b406cf6
 DIST arprec-2.2.18.tar.gz 1751743 BLAKE2B de9a9a37bbe03357ad17d9d10d8bb42f73b9c9464643a35d4d1e209d049c205f967266dcae1af8972fc8c029f03053b298a4c85fdc48fb3f66d152aca8623a25 SHA512 372eb0a0c3aceac0d222679058f47c4d1037b5a51524b752b87f1b61c1b25101c34d4e56d9da45b4075ea7040dd59a597e0add4f34be902955dcf209423a6579
 DIST arprec-2.2.19.tar.gz 1962133 BLAKE2B a2fccc1908e791fd4759e61ff52b180fcaccbfbfa831ee1beca9b22a1a745d17d21040974ffe02ea21397a2339c819a30cd93a247738564a2b433f7cef14c9e4 SHA512 97cf090398aa169e31711077efd26dc6da1f62291ab37b241b133634838bdd44743f85b86b861a3be18d2696ae9132afb6cd1871502bedb9cc17dfb63fde2632
-EBUILD arprec-2.2.18.ebuild 1533 BLAKE2B 05c9d0238707535220400f7caeb9352ca45a730979121ce9d79a3deb09d8c087406d8eced7b1f8ed435ee6804227f1fca5feebd604284eca325bf0ef219c4167 SHA512 0b4d377fda48265a8671123a752044ec70ea58f28bb471744c0e5f9138711269d1284c7feb678388e62a2e771d876a0f0e28a4307700bab9184959e60af0c118
-EBUILD arprec-2.2.19.ebuild 1570 BLAKE2B e27261e2a2eb1dbe338e8f1a2ea4e6c49fcb0b1112f3272ec7298c7eb31809aeb6d499eed22b8616207585c1c71dee70cbcd6204c191edb50004ee3b0714c5e2 SHA512 9fafaaab47fc4605fc0412862570e36fe2083858d0d327b25071c79abaf54baea3a2ec7ecca6c6dbfcbb38b550a819a5f6b2007510d32893bbb885716b093e42
+EBUILD arprec-2.2.18.ebuild 1532 BLAKE2B 0c237b7fa23540281cd631fffe19aba2f174b477230b79e3f78ecfe00523bef7555bb3e58fb1c9fabdf97161389271ff225401265c6730b145c3d27c93d1e43c SHA512 a0caa72eb9ba891b1b420985c569bd928f3b4602b062082fdf354db7c6c66a400fc7941396798531792cc73a491221b4c20dfc1b491ec2136fb28cd7b4e5a798
+EBUILD arprec-2.2.19.ebuild 1569 BLAKE2B 842a8e76f459fef164ecc204e8437a4143cc33567a035243d6540a3aaae9c693ba2d1142fb81a02b422095ef5fee8e5e4fa36dea41cdf405e1081b70a3de534d SHA512 23333b1466a36adf24ce851491c4416b5fa71267fd730e82c8c39636f992a851191ca0469670b3442b49bed27bb06cfa267c064aeef29a77feaf6fcce90bf369
 MISC metadata.xml 474 BLAKE2B d74aad2e60fe6ce5a44dca931506ef83275032371c05310b287973b10055f7635fe196d08656dedc369350c5c9a2bf7f8c0f0c732f47b38c462c3aa1352a6c76 SHA512 cde307a1a91601c08153dc01535f8567cb37e7c9a0c194d4379ef428f73b75438416281a5ab478c995e7fcf108df25e7d2247430eb0960cbc6630acc2e444808
diff --git a/sci-libs/arprec/arprec-2.2.18.ebuild b/sci-libs/arprec/arprec-2.2.18.ebuild
index b7ba9c00b8df..8c4069fcd8da 100644
--- a/sci-libs/arprec/arprec-2.2.18.ebuild
+++ b/sci-libs/arprec/arprec-2.2.18.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
@@ -9,8 +9,8 @@ FORTRAN_STANDARD=90
 inherit autotools fortran-2
 
 DESCRIPTION="Arbitrary precision float arithmetics and functions"
-HOMEPAGE="http://crd-legacy.lbl.gov/~dhbailey/mpdist/"
-SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
+HOMEPAGE="https://crd-legacy.lbl.gov/~dhbailey/mpdist/"
+SRC_URI="https://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
diff --git a/sci-libs/arprec/arprec-2.2.19.ebuild b/sci-libs/arprec/arprec-2.2.19.ebuild
index 4fe88b289cba..b31b5b5c86c7 100644
--- a/sci-libs/arprec/arprec-2.2.19.ebuild
+++ b/sci-libs/arprec/arprec-2.2.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,8 +9,8 @@ FORTRAN_STANDARD=90
 inherit autotools fortran-2
 
 DESCRIPTION="Arbitrary precision float arithmetics and functions"
-HOMEPAGE="http://crd-legacy.lbl.gov/~dhbailey/mpdist/"
-SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
+HOMEPAGE="https://crd-legacy.lbl.gov/~dhbailey/mpdist/"
+SRC_URI="https://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index 3673a79a3621..3d790a1878d1 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1,6 +1,8 @@
+DIST dlib-19.16.tar.gz 10411975 BLAKE2B 93047590a4d8f4685970d3db6841cbf9cc90ca8a5e50f0929a106d887e5db1b4fd96bbe14380537a3e28369a8db6d9d8c067e7768000ac3c7d0f225b46369326 SHA512 4e040ef88acff05e1a48e499b813c876b22ad3f989d076bdf19969d01036b62e51a0dff30b70046910ba31dfa1b1c2450a7fad41ae3142b7285ed74b8d584887
 DIST dlib-19.4.tar.gz 7226923 BLAKE2B 2d72936fc46d559a80288e7f88a64c372fb5f8dcfc69b57abee8a27519f3084fa0cf4193261dd9758f9eb718e755d46a17655e38cb74aaa0046855f11676e157 SHA512 23bf80353f9b6ce07b6a3a7df05016705645c18bcf2b3ead567935008ea12c9f6dc0722d9bbacc009bd26f78eb43c1cbecf776bfed5a3445c1f2e8e208f201e2
 DIST dlib-19.7.tar.gz 7670615 BLAKE2B 13343f3b99bf5dd7a9c032de09eff47f1675bbc978a93edfbd952196b2347e4a887a8eed805f22985477b10ecfa1df85fc568e32f1a00b17b0292a0a51db9764 SHA512 a3877066e04a411d96e910f4229c60a86971a9290e840aa4a5b2f0b102e9b8c37bfede259b80b71ba066d21eb0aa2565808e51d0eab6397ff5fd2bac60dcedd5
 DIST dlib-19.9.tar.gz 8892457 BLAKE2B d18548e09f8169bbc9d7f339599bd58b940410839b259a8d7be9cb999f82e634ad5cd0539adb45239dab821ea1029493d24ae9990ca32c75c744e2c5d9e218f6 SHA512 1e2123c22e1b13cc84108fa627bfa92eadc9dee63f93a9f45676bbf2b752c8728117d915ac327f5223b0cdbce87dd3bef2f4d8d5ed3f8f5a314ffa9e8962a246
+EBUILD dlib-19.16.ebuild 2952 BLAKE2B b026843271edc33b088d0bea4e61591579f44bf6c8a6115fb71002d857d20feabb3d18310cadedb8e21da47cdcec46ef77535444d4fc80e7b37d9f4fe46d5ce2 SHA512 3c4e77716a6de00a12fbe68b3823b15ad623f71c81d7a83d18442f7c725aa255ffe5eab6828458f24aad91db16bcf46096b39ccfb50b0a8342b6a726c37cf743
 EBUILD dlib-19.4.ebuild 1797 BLAKE2B 45fd4d3b434852fa3a8d1571e30fee6ffbdb254ed471433fac534c26854ab69352b981dae4ad45b404cc6ff8525a92bb22915bd058c18e0f00d4c3cce9157164 SHA512 ef2172c18b446cf98c79e9b6a4dcf622ca62d05cc353d82d35385a16a334a94d5689af5117f9fee26e9e32346da57227beb83ca35b4b216135ad15b214042328
 EBUILD dlib-19.7.ebuild 1795 BLAKE2B beb38d516fb6c854f7958c6d63d83d5612acfdd384986df8ef7cfc58bca1a2c323078d96711882f4a2adeef775520fdef9e08caee550667d2493eead4fa7e9c8 SHA512 e3b82055fc6e093d2cbd7850b91354cf3e5b62cbf0d614b1c62316cdcf7aed0082808400161ea072d21a4296f901d5edeebc039ff5db73aaa0a921b6cba106ee
 EBUILD dlib-19.9.ebuild 1998 BLAKE2B 57bcf753826ddf3366f0c6001ca4e98292173ff6834419eb7b99db9df53b6b939d81a4788cbf63463c1fa4bf289060262085f2c9709cdd5fd7c1600e138ac94e SHA512 15e4a3d3d024e11c9554d0d2c6b163fa612f3f39fb9e291bb78bdf9e2c898b4b22e04181e26b6eed5a34ecd6bac8036a8b31052c9c32f32f0ab46d80d2bd474d
diff --git a/sci-libs/dlib/dlib-19.16.ebuild b/sci-libs/dlib/dlib-19.16.ebuild
new file mode 100644
index 000000000000..bdcf3929b23b
--- /dev/null
+++ b/sci-libs/dlib/dlib-19.16.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+DISTUTILS_OPTIONAL=1
+inherit cmake-utils cuda distutils-r1
+
+DESCRIPTION="Numerical and networking C++ library"
+HOMEPAGE="http://dlib.net/"
+SRC_URI="https://github.com/davisking/dlib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cblas cuda debug examples gif jpeg lapack mkl png python sqlite static-libs test X cpu_flags_x86_avx cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# doc needs a bunch of deps not in portage
+
+RDEPEND="
+	cblas? ( virtual/cblas:= )
+	cuda? ( dev-libs/cudnn:= )
+	gif? ( media-libs/giflib:= )
+	jpeg? ( virtual/jpeg:0= )
+	lapack? ( virtual/lapack:= )
+	mkl? ( sci-libs/mkl:= )
+	png? ( media-libs/libpng:0= )
+	python? ( ${PYTHON_DEPS} )
+	sqlite? ( dev-db/sqlite:3= )
+	X? ( x11-libs/libX11:= )"
+DEPEND="${RDEPEND}
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	)"
+
+DOCS=( docs/README.txt )
+
+src_prepare() {
+	use cuda && cuda_src_prepare
+	cmake-utils_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	mydistutilsargs=(
+		--"$(usex gif)" DLIB_GIF_SUPPORT
+		--"$(usex jpeg)" DLIB_JPEG_SUPPORT
+		--"$(usex png)" DLIB_PNG_SUPPORT
+		--"$(usex X no yes)" DLIB_NO_GUI_SUPPORT
+		--"$(usex cblas)" DLIB_USE_BLAS
+		--"$(usex cuda)" DLIB_USE_CUDA
+		--"$(usex lapack)" DLIB_USE_LAPACK
+		--"$(usex cpu_flags_x86_avx)" USE_AVX_INSTRUCTIONS
+		--"$(usex cpu_flags_x86_sse2)" USE_SSE2_INSTRUCTIONS
+		--"$(usex cpu_flags_x86_sse4_1)" USE_SSE4_INSTRUCTIONS
+	)
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDLIB_ENABLE_ASSERTS="$(usex debug)"
+		-DDLIB_ENABLE_STACK_TRACE="$(usex debug)"
+		-DDLIB_GIF_SUPPORT="$(usex gif)"
+		-DDLIB_JPEG_SUPPORT="$(usex jpeg)"
+		-DDLIB_PNG_SUPPORT="$(usex png)"
+		-DDLIB_LINK_WITH_SQLITE3="$(usex sqlite)"
+		-DDLIB_NO_GUI_SUPPORT="$(usex X OFF ON)"
+		-DDLIB_USE_BLAS="$(usex cblas)"
+		-DDLIB_USE_CUDA="$(usex cuda)"
+		-DDLIB_USE_LAPACK="$(usex lapack)"
+		-DUSE_AVX_INSTRUCTIONS="$(usex cpu_flags_x86_avx)"
+		-DUSE_SSE2_INSTRUCTIONS="$(usex cpu_flags_x86_sse2)"
+		-DUSE_SSE4_INSTRUCTIONS="$(usex cpu_flags_x86_sse4_1)"
+	)
+	cmake-utils_src_configure
+	use python && distutils-r1_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use python && distutils-r1_src_compile
+}
+
+python_test() {
+	esetup.py test
+}
+
+src_test() {
+	mkdir "${BUILD_DIR}"/dlib/test || die
+	pushd "${BUILD_DIR}"/dlib/test > /dev/null || die
+	cmake "${S}"/dlib/test && emake
+	./dtest --runall || die
+	popd > /dev/null || die
+	use python && distutils-r1_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && distutils-r1_src_install
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}
+	fi
+}
diff --git a/sci-libs/dsdp/Manifest b/sci-libs/dsdp/Manifest
index c523d5d94079..1813ec2bc30d 100644
--- a/sci-libs/dsdp/Manifest
+++ b/sci-libs/dsdp/Manifest
@@ -2,5 +2,5 @@ AUX dsdp-5.8-gold.patch 342 BLAKE2B a0cc333fed3f2b1ebdeccc439c0b98f9956bc64ac105
 AUX dsdp-5.8-malloc.patch 212 BLAKE2B d030d01bc49aa275c2f0eed48c1808e17877120587dedcf72fb07f737e44953df8c28d2ba6a5a443b372f56c036f9f44e1841a209b383ddab892ff8ef4e0f01d SHA512 a4c324beadb7298c9c8709115c83975d10b359b792042047439631f478fc99648b9348715645cd34d893fe9b6b49b6ba8e628771cde0e007eb0b1f474dd1fd7f
 AUX dsdp-5.8-readsdpa.patch 495 BLAKE2B 538ca4b9986cb5ed74ecb8510f8de23ecace871111140d394ae982e9932b9a733f2355199deb28cdf88addd0e18939b6a4e22b737a65438dc12e0a36e93d885c SHA512 43b329526f3b7d4761f7dfa44d62f94a843491bf9998f2f839edc880cdd8d04d1c8c7187213eda887025a9f3cdbff19afba6720cd2d70580b0e2dcb9512f8f90
 DIST DSDP5.8.tar.gz 2608518 BLAKE2B d464db2956080a33c300520ed291e1b45aeedd28378d5aab753977688bfe74d953f1d40a7aa10c2af8b70808d97dc5ece0c98d2795f707a9a3d2128302658286 SHA512 0a32a34e33dcac151e95ed0f8cee62603bbe2b4ba1e448bba35324fe576376cb33c15908cde61ae5a7c0dcdea945f1ec544f19b3dd36524158573260182e080e
-EBUILD dsdp-5.8-r3.ebuild 2390 BLAKE2B b9f9b5188159683b72d37d03af9c983d172a199fa79fc2c4d7ce54596018af660f87cde7f77fd04eabaf6f88798c83c0eb8bad08ade246ac286a4dc785ece717 SHA512 f7593cdc79b77fd21d29caf57ddc8dc250c7c5320bfc6e7cabdf672be1c06bb27f65666adf6c3808e0f73001ce2de9046b1af9fe447e17bd335f47059b3f269e
+EBUILD dsdp-5.8-r3.ebuild 2389 BLAKE2B 01cd898dd1ccf5f29736b93eba538ae18d68cf26277ec311a4258e1fe8bb7d34d3c23d306632b565a8b3987deb25696cbfb12803778ee3f04bea42b0dc296047 SHA512 76da649d8ec42f846a0f06d4733d0f35a101b441b484b9c5fc2eea91a54aaa7248b7d8fa13e00db2fdf731ef401d57ba11dd2dbd3695facf544c3c6474951df7
 MISC metadata.xml 1244 BLAKE2B f68fd446ed898a83c171b7f440aa60a1b838e4b12a172f181128baf2babe7f5ed1c0f74d96a4c078ec69b4fe06b981e5b2f4773da79afe05d65244d83de4ae44 SHA512 7dfa5358092109c0441dc9453f9769e6e63ec2525817a7280fa30c68007a3e31f524ec8600f29b21ea28e585c2776d9264918f7e66243d1a8509f42f5339c3da
diff --git a/sci-libs/dsdp/dsdp-5.8-r3.ebuild b/sci-libs/dsdp/dsdp-5.8-r3.ebuild
index 4da8972809f3..aa32624cc96c 100644
--- a/sci-libs/dsdp/dsdp-5.8-r3.ebuild
+++ b/sci-libs/dsdp/dsdp-5.8-r3.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
@@ -8,8 +8,8 @@ inherit multilib toolchain-funcs versionator
 MY_P="${PN^^}${PV}"
 
 DESCRIPTION="Software for interior-point for semidefinite programming"
-HOMEPAGE="http://www.mcs.anl.gov/hs/software/DSDP/"
-SRC_URI="http://www.mcs.anl.gov/hs/software/DSDP/${MY_P}.tar.gz"
+HOMEPAGE="https://www.mcs.anl.gov/hs/software/DSDP/"
+SRC_URI="https://www.mcs.anl.gov/hs/software/DSDP/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 4ec1bf32c3f8..e2ffaa6df8cf 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,16 +1,10 @@
 AUX gdal-2.2.3-bashcomp-path.patch 621 BLAKE2B 0f825aa27d68e35afdcbd7c5d3239b6b63e1c9b2814acc307e0b5082e7326f495102d10c4b2bdc86b17b7f4ae8ae11231c99215d87fc59217115f0fd92fc96f0 SHA512 16ed7bbd5569166c80cf4d8beba81195a177ee36bcd7e14ca6d00e3add6fe57c7980cbe1853747325443699daa331fc23e53fc86150b6c7cf871ef4812936c39
-AUX gdal-2.2.3-goocast.patch 540 BLAKE2B 3e80e54dc29d90529a6c705e434b6bd0f99bcc326c9e0e7967bd81ab8b80f3a09657c16f4a95250e6753a3dd463acc0a45301a157279a6408b697c15868f86aa SHA512 2dce2e5f391645c4470d7b08a906a942b1821a0086a4042853ba6a38df96b710b29bb7c32f6a2ac9732d281f3afe9e42aeb6f51fdc2734f896402680aed95d27
 AUX gdal-2.2.3-soname.patch 2062 BLAKE2B 159b3d8eec126a141ff21c908d45193411bdbcc50e03386131c313cbd71861859a1b8a5a5648307868fee484b8a1dd816b580bb2304cb7e1e72e42df40cea042 SHA512 0f06d8de537ddc19c6c4ee800c0c4b084ceb04a47fd24f28c3095909219e27634e66086158f80f011ccfb7865fc559a966770bfa95d3a8fd144f3f8a3d34571d
-AUX gdal-2.3.0-changeset_38658.patch 3281 BLAKE2B 3939df03e8ceba4c3615a70003bfa6a599676cd29ba6f3b61d753d7eefe6f7de1082bb3bf7fd41a45bd40674f62b390c18fd7ccc4ade10fc72b4c91b0b9ce5e2 SHA512 9e176b5335bd035e38440317b1b4aced7e252d84f48c6e3b5a42f6041a4ab810da5ef45421326a071ebe7c7cdecf133df9ca0335557e8fbc2da48b3274f46dc8
 AUX gdal-2.3.0-curl.patch 471 BLAKE2B 551c9fba5cd49afef45ae271f20b8440214b06f569893cf8dfba73bd5682a9494e8ff1d3c81c1784019e49149d56aa4a4f4ced77db2d1a29f12eaec3f4fbce72 SHA512 a23a7df486ed2fe0c000a87405ad56ed48107a957ce29bd6692df26ef93e493b2221b856720721cafeba9646c4c959e154549c87e1012a8a65389343d267dbe6
-AUX gdal-2.3.0-frmts-nitf38234.patch 421 BLAKE2B d32592e440b459a57a25de39658224db5a871a82955620140a209bab0f84872dd5c67414df16d64cf24d7ad7a180eeaff7eed7e4aef8e6a70f550575538d93ec SHA512 ffcd68e4fc277f37540a81cf200a597da0f3ee42284107724a3b6bdb44ca54459dceefd52e9d946c8b3d8fd9c5153bcdcc30dacf3ebef46180a9d22280e62c2d
-AUX gdal-2.3.0-libtiff.patch 306 BLAKE2B 8f2b39c812ceeee94b95102638885d0ff25086dec8196eaf9ae50378abe88809414da370d9b626b05d2daecfd762bf56938e35fd566952fddc18f1c614dfb4c4 SHA512 b793b1f2631a5944a79be58eab530f3cd248b25858f810515875adc71abb8e4abb1c9f9cf87ec45282bf9eca2e3932706110099a330664aadba3724954ca7297
 AUX gdal-2.3.1-poppler-0.69.0.patch 12775 BLAKE2B 27fe38cb5db58961e1f9f4aef9eddbf396dd364dd1c14bb61fefe4eb16397b75a56edd1b7e3225ccb30ecb2da1f5a5ddc669c9dd984807d5e92fb76c9b83e0b5 SHA512 84eb0107abc9030e34bd953d1b8218a15c35432c0dc687e4d52b97c66cda44e842b53d2819cd998921fe5e90830ce063aa242fe933f0675b1c649fb1c5e44ecc
 AUX gdal-2.3.1-poppler-0.71.0.patch 2770 BLAKE2B d856ebd2cc1077b39303ca0300ff5a27d1d9981c4f557bb935a0a2ddf7372ef3ae25b59c8f87a103eaf8be0eb467741b1191032889efb5f98a8bb09be1254ab5 SHA512 9c8fc013b191fc579517389928c2d0c4c2f769f188b26fa86b192dc6e7223c799f579095d0765ffe2c6f7158a661b384cb36e92e7bc8c1d5af236d24fe41281d
 AUX gdal-2.3.1-poppler-0.72.0.patch 2377 BLAKE2B c70dbfba879ecba9956b27e56ffe6fcbb076b9f6ed127eedc201c8d47cf527109374e98e2c31107f9ff14dace67556bffeff8651ae01161f2cb9e78732585846 SHA512 985a44492c585c1c8066feb7810b135535ccc87abf86996f64806e53952e7dd96c02649e072a1329aefab80c03d2d6069c829d36c4ea1471493cfb3af26eb69e
 AUX gdal-2.3.1-poppler-0.73.0.patch 906 BLAKE2B c71bf66068f19e80f38907d3f5ffd24e73ae4be99f720cc852ba8aad2f6999a020d59e068ed8a173c6f84e97471c1f6937f82d2519a166282216995cb8db69bb SHA512 0e846ec7c5ddf44144949018ae70063df1043f9dc2730bb189e794ffb40bd91869bd6f5939bd40fc88b18fb53f20151e286610a8db6e9292ba1c5ccc4065148f
-DIST gdal-2.3.0.tar.gz 14423820 BLAKE2B 6c67c66b2f68699249ccd4df2cb1e3b7042e94003b730e64bd8b8eec726a32da9485cab29552bd34c23831686ec3e879edd1848a2339c8289580ce282a287992 SHA512 b37e433be0b7a587ea9f9e5e720295e4cd1406f6c8ca770f5fedcd7fdc797e01e576eb887034b38f93f04a4e76c0ce84792bc7d91a49fea4122231a37ace812f
 DIST gdal-2.3.1.tar.gz 14450452 BLAKE2B 226ddf80ff8b9e3d420ac717b245a09fe3daa0331931f4d371b62ab9fa9bb0735ca11e1e045398de92d61b68815aa1dc3e7b6568f4853964cf42d188e46e6eb7 SHA512 0c5bb515dd2a9ad3110421b39bd680ce7e9de68e969cf35a7e63118965dbe193d25a7720a525e53af153de3e78f76ccc6983f4dcdfa6ba429d732a7a47a35d57
-EBUILD gdal-2.3.0-r2.ebuild 8138 BLAKE2B f11f4a5110a63b6eacac015ce16d05c235776a365d8328ce2046494ec560f6653f9dee26b8c99b536c6452d25e0fb600bfaed4b849b5dea87dea2bf5c0d5752b SHA512 a2cbe076456ad3b151c554b7f72da5fdf52637278b2e06816aede1e5150ee6c8aaf6441fd1be10a90b3bba380d99262c33430df10dfc7a524ea6001feca7bcab
 EBUILD gdal-2.3.1.ebuild 8398 BLAKE2B 9416c124004315533e54b39f042f52bc59462768f7f43c26bbbb69eef6843d43a1173d17f4d75d939d9d2a812bb3d171381631af6939caadd8488b1ea40ff845 SHA512 f4de15f8d1b1a4e772e2480bd7c5d4ebc68bb5c0bfb03d90acad5a1e1f3868cced22cc1af3d3b90ee85868eb1c5d21dd9a46b32483c690de88ab6ca363ac4661
 MISC metadata.xml 1616 BLAKE2B 7167165623c93e069ce77ef80e68e6339fc38354c0db343564ce8ecf3566e0d61b8b5aeb4e6b69e66bf1e8932d18de54b528bf1a2148767efe3b5cf985a31748 SHA512 dca0cb7a8c94a5313aed09f8c28ae35a55de4b0ff8198469b7f9adc8220b29cbd8c3f92db121b944b03c169b302ac8aa95f4342b76510590aff63a5f122c74c1
diff --git a/sci-libs/gdal/files/gdal-2.2.3-goocast.patch b/sci-libs/gdal/files/gdal-2.2.3-goocast.patch
deleted file mode 100644
index a25a524c2538..000000000000
--- a/sci-libs/gdal/files/gdal-2.2.3-goocast.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/frmts/pdf/pdfobject.cpp	2018-05-29 11:23:00.980957371 +0300
-+++ b/frmts/pdf/pdfobject.cpp	2018-05-29 11:23:44.378955265 +0300
-@@ -1055,7 +1055,7 @@
- {
-     if (GetType() == PDFObjectType_String)
-     {
--        GooString* gooString = m_po->getString();
-+        GooString* gooString =(GooString*) m_po->getString();
-         return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->getCString()),
-                                                       static_cast<int>(gooString->getLength())));
-     }
diff --git a/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch b/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch
deleted file mode 100644
index 3f681836989f..000000000000
--- a/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Index: /trunk/gdal/frmts/nitf/nitfrasterband.cpp
-===================================================================
---- a/frmts/nitf/nitfrasterband.cpp	(revision 38657)
-+++ b/frmts/nitf/nitfrasterband.cpp	(revision 38658)
-@@ -824,4 +826,20 @@
-         pUnpackData[i+7] = ((pDataSrc[k+2]) & 0x7);
-       }
-+      if( i < n )
-+      {
-+        pUnpackData[i+0] = ((pDataSrc[k+0] >> 5));
-+        if( i + 1 < n )
-+            pUnpackData[i+1] = ((pDataSrc[k+0] >> 2) & 0x07);
-+        if( i + 2 < n )
-+            pUnpackData[i+2] = ((pDataSrc[k+0] << 1) & 0x07) | (pDataSrc[k+1] >> 7);
-+        if( i + 3 < n )
-+            pUnpackData[i+3] = ((pDataSrc[k+1] >> 4) & 0x07);
-+        if( i + 4 < n )
-+            pUnpackData[i+4] = ((pDataSrc[k+1] >> 1) & 0x07);
-+        if( i + 5 < n )
-+            pUnpackData[i+5] = ((pDataSrc[k+1] << 2) & 0x07) | (pDataSrc[k+2] >> 6);
-+        if( i + 6 < n )
-+            pUnpackData[i+6] = ((pDataSrc[k+2] >> 3) & 0x07);
-+      }
- 
-       memcpy(pData, pUnpackData, n);
-@@ -842,4 +862,20 @@
-         pUnpackData[i+7] = ((pDataSrc[k+4]) & 0x1f);
-       }
-+      if( i < n )
-+      {
-+        pUnpackData[i+0] = ((pDataSrc[k+0] >> 3));
-+        if( i + 1 < n )
-+            pUnpackData[i+1] = ((pDataSrc[k+0] << 2) & 0x1f) | (pDataSrc[k+1] >> 6);
-+        if( i + 2 < n )
-+            pUnpackData[i+2] = ((pDataSrc[k+1] >> 1) & 0x1f);
-+        if( i + 3 < n )
-+            pUnpackData[i+3] = ((pDataSrc[k+1] << 4) & 0x1f) | (pDataSrc[k+2] >> 4);
-+        if( i + 4 < n )
-+            pUnpackData[i+4] = ((pDataSrc[k+2] << 1) & 0x1f) | (pDataSrc[k+3] >> 7);
-+        if( i + 5 < n )
-+            pUnpackData[i+5] = ((pDataSrc[k+3] >> 2) & 0x1f);
-+        if( i + 6 < n )
-+            pUnpackData[i+6] = ((pDataSrc[k+3] << 3) & 0x1f) | (pDataSrc[k+4] >> 5);
-+      }
- 
-       memcpy(pData, pUnpackData, n);
-@@ -856,4 +894,12 @@
-         pUnpackData[i+3] = ((pDataSrc[k+2]) & 0x3f);
-       }
-+      if( i < n )
-+      {
-+        pUnpackData[i+0] = ((pDataSrc[k+0] >> 2));
-+        if( i + 1 < n )
-+            pUnpackData[i+1] = ((pDataSrc[k+0] << 4) & 0x3f) | (pDataSrc[k+1] >> 4);
-+        if( i + 2 < n )
-+            pUnpackData[i+2] = ((pDataSrc[k+1] << 2) & 0x3f) | (pDataSrc[k+2] >> 6);
-+      }
- 
-       memcpy(pData, pUnpackData, n);
-@@ -873,4 +921,20 @@
-         pUnpackData[i+6] = ((pDataSrc[k+5] << 1) & 0x7f) | (pDataSrc[k+6] >> 7);
-         pUnpackData[i+7] = ((pDataSrc[k+6]) & 0x7f);
-+      }
-+      if( i < n )
-+      {
-+        pUnpackData[i+0] = ((pDataSrc[k+0] >> 1));
-+        if( i + 1 < n )
-+            pUnpackData[i+1] = ((pDataSrc[k+0] << 6) & 0x7f) | (pDataSrc[k+1] >> 2);
-+        if( i + 2 < n )
-+            pUnpackData[i+2] = ((pDataSrc[k+1] << 5) & 0x7f) | (pDataSrc[k+2] >> 3) ;
-+        if( i + 3 < n )
-+            pUnpackData[i+3] = ((pDataSrc[k+2] << 4) & 0x7f) | (pDataSrc[k+3] >> 4);
-+        if( i + 4 < n )
-+            pUnpackData[i+4] = ((pDataSrc[k+3] << 3) & 0x7f) | (pDataSrc[k+4] >> 5);
-+        if( i + 5 < n )
-+            pUnpackData[i+5] = ((pDataSrc[k+4] << 2) & 0x7f) | (pDataSrc[k+5] >> 6);
-+        if( i + 6 < n )
-+            pUnpackData[i+6] = ((pDataSrc[k+5] << 1) & 0x7f) | (pDataSrc[k+6] >> 7);
-       }
- 
diff --git a/sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch b/sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch
deleted file mode 100644
index 783752e0efa6..000000000000
--- a/sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: trunk/gdal/frmts/nitf/nitffile.c
-===================================================================
---- a/frmts/nitf/nitffile.c	(revision 38085)
-+++ b/frmts/nitf/nitffile.c	(revision 38234)
-@@ -350,5 +350,6 @@
-     if (nOffset != -1)
-         nOffset = NITFCollectSegmentInfo( psFile, nHeaderLen, nOffset, "RE", 4, 7, &nNextData);
--    else
-+
-+    if( nOffset < 0 )
-     {
-         NITFClose(psFile);
diff --git a/sci-libs/gdal/files/gdal-2.3.0-libtiff.patch b/sci-libs/gdal/files/gdal-2.3.0-libtiff.patch
deleted file mode 100644
index 5964165e3e6f..000000000000
--- a/sci-libs/gdal/files/gdal-2.3.0-libtiff.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./frmts/gtiff/libtiff/tif_read.c.old	2018-08-11 09:12:42.378891934 +0100
-+++ ./frmts/gtiff/libtiff/tif_read.c	2018-08-11 09:15:37.330882891 +0100
-@@ -296,7 +296,8 @@
-         }
-         else
-         {
--                return 1;
-+		tif->tif_rawcc = tif->tif_rawdataloaded;
-+		return 1;
-         }
- }
- 
diff --git a/sci-libs/gdal/gdal-2.3.0-r2.ebuild b/sci-libs/gdal/gdal-2.3.0-r2.ebuild
deleted file mode 100644
index fe8e746f8d17..000000000000
--- a/sci-libs/gdal/gdal-2.3.0-r2.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools perl-module distutils-r1 toolchain-funcs flag-o-matic java-pkg-opt-2
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="https://www.gdal.org/"
-SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
-
-SLOT="0/2.3"
-LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	dev-libs/json-c:=
-	dev-libs/libpcre
-	dev-libs/libxml2:=
-	media-libs/tiff:0=
-	sci-libs/libgeotiff
-	sys-libs/zlib:=[minizip(+)]
-	armadillo? ( sci-libs/armadillo:=[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio:= )
-	geos? ( >=sci-libs/geos-2.2.1 )
-	gif? ( media-libs/giflib:= )
-	gml? ( >=dev-libs/xerces-c-3.1 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
-	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lzma? ( || (
-		app-arch/xz-utils
-		app-arch/lzma
-	) )
-	mdb? ( dev-java/jackcess:1 )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc? ( dev-db/unixODBC )
-	ogdi? ( sci-libs/ogdi )
-	opencl? ( virtual/opencl )
-	oracle? ( dev-db/oracle-instantclient:= )
-	pdf? ( >=app-text/poppler-0.24.3:= )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	spatialite? ( dev-db/spatialite )
-	sqlite? ( dev-db/sqlite:3 )
-	webp? ( media-libs/libwebp:= )
-	xls? ( dev-libs/freexl )"
-
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.7:* )"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.7:* )
-	perl? ( dev-lang/swig:0 )
-	python? (
-		dev-lang/swig:0
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)"
-
-REQUIRED_USE="
-	mdb? ( java )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	spatialite? ( sqlite )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.3-soname.patch"
-	"${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866
-	"${FILESDIR}/${PN}-2.2.3-goocast.patch" # bug 656252
-	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
-	# Security bugs
-	"${FILESDIR}/${P}-libtiff.patch" # bug 621712
-	"${FILESDIR}/${P}-frmts-nitf38234.patch" # bug 621720
-	"${FILESDIR}/${P}-changeset_38658.patch" # bug 623028
-)
-
-src_prepare() {
-	# fix datadir and docdir placement
-	sed -e "s:@datadir@:@datadir@/gdal:" \
-		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-		-i "${S}"/GDALmake.opt.in || die
-
-	# the second sed expression should fix bug 371075
-	sed -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
-		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
-		-i "${S}"/swig/python/GNUmakefile || die
-
-	# Fix spatialite/sqlite include issue
-	sed -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
-		-i ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
-
-	# Fix freexl configure check
-	sed -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
-		-i configure.ac || die
-
-	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
-		-i configure.ac || die
-
-	sed -e 's:^ar:$(AR):g' \
-		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
-	# updated for newer swig (must specify the path to input files)
-	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
-		-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-		-i swig/python/GNUmakefile || die "sed python makefile failed"
-	sed -e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
-		-i swig/python/setup.cfg || die "sed python setup.cfg failed"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# bug 619148
-	append-cxxflags -std=c++14
-
-	local myconf=(
-		# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
-		# bsb - legal issues
-		# ingres - same story as oracle oci
-		# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
-		# podofo - we use poppler instead they are exclusive for each other
-		# tiff is a hard dep
-		--includedir="${EPREFIX}/usr/include/${PN}"
-		--disable-pdf-plugin
-		--disable-static
-		--enable-shared
-		--with-expat
-		--with-cryptopp=no
-		--with-geotiff
-		--with-grib
-		--with-hide-internal-symbols
-		--with-libjson-c="${EPREFIX}/usr/"
-		--with-libtiff
-		--with-libtool
-		--with-libz="${EPREFIX}/usr/"
-		--with-gnm
-		--without-bsb
-		--without-dods-root
-		--without-ecw
-		--without-epsilon
-		--without-fgdb
-		--without-fme
-		--without-gta
-		--without-grass
-		--without-hdf4
-		--without-idb
-		--without-ingres
-		--without-jasper
-		--without-jp2lura
-		--without-jp2mrsid
-		--without-kakadu
-		--without-kea
-		--without-libkml
-		--without-mongocxx
-		--without-mrsid
-		--without-mrsid_lidar
-		--without-msg
-		--without-mrf
-		--without-rasdaman
-		--without-rasterlite2
-		--without-pcraster
-		--without-pdfium
-		--without-php
-		--without-podofo
-		--without-qhull
-		--without-sde
-		--without-sfcgal
-		--without-sosi
-		--without-teigha
-		--disable-lto
-		$(use_enable debug)
-		$(use_with armadillo)
-		$(use_with aux_xml pam)
-		$(use_with curl)
-		$(use_with fits cfitsio)
-		$(use_with geos)
-		$(use_with gif)
-		$(use_with gml xerces)
-		$(use_with hdf5)
-		$(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library yreleased developer by gdal
-		$(use_with jpeg)
-		$(use_with jpeg2k openjpeg)
-		$(use_with lzma liblzma)
-		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
-		$(use_with netcdf)
-		$(use_with oracle oci)
-		$(use_with odbc)
-		$(use_with ogdi ogdi "${EPREFIX}"/usr)
-		$(use_with opencl)
-		$(use_with pdf poppler)
-		$(use_with perl)
-		$(use_with png)
-		$(use_with postgres pg)
-		$(use_with python)
-		$(use_with spatialite)
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-		$(use_with threads)
-		$(use_with webp)
-		$(use_with xls freexl) )
-
-	tc-export AR RANLIB
-
-	if use java; then
-		myconf+=(
-			--with-java=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-lib=dlopen
-			$(use_with mdb)
-		)
-	else
-		myconf+=( --without-java --without-mdb )
-	fi
-
-	if use sqlite; then
-		append-libs -lsqlite3
-	fi
-
-	# bug #632660
-	if use ogdi; then
-		tc-export PKG_CONFIG
-		append-cflags $(${PKG_CONFIG} --cflags libtirpc)
-		append-cxxflags $(${PKG_CONFIG} --cflags libtirpc)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	# mysql-config puts this in (and boy is it a PITA to get it out)
-	if use mysql; then
-		sed -e "s: -rdynamic : :" \
-			-i GDALmake.opt || die "sed LIBS failed"
-	fi
-}
-
-src_compile() {
-	if use perl; then
-		rm "${S}"/swig/perl/*_wrap.cpp || die
-		emake -C "${S}"/swig/perl generate
-	fi
-
-	# gdal-config needed before generating Python bindings
-	default
-
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null || die
-	fi
-
-	if use python; then
-		rm -f "${S}"/swig/python/*_wrap.cpp || die
-		emake -C "${S}"/swig/python generate
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-
-	use doc && emake docs
-}
-
-src_install() {
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		perl-module_src_install
-		popd > /dev/null || die
-		sed -e 's:BINDINGS        =       \(.*\) perl:BINDINGS        =       \1:g' \
-			-i GDALmake.opt || die
-	fi
-
-	use perl && perl_delete_localpod
-
-	local DOCS=( Doxyfile HOWTO-RELEASE NEWS )
-	use doc && HTML_DOCS=( html/. )
-
-	default
-
-	python_install() {
-		distutils-r1_python_install
-		python_doscript scripts/*.py
-	}
-
-	if use python; then
-		# Don't clash with gdal's docs
-		unset DOCS HTML_DOCS
-
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-
-		newdoc swig/python/README.txt README-python.txt
-
-		insinto /usr/share/${PN}/samples
-		doins -r swig/python/samples/
-	fi
-
-	doman "${S}"/man/man*/*
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
diff --git a/sci-libs/libmed/Manifest b/sci-libs/libmed/Manifest
index 34aaee76f1e3..4868ca2c1a38 100644
--- a/sci-libs/libmed/Manifest
+++ b/sci-libs/libmed/Manifest
@@ -1,4 +1,13 @@
-DIST libmed-3.3.1-gentoo.tar.bz2 36111 BLAKE2B 2e09f73da8c0e07701abeb699e34c322bca591a2417e84c68deafb821c64caeaef4e356b7a9e6ead782da5059824e69ec4c47009532a716a00ac0a3a403ca4b4 SHA512 dfd2052a2e2201d6c0b55f24dbe22f6ffbd7bdf0cfe436e1a3f556eea23aeb4a8470bd330fa7caecf8bbb8fd491b0490f357cee063622b7aa1e39ce807e3b847
+AUX libmed-3.3.1-cmake-fortran.patch 588 BLAKE2B 7fbd1619692702edb395402d30ee5ae7b44a801be010547a89ac777db7e86a11975f170eb1713e190b367bf5c5c3bf156dbf3522d263fe480387a7b40af572c3 SHA512 5c23d7afc8aad0c91b96d10953fe4c39cd079e798f0cbc5efdd9f5beb3967af1582f1c47f53d8be8a291222194f05205f06d19b1a3c3192fd4cce778052846b1
+AUX libmed-3.3.1-disable-python-compile.patch 1242 BLAKE2B 5c0a500376665cea4429820b3c41eac1d8bf25b1a172a236327e74768891ca1ec7ed143e0d7c803eac5194a6b762538731c068aca53cc5f2b8071d9b0ce08b57 SHA512 29dd13933412b19a4bb003d2337cfd3d35bedff430325809947d41b276690a3413976b39487e4577ad74a6c6ca1c611e63ee09873f0ea2acae1a21475a6bb2e5
+AUX libmed-3.3.1-mpi.patch 608 BLAKE2B 61c26f3cce21aa92d72f07227076afc477fb5cb94590b2587f5a57dfc662e7a619de84708bf71f7c22f159ca6943991bd8c5f767f2ba1953494f31133dff784d SHA512 f77833448dcf0d7d0949d96d1433cc36956765f4aefd9ff2f03add9ee8451069c3840a5bae054be094a2711631be947d32ea3321b7f79a719e3e5ea2a06fd8cf
+AUX libmed-4.0.0-cmakelist.patch 2421 BLAKE2B 38991513aabbb8237a8b0d9456d9bb76f38cffecff9b1b4c906c0f9d17abd6c02ec150420403d8c1b36310b871f5354e100d1038d5620f6ba8719074e0ccd665 SHA512 405669dedc95b3776a2f4f6d64f8a608c914adb7d0666690f1f8b4a0598d6d85c7398622f50c50ead0295ee965fa993c36eb9e4217985079b528714682ea8b5d
+AUX libmed-4.0.0-hdf5-1.8-support.patch 735 BLAKE2B 675ef189ed25e2366b1be89dcb253ecf81dcf61ca4af623a73830701baf2012134e2718d924c4554861768498016d7c4224ebc6110de56184b2c4e9d7c320583 SHA512 2eb7d3ec57afeecf8e78c6df094187989cc4336e9eed7a8145975a5a7f31c7aef5c7a3cbad358402cee4c3b47d63b546a74e4e0d4108ea036b2613ce91fa914d
+AUX libmed-4.0.0-installdoc.patch 1045 BLAKE2B ddc44d986743a4bf1fa59ab20d34835117f2213283ad13ce1e8e16358b87fe64888facb2f32da76a025cc283a5d942554700cc8816c25cb6f0eeaa54970f1f9a SHA512 486eb41af086d2dc92463aa8f64f074f70a39920b4954e4c272bc6b92c960efe198255975b7c594ff801be43e9eb6a31d007f55451901107db90ed6b3389eee6
+AUX libmed-4.0.0-tests.patch 819 BLAKE2B c6352475b917d4300d15eaa8742c44ed609768265beb37d6a4128e52cfcda9b7971e8d770045944e94dfa9c40dd756dba854c6dd793639c3dad4497bba34b651 SHA512 4b13a8dc40d7d666b7853b47df7c432a796bc905b714cdecc22bc242597eddb6c18a13eae0c39b8a00a4b07d710332c413ac5c358ffff7cb19378a8adb12221c
+DIST libmed-3.3.1-r1-gentoo.tar.bz2 36127 BLAKE2B c112215932ac5c84cc75911c20712fcf428a8fc6e8adfd497066315fbc99a70816e0276196ff6366f34eeb3bf6d40586a735dd35cc13579640d7128f563fbf2b SHA512 e55dc96b8282dfba0dc9746dba7ef2ea8616d5617deabd3164d0134ca680e27c2a121432ae22f38fc53a52ffb0ac66a9a17c131488a9d01a757601afbcdc0bff
 DIST med-3.3.1.tar.gz 43379218 BLAKE2B 101033a766b3b8f184de8b18437a020129da3a11fd947742c30d8b9d274542e7445f1ee1d5827194a1ebc02c701ea6911105102f7b61c24d9d07bb15dbfe45f7 SHA512 f1eba3bc69520b862bdab89ce76694f91ed0e6be42c037df8ec655b6314e8ae776083d5ead61fb34097eb8440302969229d1859b6d8fcce51e7551b75d8ebf5f
-EBUILD libmed-3.3.1.ebuild 2960 BLAKE2B 989c6d9ca3881626f636b3b4590aca42de9ca496c9c616395159f600fcdd7e1593b92374c38789c19daa0e5c309228c20c42b5f95cc15343c30b87e5d66857e2 SHA512 f7d3ea804544ebe0fae8127d21cb95f3b3ed685d790f9408c179bede30321ff9c0738bb2c22d1f8c8678c6f3be691bcffd5669567f736b2f2dce66fa986820a1
+DIST med-4.0.0.tar.gz 47849098 BLAKE2B 0bc6710f7b5156e09962e3125349573989429e614a203f649843f00dea06217040ebee70e481eed9c0dd304cb7d167efcd216c3600f6954a74f262cc845fff63 SHA512 2840437010481fc5f12a56e3282f8ca5e94df541899e2b511756702f86d0f87dbf2f6e086d8e591e2bd370d8f4bab8089e7f7f939fea16354a23e2b5a4d96cd7
+EBUILD libmed-3.3.1-r1.ebuild 2963 BLAKE2B b4f27e0e6b7023702ba10a134ad7677896c55a860e8d87165490e3075ed16350b79a2c3a5c109d7ebb979fe23285f5f0c53f50eb8de1d7aa2fc8677b22eb71c4 SHA512 a9fff64e93422fbb35801b5aaaf5b1c44874b6d817d7fd3266941a56ff262a6160d2155c7a493b8a6353e4aad85344f5a33e44e59d5b443f849c41df1dff56dd
+EBUILD libmed-4.0.0.ebuild 3007 BLAKE2B 31b8cf94002b43263f2c5b9ad204cb5b128bd3347e82bcc1c270dde7a8191e26089bb04937bdc60bc53d0bbec2afe51ca1f7c5459c73eb995350fa9ef74fddc4 SHA512 c6fe01159768798677f75e27ee08d81f069c30a9aa03c14ff687bf32a08919a2ceeb4248e503c207dc4064ef5fc49e4aae9eb3c3b0c8e79f7ec9549543c067ff
 MISC metadata.xml 249 BLAKE2B 54d645d97d1d7247d704241142448ad8492c53d9aa7d69a7fcc51df476d08b6226fef93ec880696d52d90af056a1b296006eeb1798b58799d5b66b8edc336d81 SHA512 8ff95dedc1dff6414020296e10ae064acd622ded48000f43fa5e43bc834699f8cab267d48b382f087942a42fbefc343ced091b1c6db0feab95551ebe2cf18d25
diff --git a/sci-libs/libmed/files/libmed-3.3.1-cmake-fortran.patch b/sci-libs/libmed/files/libmed-3.3.1-cmake-fortran.patch
new file mode 100644
index 000000000000..1f475d584843
--- /dev/null
+++ b/sci-libs/libmed/files/libmed-3.3.1-cmake-fortran.patch
@@ -0,0 +1,21 @@
+Make cmake properly disable fortran upon user requirments
+
+--- ./CMakeLists.txt.orig	2016-07-01 15:28:57.139304608 +0300
++++ ./CMakeLists.txt	2016-07-01 15:34:22.295899455 +0300
+@@ -8,10 +8,13 @@
+ 
+ INCLUDE(CheckLanguage)
+ CHECK_LANGUAGE(Fortran)
+-IF(CMAKE_Fortran_COMPILER)
++OPTION (MEDFILE_BUILD_FORTRAN "Build fortran library" ON)
++IF(MEDFILE_BUILD_FORTRAN)
+   ENABLE_LANGUAGE(Fortran)
++  IF(NOT CMAKE_Fortran_COMPILER)
++      MESSAGE(FATAL_EROOR "Fortran support was requested but not found")
++  ENDIF()
+ ELSE()
+-  MESSAGE(STATUS "No Fortran support")
+ ENDIF()
+ 
+ ## Version number 
+
diff --git a/sci-libs/libmed/files/libmed-3.3.1-disable-python-compile.patch b/sci-libs/libmed/files/libmed-3.3.1-disable-python-compile.patch
new file mode 100644
index 000000000000..642b404ba880
--- /dev/null
+++ b/sci-libs/libmed/files/libmed-3.3.1-disable-python-compile.patch
@@ -0,0 +1,17 @@
+--- ./config/cmake_files/medMacros.cmake	2016-10-24 09:55:35.000000000 +0200
++++ ./config/cmake_files/medMacros.cmake.new	2018-01-24 10:50:15.146953227 +0100
+@@ -412,9 +412,9 @@
+   FOREACH(input ${PYFILE2COMPINST})
+     GET_FILENAME_COMPONENT(inputname ${input} NAME)
+     INSTALL(FILES ${input} DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYFILELOC})
+-    INSTALL(CODE "MESSAGE(STATUS \"py compiling ${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}\")")
+-    INSTALL(CODE "SET(CMD \"import py_compile ; py_compile.compile('${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}')\")")
+-    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"\${CMD}\")")
+-    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -O -c \"\${CMD}\")")
++	#INSTALL(CODE "MESSAGE(STATUS \"py compiling ${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}\")")
++	#INSTALL(CODE "SET(CMD \"import py_compile ; py_compile.compile('${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}')\")")
++	#INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"\${CMD}\")")
++	#INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -O -c \"\${CMD}\")")
+   ENDFOREACH(input ${PYFILE2COMPINST})
+ ENDMACRO(INSTALL_AND_COMPILE_PYTHON_FILE PYFILE2COMPINST PYFILELOC)
+
diff --git a/sci-libs/libmed/files/libmed-3.3.1-mpi.patch b/sci-libs/libmed/files/libmed-3.3.1-mpi.patch
new file mode 100644
index 000000000000..0516b344a0bf
--- /dev/null
+++ b/sci-libs/libmed/files/libmed-3.3.1-mpi.patch
@@ -0,0 +1,23 @@
+--- a/include/med.h.in	2018-07-06 10:55:49.247164591 +0200
++++ a/include/med.h.in.new	2018-07-06 10:55:29.559164666 +0200
+@@ -19,6 +19,11 @@
+ #ifndef MED_H
+ #define MED_H
+ 
++@MED_DEFINE_MED_HAVE_MPI@
++#ifdef MED_HAVE_MPI
++#include <mpi.h>
++#endif
++
+ #include <hdf5.h>
+ #ifdef HAVE_STDINT_H
+ #include <stdint.h>   // Use the C99 official header
+@@ -66,8 +71,6 @@
+ #define _MED_VERSION(x,y,z) STR(x) "." STR(y) "." STR(z)
+ #define MED_VERSION_STR _MED_VERSION(MED_NUM_MAJEUR,MED_NUM_MINEUR,MED_NUM_RELEASE)
+ 
+-@MED_DEFINE_MED_HAVE_MPI@
+-
+ #define MED_NULL       (void *) NULL
+ #define MED_MAX_PARA        20
+ 
diff --git a/sci-libs/libmed/files/libmed-4.0.0-cmakelist.patch b/sci-libs/libmed/files/libmed-4.0.0-cmakelist.patch
new file mode 100644
index 000000000000..4c023cf24b31
--- /dev/null
+++ b/sci-libs/libmed/files/libmed-4.0.0-cmakelist.patch
@@ -0,0 +1,59 @@
+--- a/src/CMakeLists.txt	2018-07-28 16:37:01.180598992 +0200
++++ a/src/CMakeLists.txt.new	2018-07-28 17:14:49.147775461 +0200
+@@ -1,7 +1,3 @@
+-INCLUDE_DIRECTORIES(
+-  ${HDF5_INCLUDE_DIRS}
+-  ${MPI_INCLUDE_DIRS})
+-
+ # On Win platform, we need to make sure symbols are properly exported in
+ # the intermediary OBJECT targes built in the sub-directories:
+ # The definition "-D<target>_EXPORTS" is normally added automatically by CMake
+@@ -19,6 +15,12 @@
+ INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/include 
+     ${PROJECT_SOURCE_DIR}/include)
+
++# these includes must go after project ones to avoid masking by
++# previous versions already installed
++INCLUDE_DIRECTORIES(
++  ${HDF5_INCLUDE_DIRS}
++  ${MPI_INCLUDE_DIRS})
++
+ # Get pure C intermediary targets:
+ ADD_SUBDIRECTORY(hdfi)
+ ADD_SUBDIRECTORY(ci)
+--- a/tools/mdump/CMakeLists.txt	2018-07-29 09:24:35.714930029 +0200
++++ a/tools/mdump/CMakeLists.txt.new	2018-07-29 09:58:48.667089767 +0200
+@@ -33,6 +33,6 @@
+ CONFIGURE_FILE(xmdump3.in ${PROJECT_BINARY_DIR}/xmdump3 @ONLY)
+ 
+ INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/xmdump2 ${PROJECT_BINARY_DIR}/xmdump3 DESTINATION bin)
+-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink mdump3 mdump WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)")
+-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink xmdump3 xmdump WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)")
++INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink mdump3 mdump WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin\")")
++INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink xmdump3 xmdump WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin\")")
+ 
+--- a/src/2.3.6/CMakeLists.txt	2018-07-30 22:45:56.205079148 +0200
++++ a/src/2.3.6/CMakeLists.txt.new	2018-07-30 22:49:43.520096835 +0200
+@@ -1,8 +1,3 @@
+-INCLUDE_DIRECTORIES(
+-  ${HDF5_INCLUDE_DIRS}
+-  ${MPI_INCLUDE_DIRS}
+-)
+- 
+ SET(med236_SOURCES MEDaffiche.c)
+ 
+ # Definitions
+@@ -13,6 +8,13 @@
+     "${PROJECT_BINARY_DIR}/include/2.3.6"
+     "${PROJECT_SOURCE_DIR}/include/2.3.6")
+ 
++# these includes must go after project ones to avoid masking by
++# previous versions already installed
++INCLUDE_DIRECTORIES(
++  ${HDF5_INCLUDE_DIRS}
++  ${MPI_INCLUDE_DIRS}
++)
++ 
+ # Build intermediate targets _cfi236, _hdfi236, _misc236 and _ci236 
+ # (and their static counterpart):
+ ADD_SUBDIRECTORY(cfi)
diff --git a/sci-libs/libmed/files/libmed-4.0.0-hdf5-1.8-support.patch b/sci-libs/libmed/files/libmed-4.0.0-hdf5-1.8-support.patch
new file mode 100644
index 000000000000..72838c3dee90
--- /dev/null
+++ b/sci-libs/libmed/files/libmed-4.0.0-hdf5-1.8-support.patch
@@ -0,0 +1,15 @@
+--- ./config/cmake_files/medMacros.cmake	2019-01-09 17:16:00.951884862 +0100
++++ ./config/cmake_files/medMacros.cmake.new	2019-01-09 17:18:48.753888600 +0100
+@@ -396,10 +396,10 @@
+     ##
+     ## Requires 1.10.x version
+     ##
+-    IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1)
+-        MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.")
+-    ENDIF()
++    #IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1)
++    #    MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.")
++    #ENDIF()
+     ##
+     ##
+ 
diff --git a/sci-libs/libmed/files/libmed-4.0.0-installdoc.patch b/sci-libs/libmed/files/libmed-4.0.0-installdoc.patch
new file mode 100644
index 000000000000..2d9361c42657
--- /dev/null
+++ b/sci-libs/libmed/files/libmed-4.0.0-installdoc.patch
@@ -0,0 +1,15 @@
+--- ./CMakeLists.txt	2019-02-26 11:59:15.276962751 +0100
++++ ./CMakeLists.txt.new	2019-02-26 11:59:26.660962707 +0100
+@@ -137,9 +137,10 @@
+ ENDIF()
+ 
+ ## Installation of the doc
++set(MEDFILE_DOC_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/doc/med-fichier-${MED_STR_VERSION} CACHE PATH "install dir for documentation")
+ IF(MEDFILE_INSTALL_DOC  OR MEDFILE_BUILD_DOC)
+-  INSTALL(DIRECTORY doc/html.dox/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/med-fichier-${MED_STR_VERSION} REGEX "Makefile*" EXCLUDE PATTERN "*.am" EXCLUDE)
+-  INSTALL(DIRECTORY doc/gif doc/jpg doc/png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/med-fichier-${MED_STR_VERSION} FILES_MATCHING PATTERN "*.gif" PATTERN "*.jpg" PATTERN "*.svg" PATTERN "*.png")
++  INSTALL(DIRECTORY doc/html.dox/ DESTINATION ${MEDFILE_DOC_DIRECTORY} REGEX "Makefile*" EXCLUDE PATTERN "*.am" EXCLUDE)
++  INSTALL(DIRECTORY doc/gif doc/jpg doc/png DESTINATION ${MEDFILE_DOC_DIRECTORY} FILES_MATCHING PATTERN "*.gif" PATTERN "*.jpg" PATTERN "*.svg" PATTERN "*.png")
+ ENDIF()
+ 
+ #######################
diff --git a/sci-libs/libmed/files/libmed-4.0.0-tests.patch b/sci-libs/libmed/files/libmed-4.0.0-tests.patch
new file mode 100644
index 000000000000..91041fb4c126
--- /dev/null
+++ b/sci-libs/libmed/files/libmed-4.0.0-tests.patch
@@ -0,0 +1,17 @@
+--- ./tests/python/CMakeLists.txt.orig	2018-11-05 14:22:25.000000000 +0100
++++ ./tests/python/CMakeLists.txt	2019-01-09 17:37:17.142913290 +0100
+@@ -33,11 +33,13 @@
+   UseCase_MEDinterp_3.py
+ )
+ 
++FILE(COPY tests_params.py DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
++
+ FOREACH(_s IN LISTS _tst_scripts)
+   STRING(REPLACE ".py" "_Python" _tst_name ${_s})
+   FILE(COPY ${_s} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+   ADD_TEST(NAME ${_tst_name}
+-           COMMAND "/usr/bin/env" "PYTHONPATH=${PROJECT_BINARY_DIR}/python" "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}/${_s}")
++           COMMAND "/usr/bin/env" "PYTHONPATH=${PROJECT_BINARY_DIR}/python:${PROJECT_BINARY_DIR}/python/med" "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}/${_s}")
+ ENDFOREACH()
+ 
+ INSTALL(FILES ${_to_install} DESTINATION bin/testpy)
diff --git a/sci-libs/libmed/libmed-3.3.1.ebuild b/sci-libs/libmed/libmed-3.3.1-r1.ebuild
index c938f50de352..3540cd2fddd4 100644
--- a/sci-libs/libmed/libmed-3.3.1.ebuild
+++ b/sci-libs/libmed/libmed-3.3.1-r1.ebuild
@@ -18,7 +18,7 @@ MY_P="med-${PV}"
 DESCRIPTION="A library to store and exchange meshed data or computation results"
 HOMEPAGE="https://www.salome-platform.org/"
 SRC_URI="http://files.salome-platform.org/Salome/other/${MY_P}.tar.gz
-	 https://dev.gentoo.org/~fordfrog/distfiles/${P}-gentoo.tar.bz2"
+	 https://dev.gentoo.org/~fordfrog/distfiles/${P}-r1-gentoo.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
diff --git a/sci-libs/libmed/libmed-4.0.0.ebuild b/sci-libs/libmed/libmed-4.0.0.ebuild
new file mode 100644
index 000000000000..06e007ccb4da
--- /dev/null
+++ b/sci-libs/libmed/libmed-4.0.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# EAPI=7 uses ninja generator by default but it's incompatible with USE=fortran
+# https://github.com/Kitware/ninja/tree/features-for-fortran#readme
+CMAKE_MAKEFILE_GENERATOR=emake
+
+FORTRAN_NEEDED=fortran
+# NOTE:The build for multiple python versions should be possible but complecated for the build system
+PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
+
+inherit cmake-utils fortran-2 python-single-r1
+
+MY_P="med-${PV}"
+
+DESCRIPTION="A library to store and exchange meshed data or computation results"
+HOMEPAGE="https://www.salome-platform.org/"
+SRC_URI="http://files.salome-platform.org/Salome/other/${MY_P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fortran mpi python static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RDEPEND="
+	sci-libs/hdf5[fortran=,mpi=]
+	mpi? ( virtual/mpi[fortran=] )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	python? ( >=dev-lang/swig-2.0.9:0 )
+"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3.1-cmake-fortran.patch"
+	"${FILESDIR}/${PN}-3.3.1-disable-python-compile.patch"  # managed by function of python eclass
+	"${FILESDIR}/${PN}-3.3.1-mpi.patch"
+	"${FILESDIR}/${P}-hdf5-1.8-support.patch"
+	"${FILESDIR}/${P}-cmakelist.patch"
+	"${FILESDIR}/${P}-tests.patch"  # disable a few tests not running
+	"${FILESDIR}/${P}-installdoc.patch"
+)
+
+DOCS=( AUTHORS COPYING COPYING.LESSER ChangeLog NEWS README TODO )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+	# fixes for correct libdir name
+	sed -i -e "s@SET(_install_dir lib/python@SET(_install_dir $(get_libdir)/python@" \
+		./python/CMakeLists.txt || die "sed failed"
+	for cm in ./src/CMakeLists.txt ./tools/medimport/CMakeLists.txt
+	do
+		sed -i -e "s@INSTALL(TARGETS \(.*\) DESTINATION lib)@INSTALL(TARGETS \1 DESTINATION $(get_libdir))@" \
+			"${cm}" || die "sed on ${cm} failed"
+	done
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMEDFILE_BUILD_FORTRAN=$(usex fortran)
+		-DMEDFILE_BUILD_STATIC_LIBS=$(usex static-libs)
+		-DMEDFILE_BUILD_PYTHON=$(usex python)
+		-DMEDFILE_BUILD_TESTS=$(usex test)
+		-DMEDFILE_INSTALL_DOC=$(usex doc)
+		-DMEDFILE_USE_MPI=$(usex mpi)
+		-DMEDFILE_DOC_DIRECTORY="${EPREFIX}"/usr/share/doc/${PF}/html   # custom var created by patches
+		# as indicated in the CMakeLists.txt, the shipped documentation is generated by a custom doxygen, 
+		# so let's avoid rebuilding it because it will be different
+		-DMEDFILE_BUILD_DOC=OFF
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# the optimization done in CMakeLists.txt has been disabled so
+	# we need to do it manually
+	use python && python_optimize
+
+	# Prevent test executables being installed
+	use test && rm -rf "${D}"/usr/bin/{testc,testf,testpy}
+}
+
+src_test() {
+	# override parallel mode only for tests
+	local myctestargs=( "-j 1" )
+	cmake-utils_src_test
+}
diff --git a/sci-libs/libspatialindex/Manifest b/sci-libs/libspatialindex/Manifest
index d75a3a878cf9..cfbf95b67349 100644
--- a/sci-libs/libspatialindex/Manifest
+++ b/sci-libs/libspatialindex/Manifest
@@ -1,7 +1,4 @@
 AUX libspatialindex-1.8.1-QA.patch 549 BLAKE2B 273b4ba9beff743a7b55b14ef42e744232ed10d26c8ce7e26389c1c16ef6d147d65b929b08dff58bd535866faaecaa11986a42d0b444030cac1f6820d1663045 SHA512 8dbaa89a8128d1209cb1e4d45f26ebf0ed635e896ee8470ed52eeb121894a0cfa344b888dbac58c96c62137e9750553d892833bdbf76959f9c51219360eb0170
-AUX libspatialindex-1.8.1-pkgconfig.patch 505 BLAKE2B 26f7e55025cf1a847da9f4d534595bcfdffbbd1672ffbdcca52d28491453782f273636f905d635334680bca6690dfe59d3297b4bf0570244b8ddd8ba941bde79 SHA512 a673e1ea375c4d98a133a80b5d30ef1f0c4bd5ecc6388d50040b46666d8453e70c899f7034fae3977fa399bfec7c26f539dc52d25252cd934f7e295b7d161c09
-DIST spatialindex-src-1.8.1.tar.bz2 368252 BLAKE2B 40365048397255e29f0bd933f201fc0441d8cc8484167a5bd8eec45f22f36c1a7f1d096b510b7c4a52caff82be8130dbaa8c14470bac2f10c144a1ce467cce06 SHA512 34fc743d8fac65a60ae723e3261e8f3717df8bd5997f7338b8d944e9a832d6bad33a4b7cfa4b2f1e5ba0fdbd3ebb4b199e247f0e7b7473953b433e203c21e548
 DIST spatialindex-src-1.8.5.tar.bz2 407871 BLAKE2B 936d0fc4950b4c685088c84019aa22e720371c623bd1883725dc497380e90072333c25f979e13fbc91b7d164b87cb21a285c037bdbe0b8df84eb3876590e8dd1 SHA512 d3e47982cc2809d04490fae27796b31cdb59675790010d8b45e1a98b5a23048a4a44e321a2470dd36c01aba6f6e7620cafc4988a02b55e4f59d1b7fa9b588b06
-EBUILD libspatialindex-1.8.1.ebuild 697 BLAKE2B ae86f40b6676e40efccd2baaf9416b4981003a3f162fe31236efc71c65512b58d141b0c9dbd6ec17e9eb60f7d50999e7aac869cb6f8009f672246d45a03213fb SHA512 72137ebc99c2aaa36acf4c05cf73ad87ca60017edefd5fa664d641a9418509cfd316488b22828d864f5810ee50045988c815e37871e6596e5392bb570d8669d9
-EBUILD libspatialindex-1.8.5-r1.ebuild 707 BLAKE2B eba450d13981bd2d7ffc4b225c63762b19e3010a2bef3fa8a16a09b631bd8eeecc8733a7c51f76c3d7cfa9cd0041b22a52471c37c6d9052e25793213e61681d8 SHA512 40666f08fc0f68223a030e8a41462d5e9819c29fb065167a63e1eed83292a2c4866e05de856758572ba4d6ec446f4d00f119d3fa13eb7116e02a67f8c445a353
+EBUILD libspatialindex-1.8.5-r1.ebuild 706 BLAKE2B 04dd55a4e051325ab573282e37f7eaa10589b49c99d2bb5c9fa0c98cd393e8b590e2c16026c580d5cafa3c140de5a0d5ab95a9ab9d86876cd2cc4e061fa6ab04 SHA512 9362200760b05763cdc1ae0213ad0a5912ee0bea429728ef1232c3a78b67c811cef37ecfa012861a43599bf38e26c1575998d689db3bb67a7011f0c3d7e3c69d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sci-libs/libspatialindex/files/libspatialindex-1.8.1-pkgconfig.patch b/sci-libs/libspatialindex/files/libspatialindex-1.8.1-pkgconfig.patch
deleted file mode 100644
index a17aa80926b1..000000000000
--- a/sci-libs/libspatialindex/files/libspatialindex-1.8.1-pkgconfig.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Jun 30 19:10:57 UTC 2013
-Subject: remove LDFLAGS from Libs field
-
-https://github.com/libspatialindex/libspatialindex/issues/23
-
---- spatialindex-src-1.8.1/src/libspatialindex.pc.in
-+++ spatialindex-src-1.8.1/src/libspatialindex.pc.in
-@@ -7,6 +7,6 @@
- Description: Generic C/C++ library for spatial indexing
- Requires: 
- Version: @PACKAGE_VERSION@
--Libs: -L@libdir@ @LDFLAGS@
-+Libs: -L@libdir@
- Cflags: -I${includedir}/spatialindex @CFLAGS@ @CPPFLAGS@
- 
diff --git a/sci-libs/libspatialindex/libspatialindex-1.8.1.ebuild b/sci-libs/libspatialindex/libspatialindex-1.8.1.ebuild
deleted file mode 100644
index 27123fc01822..000000000000
--- a/sci-libs/libspatialindex/libspatialindex-1.8.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-MY_PN="spatialindex-src"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="General framework for developing spatial indices"
-HOMEPAGE="https://libspatialindex.github.com/"
-SRC_URI="http://download.osgeo.org/libspatialindex/${MY_P}.tar.bz2"
-LICENSE="MIT"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="debug static-libs"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-{QA,pkgconfig}.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-	use static-libs || prune_libtool_files
-}
diff --git a/sci-libs/libspatialindex/libspatialindex-1.8.5-r1.ebuild b/sci-libs/libspatialindex/libspatialindex-1.8.5-r1.ebuild
index d367e99feea4..d8a4d07eb66c 100644
--- a/sci-libs/libspatialindex/libspatialindex-1.8.5-r1.ebuild
+++ b/sci-libs/libspatialindex/libspatialindex-1.8.5-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://libspatialindex.github.com/"
 SRC_URI="http://download.osgeo.org/libspatialindex/${MY_P}.tar.bz2"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 SLOT="0/4"
 IUSE="debug static-libs"
 
diff --git a/sci-libs/lis/Manifest b/sci-libs/lis/Manifest
index f383101901f6..4e2208454b36 100644
--- a/sci-libs/lis/Manifest
+++ b/sci-libs/lis/Manifest
@@ -1,4 +1,4 @@
 AUX lis-1.6.2-autotools.patch 14903 BLAKE2B 9e9e0cb511989f3ef1164632bb460fb331ac4a5e11be0d1ae9cf91519107943d1d441008f3d7c2a4f0ad96acb1edc4fbe17f0dd796181f263a43375f5546137c SHA512 a9483fac16ab9b384bb06a80ff11fd6cd717100517d9f9af639cb2984a26774fdfe7233b0eb9b2602a8ba0aaf34969c9fa7267d5f4bbc8e11dc872245c74b389
 DIST lis-1.6.5.tar.gz 3130045 BLAKE2B 34627d7e310000a2b3acbbc5f11bd163b682224e42dc521adea318a69587e663e59c8296806f6271e8c39062a16bd6c3c24cda5b183bec41f2aba1be09f77a47 SHA512 0cd2fc445c6464490f01def99960f33bbde53b45b453e289edbc9f31b7a20f00d70538bd3feb03324b56ddbc5993d8ba3bfbc8a0574809be08a854c05c097f13
-EBUILD lis-1.6.5.ebuild 1574 BLAKE2B dea60e22d356b3edada561759f715ed866d208fcf0dc79367ce8435140f3b8dd19dffb21d09c832492d331bf469eaed9e91aff551e2e818d0ff65ec5ac24805c SHA512 9e1d406279bb7be19a7ab79b36bf1232ed1f31ee21051777a0917d4cbe12834e83b2154379851e56e00d846a638647de2c5ef0074993bac6c7d56e73d6621e87
+EBUILD lis-1.6.5.ebuild 1573 BLAKE2B c5d90167e27cdae9a862824384bf1867d3fe0a2039aa0e2d1d4890e46cb1736a007d2502707b7161d423c4c579bd35f90088a2b0894978a04dfe5b8a984dbb4d SHA512 e6369b183eaea1ff9798255d28fc68703a7240a8c75cec5f5164a5ec375d9131744e5e4db0bef286cc7f9e452d9792df4905d5f2230d70079830213523e349f9
 MISC metadata.xml 695 BLAKE2B a122bba1eef9339a87790e3ec8ee813f30e02b591eba898a396f5f9656ca03adebdde72d84bed0abbc9969a42563265ebbf3371f0a04eabc9098b22ff9df45e6 SHA512 7a68f0e4a9d128f97cdaf9d8bb7cad4febef8b1794a4da760365235e8ec3c82e95ef78d64ae2b21a5f2ace1f48e7008832a02d8cca86f64604c9cd45cc8e64a9
diff --git a/sci-libs/lis/lis-1.6.5.ebuild b/sci-libs/lis/lis-1.6.5.ebuild
index 5cd496ef8d5c..75c41a7dd9e8 100644
--- a/sci-libs/lis/lis-1.6.5.ebuild
+++ b/sci-libs/lis/lis-1.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit autotools fortran-2 toolchain-funcs
 
 DESCRIPTION="Library of Iterative Solvers for Linear Systems"
-HOMEPAGE="http://www.ssisc.org/lis/index.en.html"
-SRC_URI="http://www.ssisc.org/lis/dl/${P}.tar.gz"
+HOMEPAGE="https://www.ssisc.org/lis/index.en.html"
+SRC_URI="https://www.ssisc.org/lis/dl/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/sci-libs/lmfit/Manifest b/sci-libs/lmfit/Manifest
index c31cc91894f3..01310b15ee66 100644
--- a/sci-libs/lmfit/Manifest
+++ b/sci-libs/lmfit/Manifest
@@ -1,5 +1,4 @@
 AUX lmfit-7.0-cmake.patch 2226 BLAKE2B 317d232718c8172508d67de527161b074676bf62ff4da45d21a9444626fb2e84150c0b3fb099a6a9c5247ea2ec9b53c89b4b0f6d64f8b3d6352629e440e89ad4 SHA512 a9e95299baac18818a131ac67c82d49777e7cae6629d9f6bedc2e7f175f2d6a416888d973064df13d79315a5445d95c0e9a2e3d5fc1ac476fdb2b688dbe601e3
-AUX lmfit-8.0-cmake.patch 2251 BLAKE2B 4549bfb77187c0bc1040a3d3e4e3233445536d039b0d185e4a2d160fcf4d7c0ba2584bd0d943f9527c4af141688a0940763f7c23893263f7af1e294337710e65 SHA512 d3bcb2a9aa882c8240c873a65cc4b8d198ca26990d64d87988ea09e8398b10f83aedd4367bf65cb949091a6a4c3b4d70911658e46808d852cc26c3af2f6e032f
 AUX lmfit-8.2.2-cmake.patch 2769 BLAKE2B 7f67349b93cde9bf14ce5295d3a32a73301897e1643be5beea71ccb8e9d7a9a128c4160b7eb5dcbdfb1189ee6e774e151bd5f71b3af4d7ec0a00ba61f7ad79f1 SHA512 93b1f5242e1152dea4910c96b2c561a370f2e2a78fc730b5ee00257049f96a253badf5d7752a1bbac320df43e436d8f4d913fbf8d40f7b36e3579efb16147417
 DIST lmfit-5.1.tgz 345077 BLAKE2B df27621745601ffacd2110b28f3e3ea2b06d4c8c3c8fad5dda13bb4d6c2bd9f2a793ff88fab4f6d8c78075278bb26f3f424bd0074095e67ab1780a9d57b72b4b SHA512 1df6ed51d7f2137529793948f6c57ef3658932c9198776925a9f6e1d586352651c93aa053a064db7a201dbb848a7108f284223feff45171d142087539d834b29
 DIST lmfit-6.4.tgz 388809 BLAKE2B 48aa619642ac3fd009ec6a8f8b44ee4c800fc3f33e2603b557218cdf37c789159dc3947a648d560b9e2dd7fef08a6644fd25ac61505859dc3b1d151eeea58c27 SHA512 2bd0f24dd4638345b8b1ce6803ddcf45ca3ef888eb285e99f9f158c2e30b0f96016d9d84a112cdbf28f2ba98470e54fe773416179a65264426043c9a5186757d
diff --git a/sci-libs/lmfit/files/lmfit-8.0-cmake.patch b/sci-libs/lmfit/files/lmfit-8.0-cmake.patch
deleted file mode 100644
index 367aa2147ae4..000000000000
--- a/sci-libs/lmfit/files/lmfit-8.0-cmake.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-from: christoph junghans <junghans@votca.org>
-date: mon, 22 oct 2018 21:00:00 -0600
-subject: [patch] cmake: minor distribution tweaks
-
-- use gnuinstalldirs to allow to configure install dirs
-- allow to disable injecting c flags
-
-signed-off-by: christoph junghans <junghans@votca.org>
----
- cmakelists.txt     | 7 +++++--
- lib/cmakelists.txt | 4 ++--
- man/cmakelists.txt | 2 +-
- 3 files changed, 8 insertions(+), 5 deletions(-)
-
-diff -Naur lmfit-8.0.orig/CMakeLists.txt lmfit-8.0/CMakeLists.txt
---- lmfit-8.0.orig/CMakeLists.txt	2018-10-22 20:54:43.452888191 -0600
-+++ lmfit-8.0/CMakeLists.txt	2018-10-22 20:56:00.573905982 -0600
-@@ -13,9 +13,12 @@
- # --- Declare project-wide user flags, and set default values ---
- option(FITTEST "Build with FitTest" OFF)
- 
--set(destination ${CMAKE_INSTALL_PREFIX})
-+include(GNUInstallDirs)
- 
--set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pedantic -Wall -Wno-sign-compare -Wno-unused-result -Wno-parentheses  -Wno-unknown-pragmas")
-+option(INJECT_C_FLAGS "Inject a bunch of useful c flags" ON)
-+if (INJECT_C_FLAGS)
-+    set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pedantic -Wall -Wno-sign-compare -Wno-unused-result -Wno-parentheses  -Wno-unknown-pragmas")
-+endif()
- 
- add_subdirectory(lib)
- add_subdirectory(demo)
-diff -Naur lmfit-8.0.orig/lib/CMakeLists.txt lmfit-8.0/lib/CMakeLists.txt
---- lmfit-8.0.orig/lib/CMakeLists.txt	2018-10-22 20:54:43.452888191 -0600
-+++ lmfit-8.0/lib/CMakeLists.txt	2018-10-22 20:55:08.073213116 -0600
-@@ -17,9 +17,9 @@
- 
- install(
-     TARGETS ${library_name} LIBRARY
--    DESTINATION ${destination}/lib
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     COMPONENT Libraries)
- install(
-     FILES ${inc_files}
--    DESTINATION ${destination}/include
-+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-     COMPONENT Headers)
-diff -Naur lmfit-8.0.orig/man/CMakeLists.txt lmfit-8.0/man/CMakeLists.txt
---- lmfit-8.0.orig/man/CMakeLists.txt	2018-10-22 20:54:43.452888191 -0600
-+++ lmfit-8.0/man/CMakeLists.txt	2018-10-22 20:55:08.073213116 -0600
-@@ -15,7 +15,7 @@
-     )
-     install(
-         FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.${section}
--        DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man${section}"
-+        DESTINATION "${CMAKE_INSTALL_MANDIR}/man${section}"
-     )
- endfunction()
- 
diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest
index c4618a41b1ab..0d6fc7ebed4f 100644
--- a/sci-libs/mpir/Manifest
+++ b/sci-libs/mpir/Manifest
@@ -7,7 +7,7 @@ AUX mpir-2.7.2-sed-backport.patch 704 BLAKE2B a4e2083008ddb0acb2cd81886e53fc1e9e
 DIST mpir-2.6.0.tar.lzma 2472231 BLAKE2B ec768fb78317220d677fac24609fdc4db1315e3c5594d7e098a0f502c38eb8dcf69bac5317c3b7afd629c089504856bb686aa4de65ad54b4f728325e100db44f SHA512 e2608beeb72651c9b2e47f8fb2bcf672f8c74e2cd622e17cd19b12100b66e929ee31d102d2901816379b23aee1a3ea3a854e3e10ebffe2a6e4772748858f911d
 DIST mpir-2.7.2.tar.bz2 3771429 BLAKE2B c3431bcb84207fdb1bc0242fe56b7c2d45643e8c21c4b215162f824bed3a395972f734907f966bc14c58a28d30bb35f441b16b2762a9c8ef9c02d164f804bc82 SHA512 8436a0123201f9e30130ea340331c5a6445dddb58ce1f6c6a3a8303c310ac5b3c279c83b5c520a757cba82c2b14e92da44583e0eec287090cf69cbb29d516a9c
 DIST mpir-3.0.0.tar.bz2 2572041 BLAKE2B f564944dd76586ca6e50c39f1199468b905a3db7bbb8b2ee6cf3dcdfb00757d7eefc57e010d5cfc3d6db7ba2676e36f7980365e85c87827b4901ec4e80349915 SHA512 c735105db8b86db739fd915bf16064e6bc82d0565ad8858059e4e93f62c9d72d9a1c02a5ca9859b184346a8dc64fa714d4d61404cff1e405dc548cbd54d0a88e
-EBUILD mpir-2.6.0-r2.ebuild 1718 BLAKE2B 20d17fc3e1f9ce93365b387fff094e5bb416dc932954938b75e24d2ace74560d3dcbd03289493a490ed8e9a613263be35d7a60e3396862141bdb75c40d70f40e SHA512 7e104c8c81ad2445788768e83bd40abf0dc370b7c33a77ac6cc498813b043001f57b7f902a5198df4fd1259fefa2fff9370fc7aa17a997fad04911a71f046da8
+EBUILD mpir-2.6.0-r2.ebuild 1720 BLAKE2B 911baede8c9c54591f6f4814adb7babe0c428e38378c519702dc5f4cef65f7feb78bc3c9d1bb22e6673b6cd0ad41821820cc63a5591afb851df43b6353e7d7af SHA512 a733040dd61f37495f3b8a7c9018ecf865b5a48fcb69794c77b6b74164489197ef959b1c8b9b708558fb93782419ca2482ff6dd3ed30313ea67ceb459f6dc193
 EBUILD mpir-2.7.2.ebuild 1719 BLAKE2B e4c9c8a697fb658a76eecdc651c119729a9ec8ecf30d54f054e8f5c61e7a873824e3f566cc5afa2509b96c33eadebbd79bc94aa074e144b562d2fe61c841d6cb SHA512 0cabe5c4e5c1df7b8ecd54b4ba87caff0b934d1805fcbb32b68ba393ba5684fac4314ed277e39286697295f94e79900fc809586b96131d0d03c264873dfd0c07
-EBUILD mpir-3.0.0.ebuild 1731 BLAKE2B 0680ce0297d7aef75afa0e75d093dae142db8294fb0a59177044ab2b454fb9908bd1c53b190b26b6996b752b3aeb1fcb294445a1b1fb5aa58f3873dea59dbbc2 SHA512 a9146e3d93fe8dc9b60d2759eb6759382187d07c0bbff8f809d3c1eb3e104e1e0bd01a0a80e5ec737c5b74f6bad84980742861584c6bc9820bcc25d2f79f239d
+EBUILD mpir-3.0.0.ebuild 1737 BLAKE2B f116e665d36240905d0dc8dd09d53afd668334fb6b8d07ef244aae42a0ef9bf342eef528b74e5678bf6ed21ba2777814aea20b272af8aa493bc610e557845625 SHA512 e241bfda22ed0a12e77cfd72a11099c01dc8122ee20fa6fb604fb2502446e0813f9f227373b2823bd9d3d81442ef8771988488b266e3b2afcafcb3e1460e6603
 MISC metadata.xml 792 BLAKE2B 9c0bea642d53a6afb0abeecefcc940c012b5cecf8c6e98fdf69eb718f63ea8e7c7f913fa1cd8360240b5f355e3742a5ccae00166690cf8a83226ad636342d279 SHA512 811f781a961982955ba036f719ec5cce3def93190fb786ef3c3a60f1b54f9b7638d8083cf0f273174002da7d358d25e8764de591d7b587b41198c48c52908fcc
diff --git a/sci-libs/mpir/mpir-2.6.0-r2.ebuild b/sci-libs/mpir/mpir-2.6.0-r2.ebuild
index 5ad238f36cfa..ed8549c85602 100644
--- a/sci-libs/mpir/mpir-2.6.0-r2.ebuild
+++ b/sci-libs/mpir/mpir-2.6.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.mpir.org/${P}.tar.lzma"
 
 LICENSE="LGPL-3"
 SLOT="0/11"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+cxx cpudetection static-libs"
 
 DEPEND="x86? ( dev-lang/yasm )
diff --git a/sci-libs/mpir/mpir-3.0.0.ebuild b/sci-libs/mpir/mpir-3.0.0.ebuild
index 202580838f5c..da93b8c038b3 100644
--- a/sci-libs/mpir/mpir-3.0.0.ebuild
+++ b/sci-libs/mpir/mpir-3.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.mpir.org/${P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0/23"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="+cxx cpudetection static-libs"
 
 DEPEND="
diff --git a/sci-libs/scikits_image/Manifest b/sci-libs/scikits_image/Manifest
index ef515e64f22f..2cb8eaaeea6b 100644
--- a/sci-libs/scikits_image/Manifest
+++ b/sci-libs/scikits_image/Manifest
@@ -1,3 +1,3 @@
 DIST scikit-image-0.13.0.tar.gz 26101533 BLAKE2B c28284f64abd58c7bafa8f5f0c781496e8bb28af79c5c730df7cbf2fede958eb88ea420fd7f89e7b8d0d91719a98dd0935af3b2cc50fe501cc8d8d1d0ee56cb9 SHA512 923015e373c406ae2fbbfdf83ce8b91e83790bdf7842c4439fdc9fd58cffe46efc0cfc7a1b0b06e1b2d092a909a6f085335640850883e7608dbccd1074046550
-EBUILD scikits_image-0.13.0.ebuild 1804 BLAKE2B f4c2d48daf3d850951e757347420efbe2718a5376c34d07899694b0218ca5c597b79e7e0dc75085b4c62906d1ddbbe29b0fb2be358133315b5338a85642efc56 SHA512 830b93b83a1b595a28d0d24a7e3109dac0109925fee66de25d09e55eb558a1f84668b11b52fa7bede42f0d6b0c54d06775735806a0a3d27347f59f83b0240499
+EBUILD scikits_image-0.13.0.ebuild 1802 BLAKE2B 2c16b673d6a2056178176801524190a53407a28b8964a9dad37814d14cb41207c0e0edf9c86639698314860bdbc91fe0544aae1ae39b3c86f76781428b1d4b74 SHA512 936edba032b3b83d91c37767d7bd218193f40a6905b819244d0373b8a84bb53b5f9a030c3824a741664bd0a431fb8a717be206c2fdfe82c3692c6b59c6b1c871
 MISC metadata.xml 834 BLAKE2B d6ed9731e0bfffb39fb127b1ccaa9d449e7cedc4038a5a4a915624fadad131d39df0d1d7123951539074758095d35c1b9730bb4a3da2278b02630903645eb769 SHA512 1c615479bc22c8c66b4f7a2189e38c69f9b8722f051c68473439069ef89598f0505dbd94fe06cbe56a07e41a1a6552f4d8d666703676ef9a165dbcf462e09e40
diff --git a/sci-libs/scikits_image/scikits_image-0.13.0.ebuild b/sci-libs/scikits_image/scikits_image-0.13.0.ebuild
index fb9abe7e7c78..1863336706dd 100644
--- a/sci-libs/scikits_image/scikits_image-0.13.0.ebuild
+++ b/sci-libs/scikits_image/scikits_image-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ MYPN="${PN/scikits_/scikit-}"
 MYP="${MYPN}-${PV}"
 
 DESCRIPTION="Image processing routines for SciPy"
-HOMEPAGE="http://scikit-image.org/"
+HOMEPAGE="https://scikit-image.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index 4f6de4b02f1b..88c3daca3d45 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -6,10 +6,10 @@ DIST scikit-learn-0.17.tar.gz 7834903 BLAKE2B 9492a0deff723bd1ff3a976f080a5db0d1
 DIST scikit-learn-0.18.1.tar.gz 8933930 BLAKE2B 48cfc73769531242d1228f41115a78e4649c52e7d8796e54286f996ddab72353e3f73bf22302535b7d24f55194e893ed681c74dd60beab5f8ba09aa3af8e161a SHA512 7149e683424351a28c19501302ece147cb03d4d12b08822eb2b1898a4978b96803323778fbba628008dd7a7c85daea4e9b550a71ee76851f9a09b2baac18a799
 DIST scikit-learn-0.18.2.tar.gz 9224516 BLAKE2B fe4b402e3ac561f9272a0a51ddc17092f2a9fada3e2dc081be3fe66bb7932e0ca0c14d9be21272c364d13c4d9669e9ff399e16b53b5cbaa3f5b20e43d2bb448d SHA512 7c5c7bdd577ad215790654ce1eff6e802aebe53283ab6c5f12684cf99aeecc8976f9a9803f619f549d4d03be0d7634f249046e4b4f15afa12aecb2697e2e0b05
 DIST scikit-learn-0.19.0.tar.gz 9341628 BLAKE2B c9e0c12558e81efb6f5cfddead028980b0019d2f6d0fdce5662c9138ec3a5b2a3d30b022a5713578bc7effd09894006e8f7f60a3e038ca66297502d9d4212686 SHA512 1b88bc043b08de9b5bb1f3814b8101c73ced010cf94bd725fb69e1ef95b4a9597a34de4a19f84fbbf63e54d47e95b3ff498d611234fcdfcaa5e4e3cf696289d2
-EBUILD scikits_learn-0.17.1.ebuild 3108 BLAKE2B 91513a1d5867b67a5f56c46853c7e94f176cbbece88e1cf1c78782a4f10f61548ac3a9876c95983716de915c5c832667c50a9729329ac42fa2f2d98971e65c3c SHA512 27b3ae0e98a17740d6b865b0113011168acce9a806d18140122800bf0c775feb9265943541e0a0fc85eb5dd1f7f20a44c1f143aa3965d56d0669f98a7e5928d4
-EBUILD scikits_learn-0.17.ebuild 3113 BLAKE2B 3a8dd55b43055a37c7652cc18de89df72800155ca2ca4e04ad419dd51450a2e4666139ed71452d7c15d94672d1d6cac83329ba47d1aa6ede6f0255252b4485a3 SHA512 1baab6150245b0870cf074eea95d32b49b6cb4ffe7e8bdf8c5d8dbf3e53a88a0c1938acd457c08085ffa479386eb292678747021b7d6c920c1c36e10ad35ebbf
-EBUILD scikits_learn-0.18.1.ebuild 3135 BLAKE2B 0e5b6c9712ef8cc12e52021bc2123e66a250d86b1f015b4608a342064f620354f90b366fd57f01770d3125e8fdfe1e48ff35c7e36e8bdb5aec902ddc8111127b SHA512 953ced0361100ce25f0b9d3bf4ebf3e2f39ba3549d929a362f0fb772153c9be5558776c36cad7365f55955f2a97a2507062e764d343cc45f7d7ccf507ebf6d3c
-EBUILD scikits_learn-0.18.2-r1.ebuild 3281 BLAKE2B 253c4d5a738d4dfe6602835514f6ac81541a651c42d9ac1421a8d71b52ab67926e725c876b6c58e8b7a7eb314d04bf047bbf8d62911e4ab49c46ef48ff25294a SHA512 f310f73b9776508f08b42027628a76e8caad84240d43ab317fa99d692857c28d08ccafaa3250c347600990b168fcb487855d42bef25d8ce8f05259f5f597e5a5
-EBUILD scikits_learn-0.18.2.ebuild 3145 BLAKE2B 05e42d7c768f8a7c5b7a5d323ee23a8a71072dce7fea6ebe184c802c6451aebed821f475ef5e297c6ef2e921f457e1965fd5195dba6ed58bafec7abf50592535 SHA512 dedfaf45ddd7f84ecc5b3e1dd684cb7f22ff163453e26873c43a689679d3a43d7ddeb1f84976c06d360a5265a1415101f875042fbd3aec9cf04457289ad3c414
-EBUILD scikits_learn-0.19.0.ebuild 2823 BLAKE2B f082c9f512e920153d8459451a3797683217f111ca55937f431a5e3ae9c79fb2ac5a7a43ecab6cf2142a86b50d6e34d7703ac4a150eb6a68f87fd62ba2405123 SHA512 07b1e7da5468f7767c0dacb59f7d7e80a13d983a310843ec9b844885aa75291b743dbc03ee4c9a2ff6e87c99c0ab1f83cfcf086bb0b7f1161e4ba740fa7700c9
+EBUILD scikits_learn-0.17.1.ebuild 3106 BLAKE2B c42f275d1b511e698e4033fe7a91a389cf3ea0e689453d1ad6414044db8c13bdd6db1b03c2c04680911593b684d54ecacde9f3cf3e1a780061ed862bc37843da SHA512 7dd3e18d3a11492f4816ad3c1d75327d23c63ee873a77a9171fdc9e7739fda6c82466d1760e2bbb1661b5b5fd989f804389c7e6d1f975bec8f1a4fdce6f4499c
+EBUILD scikits_learn-0.17.ebuild 3111 BLAKE2B db89c5e3df2171f3accf741916217a1b3e69b81d752421cc3922796d993958cfcff9742a3ad1ec74789f85f942a44a7b244cbcabd332216c4b96687ddf26ae0a SHA512 b3872900ca6fbc13ae81cfeb53b824b8cfa410d9f879345d585f2e656797ceb2eb52505e5b38817abf1418f7806c83f3243c9b55f1ae2cb7234ab042fcb65c1f
+EBUILD scikits_learn-0.18.1.ebuild 3133 BLAKE2B adfe069852423ac9f3a19a22ec899b3fc34420e33a8f61bd1c3de73518d4075503579d25188b468d8a99beac6234c76089c9700c67f3d35ef84117e99cda8ff0 SHA512 a547fa445105edd419bc2a52413a22236ebb476a90fe4e5eee24ac6526d154b48fc114fd4158e5752b1ad3c2c05d5c53f0a86c98160dea5f55647bf5a8137e75
+EBUILD scikits_learn-0.18.2-r1.ebuild 3279 BLAKE2B 93dc6ce35faa1a5284bff41f4bc020c4a60af22ec89b28c5db9530e4627840faf4a6c606a78554c944f5e20352803d6a0d3367d262316f75da346cd63438676c SHA512 eaa489faa4e6443e36ec0ffdd30c755409a5b6efae91e076098a37a598f46a2962b06e82dfa1473a5d6e164b7a4921135d67135804701e68435cfccf1cb17c8e
+EBUILD scikits_learn-0.18.2.ebuild 3143 BLAKE2B 7006db127803e7d80236ddd09f41bd285fc3717629c39b3a7a990b40b96ab94f58164e7fa9a8dc287d93c99187f1ba168c08d7e971a558c204bb84691ca61571 SHA512 54fa49e9d10091fd1beb1ed5cdae188ba63ba452795a14600bf82cf95ee770979fb4e8f10a6c9c8fe34e9e28e229e77d1b0f76ed3b129a7b1865d449b0c99aea
+EBUILD scikits_learn-0.19.0.ebuild 2821 BLAKE2B 4adf98c726e93a526a0785909495d773ab3370033dcdccea9c770e41a1fc71d55154a9c0c14e6d87a6a4a5d98c8ec6414a38989f5d6fa13a814c1ce7bb2b5a81 SHA512 06500e57d7f80dc1fd63b75104bd32f5adddbd89ada808994e6dfd4fc7be34fc93bb27298455f7780cb55b7dfd6ce1119401f00e785489be9bfbd89b4585086a
 MISC metadata.xml 605 BLAKE2B 46a657647a79f0a23cc07b39877b1e57158cdf94d9478c3aa4e7af0dbdbf60acf996d1431076697db764d42bec0d5e0517c1247e91dc36e85823a45784d00e71 SHA512 e14b6835108fa80eca44bab635c9a229da65f048ffcee16cd4ad7736c3a0fb364c94ff0bd9630030653bd3cd78d8dced191c43c7e5aacb3a7f6e61ac45b5bb3d
diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild
index 052d3210d7e6..38fddda9bb62 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ MYPN="${PN/scikits_/scikit-}"
 MYP="${MYPN}-${PV}"
 
 DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
+HOMEPAGE="https://scikit-learn.org"
 SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
index b2e0f79446eb..063aa6ed9edb 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ MYPN="${PN/scikits_/scikit-}"
 MYP="${MYPN}-${PV}"
 
 DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
+HOMEPAGE="https://scikit-learn.org"
 SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
index 69d00a0a7a62..491f696e456b 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.18.1.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 @@ MYPN="${PN/scikits_/scikit-}"
 MYP="${MYPN}-${PV}"
 
 DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
+HOMEPAGE="https://scikit-learn.org"
 SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.2-r1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.2-r1.ebuild
index 339670ff4d3f..5538576036b7 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.18.2-r1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.18.2-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 @@ MYPN="${PN/scikits_/scikit-}"
 MYP="${MYPN}-${PV}"
 
 DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
+HOMEPAGE="https://scikit-learn.org"
 SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild
index 7f8aa4ce6687..a96a3a8ab8f2 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.18.2.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 @@ MYPN="${PN/scikits_/scikit-}"
 MYP="${MYPN}-${PV}"
 
 DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
+HOMEPAGE="https://scikit-learn.org"
 SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild b/sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild
index 0b9b744c56a6..82a1027e231d 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.19.0.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 @@ MYPN="${PN/scikits_/scikit-}"
 MYP="${MYPN}-${PV}"
 
 DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
+HOMEPAGE="https://scikit-learn.org"
 SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-libs/shapelib/Manifest b/sci-libs/shapelib/Manifest
index be37e69cc02c..0151f2ff53a8 100644
--- a/sci-libs/shapelib/Manifest
+++ b/sci-libs/shapelib/Manifest
@@ -1,5 +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
+EBUILD shapelib-1.4.1.ebuild 747 BLAKE2B d7c24d2a6d9d1e6a2782932c808551875335c95f83c71265b410e167273b058e80099fabbfe03ca5613bce18e3bf6a09ad5a9ff95a834ba3b5f3c48182a7808f SHA512 0faec499f5ab12ecdd2e9909723734552c9b22e6d36597869051862629a07dbe178d415b372cdcb84b2099092889485360fa693e8ccbb3a8a28edcf07b919339
 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
index 87fe28c275f3..d7c24cb1fbcd 100644
--- a/sci-libs/shapelib/shapelib-1.4.1.ebuild
+++ b/sci-libs/shapelib/shapelib-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 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/superlu/Manifest b/sci-libs/superlu/Manifest
index a9096abcab35..23b08c5e9832 100644
--- a/sci-libs/superlu/Manifest
+++ b/sci-libs/superlu/Manifest
@@ -4,6 +4,6 @@ AUX superlu-5.2.1-no-implicits.patch 4950 BLAKE2B 32a01cb343e21ee870fdfec54f3e52
 AUX superlu-5.2.1-pkgconfig.patch 1013 BLAKE2B a36aac6c06fa8cb4bd3d19fcc74b27c092283b209665cb4dc5d3336f4b025f5145a190e76105b5e96f846e02fd4fe43a71b9542937beefe5e8b375b54ad87e05 SHA512 f22dcbaaa6857008b75b8c6481b219b11c09ebcfe2dffe0a4d4f0cba6392f18fc9a5a870b2a8efa7c31df321b78186cbde7cf8739da59dc089fa3b6ae836bf36
 DIST superlu_4.3.tar.gz 2876631 BLAKE2B 0a563e6730394f8e69fe13f1418f9f046bd37c848c51063e93a24a209e50a67f91b725eb3978fd6c4d28e51615806d6c0b6a2539cbc0d7fd11b5e4f0a9360148 SHA512 5c13da47b79160be14719f62ccdf5d59142a172e25a988fa340eaeb001a64d7f45ba39e675cb7aa3571bec52cb3a7cda0bb7a708c9608184ba6251edb7990e8c
 DIST superlu_5.2.1.tar.gz 2560875 BLAKE2B b1dd51bddb55061f5756f3cf766f80e506f7cc12b272c2ceebbae71cab9314000308b72cf265d5948ed69c68d0ad0adeb938a4471250147b0fcfdc2b80298db7 SHA512 30538b4c2809294b8f34646bce6445944f21a1dffaf3ec0a0f29a55d5261caa56e4279d7722bb95cc9d89450d36ded969617edc82ecce7d0f1dfb24040d80d07
-EBUILD superlu-4.3-r1.ebuild 1625 BLAKE2B c37f8db95d689f21930dbaebd82e854490ee08cc97a5a78e2acdd38d4f24dbdb31c7c32d68a921f73948fcd05a6a6d8e73e7657b601a192fd4a05003ad0ac205 SHA512 1f43902eb51afc5b238cda59885b85ad33cd310c7dd70fbc33b67222b39357d277b8f54b46c636101f232cc51b6ed2fb6456445cee35714e41882e0a9ee48909
-EBUILD superlu-5.2.1-r1.ebuild 1502 BLAKE2B bcb99daedf81fcdabecfb8382954c6c61ab1a6f059d01a558b0ae469dbc69e8dc74dedbfbbe57eeb649f3cb8be2990f4a077dd926f36f777c2a33bbb78be294e SHA512 64f1567449a0f6ede3513e0f3cc6efcc7610976f3c3771a97db5a9132888492e3fb79dd3b4ac0d3716bb3070b62ce898390dedfb043af1dacd36e408e088e951
+EBUILD superlu-4.3-r1.ebuild 1623 BLAKE2B 1e0d0ae0f8edac0828f82ee87e62376d96fcfae711dbde19cafb36efa7f5415ac3fd0758e3be36e74ca7720fd4111b47a2780a18158c430028fbefce3ff2ebcd SHA512 b2ae0b96d8570949fdb20fb1f33548ae87d0783ea0c6aa2438e728534388341a1184bbd98c7b3c3f9c838e09c7e8661b01f1c6ef2342dacb7baadf228c8e6c2e
+EBUILD superlu-5.2.1-r1.ebuild 1501 BLAKE2B ff7df8c7b5e64cb2ba51a6445ec0d45981b28acfcd3efcc784eb732ad5d376612bcfd524fbadde7fd0ee2c4ef3ff1ba81d680336cda778ad771c1d40e78a9ff3 SHA512 0fd6ed61165c36aadea94761b507f7ddebc94b6e9db0df5eecf8b77e8b8091c9a7712250f4ab76348aecc6c6bbc9e3e3a3f325c6db0fe9d9ce90516ccc1950e7
 MISC metadata.xml 1404 BLAKE2B 3ab566d18d18307d9fc7dea889e492e19b76aa9fdebe0dce86b46b1cf7a2d53f65404f56da04cc8420e6a7c21867b948e537833693cb60521746c5a48f16bc6b SHA512 8b758572ed599bdf43898050e265ce8ea82c4952af97471c09ee0013e56cf6928df3f3a436516c4fae7a38a13bba4a3437e130f294f942eaaae05125fa5fbdea
diff --git a/sci-libs/superlu/superlu-4.3-r1.ebuild b/sci-libs/superlu/superlu-4.3-r1.ebuild
index 27da140292af..33e0af340663 100644
--- a/sci-libs/superlu/superlu-4.3-r1.ebuild
+++ b/sci-libs/superlu/superlu-4.3-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=5
@@ -11,7 +11,7 @@ inherit autotools-utils fortran-2 toolchain-funcs multilib
 MY_PN=SuperLU
 
 DESCRIPTION="Sparse LU factorization library"
-HOMEPAGE="http://crd-legacy.lbl.gov/~xiaoye/SuperLU/"
+HOMEPAGE="https://crd-legacy.lbl.gov/~xiaoye/SuperLU/"
 SRC_URI="${HOMEPAGE}/${PN}_${PV}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-libs/superlu/superlu-5.2.1-r1.ebuild b/sci-libs/superlu/superlu-5.2.1-r1.ebuild
index ad93fe85e938..eb6dc71012d0 100644
--- a/sci-libs/superlu/superlu-5.2.1-r1.ebuild
+++ b/sci-libs/superlu/superlu-5.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ MY_PN=SuperLU
 
 if [[ ${PV} != *9999* ]]; then
 	inherit versionator
-	SRC_URI="http://crd-legacy.lbl.gov/~xiaoye/SuperLU//${PN}_${PV}.tar.gz"
+	SRC_URI="https://crd-legacy.lbl.gov/~xiaoye/SuperLU//${PN}_${PV}.tar.gz"
 	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 	SLOT="0/$(get_major_version)"
 	S="${WORKDIR}/SuperLU_${PV}"
@@ -24,7 +24,7 @@ else
 fi
 
 DESCRIPTION="Sparse LU factorization library"
-HOMEPAGE="http://crd-legacy.lbl.gov/~xiaoye/SuperLU/"
+HOMEPAGE="https://crd-legacy.lbl.gov/~xiaoye/SuperLU/"
 LICENSE="BSD"
 
 IUSE="doc examples test"
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-03 13:42:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-03 13:42:34 +0000
commit	066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch)
tree	3cb05783d73b2c33589ba305144a31c718e123cd /sci-libs
parent	16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff)