7 files changed, 81 insertions, 9 deletions
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index fb88ea9536cc..510484f2d6f5 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/epix/Manifest b/sci-visualization/epix/Manifest
index cd33a91b18d5..01e4408bfc64 100644
--- a/sci-visualization/epix/Manifest
+++ b/sci-visualization/epix/Manifest
@@ -1,5 +1,5 @@
 AUX 50epix-gentoo.el 298 BLAKE2B 236677e59724ddda6cca138c5e049250798a249373558caa1d2f85b432710352d86cf4c4a90ac4556da4857d5aa4bbf2dbae816a2338808a6a79d44eed0fcd75 SHA512 7033d169194cffe4265569f1b048e9ec1929dc98257eb4fb63f486be1ab8162e80fa75fd3943c81b5f9a8eb0e13665e66852ef1f9fbf7cfaee949f5d56fbe9a3
 AUX epix-1.2.10-autotools.patch 2701 BLAKE2B 1478b23499deda305b94b26e9b680131bcecf6dc633d35187f9e9fc3fa7ee500e6b679eb6ade85564b631e7d207c3e0c0cb4ee1caf42779ff1477e1a55e5fd31 SHA512 c94beae67c28ceff6cd4445272574e6cb93f4c181cddb4023587d20e2fed1bea523891191f80b6dd8870f167cbcae2567cd014b6a20aafbb6a74624c76e54cac
 DIST epix-1.2.11_withpdf.tar.bz2 1709429 BLAKE2B db9cba5b94e27742347f8fc85366399016438681a7016077966e5048b9a178404af8305da7d170722aaac82d85283552f87fbba76b21e788fee546b0e0aebf43 SHA512 16d0edf13711e469a13faba83d47fbab983277a95cfed0e343089258da0b8a56104af9fc217aaa70928c50f10e7d152df93c3638cf2a65a2833142645a829a45
-EBUILD epix-1.2.11-r1.ebuild 1531 BLAKE2B 26de585b5c8316dad3df7da42493799acfcfb95f9bb0da3af4e53e7398ec11b701423324248501a56d2b67df9cdabf56cc3806864b7717d64591c6522d1674cb SHA512 712a89e7286ce16cf00df72571ae3bd15fbb90f85bfc5078230056c766c6f74ba2b434707526ba9d3f25670fcc91d1e5e80766396f2c69ca7ffb097270e9a438
+EBUILD epix-1.2.11-r2.ebuild 1505 BLAKE2B f6b8e98b34cffae438ed712f9525b188efd650d0920d99eba79f83547c64dfe9b811fa474391e0fce3998730dbd768a94554fbd29dddeadb8c4c6680cbfdd94f SHA512 fa0dde7e5fb09f5864ee56e91ba7f6efa2b3a130c50fcf5d6ee59c2d81270671b0a745f1ae5550af5960ca8e0e37634517cb930fda084d680cff8fa2d9090419
 MISC metadata.xml 779 BLAKE2B 2e6405de37d7ed3e85eb865d140a599b1de484f9cc5c35eda7be384259b34bbed06aa84dffc8a5b1b05c6db18a5d0bd1b0f28c9969a8aac933582bf0d1c9cc2a SHA512 b0cb62a782873b0e2e115f18495f520f3fb5cf06052d6fdae023a65a3a40fb2eaf355ffacf0243149d9890d8f56be87dbbdaf459b05ae32b877037e7ff2bc5e9
diff --git a/sci-visualization/epix/epix-1.2.11-r1.ebuild b/sci-visualization/epix/epix-1.2.11-r2.ebuild
index 536173f22c51..dd9b328f5f11 100644
--- a/sci-visualization/epix/epix-1.2.11-r1.ebuild
+++ b/sci-visualization/epix/epix-1.2.11-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ DEPEND="
 	dev-texlive/texlive-pstricks
 	dev-texlive/texlive-pictures
 	dev-texlive/texlive-latexextra
-	dev-tex/xcolor
+	dev-texlive/texlive-latexrecommended
 	emacs? ( virtual/emacs )"
 RDEPEND="${DEPEND}"
 SITEFILE=50${PN}-gentoo.el
@@ -47,12 +47,11 @@ src_install() {
 	newbashcomp bash_completions epix
 	bashcomp_alias epix flix elaps laps
 	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/*gz
+		dodoc doc/*gz
 	fi
 	if use examples; then
-		cd samples
-		insinto /usr/share/doc/${PF}/examples
+		cd samples || die
+		docinto examples
 		doins *.xp *.flx *c *h README
 	fi
 }
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 32af9b2815be..becc7892f788 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -7,7 +7,7 @@ DIST gnuplot-5.2.6.tar.gz 5321601 BLAKE2B 4281ba29926ee7fc046b48006fed6513dd3a9e
 DIST gnuplot-5.2.7.tar.gz 5335673 BLAKE2B 6ca3055f6bb2e032562c7f21beda0adca1087598c7bacc9ab187c7ea4a3d85e08598ddb0ff0660bca081bc17899dbb92bbfbb6acde8b7b5367f12da7a2a14b62 SHA512 f6b77e16b25e5705ea9dad4f89ed5f5a3cf95d3e4215da00be3cbfbcdeee23009e9205156399448526783f25b5b7599b674670c94c01345abafeff74f6c7de93
 EBUILD gnuplot-5.0.7.ebuild 5796 BLAKE2B 055c13b67f9a8242f986cbc99364ecb9bb8dda241db3de84e97c4b68b92b50c44600933a07a6da0064595828fd5c718640bc7ff7aa62fc85314944a2970d6f00 SHA512 22453ef591dc01114f4caacd0cb1ecb88ba4d5fb2fb95139a6698ee019e385955ab18487e279500be491f1fcd335885cd19b5afe58bb42b107a3516b1bacc2cd
 EBUILD gnuplot-5.2.6.ebuild 5860 BLAKE2B 75e70fe4a0c2dad6e8f2cf3f6faceb064c862824eb02625fbf1182ebc4944c16102b4fb4a855e34f65823cac9dfa47795d7798498a49b9cf62068782a5970dde SHA512 99eea66f0ad9414f1877093c27b25d0ec95ef657991732a53a0b730986c46e688d3351eff7b3176aa16fe0be63cdae5d904341326300a5b1f507a2d4b0e5d16e
-EBUILD gnuplot-5.2.7.ebuild 5868 BLAKE2B 560d2f38b1ac2981ed5b5eabdb555dd87911217bd84eca5b22d4b403b4f4110fd556d3d57259487da851de08557de7677fe6a823e4dcd765b405cc0b7e9233e5 SHA512 f46df011e43c5fb7c376410bd202989b3b3731ec91bb310b0c562b0dbdb33c374c8f01436f5afb4ec39424520cc86fcd9646584875dedd5eeef042eff1ac9ca3
+EBUILD gnuplot-5.2.7.ebuild 5866 BLAKE2B cfd9b916c32e0f3c4b449600eb244cc41f18e7fe088d000ed9d7c9b2491efa09d1641e006af9ee2476f8ebee0ac404d306ed196f9249a081fa129415d895e39a SHA512 0c56f62b54db8ec0c00f0d0a8ded3b51849df46a9307a863b273fe65fae71c3be54f42628e1cf1f695c01f30b12018dea74f028e4b319e5394d99634a13ab8b3
 EBUILD gnuplot-5.2.9999.ebuild 5757 BLAKE2B d06057469c991523ea917e44454557fb3e4e9889d212f7dfb939b61ae72f0dddaf2a54139bc180eeaf9d3f70b3cb58a6b602a3cdb620022de07c14520aa67bd5 SHA512 55a8b01b7738e5e5afd765d0b5471f01f3d25a6e48e45c45f8773b241d7394c87f9ac0e535f9eefaadb19af45a3f56ae96586ca35e626b710dd9764179549afe
 EBUILD gnuplot-5.3.9999.ebuild 5179 BLAKE2B ab729324b1774afe1b91922b1d68fc6b5eba7eba6da633c76a80d72ad15880367c82ad35d2f9ddf9933dac8c053ec533575167366cbf66dbac7b60d6c7e5d71f SHA512 6c90878ff3c226e6d9a1de64d4e61523491f51bf95345f280109c8e113ac1375e7b4973bf21b437df5375d0f998ad03f26a9c7a2e385269af2ccf9eba03410fa
 MISC metadata.xml 1267 BLAKE2B f3b0192ce2cd8d0fb10c2f4fb4bad9780f01746cb283c19e7ecc622c85470ed8a3b7193ca2f7abdee6fdb771719e0c0a9a8a5c7fd9320ef0dae1f1210e7e36cd SHA512 dc9f36a7f2ffb85eeafb41a2b5d0b61746ef3e1de049db18ba351108b887b4cf506ea871754918faae8b4989e5ee7dbfc9f7f48c5b9df55a3bbe782425dc0421
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild
index 72a83029201a..da97fbcf2aaf 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.7.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 bitmap? ( free-noncomm )"
diff --git a/sci-visualization/veusz/Manifest b/sci-visualization/veusz/Manifest
index 88c7315dd182..499ca5547da1 100644
--- a/sci-visualization/veusz/Manifest
+++ b/sci-visualization/veusz/Manifest
@@ -3,6 +3,8 @@ AUX veusz.desktop 248 BLAKE2B 02c9b85f9ea12ef0ee9bf8f538788f577ab4314468e94140b8
 AUX veusz.xml 346 BLAKE2B c99688c930b3901edcf500c4a99447074a01be6abfd2be714f8c1dccd4318a0270d30f47f92636280f406ba9003540434c52683b0a8f66fb4d672e3436fdb5a1 SHA512 c4f049d4648192d932560a2e73088843ecb0a2beea2e628424488d552684a8e69b84628773a08947741690eb732901bc8ae8c52fa926d1b44bf02b9046cb569e
 DIST veusz-3.0.1.tar.gz 2554401 BLAKE2B 6e5649eef94ce0bd7fcdfa8325b35de144aaecd792f32c149f5a6f16c7c35f10d29bebeb37531d726e1b87f6d46855d7cdb2af402ec8fd0a2c1af91844d12c03 SHA512 99766c0fee70c12bba7b2ee8434224649763323aa9278d2116159f18257e1e1c5a491d591efb779c1bbb9dba1fb524ad8185fa2e91429ba1cc594fd632cb6238
 DIST veusz-3.0.tar.gz 2550683 BLAKE2B 72f0da8d9b993d8a3252fbb93314a53832fbf319287946e9ebc9317ebdab3f10ef2071012b88a1ff3d31d4732f367ded0b217dfa9766f5a09abe90e96b769e45 SHA512 a740d5677e8f23245e54573de0faaa66b659b54e289b256dc344f5aa0cc2a05db26efce57ff31b19c1235e04a9aa22cfa12125a784d27b0e3725277cbfae1b06
+DIST veusz-3.1.tar.gz 2524607 BLAKE2B ca5c5a75e02c9461e1d81dc4d2cc09865ebd4424f072616bf0a231a1f592a5c1c5aad93f713ed9ec1d9e2ad39b877a36c236b615d904295608d7990eaf59d5fb SHA512 9b940d1cc224f4729f788abe1e29352d35e69d2f78bae7f072a783d339198a8171b0f0b0a5f5af82ef0f0693550a42409956a9cc3888aa46d110d777e81941a4
 EBUILD veusz-3.0.1.ebuild 2143 BLAKE2B f67bb1af08c1e20bbc01b590260e6becc9bfef8dc1cc7af7e0beb7960dcb13145bc7be0672aa3f437d58fc15f42625978039f1707be46aa0e9d57a111ee2fb64 SHA512 0c5a1e9db5601756005976b43aa130f7cc48290b281dae4da33728135ebd18bc96fa99310530586b5194b44b7669d49722ba6b8460a9d6c3a5f0d1a22e3e43a7
 EBUILD veusz-3.0.ebuild 2101 BLAKE2B 9b03d5b117d72aa0b6ef23cbda5fa86029aee2e1fd8d48e468c6fe406aaca89d0442ab853476375473ea690e441216bb41fde9e8d8bfe1a11d993b7e4f6e3fc2 SHA512 d810b47232d50a1bb5a6c60b0a4e6abd4022cedc2e4106823f6f8edd81280cee66d5e54227992ac350b25bbf443be90d27f2c3e842140b520c29a245d46c6451
+EBUILD veusz-3.1.ebuild 1926 BLAKE2B 4dd70714a31616b74f80ec32da19177381c947df329e9cc145c8dd7732be8ceefbba29e35952957855df8f50ca1c1e29708d84fbb282fe03314dc7d1d8081ffb SHA512 2f0e35a85c20d8ed47a5c117e6baa80e68d55df0661d99e09e757281151836de29a77c13aab722f2341d003303ee53b7bab4ba04bea2260c764ba36c8ba66439
 MISC metadata.xml 885 BLAKE2B 90529e34d78f5225e62c2675e15fef6e0fa1898eca31df061f5438460be53f5bad3d1395d5dcb6e300f861c2c52689bca26fcf012ffbbdaf9cf579b9b252a697 SHA512 2e6838e7cc1a152af665c771950f5b53f942ceedb40b118511c2c9b9801a4a170dbc557e3fa389986b0edf2b12b4f008fbbab9c258c59a1b4acd2063c3ef79ac
diff --git a/sci-visualization/veusz/veusz-3.1.ebuild b/sci-visualization/veusz/veusz-3.1.ebuild
new file mode 100644
index 000000000000..4eddb89c7f69
--- /dev/null
+++ b/sci-visualization/veusz/veusz-3.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit desktop distutils-r1 virtualx xdg
+
+DESCRIPTION="Qt scientific plotting package with good Postscript output"
+HOMEPAGE="https://veusz.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dbus doc emf fits hdf5 minuit"
+
+CDEPEND="dev-python/PyQt5[widgets,svg,printsupport,${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	emf? ( dev-python/pyemf[$(python_gen_usedep 'python2*')] )
+	fits? ( dev-python/astropy[${PYTHON_USEDEP}] )
+	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
+	minuit? ( || ( dev-python/iminuit[${PYTHON_USEDEP}] dev-python/pyminuit[${PYTHON_USEDEP}] ) )"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	distutils-r1_src_prepare
+	xdg_environment_reset
+}
+
+python_test() {
+	distutils_install_for_testing
+	VIRTUALX_COMMAND="${EPYTHON}" \
+		VEUSZ_RESOURCE_DIR="${S}" \
+		virtx tests/runselftest.py
+}
+
+python_install() {
+	distutils-r1_python_install
+	# symlink the license, bug #341653
+	rm "${D}/$(python_get_sitedir)"/${PN}/{COPYING,AUTHORS,ChangeLog} || die
+	mkdir -p "${D}/$(python_get_sitedir)" || die
+	cat >> "${D}/$(python_get_sitedir)"/${PN}/COPYING <<- EOF
+	Please visit
+
+	https://www.gnu.org/licenses/gpl-2.0.html
+
+	for the full license text.
+	EOF
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		dodoc Documents/manual/pdf/${PN}.pdf
+		docinto html
+		dodoc -r Documents/manual/html
+	fi
+
+	doicon icons/veusz.png
+	domenu "${FILESDIR}"/veusz.desktop
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}"/veusz.xml
+}