gentoo resync : 05.02.2020

14 files changed, 44 insertions, 99 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 930ad13c875d..ea06602455a3 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 9c51bfbf8720..65d4a05a259b 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -5,8 +5,8 @@ AUX gnuplot-5.2.6-caca.patch 385 BLAKE2B 33607e93cf59c6774892df7588c843c9c03b2ee
 DIST gnuplot-5.0.7.tar.gz 5100186 BLAKE2B 97fcefa12148fc2b581113c5283eb09217e87858ae293931758d0bb595fd7aaca4671216956211a3d30492be35f91809a975c9c80c25861c477e9235a8b5b309 SHA512 5d7241dc1472f87af8632110a1e88f83b5ea3f41e1bc8c89a45dc4662a3071d91a25bf9ae5196a2b8bef09c8079c22f635bb947c02def3416d78880d61eea919
 DIST gnuplot-5.2.6.tar.gz 5321601 BLAKE2B 4281ba29926ee7fc046b48006fed6513dd3a9ee8bd3a6aa41c5782c5162bfc8af64ffdfec77d4996af6a634f5f3424404eab77c0efd91c65bd34412f5b8f17c7 SHA512 557c0d00c951055ca03ef0f2b262e96b8013da4fedeb64dc5325fabd94772144fd2fe7bfa9d159fa47ab76695109cb4d3f01fc5bfa996df4576aee0eebe36a90
 DIST gnuplot-5.2.7.tar.gz 5335673 BLAKE2B 6ca3055f6bb2e032562c7f21beda0adca1087598c7bacc9ab187c7ea4a3d85e08598ddb0ff0660bca081bc17899dbb92bbfbb6acde8b7b5367f12da7a2a14b62 SHA512 f6b77e16b25e5705ea9dad4f89ed5f5a3cf95d3e4215da00be3cbfbcdeee23009e9205156399448526783f25b5b7599b674670c94c01345abafeff74f6c7de93
-EBUILD gnuplot-5.0.7.ebuild 5771 BLAKE2B 29e8b159e8d65a8842b43da2a108c49d6eed8090111ad649d4ab3fedc065048cef578ffd8759c3c2e8fcb05516a344a62a3f89d7b8f140c77d2d966d6a209784 SHA512 5b401f627f79dad02b96a596dec66ded1ec904ec7c159fb98e4323bc96c95d83f4708778cb934c58eef8bb1aa323dd93175ffb0edb6090ed08ff2b8f26870640
-EBUILD gnuplot-5.2.6.ebuild 5835 BLAKE2B e34ccf87d4541fa263a13aae53e54a22281f88e96143af73754e43ad629dafd76aa0f50a294c531f814396345df47dbcc19925ed8f5c2bcab0b599391cd4ba6b SHA512 199af5806464c4a85daaf8eafbe612c2355cef5037632dc88db9674063eba3a42a5c7e11dfa538cfec9b991741f172a7b7e9e35feb7d22594837ced2c132944e
+EBUILD gnuplot-5.0.7.ebuild 5772 BLAKE2B 885962a3e873639ceeee360bab9fed851c785e017c354d55e0502fad81193092dc2335f3d4fa617dc8054f52445a1a3fb55496c83f954ddcd958b42dcebf70f8 SHA512 be81f70f53f0b625f5b27ae63352693efda47746eac5a0a93b01d864f2be53ada42aefc1cd0da2a589302a8643a23400f8b8d4fbfc9f0ee80136cee0383e6699
+EBUILD gnuplot-5.2.6.ebuild 5836 BLAKE2B 4b185e9880efbfc7adf373116f135f609614a5a3f51776fb021fcb79db47431cd98c0a1c6721cbf7913585976ba3beb5802ad747e228026d3ac66edb6184fee8 SHA512 434b8c6d616e1af1692f5605ae660cc755e9a0ff6fdabce67779c00037e407b2c1830a0c3e1561345701feb62bd34a196d3a9eba5f885df669fde81011a04698
 EBUILD gnuplot-5.2.7.ebuild 5836 BLAKE2B 4b185e9880efbfc7adf373116f135f609614a5a3f51776fb021fcb79db47431cd98c0a1c6721cbf7913585976ba3beb5802ad747e228026d3ac66edb6184fee8 SHA512 434b8c6d616e1af1692f5605ae660cc755e9a0ff6fdabce67779c00037e407b2c1830a0c3e1561345701feb62bd34a196d3a9eba5f885df669fde81011a04698
 EBUILD gnuplot-5.2.9999.ebuild 5732 BLAKE2B 30e18d41e564b6316253b6aad9ad99f6e181996df3235f6c3dc89798528479c83bc66eb2912165c6bda278916a45834e3899d54373907707717caa6ce43e6e25 SHA512 ec8298cc2b0e7d82578a0322f9634710d3875e1c21cd4360ae79dae77a744eb179efdd375057344d771fd554302c1fa1e7832efe8502ee7eccbbebbeae07dbc6
 EBUILD gnuplot-5.3.9999.ebuild 5154 BLAKE2B ffed0a6362d6db589ebd626f93cbf36c7ecc3539d39ed979e62b7d7b42e596b207980c98a0459d72c4d2dd57b1054486dc6009f679de7763b6d31b15eff5df36 SHA512 2613b14581d311a39f1e128131b5dea6f96896371df2f8138ce7c2ce037e8e925a5341922d9bb2223088578891b9760d9e9319375297b653a3732a383ceff048
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
index 663fcc15eac9..c3a0eb1fbbab 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
@@ -19,7 +19,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="gnuplot"
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild
index 2b92e5cc1bce..e2c078bf41d8 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild
@@ -17,7 +17,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="gnuplot"
diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
index 79064794b2b4..68260f06708e 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -1,9 +1,8 @@
 AUX gwyddion-2.47-cfitsio.patch 863 BLAKE2B 9bfb48ba7fc3dd75cba86a0ca1910c68f6affa78722723ab5945354e9d7fd477ed5b7d5df320b031a693fa9c3187270f7a1bbf37ee3d914a215f18af7ae0ae94 SHA512 5558022a002e589a358e2560ea23eb68b1b3c01536663f11dfd6e84f8927220b56ca16b00ffc9481a14b3fb0b605d1fcb71ff9529a5b3561a6f83a2aa7785db8
 AUX gwyddion-2.55-automagic.patch 1441 BLAKE2B 3f6096392742beea11c908035efebb24129ebd8a4c7207f35615c7c1b97842f5ad774bcf24369d50cb7e0270db8b46c39dd4c4074c660dd00e1a2a9150c6fa3a SHA512 6a83a723e5a82c8123b0739aba8d638d641a776fd807f8dedbff68cd035256cf3b1941b89a039bf5fd5ad24b3bf2f25237dc13f89797e7eace0e1832f74a8c7e
-DIST gwyddion-2.44.tar.xz 3517624 BLAKE2B c32dd33e2fe6c6a09062807db1a25fd54d3becc12bb806a21572f992429cc52a2180221c5627ab49d44f24c13f9928e3825c1b833adff1523d0caa092829ecf7 SHA512 c80a0e4e9dde2f669763629d34dacc0015770c4704a10fc820f4d8e75b4f4275852162653f0c6c52674ed76162861af860de6741466d939066bfea3fb584d2ff
+AUX gwyddion-2.55-mime.patch 726 BLAKE2B fde2a0b132fbc484f905a0c06a9b666b8bd57a33b9804e7db56b58bf543947434e2f15eb82d6c2cddc066bbc575412461b57fd3be4c3668ec35e69af3081b3dc SHA512 8703b8a09fb84a979afef5a921e29af8514318d47d184ece66f3caae45639fa643701be29bc78ea541f13dc7018950f75a5f5c7099ce2275004ddf768b5c68a1
 DIST gwyddion-2.47.tar.xz 3974120 BLAKE2B c9a0241fe509a2f067c16f77d2b02885505d47c3ba0f25a44449e0d5ad05ce8596784392d8f1265823577aeebbab7ad9c96a39625b01bf11da3cebeb1c6453cc SHA512 a6bbda2d32ec013a9d6c7e2b6dbf2cef08d8f964099c0fda511bc92c16c943459f29d52f784a599466af65027aaae3aaeb1b79e56c40e39bc47019044eecd3e6
 DIST gwyddion-2.55.tar.xz 4607560 BLAKE2B 30489d980d3feb6986be4041b59c847673ee589674d5913b4508f28f072eb2f570b98f0b1be01dcf6e1d45e86607582967fd83fe3c859172fcdef3c7bffae741 SHA512 680c33b1f7d36de31274869e7f0af9c06030e04779d6b59f06860ae3f47db4ad45bbf3ee2219bb7b6c01807a807aeafa4f5d0aefe20601e0dda1011acf59fc8e
-EBUILD gwyddion-2.44-r1.ebuild 1625 BLAKE2B f22904c93c4938729297f920ac8a9bf1c231f9c75ea7d983bd24f960a6207812a599306be9f4390a790f54dc13320af2725303ff868dc174878591ea0d051c16 SHA512 f476b7f13e496cde117de6fded22676324bb76d093e2aee05c0291c45a242372f7c315c9a4975fa99e0085a38ecb4f274cb0c34bdece7cc51101d58e37ddecfa
-EBUILD gwyddion-2.47-r1.ebuild 1478 BLAKE2B 4cfc6c856151e096736b0f88bee67fd2f32969ea3cce0de7479e3acb01dae033e0ea09ff69edc3fb90e8ca9d7f1ce9700b93fc7ae794e1329e2a69342df4085c SHA512 84f1b06f7dc4c0c896cb0b3f8467c6cb732024abaa44d62087f73bdb77d0c5f3c314fb34990b596e3aeb9ba9474a1a04c7c2969d77a4056a374af0f2c5a63380
-EBUILD gwyddion-2.55.ebuild 1584 BLAKE2B 16f5b61c897c112a9009661318570ffeb43178d4424f7fe7725860819eeb74d1bb9aed279c69c0d2db29db5d74323567b4e843b12b24855a46f7162e1dd86f0a SHA512 4c7e96cca6efcc0348d278e1e696be31463c744b4c498153c16820eaa594fd34c6a35c8c729a1752856ec0275ea934e7724806ac01eaf61d2db2d81bd10e2b01
+EBUILD gwyddion-2.47-r1.ebuild 1477 BLAKE2B a1840c25a0f5f073bc77843b964cd58a919dfaffc6e54f43aeefbdb1bf7ffed1c06f48c1a48b66bbd937bdec0d5ab32a5dcca3770183f4acc3e4c18f9065a7d6 SHA512 75d698162922c955ab0d46890eb99646a5d5ec3a6c805c59455e073e4bc38a66cc6f3009b1771b53117e91752e046d82f8d259b1602df2fff62e3d0701e9a392
+EBUILD gwyddion-2.55-r2.ebuild 1559 BLAKE2B 6905a712d6672c928840f36fc4150d7f4ad3a85c8bd505b5a415cb94476a616bb933590130373c63f47be36f0bfb7ef4e0a2cd3544e9c994f3d3262afbf84fbd SHA512 2c172f1d9df59c72a800336035c1839f69a1e5fab98a5f49a90024e4d4fe74bd7150dd7de8ccfa7480eabf2dbe2eef5fd1de649881222cfb130bab579fc86036
 MISC metadata.xml 938 BLAKE2B a6bdd3f5aa17f3846d6e44ebbb6f7e230253df851819bd3ce27be44d6e288590f149576fb2bbd8e19ad04c757d58675f6b96d57571c0c92eae8dde432a08b2ee SHA512 2e90996291b1a4ca744a87af2621e3f8afcf39660a550e82d1b018ffffc41123897a923702ba61718ca97586d95672dee8777579cc4f666e57df88e534f555b1
diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch b/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch
new file mode 100644
index 000000000000..536790c1ac46
--- /dev/null
+++ b/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch
@@ -0,0 +1,15 @@
+Index: gwyddion/modules/file/ambprofile.c
+===================================================================
+--- gwyddion/modules/file/ambprofile.c	(revision 22650)
++++ gwyddion/modules/file/ambprofile.c	(revision 22651)
+@@ -32,8 +32,8 @@
+  *   <comment>Ambios XML profile data</comment>
+  *   <magic priority="80">
+  *     <match type="string" offset="0" value="&lt;?xml">
+- *       <match type="string" offset="40:120" value="<ProfilometerData>">
+- *          <match type="string" offset="60:140" value="<Header>"/>
++ *       <match type="string" offset="40:120" value="&lt;ProfilometerData&gt;">
++ *          <match type="string" offset="60:140" value="&lt;Header&gt;"/>
+  *       </match>
+  *     </match>
+  *   </magic>
diff --git a/sci-visualization/gwyddion/gwyddion-2.44-r1.ebuild b/sci-visualization/gwyddion/gwyddion-2.44-r1.ebuild
deleted file mode 100644
index 47c8b1ba0853..000000000000
--- a/sci-visualization/gwyddion/gwyddion-2.44-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils fdo-mime gnome2-utils
-
-DESCRIPTION="Framework for Scanning Mode Microscopy data analysis"
-HOMEPAGE="http://gwyddion.net/"
-SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc fits fftw gnome nls opengl perl ruby sourceview xml X"
-
-RDEPEND="
-	media-libs/libpng:0
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libXmu
-	x11-libs/pango
-	fits? ( sci-libs/cfitsio )
-	fftw? ( sci-libs/fftw:3.0 )
-	gnome? ( gnome-base/gconf:2 )
-	opengl? ( virtual/opengl x11-libs/gtkglext )
-	perl? ( dev-lang/perl )
-	ruby? ( dev-ruby/narray )
-	sourceview? ( x11-libs/gtksourceview:2.0 )
-	xml? ( dev-libs/libxml2:2 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-MAKEOPTS+=" V=1"
-
-src_configure() {
-	local myeconfargs=(
-		--disable-rpath
-		--without-kde4-thumbnailer
-		$(use_enable doc gtk-doc)
-		$(use_enable nls)
-		$(use_enable python pygwy)
-		$(use_enable fits cfitsio)
-		$(use_with perl)
-		--without-python
-		$(use_with ruby)
-		$(use_with fftw fftw3)
-		$(use_with opengl gl)
-		$(use_with sourceview gtksourceview)
-		$(use_with xml libxml2)
-		$(use_with X x)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-}
-
-pkg_postinst() {
-	use gnome && gnome2_gconf_install
-	fdo-mime_desktop_database_update
-}
-
-pkg_prerm() {
-	use gnome && gnome2_gconf_uninstall
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild b/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild
index d79ead6a58a8..1e7286e2d11b 100644
--- a/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc fits fftw gnome nls opengl perl ruby sourceview xml X"
 
 RDEPEND="
diff --git a/sci-visualization/gwyddion/gwyddion-2.55.ebuild b/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild
index 38eb5f9eca44..af6b46015063 100644
--- a/sci-visualization/gwyddion/gwyddion-2.55.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fits gnome nls openexr opengl perl ruby sourceview xml X"
+IUSE="doc fits gnome nls openexr perl ruby sourceview xml X"
 
 RDEPEND="
 	>=dev-libs/glib-2.32
@@ -26,7 +26,6 @@ RDEPEND="
 	fits? ( sci-libs/cfitsio )
 	gnome? ( gnome-base/gconf:2 )
 	openexr? ( media-libs/openexr:= )
-	opengl? ( virtual/opengl x11-libs/gtkglext )
 	perl? ( dev-lang/perl:= )
 	ruby? ( dev-ruby/narray )
 	sourceview? ( x11-libs/gtksourceview:2.0 )
@@ -39,6 +38,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.55-automagic.patch"
+	"${FILESDIR}/${PN}-2.55-mime.patch"
 )
 
 src_prepare() {
@@ -57,7 +57,7 @@ src_configure() {
 		$(use_with perl) \
 		--without-python \
 		$(use_with ruby) \
-		$(use_with opengl gl) \
+		--without-gl \
 		$(use_with openexr exr) \
 		$(use_with sourceview gtksourceview) \
 		$(use_with xml libxml2) \
diff --git a/sci-visualization/pythonprop/Manifest b/sci-visualization/pythonprop/Manifest
index b6491bfc056c..d7ed0472e07e 100644
--- a/sci-visualization/pythonprop/Manifest
+++ b/sci-visualization/pythonprop/Manifest
@@ -1,5 +1,5 @@
 DIST pythonprop-0.13.tar.gz 217721 BLAKE2B bd22106e528267ea49e1f68e22ad03958bd064aa4009a5da01a7943dedc7f4e84b8e8dfe8bfc80bc0fe248457cdef69df1d471017c9626757a764aad52e1ccb3 SHA512 b637f48369c926c8dd680a433d46236dc4fa70be79b2325d8f82e320b2d75b1e6d7d992bd81022d27fb6ab118d92178c7ad5ad94f6011a396e4a28d7431bbf2b
 DIST pythonprop-0.18.tar.gz 1158035 BLAKE2B 3a01eb72ccfc3d0ebc356c4518d570544cedb01c5dff02ba55dd6be02b529bb4e6cf53346f74ac0dc21cf0662b107f58a064a704c124024c98419f330846868a SHA512 2ca796f215e5aab33bee7dd161358c3065b464587597363dee9f03758cf666cca1b70f5b83e8ac266e21f77b806711cb6f48a1d7c3cd0b97f1461e897f5f9f80
-EBUILD pythonprop-0.13.ebuild 593 BLAKE2B 94d9dcc25cc55b39fae9cf49020479279781102dc127faa2d4b1a395db96bd008fcb64530f0d9abfbbb827bf2efbff77060db0153fee39839ebd9db268b14f3c SHA512 d9d38cd3e60fbff6adf61d8d6a04253ecb0ae11e56e65da29f5652b0c63ad5e49a3453ea66b98b0c859a01977041e688a1ad77d103ff8d4f3e46403506ec4883
-EBUILD pythonprop-0.18.ebuild 875 BLAKE2B eebb19f92b179c8a6ac3959206964574dd3dba7f3e515822aaa40b55b84b9249c2747914751ea6abb1594d6800320725dd4df7971d0b8bd6d9919f361d0e9512 SHA512 afb6b3a775918bbd8d77b72cee642ab972fcc2660b19ec763f74ecd71d636d209152b263b162086928ddd3cbdaee265fbaaf1f34bd80d84f97075a2c06ccd3aa
+EBUILD pythonprop-0.13.ebuild 655 BLAKE2B 2415c43259f6dceedb093ff8c271c22a816be418533f166ccd3c8ca8526e2f53de3ca43b69c3134f5b8d8d166a561a1908aff8fc14f317aad86609efe7a09e7c SHA512 762df784334b9ad3e951acfa03406dad59bdc45c76660b1fad48b9ec1411d44153360bb606c1dc567d4fc0b5edbbe419c968dffc627f673701f46da249bd405b
+EBUILD pythonprop-0.18-r1.ebuild 932 BLAKE2B 1c8cbe807ba78d320dc43527d57da73f2940e542e7f899fdbc99abdc56d66f38bc3f16b4d1a1d60ada0f767ff752ac7b83199035da3237fa79a3cdf96da42f8d SHA512 762937dcec7b236e254a569f9de2733c464c645cf33a7c295a9c70037bc8073f7524e76dabda4a53606961faa91d1684e0a2c4bfd8a7f1cd8d7aca84c06d217a
 MISC metadata.xml 459 BLAKE2B dbf50a4c24f4a4dc0b27d087e0f0942ef7826ed8fcb858fd9744371f906bc5e1ff727a37db157705f5ebf630e744ce21bf9fc578e59eaaa6170215066b85a681 SHA512 23f2836015bd753b0a4957be9efa3347d2f5c6b79ec041465120aa9e8e6565397ba343ea8a393273eaab3c146b8555914b4a1e8bba2a0c4596bc49833388e8f1
diff --git a/sci-visualization/pythonprop/pythonprop-0.13.ebuild b/sci-visualization/pythonprop/pythonprop-0.13.ebuild
index b5063be83fa5..854920aa56a8 100644
--- a/sci-visualization/pythonprop/pythonprop-0.13.ebuild
+++ b/sci-visualization/pythonprop/pythonprop-0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-python/matplotlib[gtk2,${PYTHON_USEDEP}]
+	|| (
+		dev-python/matplotlib-python2[gtk2,${PYTHON_USEDEP}]
+		dev-python/matplotlib[gtk2,${PYTHON_USEDEP}]
+	)
 	dev-python/basemap[${PYTHON_USEDEP}]
 	sci-electronics/voacapl
 "
diff --git a/sci-visualization/pythonprop/pythonprop-0.18.ebuild b/sci-visualization/pythonprop/pythonprop-0.18-r1.ebuild
index 96d40ecb22de..a5c36e5b53b4 100644
--- a/sci-visualization/pythonprop/pythonprop-0.18.ebuild
+++ b/sci-visualization/pythonprop/pythonprop-0.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-python/matplotlib[${PYTHON_USEDEP}]
+	|| (
+		dev-python/matplotlib-python2[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+	)
 	dev-python/basemap[${PYTHON_USEDEP}]
 	sci-electronics/voacapl
 "
diff --git a/sci-visualization/pyxplot/Manifest b/sci-visualization/pyxplot/Manifest
index 947ec5b18121..c81bb400fd09 100644
--- a/sci-visualization/pyxplot/Manifest
+++ b/sci-visualization/pyxplot/Manifest
@@ -1,3 +1,3 @@
 DIST pyxplot_0.9.2.tar.gz 4131841 BLAKE2B 8a5da46f2328ae8e73d7b841dc04b8d972bdaeb7dacaf658349e5235a696334cd806b8f8bc25b9bbebe2074f52f4fb0bad4b22ff305250b1a4d138ea039657e5 SHA512 34c43fec36dd579161c7adb9f0bab012c5d3e59c904526f82a70a31685b88a231c300ab4dbdff376b29fdd5698c376d55f7a2f2786d7960c4de7e6e0776fa844
-EBUILD pyxplot-0.9.2-r1.ebuild 948 BLAKE2B a92e9ad6395413419f2a13948880991dd1d4cddfdbd68be9eef083cae88f7d55babaaf0789e9402e45d656e6c6e1b91d90dd23359c43119996474ce60655fa64 SHA512 c00ed18ff4a4e28754ed15b447b6edfa87125924a1ef795d49ff125cf626f6b767355d0393d7c644ea0f1fbf08859e4d6990b1f64a5b52fc190aed1c681b4f47
+EBUILD pyxplot-0.9.2-r2.ebuild 998 BLAKE2B d3378d9a18598654471f885ac1da3f512afc393594fc6f82d48f5962921440a685c2b784c9b76806d0a8e225ebe797f9f96dd2183388e699a4963c27461930c6 SHA512 23ef5ce2e687362f51bd173db7b0f3e810c6470ac8e3efe15410ab79b8a22f1702a678bf1dee18069fd195405d819df389972c3edc8a8487d5540d71c1b6134f
 MISC metadata.xml 649 BLAKE2B a709482e9a6d3f30231db228633f682ba1426640a5ababffc02b8a625900f62ec1f2bd40a6d2469085d87ed7c342081596d7371b112f0c4b56435f2ca7253f15 SHA512 2f9b6c06f24dccd4c954dc35cd4ac2b286ff77c5cf5794ed8ec6e20af4050c09099c84bdd75402823aed922f879b8d4340d9f6ce8763e116c0ba476853475531
diff --git a/sci-visualization/pyxplot/pyxplot-0.9.2-r1.ebuild b/sci-visualization/pyxplot/pyxplot-0.9.2-r2.ebuild
index 614513710085..7ecda5c36f0e 100644
--- a/sci-visualization/pyxplot/pyxplot-0.9.2-r1.ebuild
+++ b/sci-visualization/pyxplot/pyxplot-0.9.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,7 +24,10 @@ RDEPEND="
 	sci-libs/cfitsio
 	sci-libs/fftw:3.0=
 	sci-libs/gsl
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	|| (
+		sci-libs/scipy-python2[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)
 	virtual/latex-base
 	virtual/imagemagick-tools
 	${PYTHON_DEPS}"