gentoo resync : 03.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
commit: bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree: adb35b5a9a00ee7ea591ab0c987f70167c23b597 /sci-libs
parent: 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)
45 files changed, 253 insertions, 1317 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index b2aa6e070b01..29e6c3b25dec 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/arpack/Manifest b/sci-libs/arpack/Manifest
index 1c73efa8b515..1d0d2d582de4 100644
--- a/sci-libs/arpack/Manifest
+++ b/sci-libs/arpack/Manifest
@@ -3,8 +3,8 @@ DIST arpack-3.5.0.tar.gz 949853 BLAKE2B fa28090cd745983ee362ab17e0d9f5ab503ec840
 DIST arpack-ng_3.1.5.tar.gz 1516406 BLAKE2B 14dea27dbe7d17144871c62db58467642f4602ec479f63b1dcfe67e22b73b146691cb5bb01c90323507a65c499077d0fee3fec0a15c5d654ccca9d3f67975a06 SHA512 4876b0babb89bbcc39e92b63d4537b860e9cd0b8a188937d3ba815041b7261623cdac25c91c8bef20ebce4271f822307c492cf6c9f22ec3d740218405337a515
 DIST tutorial.ps.gz 105599 BLAKE2B 99570e6a0cc1c020b9c271e8ce1cc224f69ff5333cc818c10b063dc8ffbaf66a9f5c6ede99541b4212286d422146b1c4e332eba7e1635c99efa0e4c2620f0630 SHA512 a7b8fefd1a572ed477ae208d49094c1c65c9368990d12de9b3528e33fed546c947659f74e54a810d04154b4a1b0f9a94bcba4db0cf59d379e20786a261066aa4
 DIST ug.ps.gz 248543 BLAKE2B ac010aef470060636fa00360636ba093f0d24d219fa927c79fb1726b798160eda74fa8b4be6c7dff94f5759efcf30afa99ad310e7959115e028738beb8aa125d SHA512 3349117fb10b07207ffbab2ffa31b406d026855ea4c16e8649b14c7d70bc94e11b5730672e34acd654817799136d4bd76569ac50ec78d787df5582d18ed61328
-EBUILD arpack-3.1.5.ebuild 1546 BLAKE2B 571cc7e04aad5351278ebee3c0ee248440ff58971fea24c0da9f2356bd8b4480ddb17148245d68201f0ba63981ea7097005d12baaf2cda5e5e4eb34a14d6df75 SHA512 83fdba57db8b47a8e8214f3cf7e241f55ef595ed63dbec124793a29a611839b7ae27c2db150dad6c47668b917ac80522d970935111833896c4ce802c8defd591
-EBUILD arpack-3.4.0.ebuild 1349 BLAKE2B 1062601fdeca9a473dc0703ee3b7d8a065f240fe488f2142e7ceef8b2e3c8a2d2ad32fa1f04c96cafcd65bda429e54a9a3fd76952be17bf981664661d8778559 SHA512 2526034ddff90862a7f0b60d9389dcc459b3806c127ca2b1831c9e14c9c6d3013f962c4330b5df5a7e504dcf9a7f601251a4b4b94af504cc896fbc4b6d4c6754
-EBUILD arpack-3.5.0.ebuild 1349 BLAKE2B 1062601fdeca9a473dc0703ee3b7d8a065f240fe488f2142e7ceef8b2e3c8a2d2ad32fa1f04c96cafcd65bda429e54a9a3fd76952be17bf981664661d8778559 SHA512 2526034ddff90862a7f0b60d9389dcc459b3806c127ca2b1831c9e14c9c6d3013f962c4330b5df5a7e504dcf9a7f601251a4b4b94af504cc896fbc4b6d4c6754
-EBUILD arpack-9999.ebuild 1304 BLAKE2B 2dea28aa3bc26a39c6715db10ed4bd854b733a1150cb8d92f176e32ed67a7f4558283749aa7cfd8b3483f79d11a9f77b5c988a7761d2f331819b9357feac08e3 SHA512 3e704fa0182be22a01c394574cce1d873358eead7e09ab029edbcbea35b1d8cd6d5e9f19fa496854557a7ea1b624ab61d71a5fd4118194736349280e6da8374a
+EBUILD arpack-3.1.5.ebuild 1550 BLAKE2B 0b18c51eff62ef6f0d25cd4692dfe0c6fe4b7148276427c69aa07eb487596ae624384140cb7d7cfe8939d8edd21ec4c361904220a309a5ca061e92e41faf0f35 SHA512 201b1020fda26b59b2b8c9b989500039a7d73718d4fd9531234f1a20e1972d33ba1ac827139ef0e453452cc6d358c7eabd568b2fab10ca2597d3bc2a473c292b
+EBUILD arpack-3.4.0.ebuild 1355 BLAKE2B d0d678d83c207f139008dd307a4f47f27d7f3161f525826490e0037bae021112802746629b064fc808c399cf14b11ef1fd5c554aae8cf2067b580fedb49d12a8 SHA512 12284a85d1434db427bb29ab589116667f4e388eac59eb19a0184f14f64c496052c6ae28cd8be189677b3b849aeddc5ad698c4b16fca2d2ea54cf9e876a8eaea
+EBUILD arpack-3.5.0.ebuild 1353 BLAKE2B 1c1e065c0aa0b64d65cb3892324ae3ab4736c01e9c27a9a5962a2a9eb418f8df25723a7f9c0ba9aa337b63aa93c30a749c1f613feca748c830cc777d3d605b72 SHA512 41622bfb79ab0e186916788a3573e039d1b01c44594b9b85ee1335e7d65f7451b00a4eb17b6e26a9f7fb865f6eb7a4be42f4c9dd31aeb3c05dbce92786892fb2
+EBUILD arpack-9999.ebuild 1310 BLAKE2B d1153a2ab23165a18266ea7c7dcbb78a55a816645dbb0f37c0a9ed065fce28cd49af53b50a7b6314d79bcffb1e3c9aa4e942752dd2fc4cdcc3ac883671ee1bfc SHA512 83fff44b0d876d88b5836d4c3a1bbbaf05834e31a8914e57e130ea574c14bfd094d3dd64502924bb50c802a008d1d42f97b9634d8ed5211f9e8ee27b265bb98e
 MISC metadata.xml 974 BLAKE2B c9121a0b23acddc3268d4bdbf4537104217a00d09263d29b6cc6f832c87f9a9775f6fab567976078dc1dfa54f2bac627d792b1819a9ea698f3a1534bc52c39da SHA512 c3e094cab53fb61c9acf3eff6ca0c0fc53a71ec135315ba833fbfe6a5ae9481f2b4de5270ccd19ec84cf85dfb18df179e1e234d268eef1af98be218575dcd4bf
diff --git a/sci-libs/arpack/arpack-3.1.5.ebuild b/sci-libs/arpack/arpack-3.1.5.ebuild
index b519d22a06de..e59f0f251e17 100644
--- a/sci-libs/arpack/arpack-3.1.5.ebuild
+++ b/sci-libs/arpack/arpack-3.1.5.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
@@ -20,7 +20,7 @@ SRC_URI="
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc examples mpi static-libs"
+IUSE="doc examples mpi"
 
 RDEPEND="
 	virtual/blas
@@ -34,6 +34,7 @@ S="${WORKDIR}/${MY_P/_/-}"
 src_configure() {
 	tc-export PKG_CONFIG
 	local myeconfargs=(
+		--disable-static
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
 		$(use_enable mpi)
diff --git a/sci-libs/arpack/arpack-3.4.0.ebuild b/sci-libs/arpack/arpack-3.4.0.ebuild
index 6ad847966d71..bdb9445f39b9 100644
--- a/sci-libs/arpack/arpack-3.4.0.ebuild
+++ b/sci-libs/arpack/arpack-3.4.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools eutils fortran-2 toolchain-funcs
 
@@ -16,7 +16,7 @@ SRC_URI="
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc examples mpi static-libs"
+IUSE="doc examples mpi"
 
 RDEPEND="
 	virtual/blas
@@ -34,6 +34,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--disable-static \
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
 		$(use_enable mpi)
diff --git a/sci-libs/arpack/arpack-3.5.0.ebuild b/sci-libs/arpack/arpack-3.5.0.ebuild
index 6ad847966d71..5bf1ad557e6f 100644
--- a/sci-libs/arpack/arpack-3.5.0.ebuild
+++ b/sci-libs/arpack/arpack-3.5.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools eutils fortran-2 toolchain-funcs
 
@@ -16,7 +16,7 @@ SRC_URI="
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc examples mpi static-libs"
+IUSE="doc examples mpi"
 
 RDEPEND="
 	virtual/blas
@@ -34,6 +34,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--disable-static
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
 		$(use_enable mpi)
diff --git a/sci-libs/arpack/arpack-9999.ebuild b/sci-libs/arpack/arpack-9999.ebuild
index 26930345b335..e81afe18fb49 100644
--- a/sci-libs/arpack/arpack-9999.ebuild
+++ b/sci-libs/arpack/arpack-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools eutils fortran-2 toolchain-funcs
 
@@ -19,7 +19,7 @@ DESCRIPTION="Arnoldi package library to solve large scale eigenvalue problems"
 HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/ https://github.com/opencollab/arpack-ng"
 LICENSE="BSD"
 SLOT="0"
-IUSE="examples mpi static-libs"
+IUSE="examples mpi"
 
 RDEPEND="
 	virtual/blas
@@ -35,6 +35,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--disable-static \
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
 		$(use_enable mpi)
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 4b50bad1e4f7..613e4e04d1d7 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -3,8 +3,9 @@ AUX gdal-2.2.3-soname.patch 2062 BLAKE2B 159b3d8eec126a141ff21c908d45193411bdbcc
 AUX gdal-2.3.0-curl.patch 471 BLAKE2B 551c9fba5cd49afef45ae271f20b8440214b06f569893cf8dfba73bd5682a9494e8ff1d3c81c1784019e49149d56aa4a4f4ced77db2d1a29f12eaec3f4fbce72 SHA512 a23a7df486ed2fe0c000a87405ad56ed48107a957ce29bd6692df26ef93e493b2221b856720721cafeba9646c4c959e154549c87e1012a8a65389343d267dbe6
 AUX gdal-2.4.1-poppler-0.75.patch 5452 BLAKE2B 7cb3b1e84f2f1ff91af49cb4292047f055aeff5a45c8f0d4c440c99d2ab746d32500f11c040f0eaba72b8da9122ab5fc3b5d50dc082c60281354652ab65fff9f SHA512 7482a8a160f514c31c11d101e1f8a2c32dcc862b3c7bc76ac11712bca7c3088975b4fefae33a6d68a847a5e54982b8d02d6bdc8dee27dd0d5efea0f6d28590ed
 AUX gdal-2.4.1-poppler-0.76.patch 699 BLAKE2B 132ff0a3046734e851d12379d049b2e4fdbefcd4bb6949ddf9fa18b856b1ae20d2a2ec9dbcc0d973097cd2ba5f6e72e852b26a93997ffe4b428fe79d44b5c1cf SHA512 09cdd963dbc5e09d211663f54b1cef72eeeda7484ad10b08862907df60aefc068d840e80d4fd0aa0776a03edca89e8affb8b614c4db02085e854bb4a14342d4f
+AUX gdal-2.4.1-poppler-0.82.patch 2322 BLAKE2B a07590bdd3d910b6da8e99989f648251d891fe170ec5b6954d34a3986ce949f2c428f184d8ffbe6292cf6fb7915753db7e81b4993c71fe2b1e4016745c8595fd SHA512 9aca4c69c1df413666d58d75e9b235cc7039224e400188e982b5e9de22773b20829c09eb467069c9e56ea79aa4de2f0e1267d2ed4cd8bb1be7e0432f2c7297c2
 AUX gdal-2.4.1-swig-4.patch 4239 BLAKE2B d3bfc88aa79fa94015816cd6e620b7520c765379668542dc1fa5c20192898e9e25fcd1a4cc7aed98fca8d07dc1e0a06b6bcd60fa19049af738f061f7537a7129 SHA512 7db4206ce24a35b4b71859310cc4218fd02c3c2900892fc51950d7ddb90b5e743dc42fe4fe545404063ffeb2f0eaa4319f616a200ed3e92723ed04db4300f7c0
 DIST gdal-2.4.1.tar.gz 14546610 BLAKE2B 92404336339c6f46877f3e6599af6fc67a53714888ff66fc0142efa8ddf185ad34d9ec337dcbad67f059041da31e70073a9e41872a7332fd9977552d79fcbc61 SHA512 b25e49f343986af6f37e0bec6dc3084cbcf1a0080da5cfd91d1a58c1d9ffd2ac355299d66534e63e89358cbb15ecd0f2ae934d91bbd2a3749889dadaf266e483
-EBUILD gdal-2.4.1-r1.ebuild 8154 BLAKE2B b1e5e5d599a521fab13bdd696d2148b82dec36b4b04f5a9ac60097d7020479a37ae43f347e9feb06344546eaf106e9ff7c6b9a7b95fbe1781f0752090bc4fb56 SHA512 4a2d654bc206fc5c3d3a7f1ffebd34d2b9eead0107ef453eaafdfcb418f99e459e6873ae837edc73ff91cc8503d30625499ada40edff7541a5ad13ba46f9dc44
+EBUILD gdal-2.4.1-r1.ebuild 8193 BLAKE2B a07ad5889a6d80a2fa92aab151cb279769e19bdb7b85293cead93ebecfda9be6689eb762b7e4ad237ad8ab32cd6f3ce9d45e36865116f8b1e1b6e8ed27892ae1 SHA512 b626dc9c2568d76aec6ab7a1e16172d983661289cb3b531e84a3ece9862168c57316c8b1fe9ec177b17a8f811b039bc7e4a6d6eff5d2f1c9ac589b3e0c424365
 EBUILD gdal-2.4.1.ebuild 8103 BLAKE2B 64c0da0778d1d685931f26d5503ea2842094b9d2575d11d81f4bfc494087917079bc458c2cef6237fa666f7290912b2990311bffca1d4a4170891c3d9fcc50c0 SHA512 41fb4a70b214b754b47168b0518b7f2265c1d879d3b99229ff658586c25edd4c1bed086dacb1cd644595cd996ec9e4bff52b04b7bd65a4d6f4924cbec905e09a
 MISC metadata.xml 1522 BLAKE2B b67678f81739e2fb2866cc6ca49545368fce4a85b145ba3f8228b8a39ecb2d7f75b55500f13768838c9ed11a47f586ab7b05eb31e2dbf6fcd4d29c5d8896107f SHA512 091112e555a5a77c5643cbd4465046bfd9fe287e209b42f5410787a2f1a2e4d7ec640efad93c277f0f6581db2264fa104d5aba2e8cbc4126c2c14fe4d86afcee
diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch
new file mode 100644
index 000000000000..740856814f86
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch
@@ -0,0 +1,53 @@
+From 20c3fc7cb4a4ec2a67642bd83ddb6e403488b0fe Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Tue, 22 Oct 2019 13:11:57 +0200
+Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev
+
+---
+ gdal/frmts/pdf/pdfdataset.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
+index 15537ca7fd7..8f944c40d30 100644
+--- a/frmts/pdf/pdfdataset.cpp
++++ b/frmts/pdf/pdfdataset.cpp
+@@ -205,7 +205,11 @@ class GDALPDFOutputDev : public SplashOutputDev
+         virtual void drawChar(GfxState *state, double x, double y,
+                               double dx, double dy,
+                               double originX, double originY,
+-                              CharCode code, int nBytes, Unicode *u, int uLen) override
++                              CharCode code, int nBytes,
++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82
++                              const
++#endif
++                              Unicode *u, int uLen) override
+         {
+             if (bEnableText)
+                 SplashOutputDev::drawChar(state, x, y, dx, dy,
+From 94daceefebd464858888ddc85170c1a8c4bd50d7 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Sun, 29 Sep 2019 23:55:18 +0200
+Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev
+
+---
+ gdal/frmts/pdf/pdfdataset.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
+index 3d68f92abe8..b3db5374227 100644
+--- a/frmts/pdf/pdfdataset.cpp
++++ b/frmts/pdf/pdfdataset.cpp
+@@ -265,7 +265,12 @@ class GDALPDFOutputDev : public SplashOutputDev
+ 
+         virtual void drawImage(GfxState *state, Object *ref, Stream *str,
+                                int width, int height, GfxImageColorMap *colorMap,
+-                               GBool interpolate, int *maskColors, GBool inlineImg) override
++                               GBool interpolate,
++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82
++                               const
++#endif
++                               int *maskColors,
++                               GBool inlineImg) override
+         {
+             if (bEnableBitmap)
+                 SplashOutputDev::drawImage(state, ref, str,
diff --git a/sci-libs/gdal/gdal-2.4.1-r1.ebuild b/sci-libs/gdal/gdal-2.4.1-r1.ebuild
index 2c9beae3deb6..db767c561b77 100644
--- a/sci-libs/gdal/gdal-2.4.1-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.4.1-r1.ebuild
@@ -85,6 +85,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-poppler-0.75.patch"
 	"${FILESDIR}/${P}-poppler-0.76.patch"
 	"${FILESDIR}/${P}-swig-4.patch" # bug 689110
+	"${FILESDIR}/${P}-poppler-0.82.patch"
 )
 
 src_prepare() {
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 911cc1d656e2..32420e8f7658 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -3,6 +3,6 @@ DIST geos-3.7.0.tar.bz2 2028814 BLAKE2B 17385d9be831d4812391a30627e13989d3ca099c
 DIST geos-3.7.2.tar.bz2 2071465 BLAKE2B ba968488aa5d845e582d3771d8d2b1f67b0f301e73fad5834a0805a912c8f3b1200bba93d8758f43539ce269758de348d999db3db9738e7abf5c1a443f388d8c SHA512 ff0fde2e21ed9d2770c139aa50c6efd22d9cff3c6bfd8f1ef86b064efd1ad318b08dec66e34661bc1c7a341b0837978853494f27d63988be865a8ee4f7611d38
 DIST geos-3.8.0.tar.bz2 2399403 BLAKE2B 0f9b6d7f9a4052b9b84e77d534be6e2909e5dc4995287f34e3b7e7c1537c9a73088d4a49f96f43034723eb37c88674aae469e26d7db3eb40efbcdf5551553a1a SHA512 c89b25b42092152ef261090f25ff64b229f30f67d42fdf44c2871e78b66bb2c42e23b9ae21f9aea0e48823bdb0267d609ab2ee77d310abcb76fa672c6614d8f1
 EBUILD geos-3.7.0.ebuild 1338 BLAKE2B 7ebfca396ca09ebe266c59c901ad7f931076a5bef9b7574167d35b0123297205504cdfe7b11ad3a44729483ab57a14bfce6a17f66c9a4391c06b8fcf4c1071d4 SHA512 fe01f7c023c67401396ba760266b62ebba2388e42a7aae08a188fb7ec4726d9c6390f8768511fbd28ad6374a8f47a5de55a530c025d01e43a43082f7ea3a0021
-EBUILD geos-3.7.2.ebuild 1345 BLAKE2B 22063a40f25ecbcf405a48cd37406a2eea5fc03bf70626765c4b2208b53bb299d80b44d392d94ade93b8c30274417d4670ca58cf8fb8c578e6d33167d362b95c SHA512 b54e29ec97c41372bb913e8548a89cc88b03d15336a4ec69da42822224246a8b964f6a1311115ca5674d263a81d942d68a497967a17da7753ecbde0f205600b6
+EBUILD geos-3.7.2.ebuild 1340 BLAKE2B c80be7de21da9d791ae58e5ae803fa7f1ad021301933ccb319d371fd9bf9418fb72c3cd96a39972b74cba75cabe80d0b45d6dc960dec4f67d1d730499343c346 SHA512 a43dc5d8494fe07508b4df263fc47b47e48cc93f5cc245c8086932038aa59c7b163f9641afffae21760bc59ab83aecc41caab8ec725027c646489246720ef04a
 EBUILD geos-3.8.0.ebuild 1346 BLAKE2B e68219f57a210aa0f2ae633740360a75b88e302715deaec1af24446c540e9e3fb24812985118f73e2fb34e404c1bea7f7f91203df6c87d62b7e9165bcc85da06 SHA512 173bf18fd49919a49a9459a43ab598a68ca84cf3db8d0b299d72bd9e1e3de3ce6e9d3adb15fab5ab5b63d58bc29920b20a8dafb23b22a26d011d1c96fb62f240
 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c
diff --git a/sci-libs/geos/geos-3.7.2.ebuild b/sci-libs/geos/geos-3.7.2.ebuild
index 1acbe1537bf3..285b79163026 100644
--- a/sci-libs/geos/geos-3.7.2.ebuild
+++ b/sci-libs/geos/geos-3.7.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc python ruby static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index c8788a6f9f12..7b76673d0380 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -2,5 +2,5 @@ AUX hdf5-1.8.13-no-messing-ldpath.patch 1141 BLAKE2B d7d186e4c00acb9fd3d44beb1d8
 AUX hdf5-1.8.9-mpicxx.patch 494 BLAKE2B 148d87af064e2ba28c918c8db39ece0782a179803e4c38c5cd5eaba81a673bb8aa3699a48e80a7ae2d4579ac0261cc21d5509e46661ada9a69f444a58eb45ecd SHA512 8b4c39e40591860652547ea8ff205230da7d67488233e911cbcb3416eab561f2529c65bc5e7c9c812bf4298812346f47f9209e5f69f7e8f66ad587306a5b477b
 AUX hdf5-1.8.9-static_libgfortran.patch 429 BLAKE2B 9e1c544a453c09b3498a7d9d3e8090c928571776934c4dd6b426cbdb2783ed8f47185d6ee0c73ede6b4f14e27459ef5e1412112e9d897daa2dc57f1ad5fb0b24 SHA512 af97c54469a90bf3b0e8ec1218d4ca95822ac0cbc7120114979fc467fe3114743c74f4d4e16f0c10b1cd82d40880ef482f6fd34e1effc7c621b981ad466204f9
 DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2ae279d3980f57ed46722b754d3f36ecf1d6273c75e80ed1afd4bbf10c6b1c5d9408e1f83a4b2e397e7902a7d3c SHA512 769e43b8672e26fe24ed68da0228c010d3d9bc950ca09f0bc60707911a2f26f2f8415c8abc8ec06e07667148d8cdb3b0c7b3e7860d9b19739629c5dfd5ce73d4
-EBUILD hdf5-1.10.5.ebuild 2642 BLAKE2B 746c63600cdcab79167b2c3da0f37bd7c046c6389565fdf50a752d5fc2e14511ba2fdc5ed190a8b83716f11c57a9ddb10ca72f9e468f9752ec96449580fba37b SHA512 ca6b8e9c76fcbe59f14b538ee0e52dd780af7417586d6158fbf1195251b58bd03753b6acec1c4b55b1af15862a648d1b415bff998ff1a2c83a2578d65301545b
+EBUILD hdf5-1.10.5.ebuild 2708 BLAKE2B aa05e9276c17ad1da567234c534a151b6cb8ecdc22a01e04f21be5301835a6a90e6ff2b805cc51a253291b254b053c63135d9588c1ffb461846c7a638a33dc85 SHA512 d6d14e8aeaa2ec17940ad0fa054afa923a73dba2a295ee5cfd0c0e9656863ad0b07811528cbfb11b86ea495e3dc82a796424e4583ff59ae0baa68db90f3f6b54
 MISC metadata.xml 670 BLAKE2B 6ec39c2c545ea8130677894921b6914d4503199a40f5498b81f1520312a451585276a2192ecb388323574bf0a17acfe798d090bf499f8ef2b6bb7ff831c662ba SHA512 2cbdee7294537d76bee9c72c77c36d0d2aab176dd4588a7b99d16bc3a421b52770bf6d93943c13fb32674f5deb7bbebb94b9e18875b3e473395a9176277fd56a
diff --git a/sci-libs/hdf5/hdf5-1.10.5.ebuild b/sci-libs/hdf5/hdf5-1.10.5.ebuild
index a3c248db158e..deaec088dd13 100644
--- a/sci-libs/hdf5/hdf5-1.10.5.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P
 LICENSE="NCSA-HDF"
 SLOT="0/${PV%%_p*}"
 KEYWORDS="alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cxx debug examples fortran +hl mpi static-libs szip threads zlib"
+IUSE="cxx debug examples fortran +hl mpi szip threads zlib"
 
 REQUIRED_USE="
 	cxx? ( !mpi ) mpi? ( !cxx )
@@ -79,10 +79,11 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--disable-static \
 		--enable-deprecated-symbols \
-		$(use debug && echo --enable-build-mode=debug || echo --enable-build-mode=production) \
-		$(use_enable debug codestack) \
+		--enable-build-mode=$(usex debug debug production) \
 		$(use_enable cxx) \
+		$(use_enable debug codestack) \
 		$(use_enable fortran) \
 		$(use_enable hl) \
 		$(use_enable mpi parallel) \
@@ -91,3 +92,10 @@ src_configure() {
 		$(use_with threads pthread) \
 		$(use_with zlib)
 }
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index 4e3b9b2e8411..83cb31857785 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,3 +1,3 @@
 DIST lapack-3.8.0.tar.gz 7426094 BLAKE2B 27cd75eea498250382b2df6f5d7dc95fdee8d37b1a0faba5296ca0145ec40a1165a4ecc727aa1647086be6783b50cf475f79cea0f30f541da789051db99b2f37 SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
-EBUILD lapack-3.8.0.ebuild 3012 BLAKE2B c99ad74d7c8858050157db0b8f34d9f99867dd5e9dd14e76650a5bb7a5698c91a0e59d8f23815c8172d3dfec1921639d60b1d770ddc012c4375b0b5f89f5c185 SHA512 4b1bf23e4607286f52c1171cc5cc1c30830da53026fa1c7b7e92826c94419d60cb61a5dd03de8be394b5426d39f475506a95abcd0d7d2cb020790dc0a4f9e181
+EBUILD lapack-3.8.0.ebuild 3010 BLAKE2B 9bab2aef8be2987660e0f9b48ad6c7e4d0edb6e451972c8a8076872388628cd561c7e49a4e7417398cf63eb8816762f10503c68dd95fd78e95f09fc4d00c399c SHA512 03bd798f9b3f4515efc64c04b260829a92e8c7b40553bfbd8830519c15aa92cfe6d5d3472b434beba31961520c1409d11bfb5fce9c99c8232b0dc5e227e4093f
 MISC metadata.xml 1423 BLAKE2B 2ec6d7c07c4827cca666cddb7e7b2e47238ff3fd40fd5e15463196812a7a82e0b85e5d36ae2a2c3315c3b4e0b5f3d4a79a953cb1703836b20dc14862956bcf29 SHA512 39a5e8738999caaf00b4f7fcdb3afdd1405a7c817920b9247a76dbc64e06f8c2011763031a058673ac8a411cad2219cbd7c8664d379535e2afea72d2bd578fbe
diff --git a/sci-libs/lapack/lapack-3.8.0.ebuild b/sci-libs/lapack/lapack-3.8.0.ebuild
index 223eeadad7be..a12e480344c3 100644
--- a/sci-libs/lapack/lapack-3.8.0.ebuild
+++ b/sci-libs/lapack/lapack-3.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.netlib.org/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lapacke doc eselect-ldso"
 # TODO: static-libs 64bit-index
 
diff --git a/sci-libs/openfoam/Manifest b/sci-libs/openfoam/Manifest
deleted file mode 100644
index 84b9fca1a3b6..000000000000
--- a/sci-libs/openfoam/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST OpenFOAM-2.2.1.tgz 37600247 BLAKE2B ba364c052e482379e7a280aa4d35260e276eab61a93668e1ca26ddcbf8228f67f7562cf90e6d9e659b5971b0b8f28455ef1a8420d901e911913c331c34edc739 SHA512 1b3afab700ca6e8b328ec76b5d862e67696ad6c622bc1d3a26c3cc87d6ad62f752be72cc0644510b63612fd1441e7a2969e3b53728d30f2a67a2453530fcd286
-DIST OpenFOAM-2.2.2.tgz 32536146 BLAKE2B e56a9fd2f85baeca478ea5ab663fe502ca20234da0fe379cf44fe2189813c0fb675e8a94ed1a4fae7972c9dfd0ad4e36da6eea1dc0b34d9771cdd881d931b0a9 SHA512 c57128b4a3fea0419118963a0e65dcecb532cb36713a03c3beef027e57f5a48c6839f35286eb9163cceb9e278bef6135bca7ca53990c2dbe4544fb26e82098d0
-DIST OpenFOAM-2.3.0.tgz 37339475 BLAKE2B b09369bbd76dd0555e8a89b108196e47fd7d410447e95991132f6f2d3ab59d0b8b22370d7bb2fab2425bd66dcce2f687fbf6b4c293dd3fd81103b931b0455c80 SHA512 314e4726c3814bf8efebee88be0113c3921be8daeb947ef325688911ff6dc265f144952adf77af1d274abff58c68331bc48f4e74ef7a632c98adbd87fe79355c
-DIST OpenFOAM-2.3.1.tgz 37660806 BLAKE2B 36a9034bd9e601303c6d141d1f236650ed890ba1a032f81cfa11073fbb5deece734691b0d64069c7e59af055d2336fc725beeec8f612242098b139dd6abeb1d7 SHA512 a55cb2c8ac66bbfff81249aab759e1178895597460544009129883ab775813bb028d4c294d1913fd644d9d2268d075d2fd151c1cd1aac69080555f99ce1c182e
-DIST OpenFOAM-2.4.0.tgz 41640005 BLAKE2B d8d3efb323966d0b1617a80711724e9a9f52372f7548bab6f6d41c6920f20fb25f2d0dbfdb82a5b7ce6604548fc61ef3f383f045c3b90ac7d5c3132f3933ca8f SHA512 1916191d810676145a88492e902840f5cbd839f3b221dcf55c5edc26791b395c1d36fd6ef37e4c1bc1f813357a3b22ce3ec3e1b802ac49157f76d25e6ca53cbe
-EBUILD openfoam-2.2.1.ebuild 2734 BLAKE2B efc312a7b6236fb8347a6c00485f024ede75179c95c36c3c99336a99e09b8630f26980f907269060508e1261a987f830f8495a9cc9803760d89d9fd51228809e SHA512 840b31b22793d5258e26118049a3c1277fcb22f37511bf71217b006af830fd8b360e09640e5026362e88fdc185d2531e86bb80fa1a0c539957d20707bc303234
-EBUILD openfoam-2.2.2.ebuild 2734 BLAKE2B efc312a7b6236fb8347a6c00485f024ede75179c95c36c3c99336a99e09b8630f26980f907269060508e1261a987f830f8495a9cc9803760d89d9fd51228809e SHA512 840b31b22793d5258e26118049a3c1277fcb22f37511bf71217b006af830fd8b360e09640e5026362e88fdc185d2531e86bb80fa1a0c539957d20707bc303234
-EBUILD openfoam-2.3.0-r1.ebuild 3066 BLAKE2B 83612e8ca96df1a4f36964ca8e6fda2f93821480a4a21c5e6c37f91237186c887cb6e0ed5bfd83ecc85a4f12410e368c446469cb33069ea78399290b2b517b12 SHA512 217104ca626b89af62e67046ce248e2434b8d25370759ee8e1415af87098d29dba250f73c62d3e4c97e746adb0cfe216b8733566ffcc8a13db00dd2d79bb6d72
-EBUILD openfoam-2.3.1-r1.ebuild 3064 BLAKE2B faa119a8ea8d1945683404623a3969da6d1c8a510e0e242a0e764ce14dd701eabf4fc082963f6ce78931f3632217f925264bc1e2caac472006f4e51dca12dddd SHA512 1d32199999c08c1172440df5a290f40ce82f2652622823604566e85ae69e066613400bafffa9f2bb450a5fcc8f6e8f81f14a3d7d76a1c25e58caacab43ea8ea7
-EBUILD openfoam-2.4.0-r1.ebuild 3152 BLAKE2B 359a89fe8ea196ee09467f4af9d225b34e80deb98ca96eff439738ab8f8c4075f2b0ce1bba180001f8c2b69979503235735730f1928e809c7a3cc577bc9703e2 SHA512 89a58093dabb8f17f6c03bf39069da82cb6c125ab12df67701393fcac419e53ff42950d3efa5685770954982bcf2e4d91889e19f22b10073bf48a2c89d4d9bf5
-MISC metadata.xml 538 BLAKE2B fc2c49df471cc63cd4e9096776373df0c15b81eca0c9b7e6779805f8274d088d474efef69d0d68bdea1a63989289074f42a24601d8336b22e7171cb495655e10 SHA512 f69a0c2437906775c05a2130e1e3e0b16f9038f80158f9334453ec15d14bfc0fcb2791ab68147a34c62bb1f17100d51c2f120e869075b6921e1d9edf5cb76fb8
diff --git a/sci-libs/openfoam/metadata.xml b/sci-libs/openfoam/metadata.xml
deleted file mode 100644
index 3bb70c9ae50b..000000000000
--- a/sci-libs/openfoam/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
-  <use>
-    <flag name="opendx"> Install opendx visualisation tool</flag>
-    <flag name="src"> Install source files</flag>
-    <flag name="paraview">Enable support for paraview library</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">downloads</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-libs/openfoam/openfoam-2.2.1.ebuild b/sci-libs/openfoam/openfoam-2.2.1.ebuild
deleted file mode 100644
index 711bb0042fcd..000000000000
--- a/sci-libs/openfoam/openfoam-2.2.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils versionator multilib toolchain-funcs multiprocessing
-
-MY_PN="OpenFOAM"
-MY_PV=$(get_version_component_range 1-2)
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Open Field Operation and Manipulation - CFD Simulation Toolbox"
-HOMEPAGE="http://www.openfoam.org"
-SRC_URI="http://downloads.sourceforge.net/foam/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="2.2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples opendx src"
-
-RDEPEND="!=sci-libs/openfoam-bin-${MY_PV}*
-	!=sci-libs/openfoam-kernel-${MY_PV}*
-	!=sci-libs/openfoam-meta-${MY_PV}*
-	!=sci-libs/openfoam-solvers-${MY_PV}*
-	!=sci-libs/openfoam-utilities-${MY_PV}*
-	!=sci-libs/openfoam-wmake-${MY_PV}*
-	sci-libs/parmetis
-	sci-libs/parmgridgen
-	sci-libs/scotch
-	virtual/mpi
-	opendx? ( sci-visualization/opendx )"
-DEPEND="${DEPEND}
-	doc? ( app-doc/doxygen[dot] )"
-
-S=${WORKDIR}/${MY_P}
-INSDIR="/usr/$(get_libdir)/${MY_PN}/${MY_P}"
-
-pkg_setup() {
-	# just to be sure the right profile is selected (gcc-config)
-	if ! version_is_at_least 4.3 $(gcc-version) ; then
-		die "${PN} requires >=sys-devel/gcc-4.3 to compile."
-	fi
-
-	elog
-	elog "In order to use ${MY_PN} you should add the following line to ~/.bashrc :"
-	elog
-	elog "alias startOF$(delete_all_version_separators ${MY_PV})='source ${INSDIR}/etc/bashrc'"
-	elog
-	elog "And everytime you want to use OpenFOAM you have to execute startOF$(delete_all_version_separators ${MY_PV})"
-	ewarn
-	ewarn "FoamX is deprecated since ${MY_PN}-1.5! "
-	ewarn
-}
-
-src_configure() {
-	if has_version sys-cluster/mpich2 ; then
-		export WM_MPLIB=MPICH
-	elif has_version sys-cluster/openmpi ; then
-		export WM_MPLIB=OPENMPI
-	else
-		die "You need one of the following mpi implementations: openmpi or mpich2"
-	fi
-
-	sed -i -e "s|WM_MPLIB:=OPENMPI|WM_MPLIB:="${WM_MPLIB}"|" etc/bashrc
-	sed -i -e "s|setenv WM_MPLIB OPENMPI|setenv WM_MPLIB "${WM_MPLIB}"|" etc/cshrc
-
-	sed -i -e "s|^foamInstall=\$HOME|foamInstall=/usr/$(get_libdir)|" etc/bashrc
-	sed -i -e "s|^set foamInstall = \$HOME|set foamInstall = /usr/$(get_libdir)|" etc/cshrc
-}
-
-src_compile() {
-	export WM_NCOMPPROCS=$(makeopts_jobs)
-
-	export FOAM_INST_DIR=${WORKDIR}
-	source etc/bashrc
-
-	find wmake -name dirToString -exec rm -rf {} +
-	find wmake -name wmkdep -exec rm -rf {}+
-
-	if use doc ; then
-		./Allwmake doc || die "could not build"
-	else
-		./Allwmake || die "could not build"
-	fi
-}
-
-src_test() {
-	cd bin
-	./foamInstallationTest
-}
-
-src_install() {
-	insinto ${INSDIR}
-	doins -r etc
-
-	use examples && doins -r tutorials
-
-	use src && doins -r src
-
-	insopts -m0755
-	doins -r bin applications platforms wmake
-
-	dodoc README.html doc/Guides-a4/*.pdf
-
-	if use doc ; then
-		dohtml -r doc/Doxygen
-	fi
-}
diff --git a/sci-libs/openfoam/openfoam-2.2.2.ebuild b/sci-libs/openfoam/openfoam-2.2.2.ebuild
deleted file mode 100644
index 711bb0042fcd..000000000000
--- a/sci-libs/openfoam/openfoam-2.2.2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils versionator multilib toolchain-funcs multiprocessing
-
-MY_PN="OpenFOAM"
-MY_PV=$(get_version_component_range 1-2)
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Open Field Operation and Manipulation - CFD Simulation Toolbox"
-HOMEPAGE="http://www.openfoam.org"
-SRC_URI="http://downloads.sourceforge.net/foam/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="2.2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples opendx src"
-
-RDEPEND="!=sci-libs/openfoam-bin-${MY_PV}*
-	!=sci-libs/openfoam-kernel-${MY_PV}*
-	!=sci-libs/openfoam-meta-${MY_PV}*
-	!=sci-libs/openfoam-solvers-${MY_PV}*
-	!=sci-libs/openfoam-utilities-${MY_PV}*
-	!=sci-libs/openfoam-wmake-${MY_PV}*
-	sci-libs/parmetis
-	sci-libs/parmgridgen
-	sci-libs/scotch
-	virtual/mpi
-	opendx? ( sci-visualization/opendx )"
-DEPEND="${DEPEND}
-	doc? ( app-doc/doxygen[dot] )"
-
-S=${WORKDIR}/${MY_P}
-INSDIR="/usr/$(get_libdir)/${MY_PN}/${MY_P}"
-
-pkg_setup() {
-	# just to be sure the right profile is selected (gcc-config)
-	if ! version_is_at_least 4.3 $(gcc-version) ; then
-		die "${PN} requires >=sys-devel/gcc-4.3 to compile."
-	fi
-
-	elog
-	elog "In order to use ${MY_PN} you should add the following line to ~/.bashrc :"
-	elog
-	elog "alias startOF$(delete_all_version_separators ${MY_PV})='source ${INSDIR}/etc/bashrc'"
-	elog
-	elog "And everytime you want to use OpenFOAM you have to execute startOF$(delete_all_version_separators ${MY_PV})"
-	ewarn
-	ewarn "FoamX is deprecated since ${MY_PN}-1.5! "
-	ewarn
-}
-
-src_configure() {
-	if has_version sys-cluster/mpich2 ; then
-		export WM_MPLIB=MPICH
-	elif has_version sys-cluster/openmpi ; then
-		export WM_MPLIB=OPENMPI
-	else
-		die "You need one of the following mpi implementations: openmpi or mpich2"
-	fi
-
-	sed -i -e "s|WM_MPLIB:=OPENMPI|WM_MPLIB:="${WM_MPLIB}"|" etc/bashrc
-	sed -i -e "s|setenv WM_MPLIB OPENMPI|setenv WM_MPLIB "${WM_MPLIB}"|" etc/cshrc
-
-	sed -i -e "s|^foamInstall=\$HOME|foamInstall=/usr/$(get_libdir)|" etc/bashrc
-	sed -i -e "s|^set foamInstall = \$HOME|set foamInstall = /usr/$(get_libdir)|" etc/cshrc
-}
-
-src_compile() {
-	export WM_NCOMPPROCS=$(makeopts_jobs)
-
-	export FOAM_INST_DIR=${WORKDIR}
-	source etc/bashrc
-
-	find wmake -name dirToString -exec rm -rf {} +
-	find wmake -name wmkdep -exec rm -rf {}+
-
-	if use doc ; then
-		./Allwmake doc || die "could not build"
-	else
-		./Allwmake || die "could not build"
-	fi
-}
-
-src_test() {
-	cd bin
-	./foamInstallationTest
-}
-
-src_install() {
-	insinto ${INSDIR}
-	doins -r etc
-
-	use examples && doins -r tutorials
-
-	use src && doins -r src
-
-	insopts -m0755
-	doins -r bin applications platforms wmake
-
-	dodoc README.html doc/Guides-a4/*.pdf
-
-	if use doc ; then
-		dohtml -r doc/Doxygen
-	fi
-}
diff --git a/sci-libs/openfoam/openfoam-2.3.0-r1.ebuild b/sci-libs/openfoam/openfoam-2.3.0-r1.ebuild
deleted file mode 100644
index 0935f6953805..000000000000
--- a/sci-libs/openfoam/openfoam-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils versionator multilib toolchain-funcs multiprocessing
-
-MY_PN="OpenFOAM"
-MY_PV=$(get_version_component_range 1-2)
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Open Field Operation and Manipulation - CFD Simulation Toolbox"
-HOMEPAGE="http://www.openfoam.org"
-SRC_URI="http://downloads.sourceforge.net/foam/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="2.3"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples opendx src"
-
-RDEPEND="!=sci-libs/openfoam-bin-${MY_PV}*
-	!=sci-libs/openfoam-kernel-${MY_PV}*
-	!=sci-libs/openfoam-meta-${MY_PV}*
-	!=sci-libs/openfoam-solvers-${MY_PV}*
-	!=sci-libs/openfoam-utilities-${MY_PV}*
-	!=sci-libs/openfoam-wmake-${MY_PV}*
-	sci-libs/parmetis
-	sci-libs/parmgridgen
-	sci-libs/scotch
-	virtual/mpi
-	opendx? ( sci-visualization/opendx )"
-DEPEND="${DEPEND}
-	doc? ( app-doc/doxygen[dot] )"
-
-S=${WORKDIR}/${MY_P}
-INSDIR="/usr/$(get_libdir)/${MY_PN}/${MY_P}"
-
-pkg_setup() {
-	# just to be sure the right profile is selected (gcc-config)
-	if ! version_is_at_least 4.3 $(gcc-version) ; then
-		die "${PN} requires >=sys-devel/gcc-4.3 to compile."
-	fi
-
-	elog
-	elog "In order to use ${MY_PN} you should add the following line to ~/.bashrc :"
-	elog
-	elog "alias startOF$(delete_all_version_separators ${MY_PV})='source ${INSDIR}/etc/bashrc'"
-	elog
-	elog "And everytime you want to use OpenFOAM you have to execute startOF$(delete_all_version_separators ${MY_PV})"
-	ewarn
-	ewarn "FoamX is deprecated since ${MY_PN}-1.5! "
-	ewarn
-}
-
-src_configure() {
-	if has_version sys-cluster/mpich2 ; then
-		export WM_MPLIB=MPICH
-	elif has_version sys-cluster/openmpi ; then
-		export WM_MPLIB=OPENMPI
-	else
-		die "You need one of the following mpi implementations: openmpi or mpich2"
-	fi
-
-	sed -i -e "s|WM_MPLIB:=OPENMPI|WM_MPLIB:="${WM_MPLIB}"|" etc/bashrc
-	sed -i -e "s|setenv WM_MPLIB OPENMPI|setenv WM_MPLIB "${WM_MPLIB}"|" etc/cshrc
-
-	sed -i -e "s|^foamInstall=\$HOME|foamInstall=/usr/$(get_libdir)|" etc/bashrc
-	sed -i -e "s|^set foamInstall = \$HOME|set foamInstall = /usr/$(get_libdir)|" etc/cshrc
-
-	sed -i -e 's|^export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName|export ParaView_DIR=/usr|' etc/config/paraview.sh
-	sed -i -e 's|^setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName|setenv ParaView_DIR /usr|' etc/config/paraview.csh
-}
-
-src_compile() {
-	export WM_NCOMPPROCS=$(makeopts_jobs)
-
-	export FOAM_INST_DIR=${WORKDIR}
-	source etc/bashrc
-
-	find wmake -name dirToString -exec rm -rf {} +
-	find wmake -name wmkdep -exec rm -rf {}+
-
-	./Allwmake || die "could not build"
-	if use doc ; then
-		doc/Allwmake || die "could not build"
-	fi
-}
-
-# Doesn't do anything sane
-#src_test() {
-#	cd bin
-#	./foamInstallationTest
-#}
-
-src_install() {
-	insinto ${INSDIR}
-	doins -r etc
-
-	use examples && doins -r tutorials
-
-	use src && doins -r src
-
-	insopts -m0755
-	doins -r bin applications platforms wmake
-
-	dodoc README.html doc/Guides-a4/*.pdf
-
-	if use doc ; then
-		dohtml -r doc/Doxygen
-	fi
-}
diff --git a/sci-libs/openfoam/openfoam-2.3.1-r1.ebuild b/sci-libs/openfoam/openfoam-2.3.1-r1.ebuild
deleted file mode 100644
index 9ed9cb2b0907..000000000000
--- a/sci-libs/openfoam/openfoam-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils versionator multilib toolchain-funcs multiprocessing
-
-MY_PN="OpenFOAM"
-MY_PV=$(get_version_component_range 1-2)
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Open Field Operation and Manipulation - CFD Simulation Toolbox"
-HOMEPAGE="http://www.openfoam.org"
-SRC_URI="http://downloads.sourceforge.net/foam/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="2.3"
-KEYWORDS="amd64 x86"
-IUSE="doc examples opendx src"
-
-RDEPEND="!=sci-libs/openfoam-bin-${MY_PV}*
-	!=sci-libs/openfoam-kernel-${MY_PV}*
-	!=sci-libs/openfoam-meta-${MY_PV}*
-	!=sci-libs/openfoam-solvers-${MY_PV}*
-	!=sci-libs/openfoam-utilities-${MY_PV}*
-	!=sci-libs/openfoam-wmake-${MY_PV}*
-	sci-libs/parmetis
-	sci-libs/parmgridgen
-	sci-libs/scotch
-	virtual/mpi
-	opendx? ( sci-visualization/opendx )"
-DEPEND="${DEPEND}
-	doc? ( app-doc/doxygen[dot] )"
-
-S=${WORKDIR}/${MY_P}
-INSDIR="/usr/$(get_libdir)/${MY_PN}/${MY_P}"
-
-pkg_setup() {
-	# just to be sure the right profile is selected (gcc-config)
-	if ! version_is_at_least 4.3 $(gcc-version) ; then
-		die "${PN} requires >=sys-devel/gcc-4.3 to compile."
-	fi
-
-	elog
-	elog "In order to use ${MY_PN} you should add the following line to ~/.bashrc :"
-	elog
-	elog "alias startOF$(delete_all_version_separators ${MY_PV})='source ${INSDIR}/etc/bashrc'"
-	elog
-	elog "And everytime you want to use OpenFOAM you have to execute startOF$(delete_all_version_separators ${MY_PV})"
-	ewarn
-	ewarn "FoamX is deprecated since ${MY_PN}-1.5! "
-	ewarn
-}
-
-src_configure() {
-	if has_version sys-cluster/mpich2 ; then
-		export WM_MPLIB=MPICH
-	elif has_version sys-cluster/openmpi ; then
-		export WM_MPLIB=OPENMPI
-	else
-		die "You need one of the following mpi implementations: openmpi or mpich2"
-	fi
-
-	sed -i -e "s|WM_MPLIB:=OPENMPI|WM_MPLIB:="${WM_MPLIB}"|" etc/bashrc
-	sed -i -e "s|setenv WM_MPLIB OPENMPI|setenv WM_MPLIB "${WM_MPLIB}"|" etc/cshrc
-
-	sed -i -e "s|^foamInstall=\$HOME|foamInstall=/usr/$(get_libdir)|" etc/bashrc
-	sed -i -e "s|^set foamInstall = \$HOME|set foamInstall = /usr/$(get_libdir)|" etc/cshrc
-
-	sed -i -e 's|^export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName|export ParaView_DIR=/usr|' etc/config/paraview.sh
-	sed -i -e 's|^setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName|setenv ParaView_DIR /usr|' etc/config/paraview.csh
-}
-
-src_compile() {
-	export WM_NCOMPPROCS=$(makeopts_jobs)
-
-	export FOAM_INST_DIR=${WORKDIR}
-	source etc/bashrc
-
-	find wmake -name dirToString -exec rm -rf {} +
-	find wmake -name wmkdep -exec rm -rf {}+
-
-	./Allwmake || die "could not build"
-	if use doc ; then
-		doc/Allwmake || die "could not build"
-	fi
-}
-
-# Doesn't do anything sane
-#src_test() {
-#	cd bin
-#	./foamInstallationTest
-#}
-
-src_install() {
-	insinto ${INSDIR}
-	doins -r etc
-
-	use examples && doins -r tutorials
-
-	use src && doins -r src
-
-	insopts -m0755
-	doins -r bin applications platforms wmake
-
-	dodoc README.html doc/Guides-a4/*.pdf
-
-	if use doc ; then
-		dohtml -r doc/Doxygen
-	fi
-}
diff --git a/sci-libs/openfoam/openfoam-2.4.0-r1.ebuild b/sci-libs/openfoam/openfoam-2.4.0-r1.ebuild
deleted file mode 100644
index 67bda192d50c..000000000000
--- a/sci-libs/openfoam/openfoam-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils versionator multilib toolchain-funcs multiprocessing
-
-MY_PN="OpenFOAM"
-MY_PV=$(get_version_component_range 1-2)
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Open Field Operation and Manipulation - CFD Simulation Toolbox"
-HOMEPAGE="http://www.openfoam.org"
-SRC_URI="http://downloads.sourceforge.net/foam/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="2.4"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples opendx src paraview"
-
-RDEPEND="!=sci-libs/openfoam-bin-${MY_PV}*
-	!=sci-libs/openfoam-kernel-${MY_PV}*
-	!=sci-libs/openfoam-meta-${MY_PV}*
-	!=sci-libs/openfoam-solvers-${MY_PV}*
-	!=sci-libs/openfoam-utilities-${MY_PV}*
-	!=sci-libs/openfoam-wmake-${MY_PV}*
-	sci-mathematics/cgal
-	sci-libs/parmetis
-	sci-libs/parmgridgen
-	sci-libs/scotch
-	virtual/mpi
-	opendx? ( sci-visualization/opendx )
-	paraview? ( sci-visualization/paraview[development] )"
-DEPEND="${DEPEND}
-	doc? ( app-doc/doxygen[dot] )"
-
-S=${WORKDIR}/${MY_P}
-INSDIR="/usr/$(get_libdir)/${MY_PN}/${MY_P}"
-
-pkg_setup() {
-	# just to be sure the right profile is selected (gcc-config)
-	if ! version_is_at_least 4.3 $(gcc-version) ; then
-		die "${PN} requires >=sys-devel/gcc-4.3 to compile."
-	fi
-
-	elog
-	elog "In order to use ${MY_PN} you should add the following line to ~/.bashrc :"
-	elog
-	elog "alias startOF$(delete_all_version_separators ${MY_PV})='source ${INSDIR}/etc/bashrc'"
-	elog
-	elog "And everytime you want to use OpenFOAM you have to execute startOF$(delete_all_version_separators ${MY_PV})"
-	ewarn
-	ewarn "FoamX is deprecated since ${MY_PN}-1.5! "
-	ewarn
-}
-
-src_configure() {
-	if has_version sys-cluster/mpich2 ; then
-		export WM_MPLIB=MPICH
-	elif has_version sys-cluster/openmpi ; then
-		export WM_MPLIB=OPENMPI
-	else
-		die "You need one of the following mpi implementations: openmpi or mpich2"
-	fi
-
-	sed -i -e "s|WM_MPLIB:=OPENMPI|WM_MPLIB:="${WM_MPLIB}"|" etc/bashrc
-	sed -i -e "s|setenv WM_MPLIB OPENMPI|setenv WM_MPLIB "${WM_MPLIB}"|" etc/cshrc
-
-	sed -i -e "s|^foamInstall=\$HOME|foamInstall=/usr/$(get_libdir)|" etc/bashrc
-	sed -i -e "s|^set foamInstall = \$HOME|set foamInstall = /usr/$(get_libdir)|" etc/cshrc
-
-	sed -i -e 's|^export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName|export ParaView_DIR=/usr|' etc/config/paraview.sh
-	sed -i -e 's|^setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName|setenv ParaView_DIR /usr|' etc/config/paraview.csh
-}
-
-src_compile() {
-	export WM_NCOMPPROCS=$(makeopts_jobs)
-
-	export FOAM_INST_DIR=${WORKDIR}
-	source etc/bashrc
-
-	find wmake -name dirToString -exec rm -rf {} +
-	find wmake -name wmkdep -exec rm -rf {}+
-
-	./Allwmake || die "could not build"
-	if use doc ; then
-		doc/Allwmake || die "could not build"
-	fi
-}
-
-# Doesn't do anything sane
-#src_test() {
-#	cd bin
-#	./foamInstallationTest
-#}
-
-src_install() {
-	insinto ${INSDIR}
-	doins -r etc
-
-	use examples && doins -r tutorials
-
-	use src && doins -r src
-
-	insopts -m0755
-	doins -r bin applications platforms wmake
-
-	dodoc README.html doc/Guides-a4/*.pdf
-
-	if use doc ; then
-		dohtml -r doc/Doxygen
-	fi
-}
diff --git a/sci-libs/parmgridgen/Manifest b/sci-libs/parmgridgen/Manifest
deleted file mode 100644
index fd2e63752c41..000000000000
--- a/sci-libs/parmgridgen/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX parmgridgen-1.0-as-needed.patch 985 BLAKE2B 8e01377fd8fa74af161a2fd9582d1faa16915e4a221ba51dc43f521b821d362063ca6c84ea808bdd63acf849515bd8951a1b943b8c73b6164a89f4adf59a5ce9 SHA512 1fabedd43c4aa0bd58fcd8815fbe13d9a5ff6e7dfacee5f4858a46f1ea5125cc628689ed66c111b05e388ed2f04b602ed09b6c9cc9d6e3512b9f612242ca2cbd
-AUX parmgridgen-1.0-autotools.patch 15980 BLAKE2B 17ad43d00cc80bc699e8434b2c5d8801dc8c0d22217a0207956a935d84497ab29a75e919895490662d11ac9a409d3d37c2e72f2117166c8a3f01db7768161f30 SHA512 d12a553ccf76d1e142d5cbf7687d7e38050684b2f86aeafa812447dae5d629f77000d6c95a87d641683677d08ca5061ce047e0e7071aae8558b172db6f36ce37
-AUX parmgridgen-1.0-format-security.patch 1338 BLAKE2B 2b857f31ecb59afc9bb52272283dc6c7db9915e7fa3c9f4386abdb21f0f3965b099f360e843c164fedcecf4c090ef37d056c2959d07983be696324edc862a0db SHA512 5f7e3e2417f6764e8faa4c5db89d317ea741be14f3051ac3ba1f99b31cc48fab534d14f2c2d2f6fc240f5352c1f82c31fdecc3eea5ca99812fbc7fd332c24033
-AUX parmgridgen-1.0-impl-fct.patch 2207 BLAKE2B c9665f969730628a8811f24b5c5d8ce43cbc5c202ec4d277bdf770760f0cbdeaf5a4cef7ac94a52b3d04666b4e48911e39e49c917b40d56fe1344cfa82a76f2f SHA512 078690430ffefcc56a3f84942ee49e06663b1be995ba8be5755930e5bf1eb76fdaaf27eb1756474911ad9ada2250f3bf3ecfff9de240e2142cd5ea46083f001d
-DIST ParMGridGen-1.0.tar.gz 2623528 BLAKE2B 982e6d7a0df3b9c101993ecf397c75f10d0cf390914ccca6f02efbe5ae190c65bc31e5770bd57ff375a8e3a3aab878c56da50af4f3e5f0f422044137d90ddff8 SHA512 e12ea3c923dd900c92ba4f2639daacc6c3596c5ea3c8d366b269c4c21247b10e6400c384321cfc65b486e4f8217dcd43f43eee27570b1fe1375deb02e255cb16
-EBUILD parmgridgen-1.0-r1.ebuild 881 BLAKE2B 20fff01c994d7baa7dc7a9991b29a19531addb23d5a36d07ce73fe9ce7762e55632f85b200f83c490c53790e51ff8d2d967eae96825d8b73479dce13dca978c7 SHA512 c64f85a46d02e6ccee978c17ef0401a900c82650431691c9e8d19e1f29998e8926d3be825b1452cb97ed90e4fca443e9a3138d668375eb9867bd5e8be970f910
-MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/sci-libs/parmgridgen/files/parmgridgen-1.0-as-needed.patch b/sci-libs/parmgridgen/files/parmgridgen-1.0-as-needed.patch
deleted file mode 100644
index 3b378552fab7..000000000000
--- a/sci-libs/parmgridgen/files/parmgridgen-1.0-as-needed.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/MGridGen/Lib/Makefile.am	2009-03-10 09:28:13.000000000 +0200
-+++ b/MGridGen/Lib/Makefile.am	2009-03-10 09:28:07.000000000 +0200
-@@ -8,3 +8,5 @@
- lib_LTLIBRARIES = libMGridGen.la
- libMGridGen_la_SOURCES = aratio.c  coarsen.c  kwayfm.c  match.c  merge.c  mgridgen.c  refine.c  setup.c
- libMGridGen_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0
-+
-+libMGridGen_la_LIBADD = ../IMlib/libIMlib.la
---- a/ParMGridGen/ParLib/Makefile.am	2009-03-10 09:31:43.000000000 +0200
-+++ b/ParMGridGen/ParLib/Makefile.am	2009-03-10 09:35:13.000000000 +0200
-@@ -8,3 +8,8 @@
- lib_LTLIBRARIES = libParMGridGen.la
- libParMGridGen_la_SOURCES = comm.c  debug.c  grsetup.c  ikeysort.c  memory.c  move.c  parmgridgen.c  setup.c  util.c
- libParMGridGen_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0
-+
-+libParMGridGen_la_LIBADD = \
-+	$(top_builddir)/MGridGen/IMlib/libIMlib.la \
-+	$(top_builddir)/MGridGen/Lib/libMGridGen.la \
-+	../IMParMetis-2.0/ParMETISLib/libIMparmetis.la
diff --git a/sci-libs/parmgridgen/files/parmgridgen-1.0-autotools.patch b/sci-libs/parmgridgen/files/parmgridgen-1.0-autotools.patch
deleted file mode 100644
index 1615f2232e5d..000000000000
--- a/sci-libs/parmgridgen/files/parmgridgen-1.0-autotools.patch
+++ /dev/null
@@ -1,460 +0,0 @@
-From bbed136f01cd384bc4083aaca1761be9ee2d2a79 Mon Sep 17 00:00:00 2001
-From: Justin Lecher <jlec@gentoo.org>
-Date: Mon, 18 Dec 2017 18:30:09 +0000
-Subject: [PATCH] autotools support
-
-Signed-off-by: Justin Lecher <jlec@gentoo.org>
----
- MGridGen/IMlib/Makefile.am                         |   8 +
- MGridGen/Lib/Makefile.am                           |  10 ++
- MGridGen/Makefile.am                               |   4 +
- MGridGen/Programs/Makefile.am                      |   7 +
- Makefile.am                                        |   7 +
- ParMGridGen/IMParMetis-2.0/Makefile.am             |   4 +
- ParMGridGen/IMParMetis-2.0/ParMETISLib/Makefile.am |   8 +
- ParMGridGen/Makefile.am                            |   4 +
- ParMGridGen/ParLib/Makefile.am                     |  10 ++
- ParMGridGen/Programs/Makefile.am                   |  21 +++
- acx_mpi.m4                                         | 181 +++++++++++++++++++++
- configure.ac                                       |  24 +++
- mgridgen.h                                         |   7 -
- mgridgen.pc.in                                     |  10 ++
- parmgridgen.h                                      |   5 -
- parmgridgen.pc.in                                  |  10 ++
- 16 files changed, 308 insertions(+), 12 deletions(-)
- create mode 100644 MGridGen/IMlib/Makefile.am
- create mode 100644 MGridGen/Lib/Makefile.am
- create mode 100644 MGridGen/Makefile.am
- create mode 100644 MGridGen/Programs/Makefile.am
- create mode 100644 Makefile.am
- create mode 100644 ParMGridGen/IMParMetis-2.0/Makefile.am
- create mode 100644 ParMGridGen/IMParMetis-2.0/ParMETISLib/Makefile.am
- create mode 100644 ParMGridGen/Makefile.am
- create mode 100644 ParMGridGen/ParLib/Makefile.am
- create mode 100644 ParMGridGen/Programs/Makefile.am
- create mode 100644 acx_mpi.m4
- create mode 100644 configure.ac
- delete mode 100644 mgridgen.h
- create mode 100644 mgridgen.pc.in
- delete mode 100644 parmgridgen.h
- create mode 100644 parmgridgen.pc.in
-
-diff --git a/MGridGen/IMlib/Makefile.am b/MGridGen/IMlib/Makefile.am
-new file mode 100644
-index 0000000..008c259
---- /dev/null
-+++ b/MGridGen/IMlib/Makefile.am
-@@ -0,0 +1,8 @@
-+## Source directory
-+
-+pkginclude_HEADERS = IMlib.h
-+pkgincludedir = $(includedir)/mgridgen
-+
-+lib_LTLIBRARIES = libIMlib.la
-+libIMlib_la_SOURCES = blas.c  dfkeysort.c  dkeysort.c  file.c  ifkeysort.c  ifloatsort.c  iintsort.c  ikeysort.c  memory.c  sort.c  util.c
-+libIMlib_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0
-diff --git a/MGridGen/Lib/Makefile.am b/MGridGen/Lib/Makefile.am
-new file mode 100644
-index 0000000..39946b0
---- /dev/null
-+++ b/MGridGen/Lib/Makefile.am
-@@ -0,0 +1,10 @@
-+## Source directory
-+
-+INCLUDES = -I../IMlib
-+
-+pkginclude_HEADERS = defs.h  macros.h  mgridgen.h  proto.h  struct.h
-+pkgincludedir = $(includedir)/mgridgen
-+
-+lib_LTLIBRARIES = libMGridGen.la
-+libMGridGen_la_SOURCES = aratio.c  coarsen.c  kwayfm.c  match.c  merge.c  mgridgen.c  refine.c  setup.c
-+libMGridGen_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0
-diff --git a/MGridGen/Makefile.am b/MGridGen/Makefile.am
-new file mode 100644
-index 0000000..040d716
---- /dev/null
-+++ b/MGridGen/Makefile.am
-@@ -0,0 +1,4 @@
-+## middle directory
-+
-+#Build in these directories:
-+SUBDIRS= IMlib Lib Programs
-diff --git a/MGridGen/Programs/Makefile.am b/MGridGen/Programs/Makefile.am
-new file mode 100644
-index 0000000..3fe9ba5
---- /dev/null
-+++ b/MGridGen/Programs/Makefile.am
-@@ -0,0 +1,7 @@
-+## Source directory
-+
-+INCLUDES = -I../IMlib -I../Lib
-+
-+bin_PROGRAMS = mgridgen
-+mgridgen_SOURCES = io.c mgridgen.c
-+mgridgen_LDADD = ../IMlib/libIMlib.la ../Lib/libMGridGen.la -lm
-diff --git a/Makefile.am b/Makefile.am
-new file mode 100644
-index 0000000..f97504c
---- /dev/null
-+++ b/Makefile.am
-@@ -0,0 +1,7 @@
-+## top directory
-+
-+SUBDIRS = MGridGen ParMGridGen
-+EXTRA_DIST = VERSION mgridgen.pc.in parmgridgen.pc.in
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = mgridgen.pc parmgridgen.pc
-diff --git a/ParMGridGen/IMParMetis-2.0/Makefile.am b/ParMGridGen/IMParMetis-2.0/Makefile.am
-new file mode 100644
-index 0000000..3fa93db
---- /dev/null
-+++ b/ParMGridGen/IMParMetis-2.0/Makefile.am
-@@ -0,0 +1,4 @@
-+## middle directory
-+
-+#Build in these directories:
-+SUBDIRS= ParMETISLib
-diff --git a/ParMGridGen/IMParMetis-2.0/ParMETISLib/Makefile.am b/ParMGridGen/IMParMetis-2.0/ParMETISLib/Makefile.am
-new file mode 100644
-index 0000000..c4d6e33
---- /dev/null
-+++ b/ParMGridGen/IMParMetis-2.0/ParMETISLib/Makefile.am
-@@ -0,0 +1,8 @@
-+## Source directory
-+
-+pkginclude_HEADERS = defs.h  macros.h  parmetis.h  proto.h  rename.h  struct.h
-+pkgincludedir = $(includedir)/imparmetis
-+
-+lib_LTLIBRARIES = libIMparmetis.la
-+libIMparmetis_la_SOURCES = coarsen.c  comm.c  debug.c  diffuse.c  drivers.c  edge_refine.c  fused.c  grsetup.c  iidxsort.c  ikeysort.c  memory.c  remap.c  setup.c  timer.c  util.c  var.c
-+libIMparmetis_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0
-diff --git a/ParMGridGen/Makefile.am b/ParMGridGen/Makefile.am
-new file mode 100644
-index 0000000..0743f65
---- /dev/null
-+++ b/ParMGridGen/Makefile.am
-@@ -0,0 +1,4 @@
-+## middle directory
-+
-+#Build in these directories:
-+SUBDIRS= IMParMetis-2.0 ParLib Programs
-diff --git a/ParMGridGen/ParLib/Makefile.am b/ParMGridGen/ParLib/Makefile.am
-new file mode 100644
-index 0000000..78d03d9
---- /dev/null
-+++ b/ParMGridGen/ParLib/Makefile.am
-@@ -0,0 +1,10 @@
-+## Source directory
-+
-+INCLUDES = -I$(top_builddir)/MGridGen/IMlib
-+
-+pkginclude_HEADERS = defs.h  macros.h  parmgridgen.h  proto.h  rename.h  struct.h
-+pkgincludedir = $(includedir)/parmgridgen
-+
-+lib_LTLIBRARIES = libParMGridGen.la
-+libParMGridGen_la_SOURCES = comm.c  debug.c  grsetup.c  ikeysort.c  memory.c  move.c  parmgridgen.c  setup.c  util.c
-+libParMGridGen_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0
-diff --git a/ParMGridGen/Programs/Makefile.am b/ParMGridGen/Programs/Makefile.am
-new file mode 100644
-index 0000000..0d586ee
---- /dev/null
-+++ b/ParMGridGen/Programs/Makefile.am
-@@ -0,0 +1,21 @@
-+## Source directory
-+
-+INCLUDES = -I../ParLib -I$(top_builddir)/MGridGen/IMlib
-+
-+bin_PROGRAMS = parmgridgen
-+parmgridgen_SOURCES = io.c  main.c  parmgridgen.c
-+parmgridgen_LDADD = ../IMParMetis-2.0/ParMETISLib/libIMparmetis.la ../ParLib/libParMGridGen.la \
-+	$(top_builddir)/MGridGen/IMlib/libIMlib.la $(top_builddir)/MGridGen/Lib/libMGridGen.la @MPILIBS@
-+
-+# AM_CPPFLAGS = -I$(top_srcdir)/ParMETISLib
-+# LDADD = $(top_builddir)/METISLib/libmetis.la \
-+# 	$(top_builddir)/ParMETISLib/libparmetis.la
-+
-+# check_PROGRAMS = parmgridgen
-+# parmgridgen_SOURCES = io.c  main.c  parmgridgen.c
-+
-+MPIRUN = mpirun -np 4
-+
-+check-local: $(check_PROGRAMS)
-+	$(MPIRUN) parmgridgen $(top_builddir)/Graphs/M6.metis 3 4 6 1 4 128
-+
-diff --git a/acx_mpi.m4 b/acx_mpi.m4
-new file mode 100644
-index 0000000..bb2cb31
---- /dev/null
-+++ b/acx_mpi.m4
-@@ -0,0 +1,181 @@
-+# ===========================================================================
-+#                http://autoconf-archive.cryp.to/acx_mpi.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+#   ACX_MPI([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-+#
-+# DESCRIPTION
-+#
-+#   This macro tries to find out how to compile programs that use MPI
-+#   (Message Passing Interface), a standard API for parallel process
-+#   communication (see http://www-unix.mcs.anl.gov/mpi/)
-+#
-+#   On success, it sets the MPICC, MPICXX, MPIF77, or MPIFC output variable
-+#   to the name of the MPI compiler, depending upon the current language.
-+#   (This may just be $CC/$CXX/$F77/$FC, but is more often something like
-+#   mpicc/mpiCC/mpif77/mpif90.) It also sets MPILIBS to any libraries that
-+#   are needed for linking MPI (e.g. -lmpi or -lfmpi, if a special
-+#   MPICC/MPICXX/MPIF77/MPIFC was not found).
-+#
-+#   If you want to compile everything with MPI, you should set:
-+#
-+#       CC="MPICC" #OR# CXX="MPICXX" #OR# F77="MPIF77" #OR# FC="MPIFC"
-+#       LIBS="$MPILIBS $LIBS"
-+#
-+#   NOTE: The above assumes that you will use $CC (or whatever) for linking
-+#   as well as for compiling. (This is the default for automake and most
-+#   Makefiles.)
-+#
-+#   The user can force a particular library/compiler by setting the
-+#   MPICC/MPICXX/MPIF77/MPIFC and/or MPILIBS environment variables.
-+#
-+#   ACTION-IF-FOUND is a list of shell commands to run if an MPI library is
-+#   found, and ACTION-IF-NOT-FOUND is a list of commands to run if it is not
-+#   found. If ACTION-IF-FOUND is not specified, the default action will
-+#   define HAVE_MPI.
-+#
-+# LAST MODIFICATION
-+#
-+#   2008-04-12
-+#
-+# COPYLEFT
-+#
-+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-+#   Copyright (c) 2008 Julian C. Cummings <cummings@cacr.caltech.edu>
-+#
-+#   This program is free software: you can redistribute it and/or modify it
-+#   under the terms of the GNU General Public License as published by the
-+#   Free Software Foundation, either version 3 of the License, or (at your
-+#   option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful, but
-+#   WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-+#   Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License along
-+#   with this program. If not, see <http://www.gnu.org/licenses/>.
-+#
-+#   As a special exception, the respective Autoconf Macro's copyright owner
-+#   gives unlimited permission to copy, distribute and modify the configure
-+#   scripts that are the output of Autoconf when processing the Macro. You
-+#   need not follow the terms of the GNU General Public License when using
-+#   or distributing such scripts, even though portions of the text of the
-+#   Macro appear in them. The GNU General Public License (GPL) does govern
-+#   all other use of the material that constitutes the Autoconf Macro.
-+#
-+#   This special exception to the GPL applies to versions of the Autoconf
-+#   Macro released by the Autoconf Macro Archive. When you make and
-+#   distribute a modified version of the Autoconf Macro, you may extend this
-+#   special exception to the GPL to apply to your modified version as well.
-+
-+AC_DEFUN([ACX_MPI], [
-+AC_PREREQ(2.50) dnl for AC_LANG_CASE
-+
-+AC_LANG_CASE([C], [
-+	AC_REQUIRE([AC_PROG_CC])
-+	AC_ARG_VAR(MPICC,[MPI C compiler command])
-+	AC_CHECK_PROGS(MPICC, mpicc hcc mpxlc_r mpxlc mpcc cmpicc, $CC)
-+	acx_mpi_save_CC="$CC"
-+	CC="$MPICC"
-+	AC_SUBST(MPICC)
-+],
-+[C++], [
-+	AC_REQUIRE([AC_PROG_CXX])
-+	AC_ARG_VAR(MPICXX,[MPI C++ compiler command])
-+	AC_CHECK_PROGS(MPICXX, mpic++ mpicxx mpiCC hcp mpxlC_r mpxlC mpCC cmpic++, $CXX)
-+	acx_mpi_save_CXX="$CXX"
-+	CXX="$MPICXX"
-+	AC_SUBST(MPICXX)
-+],
-+[Fortran 77], [
-+	AC_REQUIRE([AC_PROG_F77])
-+	AC_ARG_VAR(MPIF77,[MPI Fortran 77 compiler command])
-+	AC_CHECK_PROGS(MPIF77, mpif77 hf77 mpxlf_r mpxlf mpf77 cmpifc, $F77)
-+	acx_mpi_save_F77="$F77"
-+	F77="$MPIF77"
-+	AC_SUBST(MPIF77)
-+],
-+[Fortran], [
-+	AC_REQUIRE([AC_PROG_FC])
-+	AC_ARG_VAR(MPIFC,[MPI Fortran compiler command])
-+	AC_CHECK_PROGS(MPIFC, mpif90 mpxlf95_r mpxlf90_r mpxlf95 mpxlf90 mpf90 cmpif90c, $FC)
-+	acx_mpi_save_FC="$FC"
-+	FC="$MPIFC"
-+	AC_SUBST(MPIFC)
-+])
-+
-+if test x = x"$MPILIBS"; then
-+	AC_LANG_CASE([C], [AC_CHECK_FUNC(MPI_Init, [MPILIBS=" "])],
-+		[C++], [AC_CHECK_FUNC(MPI_Init, [MPILIBS=" "])],
-+		[Fortran 77], [AC_MSG_CHECKING([for MPI_Init])
-+			AC_LINK_IFELSE([AC_LANG_PROGRAM([],[      call MPI_Init])],[MPILIBS=" "
-+				AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])],
-+		[Fortran], [AC_MSG_CHECKING([for MPI_Init])
-+			AC_LINK_IFELSE([AC_LANG_PROGRAM([],[      call MPI_Init])],[MPILIBS=" "
-+				AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])])
-+fi
-+AC_LANG_CASE([Fortran 77], [
-+	if test x = x"$MPILIBS"; then
-+		AC_CHECK_LIB(fmpi, MPI_Init, [MPILIBS="-lfmpi"])
-+	fi
-+	if test x = x"$MPILIBS"; then
-+		AC_CHECK_LIB(fmpich, MPI_Init, [MPILIBS="-lfmpich"])
-+	fi
-+],
-+[Fortran], [
-+	if test x = x"$MPILIBS"; then
-+		AC_CHECK_LIB(fmpi, MPI_Init, [MPILIBS="-lfmpi"])
-+	fi
-+	if test x = x"$MPILIBS"; then
-+		AC_CHECK_LIB(mpichf90, MPI_Init, [MPILIBS="-lmpichf90"])
-+	fi
-+])
-+if test x = x"$MPILIBS"; then
-+	AC_CHECK_LIB(mpi, MPI_Init, [MPILIBS="-lmpi"])
-+fi
-+if test x = x"$MPILIBS"; then
-+	AC_CHECK_LIB(mpich, MPI_Init, [MPILIBS="-lmpich"])
-+fi
-+
-+dnl We have to use AC_TRY_COMPILE and not AC_CHECK_HEADER because the
-+dnl latter uses $CPP, not $CC (which may be mpicc).
-+AC_LANG_CASE([C], [if test x != x"$MPILIBS"; then
-+	AC_MSG_CHECKING([for mpi.h])
-+	AC_TRY_COMPILE([#include <mpi.h>],[],[AC_MSG_RESULT(yes)], [MPILIBS=""
-+		AC_MSG_RESULT(no)])
-+fi],
-+[C++], [if test x != x"$MPILIBS"; then
-+	AC_MSG_CHECKING([for mpi.h])
-+	AC_TRY_COMPILE([#include <mpi.h>],[],[AC_MSG_RESULT(yes)], [MPILIBS=""
-+		AC_MSG_RESULT(no)])
-+fi],
-+[Fortran 77], [if test x != x"$MPILIBS"; then
-+	AC_MSG_CHECKING([for mpif.h])
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[      include 'mpif.h'])],[AC_MSG_RESULT(yes)], [MPILIBS=""
-+		AC_MSG_RESULT(no)])
-+fi],
-+[Fortran], [if test x != x"$MPILIBS"; then
-+	AC_MSG_CHECKING([for mpif.h])
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[      include 'mpif.h'])],[AC_MSG_RESULT(yes)], [MPILIBS=""
-+		AC_MSG_RESULT(no)])
-+fi])
-+
-+AC_LANG_CASE([C], [CC="$acx_mpi_save_CC"],
-+	[C++], [CXX="$acx_mpi_save_CXX"],
-+	[Fortran 77], [F77="$acx_mpi_save_F77"],
-+	[Fortran], [FC="$acx_mpi_save_FC"])
-+
-+AC_SUBST(MPILIBS)
-+
-+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-+if test x = x"$MPILIBS"; then
-+        $2
-+        :
-+else
-+        ifelse([$1],,[AC_DEFINE(HAVE_MPI,1,[Define if you have the MPI library.])],[$1])
-+        :
-+fi
-+])dnl ACX_MPI
-diff --git a/configure.ac b/configure.ac
-new file mode 100644
-index 0000000..daff95e
---- /dev/null
-+++ b/configure.ac
-@@ -0,0 +1,24 @@
-+# -*- Autoconf -*-
-+AC_PREREQ(2.61)
-+AC_INIT(parmgridgen, 1.0, moulitsa@cs.umn.edu)
-+AM_INIT_AUTOMAKE([foreign])
-+AC_CONFIG_HEADER([config.h])
-+AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
-+AC_CHECK_LIB(m, sqrt)
-+sinclude(acx_mpi.m4)
-+AC_LANG_PUSH([C])
-+ACX_MPI([], AC_MSG_ERROR([could not compile an mpi test program]))
-+AC_CONFIG_FILES([Makefile 
-+		 mgridgen.pc
-+		 parmgridgen.pc
-+		 MGridGen/Makefile
-+		 MGridGen/IMlib/Makefile
-+		 MGridGen/Lib/Makefile
-+		 MGridGen/Programs/Makefile
-+		 ParMGridGen/Makefile
-+		 ParMGridGen/IMParMetis-2.0/Makefile
-+		 ParMGridGen/IMParMetis-2.0/ParMETISLib/Makefile
-+		 ParMGridGen/ParLib/Makefile
-+		 ParMGridGen/Programs/Makefile])
-+AC_OUTPUT
-diff --git a/mgridgen.h b/mgridgen.h
-deleted file mode 100644
-index e1bfa2e..0000000
---- a/mgridgen.h
-+++ /dev/null
-@@ -1,7 +0,0 @@
--typedef int idxtype;
--typedef double realtype;
--
--
--void MGridGen(int, idxtype *, realtype *, realtype *, idxtype *, realtype *,
--              int, int, int *, int *, int *, idxtype *);
--
-diff --git a/mgridgen.pc.in b/mgridgen.pc.in
-new file mode 100644
-index 0000000..d84810c
---- /dev/null
-+++ b/mgridgen.pc.in
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: MGridGen
-+Description: Software for generating coarse grids
-+Version: @VERSION@
-+Libs: -L${libdir} -lIMlib -lMGridGen
-+Cflags: -I${includedir}/mgridgen
-diff --git a/parmgridgen.h b/parmgridgen.h
-deleted file mode 100644
-index 6a1a637..0000000
---- a/parmgridgen.h
-+++ /dev/null
-@@ -1,5 +0,0 @@
--typedef int idxtype;
--typedef double realtype;
--
--void ParMGridGen(idxtype *, idxtype *, realtype *, realtype *, idxtype *,
--                 realtype *, int *, int, int, int *, idxtype *, MPI_Comm *);
-diff --git a/parmgridgen.pc.in b/parmgridgen.pc.in
-new file mode 100644
-index 0000000..a11a597
---- /dev/null
-+++ b/parmgridgen.pc.in
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: ParMGridGen
-+Description: Software for parallel (mpi) generating coarse grids
-+Version: @VERSION@
-+Libs: -L${libdir} -lIMparmetis -lParMGridGen
-+Cflags: -I${includedir}/imparmetis -I${includedir}/parmgridgen
--- 
-2.15.1
-
diff --git a/sci-libs/parmgridgen/files/parmgridgen-1.0-format-security.patch b/sci-libs/parmgridgen/files/parmgridgen-1.0-format-security.patch
deleted file mode 100644
index 1ad445c705e9..000000000000
--- a/sci-libs/parmgridgen/files/parmgridgen-1.0-format-security.patch
+++ /dev/null
@@ -1,48 +0,0 @@
- ParMGridGen/IMParMetis-2.0/ParMETISLib/util.c | 4 ++--
- ParMGridGen/ParLib/util.c                     | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/ParMGridGen/IMParMetis-2.0/ParMETISLib/util.c b/ParMGridGen/IMParMetis-2.0/ParMETISLib/util.c
-index d0dfc91..941f68e 100644
---- a/ParMGridGen/IMParMetis-2.0/ParMETISLib/util.c
-+++ b/ParMGridGen/IMParMetis-2.0/ParMETISLib/util.c
-@@ -25,7 +25,7 @@ void errexit(char *f_str,...)
- 
-   sprintf(out2, "Error! %s", out1);
- 
--  fprintf(stdout, out2);
-+  fprintf(stdout, "%s", out2);
-   fflush(stdout);
- 
-   abort();
-@@ -46,7 +46,7 @@ void myprintf(CtrlType *ctrl, char *f_str,...)
- 
-   sprintf(out2, "[%2d] %s", ctrl->mype, out1);
- 
--  fprintf(stdout, out2);
-+  fprintf(stdout, "%s", out2);
-   fflush(stdout);
- 
- }
-diff --git a/ParMGridGen/ParLib/util.c b/ParMGridGen/ParLib/util.c
-index 9b8290d..c212b60 100644
---- a/ParMGridGen/ParLib/util.c
-+++ b/ParMGridGen/ParLib/util.c
-@@ -25,7 +25,7 @@ void MGriderrexit(char *f_str,...)
- 
-   sprintf(out2, "Error! %s", out1);
- 
--  fprintf(stdout, out2);
-+  fprintf(stdout, "%s", out2);
-   fflush(stdout);
- 
-   abort();
-@@ -46,7 +46,7 @@ void MGridmyprintf(MGridCtrlType *ctrl, char *f_str,...)
- 
-   sprintf(out2, "[%2d] %s", ctrl->mype, out1);
- 
--  fprintf(stdout, out2);
-+  fprintf(stdout, "%s", out2);
-   fflush(stdout);
- 
- }
diff --git a/sci-libs/parmgridgen/files/parmgridgen-1.0-impl-fct.patch b/sci-libs/parmgridgen/files/parmgridgen-1.0-impl-fct.patch
deleted file mode 100644
index 1a464b99ed2f..000000000000
--- a/sci-libs/parmgridgen/files/parmgridgen-1.0-impl-fct.patch
+++ /dev/null
@@ -1,70 +0,0 @@
- ParMGridGen/ParLib/move.c          | 1 +
- ParMGridGen/ParLib/parmgridgen.c   | 1 +
- ParMGridGen/ParLib/util.c          | 2 +-
- ParMGridGen/Programs/io.c          | 2 +-
- ParMGridGen/Programs/parmgridgen.c | 2 +-
- 5 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/ParMGridGen/ParLib/move.c b/ParMGridGen/ParLib/move.c
-index 881b1ad..b02b467 100644
---- a/ParMGridGen/ParLib/move.c
-+++ b/ParMGridGen/ParLib/move.c
-@@ -9,6 +9,7 @@
-  */
- 
- #include "parmgridgen.h"
-+#include "IMlib.h"
- 
- /*************************************************************************
- * This function moves the graph, and returns a new graph.
-diff --git a/ParMGridGen/ParLib/parmgridgen.c b/ParMGridGen/ParLib/parmgridgen.c
-index 6fd4aa3..262e05c 100644
---- a/ParMGridGen/ParLib/parmgridgen.c
-+++ b/ParMGridGen/ParLib/parmgridgen.c
-@@ -9,6 +9,7 @@
-  */
- 
- #include "parmgridgen.h"
-+#include "IMlib.h"
- 
- /***********************************************************************************
- * This function is the entry point of the parallel coarse grid construction.
-diff --git a/ParMGridGen/ParLib/util.c b/ParMGridGen/ParLib/util.c
-index 9b8290d..fa2e10a 100644
---- a/ParMGridGen/ParLib/util.c
-+++ b/ParMGridGen/ParLib/util.c
-@@ -9,7 +9,7 @@
-  */
- 
- #include "parmgridgen.h"
--
-+#include "IMlib.h"
- 
- /*************************************************************************
- * This function prints an error message and exits
-diff --git a/ParMGridGen/Programs/io.c b/ParMGridGen/Programs/io.c
-index 318c8b4..ed5d495 100644
---- a/ParMGridGen/Programs/io.c
-+++ b/ParMGridGen/Programs/io.c
-@@ -9,7 +9,7 @@
-  */
- 
- #include "parmgridgen.h"
--
-+#include "IMlib.h"
- 
- /*************************************************************************
- * This function reads the CSR matrix
-diff --git a/ParMGridGen/Programs/parmgridgen.c b/ParMGridGen/Programs/parmgridgen.c
-index 2c0d38c..e9956c5 100644
---- a/ParMGridGen/Programs/parmgridgen.c
-+++ b/ParMGridGen/Programs/parmgridgen.c
-@@ -9,7 +9,7 @@
-  */
- 
- #include "parmgridgen.h"
--
-+#include "IMlib.h"
- 
- /***********************************************************************************
- * This function is the testing routine for the adaptive multilevel partitioning code.
diff --git a/sci-libs/parmgridgen/metadata.xml b/sci-libs/parmgridgen/metadata.xml
deleted file mode 100644
index 40aa45df2b01..000000000000
--- a/sci-libs/parmgridgen/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sci-libs/parmgridgen/parmgridgen-1.0-r1.ebuild b/sci-libs/parmgridgen/parmgridgen-1.0-r1.ebuild
deleted file mode 100644
index 6294d8598f99..000000000000
--- a/sci-libs/parmgridgen/parmgridgen-1.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MYP=ParMGridGen-${PV}
-
-DESCRIPTION="Software for parallel (mpi) generating coarse grids"
-HOMEPAGE="http://www-users.cs.umn.edu/~moulitsa/software.html"
-SRC_URI="http://www-users.cs.umn.edu/~moulitsa/download/${MYP}.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-RESTRICT="mirror bindist"
-
-DEPEND="virtual/mpi"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MYP}
-
-pkg_setup(){
-	export CC=mpicc
-}
-
-PATCHES=(
-	"${FILESDIR}/${P}-autotools.patch"
-	"${FILESDIR}/${P}-as-needed.patch"
-	"${FILESDIR}/${P}-format-security.patch"
-	"${FILESDIR}/${P}-impl-fct.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	dodoc README Doc/*.pdf
-}
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 9907e7fa5607..c947a0d7f041 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -2,10 +2,16 @@ DIST proj-4.8.0-org_proj4_PJ.h 2960 BLAKE2B f5f367910490fb781a7ddb512e8eaae2d6de
 DIST proj-4.8.0.tar.gz 785279 BLAKE2B c0b71012128f395347f1233cca55c5d6af258bdc1d0c67ca8b847e8b69c2f6fead7176f69ae1546f45dddcd96e05c6409167b0c078029de0be1d7bc4e550edec SHA512 6076289f8bdf1ca3b76ea879d8c221a668fcb4a6deec7cf6a293c489dfe0b21c36da0c6ed2c7a0b8042436106e851018aa429b4731f4ff018fea2fdb8887ec76
 DIST proj-4.9.2-org_proj4_PJ.h 2960 BLAKE2B f5f367910490fb781a7ddb512e8eaae2d6de4fd1f5b8e9e1dc1b189959a57499174f6b1e90476f10cb4cb8860e069061eb8b507fbbb46b3e1e394df43f67561e SHA512 db2c2b8920ef1c0c56395480dd514e372d5385839ac553a36c92431f5662bb8ec47706489b5c12e0c4308967da58fc94b29a957ede627274ab685ab647151f2c
 DIST proj-4.9.2.tar.gz 874816 BLAKE2B a59a405298a7c8d5bcf3e1a29c5949b466fed5c3745d0f6d631fff3282f6135d6be21cd75c9b377692f4fb98ae6e10e75867fdeab868fdb49c1578073cd7e802 SHA512 34a506742bb27cbc7f5ee91ee7f8c7a27d0f5644a1dcfd11b1e59120040804b1621ddfa4212bff45a1c3fb85511e48ece21612e86033139bafbb50c165e77cda
+DIST proj-5.2.0.tar.gz 1398188 BLAKE2B 37a3a8ed78fd65342f33859662a38f85c3087409db9f00eb031feb5a2527a056e5f0debd97b47f9d08ba6575af2c41d9051de0865e1ad8bd88c956358e519d77 SHA512 f773117d22309d4ee8dbedc2a7b6ba27e8cd032e1bd0af3c98f270bf7b7ab3353be0b04d91202a1f137fc45164c8e8a52712bb06281948008160d08f9f9074ba
 DIST proj-6.0.0.tar.gz 2405217 BLAKE2B 7d0be7753048ffb0b95a7aca8bf73346c4239112527bf0c4a37b22a25c66f97c7692445608cd7aff422edeec18e9eb90839d84cda117dda0bbdefbe274b3e5e3 SHA512 bc4d2f02d697aa01099f5e973a7ca70072f51210754e4d9331ae5bfdef886a41984ce27c1ff926da14fd199005bf9cad7162ab3ea8f3f421ac8b60bc8defd8f7
+DIST proj-6.2.0.tar.gz 2685319 BLAKE2B 8af166a9c98e07cde9e469fc8dbc5033f785181793b989211619fefa443f6449402d66bd42670ca17d81bf3a00d9d7d5c196e16a7975da2a5937ff5a81b771ee SHA512 4c2fd898103c8955a48557353c6866723d6e6b3769580d0b9cb63a685cf4e53ebe63b965498c2ba03eac4827a68fd0036a2234364a7d92dc28e5cdaecf90142d
 DIST proj-datumgrid-1.5.zip 2250131 BLAKE2B c83b5bab72b790c70fbf3b95782ba4e8e93e2accc93a0a8c06667908dc437de44aa3623799f685e020269090be103bac568fe6a9d73ce128b8af024ec1ca8442 SHA512 9d9a935b3e984721a1ceafac49c139d3c5d9923c5bcef5f57fec8028a043c86e7de8bad9c200fa38cd6d1bf27b32dd0126597d42fee793d055e686f090604bf3
+DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
 DIST proj-datumgrid-1.8.zip 6601640 BLAKE2B d439286c27b04767b4085f109a3bbbd555ac9e5acad2f673d5641fee433235b5a5410236ce32e42d3b11ce06d3199dec76c6e41aaa2b5dfd14a09b6b33928164 SHA512 991206f17348b3de484eb5364d773cd06577057228c2d1a0a1c1658308e2596ca13338a666fa71ddd76d538f23dd5bf21e178fd26a785717edd847a17e5c0cd1
+DIST proj-datumgrid-europe-1.4.tar.gz 26115747 BLAKE2B 3dfb5c19362f9d9cdfc4ee5469e536b97d963a5ac3bcf6652ef5935ec393f4035bc15abc444d62cfa477478faabd66a8effe64dbb8eb26b7d73a717b4eae2e53 SHA512 4043c0791af086541a3e08f7ad667b25968ed25e6595c1f047e1272f52838d28ab4010a076f9524882f97d7aa9104769c0b9cdf17394915c5b70b0dc13e019ee
 EBUILD proj-4.8.0.ebuild 1299 BLAKE2B 0ebc7c73ece64fe41bf071f96becad9f416824e85e031cc1290b16e06d15717e4ef833f207687c7341a9cc09f94508aef508147ca1cd1a084b52bfda6a9e5b36 SHA512 1df5171dfd85e0eee8e49cbd9d603f016978658e73226a1809d5efc6aef96955784b7fc176b06e94e87a2ccdc13d92982d31807f104932a407e16f32f8d50254
-EBUILD proj-4.9.2.ebuild 1274 BLAKE2B 25461d51e835da57b62a0f5ca7aa1c3bf6f8d05b6b20c9dec23706b4febf396b825c2af20a574c26019adc2bdfb0d2cedfb837d172d34897d39b9b9a0ea9241b SHA512 659eeabad7d2afde8c4fdf7e14aa161494488d840cde5c932f71e77b67c8cf9074c4e4b8706e00de2431aec2e3716fff52f937259ddcdd7992d540d825d18359
-EBUILD proj-6.0.0.ebuild 940 BLAKE2B f9dc8b36da183f28a697f21562ebe79ca5452e4b90af037646a62ee7e48484535682491d71a8ada25282d5426f777caa96c873eb0eeb1c553fa331243f67210e SHA512 948dfd6357fe0d8bad1b0fcc09f9a3191ce023e25a2601a0ca5ad50513b77338183f8648331c91035266f9d753857a8a1805e00785974b2c2b05c7c02477c10c
-MISC metadata.xml 415 BLAKE2B 5bbcea99e5589d2c894dc19eaba8b7893d8965d4c8d25024917fa004e3905c0620a76dfaa34de4c2de156544d4ffdc94e3d05e222cb0b2b2b812ac261d0e9bf3 SHA512 8e98b001981de3b4062d8156577061b92918726c7992a3f96fb3d21c2f18d773efe343839255a4cc1ca69f50d05d16a4c48eb4aabc3db9f40a67ac62adc93e5b
+EBUILD proj-4.9.2.ebuild 1276 BLAKE2B ab895282e8e50e906163c9be2541abf8420826aae4c9a5090224eb6b0edff8c64ae68dba2bfeb7ab58c4b733807f7f0c45b6bfd2bbd844819c66738984f92af8 SHA512 0a5fa49e0307e1ff228c38484d7b83f398c12b61b846585150a1fec5c933f82650b37677ddd6e87fffdc77381bc4d66cbd56a1b97be407301a5838bcfbbfa394
+EBUILD proj-5.2.0.ebuild 916 BLAKE2B c14d391decf32d2888cdcdb300087eac27e78e3d9843ec88d541e633ce91f4f66bdfbf1ac147e10befe11d9750c0aa60a3b0f6ca8c8b7ad58722f59b44e782a7 SHA512 bcacfa39b1b550c05bd5ba9a1da5984a2bcb1826cc82f859f39e1e566aa3747e5742c7f03cad0a2dd0c87e7623102147a3c037ec151dea062f7450d4ced77562
+EBUILD proj-6.0.0.ebuild 943 BLAKE2B ab7c16f6128d96f499063c030f4c938bc2d3aab88b0ef5cd3491b631e485862cb1603c5cd74be13882b498f6a62f4fcc51a85afa4c3d8c4effab6d7d092e8964 SHA512 374ae20f1ce4192d62be5b8519270c57fa172e4c4f30d9dbc0bf0cad02ccffaa2f0a527d33d7e9b197b910ce40457c77d72ab52c77d08bb03935cb1e83a16f16
+EBUILD proj-6.2.0.ebuild 1096 BLAKE2B 8251133a9e32eb75535d8efc5fbc5fe744b034a1fe05ebc6698805fa45b45e30dc4cdca5641dcb534729b67ca07867747cb85ddee90ded78c792f7ce2be4f243 SHA512 4f1906b875751cb6e2466d5ce15fc25bd275b4e5d2101b2a44d440fedb91563f8f3d7a52133dd647c316d97eb06ce18e025197038edfeab0488e6310107b928c
+MISC metadata.xml 513 BLAKE2B 4068b4ddcb4e95578df8da19650ab86b4dbfdba294a3d03f10ada37a578a2113b0d71720545c269b1c097d3a37dbc66ee0cdfe61889466171c109413088707fd SHA512 e841ea4fb30d3632fecca7d584121fce35dff2b23ad8a1feeb98a47f0a3b1d78f57a05b0d303aeff47f981f5b7feb831deb14644ab6615644c0a8593a6e321b3
diff --git a/sci-libs/proj/metadata.xml b/sci-libs/proj/metadata.xml
index bf7a5ebdf46f..b88fa9cb0362 100644
--- a/sci-libs/proj/metadata.xml
+++ b/sci-libs/proj/metadata.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci-geosciences@gentoo.org</email>
-    <name>Gentoo Geosciences Project</name>
-  </maintainer>
-  <longdescription>Proj.4 cartograpic projection code for forward and inverse 
-coordinate and projection transformations.</longdescription>
+	<maintainer type="project">
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
+	<longdescription>
+		PROJ enables the transformation of geospatial coordinates
+		between coordinate reference systems.
+	</longdescription>
+	<use>
+		<flag name="europe">Install the PROJ collection of European grids and init-files</flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-libs/proj/proj-4.9.2.ebuild b/sci-libs/proj/proj-4.9.2.ebuild
index 7fac923f670c..8368817a48b0 100644
--- a/sci-libs/proj/proj-4.9.2.ebuild
+++ b/sci-libs/proj/proj-4.9.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0/9"
 KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="java static-libs"
 
diff --git a/sci-libs/proj/proj-5.2.0.ebuild b/sci-libs/proj/proj-5.2.0.ebuild
new file mode 100644
index 000000000000..c8177afc247a
--- /dev/null
+++ b/sci-libs/proj/proj-5.2.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
+
+DESCRIPTION="PROJ coordinate transformation software"
+HOMEPAGE="https://proj4.org/"
+SRC_URI="
+	http://download.osgeo.org/proj/${P}.tar.gz
+	http://download.osgeo.org/proj/${DATUMGRID}
+"
+
+LICENSE="MIT"
+SLOT="0/13"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="static-libs"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"/nad || die
+	mv README README.NAD || die
+	unpack ${DATUMGRID}
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--without-jni
+}
+
+src_install() {
+	default
+	cd nad || die
+	dodoc README.{NAD,DATUMGRID}
+	insinto /usr/share/proj
+	insopts -m 755
+	doins test27 test83
+	insopts -m 644
+	doins pj_out27.dist pj_out83.dist
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/proj/proj-6.0.0.ebuild b/sci-libs/proj/proj-6.0.0.ebuild
index 24521583e3a7..336599353605 100644
--- a/sci-libs/proj/proj-6.0.0.ebuild
+++ b/sci-libs/proj/proj-6.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0/15"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="java static-libs"
 
diff --git a/sci-libs/proj/proj-6.2.0.ebuild b/sci-libs/proj/proj-6.2.0.ebuild
new file mode 100644
index 000000000000..2263d70332f5
--- /dev/null
+++ b/sci-libs/proj/proj-6.2.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
+EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.4.tar.gz"
+
+DESCRIPTION="PROJ coordinate transformation software"
+HOMEPAGE="https://proj4.org/"
+SRC_URI="
+	https://download.osgeo.org/proj/${P}.tar.gz
+	https://download.osgeo.org/proj/${DATUMGRID}
+	europe? ( https://download.osgeo.org/proj/${EUROPE_DATUMGRID} )
+"
+
+LICENSE="MIT"
+SLOT="0/15"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="europe static-libs test"
+REQUIRED_USE="test? ( !europe )"
+
+RDEPEND="dev-db/sqlite:3"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"/data || die
+	mv README README.DATA || die
+	unpack ${DATUMGRID}
+	use europe && unpack ${EUROPE_DATUMGRID}
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--without-jni
+}
+
+src_install() {
+	default
+	cd data || die
+	dodoc README.{DATA,DATUMGRID}
+	use europe && dodoc README.EUROPE
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/shapelib/Manifest b/sci-libs/shapelib/Manifest
index 4423282334fb..2425df06d5cd 100644
--- a/sci-libs/shapelib/Manifest
+++ b/sci-libs/shapelib/Manifest
@@ -1,7 +1,7 @@
 DIST shapelib-1.4.0.tar.gz 548990 BLAKE2B 0e75481d35f8dc5687eee23696d46a780d4b185a81ca1246e5c19f01e58f4a55dc7b69347c9effa01ac1786c5271dfe3907798cc81fe9314979c502bcb9d982d SHA512 206b81fe859a837e821e449ab1b2dbd5a3aa7abd1871da4aec69e130b6fad6300697429884ce359c90e4b76bca90e2108f32b9fdbd3b92013fa5a39f3bedeeb1
 DIST shapelib-1.4.1.tar.gz 549831 BLAKE2B e579704bd71c2525133f87628261e78f39e8063cd7e8a57997e90a8ca4a6ebb5de3a4d1ab8da5d00afe1363d9eb22e8c7a9a66ac109c300b72b6d26bd87b61fd SHA512 791c1a0d6c5ff09341176f68349ebd760ae91e8749a9f844299d7ac38a42c4f1131e63479c384a8a8b05a89e90d02e9fd92c526cab417eb80b171d639b4a4422
 DIST shapelib-1.5.0.tar.gz 547686 BLAKE2B 3f962ee701d8cfb86a56aa1c0b2156bc2288a2bc908bb1a8303e491812845241f5281b0b8650befcc53e9dfc408b652a56f5e2fdc5ac7c2ff6eb99170696e437 SHA512 6dbd5fc7929ca403e65017ef58211f351608d9ad08221bf68bde047ceecfd27013ce731f9ae4edcfd040bc3db7fe9054b5d96e46128d2968788bef19532b1721
-EBUILD shapelib-1.4.0-r1.ebuild 732 BLAKE2B 6ded850e66686307ea4ef7a40cb2f50c76eaf374d079e51e437358c8ad45dd7a7c1107f76a41d9f616df60112d8cb3e8865a7eae6eec8f7b2225d577c1964572 SHA512 c0bce2f2bb82acb8bebf35b00cd1eaf945b5027b64969ddff9f7aac07b4083d3e8ae5e12690da8b8fe33ce56c80d930bb0b9e8571c1662afa297971f6a5dc3fc
-EBUILD shapelib-1.4.1.ebuild 737 BLAKE2B 90679e4eaa6aa34e226bb307c760373dff7cc2d8004dcb214bf0c3bd40fb3bd33732968f9a754e4f9537c134fc47f88579de65b9b11713df1db6b12cf8ae8567 SHA512 76b822dab574d4a27efcde31cdde9b2eb624be0de1b063330fd96a324f7555a77963df00a8ddcde7aec487132554baed65bb115e7aed2e3c50dba98c1e832ebd
+EBUILD shapelib-1.4.0-r1.ebuild 734 BLAKE2B 01ef8f8b68ef976f4dc0fe32e948af09cb2c0fe8696566aaf21707d13f2ed1d9a726c67f124b8efb6ead679737c7a5e5d08fa06a1765ab15269bf4e9416cd700 SHA512 9855cd8eae880e70691c10cf7fc253dae7720118930a3ff3a8884e6f89ce55a35ac58b023de0883d321cd130f392d11359e5f82beb680c497e83bc239777d2b3
+EBUILD shapelib-1.4.1.ebuild 739 BLAKE2B 54d057ca4143ffa67a6911a9ff755b9cb716b6e01ad93f34e04500da4f7d314f2c96f2f0a457248d3f38c5bdb668511c0c2511156f4275bde13ca0a3da7a3bf4 SHA512 b7692107c187098ec350e8591aa744681819dd603145f491ce3a11d1060a792d23a72e05f69a4d5b040c06514a8354d158137e18c95bd0e56d7cc89dfc92ef86
 EBUILD shapelib-1.5.0.ebuild 735 BLAKE2B a24b33d02c69daca5d1ce14d42e8bf711b2fe42c87cc0ac7a5d572fdb974734f2bf26e178ee65e3a3f0b941e36f81f2d3ba59b17317169ab4b14338e84e4a641 SHA512 4323da01b30b2d32c6d11d34641414280f952fbb0cb3a5d20a1748856d33e8b70b214d533a81c60110c78024854514b8126c889475a7f16a17b69170234af591
 MISC metadata.xml 405 BLAKE2B ed97fadfd57934dab768c271f100531eb2f5c9e98564b54d73c2396d0959c62b39ee7ce5ad96495f1133cf8c3de8ad2ffcb0d13353c1a32c9be92ad81bd80995 SHA512 9581a1f8123cdcc6b68de0fdc03dfa866c64668222f1d90b55160cdaf8d36e1441f0530fced6b149681fef88321bf33879996199685eb6e26cefae975b704adb
diff --git a/sci-libs/shapelib/shapelib-1.4.0-r1.ebuild b/sci-libs/shapelib/shapelib-1.4.0-r1.ebuild
index 605f11ae57a3..becf6ab986ba 100644
--- a/sci-libs/shapelib/shapelib-1.4.0-r1.ebuild
+++ b/sci-libs/shapelib/shapelib-1.4.0-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0/2"
 KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
-RDEPEND="sci-libs/proj"
+RDEPEND="sci-libs/proj:="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/sci-libs/shapelib/shapelib-1.4.1.ebuild b/sci-libs/shapelib/shapelib-1.4.1.ebuild
index b850d84830e8..2cdd74bbd191 100644
--- a/sci-libs/shapelib/shapelib-1.4.1.ebuild
+++ b/sci-libs/shapelib/shapelib-1.4.1.ebuild
@@ -14,7 +14,7 @@ SLOT="0/2"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
-RDEPEND="sci-libs/proj"
+RDEPEND="sci-libs/proj:="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/sci-libs/tamu_anova/Manifest b/sci-libs/tamu_anova/Manifest
index f92e22a6ce4a..58ea0f8ef4a8 100644
--- a/sci-libs/tamu_anova/Manifest
+++ b/sci-libs/tamu_anova/Manifest
@@ -1,5 +1,5 @@
-AUX 0.2.1-gentoo.patch 913 BLAKE2B 82714a853586898805bcb2de03df03f6e04c8dbb4dd1a83718633053f5a02fb28492e71d26f3fc84585cfedbfce79cccd6abe39f922463d615b549710fcc900b SHA512 898ce24ac70b51d865f5e304c17fd663c254c971dea144cf9a1eccce7e6b75e5e60a84dd0e653915aa52e87dcf1687efed542a3b11aff27287ce3efe2ce0b81b
-AUX tamu_anova-0.2.1-texinfo5.1.patch 1414 BLAKE2B 0a0b3a74f47ae558d1993f61f62058c07eec5e0e2ca045623ef8db73fef84cbe751649bd048efa3be468eb467cc598a2d94ea74a2a00f011c5d741af388e8a51 SHA512 f221b19b238f6df374a3d256c7ab594c7e00f0c3c2959c88eeeb8ff1bc8dd7cb22ba60b3a0456f2da834242129a688b2feff781668ec920dff5779d31c31faa7
-DIST tamu_anova-0.2.1.tar.gz 220803 BLAKE2B dab9762a34c0abdeae900bc26864874dc33b60c19dafd06ddb6d41670c142d33c034e61b45d10d1c609d8b38af40514578f40b53b413256a38a1956036728bb1 SHA512 e4e65997d8ca57b5ad1c0001abbe41652fa86f8b8e9e00aa53d8079062e028baee67436408997d96d87c85801c48e1c87f40dfe291d387cd94dcefd61a52c477
-EBUILD tamu_anova-0.2.1.ebuild 611 BLAKE2B d7a806d37135e20ae7e3cc85ee373db82259782e2343b8dea83a72dca836aea93f03c24e10081c73ede8cdf73a1bfa0a997b7a94cde89fc6119c54b0efc3875b SHA512 d0b9ed81a39abfbaac75c3be51eed156c3e5fc7305047cd915a043e294a20e006726ead448299c0fbd6de299655ba686df8b5f9dcc6e7e6fd9feb221c9dec5bd
+AUX 0.2-gentoo.patch 913 BLAKE2B 82714a853586898805bcb2de03df03f6e04c8dbb4dd1a83718633053f5a02fb28492e71d26f3fc84585cfedbfce79cccd6abe39f922463d615b549710fcc900b SHA512 898ce24ac70b51d865f5e304c17fd663c254c971dea144cf9a1eccce7e6b75e5e60a84dd0e653915aa52e87dcf1687efed542a3b11aff27287ce3efe2ce0b81b
+AUX tamu_anova-0.2-texinfo5.1.patch 1414 BLAKE2B 0a0b3a74f47ae558d1993f61f62058c07eec5e0e2ca045623ef8db73fef84cbe751649bd048efa3be468eb467cc598a2d94ea74a2a00f011c5d741af388e8a51 SHA512 f221b19b238f6df374a3d256c7ab594c7e00f0c3c2959c88eeeb8ff1bc8dd7cb22ba60b3a0456f2da834242129a688b2feff781668ec920dff5779d31c31faa7
+DIST tamuanova_0.2.orig.tar.gz 220803 BLAKE2B dab9762a34c0abdeae900bc26864874dc33b60c19dafd06ddb6d41670c142d33c034e61b45d10d1c609d8b38af40514578f40b53b413256a38a1956036728bb1 SHA512 e4e65997d8ca57b5ad1c0001abbe41652fa86f8b8e9e00aa53d8079062e028baee67436408997d96d87c85801c48e1c87f40dfe291d387cd94dcefd61a52c477
+EBUILD tamu_anova-0.2-r1.ebuild 744 BLAKE2B e2c0a57372ae5647e585d00f77da16aa8c44a635f8187675e62f8fa360050c9140a41f07e22be9086146658489ebba29156a9c6d4044230b5f01994336c2a713 SHA512 7f66f00a37839f3ae6d4098b3bf4b4947214dbdf848c0dea186bd3ade1f6adc087f49951ebe135231a04ba86ba273bc91eb39961297d0704df6d3ec1a1c7cb10
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/tamu_anova/files/0.2.1-gentoo.patch b/sci-libs/tamu_anova/files/0.2-gentoo.patch
index 4d4c1f4a0af1..4d4c1f4a0af1 100644
--- a/sci-libs/tamu_anova/files/0.2.1-gentoo.patch
+++ b/sci-libs/tamu_anova/files/0.2-gentoo.patch
diff --git a/sci-libs/tamu_anova/files/tamu_anova-0.2.1-texinfo5.1.patch b/sci-libs/tamu_anova/files/tamu_anova-0.2-texinfo5.1.patch
index f0c0570fc46d..f0c0570fc46d 100644
--- a/sci-libs/tamu_anova/files/tamu_anova-0.2.1-texinfo5.1.patch
+++ b/sci-libs/tamu_anova/files/tamu_anova-0.2-texinfo5.1.patch
diff --git a/sci-libs/tamu_anova/tamu_anova-0.2-r1.ebuild b/sci-libs/tamu_anova/tamu_anova-0.2-r1.ebuild
new file mode 100644
index 000000000000..36f86cfa54bf
--- /dev/null
+++ b/sci-libs/tamu_anova/tamu_anova-0.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="ANOVA Extensions to the GNU Scientific Library"
+HOMEPAGE="https://tracker.debian.org/pkg/tamuanova"
+SRC_URI="http://cdn-fastly.deb.debian.org/debian/pool/main/t/tamuanova/tamuanova_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+
+RDEPEND="sci-libs/gsl:0="
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/texinfo"
+
+S="${WORKDIR}"/${PN}-0.2
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-gentoo.patch
+	"${FILESDIR}"/${P}-texinfo5.1.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/tamu_anova/tamu_anova-0.2.1.ebuild b/sci-libs/tamu_anova/tamu_anova-0.2.1.ebuild
deleted file mode 100644
index 5ae7872d14fe..000000000000
--- a/sci-libs/tamu_anova/tamu_anova-0.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils
-
-DESCRIPTION="ANOVA Extensions to the GNU Scientific Library"
-HOMEPAGE="http://www.stat.tamu.edu/~aredd/tamuanova/"
-SRC_URI="http://www.stat.tamu.edu/~aredd/tamuanova/${PN}-0.2.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-IUSE="static-libs"
-
-RDEPEND="sci-libs/gsl"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${PN}-0.2
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-gentoo.patch
-	"${FILESDIR}"/${P}-texinfo5.1.patch
-	)
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index d9c0496763ff..6da8f8e189de 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -16,5 +16,5 @@ DIST VTKLargeData-8.1.0.tar.gz 166992034 BLAKE2B ac98861ccac2aacfab7547a4b56de5c
 DIST vtkDocHtml-6.1.0.tar.gz 230827905 BLAKE2B a323728450c5054d715dac137e54ed9b901019af595ea3abca9e7865d0b420d7b5f87789a9489df116f982633984d74721153dc3ab735e97455f64c2ffc4aa95 SHA512 fcae74a65157d87b39a162facdecbb0ab0a9b95b9f2555ed2b15d635b82034bfc62181eea441caf0b1edbe036b792a8231d409908b943398ce7f662c149d3a60
 DIST vtkDocHtml-8.1.0.tar.gz 132655967 BLAKE2B a27d9631fa9fe42e9b8076aa3b33e03b3835db0f348ed60cfdc866ffe7accd9c5d99b6525523113a4d628253e28d6d9121e78942d89b6ee281d5e7ecee7c289e SHA512 c49338ad2c121ab16098195e5a1f2c9539137a85ae5edaa64d4a887ece0c64efb8840162942f47b70ab2d82d341bba2e706a6ff007fe6bdfbce12ad92bca883c
 EBUILD vtk-6.1.0-r4.ebuild 10480 BLAKE2B 72dc967f163fed46bcbe7dc0a2b4de89840c95134a5b89522ed2d8962873a4ee54d7e2a0a9dc9814f003e3aa5d206e39ec77b799690b7ba8af1fec5d874cef48 SHA512 b299bee838d2fac4b44d56039856a326388186bac7d7c154bc4b144db66df1c04b9c74db3039f6e2ff8d3b25714a3e37d097e47a573b4a1851be09acbe161794
-EBUILD vtk-8.1.0-r3.ebuild 9057 BLAKE2B e5329bd6ed31f37152614d1e4773ed62a0eb92e9bfdecd0695dc57ebbf5c6cce9d0e5ab27a793774acabe9a9b9c4170ec579ccdf75fcbdc02e6666eafee2b6b2 SHA512 db6b2eea35c79c1ece9a0ce00dd5e9863eb3b312fd90101da5b7d216dcff2a365445d4f91fccdf49f176dfc626652a05da396c270dd27251db74b1cf69f08238
+EBUILD vtk-8.1.0-r3.ebuild 8941 BLAKE2B 46621f53b88cd7577f70f8921a583921791b730200e496f2dd846e2b18cf42d19b25826c244141d736e632a0bc7653e7a2e4076faf087276b2cf2e1ae295d766 SHA512 403715ad2de469165775e506968061965216f90bf36ee51e01f7165073882f14e0799324d7d0823f741567f182c78447634bb3a2bb653e341254cb900aa27769
 MISC metadata.xml 1122 BLAKE2B 8dbb591a7a7058bb373268f588fab8e1d4a16840dd92cb2c288222e091a84bbd7c30bac38ed289f7aa4fcd7fb002438f13ce4046e27822271a34d0bb5410fb39 SHA512 1415d25d21fb73f3eebe0401a1a1d022ace5f4a95e1e522209a2010d98b70a721abb6c5214a5bbe8d68df889b439229c618f7d5fa0671fd98eefb572a4b1bae0
diff --git a/sci-libs/vtk/vtk-8.1.0-r3.ebuild b/sci-libs/vtk/vtk-8.1.0-r3.ebuild
index bfe60457d8c5..cf30b696b29f 100644
--- a/sci-libs/vtk/vtk-8.1.0-r3.ebuild
+++ b/sci-libs/vtk/vtk-8.1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ LICENSE="BSD LGPL-2"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="
-	all-modules aqua boost doc examples imaging ffmpeg gdal java json kaapi mpi
+	all-modules aqua boost doc examples imaging ffmpeg gdal java json mpi
 	mysql odbc offscreen postgres python qt5 rendering tbb theora tk tcl
 	video_cards_nvidia views web R +X xdmf2"
 
@@ -69,7 +69,6 @@ RDEPEND="
 	ffmpeg? ( virtual/ffmpeg )
 	gdal? ( sci-libs/gdal )
 	java? ( >=virtual/jdk-1.7:* )
-	kaapi? ( <sci-libs/xkaapi-3 )
 	mpi? (
 		virtual/mpi[cxx,romio]
 		python? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
@@ -225,9 +224,7 @@ src_configure() {
 		mycmakeargs+=( -DJAVAC_OPTIONS=${javacargs// /;} )
 	fi
 
-	if use kaapi; then
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Kaapi" )
-	elif use tbb; then
+	if use tbb; then
 		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" )
 	else
 		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" )
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
commit	bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree	adb35b5a9a00ee7ea591ab0c987f70167c23b597 /sci-libs
parent	48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)