summaryrefslogtreecommitdiff
path: root/sci-visualization
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-05-30 11:44:06 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-05-30 11:44:06 +0100
commitf516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree8bfecb640b7b6403d7a3d662d923eed630033da7 /sci-visualization
parent1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)
gentoo resync : 30.05.2020
Diffstat (limited to 'sci-visualization')
-rw-r--r--sci-visualization/Manifest.gzbin5197 -> 5362 bytes
-rw-r--r--sci-visualization/gr/Manifest4
-rw-r--r--sci-visualization/gr/files/gr-0.49.0-paths.patch15
-rw-r--r--sci-visualization/gr/gr-0.49.0.ebuild58
-rw-r--r--sci-visualization/gr/metadata.xml8
-rw-r--r--sci-visualization/grace/Manifest4
-rw-r--r--sci-visualization/grace/grace-5.1.25.ebuild4
-rw-r--r--sci-visualization/grace/grace-5.1.25_p7.ebuild2
-rw-r--r--sci-visualization/tensorboard/Manifest2
-rw-r--r--sci-visualization/tensorboard/tensorboard-2.2.1.ebuild63
-rw-r--r--sci-visualization/xyscan/Manifest2
-rw-r--r--sci-visualization/xyscan/xyscan-4.3.0.ebuild11
-rw-r--r--sci-visualization/zhu3d/Manifest2
-rw-r--r--sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild4
14 files changed, 164 insertions, 15 deletions
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index b0ce6c4669b8..f8e58f486c1f 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
Binary files differ
diff --git a/sci-visualization/gr/Manifest b/sci-visualization/gr/Manifest
new file mode 100644
index 000000000000..24b5645b4702
--- /dev/null
+++ b/sci-visualization/gr/Manifest
@@ -0,0 +1,4 @@
+AUX gr-0.49.0-paths.patch 461 BLAKE2B e8ebc8f2ad6731d402c9d9bd8237b191b57268a27c0c4da67bad2a9efc30d1966ae39e38a8631a158babe6c1d5ba81ee74f85bfb7c8002ef3310613dce71d02f SHA512 e3a2916f8366796761049e6ac5d069ac65f270a195fdf48843042c85455c1e65d7369e10d00ac6a2c72cb9cd172d1535d521f4fe06bbe57584159ef7c1e32fd5
+DIST gr-0.49.0.tar.gz 8604669 BLAKE2B a4f14910b8b229e722018a00e7f7f1b0c354265282b16c49e536bb8771a1bd69c0e0c17a9e4e70593f185e6c58885fcb6842b2f2c121988c1c161f5d11548b1b SHA512 851deac9cc2f42a9f62883e6bfb4bcc6e71e46910ec97a7b5fec087299f12d09043365f594d47c315a23079342bf25893b1a0f59bbd0e92eb140cc2a11126a14
+EBUILD gr-0.49.0.ebuild 1319 BLAKE2B 3cb8e481e84708827d53ac1df595e3c04f8e8018ee9dc4eb7f259487036bf8770c338fdae63c64ddac150a46002980e83979bae2e78839c27ea0f5b832fe6ff1 SHA512 ea2701b3694bf8000f017b0fa7beef055b8ed3ae9c42a2983017a4198a9d9bce5875825492322ac9ea13d99cdf8fc4853029c2064d691e6e15d6634200409be2
+MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/sci-visualization/gr/files/gr-0.49.0-paths.patch b/sci-visualization/gr/files/gr-0.49.0-paths.patch
new file mode 100644
index 000000000000..73e23022f372
--- /dev/null
+++ b/sci-visualization/gr/files/gr-0.49.0-paths.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index db08eeb7..46be6fab 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -907,8 +907,8 @@ if(GR_INSTALL)
+ install(FILES lib/gr/qtgr/grwidget.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/)
+ endif()
+ install(
+- DIRECTORY lib/gks/fonts
+- DESTINATION ${CMAKE_INSTALL_PREFIX}/
++ DIRECTORY lib/gks/fonts/
++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/fonts/gks
+ USE_SOURCE_PERMISSIONS
+ )
+ endif()
diff --git a/sci-visualization/gr/gr-0.49.0.ebuild b/sci-visualization/gr/gr-0.49.0.ebuild
new file mode 100644
index 000000000000..cf5992490cfb
--- /dev/null
+++ b/sci-visualization/gr/gr-0.49.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Universal framework for cross-platform visualization applications"
+HOMEPAGE="http://gr-framework.org/"
+SRC_URI="https://github.com/sciapp/gr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cairo ffmpeg opengl postscript qt5 tiff truetype X"
+
+DEPEND="
+ media-libs/fontconfig
+ media-libs/libjpeg-turbo
+ media-libs/libpng
+ media-libs/qhull
+ sys-libs/zlib
+ cairo? ( x11-libs/cairo )
+ ffmpeg? ( media-video/ffmpeg )
+ opengl? (
+ media-libs/glfw
+ virtual/opengl
+ )
+ postscript? ( app-text/ghostscript-gpl )
+ qt5? ( dev-qt/qtgui:5 )
+ tiff? ( media-libs/tiff )
+ truetype? ( media-libs/freetype )
+ X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+PATCHES=(
+ "${FILESDIR}/${P}-paths.patch"
+)
+
+src_configure() {
+ use cairo || mycmakeargs+=( -DCAIRO_LIBRARY= )
+ use opengl || mycmakeargs+=( -DGLFW_LIBRARY= )
+ use postscript || mycmakeargs+=( -DGS_LIBRARY= )
+ use ffmpeg || mycmakeargs+=( -DFFMPEG_INCLUDE_DIR= )
+ use truetype || mycmakeargs+=( -DFREETYPE_LIBRARY= )
+ use tiff || mycmakeargs+=( -DTIFF_LIBRARY= )
+
+ # todo: Qt5, X11 automagic
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ find "${ED}" -name '*.a' -delete
+}
diff --git a/sci-visualization/gr/metadata.xml b/sci-visualization/gr/metadata.xml
new file mode 100644
index 000000000000..80a71f597854
--- /dev/null
+++ b/sci-visualization/gr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>dilfridge@gentoo.org</email>
+ <name>Andreas K. Huettel</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest
index e9b5fa2b56e1..4b1b4c27f3bc 100644
--- a/sci-visualization/grace/Manifest
+++ b/sci-visualization/grace/Manifest
@@ -8,6 +8,6 @@ DIST grace-5.1.25.tar.gz 2957689 BLAKE2B f46032c92aa2ed2484ca05c0eb858f47adfa885
DIST grace.png 338 BLAKE2B 3a109acd9e44929b9efe1fd6b707459b71cfbb601b98a00619096becff8d89fb46f2fe34f4a5c5974b125b4bed9b5f2452fee669627146ba00976dd43a7778b0 SHA512 804a693b867ad63f34964c7388f61719c558d253cb2c7bc7b6bd0647ad9b3ddc6b23d3950091b6804e4a94736f024486cf3dcce5f877135def34712ee95e4031
DIST grace.png.tar 10240 BLAKE2B 3e99cd04a92b547ed5440475363b140d0183c92d1865f0b4564890f705a87df4e55624d681fa77408948a841eac4358465e49e65fa02615e31ec54ffb84f059d SHA512 e94970b92894e58fd481d2f81e615c38b77fab7039985516a2ad9b2bb2bb7a82f4e3e8cdb639e7c0d55eaad6bf8abc636a342c94a356e3bd0520824252faddcf
DIST grace_5.1.25-7.debian.tar.xz 108904 BLAKE2B 17265969d0501e1b1306733178a680b93d1d5fa96d63df4c14e5b3cba70b68d44d90a77d6ec0aa5243c2a79048bb75aedefeae1a2bab551a6315d253ee831735 SHA512 2fa34337858454c8a28b666fccb7157e9c4895b828f25171c4c6b68316abbf6d4bc54032f1de01ccb6b86068f7059ae2462d18b4a273341f588f49fc35f1bb61
-EBUILD grace-5.1.25.ebuild 2755 BLAKE2B 8d795e4b22bcbd3703d46ce292953d14cc4c393d86e988953c877b14060fc2fa252e62a72297adefb5a42f1dd8ac371515a33c2850fc181d7bf54aaefb8fdd6a SHA512 b7b6188fc2825584783a059b1c54de606f81739c0098dd0e2dd7e129cee705fc7cf76ab383cd13ac88cc626c078c3410c4c7ae301b4dac7c016333315f2d4108
-EBUILD grace-5.1.25_p7.ebuild 2792 BLAKE2B 5873ea8e75fe9c1029139b7d2e45e39b34738dff7cbc5806db63789b9fcbc25d4d22c8686621583e1e2e232037a0f860e59da09b0473209d16fb60b2b1ee4ee9 SHA512 2fe8a3a6f89d4ac57688bdb562ebd183922a070dcb4bad13e17da4d5eb6d086216a790183c2ecc5604d8c974cbf83b13ffd8dbb62c8423a416bfc4affd470776
+EBUILD grace-5.1.25.ebuild 2753 BLAKE2B 78ab5459159144aa0a03ab5f330e67a5fbb7b3c780f30513c60ae378b1f0e97f3d29e53c666e869a8fd89d0b02ddafcc7aa3dbe4f1cb670321fa120bdf5ae0e0 SHA512 c1dc4d6fe7d15b50a679eca7d078252f77fd7ddeaa9ef5b8416e9e8bee500828a89963f62de64ff127ecba1bb6505c64f82751e608c56f710721770d80ef93e4
+EBUILD grace-5.1.25_p7.ebuild 2793 BLAKE2B 07606b425149de775a1bbba59d5c4d5aac7f8fc7e151f6680bdc418bff2765741b9f40ca7274cf640d0cee204dc54e66847ed8d4bd129cc1cc1d2ad36678a35d SHA512 a4052a5875c804de320ac949496816b4897b136f6e632b86482d9085044dc1bb0b7fc054303007f36e804c78f8e6df61c9c82edf92ff346d4e4fd53e8da649b2
MISC metadata.xml 854 BLAKE2B e13e7dd68252a64082dced5b692838ba88f0ea9795a319a9c3fecca6289be8bd57b3e3fd379741085da7548187bf340e0a156ed66ffaf56312db4cee551bf25e SHA512 ac6c70961058fcff4c352138f48f3efc468a82132625893775c775258b8d2e894d09faa3e51b382c437583088ac937ca3d8e2002f202fce6409c6f11e5acfaf2
diff --git a/sci-visualization/grace/grace-5.1.25.ebuild b/sci-visualization/grace/grace-5.1.25.ebuild
index 28ef1a814c03..cc86861fbe77 100644
--- a/sci-visualization/grace/grace-5.1.25.ebuild
+++ b/sci-visualization/grace/grace-5.1.25.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=6
@@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran
inherit eutils fortran-2 toolchain-funcs
DESCRIPTION="Motif based XY-plotting tool"
-HOMEPAGE="http://plasma-gate.weizmann.ac.il/Grace/"
+HOMEPAGE="https://plasma-gate.weizmann.ac.il/Grace/"
SRC_URI="
http://pkgs.fedoraproject.org/cgit/grace.git/plain/grace.png
https://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar
diff --git a/sci-visualization/grace/grace-5.1.25_p7.ebuild b/sci-visualization/grace/grace-5.1.25_p7.ebuild
index b38696109880..9a41b41a0961 100644
--- a/sci-visualization/grace/grace-5.1.25_p7.ebuild
+++ b/sci-visualization/grace/grace-5.1.25_p7.ebuild
@@ -7,7 +7,7 @@ FORTRAN_NEEDED=fortran
inherit desktop fortran-2 toolchain-funcs
DESCRIPTION="Motif based XY-plotting tool"
-HOMEPAGE="http://plasma-gate.weizmann.ac.il/Grace/"
+HOMEPAGE="https://plasma-gate.weizmann.ac.il/Grace/"
SRC_URI="
ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P/_p*}.tar.gz
mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
diff --git a/sci-visualization/tensorboard/Manifest b/sci-visualization/tensorboard/Manifest
index 41d895d8ba24..815c5534f6cc 100644
--- a/sci-visualization/tensorboard/Manifest
+++ b/sci-visualization/tensorboard/Manifest
@@ -1,7 +1,9 @@
DIST tensorboard-1.15.0.zip 3765194 BLAKE2B 54a9987b65d4e2b127789f0e66eb5bdef8c024d19a82867632b44eefc4718bc6eb6c68fa61fdb2306af2c3adbacc3c75ec15f7aa331038b15cec27af2d846f85 SHA512 7b47d60929b4be91b4d56e36fc5a19b79511b8f3a1081fe308d3a107f978f2c5d23ad2d209104de983bc44f4506cdb0cb6e09b37e552dc042600ea16e14827dc
DIST tensorboard-2.0.0.zip 3776140 BLAKE2B 2bfd5b9d5b1c21f7df19ce5dae8a3d72381092630d1f53409fa0b96cab56be323ddef116bab95184d045f82fec88f4162e1f7277b25ed9c19b77189cf1a132ba SHA512 e87ea39eae9b64c3314de771de98c21148517aee4103a4bc23d674273b1a220248d6ba85a9f94481c6d67e8d3733af099b91df3dae38537411082c1595aad73d
DIST tensorboard-2.1.0.zip 3835182 BLAKE2B c2c7dbc1ba4b85c52df6e693e1bd425bd76fe6db7ca25582b57d9c65c68b191dcdba2623ab0560139f1cac1bdf5c7a47261daaaf51fca46f2c5bf441f832a6fd SHA512 7463ace0863b90312a62a7fa96f4eca0147e85cf46ff21729f8996a794d54e14d876d3abe083d6aa4efd8e4e1582f7d5029de367f199981a34d4057b558bc51c
+DIST tensorboard-2.2.1.zip 2950617 BLAKE2B 487ad01981f994b23cb5fca8b60d9ed5f13ba13735d2613d1f3154eec9791b4b3068fb9fd50e75e16682e09ceb8a9ed8533ca2c43b6dea73db3adaeef15a889b SHA512 e96f8853d282dc19911cf2210ece0a4d7239f37dcba82e91697c80881fbcc21f12e4ba3e7d2eea7a84c9bb5b6521bf488d93d2312e55af9ec2d2c20f135d94fa
EBUILD tensorboard-1.15.0.ebuild 1685 BLAKE2B e7536cba5194bf668923f2db6ec8be419060f9dea9dabb33a4a10befb37f810175560a9d0203f923e2418f1c41fa92b357bd4348d45f6e5c2e8bd96d8918c4cb SHA512 2a484736a0c47fd7347ef5e278ac304acaaa5170007174bde2f48eada5d146b66ffcc0eaf67c1d8c1ee3ed57669c94b045c3f7523b8fb4d2edbc63fa2b2fdeb3
EBUILD tensorboard-2.0.0.ebuild 1685 BLAKE2B e7536cba5194bf668923f2db6ec8be419060f9dea9dabb33a4a10befb37f810175560a9d0203f923e2418f1c41fa92b357bd4348d45f6e5c2e8bd96d8918c4cb SHA512 2a484736a0c47fd7347ef5e278ac304acaaa5170007174bde2f48eada5d146b66ffcc0eaf67c1d8c1ee3ed57669c94b045c3f7523b8fb4d2edbc63fa2b2fdeb3
EBUILD tensorboard-2.1.0-r1.ebuild 1836 BLAKE2B 266792447328fc11b51052f61db05376bed5bf3c57875c82f7c24ddf3af13a4f1c3f40967481aefcea1ed3f31c9d0f296c0c01fc3863fdb17d929d9664dd8dd3 SHA512 ed297313f2164848777561147a93daa40efb9eef47b0408f45a926f29bc44385dc57d17897ce9bcba128837446dc8bdc07b42dd91e933506173186866a85b3e0
+EBUILD tensorboard-2.2.1.ebuild 1942 BLAKE2B 37dcf440eb4b43dca86d3e062922c7b3ef881c238fb63f40e6685e864cdbd334f4762ee7b48e349b5d352aea2c5571f608202fb424c2aff20ddd7f20bf8ff773 SHA512 3ef4be870873cab5a52749db718d221cfa62ac56ba0dab781bbf7f30a26d97463a720283d8a6eacde1cdba1809ff672771276f7f272e904237bda277f121f8b2
MISC metadata.xml 494 BLAKE2B 367959e934fdf8e447da9632a05ea0ada6116a7c39cf42096a3b24f0dcf0c0bfbd3263e6f3913611c27e76f629b77d1e5022fa124d7e79f03a224bd3627bb538 SHA512 b59bedcac4e07ddbb62e90df57670116ba51c3d8c6294679ba5d8f17d7adbf3644f3d203c1d1ef4fa06d7e50640148ee259a081afb807477784350b98c52da11
diff --git a/sci-visualization/tensorboard/tensorboard-2.2.1.ebuild b/sci-visualization/tensorboard/tensorboard-2.2.1.ebuild
new file mode 100644
index 000000000000..08bb80b2417a
--- /dev/null
+++ b/sci-visualization/tensorboard/tensorboard-2.2.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit python-r1
+
+DESCRIPTION="TensorFlow's Visualization Toolkit"
+HOMEPAGE="https://www.tensorflow.org/"
+SRC_URI="https://files.pythonhosted.org/packages/py3/${PN::1}/${PN}/${P}-py3-none-any.whl -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-python/bleach[${PYTHON_USEDEP}]
+ >=dev-python/google-auth-1.6.3[${PYTHON_USEDEP}]
+ >=dev-python/google-auth-oauthlib-0.4.1[${PYTHON_USEDEP}]
+ dev-python/grpcio[${PYTHON_USEDEP}]
+ dev-python/html5lib[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/protobuf-python[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ >=dev-python/setuptools-41[${PYTHON_USEDEP}]
+ dev-python/werkzeug[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ >=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]"
+BDEPEND="app-arch/unzip
+ ${PYTHON_DEPS}"
+PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"
+
+src_prepare() {
+ eapply_user
+
+ rm -rf "${S}/${PN}/_vendor/bleach" || die
+ rm -rf "${S}/${PN}/_vendor/html5lib" || die
+ sed -i -e '/_vendor.bleach/d' -e '/_vendor.html5lib/d' "${S}/${P}.dist-info/RECORD" || die "failed to unvendor"
+
+ find "${S}/${PN}" -name '*.py' -exec sed -i \
+ -e 's/^from tensorboard\._vendor import html5lib/import html5lib/' \
+ -e 's/^from tensorboard\._vendor import bleach/import bleach/' \
+ -e 's/^from tensorboard\._vendor\.html5lib/from html5lib/' \
+ -e 's/^from tensorboard\._vendor\.bleach/from bleach/' \
+ {} + || die "failed to unvendor"
+
+ sed -i -e '/tensorboard-plugin-/d' "${S}/${P}.dist-info/METADATA" || die "failed to remove plugin deps"
+}
+
+src_install() {
+ do_install() {
+ python_domodule "${PN}"
+ python_domodule "${P}.dist-info"
+ }
+ python_foreach_impl do_install
+}
diff --git a/sci-visualization/xyscan/Manifest b/sci-visualization/xyscan/Manifest
index f9822c2f9eb0..550b6dcbfd92 100644
--- a/sci-visualization/xyscan/Manifest
+++ b/sci-visualization/xyscan/Manifest
@@ -1,3 +1,3 @@
DIST xyscan-4.30-src.tgz 2700346 BLAKE2B 553e751a8d8320aca0bdfcf9facb528463d4b9179f134c0d2739837af8756760e8831f868737658f21c109c76f87a0c7284c65138b5585481e8201f664f3653e SHA512 f520f9d54893e738e8c93c7f0f4c5940b17e25d2a8dcd42632993b92460cecd388e6bfaa69f3905bdb9e77ea2ec876f3b93d82079d3383d6edc4cc8baec512b6
-EBUILD xyscan-4.3.0.ebuild 1102 BLAKE2B be44c9b1ff016cd933243a574192ea76063272df367a0b428cdd1257951b79eaf963ba736389e17df4c3bb34c16bebc62f52204f333b87b87f72db49097b68c9 SHA512 c0345e07a9d29622379df5588ab9160857a74a3c1e3441e24c57986e865e3ef216c389ff06c12c22661ba52b137d91af1813136688860b6aab35ba9ffe60d59b
+EBUILD xyscan-4.3.0.ebuild 1073 BLAKE2B f0c503b9d5f4dff23cdcbeeb916feb5a7c3eb9a92ee13777d44cd85df8ee89c5f4898d253dcb8bb201733f32bd132c5f996a57e2f6e21e593faf63c55e69a55d SHA512 e974ab99d2b52ecb32b10a08f9a9d86f3ad718457cda7493195ae061eede3f3f139989c68fd82acd75ab5fed18c4c04a1eef7e7f05fbd5b335ccbe0e3240b24f
MISC metadata.xml 575 BLAKE2B 64935c668707ca1efba54b4a6a366dd9d04c1cf8b9ec606343fe896e731508d4bbb4be6790f5e20b5658bdcdc6659de090a136daf47294d4b769fe391c5242dd SHA512 b837b28ce6e5f2f44b93b14cfde853c2a41cf04f0aa2ce4cf2eb767dd4e355e13e6b24745ac3696f7bb1a27b717a41fef91cbcf4087ef0daffdafa63a7b0cd36
diff --git a/sci-visualization/xyscan/xyscan-4.3.0.ebuild b/sci-visualization/xyscan/xyscan-4.3.0.ebuild
index 5c70e092144d..0d14b12e89a4 100644
--- a/sci-visualization/xyscan/xyscan-4.3.0.ebuild
+++ b/sci-visualization/xyscan/xyscan-4.3.0.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit desktop qmake-utils versionator
-
-MY_PV=$(replace_version_separator 2 '')
+MY_PV=$(ver_rs 2 '')
+inherit desktop qmake-utils
DESCRIPTION="Tool for extracting data points from graphs"
HOMEPAGE="http://rhig.physics.yale.edu/~ullrich/software/xyscan/"
@@ -42,7 +41,7 @@ src_configure() {
src_install() {
dobin xyscan
- HTML_DOCS=( docs/. )
+ local HTML_DOCS=( docs/. )
einstalldocs
newicon images/xyscanIcon.png xyscan.png
make_desktop_entry xyscan "xyscan data point extractor"
diff --git a/sci-visualization/zhu3d/Manifest b/sci-visualization/zhu3d/Manifest
index f6b137e031ca..2e55a0d1078f 100644
--- a/sci-visualization/zhu3d/Manifest
+++ b/sci-visualization/zhu3d/Manifest
@@ -1,4 +1,4 @@
AUX zhu3d-4.2.6-qt5.patch 6547 BLAKE2B acbe896190b365238c29ff9b831ebaf743e4a58ef027b5ceb70fd285a06b86dcd8e0d73773dc18864291922f69bc1bdebdcb4710f6138ce788d8280560817ddf SHA512 77e2049483385921ff3e535d0174d820845566d3e5a3ee9c63fac034c3b4c17c5df067e6ba41d4e0111ebc4eefcfe01299e0bf48ee20aa1e26b134b1386c626b
DIST zhu3d-4.2.6.tar.gz 953395 BLAKE2B 0ef7fdb18718266fdbee56f202a67f637088519ed1a3e7bd00b085acff630af6b56df25d7e8485879fbd478f57294c2c9feb6a1396a10c9ce6d4f437b824c74c SHA512 105c68e0bfff7b2dbb71d3ed713033e82a729db7d3d8f6e3de038ced53db0829e0b0b146e6b042d954983af830c6834921be58d72bde90012461047d5d99dfd1
-EBUILD zhu3d-4.2.6-r1.ebuild 1764 BLAKE2B ad427c0280fdbe62e6ed0eb042920b5edf947cd7bef67d08434939175c68644db842e14b85f203136fc7fbf8a8276cb772e8c5115e2b8ed12ff323d0766f748b SHA512 057f60c93f4dda1a49de294e5ef35e30d15d8823bc1fd23d5700481a77fc00fd465a26cc33af8f98057f3ff9359a19217f25b1e77708fb5d0169f7d5d94103d2
+EBUILD zhu3d-4.2.6-r1.ebuild 1761 BLAKE2B b6c6e9b2f924e8c965caa4ac302aaf2bca3c8ec9c64ee74d7d52ea861fbd97fd72b14f97d51ff94c6aa3ac613bf7164f2ed075f473892f770e3bd958b2166bbe SHA512 fab1f3a92e0d5daeb7418739ea350b53e9f503bf6f09e9493118e1ff542c13845b7acf8cd209e6c95515179712e8d06227f5110dc2bb7d841dcabe9874b4b996
MISC metadata.xml 816 BLAKE2B d117901e2ca6fc6461aa41c56453da30f7e68b8d3c409e6d618ed6bcbb92a72453afee572de822f09038f492c7ea8b9ef7020cd08ce7375301f82316ed5a83c1 SHA512 361ff45d40fadfd080b0d77def6581fd9efa8ff5d3aee9b09c0a650fa6c65af426dc0af215b99f956abbf76baff9c82c2d6bbf1df805591f2b4b57fb9312709e
diff --git a/sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild b/sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild
index e20dc4f875c4..abb07c87530b 100644
--- a/sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild
+++ b/sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit desktop qmake-utils