gentoo resync : 15.09.2019

9 files changed, 7 insertions, 116 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 2e2441c37149..9fb9bd6a5f08 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index a43f86619f9e..4b50bad1e4f7 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -5,6 +5,6 @@ AUX gdal-2.4.1-poppler-0.75.patch 5452 BLAKE2B 7cb3b1e84f2f1ff91af49cb4292047f05
 AUX gdal-2.4.1-poppler-0.76.patch 699 BLAKE2B 132ff0a3046734e851d12379d049b2e4fdbefcd4bb6949ddf9fa18b856b1ae20d2a2ec9dbcc0d973097cd2ba5f6e72e852b26a93997ffe4b428fe79d44b5c1cf SHA512 09cdd963dbc5e09d211663f54b1cef72eeeda7484ad10b08862907df60aefc068d840e80d4fd0aa0776a03edca89e8affb8b614c4db02085e854bb4a14342d4f
 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 8161 BLAKE2B 6bee2d21a8133149aed8faefec5af07179c931be414961c31956247913e40ce50f5675c8db283d2976201f1a15a1611d5a0f042ad7e72b25b936022dd7a8f5ba SHA512 8d77bb9842f605089bd0cbab4fe851408b278a1d8617b709cc4da8176cb3f9b6fada30ffcafb57062da19ae9b13e51174c2aad3dae5e86d7d29db478eb5f4d40
-EBUILD gdal-2.4.1.ebuild 8110 BLAKE2B 6d6b7f39ad24da917aab354d89a4f6292019e5d5ef788ab286903bd7ff4095bbe66aa965c19f33a913335c679ed0d37bdecea0652d754a145f1d3bf312770579 SHA512 f59fff51426669bac6ca5e2394b7762114f83be5d76807df250dced8355079742ec568f8170b5dfed1c3fd46c01009065faeb9a42e03af72828a5a6b93f585a7
+EBUILD gdal-2.4.1-r1.ebuild 8154 BLAKE2B b1e5e5d599a521fab13bdd696d2148b82dec36b4b04f5a9ac60097d7020479a37ae43f347e9feb06344546eaf106e9ff7c6b9a7b95fbe1781f0752090bc4fb56 SHA512 4a2d654bc206fc5c3d3a7f1ffebd34d2b9eead0107ef453eaafdfcb418f99e459e6873ae837edc73ff91cc8503d30625499ada40edff7541a5ad13ba46f9dc44
+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/gdal-2.4.1-r1.ebuild b/sci-libs/gdal/gdal-2.4.1-r1.ebuild
index 5524199c1e1a..2c9beae3deb6 100644
--- a/sci-libs/gdal/gdal-2.4.1-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.4.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/2.3"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
 COMMON_DEPEND="
diff --git a/sci-libs/gdal/gdal-2.4.1.ebuild b/sci-libs/gdal/gdal-2.4.1.ebuild
index 78ac5d85adb7..7d215149c2c3 100644
--- a/sci-libs/gdal/gdal-2.4.1.ebuild
+++ b/sci-libs/gdal/gdal-2.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/2.3"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
 COMMON_DEPEND="
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index a31c62ff7002..e5c7f320acb8 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,11 +1,7 @@
 AUX netcdf-4.3.2-HDF5-1.8.13+-compat.patch 5258 BLAKE2B ef4afcaf5f9139c6db2898e8e6339e77de8534218c7e00a6b16ff68bdaeb470a96b06493637a6b7734bc00a4813f21a4fd179bc12d1cf156a04ee651380bfc5e SHA512 aa54ec936aff884b105217a8c87f5d7722b8b76a4bdd8b8804366c6509abba9962fdcdbfda2361662fec3732be1a1c2b7a2ae8abea1862d2ad7fd3b0f3828f59
 DIST netcdf-4.3.2.tar.gz 5013938 BLAKE2B 7acef16284bf8586750bdeb03da3e2e2a1c543b80423269eb2542d179e1b52dd51e30584a13f604e75c295ae9ff993c814183fbb5a78ad1141c62f8dbdda6525 SHA512 9cb9c761bf1e17a37601c37000fdc0bb654afcf111e5ac2fb7dcf037c6aa827e66beb29d5c661edc50ea3f84849f3dee387aab9e85ef81a9b6ca3f36e45debdd
-DIST netcdf-4.4.0.tar.gz 17487357 BLAKE2B 45c3ea75df4c7fef57cd49d242c349b078a73915f8690bf2508e0f93cb4189246806a3ecead5a0dd050204dbeeeb4eaa0468bcfba4eeee14b9766a3fe0f1ffa6 SHA512 c5cae15e86d11e6434a489bdac39ea498bdca2008ae6732a16603b32d79a9227a168a0fa0174c6d55ced0c92d9b644f60db4d946f695731161572abd6b778fa1
-DIST netcdf-4.4.1.1.tar.gz 17670828 BLAKE2B 9d38b7ce9feaafbe8326b4a055be3aa805dbe0f8efd039c30b2fb9c41ac912a4ae9eb2f95709f0069f8d38c7526491636be4adc65d1d57ee69e0678edccf232b SHA512 ee23f37d7b40e7b9a115d29bc038c7c654d50dedfcad62617b8dee3efa4668305e6a0656ba655770727ff46f4b6d742869c719267eca3392c94e2488eb902da7
 DIST netcdf-4.6.1.tar.gz 18201700 BLAKE2B 2dab9add736d0db3ad91fb1ccda63c200fe5a2c6e56e2dd5b76375f6535807c6f462623d1709235f03e0940b66a8c2d1c3fd896b042b8b0004c87f038852befb SHA512 e290b10e763f9f6ef56b5224f834834853de7c21347ef6a078a2e7d819757fc8069814431784d0a0387ba2ce1f01776556e3051f9465829da0ffd3849571cd61
 EBUILD netcdf-4.3.2-r1.ebuild 1474 BLAKE2B 4a7ae70e9f5442edd52ebff9263ad517345dd5c930af61668b0a013789052a42aae892ad2816368735ef0963c139ef1446a769366fb67dd842bdfb969045e371 SHA512 b5927be5e0c9d3c2833acc9612e2148b7d9fe92a444f0d662a24ee27956f40e5f1be19341ca7fa4ebabf5c0354d4ea43de20553d3d180a32ecc13454e448336f
-EBUILD netcdf-4.4.0-r1.ebuild 1311 BLAKE2B b2a0e74d7ebba7bd0f7bcfd67be94ec68ff389993c568ff72be61e7b48642a62db3e6cfa2a6a9d0375b45274f5c801d1c2fcc0c476370808bdca7388b9b9559b SHA512 16743218eea2154354c57c02b2f3cf76b0c85d9f3d7afa2f7cdb660cbcd7199509fc72a9da6be6b188390ddabe790c29b167b8c33c12835a0a672ac5273df54c
-EBUILD netcdf-4.4.1.1.ebuild 1387 BLAKE2B 35be1dfd64aeb91426dc92850d40e1ea066c1c0aeb29bbdbc9a280dd38680ee715bcddc24b33c3caafe428d0aad0ea17b5f17a605c89d1fad27238895ddd1978 SHA512 0023d4da50a3045313fa0698d6f867050c95e8e22cc882dd5d50a5ebaf7089f9b6d4ff521588a6c22f0be521d84a0c5fc3176005b2ce9ad6d878a725d4483944
 EBUILD netcdf-4.6.1-r1.ebuild 1303 BLAKE2B 1de11a2598f0be06756961a2238afe07b89a7e1f047227fbd9ab41c2791e189d6eaf8e0a14a24f5cac1084da97fab7a2b88849dab01be7b27829fbb42f456f21 SHA512 ed61101c13ec79900be83ee002c03ec9f26e5b95bad64cbf1c941678f037b7ad5dcb48fb3fc6987f765bb70fd976999e78a3e5d58349cfb9dfe32c6ce24195a1
 EBUILD netcdf-4.6.1.ebuild 1309 BLAKE2B 1f3b940aea083c0f02a6266e323edd8693d3eb97a9daaabd142950237c3345ae0154e69e221fa6ce6bba1897b005d55aa74cf567850ae0b45445d86b346c34a0 SHA512 982b9c8923f7223a794b3ac82967fa33fdc646d3e7493a54d02a2182b2e927a78e3672e32045151833b51a949db2ce715211ee4e9e67a42fca9fef88250605ed
 MISC metadata.xml 1064 BLAKE2B 7980e918eb2d2f438aeb5deb4a678c2e324606b40e8d04e592df7d24492bdfbc548082f6fa372c168b09597c3511df15a046cd8f6d746db3d9aeae31cf3604ac SHA512 2aaa7a6c4659ff3daf81bdb63541ce08359f43bb7007f38dea333d0a05fc920e6780b79a9b0f79fec59d4e05a005efd3642acaedcd3223a21d5aa919110545dd
diff --git a/sci-libs/netcdf/netcdf-4.4.0-r1.ebuild b/sci-libs/netcdf/netcdf-4.4.0-r1.ebuild
deleted file mode 100644
index 3efc4f92fd05..000000000000
--- a/sci-libs/netcdf/netcdf-4.4.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 eutils
-
-DESCRIPTION="Scientific library and interface for array oriented data access"
-HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
-SRC_URI="https://github.com/Unidata/netcdf-c/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UCAR-Unidata"
-SLOT="0/11"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+dap examples hdf +hdf5 mpi static-libs szip test tools"
-
-RDEPEND="
-	dap? ( net-misc/curl:0= )
-	hdf? ( sci-libs/hdf:0= sci-libs/hdf5:0= )
-	hdf5? ( sci-libs/hdf5:0=[hl(+),mpi=,szip=,zlib] )"
-DEPEND="${RDEPEND}"
-# doc generation is missing many doxygen files in tar ball
-#	doc? ( app-doc/doxygen[dot] )"
-
-REQUIRED_USE="test? ( tools ) szip? ( hdf5 ) mpi? ( hdf5 )"
-
-S="${WORKDIR}/${PN}-c-${PV}"
-
-src_configure() {
-	local myconf
-	if use mpi; then
-		export CC=mpicc
-		myconf="--enable-parallel"
-		use test && myconf+=" --enable-parallel-tests"
-	fi
-	econf "${myconf}" \
-		--disable-examples \
-		--disable-dap-remote-tests \
-		$(use_enable dap) \
-		$(use_enable hdf hdf4) \
-		$(use_enable hdf5 netcdf-4) \
-		$(use_enable static-libs static) \
-		$(use_enable tools utilities)
-}
-
-src_install() {
-	default
-	use examples && dodoc -r examples
-	prune_libtool_files
-}
diff --git a/sci-libs/netcdf/netcdf-4.4.1.1.ebuild b/sci-libs/netcdf/netcdf-4.4.1.1.ebuild
deleted file mode 100644
index 645d3596db65..000000000000
--- a/sci-libs/netcdf/netcdf-4.4.1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Scientific library and interface for array oriented data access"
-HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
-SRC_URI="https://github.com/Unidata/netcdf-c/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UCAR-Unidata"
-SLOT="0/11"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+dap examples hdf +hdf5 mpi static-libs szip test tools"
-
-RDEPEND="
-	dap? ( net-misc/curl:0= )
-	hdf? ( sci-libs/hdf:0= sci-libs/hdf5:0= )
-	hdf5? ( sci-libs/hdf5:0=[hl(+),mpi=,szip=,zlib] )"
-DEPEND="${RDEPEND}"
-# doc generation is missing many doxygen files in tar ball
-#	doc? ( app-doc/doxygen[dot] )"
-
-REQUIRED_USE="test? ( tools ) szip? ( hdf5 ) mpi? ( hdf5 )"
-
-S="${WORKDIR}/${PN}-c-${PV}"
-
-src_configure() {
-	local myconf
-	if use mpi; then
-		export CC=mpicc
-		myconf="--enable-parallel"
-		use test && myconf+=" --enable-parallel-tests"
-	fi
-	econf "${myconf}" \
-		--disable-examples \
-		--disable-dap-remote-tests \
-		$(use_enable dap) \
-		$(use_enable hdf hdf4) \
-		$(use_enable hdf5 netcdf-4) \
-		$(use_enable static-libs static) \
-		$(use_enable tools utilities)
-}
-
-src_test() {
-	# fails parallel tests: bug #621486
-	emake check -j1
-}
-
-src_install() {
-	default
-	use examples && dodoc -r examples
-	prune_libtool_files
-}
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index d2d8a576c575..d9c0496763ff 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -17,4 +17,4 @@ DIST vtkDocHtml-6.1.0.tar.gz 230827905 BLAKE2B a323728450c5054d715dac137e54ed9b9
 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
-MISC metadata.xml 1120 BLAKE2B 17456da598e4b7dfddec75a323def586e3b099ddfaa2e5883410afdd9143d317a6db53ead747b097cf8631f738d6a0b38a1e27ea37b445ba667a403053223e02 SHA512 d0d9ccd1922afe496e24d38fee05793fdf3983f798bef817a00c77bb632f2cabe3d2be554d0e979c223fd4005f3186b9ef78d394050539bd21cba5c2b6e56143
+MISC metadata.xml 1122 BLAKE2B 8dbb591a7a7058bb373268f588fab8e1d4a16840dd92cb2c288222e091a84bbd7c30bac38ed289f7aa4fcd7fb002438f13ce4046e27822271a34d0bb5410fb39 SHA512 1415d25d21fb73f3eebe0401a1a1d022ace5f4a95e1e522209a2010d98b70a721abb6c5214a5bbe8d68df889b439229c618f7d5fa0671fd98eefb572a4b1bae0
diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml
index dbcdc25b2345..9faa532b1c8a 100644
--- a/sci-libs/vtk/metadata.xml
+++ b/sci-libs/vtk/metadata.xml
@@ -11,14 +11,14 @@
     <flag name="cg">Use nvidia's cg shaders</flag>
     <flag name="gdal">Support for gdal formated data</flag>
     <flag name="imaging">Building Imaging modules</flag>
-    <flag name="json">Support for json formated data</flag>
+    <flag name="json">Support for json formatted data</flag>
     <flag name="kaapi">Use <pkg>sci-libs/xkaapi</pkg> to handle smp support</flag>
     <flag name="offscreen">Offscreen rendering through OSMesa</flag>
     <flag name="rendering">Building Redering modules</flag>
     <flag name="tbb">Use <pkg>dev-cpp/tbb</pkg> to handle smp support</flag>
     <flag name="views">Building Views modules</flag>
     <flag name="web">Install web component</flag>
-    <flag name="xdmf2">Support for xdmf2 formated data</flag>
+    <flag name="xdmf2">Support for xdmf2 formatted data</flag>
     <flag name="R">Enable support for dev-lang/R</flag>
   </use>
 </pkgmetadata>