gentoo resync 31.01.2019

7 files changed, 17 insertions, 17 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index dac2bbb19d93..540a4482d6ab 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index caee535a7abb..ec3432a4adc6 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -13,5 +13,5 @@ AUX gdal-2.3.1-poppler-0.73.0.patch 906 BLAKE2B c71bf66068f19e80f38907d3f5ffd24e
 DIST gdal-2.3.0.tar.gz 14423820 BLAKE2B 6c67c66b2f68699249ccd4df2cb1e3b7042e94003b730e64bd8b8eec726a32da9485cab29552bd34c23831686ec3e879edd1848a2339c8289580ce282a287992 SHA512 b37e433be0b7a587ea9f9e5e720295e4cd1406f6c8ca770f5fedcd7fdc797e01e576eb887034b38f93f04a4e76c0ce84792bc7d91a49fea4122231a37ace812f
 DIST gdal-2.3.1.tar.gz 14450452 BLAKE2B 226ddf80ff8b9e3d420ac717b245a09fe3daa0331931f4d371b62ab9fa9bb0735ca11e1e045398de92d61b68815aa1dc3e7b6568f4853964cf42d188e46e6eb7 SHA512 0c5bb515dd2a9ad3110421b39bd680ce7e9de68e969cf35a7e63118965dbe193d25a7720a525e53af153de3e78f76ccc6983f4dcdfa6ba429d732a7a47a35d57
 EBUILD gdal-2.3.0-r2.ebuild 8138 BLAKE2B f11f4a5110a63b6eacac015ce16d05c235776a365d8328ce2046494ec560f6653f9dee26b8c99b536c6452d25e0fb600bfaed4b849b5dea87dea2bf5c0d5752b SHA512 a2cbe076456ad3b151c554b7f72da5fdf52637278b2e06816aede1e5150ee6c8aaf6441fd1be10a90b3bba380d99262c33430df10dfc7a524ea6001feca7bcab
-EBUILD gdal-2.3.1.ebuild 8497 BLAKE2B 263ccfa2d5ec703d0a51adea18f3a4cdfa5d2a8808c04b30f37bc5cb674e8d5c2f2eb578c4942691610a3d509252967b16056a371929a0eb1490ef4922c15f49 SHA512 9fe9e0bbe01a40dcff87ea0aa6004c8f5ca58619227bd76349ed0b85406c23c6f0cef79021a7634cce10fd1072a1f8bc1d6f7e5a6b6c35cb4a1bf5c21d999a29
+EBUILD gdal-2.3.1.ebuild 8399 BLAKE2B 6ca20d8216c0efb8091ea610a379a0f58aa51796b8bc72469c08105c98c087cd66ffd0646bcca492b260b786e48ae0f86288de42a4404b4e65a4005311aa7e87 SHA512 9ff7532518e51c578075315bd962e2b9d404deb27a053c479f3143ba9eac364f251ff23c8eca8e6951e41aed0eec8f9e78cd28a574a5d3f970fd821aa5ad87d6
 MISC metadata.xml 1616 BLAKE2B 7167165623c93e069ce77ef80e68e6339fc38354c0db343564ce8ecf3566e0d61b8b5aeb4e6b69e66bf1e8932d18de54b528bf1a2148767efe3b5cf985a31748 SHA512 dca0cb7a8c94a5313aed09f8c28ae35a55de4b0ff8198469b7f9adc8220b29cbd8c3f92db121b944b03c169b302ac8aa95f4342b76510590aff63a5f122c74c1
diff --git a/sci-libs/gdal/gdal-2.3.1.ebuild b/sci-libs/gdal/gdal-2.3.1.ebuild
index 9f81394be026..89243a3e82ff 100644
--- a/sci-libs/gdal/gdal-2.3.1.ebuild
+++ b/sci-libs/gdal/gdal-2.3.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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
 COMMON_DEPEND="
@@ -82,8 +82,9 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.2.3-soname.patch"
 	"${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866
 	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
-	"${FILESDIR}/${PN}-2.3.1-poppler-0.69.0.patch"
-	"${FILESDIR}/${PN}-2.3.1-poppler-0.71.0.patch" # bug 674556
+	# fixed in 2.4.0:
+	"${FILESDIR}/${P}-poppler-0.69.0.patch"
+	"${FILESDIR}/${P}-poppler-0.71.0.patch" # bug 674556
 )
 
 src_prepare() {
@@ -120,10 +121,9 @@ src_prepare() {
 
 	default
 
-	# not upstreamable, not fixed in 2.4.0 or master as of 2019-01-12:
-	has_version ">=app-text/poppler-0.72.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.72.0.patch"
-	# not upstreamable, not fixed in 2.4.0 or master as of 2019-01-16:
-	has_version ">=app-text/poppler-0.73.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.73.0.patch"
+	# fixed in git master or what will become 2.4.1:
+	has_version ">=app-text/poppler-0.72.0" && eapply "${FILESDIR}/${P}-poppler-0.72.0.patch"
+	has_version ">=app-text/poppler-0.73.0" && eapply "${FILESDIR}/${P}-poppler-0.73.0.patch"
 
 	eautoreconf
 }
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index f938da1b70d1..9e6711bdeadf 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -18,8 +18,8 @@ DIST scipy-1.1.0-ref.pdf 34360806 BLAKE2B f82807879d5d36d91d74e8983a0f4104bcb4b6
 DIST scipy-1.1.0.tar.gz 15583560 BLAKE2B 477753e622ee26a3bc8c2cb6829410152df84b29ce17a6d53a66348f5536f7993fedf5d32b782405b54b3af3feabf9bc91c381ed39546076849c2fdb71039404 SHA512 72fe32c6c009613cb78202598e5db14f8e630b3218839cfe18d43d40550d94cc5aa100c6f5d41f40e86ae148e9b6a13431bb91b0f9be44b0569ccd7b725fe973
 EBUILD scipy-0.16.1.ebuild 4249 BLAKE2B 8335f8abb2453467099d68e97aa3aa669634f64b42e75b3c310f6f39178f90c9b8760a1ffa4bb76a3ff6285dc19806074e7408d16427416caa2bcdb9db6aed0e SHA512 adc049f57eb2c16565d8d99983409a6f64f57938aa649d89008587374550af06aa5d1f9476f61d9fcfbaa5615e60732381c1ed436b0dd9241aee00b43370ba44
 EBUILD scipy-0.18.1.ebuild 4254 BLAKE2B 156c9f9cfa488170e9be814e2238f1e4113f6e176f4458f3f659959ab6d552729afff18a3a0c392a579f7025c216a7ce354910f836a26549866764d86d070f74 SHA512 f20fd715cbb7667cabf636db6cf11b8b1de26c497ef87a6d4ee16324415867a9fe06f0bca57677eacb4622b621e60badcd97e8325dc74076492cb0e29ef8e4f2
-EBUILD scipy-0.19.1.ebuild 4247 BLAKE2B 98a7b7152c422cd5540aee58ad2c400471954396ad680c6bb642ceaba7715c93b1ee19772fa001b40b94b4d0a855265af61575c6f65afd51b8c77a965e380f45 SHA512 fcb4dfa545cf24913f402261a8ccbd8ea9e7ac70aa6ae0d1eb66f3e0187d4459394f40a7a864c24dcf8c1802ee191701bbb01b6f72f4c9a03dcee3296136edc5
+EBUILD scipy-0.19.1.ebuild 4246 BLAKE2B 985eef95193aaddeb640ce5e9f2fd0413ac51a1c85e78c2e038e18de174c3a5ea9889693a6c4ed7300e84900663e4a41658b7997f647b581c199e037e2aca48a SHA512 0d1e398342ccc28c2f957c4c33a31750c15d425857d20b62a2e28e8cb40ee9479ec92ff607f3a12922f3977d9eeac8b7ef8bbdd56dab3cc6a1e20d68ec6c702e
 EBUILD scipy-1.0.0.ebuild 4033 BLAKE2B 5718c17ddfe3b7bd2e37354e62771136ceab83d34f0483bbc258cc4a1d1528a78c4ef7458096e83cab1593287dd975675b3d6e3ed430f93c4fa75d71d65cc2b9 SHA512 198f6b4b1dbec7bcb8d2e843697d7cc805bbd28b4c0aa5b21d71032081c6c9d71a3492c182a417bc10aa2178b004ff52ec68901db8196656b7852ec630d9cb68
-EBUILD scipy-1.1.0.ebuild 4033 BLAKE2B 5718c17ddfe3b7bd2e37354e62771136ceab83d34f0483bbc258cc4a1d1528a78c4ef7458096e83cab1593287dd975675b3d6e3ed430f93c4fa75d71d65cc2b9 SHA512 198f6b4b1dbec7bcb8d2e843697d7cc805bbd28b4c0aa5b21d71032081c6c9d71a3492c182a417bc10aa2178b004ff52ec68901db8196656b7852ec630d9cb68
-EBUILD scipy-9999.ebuild 3615 BLAKE2B 83d9274d3c6cc56d1de623b99e15da74df3615aec38675912937cf0572a74ce5ad0eaaa945e541707d8a5444251d4009eddeeffb287cd4db89cf610188f0759b SHA512 55148129c46cacdca338380d7d26792dcdb5d7fa3128273de9c44e930d6bf83715574d26d8b065fec8b633f1efbda9d9446a5b6bae04bc9069d315a1ee85f385
+EBUILD scipy-1.1.0.ebuild 4032 BLAKE2B 8774ce67b6d3dfc74957a384852297e1fa1be54938ed02351632e4c0e330407d9c84230d1d21ae2707e88027e258881bd52eec8198c68bf5ec6171aa1c84af4f SHA512 c8a7cb23cbe23a50f37703d5b99af510bfb1b805b197e5fd6d91a69d1fd4d26dbdd0c7d74590e457188994735a1bf59413718e7e6f07792d95212467f6567e99
+EBUILD scipy-9999.ebuild 3614 BLAKE2B 70dd389dad2b78b79c867e50ed963f6e8d9f2fb560ca5b0b23463158267aef78f7c7a2eb30087f4600bc3449fa31cff81d752d1c41317f82fc28765b2c38c8ee SHA512 ab2ba2adcc5927528447aeb9a8dced497df47f8f646f343fa0b9337f89d02367ec511725f83b001ba5485fc94ed4e95dbb5c8e9bf25bd70bc33eddc6ff54f288
 MISC metadata.xml 931 BLAKE2B 3e358fcc4354b870a4794f13ed6c840f2c55ffdf4d6306977e6db3606b73e7df9b682a18973f0aa2a1d0d9eabb2d7d40c6aa5c6026813385361700bdc227afd8 SHA512 ae95726c4c661a2e5708a98b347f8ea25708574bbaf8ec86f315069551d6a0d68a43279b214be8b54cd20e5aacea1a9abd40a2de43d51f292a830cab0955d625
diff --git a/sci-libs/scipy/scipy-0.19.1.ebuild b/sci-libs/scipy/scipy-0.19.1.ebuild
index c12cc341cc76..81bfc711b518 100644
--- a/sci-libs/scipy/scipy-0.19.1.ebuild
+++ b/sci-libs/scipy/scipy-0.19.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}
diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild b/sci-libs/scipy/scipy-1.1.0.ebuild
index 0db065d7043a..6a801e838d63 100644
--- a/sci-libs/scipy/scipy-1.1.0.ebuild
+++ b/sci-libs/scipy/scipy-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}
diff --git a/sci-libs/scipy/scipy-9999.ebuild b/sci-libs/scipy/scipy-9999.ebuild
index b25250bfad33..1595b85c58b3 100644
--- a/sci-libs/scipy/scipy-9999.ebuild
+++ b/sci-libs/scipy/scipy-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}