reinit the tree, so we can have metadata

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
commit: 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree: ba5f07bf3f9d22d82e54a462313f5d244036c768 /sci-visualization
204 files changed, 10977 insertions, 0 deletions
diff --git a/sci-visualization/circos/Manifest b/sci-visualization/circos/Manifest
new file mode 100644
index 000000000000..66fa706056e8
--- /dev/null
+++ b/sci-visualization/circos/Manifest
@@ -0,0 +1,5 @@
+DIST circos-0.55.tgz 10163948 SHA256 3c9f3302b7becb8300d31153d9f8db5552491cb21f5b4cb2f3dc4ca9fd2a362d SHA512 3ebad082acd96b27281e6fcd996fb79022d982a93db59e1f3589a341df7f9855d7554fb92c88c41dc4679e7273d11c0372285a4059ec14a77f11d1d4014db9c1 WHIRLPOOL 4c242fbea59095f24d08eb18c9c9e145e6c7b783581297698a8b21d702019d621709a233bf4ba06928f00ced4eb9e50674f338d12265eaf948533a7ef0a2e251
+EBUILD circos-0.55-r1.ebuild 930 SHA256 8008690a51754cca123d5af1eec0384eda530bdd43dd2da829d702392181b96d SHA512 15d004ce7c0fe3d9f9039e9a9dbb664bf988cd8b7a3db7f8185069227879f594cca779ccec6c8864fd81b6e13bf1d7f587ef3abd273b3d41d95d94c5f4d5e1fd WHIRLPOOL b380d30c2df591b996e22a7aba33d137b0c24fcca27ee3433a43d04d90d5e463fa8b33d1a6c4bb9b5c2764b05b4e5819654477db62099e86f9a5abe00078a606
+MISC ChangeLog 2766 SHA256 410d8c2cabcd45b16bafe49d682f7b1a2ec2e2faf12fb70d6dbb553e877e3c60 SHA512 c2f28b9119e0c97d21f7199ce1d68a0a9dc404112abb79eb26575258596ab135b6bb1868ce8e029f690a788e748e8a513c3b213106c687e9389efab9f13cf9ea WHIRLPOOL 50054cd17952ed34a603abce24495d81f5b37ad883c7ca2f97b6e11975da29ddfc58e6f10999e78e33ba361ce9f39f252919081a0e09665270050bc352ad8b40
+MISC ChangeLog-2015 1069 SHA256 5d79d1c12529044e49c089c5077723aab51e10be39c91c8d8b950f03ecc5a2a5 SHA512 a77186904b64d52271ffad2d4a6151c7d07b1c24e3f5da686401e95dfacc55cd283fcb26c96cc1fde76faa5bf9d8de95700c6bc3375007e32d8b5f01686faf5e WHIRLPOOL 0c61651856504a5aebfb672c3ca12169d5e1d915b73e550b1dd3ead66443c177213540911b47228c98987801624c2c777df400df6d83e0a2cc3f85ad0c648561
+MISC metadata.xml 697 SHA256 11e3650377dc357d8b8b31e0f519e3841933a01e1be9e1a46fa1888e6d8d27e5 SHA512 32c161f3f9ed0df4281de0e7049133eefd48391f6316a1c70f02a0c5e406279834d39029cc72de7d46745f6bbd4690622dc917d0a09556683527de5cb082677b WHIRLPOOL b83ac3c296fdb8928d7acbef3a2ad985a8396682135ecf24a3b9c32babd8c425427792e285cde52228a096c81313e3a31e9c5b8228c4ebb44ef350fdda4dc05e
diff --git a/sci-visualization/circos/circos-0.55-r1.ebuild b/sci-visualization/circos/circos-0.55-r1.ebuild
new file mode 100644
index 000000000000..bfac5b3544a9
--- /dev/null
+++ b/sci-visualization/circos/circos-0.55-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Circular layout visualization of genomic and other data"
+HOMEPAGE="http://mkweb.bcgsc.ca/circos/"
+SRC_URI="http://mkweb.bcgsc.ca/circos/distribution/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="dev-perl/Config-General
+	dev-perl/GD
+	dev-perl/Math-Bezier
+	dev-perl/Math-Round
+	dev-perl/Math-VecStat
+	dev-perl/Params-Validate
+	dev-perl/Readonly
+	dev-perl/Regexp-Common
+	>=dev-perl/Set-IntSpan-1.11
+	dev-perl/Graphics-ColorObject
+	dev-perl/List-MoreUtils"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r */
+
+	exeinto /opt/${PN}/bin
+	doexe bin/circos bin/gddiag
+
+	dosym /opt/${PN}/bin/circos /usr/bin/circos
+
+	einstalldocs
+	local d
+	while IFS="" read -d $'\0' -r d; do
+		dodoc "${d}"
+	done < <(find * -maxdepth 0 -type f -print0)
+}
diff --git a/sci-visualization/circos/metadata.xml b/sci-visualization/circos/metadata.xml
new file mode 100644
index 000000000000..aafe35b94066
--- /dev/null
+++ b/sci-visualization/circos/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sci-biology@gentoo.org</email>
+	<name>Gentoo Biology Project</name>
+</maintainer>
+<longdescription>
+  Circos visualizes data in a circular layout — this makes Circos
+  ideal for exploring relationships between objects or
+  positions. Circos is ideal for creating publication-quality
+  infographics and illustrations with a high data-to-ink ratio, richly
+  layered data and pleasant symmetries. You have fine control each element
+  in the figure to tailor its focus points and detail to your audience.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-visualization/epix/Manifest b/sci-visualization/epix/Manifest
new file mode 100644
index 000000000000..b3dbb206b099
--- /dev/null
+++ b/sci-visualization/epix/Manifest
@@ -0,0 +1,8 @@
+AUX 50epix-gentoo.el 298 SHA256 5aa1fc2e45f9c544f4cfc95a803a2540a42ef766258eecbb3d166b158565d219 SHA512 7033d169194cffe4265569f1b048e9ec1929dc98257eb4fb63f486be1ab8162e80fa75fd3943c81b5f9a8eb0e13665e66852ef1f9fbf7cfaee949f5d56fbe9a3 WHIRLPOOL 424537eb3c11f7a0ea25a11ff67be94254bf5bef457b55af0e472d4110caa7a00e82fbdedb5cf0787858e9206f9d875682cc3debd912e55d951bcb4abd8ef75f
+AUX epix-1.2.10-autotools.patch 2701 SHA256 164802fb1083bc3e420925965788aad593a460d0e2f0cdd103654ded6c898f9f SHA512 c94beae67c28ceff6cd4445272574e6cb93f4c181cddb4023587d20e2fed1bea523891191f80b6dd8870f167cbcae2567cd014b6a20aafbb6a74624c76e54cac WHIRLPOOL b7f6dc508d8f1753aeed2ccda427cfd95f0b135fed5e33d1593304560a91d6545dff96295b7acac30c76ff95bca0b11e7b2c7c1a21e8ff139e9d4394b74ab72b
+DIST epix-1.2.11_withpdf.tar.bz2 1709429 SHA256 e6186a5564e26195887dadd94dba9c0ba596a1402cb5b9866dea10abc66ef4d7 SHA512 16d0edf13711e469a13faba83d47fbab983277a95cfed0e343089258da0b8a56104af9fc217aaa70928c50f10e7d152df93c3638cf2a65a2833142645a829a45 WHIRLPOOL 1540b35b87f7c663a37b45a8c33e3d9b93f07f10d6c54da7df4262b1a685be30ec65ddebd5c6d7030dd3f1c86a990223db05cfc5f93840265b56f902f085536a
+EBUILD epix-1.2.11-r1.ebuild 1531 SHA256 9de5ec58867be5f11c3622d68303e19408bad49c605f41284e8f3e65c0c861c1 SHA512 712a89e7286ce16cf00df72571ae3bd15fbb90f85bfc5078230056c766c6f74ba2b434707526ba9d3f25670fcc91d1e5e80766396f2c69ca7ffb097270e9a438 WHIRLPOOL 2abc1caf8f531fe12b6a5a37a3c7b1fe560c13be742d3b9a367641c7d36de936583261b3a60aa1e7b744194b9e096fc739cd958ac1fefaaf280dbcf8199abe3d
+EBUILD epix-1.2.11.ebuild 1534 SHA256 d5eb4bebd47552495fefa434e4902c09d8f865890d6a0f1643d1daf407a1e92a SHA512 8bc004f857a1a4297a32619f8a6d472dd0ed44b82ba3f486283fc44feb475ee3f231463f84f62a4970d3eb57b8a4af9cea09cc00a83528d73e7f930d251007e1 WHIRLPOOL d15bf3c4e8cc32df934d4839365d19952333c21390b515a21db54f40f9be997cb8f22325a892d7a0e18920ec9dd7eb4b98aec8a5cd2d8a015e23da63d05f0a49
+MISC ChangeLog 3397 SHA256 3e347834ccbc875b75c298b7c1853408d4fb7b8c9187a3c4a2bdfa137ef1eb61 SHA512 044260f0e344a27ec2158f5d9833e6ad74e46ff5491a99cba5e951b43848cb6fd73913e4a96cfb459dacf499052a83b802bbcc812c198227e946b177ade28b5b WHIRLPOOL 61d3acabb118891537fb7dcc225aa70fe0cfe13d16e6286b380716da4f5e4e7d8d141d8ca96c3f17446f12177222a4dd1eec7a3d5a30117a7cbba2794b62e471
+MISC ChangeLog-2015 9607 SHA256 8760acfa0865c26f30fd53f47914613fd1e01eff76781e0c65fbf8488c65b2f1 SHA512 b71b76376a1ef9d026143edb9f365b0b00966c87701d73727712de4e8d8fe6db601fb72c5e90a459a2167fcaab42fa87cc3f7f5e3fbf5ae205dcb490cd372f57 WHIRLPOOL c29d9f3537e219c0f1e18a59bb33b21c75e5a51a80b9c0c1650793c00c003274add712a4d2d0031a4f4b6d9970fb80579a34334c8ffe6c87ebfed705f91d80b5
+MISC metadata.xml 779 SHA256 0cf9b7f584c15f78c4998ad365121b1451bc9161ffe7946f88f3137645b27137 SHA512 b0cb62a782873b0e2e115f18495f520f3fb5cf06052d6fdae023a65a3a40fb2eaf355ffacf0243149d9890d8f56be87dbbdaf459b05ae32b877037e7ff2bc5e9 WHIRLPOOL d1239bf96f90d3c65c03284b1e3430576f4c1db073304b30a9cf4eaec7943455a1db182eb2c4ef4facc7dc63b9d702b99c28de26e29fdc7bfe2f47afd8b2ce3c
diff --git a/sci-visualization/epix/epix-1.2.11-r1.ebuild b/sci-visualization/epix/epix-1.2.11-r1.ebuild
new file mode 100644
index 000000000000..536173f22c51
--- /dev/null
+++ b/sci-visualization/epix/epix-1.2.11-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp-common bash-completion-r1 autotools eutils
+
+DESCRIPTION="2- and 3-D plotter for creating images (to be used in LaTeX)"
+HOMEPAGE="http://mathcs.holycross.edu/~ahwang/current/ePiX.html"
+SRC_URI="http://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="doc emacs examples"
+
+DEPEND="
+	virtual/latex-base
+	dev-texlive/texlive-pstricks
+	dev-texlive/texlive-pictures
+	dev-texlive/texlive-latexextra
+	dev-tex/xcolor
+	emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}"
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.2.10-autotools.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-epix-el
+}
+
+src_install() {
+	default
+	if use emacs; then
+		# do compilation here as the make install target will
+		# create the .el file
+		elisp-compile *.el || die "elisp-compile failed!"
+		elisp-install ${PN} *.elc *.el || die "elisp-install failed!"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+	newbashcomp bash_completions epix
+	bashcomp_alias epix flix elaps laps
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins doc/*gz
+	fi
+	if use examples; then
+		cd samples
+		insinto /usr/share/doc/${PF}/examples
+		doins *.xp *.flx *c *h README
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sci-visualization/epix/epix-1.2.11.ebuild b/sci-visualization/epix/epix-1.2.11.ebuild
new file mode 100644
index 000000000000..7f6af033a27c
--- /dev/null
+++ b/sci-visualization/epix/epix-1.2.11.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp-common bash-completion-r1 autotools eutils
+
+DESCRIPTION="2- and 3-D plotter for creating images (to be used in LaTeX)"
+HOMEPAGE="http://mathcs.holycross.edu/~ahwang/current/ePiX.html"
+SRC_URI="http://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc emacs examples"
+
+DEPEND="
+	virtual/latex-base
+	dev-texlive/texlive-pstricks
+	dev-texlive/texlive-pictures
+	dev-texlive/texlive-latexextra
+	dev-tex/xcolor
+	emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}"
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.2.10-autotools.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-epix-el
+}
+
+src_install() {
+	default
+	if use emacs; then
+		# do compilation here as the make install target will
+		# create the .el file
+		elisp-compile *.el || die "elisp-compile failed!"
+		elisp-install ${PN} *.elc *.el || die "elisp-install failed!"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+	newbashcomp bash_completions epix
+	bashcomp_alias epix flix elaps laps
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins doc/*gz
+	fi
+	if use examples; then
+		cd samples
+		insinto /usr/share/doc/${PF}/examples
+		doins *.xp *.flx *c *h README
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sci-visualization/epix/files/50epix-gentoo.el b/sci-visualization/epix/files/50epix-gentoo.el
new file mode 100644
index 000000000000..eb5d8eb13371
--- /dev/null
+++ b/sci-visualization/epix/files/50epix-gentoo.el
@@ -0,0 +1,8 @@
+;; sci-visualisation/epix site init file
+
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'epix-mode "epix" "ePiX editing mode" t)
+(autoload 'flix-mode "epix" "flix editing mode" t)
+(add-to-list 'auto-mode-alist '("\\.xp\\'" . epix-mode))
+(add-to-list 'auto-mode-alist '("\\.flx\\'" . flix-mode))
diff --git a/sci-visualization/epix/files/epix-1.2.10-autotools.patch b/sci-visualization/epix/files/epix-1.2.10-autotools.patch
new file mode 100644
index 000000000000..03f93cd26c9c
--- /dev/null
+++ b/sci-visualization/epix/files/epix-1.2.10-autotools.patch
@@ -0,0 +1,85 @@
+diff -Nur epix-1.2.10.orig/configure.ac epix-1.2.10/configure.ac
+--- epix-1.2.10.orig/configure.ac	2012-11-29 21:04:20.411280150 -0800
++++ epix-1.2.10/configure.ac	2012-11-29 21:14:00.462163755 -0800
+@@ -9,6 +9,7 @@
+ dnl Checks for programs.
+ AC_PROG_CXX
+ AC_PROG_LN_S
++AM_PROG_AR
+ AC_PROG_RANLIB
+ AC_PROG_MAKE_SET
+ AC_PROG_INSTALL
+diff -Nur epix-1.2.10.orig/doc/Makefile.am epix-1.2.10/doc/Makefile.am
+--- epix-1.2.10.orig/doc/Makefile.am	2012-11-29 21:04:20.414280167 -0800
++++ epix-1.2.10/doc/Makefile.am	2012-11-29 21:04:30.491329674 -0800
+@@ -1,7 +1,7 @@
+ # Makefile.am for ePiX v1.x "doc" directory
+ #
+ 
+-EPIXFLAGS = --no-defaults -I.. -L.. -lepix -v
++EPIXFLAGS = --no-defaults -I.. -L.. -lepix -q
+ 
+ %.eepic: %.xp
+ 	../epix-local $(EPIXFLAGS) $<
+@@ -13,13 +13,13 @@
+ CLEANFILES = *~ *.aux *.dvi *.log *.out *.toc \
+ 	*.fdx *.flg *.fnd *.idx *.ilg *.ind \
+ 	epix.info epix.info.bz2 manual_src.tar manual.pdf manual.ps \
+-	manual_src.tar.gz manual.pdf.gz manual.ps.gz manual-stamp
++	manual_src.tar.gz manual.pdf manual.ps.gz manual-stamp
+ 
+ MAINTAINERCLEANFILES = *.eepic *.aux *.dvi *.log *.out *.toc \
+ 	*.fdx *.flg *.fnd *.idx *.ilg *.ind
+ 
+ ## Targets ##
+-doc_DATA = manual.pdf.gz manual.ps.gz manual_src.tar.gz
++doc_DATA = 
+ 
+ info_TEXINFOS = epix.texi
+ 
+@@ -42,8 +42,7 @@
+ 	gzip -9 -c manual.ps > manual.ps.gz
+ 
+ #PDF
+-manual.pdf.gz: manual-stamp
+-	gzip -9 -c manual.pdf > manual.pdf.gz
++manual.pdf: manual-stamp
+ 
+ epix.info: manual-stamp epix.texi
+ 	makeinfo epix.texi 2>&1 >/dev/null
+diff -Nur epix-1.2.10.orig/Makefile.am epix-1.2.10/Makefile.am
+--- epix-1.2.10.orig/Makefile.am	2012-11-29 21:04:20.415280173 -0800
++++ epix-1.2.10/Makefile.am	2012-11-29 21:05:52.489734436 -0800
+@@ -56,7 +56,7 @@
+ 
+ EPIX_CONFFILES = bash_completions $(EPIX_EL)
+ 
+-EPIX_NOTEFILES = AUTHORS BUGS ChangeLog COPYING INSTALL NEWS POST-INSTALL \
++EPIX_NOTEFILES = AUTHORS BUGS ChangeLog NEWS POST-INSTALL \
+ 	README THANKS VERSION
+ 
+ EXTRA_DIST = $(bin_SCRIPTS) $(man_MANS) $(EPIX_CONFFILES) $(EPIX_NOTEFILES) \
+@@ -85,11 +85,6 @@
+ 	    -e 's%@RUNTIME_COMPILER\@%$(CXX)%;' $< > $@-local
+ 	chmod a+x $@ $@-local
+ 
+-# libepix.a
+-libepix.a: $(libepix_a_OBJECTS)
+-	ar -ru libepix.a $(libepix_a_OBJECTS)
+-	$(RANLIB) libepix.a
+-
+ # object file dependencies
+ $(libepix_a_LIBADD): %.o: %.cc %.h
+ 
+diff -Nur epix-1.2.10.orig/samples/Makefile.am epix-1.2.10/samples/Makefile.am
+--- epix-1.2.10.orig/samples/Makefile.am	2012-11-29 21:04:20.416280179 -0800
++++ epix-1.2.10/samples/Makefile.am	2012-11-29 21:04:30.491329674 -0800
+@@ -7,7 +7,7 @@
+ CLEANFILES = *~ *.eepic *.eps sample_src.tar sample_src.tar.gz sample-stamp
+ 
+ ## Targets ##
+-doc_DATA = sample_src.tar.gz
++doc_DATA =
+ 
+ 
+ # tar up tex, xp, and eepic files
diff --git a/sci-visualization/epix/metadata.xml b/sci-visualization/epix/metadata.xml
new file mode 100644
index 000000000000..aa1412a875fc
--- /dev/null
+++ b/sci-visualization/epix/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  ePiX creates mathematically accurate figures, plots, and
+  movies using easy-to-learn syntax. The output is expressly suitable
+  for use with LaTeX; figures may be written in a LaTeX picture
+  environment containing PSTricks, tikz, or eepic macros, or as vector
+  (EPS or PDF) image files. The user interface resembles that of
+  LaTeX: You prepare a human-readable scene description in a text
+  editor, then compile the input file into a picture.
+  use ePiX, however. 
+</longdescription>
+</pkgmetadata>
diff --git a/sci-visualization/fig2sxd/Manifest b/sci-visualization/fig2sxd/Manifest
new file mode 100644
index 000000000000..609a7f01c4d0
--- /dev/null
+++ b/sci-visualization/fig2sxd/Manifest
@@ -0,0 +1,6 @@
+AUX fig2sxd-0.20-phony-check.patch 338 SHA256 1c533fa61a6f3867df11c2b027ba0aed0ee7dc5d4d358dafdb01303fc1c17535 SHA512 d4907c3a38a055ab1807a5fd6aefa85efedefb5a8ecab3fa0b7b57ae16c7a4e692e8a101ff61b6edb6ac833ae051ac853f79d4428398b5e048882e201c1d3f7a WHIRLPOOL 424c6a69bccbbdeacf117da070ec89bc35fb326ada79009f4ba3919cdfdef8126f9eb0791d1b1ee6a1ec5d5660ce5222b4b49635c79adeb5da6b3e741b1b88af
+DIST fig2sxd_0.22.1.orig.tar.gz 26474 SHA256 de6d740a64fde7bad0a65b3a63fe29bb7f647e28a643fc6c6740b6c197d55d73 SHA512 cc407f68e1d82f05566cce8d19bc3f64f4b39c338629b393d3c3d7770c6c69499943c247ddc9bebf1193bab6c4896d28c3b771ed29cfa751a0b6184847a0fc4a WHIRLPOOL 5276ef7a30e3f6886255723ec108b3b78ed5ca51ebe078698d3ee523ccb41b36ed861f4355f8765316f39e3aada3fa5018e9094fe3c496b383aea45456eccb06
+EBUILD fig2sxd-0.22.1.ebuild 680 SHA256 5611212c177e85bb7b228f44e010f7326c72cb17dd03312a3026b68a3f763b33 SHA512 7ba47480d3a9bc31be07142782eec5bb0dc3701152a602df472bab0365ce59749d8db98c12fa00de8889072f792caebe301e71a8b8329128f300faa3e091ce8f WHIRLPOOL 7318c8d1b4ad11f641e29d180ddebffc114b41a1944de3e300991964366539fab0fb2a5915d203b9898c63bce59bdbf9663a4e0e670f3d3f2002fc2d10507f00
+MISC ChangeLog 3197 SHA256 0fd96965e17b61312d8bd48b0fb4f50ffe7db4ac175769cd21d4068e41f46fdf SHA512 d4c4e53d0d6ccd712cad40e0f3b74d885b93119c7c17ef32d933e337da51fc64cdd8ebc25823a3cc618e6708ff93a7815dcd5eadbf5c85a303ebe7b33d38def1 WHIRLPOOL aa3db8fd1651987f0ee63b9e48da4503d3c723eb086a5e317b4136a0d5b05e7a406ed00876da253ea65d718376bfc5418aa91c457749c43ec33d6d28ab1780b4
+MISC ChangeLog-2015 2284 SHA256 4cb03692fe7ae0b13d0be2bb08f2f72144d710a87626b82e1476c5cd350f6063 SHA512 79abe89f90f008dc6a58d80b659c4c0dcd84a2330802a1bc2cbe50a414aaac765a35d19d2be1e520c8091d3ad321020daefcc3a3fbf5e08511235329b84801e0 WHIRLPOOL 72384a90b1efc9a73d9ba903bf09790e114cf0c08e4bcc192c876661006bdcbb88577c2a0ee6006612220e938867e6b8a7e4081e8647caac2c20b14ca6d364b4
+MISC metadata.xml 479 SHA256 7829a82b35362f2c82fba79ce4aef86c7ab4b28ed062a1d86663258d0ba78bd5 SHA512 43164a176d787d385a162fe451a3b0d0abcc048a9e1d6483c90a5ffceafb77ed841160da11ea8dec0ff2844cbbbbfd271b2bb38d80599f8db0fdbdc18a329129 WHIRLPOOL 272f5b2d9d9815a2776986199f08d5a361a47fb1da19541c76a653d2f5fbbeb2927acc6be18665611728088f2a73b08aec863d31c1fde6b646d040a280940d0b
diff --git a/sci-visualization/fig2sxd/fig2sxd-0.22.1.ebuild b/sci-visualization/fig2sxd/fig2sxd-0.22.1.ebuild
new file mode 100644
index 000000000000..d01566cdf963
--- /dev/null
+++ b/sci-visualization/fig2sxd/fig2sxd-0.22.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Utility to convert files in xfig format to OpenOffice.org Draw format"
+LICENSE="GPL-2"
+
+HOMEPAGE="https://sourceforge.net/projects/fig2sxd"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+DOCS=( changelog )
+PATCHES=( "${FILESDIR}"/${PN}-0.20-phony-check.patch )
+
+src_compile() {
+	emake CXXFLAGS="${CXXFLAGS}" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	einstalldocs
+}
diff --git a/sci-visualization/fig2sxd/files/fig2sxd-0.20-phony-check.patch b/sci-visualization/fig2sxd/files/fig2sxd-0.20-phony-check.patch
new file mode 100644
index 000000000000..d9e76b8c9780
--- /dev/null
+++ b/sci-visualization/fig2sxd/files/fig2sxd-0.20-phony-check.patch
@@ -0,0 +1,9 @@
+diff -Naur fig2sxd-0.20/Makefile fig2sxd-0.20.new/Makefile
+--- fig2sxd-0.20/Makefile	2008-05-16 18:47:34.000000000 -0400
++++ fig2sxd-0.20.new/Makefile	2009-08-31 22:22:07.000000000 -0400
+@@ -75,4 +75,4 @@
+ 	tar czf `date +"../fig2sxd-%Y-%m-%d-%H-%M.tar.gz"` -C $(SRCDIR)../ \
+ 		$(ARCHFILES)
+ 
+-.PHONY: all clean
++.PHONY: all clean check
diff --git a/sci-visualization/fig2sxd/metadata.xml b/sci-visualization/fig2sxd/metadata.xml
new file mode 100644
index 000000000000..ab6e7a15619f
--- /dev/null
+++ b/sci-visualization/fig2sxd/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  This program converts a file in XFig format into a .sxd file for
+  OpenOffice.org Draw.
+</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">fig2sxd</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-visualization/fityk/Manifest b/sci-visualization/fityk/Manifest
new file mode 100644
index 000000000000..f47d3ed0b02f
--- /dev/null
+++ b/sci-visualization/fityk/Manifest
@@ -0,0 +1,7 @@
+DIST fityk-1.2.9.tar.bz2 1370476 SHA256 615f30296e6e6ed0cad3dfe4fd139b552c25437d6afd371652de4bd12c1a89be SHA512 e6d4846a0690ea5e7b94fc067de48d67d6342ff595844d709af9f3b978bf4bd9d0095ce348716fd0053c5575b4bff5825f8f126a53bf7e11f4e6e8a2cc6ddb1a WHIRLPOOL 5f60429565d8a301bcec11be660df9c8cd69b03a94375de14215e74f56b8a878038bb0b9e81658ad5ac4fecd5ff7d127cb6ba992e19a98a21ad49941d42247a5
+DIST fityk-1.3.1.tar.bz2 1518937 SHA256 3d88feb96dbdca70fbfb5f8fa994cea01e77723751e5957094ca46a0c6d511fe SHA512 4a7a65691af8b8d5b47461133b7870ea21ea04ac2ee8ee5714a6b9bab2f072baa6b5d8bf011baba09c62a7ce2dc9d60f3040cc6fdb77dc498b6e03a24fc0fe08 WHIRLPOOL cbda2c70beae7ced2b132158fa815dd662500cf83235ea39e12ab31f99fac27af4be3e632f1dc768018fc19c9bc563d62e6a08fea9c4e56d37fc382b509b47a8
+EBUILD fityk-1.2.9.ebuild 2012 SHA256 72149845bd45b7ecc4405a8e35a8fe70120d89d7e3215c92573e5afef07c9658 SHA512 cf27943281c5c4e5c6bd09b7c5751383a5e1f3e977d056bfe74dc434f976c485307bbd460a86406cc28a58ff4cde7ed761ef1c0a3513ca03fb713674d2586669 WHIRLPOOL fbfd38e463673fc41f0f594a7931aba9a8369dc6dc70042785e8015effc502c975d6117576cdee724d3b05461747ee3930d84fe743a71135f1458456ae8beab7
+EBUILD fityk-1.3.1.ebuild 2168 SHA256 67f72b9bbed8f12d90ab688335f035c21f3200bd40eb0dcd368f29b72d7c9ac0 SHA512 64ac23c3ca367578585d55c1dcdb04826a54507a786fb1731f8680242cf92e30eacc6e5b334902cca831ee14ecb8afc73de338576cb80d6c58ab49950a70f7a3 WHIRLPOOL 38df517fa1178de5fad30efb81612a0f55a2e269d36e16ce88d02090a29a8df3a88a1914e10fab1459c1e72a6b6f4f240f70a2ddd950c8fcafc138572fba3f33
+MISC ChangeLog 2767 SHA256 d6bd32e85ed0289ef06b068e47d2363afb212b1f0fb99ac8c11159eb1ddfdc26 SHA512 1bf7a953cc5d7cc87413652aef097324d69b2d9473c6e050b96736723dd9145772c05bc520fdaed6f0c88f1359d581537c6ed1ac9e86418b7f26699615f0ea0f WHIRLPOOL 178d86e2859aff6d0bfea90357ca75d725f0f697beb6efbac3c47cf390eac651d2c4e4b124721c51f389b4726e7f2dd48849a9223980b21f5df805acd0d74a51
+MISC ChangeLog-2015 4483 SHA256 8571923fe195bc83c858dbdf1db010c7420d7940950e3cf2c4e608fbda67084c SHA512 62647bc888c79a2ab986cfd560548c1dfc8b4af8bc27b0ea92c8e76676df0201c90e3db0caccccf16cf880109a9a367c7c9e4594c934d6f7f356e1b39b96ff48 WHIRLPOOL 317ba37cc89d32c43bdce719cfd1567f7cb66e7b81cd8a831af7cfdff9fd679d93d4d4f3264bfc9b893b322a6902c38b81a91e0e2526321300923fe6687dfded
+MISC metadata.xml 1378 SHA256 998a719ad617caa45bf35d4394901e4ab2b06a29d91867b23c76bea7926293d1 SHA512 38e516a5e0ec249d3ed4e54d4780830e1b53994e9dc1999c664b2f37aac0247df780522e7b25c124ffb0d9766d1292871ec0f9a238c2b3aa9994cef3581befe6 WHIRLPOOL 1a7272d2d8dc7f4ebd6745a27fd08e235906a54c99c49fe9f0b128640165a67e810b96ca2ef6c39134f5a8cb6f8d2a025dca3fa115e55fce4a8addccf33e80cb
diff --git a/sci-visualization/fityk/fityk-1.2.9.ebuild b/sci-visualization/fityk/fityk-1.2.9.ebuild
new file mode 100644
index 000000000000..b1fc0d146d49
--- /dev/null
+++ b/sci-visualization/fityk/fityk-1.2.9.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit autotools-utils fdo-mime python-r1 wxwidgets
+
+DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
+HOMEPAGE="http://fityk.nieto.pl/"
+SRC_URI="https://github.com/wojdyr/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="gnuplot nlopt readline python static-libs wxwidgets"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+	>=sci-libs/xylib-1
+	>=dev-lang/lua-5.1:0
+	nlopt? ( sci-libs/nlopt )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:* )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )"
+DEPEND="${CDEPEND}
+	dev-libs/boost
+	dev-lang/swig"
+RDEPEND="${CDEPEND}
+	gnuplot? ( sci-visualization/gnuplot )"
+
+src_prepare() {
+	use python && python_copy_sources
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--disable-xyconvert
+		--disable-python
+		$(use_enable nlopt)
+		$(use_enable wxwidgets GUI)
+		$(use_with readline)
+	)
+	autotools-utils_src_configure
+	if use python; then
+		myeconfargs=(
+		--disable-xyconvert
+		--enable-python
+		--disable-nlopt
+		--disable-GUI
+		--without-readline )
+		python_foreach_impl autotools-utils_src_configure
+	fi
+}
+
+src_compile() {
+	autotools-utils_src_compile
+	if use python; then
+		python_compilation() {
+			cd  "${BUILD_DIR}"/fityk || die
+			einfo "in ${PWD}"
+			emake swig/_fityk.la
+		}
+		python_foreach_impl python_compilation
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+	if use python; then
+		python_installation() {
+			cd  "${BUILD_DIR}"/fityk || die
+			emake DESTDIR="${D}" install-pyexecLTLIBRARIES
+			rm "${D}"/$(python_get_sitedir)/*.la || die
+		}
+		python_foreach_impl python_installation
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/sci-visualization/fityk/fityk-1.3.1.ebuild b/sci-visualization/fityk/fityk-1.3.1.ebuild
new file mode 100644
index 000000000000..309321d1e376
--- /dev/null
+++ b/sci-visualization/fityk/fityk-1.3.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER=3.0
+
+PYTHON_COMPAT=( python2_7 python{3_4,3_5} )
+
+inherit fdo-mime python-r1 wxwidgets
+
+DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
+HOMEPAGE="http://fityk.nieto.pl/"
+SRC_URI="https://github.com/wojdyr/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="gnuplot nlopt python readline static-libs wxwidgets"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+	>=dev-lang/lua-5.1:0
+	dev-libs/boost:=
+	>=sci-libs/xylib-1
+	nlopt? ( sci-libs/nlopt )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )"
+DEPEND="${CDEPEND}
+	dev-lang/swig"
+RDEPEND="${CDEPEND}
+	gnuplot? ( sci-visualization/gnuplot )"
+
+pkg_setup() {
+	use wxwidgets && setup-wxwidgets
+}
+
+src_prepare() {
+	default
+	use python && python_copy_sources
+}
+
+src_configure() {
+	common_confargs=(
+		--with-wx-config=wx-config-${WX_GTK_VER}
+	)
+
+	econf \
+		"${common_confargs[@]}" \
+		--disable-python \
+		$(use_enable nlopt) \
+		$(use_enable wxwidgets GUI) \
+		$(use_with readline) \
+		$(use_enable static-libs static)
+
+	if use python; then
+		python_configure() {
+			econf \
+				"${common_confargs[@]}" \
+				--enable-python \
+				--disable-nlopt \
+				--disable-GUI \
+				--without-readline
+		}
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		python_compilation() {
+			emake -C fityk swig/_fityk.la
+		}
+		python_foreach_impl run_in_build_dir python_compilation
+	fi
+}
+
+src_install() {
+	default
+
+	if use python; then
+		python_installation() {
+			emake DESTDIR="${D}" -C fityk install-pyexecLTLIBRARIES
+			rm "${D%/}"/$(python_get_sitedir)/*.la || die
+		}
+		python_foreach_impl run_in_build_dir python_installation
+	fi
+
+	# No .pc file / libfityk.a has dependencies -> need .la file
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/sci-visualization/fityk/metadata.xml b/sci-visualization/fityk/metadata.xml
new file mode 100644
index 000000000000..94ca66ce2fab
--- /dev/null
+++ b/sci-visualization/fityk/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  Fityk is a program for nonlinear fitting of analytical functions
+  (especially peak-shaped) to data. It can also be used to display
+  data or to remove baseline from data.
+
+  It is reported to be used in crystallography, chromatography,
+  photoluminescence, infrared and Raman spectroscopy and other fields.
+  
+  Fityk knows about common peak-shaped functions (Gaussian, Lorentzian,
+  Voigt, Pearson VII, bifurcated Gaussian, EMG, Doniach-Sunjic, etc.) and
+  polynomials. It also supports user-defined functions.
+  
+  Fityk offers a graphical interface (and also command line
+  interface), various optimization methods (standard Marquardt
+  least-squares algorithm, Genetic Algorithms, Nelder-Mead simplex),
+  equality constraints, modeling error of x coordinate of points
+  (eg. zero-shift of instrument), handling series of datasets,
+  automation of common tasks with scripts, and more.
+</longdescription>
+  <use>
+    <flag name="nlopt">Enable optimization with <pkg>sci-libs/nlopt</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">wojdyr/fityk</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-visualization/g3data/Manifest b/sci-visualization/g3data/Manifest
new file mode 100644
index 000000000000..a026685e87a6
--- /dev/null
+++ b/sci-visualization/g3data/Manifest
@@ -0,0 +1,5 @@
+DIST g3data-1.5.4.tar.gz 127973 SHA256 ec729322fa8b47dd8f70ecef350ff880faf73e18b693cb5d4b2330f7ebb08b7a SHA512 b4651eb6ba87ddb745c46520ccf2d7146d179e69a614d7c6c247b82eaf188b30e955d60e7df59419f63a304a5c5215829d3bea3cc233d2729ff599c523d852e2 WHIRLPOOL 7736929e7131bf3b2adfef61d750ba4ead8550a59940c6c9bce18d028d036accc1547d6d95098dde6cb2cb283b57d4af608f62a8d3f89947c87e5ed3a94a2fe9
+EBUILD g3data-1.5.4.ebuild 440 SHA256 13bc35e0d00a0f5be51b56c7bb40ab354b8838562fee99335ecff2973750bd3c SHA512 d514dd9042efe9e00ab7b1a483ad99da5d50e7853740cd9323bc30bf16e7c6303dc8e16d00ef2803128434fc77eb0f5aa44d010b1475d14d1e4ce095135025ba WHIRLPOOL e71bdf073b0b2df4193b5befaa3eb959d49df1b75dfc49755412d6b2a1b18ef191b6fe47003dd73c65a1756fe3c06cd205c737ee88979da0feab054598d071a3
+MISC ChangeLog 2469 SHA256 39150a285c626bfe94ae6857a5d2d1f8db547333457d64b2cb4d9a17044b366c SHA512 665304dad2120810374197a45bfe438077a47d7e0b97eb5f32ea68b237fa6951c14a175f3ebb0c81bc5fb4dd6241f66270ae3579835e70a2582b495a0172b9d1 WHIRLPOOL 17d48aa5e20f56e326690a2868a22fb7d6c04d10d67a8ef5253ecb07f177757c84809cd81ef2ca7c2112cf44e7c5df6f5902dfcec58f7c81f41524acdf74b496
+MISC ChangeLog-2015 2798 SHA256 2edf01c00c75b4d46800cc4729d07b79a667ee24bf334660a640443a97e84d14 SHA512 a4b0790e3cc713c996373a6de92b9020e18eb083b404049ebc890b94ecd6d78bc9b3516a8b5045ca774bb582629a3f90ad47965e13a5af554ae10f6ecd8c21d6 WHIRLPOOL 15170fd809cf46c1d3cfec3bcaa8798dd595ded3c486cefd184c68390217b0ab1868d9411360b111c5da81c13af211a39ed8eeacb67440c50f9b6653b436c762
+MISC metadata.xml 554 SHA256 0e616e84f969e659b0929f00c322b8d3506c0012c75ea7e8032cdb264cc43c64 SHA512 eb965b746fa8c3e8b516a11cd32ccadd20e92d3cbda0861b331da03d2172221d3d2f472a1598a1ad61005274d0863ddd0ad4ab90e42e5cececbe8c7148219285 WHIRLPOOL 5ef6d3badc7d338812e193eb6156c33283f9ea81614ff02df6285640dc8452ce3e986b5b711b6b642ac91ce556d65b82e0f4e3a3b7ba4a75513a313db0b8501b
diff --git a/sci-visualization/g3data/g3data-1.5.4.ebuild b/sci-visualization/g3data/g3data-1.5.4.ebuild
new file mode 100644
index 000000000000..b0ab73790564
--- /dev/null
+++ b/sci-visualization/g3data/g3data-1.5.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils eutils
+
+DESCRIPTION="Tool for extracting data from graphs"
+HOMEPAGE="https://github.com/pn2200/g3data"
+SRC_URI="mirror://github/pn2200/g3data/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/sci-visualization/g3data/metadata.xml b/sci-visualization/g3data/metadata.xml
new file mode 100644
index 000000000000..484cbd6c573d
--- /dev/null
+++ b/sci-visualization/g3data/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+  g3data is used for extracting data from graphs. In publications graphs are
+  often included, but the actual data is not. g3data makes the extraction
+  process much easier.
+</longdescription>
+  <upstream>
+    <remote-id type="github">pn2200/g3data</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-visualization/gcalc/Manifest b/sci-visualization/gcalc/Manifest
new file mode 100644
index 000000000000..fc8293cfa3f2
--- /dev/null
+++ b/sci-visualization/gcalc/Manifest
@@ -0,0 +1,5 @@
+DIST GCalc-3.1-rc1.tar.gz 543699 SHA256 c22f0b2f0d11555d39cd9e6eacf025d84c736d01085d69592098489cba7ac99e SHA512 6cf66bb1a3867370c027c1c5b82f30b22d146483a8be4a997a6f917142bc83d732cc064eb3f2ff28ea4fcb1583695097d218c7fa092e78d8fb9ba2511261cbda WHIRLPOOL 46a3279fdc7b6bd527ac60b81f878b4ce25f05157c767226c3ec0b872d3acd3df36c391a9d40a28f8f5ddcbfd62435fc90efc2afcd5ae64dda1a984b9f5a1828
+EBUILD gcalc-3.1_rc1-r1.ebuild 819 SHA256 3c89e8901f6e93dcac0d88f38229b992ade57d2b08d99bb352d3719e146ef78f SHA512 5ddcb6027e74cd09be687ba1d591114b03cf6aac53adb7b0da43d44aecdc0c78a3aac193d03de1c10e4248735db616e4e8a0be2d25071194156ddbf4108afce9 WHIRLPOOL cd11fdf18644b3e6b9976de7666fec8354ed3b1e5317fa39c5dca41b8ccc37cb56c2b1d7b57cf84dce429960a745ad0a701a61d2863e2cf7c925f1f2780aa18c
+MISC ChangeLog 2434 SHA256 fbdd77929537835955b518b831a555acbe0aea14b805fea8ded8cc48e3659022 SHA512 b3b7fe9f09a53b7a5841cbd0dae84738c4b29749544e575707cccbed337b448cffa1a516e1baaac916d27230c9dbb5638d523b034d928b301f842892fd0ab6f7 WHIRLPOOL 83b80a70004c01dc9f85a7560ece0cb436a228b713932b8b15a1f7e269f12a43c5bdbdb595fca92f47797f5e93f9790fbd8d23a3fb06983293a3c39a89ea1dea
+MISC ChangeLog-2015 671 SHA256 9406c3bc19b7e87af077bf0611cffe7604e840b14133d73a8a416088b54b565c SHA512 892379987d12af1cd07ec0b369b72f8402bdfb20535de6f177d56c82fdbc772372e4c306770d1b8f9f0e6ec5dd17304cc3f6ca314e713711c4a77e5f05bf04b5 WHIRLPOOL 816ab8d65f3fa432feddc7f68a65a8d488269434ef63390549d4a63f6923e01b1d80e6d3c0ac90d98ea0b02932a7b76087a0109aa4bfcebe347f893124d315cc
+MISC metadata.xml 342 SHA256 3eb2c917d3156cad83feef079c566088701fd77741e4f45383ae0b7dc96786ea SHA512 e09bce9848eeba3adbad9ab3f73402ca3b9b9b67b0b365764e83c4eba3e66ca7af77fe3cc195e469f7b88507f4ecfb145be8530abb57c22bb09dd78cb3001178 WHIRLPOOL 389a57d14c92f7b09695b9c39703356fdad42bd25fd5425dc05bde5a0319c9eb8c45c245cd2cc315b5f1788425f8dc53e31be179477e67374f2fd93789a4643a
diff --git a/sci-visualization/gcalc/gcalc-3.1_rc1-r1.ebuild b/sci-visualization/gcalc/gcalc-3.1_rc1-r1.ebuild
new file mode 100644
index 000000000000..285044c90585
--- /dev/null
+++ b/sci-visualization/gcalc/gcalc-3.1_rc1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+MY_P="GCalc-${PV/_/-}"
+DESCRIPTION="Java Mathematical Graphing System"
+HOMEPAGE="http://gcalc.net/"
+SRC_URI="http://gcalc.net/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+IUSE=""
+SLOT="0"
+
+RDEPEND=">=virtual/jre-1.7
+	!!sci-mathematics/gcalc"
+DEPEND=">=virtual/jdk-1.7"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	java-pkg_clean
+	default
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src ! -name "*.html"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher gcalc --main net.gcalc.calc.GCalc
+
+	newicon src/resources/gicon.png ${PN}.png
+	make_desktop_entry ${PN} "GCalc Java Mathematical Graphing System"
+}
diff --git a/sci-visualization/gcalc/metadata.xml b/sci-visualization/gcalc/metadata.xml
new file mode 100644
index 000000000000..32258c002cc2
--- /dev/null
+++ b/sci-visualization/gcalc/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+<maintainer type="project">
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/sci-visualization/gfsview/Manifest b/sci-visualization/gfsview/Manifest
new file mode 100644
index 000000000000..69ad2bef78e9
--- /dev/null
+++ b/sci-visualization/gfsview/Manifest
@@ -0,0 +1,5 @@
+DIST gfsview-snapshot-120706.tar.gz 707640 SHA256 b71fa85344fdf66330869d2d45b15c89e0c07ef420944c6d67975a85cae3c1fd SHA512 89d31a5a10c7ba21a16534b20faf6532c097c84375d09ce9940593b9e569e538db0e5174b9554e0890fb94b2194852b782e235f20dd9d7d609c08d88ac0bffa2 WHIRLPOOL 2cf0d44f820c6f2a2cda5e52faf48517d85d7a73c59623af657473ee7baeeeae57072c4f0dcba4dbbdbeb386dc01ccf3733bc8b148c53bcbc7252a4ba45d1fa3
+EBUILD gfsview-20120706-r1.ebuild 749 SHA256 70efcbe032f75fcd29cb7fd3261ee3aeb4f8b0303e30327b43b93995b34f9986 SHA512 26a5f66863c2704a03b126d573e188463b938ddc289ebb3609bb797d41dfb6f90bdd36dcfbad377dd9c7c0a82704c967b354829e67cc446a85addcdfd6709592 WHIRLPOOL 6b025060c84f3547e47b55bc78abdf4d922541d79fc16411397a43acc53d56624a657005f4734a96b1d3d14b4275901e3e03ff4a97b8cc74ba04214d743f9aa9
+MISC ChangeLog 3441 SHA256 4863522c717d35900fc34e1ac5d77b9bb1ef504718af47841f31634ef1d04728 SHA512 2fcef9fc45b044aca09bf84f1bfd59565d145f48eac8b76dc3ebc2e20c3a5c54edd1ce624c44d407d271ceab319660c34f68102bae4e52bf5ff79d3daf20eabb WHIRLPOOL 996e2613a768fbe441710060347493ae1a692889eaba891142d4d267307c230c2d2c71c0cfd0484e7e34930b8d22be6494491de842eeb55aaf458bca1bfdac1e
+MISC ChangeLog-2015 2204 SHA256 b887dd7659263d4a1eecf3ede3a9ea331286adcce8f3499d5988a8e954ac5b3f SHA512 45ecf158f4d27005c052ca95cd1be48d1b60002b5d8265a118ecdc5ae5f68fe731b1806c381d4fcfec7b2249aaa92a3df93b47948fcad7efafe4409ea40febd8 WHIRLPOOL a1b38645ab807132f4309fae3b0ec274b46dfb00009651639a2a9d79ff0f5e3029f00f9b99048253fdfb8be73663d05f40fbacbc57ad70ef6ad55d27131c2255
+MISC metadata.xml 448 SHA256 5d63a098a413bc4d131cf073ef61e8aa249a2dce04eb8929856f914a36958b62 SHA512 1205ec4dfff0511161c854d6d9925c876910d94d95194635bf9f5d42ba4f1485d994626755f2cbd6a8c470eff7a4cf2ea58dfb18beda4b6a1acf9022cf212c01 WHIRLPOOL a8a58f1f280845b24207650f54bb23aa7c70aa459dfb796954587296877c15ff069ec6e733282594a74b058fb9960e8da79ec116a4755301c8d2518e9b4258c3
diff --git a/sci-visualization/gfsview/gfsview-20120706-r1.ebuild b/sci-visualization/gfsview/gfsview-20120706-r1.ebuild
new file mode 100644
index 000000000000..21f6f50c057e
--- /dev/null
+++ b/sci-visualization/gfsview/gfsview-20120706-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils toolchain-funcs
+
+MYP=${P/-20/-snapshot-}
+
+DESCRIPTION="Graphical viewer for Gerris simulation files"
+HOMEPAGE="http://gfs.sourceforge.net/"
+SRC_URI="http://gerris.dalembert.upmc.fr/gerris/tarballs/${MYP}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="
+	sci-libs/gerris
+	media-libs/ftgl
+	media-libs/mesa[osmesa]
+	x11-libs/gtk+:2
+	>=x11-libs/gtkglext-1.0.6
+	x11-libs/startup-notification
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+	export LIBS="$($(tc-getPKG_CONFIG) --libs gl)"
+	autotools-utils_src_prepare
+}
diff --git a/sci-visualization/gfsview/metadata.xml b/sci-visualization/gfsview/metadata.xml
new file mode 100644
index 000000000000..57ac151a80d9
--- /dev/null
+++ b/sci-visualization/gfsview/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  GfsView is a graphical viewer for Gerris simulation files.
+  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">gfs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-visualization/ggobi/Manifest b/sci-visualization/ggobi/Manifest
new file mode 100644
index 000000000000..71e4cf527d97
--- /dev/null
+++ b/sci-visualization/ggobi/Manifest
@@ -0,0 +1,12 @@
+AUX ggobi-2.1.10-desktop.patch 394 SHA256 cf928b6b9df622466d68723c5d26120e2d1203b1ed1a68cdd7b516e354ddab24 SHA512 db54bb75d8a56a51e3731f6f01cb1a8986aa8fc70a5959ac9ebbb604e55b6367f7bcd48837c09f3e933c1e20bd5b6901007285976cd2b93999a277613e3b3065 WHIRLPOOL 15009c5b22c55e4359734375a5f12242fcad55a3d5c44c1cdf1f8046a7d988fd85f27144dc02202d6e6e6576a8f0555c30420e29e7bb48c59ebc71e4e3c9abe3
+AUX ggobi-2.1.10-hardened.patch 1912 SHA256 1e525e65e66edd947ccabce1e5c9f7a3e1728227b3009481a66596ec50dacdc7 SHA512 069f0dc1594d2616dccc7fec5ea89f2f31b0e3368471f4163071e4afb70f58dfad62afee85536b95b03ec15613a6261e736f2d6d97448d2ee08976f10abe8e73 WHIRLPOOL 23cb3295c3b57200dec4a161c43249654d5cfeb70cf791de0e9447b5168ed6e1d50f651baea5126d8eb9762de8ff4c70e7c54799215693b851c209e0bea128db
+AUX ggobi-2.1.11-Wformat-security.patch 1109 SHA256 07a4649bbbb085911142a33a2fa7de56ee038431f840fb8480d425c51a09049f SHA512 18162cc1ab6e8065de5602b54058f4ee11f9cb25d8ab0ed3bc176802687009f9d75c7c3a9909cd3439544c8989de0d53e3bd9744183f44fc07e8b6ba456200e5 WHIRLPOOL afda6fcf2d2ed1f4c9bbc431437843c6a8d83d57fac0ca97c0837ee063f285f02c948210ce656f833ea0f117979aefd8189e057a2d9b89f541db2ceb2125b0d1
+AUX ggobi-2.1.8-plugindir.patch 499 SHA256 201af2941a8dedbc42fb42d9f6cc549853d5655d08be6b6611009e9c7512c365 SHA512 07108552ac0bda21fec8b7aa83e25a51abd1fcc6630347d1e1348b467a0d246c91f6400d148b6781961a8e38eb31a0c96a86de0df48984a351c072f950d2be11 WHIRLPOOL f313f54e4d4aa8f81895713bd246d246f02500f792e40ac0381d456dde61d91d6ac0e95f2489e1294410513bdddb728485dba0e157bf908182b8ca962d402c2d
+AUX ggobi-2.1.9-as-needed.patch 1716 SHA256 748a07ee90af08b056bc1dbd5b511e774245d5f1e62af234f21ed98192a26ac1 SHA512 6e96f461e71630b68ba0ecc48fa94f8b7ab211cd26c95b91d65604a23c3fa13b20316e90397f857857c21cd8ddc6a8f67efcc7ec62a8d2c48c349b532aad8797 WHIRLPOOL e50ab89c823f210b4333ef8ed95ac01fec8e5ea26debffc2b6bd5eafcc97f87181c59f8063e198a820c4081b9f00521337cf5dc33d0329f521ca65d36d16a657
+DIST ggobi_2.1.10.orig.tar.bz2 2776784 SHA256 08881aacb70a7a80e3778197bb4c673e634aea403fb7f9e282df189764b96aa3 SHA512 40bc4a7fae992bf327d6b36c5aea7802279a3b6229242f31386e771636b4561260914a7fefb6a6337c1e1ab5a0682fbdd626389b83d9b57d0c2d050fac3723e5 WHIRLPOOL ee751f5278937433db76b8c43d032e1dd7d78541848ab7da412a2da2bebb9300bb4689578b1809328368024f5691b3371b579c882ea01f4ee37ae521cb23e76f
+DIST ggobi_2.1.11.orig.tar.bz2 2787709 SHA256 2c4ddc3ab71877ba184523e47b0637526e6f3701bd9afb6472e6dfc25646aed7 SHA512 d34c6569d05d1e680101b62745012940c1e18c1588cd37b89b26b89e9eed9bab8fc53e0585a595b6cb4c9f2bb7d603ca4252cb6a6ba344bbc24e5cc5fd8a6dc1 WHIRLPOOL 9e686287fdb41f840c45b9ab92c184a0d624eb86a93233e4934cebd0e550ac25fe5ae3b06f6c95ebf1098efbd6062b9c9161ffbb26b3e3a43833443536af4987
+EBUILD ggobi-2.1.10.ebuild 1346 SHA256 d558b47ab75416f9d8d18d6a97410c3ebbd428b512b2c12f4899e65d50018e8d SHA512 e2c29578b022c2e67d29646c6f86bfb0607a202bec21125dcee83aa24eacce30e7fb78a09c1677ed2db2466dd47113eb5adb017ae7d49e0108b8adffec6c04a9 WHIRLPOOL f590b7da600843daaf25e72cc38fdb38748836d4420da2361eb27ab0d29ba532e0da5ac7106e428cecac173d73508811d036944b79f8be01220a277e2fcc8198
+EBUILD ggobi-2.1.11.ebuild 1352 SHA256 fcf0421ef4278f7321236a68f0b5deb0f9250321e970cc49093c6ac7d7d32017 SHA512 86a85a0eae27df877ac1fc5f07467a16655dd1d8132be7176bf5a62f1ac2a0afc2aede72e22432bbf17389699c4e91b930130075be1f481e9f2ca7e4f1c491f9 WHIRLPOOL f1ca377600ad1ac7b06d8b8b8f48f515ae75c6659f9e363ad180b17192444717921352fdcfa66d2ea6103c40317fdb44d2dd8c1f7e7e3e4a425aed754d1f481b
+MISC ChangeLog 3674 SHA256 0a1569d5c77f71dda1952bb4d6c2782841f97e51121fa3f8a95b5d01f3228693 SHA512 8bcd3616d28a95825b6648b8d80e9211fc96dc22773d9d83187c8f3b0bdede51c80c34a10038472d3009b3b5d0b72d450dfc3493626456e4e1681947a26cefa5 WHIRLPOOL 0a295f6301de053f60a3d0bbd7ebee31a242401dfe0894553715957001f2aada5eebfed09399f71e3ad28a923ae6adc34f5942ea78ff310037d548d624db5eed
+MISC ChangeLog-2015 2561 SHA256 9e783c810240085c2e18c8993485f2738bf32ec613b606113a5a0f6eb1115f80 SHA512 115ec2fcef7af8d419ded30a09e9527a0479c7a3e1f6a3e1127e1b833f2a015d6f41d1b06df7d80e50f630c335c3a27e2c456a46ec995fd409a58076efe31050 WHIRLPOOL 90a5013a10fb2eeb07ad5f55dbc37089404de63c36a15e7380491e55a86d302b21e1721b1ec7e0befc9b813c1e93fb54dcb7b6235a09a9258e03464f1c61031c
+MISC metadata.xml 622 SHA256 86d81c7fea11d5be891f744c2362dcd1475dfc21d9be84fba7314afd30d888ca SHA512 3ffd9440d573a564db639a4f992fdda62c5f20a9e9d8f28126e4ac8e1e4958e543fea8315a3b1e10773d6d119046154d98d248e9b68a852233c5d0c90c141ab0 WHIRLPOOL 06c1530689d54a560d5e8da05da12d3da7458a035a03e4ac4b4e6207ed5b3b238c03f9367ef78ccae4116f5a8f496ab9cf7e90329a365a157c643e414a4b8ed4
diff --git a/sci-visualization/ggobi/files/ggobi-2.1.10-desktop.patch b/sci-visualization/ggobi/files/ggobi-2.1.10-desktop.patch
new file mode 100644
index 000000000000..388cb85c975c
--- /dev/null
+++ b/sci-visualization/ggobi/files/ggobi-2.1.10-desktop.patch
@@ -0,0 +1,11 @@
+--- xdg/ggobi.desktop.orig	2013-02-24 22:20:02.616872402 -0800
++++ xdg/ggobi.desktop	2013-02-24 22:20:13.293924862 -0800
+@@ -6,6 +6,6 @@
+ Comment=Multivariate interactive graphics for exploratory data analysis
+ TryExec=ggobi
+ Exec=ggobi
+-Icon=ggobi.png
+-Categories=Graphics;2DGraphics
++Icon=ggobi
++Categories=Graphics;2DGraphics;
+ MimeType=text/comma-separated-values;text/csv;application/csv;
diff --git a/sci-visualization/ggobi/files/ggobi-2.1.10-hardened.patch b/sci-visualization/ggobi/files/ggobi-2.1.10-hardened.patch
new file mode 100644
index 000000000000..63681a0a03ea
--- /dev/null
+++ b/sci-visualization/ggobi/files/ggobi-2.1.10-hardened.patch
@@ -0,0 +1,66 @@
+Description: Upstream changes introduced in version 2.1.10-4
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ ggobi (2.1.10-4) unstable; urgency=low
+ .
+   * src/ggobi.c: Applied patch kindly supplied by Michael Lawrence to
+     address issues found under hardened compiler flags (Closes: #646260)
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Dirk Eddelbuettel <edd@debian.org>
+Bug-Debian: http://bugs.debian.org/646260
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- ggobi-2.1.10.orig/src/ggobi.c
++++ ggobi-2.1.10/src/ggobi.c
+@@ -698,10 +698,10 @@ ValidateGGobiRef (ggobid * gg, gboolean
+   }
+ 
+   if (fatal) {
+-    g_error (error_msg);
++    g_error ("%s", error_msg);
+   }
+   else
+-    g_critical (error_msg);
++    g_critical ("%s", error_msg);
+ 
+   return (NULL);
+ }
+@@ -718,9 +718,9 @@ ValidateDatadRef (GGobiData * d, ggobid
+   }
+ 
+   if (fatal)
+-    g_error (error_msg);
++    g_error ("%s", error_msg);
+   else
+-    g_critical (error_msg);
++    g_critical ("%s", error_msg);
+ 
+   return (NULL);
+ }
+@@ -739,9 +739,9 @@ ValidateDisplayRef (displayd * d, ggobid
+   }
+ 
+   if (fatal)
+-    g_error (error_msg);
++    g_error ("%s", error_msg);
+   else
+-    g_critical (error_msg);
++    g_critical ("%s", error_msg);
+ 
+   return (NULL);
+ }
diff --git a/sci-visualization/ggobi/files/ggobi-2.1.11-Wformat-security.patch b/sci-visualization/ggobi/files/ggobi-2.1.11-Wformat-security.patch
new file mode 100644
index 000000000000..960d940a7908
--- /dev/null
+++ b/sci-visualization/ggobi/files/ggobi-2.1.11-Wformat-security.patch
@@ -0,0 +1,36 @@
+Fix -Wformat -Werror=format-security errors caused by wrong fprintf calls
+See also: https://bugs.gentoo.org/show_bug.cgi?id=577430
+* utils_ui.c: In function ‘quick_message’:
+* utils_ui.c:192:29: error: format not a string literal and no format arguments [-Werror=format-security]
+*                              message);
+
+--- ggobi-2.1.11/src/utils_ui.c
++++ ggobi-2.1.11/src/utils_ui.c
+@@ -189,7 +189,7 @@
+ 
+   dialog =
+     gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_INFO, GTK_BUTTONS_OK,
+-                            message);
++                            "%s", message);
+ 
+   if (modal)
+     gtk_window_set_modal (GTK_WINDOW (dialog), true);
+--- ggobi-2.1.11/src/write_xml.c
++++ ggobi-2.1.11/src/write_xml.c
+@@ -37,14 +37,14 @@
+ write_xml_string(FILE *f, gchar *str)
+ {
+   gchar *fmtstr = g_markup_printf_escaped("%s", str);
+-  fprintf(f, fmtstr);
++  fprintf(f, "%s", fmtstr);
+   g_free(fmtstr);
+ }
+ static void
+ write_xml_string_fmt(FILE *f, gchar *fmt, gchar *str)
+ {
+   gchar *fmtstr = g_markup_printf_escaped(fmt, str);
+-  fprintf(f, fmtstr);
++  fprintf(f, "%s", fmtstr);
+   g_free(fmtstr);
+ }
+ 
diff --git a/sci-visualization/ggobi/files/ggobi-2.1.8-plugindir.patch b/sci-visualization/ggobi/files/ggobi-2.1.8-plugindir.patch
new file mode 100644
index 000000000000..0476f47a816d
--- /dev/null
+++ b/sci-visualization/ggobi/files/ggobi-2.1.8-plugindir.patch
@@ -0,0 +1,11 @@
+--- plugins/Makefile.plugin.orig	2009-12-14 22:15:01.000000000 +0000
++++ plugins/Makefile.plugin	2009-12-14 22:15:16.000000000 +0000
+@@ -2,7 +2,7 @@
+ 
+ # Every plugin provides a single library to GGobi, define it here.
+ # Its name should start with 'lib' and end with '.la'.
+-plugindir = $(datadir)/ggobi/plugins/$(PACKAGE_NAME)
++plugindir = $(libdir)/ggobi/plugins/$(PACKAGE_NAME)
+ plugin_LTLIBRARIES        = plugin.la
+ 
+ # Most plugins will only require GGobi and its dependencies (gtk, libxml2)
diff --git a/sci-visualization/ggobi/files/ggobi-2.1.9-as-needed.patch b/sci-visualization/ggobi/files/ggobi-2.1.9-as-needed.patch
new file mode 100644
index 000000000000..3bec9b55c21d
--- /dev/null
+++ b/sci-visualization/ggobi/files/ggobi-2.1.9-as-needed.patch
@@ -0,0 +1,40 @@
+--- configure.ac.orig	2012-06-26 05:46:07.000000000 +0100
++++ configure.ac	2012-06-26 05:46:44.000000000 +0100
+@@ -178,6 +178,8 @@
+  echo "Looking for gtk2"
+ 
+ PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.6.0])
++AC_CHECK_LIB(m,sqrt)
++PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.0])
+ 
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+
+--- src/Makefile.am.orig	2012-06-26 04:53:20.000000000 +0100
++++ src/Makefile.am	2012-06-26 04:54:04.000000000 +0100
+@@ -4,7 +4,6 @@
+ libggobi_la_GOBHEADERS = $(libggobi_la_GOBS:%.gob=ggobi-%.h)
+ libggobi_la_GOBOBJECTS = $(libggobi_la_GOBS:%.gob=ggobi-%.lo)
+ libggobi_la_GOBSTAMPS = $(libggobi_la_GOBS:%.gob=.%.gob.stamp)
+-libggobi_la_LDFLAGS  = @GTK_LIBS@ @LIBXML_LIBS@
+ libggobi_la_BUILT = array.c ash1d.c barchart.c barchartClass.c \
+   barchart_ui.c brush.c brush_api.c brush_bins.c brush_init.c brush_link.c \
+   brush_ui.c color.c color_ui.c cpanel.c display.c display_tree.c display_ui.c \
+@@ -27,7 +26,7 @@
+   write_csv.c write_xml.c wvis.c wvis_ui.c xlines.c xyplot.c \
+   xyplot_ui.c $(libggobi_la_GOBSOURCES)
+ libggobi_la_SOURCES = $(libggobi_la_BUILT) $(libggobi_la_GOBSTAMPS)
+-libggobi_la_LIBADD = $(libggobi_la_GOBOBJECTS)
++libggobi_la_LIBADD = $(libggobi_la_GOBOBJECTS) @GTK_LIBS@ @LIBXML_LIBS@ @GMODULE_LIBS@
+ libggobi_la_DEPENDENCIES = $(libggobi_la_GOBOBJECTS)
+ pkginclude_HEADERS = GGobiAPI.h ggobiClass.h tour1d_pp.h GGobiApp.h \
+   noop-toggle.h tour2d_pp.h GGobiEvents.h parcoordsClass.h tour_pp.h \
+@@ -59,7 +58,7 @@
+ # Windows specific
+ if OS_WIN32
+ libggobi_la_DEPENDENCIES+=libggobi.def
+-libggobi_la_LDFLAGS+=-Wc,-s -no-undefined -export-symbols libggobi.def
++libggobi_la_LDFLAGS=-Wc,-s -no-undefined -export-symbols libggobi.def
+ ggobi_LDFLAGS = -mwindows -s
+ endif
+ 
diff --git a/sci-visualization/ggobi/ggobi-2.1.10.ebuild b/sci-visualization/ggobi/ggobi-2.1.10.ebuild
new file mode 100644
index 000000000000..79dd49b4198b
--- /dev/null
+++ b/sci-visualization/ggobi/ggobi-2.1.10.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools
+
+DESCRIPTION="Visualization program for exploring high-dimensional data"
+HOMEPAGE="http://www.ggobi.org/"
+# source code release is not well published
+#SRC_URI="http://www.ggobi.org/downloads/${P}.tar.bz2"
+SRC_URI="mirror://debian/pool/main/g/${PN}/${PN}_${PV}.orig.tar.bz2"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc minimal nls"
+
+RDEPEND="
+	dev-libs/libxml2:2
+	media-gfx/graphviz
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i \
+		-e 's|ND_coord_i|ND_coord|' \
+		plugins/GraphLayout/graphviz.c || die
+	rm m4/libtool.m4 m4/lt*m4 plugins/*/aclocal.m4 || die
+	epatch \
+		"${FILESDIR}"/${PN}-2.1.8-plugindir.patch \
+		"${FILESDIR}"/${PN}-2.1.9-as-needed.patch \
+		"${FILESDIR}"/${PN}-2.1.10-hardened.patch \
+		"${FILESDIR}"/${PN}-2.1.10-desktop.patch
+	# need the ${S} for recursivity lookup
+	AT_M4DIR="${S}"/m4 eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-rpath \
+		$(use_enable nls) \
+		$(use_with !minimal all-plugins)
+}
+
+src_compile() {
+	emake all ggobirc
+}
+
+src_install() {
+	default
+	insinto /etc/xdg/ggobi
+	doins ggobirc
+	use doc || rm "${ED}"/usr/share/doc/${PF}/*.pdf
+}
diff --git a/sci-visualization/ggobi/ggobi-2.1.11.ebuild b/sci-visualization/ggobi/ggobi-2.1.11.ebuild
new file mode 100644
index 000000000000..658728197cf2
--- /dev/null
+++ b/sci-visualization/ggobi/ggobi-2.1.11.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools
+
+DESCRIPTION="Visualization program for exploring high-dimensional data"
+HOMEPAGE="http://www.ggobi.org/"
+# source code release is not well published
+#SRC_URI="http://www.ggobi.org/downloads/${P}.tar.bz2"
+SRC_URI="mirror://debian/pool/main/g/${PN}/${PN}_${PV}.orig.tar.bz2"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc minimal nls"
+
+RDEPEND="
+	dev-libs/libxml2:2
+	media-gfx/graphviz
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i \
+		-e 's|ND_coord_i|ND_coord|' \
+		plugins/GraphLayout/graphviz.c || die
+	rm m4/libtool.m4 m4/lt*m4 plugins/*/aclocal.m4 || die
+	epatch \
+		"${FILESDIR}"/${PN}-2.1.8-plugindir.patch \
+		"${FILESDIR}"/${PN}-2.1.9-as-needed.patch \
+		"${FILESDIR}"/${PN}-2.1.10-desktop.patch \
+		"${FILESDIR}"/${PN}-2.1.11-Wformat-security.patch
+	# need the ${S} for recursivity lookup
+	AT_M4DIR="${S}"/m4 eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-rpath \
+		$(use_enable nls) \
+		$(use_with !minimal all-plugins)
+}
+
+src_compile() {
+	emake all ggobirc
+}
+
+src_install() {
+	default
+	insinto /etc/xdg/ggobi
+	doins ggobirc
+	use doc || rm "${ED}"/usr/share/doc/${PF}/*.pdf
+}
diff --git a/sci-visualization/ggobi/metadata.xml b/sci-visualization/ggobi/metadata.xml
new file mode 100644
index 000000000000..a0223eece275
--- /dev/null
+++ b/sci-visualization/ggobi/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
+<longdescription lang="en">
+  GGobi is an open source visualization program for exploring
+  high-dimensional data. It provides highly dynamic and interactive
+  graphics such as tours, as well as familiar graphics such as the
+  scatterplot, barchart and parallel coordinates plots. Plots are
+  interactive and linked with brushing and identification.    
+</longdescription>
+</pkgmetadata>
diff --git a/sci-visualization/gle/Manifest b/sci-visualization/gle/Manifest
new file mode 100644
index 000000000000..07afe1f21e21
--- /dev/null
+++ b/sci-visualization/gle/Manifest
@@ -0,0 +1,11 @@
+AUX 64gle-gentoo.el 161 SHA256 a14ce47df108c25318471f1ae3ccc6c9984b7e1a2728e16b57cef0a848156a55 SHA512 eda9f1f3ef933aa9f43054c7eae6ec9200022723d91259fb6ba42ddbfbd01f8953d4dcd9aa541211b054c6c93947d7cada1db599db046443b90451cce9e3d7f8 WHIRLPOOL cab4a9fa7425627d9d3f1026e78687fce6b9de8c867786c0fd1b21efade894e62f1c268818676fa8e6ccf5026a95378881b82983a3d654d7747569b37833e636
+AUX gle-4.2.4b-parallel.patch 464 SHA256 ac8ecbb9ea3198dfcb57c7cffe22dfbb5fc88f53fa4e68744078fa4f693ed8f0 SHA512 aeb1c1df07716844105cab33d84ffc5837a4a8b0452872360eaa169157ffdba88720783d421a0fd236a8ac89d128a1e75349d96566dc92f89b50a47352375cab WHIRLPOOL 6f583bf5efc758008c7977c17e3490ef42edb4f6ffb8bef343364f596065d780b9aaed1c51df331f6b42e4f903f35258ede260abd63e180077672707090e897b
+DIST GLEusersguide.pdf 2244780 SHA256 02c13fe038f8b4b7726ac3e6a74410e299f50cdccb2b040d7ed1fbc99b9cfbef SHA512 cce76a83d09a68d449f4e3717e9dfcaa6c0866a1c36eb58f7180c2602f8a780804278804fee555ae6360bcf8b10b34c2124408975ea49824ab5d8ae23685fc71 WHIRLPOOL 702e9926b0cfca7932279ba5cf459a5c4bf66c40ddad2f068dfec6aad891185a445ca3a830fa0f18371c36261f407aa78c74e7d4a7151ecf68d39d21675a6691
+DIST gle-graphics-4.2.4cf-src.tar.gz 2321647 SHA256 21715f2943ca528ec94a8e129175693afc3b59bb03f92540a2150ffe72ab47ef SHA512 961205fcb763ef0fd0b59cfffd144440ea7dea8a54a19e79caa97712245a51ceaaeda5b92ce2571852cec14357af696861bf9cd588aa08622cc8f1f5ebf3959a WHIRLPOOL 11465d836e8763fdc286f38ea9761d806174469b0c52e2f3ce3dacbbb1b5d587f1bf0aade3668b38c2b99668066e372782561ed4b1a2dbaf689095c149a8fcbe
+DIST gle-graphics-4.2.5f-src.tar.gz 2330270 SHA256 6cd6b1d82cbf2c7a0b0affbd67c0ec32460ef6a13f6b41dfdd6f308fd651f102 SHA512 d459b24577c9c3f8825c368f864532c97d0a37c94018276a60c941d17dce0e55fe738f7eda3227a47848f2fb32fea1dcec29d9751a5be92cde4d8d38a2eeb0f5 WHIRLPOOL 6d1cc02f65bfb39fda3ccbc7b56ae27bb5a15be428b171903abb5de8d6bbd089e7338e013708c0c926da4b5cf053c157103bb763e448f73e10d3d6281aed6744
+DIST gle-manual-4.2.2.pdf 2238766 SHA256 fbc4ba2613882d2d4ae3f8484c77aa27a257fc1b0ec02a46085c3651a2ace58e SHA512 0eaa10f1f13c2f65145cbeb8f713b6de787dcc7dd3c3a30e27514b1cc8e74007d38adc12fc7666d665677354c7c14db521dea05126614def4ec30f3429cd1a41 WHIRLPOOL 55bdb65ca95c3fcf183205c5bb59ca43e74bcd8751fce90aa2dd9cc0aedab9abfbfc986539fcce0b1cf559c68eb3a08d4747bc746509125ec6e15d913bee9482
+EBUILD gle-4.2.4c.ebuild 2428 SHA256 3b888bff99d801cf342c9094c7610270629a84e563dbd82c313d5062e1fef4cd SHA512 ee4b18afcbd8fd31e950a4e8ed8675e7b119ec52e31cbaae4e3c405cc6ed4e50e851278522c9abb21eec2bc1fc35dfc1d0384b8181fdf8934f432f7752caa49c WHIRLPOOL 6dba3be094df3307dc2183015f726ba9698bdfbb8297dd4a41568554f2b0adadf3d36ac2b8c1a1416069c16b4c388a66fa34aae69d0ac4cee62fe4d2ef1c70de
+EBUILD gle-4.2.5.ebuild 2314 SHA256 3e86b30d5795d95347fa2dec7d0d239fb7f7be4410306b956f9497f4dcc3b051 SHA512 b1a4be632e722a9aa6fb6f9b344076cc45738e34e961a5e3071b1868204450208700901d0a04bd6e450514a4ffa046d09c4a0bb049bb8f5b77d14d43d769c96d WHIRLPOOL a63d89e8fd1d879463722c50f64e400c2b5e36737ea541fd82efa7ebeae7a11cc282d2d4b1336f5d29d55da3382a2c4bfacbf787f7de1874c060b7367798013e
+MISC ChangeLog 3091 SHA256 527a5c8a47fa0ed87731af880fdd990477080166349e33f288fd0107209a1fed SHA512 7515093a2f1e9ce2f3ab84cc0496ec09f426247476f2982d39697e98476734e215bccf216073fcf9cbf76b9d481fb88eb7922a50f46a7b913201715f79f862a5 WHIRLPOOL 08a35459adcc22111d097a14948ac2386b9bcc0a2af016411c88909b71d4630c8a67c3365fd1ecfe16af8bcdaba4e5370bc827b069da4cc8e3bb92eea7b580e6
+MISC ChangeLog-2015 4190 SHA256 a89b4bc683a22e56e43abdb50f8af77cc6a6168f78d7f20f55d6e1f33edb3a95 SHA512 e817cdb667fb65ff365054a861c9e6dfcb283cd6f0f1f98fee9a3e4e3d4299266e95d27163e72bf674261e9dfe871970a49883fe6f813f11e66c04e12dd0f766 WHIRLPOOL da532e3285264a5eeafbe02a78d9711aedb0bb04eb1c6f89aa7a54523bc20b3db949aeb8d065ac01b83442519cb0c66711fe4b1f9734a80b451710a34bf9c37e
+MISC metadata.xml 725 SHA256 06f2565c1a0031e016604e72f88870bce37456231fc2eb6fa81d8c062eca78f8 SHA512 745264b5ccf026947f5a3c0a39b4199589d7831ec1f5de7c03f82b48ebbc590d57d973a7007a09d71135b60cf8129d38eeaab2a95785b62f76fccc6727db61ee WHIRLPOOL 60826ffd9203cdea2d051575aebc6c7494cc3c8e512ec2f7f77900a74360ae6a7ab646fbbf3353f8245538471b4251610664a5eadee084544ed033830d11c29b
diff --git a/sci-visualization/gle/files/64gle-gentoo.el b/sci-visualization/gle/files/64gle-gentoo.el
new file mode 100644
index 000000000000..841503ba6eec
--- /dev/null
+++ b/sci-visualization/gle/files/64gle-gentoo.el
@@ -0,0 +1,6 @@
+
+;;; gle site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'gle-mode "gle-mode")
+(add-to-list 'auto-mode-alist '("\\.gle\\'" . gle-mode))
diff --git a/sci-visualization/gle/files/gle-4.2.4b-parallel.patch b/sci-visualization/gle/files/gle-4.2.4b-parallel.patch
new file mode 100644
index 000000000000..1eff8c067102
--- /dev/null
+++ b/sci-visualization/gle/files/gle-4.2.4b-parallel.patch
@@ -0,0 +1,21 @@
+--- src/gui/MakefileAC.in.orig	2010-01-06 20:10:04.000000000 +0000
++++ src/gui/MakefileAC.in	2010-01-06 20:21:15.000000000 +0000
+@@ -84,14 +84,14 @@
+ qmake:
+ 	$(QMAKE_PROG) $(QMAKE_OPTS)
+ 
+-domake:
+-	$(MAKE_PROG)
++domake: Makefile
++	$(MAKE)
+ 
+-repmake:
++repmake: Makefile
+ 	perl ../../platform/autopackage/qt-replace.pl Makefile
+ 
+ doclean:
+-	-$(MAKE_PROG) clean
++	-$(MAKE) clean
+ 	-@$(RM) qgle install_qgle_name_mac Makefile
+ 	-@$(RMDIR) moc
+ 	-@$(RMDIR) objects
diff --git a/sci-visualization/gle/gle-4.2.4c.ebuild b/sci-visualization/gle/gle-4.2.4c.ebuild
new file mode 100644
index 000000000000..5df58681d2a3
--- /dev/null
+++ b/sci-visualization/gle/gle-4.2.4c.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils elisp-common qt4-r2 flag-o-matic autotools
+
+DESCRIPTION="Graphics Layout Engine"
+HOMEPAGE="http://glx.sourceforge.net/"
+MY_P=${PN}-graphics-${PV}
+MAN_V=4.2.2
+SRC_URI="mirror://sourceforge/glx/${MY_P}f-src.tar.gz
+	doc? ( mirror://sourceforge/glx/${PN}-manual-${MAN_V}.pdf
+		   mirror://sourceforge/glx/GLEusersguide.pdf )"
+SLOT="0"
+LICENSE="BSD-2 emacs? ( GPL-2 ) qt4? ( GPL-2 )"
+IUSE="X qt4 jpeg png tiff doc emacs vim-syntax"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	sys-libs/ncurses:0=
+	X? ( x11-libs/libX11 )
+	qt4? ( dev-qt/qtopengl:4 )
+	jpeg? ( virtual/jpeg:0 )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0 )
+	emacs? ( virtual/emacs )"
+
+RDEPEND="${DEPEND}
+	app-text/ghostscript-gpl
+	virtual/latex-base
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.2.4b-parallel.patch
+	eaclocal
+	eautoconf
+}
+
+src_configure() {
+	# CPPFLAGS are understood as C++ flags
+	append-cppflags ${CXXFLAGS}
+	econf \
+		--without-rpath \
+		--with-manip \
+		$(use_with qt4 qt "${EPREFIX}"/usr) \
+		$(use_with X x) \
+		$(use_with jpeg) \
+		$(use_with png) \
+		$(use_with tiff)
+}
+
+src_compile() {
+	emake
+	if use emacs; then
+		cd contrib/editors/highlighting
+		mv ${PN}-emacs.el ${PN}-mode.el
+		elisp-compile ${PN}-mode.el || die
+	fi
+}
+
+src_install() {
+	# -jN failed to install some data files
+	emake -j1 DESTDIR="${D}" install
+	rmdir "${ED}"/usr/share/doc/gle-graphics || die "rmdir gle-graphics failed"
+	dodoc README.txt
+
+	if use qt4; then
+		newicon src/gui/images/gle_icon.png gle.png
+		make_desktop_entry qgle GLE gle
+		newdoc src/gui/readme.txt gui_readme.txt
+	fi
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins "${DISTDIR}"/${PN}-manual-${MAN_V}.pdf \
+			"${DISTDIR}"/GLEusersguide.pdf
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} contrib/editors/highlighting/gle-mode.{el,elc} || die
+		elisp-site-file-install "${FILESDIR}"/64gle-gentoo.el || die
+	fi
+
+	if use vim-syntax ; then
+		dodir /usr/share/vim/vimfiles/{ftplugins,indent,syntax}
+		cd contrib/editors/highlighting/vim || die
+		chmod 644 ftplugin/* indent/* syntax/*
+		insinto /usr/share/vim/vimfiles
+		doins -r ftplugin indent syntax
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sci-visualization/gle/gle-4.2.5.ebuild b/sci-visualization/gle/gle-4.2.5.ebuild
new file mode 100644
index 000000000000..178b6e82de0c
--- /dev/null
+++ b/sci-visualization/gle/gle-4.2.5.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils elisp-common qt4-r2 flag-o-matic autotools
+
+DESCRIPTION="Graphics Layout Engine"
+HOMEPAGE="http://glx.sourceforge.net/"
+MY_P=${PN}-graphics-${PV}
+MAN_V=4.2.2
+SRC_URI="mirror://sourceforge/glx/${MY_P}f-src.tar.gz"
+SLOT="0"
+LICENSE="BSD-2 emacs? ( GPL-2 ) qt4? ( GPL-2 )"
+IUSE="X qt4 jpeg png tiff doc emacs vim-syntax"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	sys-libs/ncurses:0=
+	X? ( x11-libs/libX11 )
+	qt4? ( dev-qt/qtopengl:4 )
+	jpeg? ( virtual/jpeg:0 )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0 )
+	doc? ( dev-texlive/texlive-latexextra )
+	emacs? ( virtual/emacs )"
+
+RDEPEND="${DEPEND}
+	app-text/ghostscript-gpl
+	virtual/latex-base
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.2.4b-parallel.patch
+	eaclocal
+	eautoconf
+}
+
+src_configure() {
+	# CPPFLAGS are understood as C++ flags
+	append-cppflags ${CXXFLAGS}
+	econf \
+		--without-rpath \
+		--with-manip \
+		$(use_with qt4 qt "${EPREFIX}"/usr) \
+		$(use_with X x) \
+		$(use_with jpeg) \
+		$(use_with png) \
+		$(use_with tiff)
+}
+
+src_compile() {
+	emake
+	if use doc; then
+		emake -j1 doc
+	fi
+	if use emacs; then
+		cd contrib/editors/highlighting
+		mv ${PN}-emacs.el ${PN}-mode.el
+		elisp-compile ${PN}-mode.el || die
+	fi
+}
+
+src_install() {
+	# -jN failed to install some data files
+	emake -j1 DESTDIR="${D}" install
+	rm -rf "${ED}"/usr/share/doc/gle-graphics
+	dodoc README.txt
+
+	if use qt4; then
+		newicon src/gui/images/gle_icon.png gle.png
+		make_desktop_entry qgle GLE gle
+		newdoc src/gui/readme.txt gui_readme.txt
+	fi
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins build/doc/gle-manual.pdf
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} contrib/editors/highlighting/gle-mode.{el,elc} || die
+		elisp-site-file-install "${FILESDIR}"/64gle-gentoo.el || die
+	fi
+
+	if use vim-syntax ; then
+		dodir /usr/share/vim/vimfiles/{ftplugins,indent,syntax}
+		cd contrib/editors/highlighting/vim || die
+		chmod 644 ftplugin/* indent/* syntax/*
+		insinto /usr/share/vim/vimfiles
+		doins -r ftplugin indent syntax
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sci-visualization/gle/metadata.xml b/sci-visualization/gle/metadata.xml
new file mode 100644
index 000000000000..3d73697aa10d
--- /dev/null
+++ b/sci-visualization/gle/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+  GLE (Graphics Layout Engine) is a high-quality graphics package for
+  scientists, combining a user-friendly scripting language with a full
+  range of facilities for producing publication-quality graphs,
+  diagrams, posters and slides.
+</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">glx</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
new file mode 100644
index 000000000000..2bb46a07d2a9
--- /dev/null
+++ b/sci-visualization/gnuplot/Manifest
@@ -0,0 +1,14 @@
+AUX gnuplot-5.0.1-fix-underlinking.patch 483 SHA256 636e809614982d6271a1376f7b1d3278b59d08acc645bb81a44611e83ea1991d SHA512 b5ac3ed830f201ba6018a81bc4860e6da0e41cc9cdc1ac8acc225bf41a0006cbd6e2f8e061ab2bd013ad55b105a02e915e256a09ca4e4faaf4791ea1c3199f28 WHIRLPOOL 5dba603849e11ad1850771ecabe8a9b1d63c3c630a524d9c67a9fe096a5449618e0b59678aef8bc8cf7b1570eb06d740f8fc827d99d8d40c5ac5f9b799b47373
+DIST gnuplot-5.0.1.tar.gz 4963747 SHA256 7cbc557e71df581ea520123fb439dea5f073adcc9010a2885dc80d4ed28b3c47 SHA512 f68ccef8ecad0d5f7c2eb5dc2c97ba14abba6e3324c36bb9ede5f87eef613942376a26e42e55fa8e9c908e2b732aa0b9f34d6d5c386e3d5cf9685bbca60fa094 WHIRLPOOL 7c1d7ec4e999d5d78fadc67cee1186988dbb1cd53feef19094554aa215a19ee6b136d7b65e692cba42bfdb19a06f036fc3fbe1b78cb55f9d0f1b8a740341d15c
+DIST gnuplot-5.0.4.tar.gz 5051380 SHA256 151cb845728bde75eb9d1561b35140114a05a7c52a52bd35b4b2b3d944e0c31e SHA512 ebb6bf64cc7f333135d328f6b72d73ef3a3b62f5df28d746efa1589dd9d54fc359306c7c2bc5ad9671b53b0cc945a4388b087abf365dda7417fe21a93ff29dae WHIRLPOOL 73c952dd640879190d68c66df1d67c143ec3619c356f52357df637748be9324946f538ca3da222580f7376332dfc2a295634523d9864bd7342c43af0baa26053
+DIST gnuplot-5.0.5.tar.gz 5078771 SHA256 25f3e0bf192e01115c580f278c3725d7a569eb848786e12b455a3fda70312053 SHA512 fd6efc3a869850fa1939a4c833c776395efaaaf6dccc63e3626cee2e39938923b06314368802155adf711ae3e5ca0e3dd1a88be348e8571f9d0be8790240c62c WHIRLPOOL 586aa59439d92c1a05169b57b1c7369465914870788b20b394fef0591a84f134ce6f6707b370105f55277d326d3ab578904ac82355c8d97b7337a7980ab8e29e
+DIST gnuplot-5.0.6.tar.gz 5093897 SHA256 5bbe4713e555c2e103b7d4ffd45fca69551fff09cf5c3f9cb17428aaacc9b460 SHA512 7f9b05725a8594dcfbf1f1fc8f1db9bf45e1b6841fa1089b2c2528a3e36f71baab16d5fbeb027e4dd3618461a4895d037cb9f43781bfee2cb078cb9583567d8d WHIRLPOOL 3f3cf31f764af36d3761a17447ed8da98aec1148270eacc33c48605cf0dbff6dbde4b726403d4177da2104e6ff9baa4d48e0e3c65630a057ab1dc01f641daf5e
+EBUILD gnuplot-5.0.1-r1.ebuild 5692 SHA256 c8e358f2e1321906e215d51a81f3c777c9205b57321be97a8951d25a33fb3ed1 SHA512 6058590102387ce8899f50f2621fdb6221b2faa5f9778cda0cea465aa1501bc78c02c6e769f3f05297c8769f48087787fe20a9af7bc6e7038752c82d68993849 WHIRLPOOL efde2a5a906d40697310ccec9141f6bdbd38dcb50f660d97671ef661d23a713d59732f01fa98f1718d5b66df85615e6b0fd1ab874fe9fa994a3f60ce014dd75e
+EBUILD gnuplot-5.0.4.ebuild 5669 SHA256 cf4268a29f2d9b141f5a90235a279477cc5b27342fbf5c4738e213ae5b8d5336 SHA512 978f1d20657954c649780a8c2124a4aa95d1b81b5fdf49f6369f6679637c1e28bd948d90f98990404760ea0e007ff45e93351143d99e3c83525cc438d7a84a61 WHIRLPOOL 0b9d1f9448360b4d2ac3ff7f529e43ecc7dd15e91a7099be2aee33033c18bdb26fe31d7ccb6889d38e23167ad7bd0319f56e1b07674b66a7cf4fd267d6aae198
+EBUILD gnuplot-5.0.5.ebuild 5604 SHA256 06198c1feedefbf72c82a32b622b400d750f1d0e6ea8ef8a58204e88553cb53d SHA512 c251c4a2f3eed5ab4c9ae8423546f1adb84592fe0cd018e5f08240c862599c964db0383ac098da6e7b32e5986ab5ce1991721ac40f7c4b3d6188386c56df883d WHIRLPOOL fb4c7941b7fa4695dfc6f007c2dd35244f863a66779791d72f9f20045edda0db81c10d1aba1e2f7087794e2992ca7c7f783c4fe1ee13addb635a1de50dcf1c82
+EBUILD gnuplot-5.0.6.ebuild 5604 SHA256 06198c1feedefbf72c82a32b622b400d750f1d0e6ea8ef8a58204e88553cb53d SHA512 c251c4a2f3eed5ab4c9ae8423546f1adb84592fe0cd018e5f08240c862599c964db0383ac098da6e7b32e5986ab5ce1991721ac40f7c4b3d6188386c56df883d WHIRLPOOL fb4c7941b7fa4695dfc6f007c2dd35244f863a66779791d72f9f20045edda0db81c10d1aba1e2f7087794e2992ca7c7f783c4fe1ee13addb635a1de50dcf1c82
+EBUILD gnuplot-5.0.9999.ebuild 5617 SHA256 1269e993ce5310f73ad0e770b9d89246dc752fa8e2ad2bd34c85e04fb4b2418a SHA512 ad5e2f16c8309525d863621a564fc1aafdf834eb96f61b6f3f91d8c9dab2b55eedef34b7c77f07c90d3937252ceb35156265937858cba2afc173665bb44b187e WHIRLPOOL 97b856beb0d39c9e1627324fd9b340d6353d3ec176ec75c76f72667be168f7bd122873f9aa297cf13bd20e421f8387b637349c0b74d2670bb9f8ce1cf41b980b
+EBUILD gnuplot-5.1.9999.ebuild 5542 SHA256 9dfafd12a6b048259518a95f44b4e23741dc21a5be4702df5766a9661fbb593a SHA512 d4ebf26502c5b17b0e147fd5f478e15f145c15ca418b66735d80f7efb33c8129f895cdeca1962d91c42ba1704107c0d1b70696d8bc1f08fec3eb269f17287e07 WHIRLPOOL 0354f48c04472e07da3015661b7b7a71df6290bd65631922133f5bdc4472dfcf3df4852ab2596916814b30f44c09c24bdfc4d5781f7521c51a73fb7afee03773
+MISC ChangeLog 6805 SHA256 189ff4733326725d08cab997b43e907bebb96ebe28af7201cf420e327416eef2 SHA512 8aebaa653ee2bdcc9c42e68d4195991fd744b95a706a16586b50674f7e8dc513e9b9366b1c5679aa78da78eeb0a516b51c136522c425621790d3f14ddb50f1eb WHIRLPOOL d0c54fcb6e805b52bb13b1f175b7482ab05fcd308937ac600957cafc4a687d7df7ccacb5be1674a70f11b3ba733c1aeadde56e780acff5d7382c0a20ba31aa1c
+MISC ChangeLog-2015 43620 SHA256 71f96494865b1c06db75afdf7bc0813aae86cb84913756075e87899d97502ca8 SHA512 8f79b7dd12bbadc9c2f6e90f3cadefe783693174a19504847872f80ff7a62ab037ebeb7221aa7fd5ce5cf7fde86b3c55a14afb625d344a7ab27bc00be8698402 WHIRLPOOL 3c0e4fa5e788a5700d39cd137d71a2aeafad0df991ab301fc2e11bafd898386945234280d39e6ce4912da8429e148c9ea079257462c937ff34df0bd59c5f81ff
+MISC metadata.xml 1250 SHA256 08dcc4fd7b5f3152d19befb2de06a214d6fb69835cdf0f5609b6f22ada23e0eb SHA512 6f7195f01f62923757633f63c75f14f5c5dbf9b7ffd770af3e011873578128caebcd8b331ecf05bfc2f8e883b8062c29a3e937c026df1700d752a5455caa881c WHIRLPOOL c65f213f80566f99628e8e8ed2bb3086bcc26aadb078725566662a867d73a80afea8e2bd568e3f0ee9c1df566d571646dec7f893792193e5803f4f71ab6d76d3
diff --git a/sci-visualization/gnuplot/files/gnuplot-5.0.1-fix-underlinking.patch b/sci-visualization/gnuplot/files/gnuplot-5.0.1-fix-underlinking.patch
new file mode 100644
index 000000000000..c39bc828f268
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.0.1-fix-underlinking.patch
@@ -0,0 +1,17 @@
+Description: Add missing linkage against X11 libs.
+Author: Anton Gladky <gladk@debian.org>
+Last-Update: 2015-06-16
+
+Index: gnuplot-5.0.1/src/Makefile.am
+===================================================================
+--- gnuplot-5.0.1.orig/src/Makefile.am
++++ gnuplot-5.0.1/src/Makefile.am
+@@ -89,6 +89,8 @@ $(EXTRA_gnuplot_SOURCES)
+ 
+ if BUILD_WXWIDGETS
+ gnuplot_SOURCES += wxterminal/wxt_gui.cpp
++XLIBS = @LIBRARIES_FOR_X@
++gnuplot_LDADD += $(XLIBS)
+ endif
+ 
+ if BUILD_GPCAIRO
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild
new file mode 100644
index 000000000000..1f62807e15a4
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib readme.gentoo toolchain-funcs wxwidgets
+
+DESCRIPTION="Command-line driven interactive plotting program"
+HOMEPAGE="http://www.gnuplot.info/"
+
+if [[ -z ${PV%%*9999} ]]; then
+	inherit autotools cvs
+	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
+	ECVS_MODULE="gnuplot"
+	ECVS_BRANCH="branch-5-0-stable"
+	ECVS_USER="anonymous"
+	ECVS_CVS_OPTIONS="-dP"
+	MY_P="${PN}"
+	SRC_URI=""
+	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc x86"
+else
+	MY_P="${P/_/.}"
+	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	inherit autotools
+fi
+
+LICENSE="gnuplot bitmap? ( free-noncomm )"
+SLOT="0"
+IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X"
+
+RDEPEND="
+	cairo? (
+		x11-libs/cairo
+		x11-libs/pango )
+	gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
+	ggi? ( media-libs/libggi )
+	latex? (
+		virtual/latex-base
+		lua? (
+			dev-tex/pgf
+			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
+	libcaca? ( media-libs/libcaca )
+	lua? ( dev-lang/lua:0 )
+	qt4? ( >=dev-qt/qtcore-4.5:4
+		>=dev-qt/qtgui-4.5:4
+		>=dev-qt/qtsvg-4.5:4 )
+	readline? ( sys-libs/readline:0= )
+	libcerf? ( sci-libs/libcerf )
+	svga? ( media-libs/svgalib )
+	wxwidgets? (
+		x11-libs/wxGTK:3.0[X]
+		x11-libs/cairo
+		x11-libs/pango
+		x11-libs/gtk+:2 )
+	X? ( x11-libs/libXaw )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		app-text/ghostscript-gpl )"
+
+S="${WORKDIR}/${MY_P}"
+
+GP_VERSION="${PV%.*}"
+E_SITEFILE="lisp/50${PN}-gentoo.el"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
+
+src_prepare() {
+	# Fix underlinking
+	epatch "${FILESDIR}"/${P}-fix-underlinking.patch
+
+	if [[ -z ${PV%%*9999} ]]; then
+		local dir
+		for dir in config demo m4 term tutorial; do
+			emake -C "$dir" -f Makefile.am.in Makefile.am
+		done
+		#eautoreconf
+	fi
+
+	# Add special version identification as required by provision 2
+	# of the gnuplot license
+	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
+
+	# hacky workaround
+	# Please hack the buildsystem if you like
+	if use prefix && use qt4; then
+		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
+	fi
+
+	DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
+		for details. You can use the "pdfcairo" terminal for PDF output.'
+	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
+	use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
+		SVGA console graphics, gnuplot needs to be set up as setuid root.
+		Please note that this is usually considered to be a security hazard.
+		As root, manually "chmod u+s /usr/bin/gnuplot".'
+	use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output,
+		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
+		environment variables. See the FAQ file in /usr/share/doc/${PF}/
+		for more information.'
+
+	mv configure.in configure.ac || die
+	eautoreconf
+
+	# Make sure we don't mix build & host flags.
+	sed -i \
+		-e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
+		-e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
+		-e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
+		-e 's:@CC@:$(CC_FOR_BUILD):' \
+		docs/Makefile.in || die
+}
+
+src_configure() {
+	if ! use latex; then
+		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
+	fi
+
+	if use wxwidgets; then
+		WX_GTK_VER="3.0"
+		need-wxwidgets unicode
+	fi
+
+	tc-export CC CXX			#453174
+	tc-export_build_env BUILD_CC
+	export CC_FOR_BUILD=${BUILD_CC}
+
+	econf \
+		--without-pdf \
+		--with-texdir="${TEXMF}/tex/latex/${PN}" \
+		--with-readline=$(usex readline gnu builtin) \
+		$(use_with bitmap bitmap-terminals) \
+		$(use_with cairo) \
+		$(use_enable compat backwards-compatibility) \
+		$(use_with doc tutorial) \
+		$(use_with gd) \
+		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
+		"$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
+		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
+		$(use_with libcerf) \
+		$(use_with lua) \
+		$(use_with svga linux-vga) \
+		$(use_with X x) \
+		--enable-stats \
+		$(use_with qt4 qt qt4) \
+		$(use_enable wxwidgets) \
+		DIST_CONTACT="https://bugs.gentoo.org/" \
+		EMACS=no
+}
+
+src_compile() {
+	# Prevent access violations, see bug 201871
+	export VARTEXFONTS="${T}/fonts"
+
+	# We believe that the following line is no longer needed.
+	# In case of problems file a bug report at bugs.gentoo.org.
+	#addwrite /dev/svga:/dev/mouse:/dev/tts/0
+
+	emake all
+
+	if use doc; then
+		# Avoid sandbox violation in epstopdf/ghostscript
+		addpredict /var/cache/fontconfig
+		emake -C docs gnuplot.pdf
+		emake -C tutorial pdf
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
+	newdoc term/PostScript/README README-ps
+	newdoc term/js/README README-js
+	use lua && newdoc term/lua/README README-lua
+	readme.gentoo_create_doc
+
+	if use examples; then
+		# Demo files
+		insinto /usr/share/${PN}/${GP_VERSION}
+		doins -r demo
+		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
+		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
+	fi
+
+	if use doc; then
+		# Manual, tutorial, FAQ
+		dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
+		# Documentation for making PostScript files
+		docinto psdoc
+		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
+	fi
+}
+
+src_test() {
+	GNUTERM="unknown" default_src_test
+}
+
+pkg_postinst() {
+	use latex && texmf-update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use latex && texmf-update
+}
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.4.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.4.ebuild
new file mode 100644
index 000000000000..da8e950ce6ee
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-5.0.4.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib readme.gentoo toolchain-funcs wxwidgets
+
+DESCRIPTION="Command-line driven interactive plotting program"
+HOMEPAGE="http://www.gnuplot.info/"
+
+if [[ -z ${PV%%*9999} ]]; then
+	inherit autotools cvs
+	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
+	ECVS_MODULE="gnuplot"
+	ECVS_BRANCH="branch-5-0-stable"
+	ECVS_USER="anonymous"
+	ECVS_CVS_OPTIONS="-dP"
+	MY_P="${PN}"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	MY_P="${P/_/.}"
+	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	inherit autotools
+fi
+
+LICENSE="gnuplot bitmap? ( free-noncomm )"
+SLOT="0"
+IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X"
+
+RDEPEND="
+	cairo? (
+		x11-libs/cairo
+		x11-libs/pango )
+	gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
+	ggi? ( media-libs/libggi )
+	latex? (
+		virtual/latex-base
+		lua? (
+			dev-tex/pgf
+			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
+	libcaca? ( media-libs/libcaca )
+	lua? ( dev-lang/lua:0 )
+	qt4? ( >=dev-qt/qtcore-4.5:4
+		>=dev-qt/qtgui-4.5:4
+		>=dev-qt/qtsvg-4.5:4 )
+	readline? ( sys-libs/readline:0= )
+	libcerf? ( sci-libs/libcerf )
+	svga? ( media-libs/svgalib )
+	wxwidgets? (
+		x11-libs/wxGTK:3.0[X]
+		x11-libs/cairo
+		x11-libs/pango
+		x11-libs/gtk+:2 )
+	X? ( x11-libs/libXaw )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		app-text/ghostscript-gpl )"
+
+S="${WORKDIR}/${MY_P}"
+
+GP_VERSION="${PV%.*}"
+E_SITEFILE="lisp/50${PN}-gentoo.el"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
+
+src_prepare() {
+	# Fix underlinking
+	epatch "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
+
+	if [[ -z ${PV%%*9999} ]]; then
+		local dir
+		for dir in config demo m4 term tutorial; do
+			emake -C "$dir" -f Makefile.am.in Makefile.am
+		done
+		#eautoreconf
+	fi
+
+	# Add special version identification as required by provision 2
+	# of the gnuplot license
+	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
+
+	# hacky workaround
+	# Please hack the buildsystem if you like
+	if use prefix && use qt4; then
+		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
+	fi
+
+	DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
+		for details. You can use the "pdfcairo" terminal for PDF output.'
+	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
+	use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
+		SVGA console graphics, gnuplot needs to be set up as setuid root.
+		Please note that this is usually considered to be a security hazard.
+		As root, manually "chmod u+s /usr/bin/gnuplot".'
+	use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output,
+		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
+		environment variables. See the FAQ file in /usr/share/doc/${PF}/
+		for more information.'
+
+	mv configure.in configure.ac || die
+	eautoreconf
+
+	# Make sure we don't mix build & host flags.
+	sed -i \
+		-e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
+		-e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
+		-e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
+		-e 's:@CC@:$(CC_FOR_BUILD):' \
+		docs/Makefile.in || die
+}
+
+src_configure() {
+	if ! use latex; then
+		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
+	fi
+
+	if use wxwidgets; then
+		WX_GTK_VER="3.0"
+		need-wxwidgets unicode
+	fi
+
+	tc-export CC CXX			#453174
+	tc-export_build_env BUILD_CC
+	export CC_FOR_BUILD=${BUILD_CC}
+
+	econf \
+		--without-pdf \
+		--with-texdir="${TEXMF}/tex/latex/${PN}" \
+		--with-readline=$(usex readline gnu builtin) \
+		$(use_with bitmap bitmap-terminals) \
+		$(use_with cairo) \
+		$(use_enable compat backwards-compatibility) \
+		$(use_with doc tutorial) \
+		$(use_with gd) \
+		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
+		"$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
+		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
+		$(use_with libcerf) \
+		$(use_with lua) \
+		$(use_with svga linux-vga) \
+		$(use_with X x) \
+		--enable-stats \
+		$(use_with qt4 qt qt4) \
+		$(use_enable wxwidgets) \
+		DIST_CONTACT="https://bugs.gentoo.org/" \
+		EMACS=no
+}
+
+src_compile() {
+	# Prevent access violations, see bug 201871
+	export VARTEXFONTS="${T}/fonts"
+
+	# We believe that the following line is no longer needed.
+	# In case of problems file a bug report at bugs.gentoo.org.
+	#addwrite /dev/svga:/dev/mouse:/dev/tts/0
+
+	emake all
+
+	if use doc; then
+		# Avoid sandbox violation in epstopdf/ghostscript
+		addpredict /var/cache/fontconfig
+		emake -C docs gnuplot.pdf
+		emake -C tutorial pdf
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
+	newdoc term/PostScript/README README-ps
+	newdoc term/js/README README-js
+	use lua && newdoc term/lua/README README-lua
+	readme.gentoo_create_doc
+
+	if use examples; then
+		# Demo files
+		insinto /usr/share/${PN}/${GP_VERSION}
+		doins -r demo
+		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
+		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
+	fi
+
+	if use doc; then
+		# Manual, tutorial, FAQ
+		dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
+		# Documentation for making PostScript files
+		docinto psdoc
+		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
+	fi
+}
+
+src_test() {
+	GNUTERM="unknown" default_src_test
+}
+
+pkg_postinst() {
+	use latex && texmf-update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use latex && texmf-update
+}
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.5.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.5.ebuild
new file mode 100644
index 000000000000..cac060cf8d00
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-5.0.5.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets
+
+DESCRIPTION="Command-line driven interactive plotting program"
+HOMEPAGE="http://www.gnuplot.info/"
+
+if [[ -z ${PV%%*9999} ]]; then
+	inherit cvs
+	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
+	ECVS_MODULE="gnuplot"
+	ECVS_BRANCH="HEAD"
+	ECVS_USER="anonymous"
+	ECVS_CVS_OPTIONS="-dP"
+	MY_P="${PN}"
+	SRC_URI=""
+	KEYWORDS=""
+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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="gnuplot bitmap? ( free-noncomm )"
+SLOT="0"
+IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X"
+
+RDEPEND="
+	cairo? (
+		x11-libs/cairo
+		x11-libs/pango )
+	gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
+	ggi? ( media-libs/libggi )
+	latex? (
+		virtual/latex-base
+		lua? (
+			dev-tex/pgf
+			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
+	libcaca? ( media-libs/libcaca )
+	lua? ( dev-lang/lua:0 )
+	qt4? ( >=dev-qt/qtcore-4.5:4
+		>=dev-qt/qtgui-4.5:4
+		>=dev-qt/qtsvg-4.5:4 )
+	readline? ( sys-libs/readline:0= )
+	libcerf? ( sci-libs/libcerf )
+	svga? ( media-libs/svgalib )
+	wxwidgets? (
+		x11-libs/wxGTK:3.0[X]
+		x11-libs/cairo
+		x11-libs/pango
+		x11-libs/gtk+:2 )
+	X? ( x11-libs/libXaw )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		app-text/ghostscript-gpl )"
+
+S="${WORKDIR}/${MY_P}"
+
+GP_VERSION="${PV%.*}"
+E_SITEFILE="lisp/50${PN}-gentoo.el"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
+
+PATCHES=( "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch )
+
+src_prepare() {
+	default
+
+	if [[ -z ${PV%%*9999} ]]; then
+		local dir
+		for dir in config demo m4 term tutorial; do
+			emake -C "$dir" -f Makefile.am.in Makefile.am
+		done
+	fi
+
+	# Add special version identification as required by provision 2
+	# of the gnuplot license
+	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
+
+	# hacky workaround
+	# Please hack the buildsystem if you like
+	if use prefix && use qt4; then
+		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
+	fi
+
+	DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
+		for details. You can use the "pdfcairo" terminal for PDF output.'
+	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
+	use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
+		SVGA console graphics, gnuplot needs to be set up as setuid root.
+		Please note that this is usually considered to be a security hazard.
+		As root, manually "chmod u+s /usr/bin/gnuplot".'
+	use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output,
+		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
+		environment variables. See the FAQ file in /usr/share/doc/${PF}/
+		for more information.'
+
+	mv configure.in configure.ac || die
+	eautoreconf
+
+	# Make sure we don't mix build & host flags.
+	sed -i \
+		-e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
+		-e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
+		-e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
+		-e 's:@CC@:$(CC_FOR_BUILD):' \
+		docs/Makefile.in || die
+}
+
+src_configure() {
+	if ! use latex; then
+		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
+	fi
+
+	if use wxwidgets; then
+		WX_GTK_VER="3.0"
+		need-wxwidgets unicode
+	fi
+
+	tc-export CC CXX			#453174
+	tc-export_build_env BUILD_CC
+	export CC_FOR_BUILD=${BUILD_CC}
+
+	econf \
+		--without-pdf \
+		--with-texdir="${TEXMF}/tex/latex/${PN}" \
+		--with-readline=$(usex readline gnu builtin) \
+		$(use_with bitmap bitmap-terminals) \
+		$(use_with cairo) \
+		$(use_enable compat backwards-compatibility) \
+		$(use_with doc tutorial) \
+		$(use_with gd) \
+		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
+		"$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
+		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
+		$(use_with libcerf) \
+		$(use_with lua) \
+		$(use_with svga linux-vga) \
+		$(use_with X x) \
+		--enable-stats \
+		$(use_with qt4 qt qt4) \
+		$(use_enable wxwidgets) \
+		DIST_CONTACT="https://bugs.gentoo.org/" \
+		EMACS=no
+}
+
+src_compile() {
+	# Prevent access violations, see bug 201871
+	export VARTEXFONTS="${T}/fonts"
+
+	# We believe that the following line is no longer needed.
+	# In case of problems file a bug report at bugs.gentoo.org.
+	#addwrite /dev/svga:/dev/mouse:/dev/tts/0
+
+	emake all
+
+	if use doc; then
+		# Avoid sandbox violation in epstopdf/ghostscript
+		addpredict /var/cache/fontconfig
+		emake -C docs gnuplot.pdf
+		emake -C tutorial pdf
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
+	newdoc term/PostScript/README README-ps
+	newdoc term/js/README README-js
+	use lua && newdoc term/lua/README README-lua
+	readme.gentoo_create_doc
+
+	if use examples; then
+		# Demo files
+		insinto /usr/share/${PN}/${GP_VERSION}
+		doins -r demo
+		rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
+		rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
+	fi
+
+	if use doc; then
+		# Manual, tutorial, FAQ
+		dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
+		# Documentation for making PostScript files
+		docinto psdoc
+		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
+	fi
+}
+
+src_test() {
+	GNUTERM="unknown" default_src_test
+}
+
+pkg_postinst() {
+	use latex && texmf-update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use latex && texmf-update
+}
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.6.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.6.ebuild
new file mode 100644
index 000000000000..cac060cf8d00
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-5.0.6.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets
+
+DESCRIPTION="Command-line driven interactive plotting program"
+HOMEPAGE="http://www.gnuplot.info/"
+
+if [[ -z ${PV%%*9999} ]]; then
+	inherit cvs
+	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
+	ECVS_MODULE="gnuplot"
+	ECVS_BRANCH="HEAD"
+	ECVS_USER="anonymous"
+	ECVS_CVS_OPTIONS="-dP"
+	MY_P="${PN}"
+	SRC_URI=""
+	KEYWORDS=""
+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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="gnuplot bitmap? ( free-noncomm )"
+SLOT="0"
+IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X"
+
+RDEPEND="
+	cairo? (
+		x11-libs/cairo
+		x11-libs/pango )
+	gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
+	ggi? ( media-libs/libggi )
+	latex? (
+		virtual/latex-base
+		lua? (
+			dev-tex/pgf
+			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
+	libcaca? ( media-libs/libcaca )
+	lua? ( dev-lang/lua:0 )
+	qt4? ( >=dev-qt/qtcore-4.5:4
+		>=dev-qt/qtgui-4.5:4
+		>=dev-qt/qtsvg-4.5:4 )
+	readline? ( sys-libs/readline:0= )
+	libcerf? ( sci-libs/libcerf )
+	svga? ( media-libs/svgalib )
+	wxwidgets? (
+		x11-libs/wxGTK:3.0[X]
+		x11-libs/cairo
+		x11-libs/pango
+		x11-libs/gtk+:2 )
+	X? ( x11-libs/libXaw )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		app-text/ghostscript-gpl )"
+
+S="${WORKDIR}/${MY_P}"
+
+GP_VERSION="${PV%.*}"
+E_SITEFILE="lisp/50${PN}-gentoo.el"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
+
+PATCHES=( "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch )
+
+src_prepare() {
+	default
+
+	if [[ -z ${PV%%*9999} ]]; then
+		local dir
+		for dir in config demo m4 term tutorial; do
+			emake -C "$dir" -f Makefile.am.in Makefile.am
+		done
+	fi
+
+	# Add special version identification as required by provision 2
+	# of the gnuplot license
+	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
+
+	# hacky workaround
+	# Please hack the buildsystem if you like
+	if use prefix && use qt4; then
+		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
+	fi
+
+	DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
+		for details. You can use the "pdfcairo" terminal for PDF output.'
+	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
+	use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
+		SVGA console graphics, gnuplot needs to be set up as setuid root.
+		Please note that this is usually considered to be a security hazard.
+		As root, manually "chmod u+s /usr/bin/gnuplot".'
+	use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output,
+		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
+		environment variables. See the FAQ file in /usr/share/doc/${PF}/
+		for more information.'
+
+	mv configure.in configure.ac || die
+	eautoreconf
+
+	# Make sure we don't mix build & host flags.
+	sed -i \
+		-e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
+		-e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
+		-e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
+		-e 's:@CC@:$(CC_FOR_BUILD):' \
+		docs/Makefile.in || die
+}
+
+src_configure() {
+	if ! use latex; then
+		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
+	fi
+
+	if use wxwidgets; then
+		WX_GTK_VER="3.0"
+		need-wxwidgets unicode
+	fi
+
+	tc-export CC CXX			#453174
+	tc-export_build_env BUILD_CC
+	export CC_FOR_BUILD=${BUILD_CC}
+
+	econf \
+		--without-pdf \
+		--with-texdir="${TEXMF}/tex/latex/${PN}" \
+		--with-readline=$(usex readline gnu builtin) \
+		$(use_with bitmap bitmap-terminals) \
+		$(use_with cairo) \
+		$(use_enable compat backwards-compatibility) \
+		$(use_with doc tutorial) \
+		$(use_with gd) \
+		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
+		"$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
+		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
+		$(use_with libcerf) \
+		$(use_with lua) \
+		$(use_with svga linux-vga) \
+		$(use_with X x) \
+		--enable-stats \
+		$(use_with qt4 qt qt4) \
+		$(use_enable wxwidgets) \
+		DIST_CONTACT="https://bugs.gentoo.org/" \
+		EMACS=no
+}
+
+src_compile() {
+	# Prevent access violations, see bug 201871
+	export VARTEXFONTS="${T}/fonts"
+
+	# We believe that the following line is no longer needed.
+	# In case of problems file a bug report at bugs.gentoo.org.
+	#addwrite /dev/svga:/dev/mouse:/dev/tts/0
+
+	emake all
+
+	if use doc; then
+		# Avoid sandbox violation in epstopdf/ghostscript
+		addpredict /var/cache/fontconfig
+		emake -C docs gnuplot.pdf
+		emake -C tutorial pdf
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
+	newdoc term/PostScript/README README-ps
+	newdoc term/js/README README-js
+	use lua && newdoc term/lua/README README-lua
+	readme.gentoo_create_doc
+
+	if use examples; then
+		# Demo files
+		insinto /usr/share/${PN}/${GP_VERSION}
+		doins -r demo
+		rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
+		rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
+	fi
+
+	if use doc; then
+		# Manual, tutorial, FAQ
+		dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
+		# Documentation for making PostScript files
+		docinto psdoc
+		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
+	fi
+}
+
+src_test() {
+	GNUTERM="unknown" default_src_test
+}
+
+pkg_postinst() {
+	use latex && texmf-update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use latex && texmf-update
+}
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
new file mode 100644
index 000000000000..e06fd330630b
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets
+
+DESCRIPTION="Command-line driven interactive plotting program"
+HOMEPAGE="http://www.gnuplot.info/"
+
+if [[ -z ${PV%%*9999} ]]; then
+	inherit cvs
+	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
+	ECVS_MODULE="gnuplot"
+	ECVS_BRANCH="branch-5-0-stable"
+	ECVS_USER="anonymous"
+	ECVS_CVS_OPTIONS="-dP"
+	MY_P="${PN}"
+	SRC_URI=""
+	KEYWORDS=""
+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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="gnuplot bitmap? ( free-noncomm )"
+SLOT="0"
+IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X"
+
+RDEPEND="
+	cairo? (
+		x11-libs/cairo
+		x11-libs/pango )
+	gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
+	ggi? ( media-libs/libggi )
+	latex? (
+		virtual/latex-base
+		lua? (
+			dev-tex/pgf
+			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
+	libcaca? ( media-libs/libcaca )
+	lua? ( dev-lang/lua:0 )
+	qt4? ( >=dev-qt/qtcore-4.5:4
+		>=dev-qt/qtgui-4.5:4
+		>=dev-qt/qtsvg-4.5:4 )
+	readline? ( sys-libs/readline:0= )
+	libcerf? ( sci-libs/libcerf )
+	svga? ( media-libs/svgalib )
+	wxwidgets? (
+		x11-libs/wxGTK:3.0[X]
+		x11-libs/cairo
+		x11-libs/pango
+		x11-libs/gtk+:2 )
+	X? ( x11-libs/libXaw )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		app-text/ghostscript-gpl )"
+
+S="${WORKDIR}/${MY_P}"
+
+GP_VERSION="${PV%.*}"
+E_SITEFILE="lisp/50${PN}-gentoo.el"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
+
+PATCHES=( "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch )
+
+src_prepare() {
+	default
+
+	if [[ -z ${PV%%*9999} ]]; then
+		local dir
+		for dir in config demo m4 term tutorial; do
+			emake -C "$dir" -f Makefile.am.in Makefile.am
+		done
+	fi
+
+	# Add special version identification as required by provision 2
+	# of the gnuplot license
+	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
+
+	# hacky workaround
+	# Please hack the buildsystem if you like
+	if use prefix && use qt4; then
+		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
+	fi
+
+	DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
+		for details. You can use the "pdfcairo" terminal for PDF output.'
+	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
+	use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
+		SVGA console graphics, gnuplot needs to be set up as setuid root.
+		Please note that this is usually considered to be a security hazard.
+		As root, manually "chmod u+s /usr/bin/gnuplot".'
+	use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output,
+		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
+		environment variables. See the FAQ file in /usr/share/doc/${PF}/
+		for more information.'
+
+	mv configure.in configure.ac || die
+	eautoreconf
+
+	# Make sure we don't mix build & host flags.
+	sed -i \
+		-e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
+		-e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
+		-e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
+		-e 's:@CC@:$(CC_FOR_BUILD):' \
+		docs/Makefile.in || die
+}
+
+src_configure() {
+	if ! use latex; then
+		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
+	fi
+
+	if use wxwidgets; then
+		WX_GTK_VER="3.0"
+		need-wxwidgets unicode
+	fi
+
+	tc-export CC CXX			#453174
+	tc-export_build_env BUILD_CC
+	export CC_FOR_BUILD=${BUILD_CC}
+
+	econf \
+		--without-pdf \
+		--with-texdir="${TEXMF}/tex/latex/${PN}" \
+		--with-readline=$(usex readline gnu builtin) \
+		$(use_with bitmap bitmap-terminals) \
+		$(use_with cairo) \
+		$(use_enable compat backwards-compatibility) \
+		$(use_with doc tutorial) \
+		$(use_with gd) \
+		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
+		"$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
+		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
+		$(use_with libcerf) \
+		$(use_with lua) \
+		$(use_with svga linux-vga) \
+		$(use_with X x) \
+		--enable-stats \
+		$(use_with qt4 qt qt4) \
+		$(use_enable wxwidgets) \
+		DIST_CONTACT="https://bugs.gentoo.org/" \
+		EMACS=no
+}
+
+src_compile() {
+	# Prevent access violations, see bug 201871
+	export VARTEXFONTS="${T}/fonts"
+
+	# We believe that the following line is no longer needed.
+	# In case of problems file a bug report at bugs.gentoo.org.
+	#addwrite /dev/svga:/dev/mouse:/dev/tts/0
+
+	emake all
+
+	if use doc; then
+		# Avoid sandbox violation in epstopdf/ghostscript
+		addpredict /var/cache/fontconfig
+		emake -C docs gnuplot.pdf
+		emake -C tutorial pdf
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
+	newdoc term/PostScript/README README-ps
+	newdoc term/js/README README-js
+	use lua && newdoc term/lua/README README-lua
+	readme.gentoo_create_doc
+
+	if use examples; then
+		# Demo files
+		insinto /usr/share/${PN}/${GP_VERSION}
+		doins -r demo
+		rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
+		rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
+	fi
+
+	if use doc; then
+		# Manual, tutorial, FAQ
+		dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
+		# Documentation for making PostScript files
+		docinto psdoc
+		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
+	fi
+}
+
+src_test() {
+	GNUTERM="unknown" default_src_test
+}
+
+pkg_postinst() {
+	use latex && texmf-update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use latex && texmf-update
+}
diff --git a/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild
new file mode 100644
index 000000000000..cbc8a7447f0a
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets
+
+DESCRIPTION="Command-line driven interactive plotting program"
+HOMEPAGE="http://www.gnuplot.info/"
+
+if [[ -z ${PV%%*9999} ]]; then
+	inherit cvs
+	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
+	ECVS_MODULE="gnuplot"
+	ECVS_BRANCH="HEAD"
+	ECVS_USER="anonymous"
+	ECVS_CVS_OPTIONS="-dP"
+	MY_P="${PN}"
+	SRC_URI=""
+	KEYWORDS=""
+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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="gnuplot bitmap? ( free-noncomm )"
+SLOT="0"
+IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X"
+
+RDEPEND="
+	cairo? (
+		x11-libs/cairo
+		x11-libs/pango )
+	gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
+	ggi? ( media-libs/libggi )
+	latex? (
+		virtual/latex-base
+		lua? (
+			dev-tex/pgf
+			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
+	libcaca? ( media-libs/libcaca )
+	lua? ( dev-lang/lua:0 )
+	qt4? ( >=dev-qt/qtcore-4.5:4
+		>=dev-qt/qtgui-4.5:4
+		>=dev-qt/qtsvg-4.5:4 )
+	readline? ( sys-libs/readline:0= )
+	libcerf? ( sci-libs/libcerf )
+	svga? ( media-libs/svgalib )
+	wxwidgets? (
+		x11-libs/wxGTK:3.0[X]
+		x11-libs/cairo
+		x11-libs/pango
+		x11-libs/gtk+:2 )
+	X? ( x11-libs/libXaw )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		app-text/ghostscript-gpl )"
+
+S="${WORKDIR}/${MY_P}"
+
+GP_VERSION="${PV%.*}"
+E_SITEFILE="lisp/50${PN}-gentoo.el"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
+
+src_prepare() {
+	default
+
+	if [[ -z ${PV%%*9999} ]]; then
+		local dir
+		for dir in config demo m4 term tutorial; do
+			emake -C "$dir" -f Makefile.am.in Makefile.am
+		done
+	fi
+
+	# Add special version identification as required by provision 2
+	# of the gnuplot license
+	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
+
+	# hacky workaround
+	# Please hack the buildsystem if you like
+	if use prefix && use qt4; then
+		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
+	fi
+
+	DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
+		for details. You can use the "pdfcairo" terminal for PDF output.'
+	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
+	use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
+		SVGA console graphics, gnuplot needs to be set up as setuid root.
+		Please note that this is usually considered to be a security hazard.
+		As root, manually "chmod u+s /usr/bin/gnuplot".'
+	use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output,
+		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
+		environment variables. See the FAQ file in /usr/share/doc/${PF}/
+		for more information.'
+
+	mv configure.in configure.ac || die
+	eautoreconf
+
+	# Make sure we don't mix build & host flags.
+	sed -i \
+		-e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
+		-e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
+		-e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
+		-e 's:@CC@:$(CC_FOR_BUILD):' \
+		docs/Makefile.in || die
+}
+
+src_configure() {
+	if ! use latex; then
+		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
+	fi
+
+	if use wxwidgets; then
+		WX_GTK_VER="3.0"
+		need-wxwidgets unicode
+	fi
+
+	tc-export CC CXX			#453174
+	tc-export_build_env BUILD_CC
+	export CC_FOR_BUILD=${BUILD_CC}
+
+	econf \
+		--without-pdf \
+		--with-texdir="${TEXMF}/tex/latex/${PN}" \
+		--with-readline=$(usex readline gnu builtin) \
+		$(use_with bitmap bitmap-terminals) \
+		$(use_with cairo) \
+		$(use_enable compat backwards-compatibility) \
+		$(use_with doc tutorial) \
+		$(use_with gd) \
+		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
+		"$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
+		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
+		$(use_with libcerf) \
+		$(use_with lua) \
+		$(use_with svga linux-vga) \
+		$(use_with X x) \
+		--enable-stats \
+		$(use_with qt4 qt qt4) \
+		$(use_enable wxwidgets) \
+		DIST_CONTACT="https://bugs.gentoo.org/" \
+		EMACS=no
+}
+
+src_compile() {
+	# Prevent access violations, see bug 201871
+	export VARTEXFONTS="${T}/fonts"
+
+	# We believe that the following line is no longer needed.
+	# In case of problems file a bug report at bugs.gentoo.org.
+	#addwrite /dev/svga:/dev/mouse:/dev/tts/0
+
+	emake all
+
+	if use doc; then
+		# Avoid sandbox violation in epstopdf/ghostscript
+		addpredict /var/cache/fontconfig
+		emake -C docs gnuplot.pdf
+		emake -C tutorial pdf
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
+	newdoc term/PostScript/README README-ps
+	newdoc term/js/README README-js
+	use lua && newdoc term/lua/README README-lua
+	readme.gentoo_create_doc
+
+	if use examples; then
+		# Demo files
+		insinto /usr/share/${PN}/${GP_VERSION}
+		doins -r demo
+		rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
+		rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
+	fi
+
+	if use doc; then
+		# Manual, tutorial, FAQ
+		dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
+		# Documentation for making PostScript files
+		docinto psdoc
+		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
+	fi
+}
+
+src_test() {
+	GNUTERM="unknown" default_src_test
+}
+
+pkg_postinst() {
+	use latex && texmf-update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use latex && texmf-update
+}
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
new file mode 100644
index 000000000000..151dd892920f
--- /dev/null
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ulm@gentoo.org</email>
+    <name>Ulrich Müller</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>junghans@gentoo.org</email>
+    <name>Christoph Junghans</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+  Gnuplot is a command-driven interactive function plotting program.
+  It can be used to plot functions and data points in both two- and
+  three-dimensional plots in many different formats. It is designed
+  primarily for the visual display of scientific data.
+</longdescription>
+  <use>
+	<flag name="compat">Enable backwards compatibility with version 4 syntax</flag>
+    <flag name="gd">Add support for <pkg>media-libs/gd</pkg>.
+    Needed for GIF, JPEG, and PNG image output.</flag>
+    <flag name="libcerf">Enable special functions from <pkg>sci-libs/libcerf</pkg></flag>
+    <flag name="bitmap">Enable dot-matrix printers and pbm terminal</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">gnuplot</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest
new file mode 100644
index 000000000000..ab7a70241619
--- /dev/null
+++ b/sci-visualization/grace/Manifest
@@ -0,0 +1,16 @@
+AUX grace-5.1.21-fortran.patch 649 SHA256 f6b078cb8ab1fafc59b3993b374731cd82dbbee6334afd7c5ccfe6fefb823bb7 SHA512 29331f67e0a23a2c180aff1c864fde6cd7b41d835a0eff63135c1f5840b2c67263c409c355d1c453133668f2dbde032f7525859ce2e579d52db8884f08554baa WHIRLPOOL 6225c84888b9bcb3c83ac4e7a68325e480a7982add44cbdf2c3f2f47ddb391d44dcb2c9c4733ff5f70f73a5b020026c2faecc3495d72409c72c77ceca502dc74
+AUX grace-5.1.21-netcdf.patch 412 SHA256 9b76339d4c9f3e26f0ba05dfd7d2358146fabc6ed466182f4a20bc134a90e3fc SHA512 b80651039fe60d7784839061081d9f2d64cd67a71e80f834d938f62266a825666e11c424bdd92a9a0808e148537c56106c79f4be943abf36925923f7fd89b347 WHIRLPOOL ec964d69fbb0a520de018bedb0f65810aa33ccf825581a7c5b3410d8e3f52e0bfd1e34f35e4ffe82b31f666866bb24041038e8dfa8a392f30968be0d49657afa
+AUX grace-5.1.22-dlmodule.patch 355 SHA256 73b62389666445cd7aebcd42ec12aecfefe2a742b2178eacf5593768f1c2222e SHA512 8ce040b56992712a11f2d00aa1aca67120e16df187ffed9541bb5fdc390c7555461d3ccbfbc3448e68d9a41b6b3bf9d1d2f3dca10259393c96665e3ba489ef34 WHIRLPOOL 8f0d1931af43d8404f69ea4395a795738066f5abc2c76f937f38609e62e1a85cdc61a46248fe5bdf0ba5d0acb0c2b7e4bee4f83577efaa1fbd2227ce3724f5ed
+AUX grace-5.1.22-ldflags.patch 1161 SHA256 955c74169f859bef042601d85be80319c29d7774b62aacceafeb352803d5ea15 SHA512 43950d98c61cbeaa93d84d1c4b37233a49150ef804b6a00ffbcccc4dd926878bafa9d24007640f193c323e093f0c4c731ac676f5e5d410c8e814796babdf6e0a WHIRLPOOL 3812bbfaff8c4b7aa7bdc16dfca2db48575f7d172eaac4f3e59b77523d097480aaeee24778708b09ba2b1cd931cf59c65f6914f1298202af324ee582e06d81e5
+AUX grace-5.1.22-mkstemp.patch 1664 SHA256 6e436fe9c27d4b627a8116ca2a1bea94bd5fc01bc475be6f56a63ec9b5cf2f97 SHA512 e7ba04f9be93e2bb12e5f78894eec255b76ee85463ec35b2890ff111f9f64567c67effec1678d4a953a602be3d0ecd2123487e3dd88704d325b369e59750ad44 WHIRLPOOL 4a092c453fca29d44ed20d1c366ce0cba5d724f5dd5a8900d2d09d795753e5ff36a184f6beb5e90b86bc38e18b12b62c607bd42536aa1ca59a58798e80e71f71
+AUX grace.desktop 161 SHA256 0e522ef577b5658559b6e4a4be531ae4989b294935897e84e03f6ad1cc4e83ff SHA512 6d43de6f8d5f85c3fff36202320864ea3611d3ee842efa677ad59ae1390c6499f9f14aefd37345c0cec62024637b057e804efd26577c45b4f7a5bb6717952b2a WHIRLPOOL e7ca9891b4b4cffa0f9bb31f398a2fdb4d662dc255a869487f0155e35662a61e9b05aaf8cf6543fed6e584758a8c1a7fc4a2056a77c65b84628eea9778bb684c
+DIST grace-5.1.23.tar.gz 2501364 SHA256 69527950fd9c056a76b7a6bf4ac37a9b87acc565c12a941ffae3c9c5a822ca10 SHA512 84b75639a5065fb0a39204b55e82471be90d78b22530e541a4e58cb5bcd94a59d51e91da38d9fecb9c23e21744c0c3b31bb9db4fd26c656233a19cffd1eef7d3 WHIRLPOOL f807245acd084973d6436f404fc9eb146543a8ce34e0089ded098e771564e9d3bc6ae7023463674101cd161a1463ab3b97ee80df5b18e191b1e9ab94c7e6afc4
+DIST grace-5.1.25.tar.gz 2957689 SHA256 751ab9917ed0f6232073c193aba74046037e185d73b77bab0f5af3e3ff1da2ac SHA512 9ea68483af1dfc98d217ae730b7a51b66deae5aaa8dfda29d5a3337ed4b5728b45aa03f561bf7d4173e73d6af8dee03cbabd95c0c8dd36999303c89451a3728a WHIRLPOOL 3c74003882b4f3455b17563b94649bb7a2abd66df4a386b0da4e91498174b414a96b705b081c8c2a1d5532b2709b2b02f5fe18145a2fc1071f2900ccef7f6e95
+DIST grace.png 338 SHA256 70130b7ddb7a64cf2d866aaf472d8badb12d72ac288275709689c631e23da9bc SHA512 804a693b867ad63f34964c7388f61719c558d253cb2c7bc7b6bd0647ad9b3ddc6b23d3950091b6804e4a94736f024486cf3dcce5f877135def34712ee95e4031 WHIRLPOOL 6cef65fc9329e7f49541e193a84c4f86498f422951ced1bd228ce854bab43a9ba5d9dfb44f780b1dcb030892cebd657d6de385df92710062f56c38f1e6cccd94
+DIST grace.png.tar 10240 SHA256 05215c72a2f45b513ba508287b5f693af145719b7a85497320d1e1e17695e99c SHA512 e94970b92894e58fd481d2f81e615c38b77fab7039985516a2ad9b2bb2bb7a82f4e3e8cdb639e7c0d55eaad6bf8abc636a342c94a356e3bd0520824252faddcf WHIRLPOOL 448e1c659475e38331c3ff2f050de52feb01db9623c0a250c7702debe920abf7e9bc56373f442d91d11ad6f55da3e9bbc58f52c1251223bdf405202ae8309556
+EBUILD grace-5.1.23-r1.ebuild 2881 SHA256 b5338544bf82157191e3e599358f7afee169db0c24f1129bf611f54d70593584 SHA512 b4efb103df93cfe9429a7b996cede8d94e36aeba1b721024076ea5a35a62234b0b0a71caf5b30cace32b113d2239037cca83c0fda781fd6aef8f769c87902032 WHIRLPOOL 060c83ec9739d1169a91d4987311281f0ecb9847c42fe7447ca751c733e72810543f4cc69c67247c034945ead7248a08db7b7d16bf84dcb3c67f85c865685106
+EBUILD grace-5.1.23.ebuild 2878 SHA256 ba501427027acb385d35ce8290afc4a6c98a574349e57bac14cc9fd2c2747e5b SHA512 7ea419a1843b0aa108b4fc765d545e2503351b6b0a7b2ddac6f48c01b78a7e4682be363735cdf4f4420304ac5d5c9439a40b87ef2bb6672eb7eab6fed345afd0 WHIRLPOOL 59089cd598852caa2977a107ccedbe5904b99077b32d9ed9ce4569bb27ae1a48002ccb0557e717b0436d6cbc3ef3230cd724918af821e04462ef1d5e3447feb0
+EBUILD grace-5.1.25.ebuild 2755 SHA256 bb106492ff5708156c9131cfecea4d84928409515c17d1c897043fd18d482ad1 SHA512 b7b6188fc2825584783a059b1c54de606f81739c0098dd0e2dd7e129cee705fc7cf76ab383cd13ac88cc626c078c3410c4c7ae301b4dac7c016333315f2d4108 WHIRLPOOL 8f8c6b29d8ca468e4936f90fa37302efe7554651aef76bafc4ee7ec2cb01ada15c3b0a746e4c29e356ba041936d6db71f896c344174b81b930348d5ef55e682d
+MISC ChangeLog 3197 SHA256 01be6542549a3a0debd04e25210fd7d8588cde54e0716fc29e68cf040661e5bc SHA512 b3bab2db522e0338fcf2f569c78add38784d80e1288d06b877cb8b24ba381470af2cf4b712d4a79cb720635d0c27df2d44507f92d9e6d3126938122c6534bb10 WHIRLPOOL d46ad892f0f850584b408c7325099173bbe40ce210542b1f2a170aa90847eacbf1b76698f5b0f30095984f05e5eec20cd98144d629b93ea87630aa41e6b012ed
+MISC ChangeLog-2015 17200 SHA256 c95d804a3815936374bc83b00b2786c5bf7e861ba773b5e24ec9f3cbf3f4570f SHA512 35883206a47366b521b7491cba97723fdce34964b1c4375def3f4b6968c65e8cc2df56943667ac7f425ffbf2edb0164739b1fc1f3e7ce724b93cc22c4b7a8c68 WHIRLPOOL 79d991d53c34c9b5dbfec721dd35d86d5cd47ae5ad3b16c63b7eb665f210344ab29213d6bccd8b210ec40dda1daae5b5efa5bd27fdf57d224c74e6fe4489a172
+MISC metadata.xml 854 SHA256 5af93a465d4dba7d2dbc11a03fefe0cab05a83b3976a10e9c6e5cf6effa28027 SHA512 ac6c70961058fcff4c352138f48f3efc468a82132625893775c775258b8d2e894d09faa3e51b382c437583088ac937ca3d8e2002f202fce6409c6f11e5acfaf2 WHIRLPOOL 2ecfb14839c9dc356c2178df83a06dcfb34db53308f2dd4b8ce5fb7688e50e57d82103ede66baabb80efaebc999df920c4f3f2a218575b299ae21ed4876c7bc2
diff --git a/sci-visualization/grace/files/grace-5.1.21-fortran.patch b/sci-visualization/grace/files/grace-5.1.21-fortran.patch
new file mode 100644
index 000000000000..cdec666107ee
--- /dev/null
+++ b/sci-visualization/grace/files/grace-5.1.21-fortran.patch
@@ -0,0 +1,26 @@
+--- a/grace_np/gracef_np.c	2008-03-03 11:45:12.000000000 +0000
++++ b/grace_np/gracef_np.c	2008-03-03 12:05:37.000000000 +0000
+@@ -1,5 +1,11 @@
+ #include <config.h>
+ 
++#ifdef NEED_F77_UNDERSCORE
++#  define F77_FNAME(fname) fname ## _
++#else
++#  define F77_FNAME(fname) fname
++#endif
++
+ #if defined(WITH_F77_WRAPPER)
+ 
+ #include <stdio.h>
+@@ -8,11 +14,6 @@
+ 
+ #include "grace_np.h"
+ 
+-#ifdef NEED_F77_UNDERSCORE
+-#  define F77_FNAME(fname) fname ## _
+-#else
+-#  define F77_FNAME(fname) fname
+-#endif
+ 
+ typedef void (*GraceFortranFunctionType) (const char *str, int len);
+ static GraceFortranFunctionType fortran_error = (GraceFortranFunctionType) 0;
diff --git a/sci-visualization/grace/files/grace-5.1.21-netcdf.patch b/sci-visualization/grace/files/grace-5.1.21-netcdf.patch
new file mode 100644
index 000000000000..d843cb4b284c
--- /dev/null
+++ b/sci-visualization/grace/files/grace-5.1.21-netcdf.patch
@@ -0,0 +1,11 @@
+--- a/configure	2007-02-16 22:44:49.000000000 +0000
++++ b/configure	2007-09-28 23:03:29.000000000 +0100
+@@ -15181,7 +15181,7 @@
+       int main(void) {
+         char *vlib;
+         vlib = nc_inq_libvers();
+-        if (strcmp(vlib, "3.0") < 0) {
++        if (((vlib[0] == '"') && (strcmp(vlib, "\"3.0") < 0)) || ((vlib[0] != '"') && (strcmp(vlib, "3.0") < 0))){
+           exit(1);
+         }
+         exit(0);
diff --git a/sci-visualization/grace/files/grace-5.1.22-dlmodule.patch b/sci-visualization/grace/files/grace-5.1.22-dlmodule.patch
new file mode 100644
index 000000000000..02fa06a8a9f9
--- /dev/null
+++ b/sci-visualization/grace/files/grace-5.1.22-dlmodule.patch
@@ -0,0 +1,12 @@
+--- a/src/dlmodule.c	2005-11-13 07:45:16.000000000 +0900
++++ b/src/dlmodule.c	2008-06-16 15:28:33.000000000 +0900
+@@ -89,6 +89,9 @@
+         return RETURN_FAILURE;
+     }
+     
++    /* clear error indicator */
++    dlerror();
++
+     newkey.data = dlsym(handle, dl_function);
+     if (!newkey.data && (error = dlerror()) != NULL) {
+         errmsg(error);
diff --git a/sci-visualization/grace/files/grace-5.1.22-ldflags.patch b/sci-visualization/grace/files/grace-5.1.22-ldflags.patch
new file mode 100644
index 000000000000..2a65cd233361
--- /dev/null
+++ b/sci-visualization/grace/files/grace-5.1.22-ldflags.patch
@@ -0,0 +1,41 @@
+Respect LDFLAGS
+
+http://bugs.gentoo.org/show_bug.cgi?id=336984
+
+--- grace-5.1.22/src/Makefile
++++ grace-5.1.22/src/Makefile
+@@ -37,10 +37,10 @@
+ include Make.dep
+ 
+ xmgrace$(EXE) : $(GROBJS) $(PARS_C) $(GUIOBJS) $(CEPHES_LIB)
+-	$(CC) $(CFLAGS) $(GROBJS) $(GUIOBJS) -o $@ $(LDFLAGS) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(GROBJS) $(GUIOBJS) -o $@ $(LIBS)
+ 
+ grace$(EXE) : $(GROBJS) $(PARS_C) $(CEPHES_LIB)
+-	$(CC) $(CFLAGS) $(GROBJS) -o $@ $(LDFLAGS) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(GROBJS) -o $@ $(LIBS)
+ 
+ 
+ buildinfo$(EXE) : buildinfo$(O)
+--- grace-5.1.22/auxiliary/Makefile
++++ grace-5.1.22/auxiliary/Makefile
+@@ -22,7 +22,7 @@
+ devclean : distclean
+ 
+ convcal$(EXE) : convcal.c
+-	$(CC) $(CFLAGS0) $(CPPFLAGS) -o $@ convcal.c $(NOGUI_LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS0) $(CPPFLAGS) -o $@ convcal.c $(NOGUI_LIBS)
+ 
+ install : $(AUXILIARIES) $(PROGRAMS) $(SCRIPTS)
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/auxiliary
+--- grace-5.1.22/grconvert/Makefile
++++ grace-5.1.22/grconvert/Makefile
+@@ -23,7 +23,7 @@
+ all : $(PROG)
+ 
+ $(PROG) : $(OBJS)
+-	$(CC) -o $@ $(OBJS) $(LDFLAGS) $(LIBS)
++	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ $(OBJS) : grconvert.h
+ 
diff --git a/sci-visualization/grace/files/grace-5.1.22-mkstemp.patch b/sci-visualization/grace/files/grace-5.1.22-mkstemp.patch
new file mode 100644
index 000000000000..402a5162c584
--- /dev/null
+++ b/sci-visualization/grace/files/grace-5.1.22-mkstemp.patch
@@ -0,0 +1,55 @@
+diff -Naur grace-5.1.22/src/editpwin.c grace-5.1.22.new/src/editpwin.c
+--- grace-5.1.22/src/editpwin.c	2006-06-03 17:19:52.000000000 -0400
++++ grace-5.1.22.new/src/editpwin.c	2008-07-26 12:45:21.000000000 -0400
+@@ -776,12 +776,12 @@
+  */
+ void do_ext_editor(int gno, int setno)
+ {
+-    char *fname, ebuf[256];
++    char fname[64], ebuf[256];
+     FILE *cp;
+     int save_autos;
+ 
+-    fname = tmpnam(NULL);
+-    cp = grace_openw(fname);
++    strcpy(fname, "grace-XXXXXX");
++    cp = fdopen(mkstemp(fname), "wb");
+     if (cp == NULL) {
+         return;
+     }
+diff -Naur grace-5.1.22/src/plotone.c grace-5.1.22.new/src/plotone.c
+--- grace-5.1.22/src/plotone.c	2005-05-19 16:30:25.000000000 -0400
++++ grace-5.1.22.new/src/plotone.c	2008-07-26 12:45:40.000000000 -0400
+@@ -121,19 +121,27 @@
+             sprintf(print_file, "%s.%s", get_docbname(), dev.fext);
+         }
+         strcpy(fname, print_file);
++	prstream = grace_openw(fname);
+     } else {
++        int hdfd;
+         s = get_print_cmd();
+         if (s == NULL || s[0] == '\0') {
+             errmsg("No print command defined, output aborted");
+             return;
+         }
+-        tmpnam(fname);
+-        /* VMS doesn't like extensionless files */
+-        strcat(fname, ".prn");
++	strcpy(fname, "grace-hardcopy-XXXXXX");
++	hdfd=mkstemp(fname);
++	if (hdfd == -1) {
++	  errmsg("Could not create a temporary file, output aborted.");
++	  return;
++	}
++	prstream = fdopen(hdfd, "wb");
++	if (prstream == NULL) {
++	  errmsg("Could not create a temporary file, output aborted.");
++	  return;
++	}
+     }
+     
+-    prstream = grace_openw(fname);
+-    
+     if (prstream == NULL) {
+         return;
+     }
diff --git a/sci-visualization/grace/files/grace.desktop b/sci-visualization/grace/files/grace.desktop
new file mode 100644
index 000000000000..227d88d9cbe4
--- /dev/null
+++ b/sci-visualization/grace/files/grace.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Grace
+Comment=Numerical Data Processing and Visualization Tool
+Exec=xmgrace
+Icon=grace
+Terminal=false
+Type=Application
+Categories=Graphics;
diff --git a/sci-visualization/grace/grace-5.1.23-r1.ebuild b/sci-visualization/grace/grace-5.1.23-r1.ebuild
new file mode 100644
index 000000000000..74c9a9f993c6
--- /dev/null
+++ b/sci-visualization/grace/grace-5.1.23-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+inherit eutils fortran-2 multilib toolchain-funcs
+
+DESCRIPTION="Motif based XY-plotting tool"
+HOMEPAGE="http://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
+	ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="fortran fftw jpeg netcdf png"
+
+DEPEND="
+	media-libs/t1lib
+	media-libs/tiff:0
+	sys-libs/zlib
+	>=x11-libs/motif-2.3:0
+	x11-libs/xbae
+	fftw? ( sci-libs/fftw:2.1 )
+	jpeg? ( virtual/jpeg:0 )
+	netcdf? ( sci-libs/netcdf )
+	png? ( media-libs/libpng:0= )"
+RDEPEND="${DEPEND}
+	x11-misc/xdg-utils"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	tc-export CC AR
+}
+
+src_prepare() {
+	# move tmpnam to mkstemp (adapted from debian)
+	epatch "${FILESDIR}"/${PN}-5.1.22-mkstemp.patch
+	# fix configure instead of aclocal.m4
+	epatch "${FILESDIR}"/${PN}-5.1.21-netcdf.patch
+	# fix for missing defines when fortran is disabled
+	epatch "${FILESDIR}"/${PN}-5.1.21-fortran.patch
+	# fix a leak (from freebsd)
+	epatch \
+		"${FILESDIR}"/${PN}-5.1.22-dlmodule.patch \
+		"${FILESDIR}"/${PN}-5.1.22-ldflags.patch
+
+	# don't strip if not asked for
+	sed -i \
+		-e 's:$(INSTALL_PROGRAM) -s:$(INSTALL_PROGRAM):g' \
+		{auxiliary,grconvert,src}/Makefile || die
+
+	sed -i \
+		-e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \
+		-e "s:\$(GRACE_HOME)/lib:\$(PREFIX)/$(get_libdir):g" \
+		-e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \
+		-e 's:$(PREFIX)/man:$(PREFIX)/share/man:g' \
+		Makefile */Makefile || die "sed failed"
+
+	sed -i \
+		-e 's:bin/grconvert:grconvert:' \
+		-e 's:auxiliary/fdf2fit:fdf2fit:' \
+		gracerc || die
+}
+
+src_configure() {
+	local myconf
+	if use fortran; then
+		myconf="--with-f77=$(tc-getFC)"
+	else
+		myconf="--without-f77"
+	fi
+
+	# the configure script just produces a basic Make.conf
+	# and a config.h
+	econf \
+		--disable-pdfdrv \
+		--disable-xmhtml \
+		--without-bundled-xbae \
+		--without-bundled-t1lib \
+		--enable-grace-home="${EPREFIX}"/usr/share/${PN} \
+		--with-helpviewer="xdg-open %s" \
+		--with-editor="xdg-open %s" \
+		--with-printcmd="lpr" \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_with fftw) \
+		$(use_enable fortran f77-wrapper) \
+		$(use_enable netcdf) \
+		$(use_enable jpeg jpegdrv) \
+		$(use_enable png pngdrv) \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	dosym ../../${PN}/examples /usr/share/doc/${PF}/examples
+	dosym ../../${PN}/doc /usr/share/doc/${PF}/html
+
+	doman "${ED}"/usr/share/doc/${PF}/html/*.1
+	rm -f "${ED}"/usr/share/doc/${PF}/html/*.1 || die
+	doicon "${WORKDIR}"/${PN}.png
+	domenu "${FILESDIR}"/${PN}.desktop
+	doicon "${WORKDIR}"/${PN}.png
+}
diff --git a/sci-visualization/grace/grace-5.1.23.ebuild b/sci-visualization/grace/grace-5.1.23.ebuild
new file mode 100644
index 000000000000..4b2795c8f6ba
--- /dev/null
+++ b/sci-visualization/grace/grace-5.1.23.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+inherit eutils fortran-2 multilib toolchain-funcs
+
+DESCRIPTION="Motif based XY-plotting tool"
+HOMEPAGE="http://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
+	ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="fortran fftw jpeg netcdf png"
+
+DEPEND="
+	media-libs/t1lib
+	media-libs/tiff:0
+	sys-libs/zlib
+	>=x11-libs/motif-2.3:0
+	x11-libs/xbae
+	fftw? ( sci-libs/fftw:2.1 )
+	jpeg? ( virtual/jpeg:0 )
+	netcdf? ( sci-libs/netcdf )
+	png? ( media-libs/libpng:0= )"
+RDEPEND="${DEPEND}
+	x11-misc/xdg-utils"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	tc-export CC
+}
+
+src_prepare() {
+	# move tmpnam to mkstemp (adapted from debian)
+	epatch "${FILESDIR}"/${PN}-5.1.22-mkstemp.patch
+	# fix configure instead of aclocal.m4
+	epatch "${FILESDIR}"/${PN}-5.1.21-netcdf.patch
+	# fix for missing defines when fortran is disabled
+	epatch "${FILESDIR}"/${PN}-5.1.21-fortran.patch
+	# fix a leak (from freebsd)
+	epatch \
+		"${FILESDIR}"/${PN}-5.1.22-dlmodule.patch \
+		"${FILESDIR}"/${PN}-5.1.22-ldflags.patch
+
+	# don't strip if not asked for
+	sed -i \
+		-e 's:$(INSTALL_PROGRAM) -s:$(INSTALL_PROGRAM):g' \
+		{auxiliary,grconvert,src}/Makefile || die
+
+	sed -i \
+		-e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \
+		-e "s:\$(GRACE_HOME)/lib:\$(PREFIX)/$(get_libdir):g" \
+		-e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \
+		-e 's:$(PREFIX)/man:$(PREFIX)/share/man:g' \
+		Makefile */Makefile || die "sed failed"
+
+	sed -i \
+		-e 's:bin/grconvert:grconvert:' \
+		-e 's:auxiliary/fdf2fit:fdf2fit:' \
+		gracerc || die
+}
+
+src_configure() {
+	local myconf
+	if use fortran; then
+		myconf="--with-f77=$(tc-getFC)"
+	else
+		myconf="--without-f77"
+	fi
+
+	# the configure script just produces a basic Make.conf
+	# and a config.h
+	econf \
+		--disable-pdfdrv \
+		--disable-xmhtml \
+		--without-bundled-xbae \
+		--without-bundled-t1lib \
+		--enable-grace-home="${EPREFIX}"/usr/share/${PN} \
+		--with-helpviewer="xdg-open %s" \
+		--with-editor="xdg-open %s" \
+		--with-printcmd="lpr" \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_with fftw) \
+		$(use_enable fortran f77-wrapper) \
+		$(use_enable netcdf) \
+		$(use_enable jpeg jpegdrv) \
+		$(use_enable png pngdrv) \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	dosym ../../${PN}/examples /usr/share/doc/${PF}/examples
+	dosym ../../${PN}/doc /usr/share/doc/${PF}/html
+
+	doman "${ED}"/usr/share/doc/${PF}/html/*.1
+	rm -f "${ED}"/usr/share/doc/${PF}/html/*.1 || die
+	doicon "${WORKDIR}"/${PN}.png
+	domenu "${FILESDIR}"/${PN}.desktop
+	doicon "${WORKDIR}"/${PN}.png
+}
diff --git a/sci-visualization/grace/grace-5.1.25.ebuild b/sci-visualization/grace/grace-5.1.25.ebuild
new file mode 100644
index 000000000000..28ef1a814c03
--- /dev/null
+++ b/sci-visualization/grace/grace-5.1.25.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit eutils fortran-2 toolchain-funcs
+
+DESCRIPTION="Motif based XY-plotting tool"
+HOMEPAGE="http://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
+	ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="fftw fortran jpeg netcdf png"
+
+DEPEND="
+	media-libs/t1lib
+	media-libs/tiff:0
+	sys-libs/zlib
+	>=x11-libs/motif-2.3:0
+	x11-libs/xbae
+	fftw? ( sci-libs/fftw:2.1= )
+	jpeg? ( virtual/jpeg:0 )
+	netcdf? ( sci-libs/netcdf )
+	png? ( media-libs/libpng:0= )"
+RDEPEND="${DEPEND}
+	x11-misc/xdg-utils"
+
+PATCHES=(
+	# move tmpnam to mkstemp (adapted from debian)
+	"${FILESDIR}"/${PN}-5.1.22-mkstemp.patch
+	# fix configure instead of aclocal.m4
+	"${FILESDIR}"/${PN}-5.1.21-netcdf.patch
+	# fix for missing defines when fortran is disabled
+	"${FILESDIR}"/${PN}-5.1.21-fortran.patch
+	# fix a leak (from freebsd)
+	"${FILESDIR}"/${PN}-5.1.22-dlmodule.patch
+	"${FILESDIR}"/${PN}-5.1.22-ldflags.patch
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# don't strip if not asked for
+	sed -i \
+		-e 's:$(INSTALL_PROGRAM) -s:$(INSTALL_PROGRAM):g' \
+		{auxiliary,grconvert,src}/Makefile || die
+
+	sed -i \
+		-e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \
+		-e "s:\$(GRACE_HOME)/lib:\$(PREFIX)/$(get_libdir):g" \
+		-e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \
+		-e 's:$(PREFIX)/man:$(PREFIX)/share/man:g' \
+		Makefile */Makefile || die "sed failed"
+
+	sed -i \
+		-e 's:bin/grconvert:grconvert:' \
+		-e 's:auxiliary/fdf2fit:fdf2fit:' \
+		gracerc || die
+}
+
+src_configure() {
+	tc-export CC AR
+
+	# the configure script just produces a basic Make.conf
+	# and a config.h
+	econf \
+		--disable-pdfdrv \
+		--disable-xmhtml \
+		--without-bundled-xbae \
+		--without-bundled-t1lib \
+		--enable-grace-home="${EPREFIX}"/usr/share/${PN} \
+		--with-helpviewer="xdg-open %s" \
+		--with-editor="xdg-open %s" \
+		--with-printcmd="lpr" \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_with fftw) \
+		$(use_enable fortran f77-wrapper) \
+		$(use_enable netcdf) \
+		$(use_enable jpeg jpegdrv) \
+		$(use_enable png pngdrv) \
+		$(use_with fortran f77 $(tc-getFC))
+}
+
+src_install() {
+	default
+
+	dosym ../../${PN}/examples /usr/share/doc/${PF}/examples
+	dosym ../../${PN}/doc /usr/share/doc/${PF}/html
+
+	doman "${ED%/}"/usr/share/doc/${PF}/html/*.1
+	rm -f "${ED%/}"/usr/share/doc/${PF}/html/*.1 || die
+
+	domenu "${FILESDIR}"/${PN}.desktop
+	doicon "${WORKDIR}"/${PN}.png
+}
diff --git a/sci-visualization/grace/metadata.xml b/sci-visualization/grace/metadata.xml
new file mode 100644
index 000000000000..61bf28cf2c69
--- /dev/null
+++ b/sci-visualization/grace/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>graphics@gentoo.org</email>
+    <name>Gentoo Graphics Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  Grace is a point-and-click tool that allows the user to draw X-Y
+  plots. This is the program formerly known as Xmgr.
+
+  A few of its features are: user defined scaling, tick marks, labels,
+  symbols, line styles, colors. Polynomial regression, splines, running
+  averages, DFT/FFT, cross/auto-correlation. Batch mode for unattended
+  plotting. Hardcopy support for PostScript, FrameMaker and several
+  image formats.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-visualization/gri/Manifest b/sci-visualization/gri/Manifest
new file mode 100644
index 000000000000..68109c5cfe5c
--- /dev/null
+++ b/sci-visualization/gri/Manifest
@@ -0,0 +1,9 @@
+AUX 50gri-gentoo.el 147 SHA256 d3f04f7eb861ed663013e74d99981ea7c08ebf199de67c0ddd255eabc10ea09d SHA512 a3cbd9953756c48d393eb91f4b4b92021a5409cbe032f1fe697a44e2fca57b29eba295e9e59cc25dda521a91eda5bbfc0f7c3171f2541e83c25c2363ac0c41a7 WHIRLPOOL de48b54c74183ae0eb707b2bf27106966dbf698b80f8bc06558a74ed84d994182e4625b0f85dd9c69f90e34752856d2a34c15d868058761f8d55e12fcbc4cbb5
+AUX gri-2.12.18-postscript.patch 3997 SHA256 2d3c2d44f39507270581744de930fb92bdcab6c5e3d846653e08ccfec07375b9 SHA512 d5ec5209bb1149b7d635c463c39ed21f0c18fc056a8a3ceccfa4b9f589f78f8063cbf59e2a010a3c05ae5cd7dec0ed7f6e7f06b38cd4446feef6297ab49ed464 WHIRLPOOL 50acc993e729061b03b2bdfb1592e494d6cbdc434b1b34d9b4996c8bb5a3d633aaf0615204eaa45fb46b7faf0cf0fd5df54fdb37ed02b90c4836642be5a9dc00
+AUX gri-2.12.23-perl-5.16.patch 554 SHA256 3ac28a5846e69bf74e1844460f1c58fabeb7a9c58b74985d924b0ef9f08caf68 SHA512 63d5ab4d21d1d7382ce750040e88d855e605b1bdcc864f1b5d69d90cbc4f946b29dd976144d9bb68fea84b74ec707c7e00d7813b0d68648f7abf0649a98d1ff4 WHIRLPOOL 9beecebf66423f96fef0510b52260050763488e5bfe3a344563af04c1944dce400387103e42c2b44d9033063f6576126c7e6c69db98fdf6484b51ccbb4fc2428
+AUX gri-2.12.23-texinfo5.patch 1035 SHA256 99b4551dc759633c13391c150dba969a2cfb2c1a7344d547e91afe3334b49a8f SHA512 dff8276bd730c2b75c62775985fe4c9af7b0d8050b4d04e9e951bab60982e9f6d3c9afe9ee7bff6bf9886f7832f4299786855c2edd32d87d4985959bab0d3fda WHIRLPOOL 4361b57d3e7d23cbe925d30a832c5d2fec2967cade88d6ac4ed6dad19942b9aa1fa38b12d116c70198446b588661868b1b2b805b7dd82c07d49fc468edffe1b6
+DIST gri-2.12.23.tar.gz 1668587 SHA256 a24e703f30250ed705c0a242aa59a24748259ea7355fca52152f367f45bfd2e7 SHA512 0b028c56e9603fd00480ad7a92461c1e60f7879d89bffb5b83a2ee52c8870546e584c75478777dbb2d4934095fe9a9d4efd2aa2ff756c1860459a1e0cc0b4216 WHIRLPOOL f272827cfa5fa65604dc2a116660a78b7b0ac1df6d5ddacd943fae5ab258d05546285bffb89779aabe710c79a04d3f665b25484af3bbf5ffa1762ca3cee0c245
+EBUILD gri-2.12.23-r1.ebuild 2158 SHA256 e1933fc4bfc84ee0fe166b244f9b5c9316b851a8e805707cdb7230164261323d SHA512 3520bfdaadc81122cf9d0ee14230b31817b95cce8e90e1873a149706a3855398f5136a489310164b61cdde786a6d0d1d644fa636366d5be0787928ff9b947ff6 WHIRLPOOL b7c3cf60ff6cef34e919bcb9b6e9f938b70da717b3a6ce97ab8a30695848111d960b7acd53bda9d7d614c8a3b05da2a60871c0829ae5387a9afab0d79ce54a82
+MISC ChangeLog 2972 SHA256 90f9ea182dba397c6a0a6f3c7ce642db79e8170d60da5014755ad97059223c57 SHA512 be93e00fd0544744f8f68e0901a45bb549bc477d04abff338c2dd88eef0ac0ed8569016842a9f3dcde36b8aeb39df811d891a0445dc0e2bc7f574414faef5af5 WHIRLPOOL 68cf09ecc532211cc678c82f6e8bd9b106b5277ebdbe97f52260aa5ed44a342234b8f4f6ada1dbd1f90359d3c286c1ffa495d370114863989046aefd2be911a3
+MISC ChangeLog-2015 7928 SHA256 64df5d18dc229cdec769fe0f94d2d3ee707011fe3f26d4af468013b44e4dc319 SHA512 29fd216b0a7385fae970816163355a630863dd3d1e4f6a271f8c336cd108865a40bbae16ec491fe27c8e673b3ba2cbaf6bbd7f7fc121bea7c7713bff46744088 WHIRLPOOL 2d8049a519ef817e3a090b1eec831423fa7fc3fd80c2b530ae57b09be4902374c14bc231ed7511788d106dfcdf55f5ca3e75341399955e473ea8f15b0bacd52e
+MISC metadata.xml 883 SHA256 c25d1a5e3de8abfa36f7efce93494192fa0b9df37980d00374ba0b0fbdf6590f SHA512 baf48aea8fd50e2304aec88dc3b62c2d44d1282a411670f7b27696b831a514bfc576a29807d4a43bc9afc2ca766adb402ee794655576fa7c2121afae3a254296 WHIRLPOOL bed60bcc61d5a818a2cf9c5a13db5816a2cdbec63a869150ace9406487070c76bdc45c1cad89fb06dd981f7fc1ab1324d39682622cefed486b1fb16a0e62de84
diff --git a/sci-visualization/gri/files/50gri-gentoo.el b/sci-visualization/gri/files/50gri-gentoo.el
new file mode 100644
index 000000000000..e07d47c854a4
--- /dev/null
+++ b/sci-visualization/gri/files/50gri-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'gri-mode "gri-mode" "Enter Gri-mode." t)
+(add-to-list 'auto-mode-alist '("\\.gri\\'" . gri-mode))
diff --git a/sci-visualization/gri/files/gri-2.12.18-postscript.patch b/sci-visualization/gri/files/gri-2.12.18-postscript.patch
new file mode 100644
index 000000000000..b3f3b7301975
--- /dev/null
+++ b/sci-visualization/gri/files/gri-2.12.18-postscript.patch
@@ -0,0 +1,97 @@
+diff -Naur gri-2.12.18/src/extern.hh gri-2.12.18.new/src/extern.hh
+--- gri-2.12.18/src/extern.hh	2003-06-07 13:37:55.000000000 -0400
++++ gri-2.12.18.new/src/extern.hh	2008-11-01 10:46:40.000000000 -0400
+@@ -137,6 +137,7 @@
+ 
+ extern int      _arrow_type;
+ extern bool     _warn_offpage;
++extern bool	_export_postscript;
+ 
+ extern std::vector<double> _dash;
+ 
+diff -Naur gri-2.12.18/src/gr.cc gri-2.12.18.new/src/gr.cc
+--- gri-2.12.18/src/gr.cc	2008-09-04 13:32:21.000000000 -0400
++++ gri-2.12.18.new/src/gr.cc	2008-11-01 10:52:24.000000000 -0400
+@@ -397,7 +397,16 @@
+ 		/*
+ 		 * write conforming postscript prolog
+ 		 */
+-		fprintf(fp, "%%!PS-Adobe-2.0 EPSF-1.2\n");
++		//fprintf(fp, "%%!PS-Adobe-2.0 EPSF-1.2\n");
++                extern bool _export_postscript;
++                if (_export_postscript)
++                {
++                  fprintf(fp, "%%!PS-Adobe-2.0\n");
++                }
++                else
++                {
++                  fprintf(fp, "%%!PS-Adobe-2.0 EPSF-1.2\n");
++                }
+ 		if (privacy)
+ 			fprintf(fp, "%%%%Creator: %s\n", "");
+ 		else
+diff -Naur gri-2.12.18/src/gri.cc gri-2.12.18.new/src/gri.cc
+--- gri-2.12.18/src/gri.cc	2006-06-16 19:18:40.000000000 -0400
++++ gri-2.12.18.new/src/gri.cc	2008-11-01 10:46:40.000000000 -0400
+@@ -35,6 +35,7 @@
+ // Globals used elsewhere (variables begin with _).
+ int             _arrow_type;
+ bool            _warn_offpage;
++bool		_export_postscript;
+ std::vector<double>       _dash;
+ std::vector<DataFile>     _dataFILE;
+ std::vector<CmdFile>      _cmdFILE;
+diff -Naur gri-2.12.18/src/startup.cc gri-2.12.18.new/src/startup.cc
+--- gri-2.12.18/src/startup.cc	2008-06-12 08:57:26.000000000 -0400
++++ gri-2.12.18.new/src/startup.cc	2008-11-01 10:57:26.000000000 -0400
+@@ -188,6 +188,7 @@
+ 	_axes_offset = 0.0;
+ 	_use_default_for_query = false;
+ 	_warn_offpage = true;
++	_export_postscript = false;
+ 	PUT_VAR("..use_default_for_query..", 0.0);
+ 	PUT_VAR("..words_in_dataline..", 0.0); // just in case tested
+ 	PUT_VAR("..batch..", 0.0);
+@@ -681,6 +682,7 @@
+ #define FLAG_PUBLICATION	1009
+ #define FLAG_SUPERUSER		1010
+ #define FLAG_WARN_OFFPAGE	1011
++#define FLAG_POSTSCRIPT		1012
+ 	// I use the 'FLAG_...' numbers for options that lack single-character abbreviations.
+ 	static struct poptOption optionsTable[] = {
+ 		{ "batch",             'b',  POPT_ARG_NONE   | POPT_ARGFLAG_ONEDASH, NULL, 'b'                   },
+@@ -703,6 +705,7 @@
+ 		{ "version",           'v',  POPT_ARG_NONE   | POPT_ARGFLAG_ONEDASH, NULL, 'v'                   },
+ 		{ "warn_offpage",      '\0', POPT_ARG_NONE   | POPT_ARGFLAG_ONEDASH, NULL, FLAG_WARN_OFFPAGE     },
+ 		{ "yes",               'y',  POPT_ARG_NONE   | POPT_ARGFLAG_ONEDASH, NULL, 'y'                   },
++		{ "postscript",        '\0', POPT_ARG_NONE   | POPT_ARGFLAG_ONEDASH, NULL, FLAG_POSTSCRIPT       },
+ 		{  0,                   0,                                       0,     0, 0                     }
+ 	};
+ 	const poptContext optCon =
+@@ -872,6 +875,8 @@
+ 				printf("Gri cannot read in '%s'\n",optArg);
+ 			}
+ 			break;
++		case FLAG_POSTSCRIPT
++			_export_postscript = true;
+ 		default:
+ 			printf("Unknown option\n");
+ 			break;
+@@ -1058,6 +1063,8 @@
+ 				} else if (!strcmp(argv[i], "-y") || !strcmp(argv[i], "-yes")) {
+ 					_use_default_for_query = true;
+ 					PUT_VAR("..use_default_for_query..", 1.0);
++				} else if (!strcmp(argv[i], "-postscript")){
++					_export_postscript = true;
+ #if 0
+ 				} else if (!strcmp(argv[i], "-e")) {
+ 					// User wants to do cmd in argv[i+1]
+@@ -1190,6 +1197,8 @@
+         gr_textput("             Makes Gri print out command lines as they are executed.\n");
+         gr_textput("     -true or -y\n");
+         gr_textput("             Makes Gri think the answer to all `query's is RETURN.\n");
++	gr_textput("     -postscript\n");
++	gr_textput("             Export a PostScript file instead of an EPS file.\n");
+ #if 0
+         gr_textput("     -e cmd\n");
+         gr_textput("             BUG: NOT IMPLEMENTED YET!\n");
diff --git a/sci-visualization/gri/files/gri-2.12.23-perl-5.16.patch b/sci-visualization/gri/files/gri-2.12.23-perl-5.16.patch
new file mode 100644
index 000000000000..14c89978ce7c
--- /dev/null
+++ b/sci-visualization/gri/files/gri-2.12.23-perl-5.16.patch
@@ -0,0 +1,23 @@
+ doc/texinfo2HTML |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/doc/texinfo2HTML b/doc/texinfo2HTML
+index 39bed0e..43d3fe6 100755
+--- a/doc/texinfo2HTML
++++ b/doc/texinfo2HTML
+@@ -54,12 +54,12 @@ BUGS:
+ 		the end is here} and more blah
+ 	will not get the \@code{} item converted correctly.
+ ";
+-require "ctime.pl";
+-require "getopts.pl";
++use POSIX qw(strftime ctime);
++use Getopt::Std;
+ 
+ $debug = 0;
+ 
+-die if !&Getopts('h');
++die if !getopts('h');
+ $print_help = 0;
+ $print_help = $opt_h if $opt_h;
+ if ($print_help) {
diff --git a/sci-visualization/gri/files/gri-2.12.23-texinfo5.patch b/sci-visualization/gri/files/gri-2.12.23-texinfo5.patch
new file mode 100644
index 000000000000..dfc56fc574b3
--- /dev/null
+++ b/sci-visualization/gri/files/gri-2.12.23-texinfo5.patch
@@ -0,0 +1,32 @@
+From 93a40c0b444fb5265b21a344b884b1c7bed49b5a Mon Sep 17 00:00:00 2001
+From: Dan Kelley <kelley.dan@gmail.com>
+Date: Mon, 5 Aug 2013 21:01:46 -0300
+Subject: [PATCH] Bug#718821 fixed
+
+Problem with a subsubsection following a section.
+---
+ doc/gri.texi | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/gri.texi b/doc/gri.texi
+index 57c5e76..d16b6ff 100644
+--- a/doc/gri.texi
++++ b/doc/gri.texi
+@@ -18486,7 +18486,7 @@ Versions exist for MSDOS, windows, and Linux operating systems.
+ (Actually, the windows version is just the MSDOS version, which can be
+ run inside an msdos window within windows-95, windows-NT, etc.)
+ 
+-@subsubsection MSDOS Operating System
++@subsection MSDOS Operating System
+ @cindex compilation under MSDOS
+ @cindex MSDOS compilation
+ 
+@@ -18543,7 +18543,7 @@ To view the output, use a PostScript viewer such as GSview.
+ 
+ 
+ 
+-@subsubsection LINUX Operating System
++@subsection LINUX Operating System
+ @cindex compilation under Linux
+ @cindex linux compilation
+ @cindex LINUX compilation
diff --git a/sci-visualization/gri/gri-2.12.23-r1.ebuild b/sci-visualization/gri/gri-2.12.23-r1.ebuild
new file mode 100644
index 000000000000..ad45c30407b0
--- /dev/null
+++ b/sci-visualization/gri/gri-2.12.23-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils elisp-common
+
+DESCRIPTION="Language for scientific graphics programming"
+HOMEPAGE="http://gri.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+IUSE="doc emacs examples hdf5"
+
+DEPEND="
+	app-text/ghostscript-gpl
+	>=sci-libs/netcdf-4
+	virtual/latex-base
+	virtual/imagemagick-tools[png]
+	emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}"
+
+SITEFILE="50gri-gentoo.el"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-2.12.18-postscript.patch \
+		"${FILESDIR}"/${P}-perl-5.16.patch \
+		"${FILESDIR}"/${P}-texinfo5.patch
+	# Makefile.am contains a call to the missing script that triggers gentoo qa
+	sed -i -e 's|${SHELL} ../missing --run tex|tex|g' \
+		doc/Makefile.in || die
+	sed \
+		-e "/system/d" \
+		-i doc/tst_suite/tst_rpn.gri || die
+}
+
+src_compile() {
+	# gentoo bug #302621
+	use hdf5 && has_version sci-libs/hdf5[mpi] && \
+		export CXX=mpicxx CC=mpicc
+	VARTEXFONTS="${T}/fonts" emake
+	use emacs && elisp-compile src/*.el
+}
+
+src_install() {
+	default
+	# license text not necessary
+	rm "${ED}"/usr/share/gri/doc/license.txt || die
+
+	# install target installs it always and in the wrong location
+	# remove it here and call elisp-install in case of USE=emacs below
+	rm -rf "${ED}"/usr/share/emacs || die
+
+	if ! use doc; then
+		sed -i -e "s/Manual at.*//" "${ED}"/usr/share/gri/startup.msg || die
+		rm "${ED}"/usr/share/gri/doc/{cmd,}refcard.ps || die
+		rm -rf "${ED}"/usr/share/gri/doc/html || die
+	fi
+	if ! use examples; then
+		sed -i -e "s/Examples at.*//" "${ED}"/usr/share/gri/startup.msg || die
+		rm -rf "${ED}"/usr/share/gri/doc/examples || die
+	fi
+	#move docs to the proper place
+	use doc || use examples && \
+		mv -f "${ED}"/usr/share/gri/doc/* "${ED}"/usr/share/doc/${PF}
+	rm -rf "${ED}"/usr/share/gri/doc || die
+
+	if use emacs; then
+		cd src
+		elisp-install ${PN} *.{el,elc}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sci-visualization/gri/metadata.xml b/sci-visualization/gri/metadata.xml
new file mode 100644
index 000000000000..d6941215d539
--- /dev/null
+++ b/sci-visualization/gri/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  Gri is a language for scientific graphics programming. The word
+  "language" is important: Gri is command-driven, not
+  point/click. Some users liken Gri to LaTeX, since both provide
+  extensive power in exchange for patience in learning syntax. Gri can
+  make x-y graphs, contour graphs, and image graphs, in PostScript and
+  (someday) SVG formats. Control is provided over all aspects of
+  drawing, e.g. line widths, colors, and fonts. A TeX-like syntax
+  provides common mathematical symbols.
+</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">gri</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
new file mode 100644
index 000000000000..a08a7ef706ba
--- /dev/null
+++ b/sci-visualization/gwyddion/Manifest
@@ -0,0 +1,7 @@
+DIST gwyddion-2.44.tar.xz 3517624 SHA256 e7ee7545770a276e78fdff1b51e547d5d0ba39b94995da91e0d6797122b7eda5 SHA512 c80a0e4e9dde2f669763629d34dacc0015770c4704a10fc820f4d8e75b4f4275852162653f0c6c52674ed76162861af860de6741466d939066bfea3fb584d2ff WHIRLPOOL 56f78efb477da520a65473ce6be9eff88897198e8a80e5971a2280755fdc61925405c0a464572cf7887689746d140eefc855562569919bc17e057f472ac0b597
+DIST gwyddion-2.47.tar.xz 3974120 SHA256 e948abb3d281d49d3684e4c15d88c424dde11c71647bdbbba0a1d9fce74fa656 SHA512 a6bbda2d32ec013a9d6c7e2b6dbf2cef08d8f964099c0fda511bc92c16c943459f29d52f784a599466af65027aaae3aaeb1b79e56c40e39bc47019044eecd3e6 WHIRLPOOL a244f0ccb6e3ba7d53401df89c1a7279d6d21196c09b89da71a6a979c410f0b88a1f064da8c8a5d49629a7ef8d449ce2ec673e631bf486178f5435127ae8efdd
+EBUILD gwyddion-2.44.ebuild 1859 SHA256 c646a2227b21fb5af446884e54210e0f8fabe01e6ab944d9e563aa17e55fe8f5 SHA512 31de84a45d0f7a66f2b3bed3f32e27de4ac9092e613c4150b0ad654ac5c2094128f1321fb5035c37586699d0e89177987225d487fd2fea4b29148fcaff72a486 WHIRLPOOL ff36de6aaa11ca6edc77440e92b2ac28669c70cf3d2738766eed178a5dceddb383f7504891693e2d69974648e6cfdc540a23a21b5be8491c33c2fb1bada38e72
+EBUILD gwyddion-2.47.ebuild 1775 SHA256 2d7878495e70d866728a3210463cce675f4651e92a2792b4c208b2c6e43dddc7 SHA512 fccecfb0efde76cf7b9fce6d3aee1096f0e4fec34e2e4745e99f118cb18c2aad86c0cde9bae358be3b21f14285e470cc70e095d73ccec5dc9061fd4d338c7989 WHIRLPOOL aedcea44e57901758a130d7b29f177cef8bb136ba02b1e4978825f5eeb71f70c4607123c7464921f06cd6fe169454ee3b508b78ba323845dd19f193367147d1f
+MISC ChangeLog 3103 SHA256 4a5ba967a11baf77ddf2c006e102e9b2bcce3783a0c18c577e7fba8aa9ab7bc8 SHA512 40ae24f3c172db53a5dcaeaf8c006ef8ffabcb13c11cf6185a71370ca861ccb673a8f325f8aefcb436b1f89d6a9920e09e7a0db55b25a6c878c06867eeb6e2d1 WHIRLPOOL 39def908e0c3dcc71938df13f3587407f92cf4eff7a767167b8e6bc50ab68444754972ca6e1089247f1c68f7bd752e837d1bdeea2df429ea491ebc8a93a1ef0c
+MISC ChangeLog-2015 7417 SHA256 886458e5ad4d0091bef9d7b5ed177ad1ef40edb3d21ff1c3ea2dc135b4a28ecb SHA512 bc1924d02b6aa92687212ce37740feb4a43c26ff3792c9bf3aad04d8bf72c454941621014c6acc700ef850faa50cf8bfa68ac756c34d3bf22b53880cd1682852 WHIRLPOOL 5a71975c17307903440e8ef77f21767e5a48aada0f93f6abca4dd61628eca0dc19593f4054dc7e0e9a5695e696cf14e63149846c88c950358187293c27b4771f
+MISC metadata.xml 817 SHA256 9080b47390c5340d062e248740c3230350dac28616000e254a502576fd4a34fc SHA512 feca824ec29a8937e34219b327a70db2efbc6d0cef7c0d0539efe282ec0e7a657fa3897faf20afb640dafc4420385d7bdbda8124c851e9f63b77f635273766e5 WHIRLPOOL fa4ee8dfa966d73dccaff983e1d442e4cc99430457a0b2b9a9baf9bd17f4f35476f74de31cf5864b9507916e47673682b4c781bdccbdc7c17aae7c796cf8ed5b
diff --git a/sci-visualization/gwyddion/gwyddion-2.44.ebuild b/sci-visualization/gwyddion/gwyddion-2.44.ebuild
new file mode 100644
index 000000000000..98103e3b4bb5
--- /dev/null
+++ b/sci-visualization/gwyddion/gwyddion-2.44.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils fdo-mime gnome2-utils python-single-r1
+
+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 python 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 )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+	)
+	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"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+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)
+		$(use_with 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
+	use python && dodoc modules/pygwy/README.pygwy
+}
+
+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.ebuild b/sci-visualization/gwyddion/gwyddion-2.47.ebuild
new file mode 100644
index 000000000000..cc4509980eb7
--- /dev/null
+++ b/sci-visualization/gwyddion/gwyddion-2.47.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit fdo-mime gnome2-utils python-single-r1
+
+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 python 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:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+	)
+	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? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	econf \
+		--disable-rpath \
+		--without-kde4-thumbnailer \
+		$(use_enable doc gtk-doc) \
+		$(use_enable nls) \
+		$(use_enable python pygwy) \
+		$(use_enable fits cfitsio) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with ruby) \
+		$(use_with fftw fftw3) \
+		$(use_with opengl gl) \
+		$(use_with sourceview gtksourceview) \
+		$(use_with xml libxml2) \
+		$(use_with X x)
+}
+
+src_install() {
+	default
+	use python && dodoc modules/pygwy/README.pygwy
+}
+
+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/metadata.xml b/sci-visualization/gwyddion/metadata.xml
new file mode 100644
index 000000000000..97387838bbc5
--- /dev/null
+++ b/sci-visualization/gwyddion/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  Gwyddion is a modular program for SPM data analysis. Primarily it is
+  supposed to be used for analysis of height fields obtained by means of
+  scanning probe microscopy techniques (AFM, MFM, STM, NSOM), but
+  generally it can be used for any other height field analysis or
+  image analysis.
+</longdescription>
+  <use>
+    <flag name="sourceview">
+      Enable support for <pkg>x11-libs/gtksourceview</pkg>
+    </flag>
+    <flag name="fits">
+      Enable FITS image import via <pkg>sci-libs/cfitsio</pkg>
+    </flag>
+  </use>
+</pkgmetadata>
diff --git a/sci-visualization/kst/Manifest b/sci-visualization/kst/Manifest
new file mode 100644
index 000000000000..6adc2809b203
--- /dev/null
+++ b/sci-visualization/kst/Manifest
@@ -0,0 +1,6 @@
+AUX kst-2.0.8-includes.patch 581 SHA256 980e9b51f5cb10218bf4b948696fd57971842e17921965e5aa58c0785a79b75e SHA512 d4b0f764beff6c8f9e8d64a5152153d1d9ddc72da029f5e10b83865e2f9aa94ae59eb1678b33f653ac06b38086b5bb03aa172c79cedbe562c0f1b9c872e124a4 WHIRLPOOL 0d21f5e8b23520011a71cd9c00e0998054fa17a6d6b8da6b3c946fc849ab4b87efac6db040bf3fae35dd2d6f2fc868b78890e78f7a828bef3f8356b575128cc3
+DIST Kst-2.0.8.tar.gz 14527129 SHA256 cefbfd3e3710771985e08f02a397ef8ab407168fa8415d2c3c5740c031af18c6 SHA512 81be1e9ef189dbf087c5626b984297d4c8f84f22fce50c4933ea467a65f8595c0254af78d55f2b2e324934346f0758b7a0cf48d06d1108026b60b7ffba1221fb WHIRLPOOL d143cd2c88e7dcff1aeb53375272cf4b7a60f546a9c8dbd76bf8c9933575ab6fbb5f7e5f82f793dbde19d523af9314eeb8efecb8e82f30b3846ebf9d222d27d1
+EBUILD kst-2.0.8.ebuild 1082 SHA256 1e06251051ba6620da032e09ec29d3119efa78fda2062212253954cf407ac732 SHA512 b696a26bccdab039f0d0845b5716048fccd2b9ddd50cd6c4208525182d2ea5c6a205e65e5db88afbe3c347e887b84d4576806e5708287eefee072250c4e8b2e3 WHIRLPOOL ac719e7618648b6ac6a0b0df9127599bbdcb73eb554edb735ef62263bd70397b7c936f66fbe704105e57113b404545e8c1c2d03885c8e26bf65dc7bcef4880da
+MISC ChangeLog 3534 SHA256 e4169ad93a966686bacb2e88757bf11827c66a1d5800914cbdd83b7d527b9d9a SHA512 0516abebe8c5af38d8360406ed4183d9aba1a74bcd4d4b830210c1ecd5f8d3ae8fc3ae5212ec852c9730decb4d608b80696e032c6a20f95e924461fc002a58a5 WHIRLPOOL 1821eb3a613132c9197a7e4667ee76125ffa66feb8b99f388319fac39449dd366dd7aeeb87745d8ac8091df26b32214262eb518ea7e0e541916b0c52a96cf3a1
+MISC ChangeLog-2015 3668 SHA256 095d4e49678fcb3e9e622712033ccc3b9a75bc4296839c969317c9c86d9b795f SHA512 eebe3ef0fad8db058a7b113b8f30e1eac490e27d2669a7dec227e20683e64401395e1ba9f0892994d2d9f3e27bd300fa9ff037722faf1c2ec8c6b879bd7fe809 WHIRLPOOL 65d89083a93ac4bd41e3094321bea955b4ae657fa67a1f262fe0310a4d61879ccc3c27e40730dfa559e77b2093fb4d757285b052850de52cfa1f8f1adc7bc9f5
+MISC metadata.xml 364 SHA256 b14feb09126944c1936c684b6eef30f29f871aff3ee5e6441b9d119eac0ccc4f SHA512 46ab4c2f002b9b516a49e8c678740344b3cdb79ce92ada0b22ee205fe17b54a804fcc520ae517bfc2f420870eaa28c40043007e54c4b55506e8edcdf7f958e66 WHIRLPOOL 3617d503c469dd2c0d5fed43af3545e5763ad3b9fb7409ec44db55d6f893304972b2b4db1df94b612193f22402e0b8184a34b8bf8a422fadee15ce8698791507
diff --git a/sci-visualization/kst/files/kst-2.0.8-includes.patch b/sci-visualization/kst/files/kst-2.0.8-includes.patch
new file mode 100644
index 000000000000..113d9dcc807d
--- /dev/null
+++ b/sci-visualization/kst/files/kst-2.0.8-includes.patch
@@ -0,0 +1,25 @@
+Add missing includes required for Qt 5 build to succeed.
+
+Author: David Carne <davidcarne@gmail.com>
+Gentoo-bug: 587948
+
+--- a/src/libkst/editablematrix.cpp
++++ b/src/libkst/editablematrix.cpp
+@@ -19,6 +19,7 @@
+ #include "debug.h"
+ #include <qbytearray.h>
+ #include <QXmlStreamWriter>
++#include <QDataStream>
+ 
+ namespace Kst {
+ 
+--- a/src/libkst/editablevector.cpp
++++ b/src/libkst/editablevector.cpp
+@@ -18,6 +18,7 @@
+ // Create QDataStream into a QByteArray
+ // qCompress the bytearray
+ #include <QXmlStreamWriter>
++#include <QDataStream>
+ 
+ #include "debug.h"
+ namespace Kst {
diff --git a/sci-visualization/kst/kst-2.0.8.ebuild b/sci-visualization/kst/kst-2.0.8.ebuild
new file mode 100644
index 000000000000..408da47f2984
--- /dev/null
+++ b/sci-visualization/kst/kst-2.0.8.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils multilib
+
+MY_P=Kst-${PV}
+
+DESCRIPTION="Fast real-time large-dataset viewing and plotting tool"
+HOMEPAGE="https://kst.kde.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug test"
+
+RESTRICT="test"
+
+RDEPEND="
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sci-libs/cfitsio
+	sci-libs/getdata
+	sci-libs/gsl
+	sci-libs/netcdf-cxx:3
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS README.kstScript )
+PATCHES=( "${FILESDIR}/${P}-includes.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-Dkst_install_libdir="$(get_libdir)"
+		-Dkst_pch=OFF
+		-Dkst_qt5=ON
+		-Dkst_release=$(usex debug OFF ON)
+		-Dkst_rpath=OFF
+		-Dkst_svnversion=OFF
+		$(cmake-utils_use test kst_test)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/sci-visualization/kst/metadata.xml b/sci-visualization/kst/metadata.xml
new file mode 100644
index 000000000000..9f73ea702ac4
--- /dev/null
+++ b/sci-visualization/kst/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+		</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">kst</remote-id>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest
new file mode 100644
index 000000000000..0cab8df49618
--- /dev/null
+++ b/sci-visualization/labplot/Manifest
@@ -0,0 +1,6 @@
+DIST labplot-2.4.0-kf5.tar.xz 6038072 SHA256 86198247ff0d274c85607cdb07a0c4ef19149e4f4bf6c9d2e6e8249134e26bb2 SHA512 5d29dd7d63d484359e73c8d82d8dbc25a069e1f33829cf75c2a2009ebae2027353ecf578b51806b5f35ae17ec472f5cbfdb4caed2637dc1ecc9229d33033d21b WHIRLPOOL 8d5af85ae52bbe1526d00888c1a18922a0f27c3dbf4ff992736e6672008ca61f54f8df93a1c0185bf4fcdcebe4543e58aa7260eafaf40ba8abf87b39ab84bad4
+EBUILD labplot-2.4.0.ebuild 1819 SHA256 87317c762c8cdf68aeec8b7ce348e767b4e597b24ed2d6b071514927c826c9e7 SHA512 444a6ce0179cd5f5528714d3d75aa85e868b906bfaf02f67a20b921703f56b00d861466c349a8171d7eab01980214ce3b93926431d5c49640f996c40e407f2e8 WHIRLPOOL 84a2cdbb77fcdf0d7db3a18dea1e8aaeb161cd07e0239f736f7f629e3586f9fb6a11a3ac6b8889e43c977054a39abf3a32cb70794e5c3a957441a56b845dd6f2
+EBUILD labplot-9999.ebuild 1811 SHA256 7e74aec0647a86d1363976e61b21d8f85524ac08b7f062cf98a5a30a624c7f56 SHA512 0300f6644fd59d3d1bfb830876a41341e90eaedfcc9aed49dcfe9ece5db02f50e243130b9b6e438ceae7e9bcbbd4642450b9d484be9dbaffb45b6a4f99d2145c WHIRLPOOL 7b22ec33aba9a1bf129f31ae62c50ded1fb5326e67866205fb912bc691cfbe4e8043be447ec49a766c478ca3c0e22069da73a6f3bf14774e9009a902eca784a5
+MISC ChangeLog 3385 SHA256 08bfbddb69d635f79a59502e04d4e200780e61559294939ae6bfd726888405a3 SHA512 3f0942caf95dce64a6d5bc90c5f7a8e317294b0e1d94af536b3565d467410990dfa879c567ccbec76ec7427443063bf4f2b0bd517c89b6a3b1d7252198df2e8f WHIRLPOOL be21b3fdc25f91a1e227e6d2ae106acb0a9ef662843433dbdc3d38269b447ae876b5905a2272648dca9076eea6ff7a0515260e226ee3d076c3ede9bb6c9a2205
+MISC ChangeLog-2015 460 SHA256 48406615f5b686a352393f83938d0f83c6f436ad40a91eee926ddd34097459a6 SHA512 82fb79e09c95a3b7a2e1e37faa6b78f9940fa9c38fe9b076965bc6fe042fe70456e934db09cdd77cfca52cf7097e49253c205f42c2c7ccbb48d90e4092169656 WHIRLPOOL acaea33e68ecf3f37425c8f8755f135d971283f46e4324459dc699b79eb2e054f7c375a0036186e995c5150ddba8aa09d2570d5d452927afdae0f7732eca7192
+MISC metadata.xml 708 SHA256 6687aa3e641ab7c71ca3f08f817ca886c13bd02136beb4f522937f4e1d1a82b4 SHA512 ff837fb6ea47422781c06001c96a0f047a8ca1ca875267c8f26f2369b57b87e86d9816a423ae17fc69c88e9f6cf730c87194267f5f645c83df710f60a99d07eb WHIRLPOOL cb26597c11ea4edcf9964cdc08b7497b827d0fa98e24cc8d14d27229acf1201b744b6fcf0a2e98334bffcda7f16809a776fa9fe92f3775dfb879c714cb7fcd45
diff --git a/sci-visualization/labplot/labplot-2.4.0.ebuild b/sci-visualization/labplot/labplot-2.4.0.ebuild
new file mode 100644
index 000000000000..41c5faefd1e7
--- /dev/null
+++ b/sci-visualization/labplot/labplot-2.4.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="frameworks"
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks"
+HOMEPAGE="https://www.kde.org/applications/education/labplot/"
+[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}-kf5.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="cantor fftw fits hdf5 netcdf"
+
+[[ ${KDE_BUILD_TYPE} != live ]] && S="${WORKDIR}/${P}-kf5"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	>=sci-libs/gsl-1.15:=
+	cantor? ( $(add_kdeapps_dep cantor) )
+	fftw? ( sci-libs/fftw:3.0= )
+	fits? ( sci-libs/cfitsio:= )
+	hdf5? ( sci-libs/hdf5:= )
+	netcdf? ( sci-libs/netcdf:= )
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+	x11-misc/shared-mime-info
+"
+RDEPEND="${COMMON_DEPEND}
+	!sci-visualization/labplot:4
+"
+
+src_prepare() {
+	kde5_src_prepare
+
+	if ! use handbook && [[ ${KDE_BUILD_TYPE} != live ]]; then
+		cmake_comment_add_subdirectory doc-translations
+	fi
+
+	punt_bogus_dep KF5 NewStuff
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CANTOR=$(usex cantor)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_FITS=$(usex fits)
+		-DENABLE_HDF5=$(usex hdf5)
+		-DENABLE_NETCDF=$(usex netcdf)
+	)
+
+	kde5_src_configure
+}
diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-9999.ebuild
new file mode 100644
index 000000000000..6eebaf152481
--- /dev/null
+++ b/sci-visualization/labplot/labplot-9999.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="frameworks"
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks"
+HOMEPAGE="https://www.kde.org/applications/education/labplot/"
+[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}-kf5.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS=""
+IUSE="cantor fftw fits hdf5 netcdf"
+
+[[ ${KDE_BUILD_TYPE} != live ]] && S="${WORKDIR}/${P}-kf5"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	>=sci-libs/gsl-1.15:=
+	cantor? ( $(add_kdeapps_dep cantor) )
+	fftw? ( sci-libs/fftw:3.0= )
+	fits? ( sci-libs/cfitsio:= )
+	hdf5? ( sci-libs/hdf5:= )
+	netcdf? ( sci-libs/netcdf:= )
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+	x11-misc/shared-mime-info
+"
+RDEPEND="${COMMON_DEPEND}
+	!sci-visualization/labplot:4
+"
+
+src_prepare() {
+	kde5_src_prepare
+
+	if ! use handbook && [[ ${KDE_BUILD_TYPE} != live ]]; then
+		cmake_comment_add_subdirectory doc-translations
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CANTOR=$(usex cantor)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_FITS=$(usex fits)
+		-DENABLE_HDF5=$(usex hdf5)
+		-DENABLE_NETCDF=$(usex netcdf)
+	)
+
+	kde5_src_configure
+}
diff --git a/sci-visualization/labplot/metadata.xml b/sci-visualization/labplot/metadata.xml
new file mode 100644
index 000000000000..9e450bf9332f
--- /dev/null
+++ b/sci-visualization/labplot/metadata.xml
@@ -0,0 +1,20 @@
+<?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>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<use>
+		<flag name="cantor">Enable support for different open-source computer algebra systems via <pkg>kde-apps/cantor</pkg></flag>
+		<flag name="fits">Enable support for NASA's <pkg>sci-libs/cfitsio</pkg> library</flag>
+	</use>
+</pkgmetadata>
diff --git a/sci-visualization/mayavi/Manifest b/sci-visualization/mayavi/Manifest
new file mode 100644
index 000000000000..af97e5e7e351
--- /dev/null
+++ b/sci-visualization/mayavi/Manifest
@@ -0,0 +1,8 @@
+AUX mayavi-4.2.0-doc.patch 1099 SHA256 084328815f4e94f7b4cbdb6422813d09eb1aa0d9a1bd2f1ea4fb8607e76438ab SHA512 7c51c59e277f1b3f06b01ed79f2293b1c90d0908020b6891c135aebcebcfe70ebbd5645a206903ea1b3f192ed84ba55dd0a5a6898208c862cbdd760c636ff1c8 WHIRLPOOL e22716929ae148736ace32581dacfd0a62f3fc1e84e5fa59479b20bd05ae81bec44ebcca56efef14ea0bc186d9c986072c5cbf84b6b63e5f46f36012dcef14a3
+DIST mayavi-4.3.0.tar.gz 7669453 SHA256 ebad81222809d18ad443cd11d62e768998467064628f8c13786ac692dd858b8d SHA512 1530c194ba5f94d7a2767dbc0e704892520c24c2af5ea8977c791922fa8a1ddf780d1589bf38b4efe4b5bc779c1ef6358d9664963fa9d4c5a1e75f6500f4a974 WHIRLPOOL 4f187ce7c4c6e8f040ef49a9586b6ab796382fa20f04c0f5ddf0870f9418f3622a4ad9bc846e4dd390f9dcf4482df84fa6673d5a76de643886e87954622ada58
+DIST mayavi-4.5.0.tar.gz 8966895 SHA256 36f688b3ea542e9f8cc0d7faa25e1425723cd00acc8aa640169029f33679ab85 SHA512 241faa5b39a6b1b28f04bf6fff44d3ff952b2df581b03845224d9404c3b1a71b2985c23060b6a50425545106a0e32f474956dba7f5b9dfcfb4d55e866a3acee6 WHIRLPOOL 4aad37e93200f4ccfe6a506ed7843ecb4ef69c0d7b8ff8b7fa3c2536d3f4ad3ea1ad84c1fe06275fd9379f3978da3ab0f7bb6dc009c6136e75b2043cd813a46d
+EBUILD mayavi-4.3.0.ebuild 1828 SHA256 6803b018cc8070f6f3ac7c947bcfee2610d2b437ceb383bd4f38df55134c5529 SHA512 a229251801da135dfeedcdf0c9b73456b38c5b3b5eb4ce3f41fc66b6de659de413c4ae021ee198e0a5debbc3266235b52c1ab792d568102942e24dd22596502a WHIRLPOOL 7662c94e232158b1f8e93179655be1f26708c32036f8b34c19f2d868535012971f32ca7b3ba35d30247cca43dd2b8d789ffe647cdca790f690b9054ef5fd712c
+EBUILD mayavi-4.5.0.ebuild 1776 SHA256 a73250c494c3386952c5cbd85f8a06a608782d46b85e9c11d89f70beca58aca1 SHA512 f806a06b374f09490393e1be09e4647de620db8e98b400be081904e3304df43a992041a52241665d3a5b4da37b7bc3614d27bbe4ac1fac980a33f9baa4798d42 WHIRLPOOL 0f15170c3d6655c9a0be77081ff815829b5d7f08ab24fb72de9bca9d0fb9516e53c703335e2440365d1a6132a346b7cc048de682d4680ce537f7a05917858df6
+MISC ChangeLog 2641 SHA256 caeb5a77348016a9f8e4e0fb0a25a52ff4aaedc4ca8659d008a2585b8350f06e SHA512 e03aeca2c32e3e689b1441ea4eab0f61c8fe6c08f8988d876f3efc713923b3ac70932902d1b758e8924afeb32a3bd7b908009a05600f1a5716eddbde037d98f9 WHIRLPOOL 36778cd794378f4aa815edc3628ea9b7e118fac54291bb4be59e95e6d14b3466224119ee8cfe8d3f231911195d70f48fa0baa28f10c659738664cb4a8f8bc12b
+MISC ChangeLog-2015 5607 SHA256 b369e8329b77540de39d4fbf7da2e8ea19137496a6612594c7b97167a35c369b SHA512 b10450e0b52cd22f4522403f4da1d76e2787b7e284aac4a5695ae0faa48c92b853b930ad09f208d0d16eb88482584652c1947a3682ae2ea144303c932a841bf8 WHIRLPOOL b2eb970a6af1ba08fa5456d2ac6fc82651dd4005fb783d6741405371f07cf7d891d06dd935c83926419c6c32e39f7070a68322d6efa527002a8844f9608e6629
+MISC metadata.xml 1279 SHA256 0ba15d549718da9cc35a2ed9eb9283dc597c98bed49478319f4b161e5b949ba2 SHA512 958b778f3c7b3cc435c23f7ca5dc8750488654dd7151de5ebe89d47eef4d5f273e7649df947e415e2482d9a96c7d9c8178b3f34f2c4acdae63f0e62c4350901b WHIRLPOOL 11d37d6ff6befe44e27bf7c83ea9ed1163209df0a9725340a026b8a8c80d3a9065a499e80f8d96e82d59e55226091ef745abc6df33aa88873efece56ed3dc3c9
diff --git a/sci-visualization/mayavi/files/mayavi-4.2.0-doc.patch b/sci-visualization/mayavi/files/mayavi-4.2.0-doc.patch
new file mode 100644
index 000000000000..1cdb129871e3
--- /dev/null
+++ b/sci-visualization/mayavi/files/mayavi-4.2.0-doc.patch
@@ -0,0 +1,37 @@
+ setup.py | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 0177c44..58d13b0 100644
+--- a/setup.py
++++ b/setup.py
+@@ -300,14 +300,14 @@ class MyBuild(build.build):
+     """
+ 
+     def run(self):
+-        build_tvtk_classes_zip()
++#        build_tvtk_classes_zip()
+         build.build.run(self)
+-        self.run_command('gen_docs')
+-        try:
+-            self.run_command('build_docs')
+-        except:
+-            log.warn("Couldn't build documentation:\n%s" %
+-                     traceback.format_exception(*sys.exc_info()))
++#        self.run_command('gen_docs')
++#        try:
++#            self.run_command('build_docs')
++#        except:
++#            log.warn("Couldn't build documentation:\n%s" %
++#                     traceback.format_exception(*sys.exc_info()))
+ 
+ 
+ 
+@@ -494,6 +494,6 @@ numpy.distutils.core.setup(
+     license = "BSD",
+     long_description = '\n'.join(DOCLINES[3:]),
+     platforms = ["Windows", "Linux", "Mac OS-X", "Unix", "Solaris"],
+-    zip_safe = False,
++    zip_safe = True,
+     **config
+ )
diff --git a/sci-visualization/mayavi/mayavi-4.3.0.ebuild b/sci-visualization/mayavi/mayavi-4.3.0.ebuild
new file mode 100644
index 000000000000..4b61043d60e2
--- /dev/null
+++ b/sci-visualization/mayavi/mayavi-4.3.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Enthought Tool Suite: Scientific data 3-dimensional visualizer"
+HOMEPAGE="
+	http://code.enthought.com/projects/mayavi/
+	https://pypi.python.org/pypi/mayavi/"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/apptools-4[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/envisage-4[${PYTHON_USEDEP}]
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pyface[${PYTHON_USEDEP}]
+	>=dev-python/traitsui-4[${PYTHON_USEDEP}]
+	dev-python/wxpython[${PYTHON_USEDEP}]"
+CDEPEND="sci-libs/vtk[python]"
+DEPEND="
+	${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/wxpython[opengl]
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)"
+
+#DOCS="docs/*.txt"
+
+# testsuite is a trainwreck; https://github.com/enthought/mayavi/issues/66
+#RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.2.0-doc.patch )
+
+python_compile_all() {
+	if use doc; then
+		${PYTHON} setup.py gen_docs || die
+		${PYTHON} setup.py build_docs || die
+	fi
+}
+
+python_test() {
+
+	VIRTUALX_COMMAND="nosetests" virtualmake
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use doc && dohtml -r docs/build/mayavi/html/
+
+	if use examples; then
+		docompress -x usr/share/doc/${PF}/examples/
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+
+	newicon mayavi/core/ui/images/m2.png mayavi2.png
+	make_desktop_entry ${PN}2 \
+		"Mayavi2 2D/3D Scientific Visualization" ${PN}2
+}
diff --git a/sci-visualization/mayavi/mayavi-4.5.0.ebuild b/sci-visualization/mayavi/mayavi-4.5.0.ebuild
new file mode 100644
index 000000000000..84348e718ed3
--- /dev/null
+++ b/sci-visualization/mayavi/mayavi-4.5.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Enthought Tool Suite: Scientific data 3-dimensional visualizer"
+HOMEPAGE="
+	http://code.enthought.com/projects/mayavi/
+	http://pypi.python.org/pypi/mayavi/"
+SRC_URI="https://github.com/enthought/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/apptools-4[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/envisage-4[${PYTHON_USEDEP}]
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pyface[${PYTHON_USEDEP}]
+	>=dev-python/traitsui-4[${PYTHON_USEDEP}]
+	dev-python/wxpython:*[opengl,${PYTHON_USEDEP}]"
+CDEPEND="sci-libs/vtk[python,rendering]"
+DEPEND="
+	${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/wxpython[opengl]
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)"
+
+# testsuite is a trainwreck; https://github.com/enthought/mayavi/issues/66
+#RESTRICT="test"
+
+# not sure if this is still needed
+#PATCHES=( "${FILESDIR}"/${PN}-4.2.0-doc.patch )
+
+python_compile_all() {
+	if use doc; then
+		esetup.py gen_docs
+		esetup.py build_docs
+	fi
+}
+
+python_test() {
+	VIRTUALX_COMMAND="nosetests" virtualmake
+}
+
+python_install_all() {
+	use examples && EXAMPLES=( examples/. )
+	use doc && HTML_DOCS=( docs/build/mayavi/html/. )
+	distutils-r1_python_install_all
+
+	newicon mayavi/core/ui/images/m2.png mayavi2.png
+	make_desktop_entry ${PN}2 \
+		"Mayavi2 2D/3D Scientific Visualization" ${PN}2
+}
diff --git a/sci-visualization/mayavi/metadata.xml b/sci-visualization/mayavi/metadata.xml
new file mode 100644
index 000000000000..e1e9603e98aa
--- /dev/null
+++ b/sci-visualization/mayavi/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
+<longdescription lang="en">
+  Mayavi2 is a general purpose, cross-platform tool for 3-D scientific
+  data visualization. Its features include:
+  * Visualization of scalar, vector and tensor data in 2 and 3 dimensions.
+  * Easy scriptability using Python.
+  * Easy extendibility via custom sources, modules, and data filters.
+  * Reading several file formats: VTK (legacy and XML), PLOT3D, etc.
+  * Saving of visualizations. 
+  * Saving rendered visualization in a variety of image formats.
+  * Convenient functionality for rapid scientific plotting via mlab
+
+  Mayavi2 has been designed with scriptability and extensibility in
+  mind. Mayavi2 provides a mayavi2 application which is usable by
+  itself. However, Mayavi2 may also be used as a plotting engine, in
+  scripts, like with matplotlib or gnuplot, as well as a library for
+  interactive visualizations in any other application. It may also be
+  used as an Envisage plug-in which allows it to be embedded in other
+  Envisage based applications natively.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-visualization/metadata.xml b/sci-visualization/metadata.xml
new file mode 100644
index 000000000000..5ac373c53d85
--- /dev/null
+++ b/sci-visualization/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The sci-visualization category contains scientific visualization
+		applications.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria sci-visualization contém aplicações de visualização
+		científicas.
+	</longdescription>
+	<longdescription lang="de">
+		Diese Kategorie beinhaltet wissendschaftliche
+		Visualisierungssoftware.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria sci-visualization zawiera programy naukowe związane z
+		wizualizacją.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría sci-visualization contiene aplicaciones científicas
+		de visualización.
+	</longdescription>
+</catmetadata>
+
diff --git a/sci-visualization/nonolith-connect/Manifest b/sci-visualization/nonolith-connect/Manifest
new file mode 100644
index 000000000000..1885e0ffe160
--- /dev/null
+++ b/sci-visualization/nonolith-connect/Manifest
@@ -0,0 +1,8 @@
+AUX 1.1-cflags-respect.patch 2622 SHA256 afcabee2fc63188194d62f095a48eb744e50047bcf2164a9023312b15b1678ee SHA512 92591f3b70cbcf175f49fa79f0ffc006ff594eb57669e0abdcd2ab940615ba20d73c191fddf8e8546811954ebae1cf3a796e21e7bcbb32708e80a6f4110f59ea WHIRLPOOL 637711c884fe733d8258c838857781ea179ef9ff61649275ad2b2f10572a09670646971ed69430ea3932bc3d67f3b675c281f55372b37043dbfda17bc41befdd
+AUX 1.1-gcc6.patch 424 SHA256 13044bd12b818051dba9c6d4387433fcc689dcd2c76ba6ba835a5721102dfb2c SHA512 88603392957da2a20c52852b452e62a80a1115a696e91d854529fed8ed8df44c2c4213c4cc39fa738c9ccb4518769363574241bba17597572ad43e603dadb5ea WHIRLPOOL 2d3dc582d23225707347958ed47edd2bc4d9dcca98d91a015081d1a8d328dc170a3bf6632d6d8339dc3b16fbd1e5fc293c85f293d738315a10e15f9a2676634f
+AUX nonolith-connect.initd 353 SHA256 bb829571b0585b21b4874c100a6295cb3cf72359814b32af01c25575e462c607 SHA512 c27852ce9f6529f09b03666dda9416f28cead09e3336ef7cc099e4d84ef65c1449054fc9b72400525db0ebe8ff049db739978010dc4a0dc737786c9bdb9ee23d WHIRLPOOL 0c1d94b2a31a98459465f587e5006e305bf0d9db3ca5b28b49f50ffd64cb51c98b494b2a5d6f32b4279d9cda9875d4e385c9c6d652ea3a24d987e07762c15993
+DIST nonolith-connect-1.1.tar.bz2 559686 SHA256 0cfda84d83df4efea7c2c9765a3576fecf92d04dc4fee76397f3843022c2e749 SHA512 41fe49a21a2f773c04c8054f322d17958b3eadac82e7013c50ff73c13dc31baa4905d52c02b5270d636fbb5348aff7ca8b064a30a81e970083abd6e69f93aff9 WHIRLPOOL 5e8f600708e67deda3580185e627f33c77db920e0c99a53c31b476bcde6f625a6ce909d993075a0643d5b0894625da30b0d398b89ae9195e3c086e53b82b7043
+EBUILD nonolith-connect-1.1.ebuild 1060 SHA256 cd547dc40a236e67c15dc4176a52235c75d7217bf4b4d123da224845b5dfc46b SHA512 0b4b1857fa97bc00778129c7a99a08f2eec1d71f4c6bc90b4381bf39031668ca430792475689ca99f149f929a45545306545abfdb2801c8d45cd151131207f70 WHIRLPOOL ef58e3a0f1e8a75a25df5f7e7481e4351ff731da7cb81a1ceee14f80cb43e354ac178be29e7e39632a474c5310e906ad831748d78274673a2ccc6515d09a3f3a
+MISC ChangeLog 2868 SHA256 a1290f9ad923b1ed274f14b244389f4e2aece6af8efc5c47aa73d7f557daa212 SHA512 9b7343dd3351ca75f0421fb6e9221c4adb13e6ce2308dec3d237437cc4759e0e63043d67b20c8406efd0074b1ec5684215cc105997264ae8ddba5ea4a83d2bc9 WHIRLPOOL 7274c8b64b3b7609626f355f6b12f3b2102edfbefc28fb0fee4e822bf16381401ece55e79e61d4ff7598fced8c928c05ee6942642eeb219839107c9207e7666f
+MISC ChangeLog-2015 1567 SHA256 b256619acb3bc64029099030fc079be01c9472208c052e90e4f6faebbb1bde09 SHA512 606e64d76323b3762fde3afec4314a87ff230e4a0d68cd3dd0916687929b3fa80aedbc59733da9748511c0de9b6185ae09c9a7feeb7951261847b39c2f74da00 WHIRLPOOL 01566915f50d2341331f6273f35e27884eec0cdab0366b5a3b9b7d68d133938b76ed8e0ab371794081c94915a0999caf3d8631549cd2d6031f397fa7292591e5
+MISC metadata.xml 369 SHA256 d7d8f7ea01c35b8807dc7df5b537a13b211ee7c2672c8db5e214b7e70c9d4ca4 SHA512 b8422b3315767f81b2e038409d54bd3fe9aa9e674e1c9ec46e56056ca421e96dfbd12e35329475310f9dc91369dda6a50382132ee111adc012d746b216b51f08 WHIRLPOOL 6af5418a40da218cf75246828b59d8e9dcca222cb2b4688b4f0db8d8289c5cd82db71f0144623e60640f627dbfc01c67fb4842ebd0b4c18f1eb30206df3a73b1
diff --git a/sci-visualization/nonolith-connect/files/1.1-cflags-respect.patch b/sci-visualization/nonolith-connect/files/1.1-cflags-respect.patch
new file mode 100644
index 000000000000..c6b04c5fe339
--- /dev/null
+++ b/sci-visualization/nonolith-connect/files/1.1-cflags-respect.patch
@@ -0,0 +1,70 @@
+diff -uNr nonolith-connect-1.1.ORIG/SConstruct nonolith-connect-1.1/SConstruct
+--- nonolith-connect-1.1.ORIG/SConstruct	2012-03-22 10:02:11.398944187 +0000
++++ nonolith-connect-1.1/SConstruct	2012-03-22 10:05:23.149936839 +0000
+@@ -1,7 +1,21 @@
+ import sys, os, shutil
++import SCons.Util
+ 
+ env = Environment()
+ 
++if os.environ.has_key('CC'):
++   env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++   env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++if os.environ.has_key('CXX'):
++   env['CXX'] = os.environ['CXX']
++if os.environ.has_key('CXXFLAGS'):
++   env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++if os.environ.has_key('LDFLAGS'):
++   env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
++if "$CCFLAGS" in env['CXXCOM']:
++   env['CXXCOM'] = env['CXXCOM'].replace("$CCFLAGS","")
++
+ opts = Variables()
+ opts.Add(BoolVariable("mingwcross", "Cross-compile with mingw for Win32", 0))
+ opts.Add(BoolVariable("boost_static", "Statically link against Boost", 0))
+@@ -95,8 +109,7 @@
+ sources = Glob('*.cpp') +  Glob('streaming_device/*.cpp') + ['cee/cee.cpp', 'bootloader/bootloader.cpp']
+ 
+ json = env.Library('json', 
+-	Glob('libjson/Source/*.cpp'),
+-	CCFLAGS = "-c -O3 -ffast-math -fexpensive-optimizations".split()
++	Glob('libjson/Source/*.cpp')
+ )
+ 
+ websocketpp = env.Library('websocketpp', ['websocketpp/src/'+i for i in [
+@@ -107,7 +120,7 @@
+                 'websocket_session.cpp',
+                 'sha1/sha1.cpp',
+                 'base64/base64.cpp'
+-            ]], CCFLAGS=['-g', '-O3'])
++            ]])
+ 
+ 
+ libusb_cflags = []
+@@ -121,14 +134,22 @@
+ 	libusb_os = ['os/poll_windows.c', 'os/windows_usb.c', 'os/threads_windows.c']
+ 	libusb_cflags += ['-D OS_WINDOWS', '-DPOLL_NFDS_TYPE=unsigned int', '-D WINVER=0x0501']
+ 
+-libusb = env.Library('libusb_nonolith', ['libusb/libusb/'+i for i in [
++env_libusb = env.Clone()
++env_libusb.Append(CPPFLAGS=libusb_cflags)
++env_libusb.Append(CFLAGS=['-Ilibusb', '-Ilibusb/libusb'])
++
++libusb = env_libusb.Library('libusb_nonolith', ['libusb/libusb/'+i for i in [
+ 				'core.c',
+ 				'descriptor.c',
+ 				'io.c',
+ 				'sync.c',
+-			]+libusb_os], CFLAGS=['-g', '-O3', '-Ilibusb', '-Ilibusb/libusb']+libusb_cflags) 
++			]+libusb_os]) 
+ 
+ 
+ libs += boostlibs
+ 
+-env.Program('nonolith-connect', sources, LIBS=libs, CCFLAGS=['-Wall', '-g', '-O3', '-Ilibusb', '-Iwebsocketpp/src', '-shared'], FRAMEWORKS=frameworks)
++env_main = env.Clone()
++env_main.Append(CXXFLAGS=['-Ilibusb', '-Iwebsocketpp/src', '-Wall'])
++#env_main.Append(LINKFLAGS=['-shared'])
++env_main.Program('nonolith-connect', sources, LIBS=libs, FRAMEWORKS=frameworks)
++
diff --git a/sci-visualization/nonolith-connect/files/1.1-gcc6.patch b/sci-visualization/nonolith-connect/files/1.1-gcc6.patch
new file mode 100644
index 000000000000..815c3ca866c7
--- /dev/null
+++ b/sci-visualization/nonolith-connect/files/1.1-gcc6.patch
@@ -0,0 +1,14 @@
+--- nonolith-connect-1.1/websocketpp/src/websocket_server_session.cpp.old	2016-09-25 18:13:31.820474134 -0400
++++ nonolith-connect-1.1/websocketpp/src/websocket_server_session.cpp	2016-09-25 18:38:52.654567787 -0400
+@@ -41,8 +41,11 @@
+ #include <iostream>
+ #include <sstream>
+ #include <string>
++
++#if __cplusplus < 201103L
+ #include <ext/algorithm>
+ using __gnu_cxx::copy_n;
++#endif
+ 
+ using websocketpp::server_session;
+ 
diff --git a/sci-visualization/nonolith-connect/files/nonolith-connect.initd b/sci-visualization/nonolith-connect/files/nonolith-connect.initd
new file mode 100644
index 000000000000..c8a6bd1d0414
--- /dev/null
+++ b/sci-visualization/nonolith-connect/files/nonolith-connect.initd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+
+depend() {
+	after logger
+}
+
+start() {
+	ebegin "Starting nonolith-connect"
+	start-stop-daemon --start --quiet -b -m -p /var/run/nonolith-connect.pid -u nonolithd:usb --exec /usr/bin/nonolith-connect
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping nonolith-connect"
+	start-stop-daemon --stop --quiet -p /var/run/nonolith-connect.pid
+	eend $?
+}
diff --git a/sci-visualization/nonolith-connect/metadata.xml b/sci-visualization/nonolith-connect/metadata.xml
new file mode 100644
index 000000000000..119bc9428076
--- /dev/null
+++ b/sci-visualization/nonolith-connect/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+<maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild b/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild
new file mode 100644
index 000000000000..955e544fbc61
--- /dev/null
+++ b/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit scons-utils toolchain-funcs user
+
+DESCRIPTION="CEE (Control - Experiment - Explore) analog multitool"
+HOMEPAGE="http://www.nonolithlabs.com/cee/"
+SRC_URI="http://apps.nonolithlabs.com/download/source/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost
+	virtual/udev
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-cflags-respect.patch"
+	"${FILESDIR}/${PV}-gcc6.patch"
+)
+
+pkg_setup() {
+	tc-export CC CXX
+	enewuser nonolithd -1 -1 /dev/null usb
+}
+
+src_configure() {
+	myesconsargs=(
+		boost_static=0
+	)
+}
+
+src_compile() {
+	escons
+}
+
+src_install() {
+	dobin nonolith-connect
+	newinitd "${FILESDIR}"/nonolith-connect.initd nonolith-connect
+}
+
+pkg_postinst() {
+	einfo "Consider adding nonolith-connect to the default runlevel."
+	einfo "Please connect your CEE hardware, start nonolith-connect "
+	einfo "using the init script provided and then visit:"
+	einfo "http://apps.nonolithlabs.com/setup"
+}
diff --git a/sci-visualization/opendx-samples/Manifest b/sci-visualization/opendx-samples/Manifest
new file mode 100644
index 000000000000..fdb2e9b72285
--- /dev/null
+++ b/sci-visualization/opendx-samples/Manifest
@@ -0,0 +1,7 @@
+AUX opendx-samples-4.4.0-nojava.patch 1744 SHA256 c69345e77d3698719e315deeae68d3c033ed7f085c1785f573d4c66046a526ef SHA512 ae72bab2a2c130263d75e4b7254b6e210c55b80eed9621493f66b2221fd92451378bb86ae1c9e4a4997a18d5902576fde5cfa9ef84660f65a6310de595d5d29f WHIRLPOOL 5ca4e9a72c9d04b09f8cec0d905d0b21fdd03198f4c3ba55f0fbe4c63c33ade908c257c756f6b7c29d7f52872c82d8c0875aaa9782982e0e31f557f29ae2429f
+DIST dxsamples-4.4.0.tar.gz 7791659 SHA256 ec2277facc8cf0f095a7fc4cb58391e053d5fd26c90d4711c927d2897dc455d9 SHA512 ae740be888728750de2cf21e94094a4aa01adec8ea0cfe937f03a67803ad7cb0d92968c8d4325e22022c698f871d4af45df02d3b8e8639434a1001dd46e0b311 WHIRLPOOL 1bbdb989177df544dacec4760190b3344406578fef75fc68ba83610b2c97712df3388efe2f2614e97e31a5fd4c3ffc8c7147b2baaf5b083b774a67000fb53335
+DIST opendx-samples-4.4.0-install.patch.bz2 4195 SHA256 0afa8404017169bb7d0eeb89debebbe9c20e04dd353ec491f65728178e49759d SHA512 3c276355d0796b2713d42ea11ce34d02c72e5b679aff4feb9792ec58c8a3c6aed1d79981d09a93b842d6d47fdc6cacd5fca4fc96f88cc764a90a5adf10797fc6 WHIRLPOOL 7b51eb21cd6dd15868ae0f161b3a7a6a767cc67cb8407a694f8b470ed9b4de4926bcdff3b86485d1df915450fa84c2fcc09221d089d5b4decc0743eb28276436
+EBUILD opendx-samples-4.4.0-r2.ebuild 673 SHA256 b82acccf92915b7425e08f8f46da73b138b48327022db63963dd9fd1874a9782 SHA512 940e1fc0bdbe4744e1061b5257ecc715b7ddc2b05254e4ed7c46b6b9b0a9ef7ac2b8b6a8f2ce28849649321285a83855c63e2f4c75e5a149521851398a7c5580 WHIRLPOOL 1da7462d47bc9c4342906e2340dbaf4a04101253aaafee3fd843716bd8abeacc695e1fe35a1a6370d55b4c686e04558737c42917133e32256a5bc6051f7ad068
+MISC ChangeLog 2900 SHA256 278e27acecbe6a6e5d8bf02e13c70cf66ae035901d31bead2471d27cb9233288 SHA512 989a575be6f3ae686bb0dbc4eff2b4183946414f81d986cdc51d031f2c174653c0bc425a66bccf5174cfca3fa0ee04b991958943f9b0a60e4c4aece9285c63eb WHIRLPOOL e10ecb1fe2059e9cec6acd8b0f8f98d561e030147bf72a2710bbf8c505090e7ee67983f81ea0dbfa335f414bd5e154258dee9c90a00f5d09b07e3bdd7d6010fe
+MISC ChangeLog-2015 2725 SHA256 bcf02752e59b3a2d9fbb65b8170ba526d45b10ccbe27ba9f5fc4d4c0ec5b6f1f SHA512 fa64bccc421f14d0b76b9a1a0c307923793bb1e53d8f85a78a79c68be37f845938f855c2c68b9e82ffa5bee43c54787db19bacd7b5163eaa0e53461ad0e27314 WHIRLPOOL fef0ace376b6a5c4dfa50e4c628ceda8c54f53cf47fe2af00e63c912af8f7be6d935ed9b29c3eebc2d4223e69eab15146cac80bfda96d3d2e719df703b62d81b
+MISC metadata.xml 491 SHA256 0506cbd766f64c15efac32e0d36a4d462ded9a76741337abffe6c8193919e27a SHA512 6e4b3dd415bea42c0db22b1f92f9cc439bef4282a1d39c9041ce4aa34a139a8025b07542b3b000bce49870273ff4ce37d1346fe602ba703de57be8391118ee0e WHIRLPOOL 4f4d14ff16dc59830535bd06a4e41925fc01e335e503e570038f6826eaffb021f9f9e0fe7926c68cb30f16a6ba1c8c3efe97604a01d82ae188a4e62f52df6a4f
diff --git a/sci-visualization/opendx-samples/files/opendx-samples-4.4.0-nojava.patch b/sci-visualization/opendx-samples/files/opendx-samples-4.4.0-nojava.patch
new file mode 100644
index 000000000000..984f84a10336
--- /dev/null
+++ b/sci-visualization/opendx-samples/files/opendx-samples-4.4.0-nojava.patch
@@ -0,0 +1,50 @@
+--- dxsamples-4.4.0/Makefile.am.nojava	2002-01-28 21:53:08.000000000 +0100
++++ dxsamples-4.4.0/Makefile.am	2006-09-03 01:40:26.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-SUBDIRS = callmodule data dxlink java macros \
++SUBDIRS = callmodule data dxlink macros \
+ 	  outboard program_guide programs scripts \
+ 	  supervise tutorial user util stereo
+ 
+--- dxsamples-4.4.0/configure.ac-orig	2009-05-03 14:30:59.000000000 +1200
++++ dxsamples-4.4.0/configure.ac	2009-05-03 14:31:44.000000000 +1200
+@@ -25,11 +25,6 @@ AC_SUBST(RTL_LIBS)
+ 
+ SHELL=/bin/sh
+ 
+-AC_ARG_WITH(javadx,
+-              [  --with-javadx           enable JAVADX (default is yes)],
+-              [with_javadx=$withval],
+-              [with_javadx='yes'])
+-
+ AC_PROG_INSTALL
+ if test -z "$LN_S" ; then
+     AC_PROG_LN_S
+@@ -40,25 +35,8 @@ DX_GET_PREFIX
+ DX_GET_ARCH
+ DX_ARCH_SPECIFIC
+ 
+-MAKE_JAVADX_SAMPLES=""
+-if test "with_javadx" != 'no' ; then
+-  failed=0;
+-  passed=0;
+-  DX_PROG_JAVAC(passed=`expr $passed + 1`,failed=`expr $failed + 1`)
+-  DX_PROG_JAR(passed=`expr $passed + 1`,failed=`expr $failed + 1`)
+-
+-  if test $failed -eq 0 ; then
+-     DX_JAVADX_SETUP(passed=`expr $passed + 1`,failed=`expr $failed + 1`)
+-     if test $failed -eq 0 ; then
+-       MAKE_JAVADX_SAMPLES=samples
+-     fi
+-  fi
+-fi
+-
+ AC_OUTPUT( Makefile callmodule/Makefile callmodule/localmk \
+ 	data/Makefile dxlink/Makefile dxlink/dxlink_make \
+-	java/samples/Makefile java/Makefile java/userdata/Makefile  \
+-	java/usermacros/Makefile  java/nets/Makefile  java/makes/Makefile  \
+ 	macros/Makefile outboard/Makefile \
+ 	program_guide/Makefile program_guide/localmk program_guide/guidemake \
+ 	programs/2D_DATA/Makefile programs/3D_DATA/Makefile \
diff --git a/sci-visualization/opendx-samples/metadata.xml b/sci-visualization/opendx-samples/metadata.xml
new file mode 100644
index 000000000000..e1939802f946
--- /dev/null
+++ b/sci-visualization/opendx-samples/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
+<longdescription lang="en">
+  This package contains examples of scripts and networks for the
+  OpenDX Data Explorer. They are referenced in the OpenDX tutorial,
+  but can also be used stand-alone to browse and investigate.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild b/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild
new file mode 100644
index 000000000000..2efa4c437c0d
--- /dev/null
+++ b/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_PN="dxsamples"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Samples for IBM Data Explorer"
+HOMEPAGE="http://www.opendx.org/"
+SRC_URI="http://opendx.sdsc.edu/source/${MY_P}.tar.gz
+	mirror://gentoo/${P}-install.patch.bz2"
+LICENSE="IBM"
+SLOT="0"
+
+S="${WORKDIR}/${MY_P}"
+
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=sci-visualization/opendx-4.4.4-r2"
+DEPEND="$RDEPEND"
+
+PATCHES=(
+	"${FILESDIR}/${P}-nojava.patch"
+	"${WORKDIR}/${P}-install.patch"
+)
+
+src_prepare() {
+	#absolutely no javadx for now
+	default
+	eautoreconf
+}
diff --git a/sci-visualization/opendx/Manifest b/sci-visualization/opendx/Manifest
new file mode 100644
index 000000000000..9123d9a2ec25
--- /dev/null
+++ b/sci-visualization/opendx/Manifest
@@ -0,0 +1,18 @@
+AUX opendx-4.3.2-sys.h.patch 1200 SHA256 919299f0fbb6e9891a8792641ea58720ae6bb95d4ffc3f6a20cae7b8e2d1729b SHA512 b874bea7a7470b14c9e91e1b5e361316cffa9d5af6391510eaa7ba1377de897519f62bf95f422b0b0f74ba29c84e14a9bb73c79d34bf66618fdb67b574a7f89e WHIRLPOOL 3c0c33fde7dd510e21c6efe973558f3bef18415819b48a300ca213030f803e20f7918ffe5bbd12b31b5faa2fd448111e924078173a270780b42fbedd5a5a761a
+AUX opendx-4.4.4-concurrent-make-fix.patch 2388 SHA256 7ce46d4fe5dda470d4a165409de8c69c1bcda1a065ecf782dbe8e1b28ee88dcf SHA512 738f567f19710a746e23bf4f9b76c5b20420008f9bad7d297ca74d45b65ac8766228387db5d77b214ebe6e87ab88d13bfc798dfcbf668cfd246d392fb0deb898 WHIRLPOOL a5c038c8e1a87d6a662920ead4eb3d88836c31d942b158e4f3c73d585bc553d4dbc3d5f97fbbddb1c9417ed8ffc5b34d40f97880e8c2cbeb9dd945e7fc49c0d5
+AUX opendx-4.4.4-dx-errno.patch 340 SHA256 046fdd113d0c3c48b2c0efabe11423539e0ab8b0d567df2acfff93f5864ea7e4 SHA512 9a23d0fd98b7e70202032e09a2ccd04f54b13331f03b83c2de61dc63d009a921b892ce1f7570f15d834471f16fb3c23bfaa28b66db86104d7a8c205aee5456b3 WHIRLPOOL 363f5eaccfa14c04ccf4b58fe1f359d97cec8079e6eacc9bfabf2bd817c2f9e261cbef2f09c4989e903ce61bb3835a83d1eccc2eb7419097db2bb887391dfc92
+AUX opendx-4.4.4-gcc43.patch 13310 SHA256 8ca2296f7c36f0dd7dbaf185b3fdf68ea40a09695aaca6c0f65d3970286d225d SHA512 b61e2cf13092b72f0e575491ceabadf00158a58f0af7d09d28858f96b06d2d6062c025e527b89c3860d945608554a318c00415d6153af6f70792bb5504ec3945 WHIRLPOOL 3bf6e8b49a438751b00a28c030a07474b5f692ea79e077d8cb4df5622abd083f18fa782bcc954100017194db376bc520ab05c889d482a2824cd549aa0ffbaef4
+AUX opendx-4.4.4-installpaths.patch 11983 SHA256 57c8e3654353f759728b9b2ca7665fa04a354bad13f0c2015e270d1f22ccdffd SHA512 a06e21431540138a412ad80168d493495cc2808b2d677efc1055b40875610b94e2089dc58f1d1b693eae590e35c95281d17fcaa9af322e3638dccc6d003c5cff WHIRLPOOL cf6809ede03896cee459c06eb745b97e0902c69f18658cfd42f5c6e59fee0f80e67ff02cd69bb786a66613adb8b338fbee7c9b93f0fc5fcf79c708e79d2faaae
+AUX opendx-4.4.4-libtool.patch 319 SHA256 1bde8364f7a40322f9812f0fbb0403ab8f52f946318bd548e7fa63dd887c291f SHA512 a98d7a19f1e9c096bc9e7ffdfb9e7a6237bf3599a4f6c29aa3994a0c91653e7369626e86ea69f0d32d6b6dcecb9bc889a888fcddde81d9ca52272be49e957864 WHIRLPOOL 690aa67d6c4f12c1aa146394563ed0b68f8ee809d27e1eba47ae5ab885a46377157a47c89ad806fadbb8cb0fafe4173fdfadb37f5bc3058ca05b3974d8c606e6
+AUX opendx-4.4.4-magick.patch 2863 SHA256 0a26b46f72fe354026c0175c85ad762c0ce2d18ad5279a62331bb24a64926ce7 SHA512 e7c35a68768bd58015dbb0d705c4ea82ec09306b5b3e738d45ab4a20fa3ae30b2372c12af55470e59d2b44b3a1bc9bf7bb11289b8c4127b41242772f5ccbcf97 WHIRLPOOL 8b4d284b17ac51bd625b4ca5afc4068613d66bcf24c02f2bf5225b4697c7cfedbb4b794c53a51ebc490f69601c3ada3a32cdb14926042016edd8f3ef862cde1f
+AUX opendx-4.4.4-null.patch 584 SHA256 99edc0c8ef8e87adce6d0453449e15d3b2d134b686daf6ba56caa458c03816c2 SHA512 9af10aebd267b181be4ade5009987cffaeabc5e1ff68343e63f836722098ffffa813a8b0c6c514b088221dbb5c4a654dd3a756449069fa0ef8edebc8cffb35b5 WHIRLPOOL 16b8ef20ef47badcbc8a594997215edee83667180dac273f05aeeee38d8758cd83b1539c1857dd47c4a588838e91f1bac89e0338f220cfaac3a47be872e71778
+AUX opendx-4.4.4-open.patch 1671 SHA256 0b0cbc06ecc8e44d32f16000c6ee2c09b70b7cfbf44ee71a50165dad19314403 SHA512 a35889802f28fc7fa91e887c8c8fc9fc6c7757c877e7469f1b01835de2c8c59c3f29a52e3dc6f30587dfd45f30b0783679273af28820c0120c28733dfed12a38 WHIRLPOOL 69f8a246ed2b91203457219040fd40cddc389955ebddeb0665d7a590052e244a115f9b86ce602584b1dde844df848a3abaf7ed5d71d54b4907e48ba67236b5bb
+AUX opendx-4.4.4-szip.patch 1409 SHA256 4afb433d13b721bf0234e00d4c1e5498cea9ffcbe8c56e71f30833c736b36bbb SHA512 50084839a1033e377dda52ec12ce80030555618c9baed7ec36a7eaa5a812e014c22f6a745bb8663fd0763db1a431f0d5c21cca5fcef51dc20c17c2daa0d411a4 WHIRLPOOL d8ebb41fc3a45f32912f2d0fd6684c3819b1bc52db4c9175711b1dc62adcc7cced18f0fda99fd0d8c49a99cd2a31878978620df959fcf078c834fb83a54f09bb
+AUX opendx-4.4.4-xdg.patch 712 SHA256 eaaf08e6deefafb69341a2cbb56527b87f3b61a1638a0d4829f23c50c349d5e0 SHA512 290df3d1f5a1a2b59473062d4a4d9247b13c333af8fb33b00580823d185358d181d94acc37691c4eb4e0a7d159bdf62b6d3cbb59c5c7d29bb01073b39871b70e WHIRLPOOL 912f28d98703e5c2dcbbf4d76f57d6a64e036397546dfc18b1302b2786d5d124c9be788f2874f6108eb9a0c2ff9ed8a48db05ad6ad558b96d0e1554b88927507
+DIST dx-4.4.4.tar.gz 9676049 SHA256 a9915e17d49c5499edd3df69ffeac0b7ba24f8b38ddf7509712b48eb3c21f1ff SHA512 e6ef0075a696c442fd4615eb32b9ebd3f85728321a33297e3402b19bbc6210953a6599d643fc0a20bc349fbc72411326c69187223ee0e65560603d8e6f7527ee WHIRLPOOL 6d6931fabfb054ff06464649b2b2ce5f094aa6d0c28f0f2e6ee22176ef4749d78f102ed9d0c27cf3c84ea10038d4502d908ec7a95a597d32f21574b277a54fa0
+DIST opendx-4.4.4_p20160917-fix-c++14.patch.bz2 3162 SHA256 306a3dcedee38dc61f27ce184a88018b78d541d168eb1b85f04a5964b527e02a SHA512 0d671e5a085b446969fbe57eb9d08e4dd103bc29058ce8c6167c3cad18f14b816a3f2cae329b194ef9827ff6590d31da95fc04176e0824f95bdf89761007bc6f WHIRLPOOL b8eecf3955acaa58c94d63a8781691bc4eb2ea62a82077052a1cf221e811cae586a691aff311e08633c70d80d9f15a3d162ad4bd4c4f5b8362fcbfc582a1bf9f
+EBUILD opendx-4.4.4-r5.ebuild 1977 SHA256 9c6f68bc9421e239b9fa6efe0b2857808ea135247c61c6c47c0cb177c5d63401 SHA512 14926d453cff938d207b3b50a0388855164763c3d8ab28255924056ecc9a02f1cf8b3d6ea44b152e849d64c234f3d96691a3cf2f1a19adbdabd9d72f8df25880 WHIRLPOOL 9bc7a1e349e3a238a4b0a34cd11738f899a1e9fd19345aa3444c86aab3d768f893c8e03087c9bfb7ba1dccb2df87e9e272db6c3b46d31b7e28b6321242470091
+EBUILD opendx-4.4.4-r6.ebuild 1975 SHA256 f184c6c6405dc8dcabc5a7279b8d0589cb4cf6b62d58109e6c719bbf715d73ff SHA512 ebc892b19d7b3423a32a0a085bf4002f2388b240fc9958a5ffcaa36b944834abc9d65fea23185a536d4afdf2b26a8e8e9d99a2ce876696e382fcc92e6de92d7a WHIRLPOOL 8c3692833bdbc3b346d023ffadcd5095e5d3203a7673573f3d282760ef151a834867a84b397e0297766b0b8a38370fde2807a08c8ed9aae9ad8325b03ef10926
+MISC ChangeLog 3688 SHA256 13d7592bff5830a750ee64913dedbbaf9f9d2633a6afd0a0d0ab664d33bdf09d SHA512 df03f9cd6ea230e0c3a9b99cca611da0016568957673affb1bd358131622f15312037478cd262678113be54994973e8a33fa35d6d6be7ba34901493b9f686c20 WHIRLPOOL ff9d4f06fb5876a0a06bd8cd3a95436ac2fcbc1720350c888b0a1068fc15abea4168ea1b0c5fa9c5614c1742ee5aa03e103e30bf316c4677c851a86d45fc8379
+MISC ChangeLog-2015 9285 SHA256 8d55729dd53e2771f129a21645f1ef27401b85e8d873ee75df813039ee6cb07d SHA512 9b0f4081e605fa59d19b250fc3fc766c58ec7383742ad9022989a01814561630781e62cce2dcce39bd13f0e5d287029f49e9878ba74a58b9a8b3b023075f14e9 WHIRLPOOL cd02745807e01ea20c0606efe9a1318ddb478495ebe160a445e786d6187a3d27795a4698b865093c2a36e35cbf8bbba5026823c73ce1664fe9ed1d95d94699a6
+MISC metadata.xml 1039 SHA256 48ed6c1488d648e08bc60c31b66463892f963e03e0784fb2964612cef9457d67 SHA512 b7bbf799b059f5f101ffe34e0119dfc71f9d08be5b058621dd2cdd2f7f72d3a00d08a1c53cae4bd4cb9eb86f25ff6e15f6a61712e262ecbcf74481faaee97ee3 WHIRLPOOL 134445ac280c65dc6949b161a4dd386710d38e6f33ce321e071c8d3498ff94a4955b491c48d7120efee7917955537fba262b0a5ec49cc4de52ff501e4bbf3f06
diff --git a/sci-visualization/opendx/files/opendx-4.3.2-sys.h.patch b/sci-visualization/opendx/files/opendx-4.3.2-sys.h.patch
new file mode 100644
index 000000000000..93bf18efb38c
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.3.2-sys.h.patch
@@ -0,0 +1,23 @@
+diff -aurN dx-4.3.2-orig/configure.ac dx-4.3.2/configure.ac
+--- dx-4.3.2-orig/configure.ac	2007-07-19 00:59:55.000000000 -0500
++++ dx-4.3.2/configure.ac	2007-07-19 01:02:34.000000000 -0500
+@@ -1004,7 +1004,7 @@
+   Xm/ScrolledWP.h Xm/SelectioB.h Xm/SeparatoG.h Xm/SeparatoGP.h Xm/Separator.h \
+   Xm/Text.h Xm/TextF.h Xm/ToggleB.h Xm/ToggleBG.h Xm/Xm.h Xm/XmP.h Xm/XmStrDefs.h \
+   gl.h gl/device.h gl/gl.h invent.h iop/afb.h iop/mov.h iop/pfs.h license.h \
+-  linux/kernel.h linux/sys.h math.h mingw32/dir.h mon.h net/if_arp.h net/route.h \
++  linux/kernel.h math.h mingw32/dir.h mon.h net/if_arp.h net/route.h \
+   os2.h setjmp.h starbase.c.h stddef.h stdio.h synch.h sys/access.h \
+   sys/ipc.h sys/m88kbcs.h sys/mman.h sys/mode.h sys/pstat.h sys/resource.h \
+   sys/svs.h sys/sysconfig.h sys/syslimits.h sys/sysmacros.h ulocks.h x11/xlibxtra.h \
+diff -aurN dx-4.3.2-orig/src/exec/libdx/memory.c dx-4.3.2/src/exec/libdx/memory.c
+--- dx-4.3.2-orig/src/exec/libdx/memory.c	2007-07-19 00:59:54.000000000 -0500
++++ dx-4.3.2/src/exec/libdx/memory.c	2007-07-19 01:01:57.000000000 -0500
+@@ -66,7 +66,6 @@
+ 
+ #if linux
+ #include <linux/kernel.h>
+-#include <linux/sys.h>
+ #include <sys/sysinfo.h>
+ #endif
+ 
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-concurrent-make-fix.patch b/sci-visualization/opendx/files/opendx-4.4.4-concurrent-make-fix.patch
new file mode 100644
index 000000000000..ba2c9c8c43c4
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-concurrent-make-fix.patch
@@ -0,0 +1,66 @@
+diff -Nuarp dx-4.4.4-orig/src/exec/dxmods/local.mk dx-4.4.4/src/exec/dxmods/local.mk
+--- dx-4.4.4-orig/src/exec/dxmods/local.mk	2008-09-11 22:31:38.000000000 +0200
++++ dx-4.4.4/src/exec/dxmods/local.mk	2008-09-11 22:33:44.000000000 +0200
+@@ -14,15 +14,15 @@ user.c:  dx.mdf
+ 
+ dxcm.mdf:  ${srcdir}/dxmdf.src
+ 	-rm -f dxcm.mdf
+-	cp ${srcdir}/dxmdf.src tmp.c
+-	$(CPP) $(INCLUDES) $(MDF) $(DEFS) tmp.c > dxcm.mdf
+-	-rm -f tmp.c
++	cp ${srcdir}/dxmdf.src tmp-dxcm.c
++	$(CPP) $(INCLUDES) $(MDF) $(DEFS) tmp-dxcm.c > dxcm.mdf
++	-rm -f tmp-dxcm.c
+ 
+ dx.mdf:  ${srcdir}/dxmdf.src
+ 	echo MYINC: $(MYINC)
+ 	-rm -f dx.mdf
+-	cp ${srcdir}/dxmdf.src tmp.c
+-	$(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS tmp.c > dx.mdf
++	cp ${srcdir}/dxmdf.src tmp-dx.c
++	$(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS tmp-dx.c > dx.mdf
+ 	@echo '/^ *$$/{' > stripl.sed
+ 	@echo 'N' >> stripl.sed
+ 	@echo '/^ *\\n *$$/D' >> stripl.sed
+@@ -30,7 +30,7 @@ dx.mdf:  ${srcdir}/dxmdf.src
+ 	cat dx.mdf |sed '/^#/d' > tmp.mdf
+ 	cat tmp.mdf |sed -f stripl.sed > dx.mdf
+ 	@rm -f stripl.sed tmp.mdf
+-	-rm -f tmp.c
++	-rm -f tmp-dx.c
+ 
+ .y.h:
+ 	$(YACC) $(YFLAGS) -d ${srcdir}/$*.y
+diff -Nuarp dx-4.4.4-orig/src/exec/dxmods/local.mk dx-4.4.4/src/exec/dxmods/local.mk
+--- dx-4.4.4-orig/src/exec/dxmods/local.mk.in	2008-09-11 22:31:38.000000000 +0200
++++ dx-4.4.4/src/exec/dxmods/local.mk.in	2008-09-11 22:33:44.000000000 +0200
+@@ -14,15 +14,15 @@ user.c:  dx.mdf
+ 
+ dxcm.mdf:  ${srcdir}/dxmdf.src
+ 	-rm -f dxcm.mdf
+-	cp ${srcdir}/dxmdf.src tmp.c
+-	$(CPP) $(INCLUDES) $(MDF) $(DEFS) tmp.c > dxcm.mdf
+-	-rm -f tmp.c
++	cp ${srcdir}/dxmdf.src tmp-dxcm.c
++	$(CPP) $(INCLUDES) $(MDF) $(DEFS) tmp-dxcm.c > dxcm.mdf
++	-rm -f tmp-dxcm.c
+ 
+ dx.mdf:  ${srcdir}/dxmdf.src
+ 	echo MYINC: $(MYINC)
+ 	-rm -f dx.mdf
+-	cp ${srcdir}/dxmdf.src tmp.c
+-	$(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS tmp.c > dx.mdf
++	cp ${srcdir}/dxmdf.src tmp-dx.c
++	$(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS tmp-dx.c > dx.mdf
+ 	@echo '/^ *$$/{' > stripl.sed
+ 	@echo 'N' >> stripl.sed
+ 	@echo '/^ *\\n *$$/D' >> stripl.sed
+@@ -30,7 +30,7 @@ dx.mdf:  ${srcdir}/dxmdf.src
+ 	cat dx.mdf |sed '/^#/d' > tmp.mdf
+ 	cat tmp.mdf |sed -f stripl.sed > dx.mdf
+ 	@rm -f stripl.sed tmp.mdf
+-	-rm -f tmp.c
++	-rm -f tmp-dx.c
+ 
+ .y.h:
+ 	$(YACC) $(YFLAGS) -d ${srcdir}/$*.y
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-dx-errno.patch b/sci-visualization/opendx/files/opendx-4.4.4-dx-errno.patch
new file mode 100644
index 000000000000..70c1b28f0e40
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-dx-errno.patch
@@ -0,0 +1,11 @@
+diff -up dx-4.4.4/src/exec/dpexec/lex.c.errno dx-4.4.4/src/exec/dpexec/lex.c
+--- dx-4.4.4/src/exec/dpexec/lex.c.errno	2006-01-09 23:57:34.000000000 +0100
++++ dx-4.4.4/src/exec/dpexec/lex.c	2009-01-26 19:16:20.000000000 +0100
+@@ -504,6 +504,7 @@ int yylex(YYSTYPE *lvalp)
+     for (;;)
+     {
+ 	yyleng = 0;
++	errno = 0;
+  
+ 	c = input();
+  
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-gcc43.patch b/sci-visualization/opendx/files/opendx-4.4.4-gcc43.patch
new file mode 100644
index 000000000000..64a3d91fee6c
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-gcc43.patch
@@ -0,0 +1,315 @@
+diff -up dx-4.4.4/src/uipp/startup/StartupApplication.C.gcc43 dx-4.4.4/src/uipp/startup/StartupApplication.C
+--- dx-4.4.4/src/uipp/startup/StartupApplication.C.gcc43	2005-11-10 20:48:22.000000000 +0100
++++ dx-4.4.4/src/uipp/startup/StartupApplication.C	2008-01-07 21:55:03.000000000 +0100
+@@ -117,7 +117,7 @@ InitializeSignals(void)
+ #endif       
+ }            
+ 
+-boolean StartupApplication::initialize(unsigned int* argcp,
++boolean StartupApplication::initialize(int*  argcp,
+ 			       char**        argv)
+ {
+     ASSERT(argcp);
+diff -up dx-4.4.4/src/uipp/startup/StartupApplication.h.gcc43 dx-4.4.4/src/uipp/startup/StartupApplication.h
+--- dx-4.4.4/src/uipp/startup/StartupApplication.h.gcc43	2003-09-20 07:33:56.000000000 +0200
++++ dx-4.4.4/src/uipp/startup/StartupApplication.h	2008-01-07 21:50:47.000000000 +0100
+@@ -84,7 +84,7 @@ class StartupApplication : public IBMApp
+     // Overrides the Application class version:
+     //   Initializes Xt Intrinsics with option list (switches).
+     //
+-    virtual boolean initialize(unsigned int* argcp, char**argv);
++    virtual boolean initialize(int* argcp, char**argv);
+ 
+     CommandScope       *commandScope;   // command scope
+ 
+diff -up dx-4.4.4/src/uipp/startup/Main.C.gcc43 dx-4.4.4/src/uipp/startup/Main.C
+--- dx-4.4.4/src/uipp/startup/Main.C.gcc43	2000-05-16 20:53:07.000000000 +0200
++++ dx-4.4.4/src/uipp/startup/Main.C	2008-01-07 19:57:58.000000000 +0100
+@@ -14,7 +14,7 @@
+ extern "C" void HCLXmInit();
+ #endif
+ 
+-int main(unsigned int argc,
++int main( int          argc,
+ 	  char**       argv)
+ {
+ #if defined(HAVE_HCLXMINIT)
+diff -up dx-4.4.4/src/uipp/base/Application.C.gcc43 dx-4.4.4/src/uipp/base/Application.C
+--- dx-4.4.4/src/uipp/base/Application.C.gcc43	2005-11-09 19:56:17.000000000 +0100
++++ dx-4.4.4/src/uipp/base/Application.C	2008-01-07 22:39:15.000000000 +0100
+@@ -136,7 +136,7 @@ void Application::installDefaultResource
+     //this->setDefaultResources(baseWidget, Application::DefaultResources);
+ }
+ 
+-boolean Application::initializeWindowSystem(unsigned int *argcp, char **argv) 
++boolean Application::initializeWindowSystem(int *argcp, char **argv) 
+ {
+ 
+     //
+@@ -149,7 +149,7 @@ boolean Application::initializeWindowSys
+ 	     NULL,			// command line options table
+ 	     0,				// number of entries in options table
+ #if XtSpecificationRelease > 4
+-	     (int*)argcp,
++	     argcp,
+ #else
+ 	     argcp,
+ #endif
+@@ -235,7 +235,7 @@ boolean Application::initializeWindowSys
+     return TRUE;
+ }
+ 
+-void Application::parseCommand(unsigned int* argcp, char** argv,
++void Application::parseCommand(int* argcp, char** argv,
+                                XrmOptionDescList optlist, int optlistsize)
+ {
+     char res_file[256];
+@@ -280,7 +280,7 @@ void Application::parseCommand(unsigned 
+     //
+ }
+ 
+-boolean Application::initialize(unsigned int* argcp, char** argv)
++boolean Application::initialize(int* argcp, char** argv)
+ {
+     //
+     // Initialize the window system if not done already.
+diff -up dx-4.4.4/src/uipp/base/Application.h.gcc43 dx-4.4.4/src/uipp/base/Application.h
+--- dx-4.4.4/src/uipp/base/Application.h.gcc43	2005-11-09 19:26:29.000000000 +0100
++++ dx-4.4.4/src/uipp/base/Application.h	2008-01-07 21:49:49.000000000 +0100
+@@ -49,7 +49,7 @@ class Application : public UIComponent, 
+     //
+     // The main program needs to access protected member functions.
+     //
+-    friend int main(unsigned int argc,
++    friend int main( int          argc,
+ 		     char**       argv);
+ 
+ 
+@@ -71,9 +71,9 @@ class Application : public UIComponent, 
+     //
+     // Initialize the window system.
+     //
+-    virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv);
++    virtual boolean initializeWindowSystem(int *argcp, char **argv);
+ 
+-    virtual void parseCommand(unsigned int* argcp, char** argv,
++    virtual void parseCommand(int* argcp, char** argv,
+ 			       XrmOptionDescList optlist, int optlistsize);
+ 
+     //
+@@ -145,7 +145,7 @@ class Application : public UIComponent, 
+     // Initializes any Application specfic state.  This routine should 
+     // be called by main() or subclasses only.
+     //
+-    virtual boolean initialize(unsigned int* argcp, char** argv);
++    virtual boolean initialize(int* argcp, char** argv);
+ 
+     //
+     // Allow others to access our event processing mechanism
+diff -up dx-4.4.4/src/uipp/base/IBMApplication.C.gcc43 dx-4.4.4/src/uipp/base/IBMApplication.C
+--- dx-4.4.4/src/uipp/base/IBMApplication.C.gcc43	2004-04-02 22:32:43.000000000 +0200
++++ dx-4.4.4/src/uipp/base/IBMApplication.C	2008-01-07 21:53:29.000000000 +0100
+@@ -349,7 +349,7 @@ int status;
+ }
+ 
+ 
+-boolean IBMApplication::initializeWindowSystem(unsigned int *argcp, char **argv)
++boolean IBMApplication::initializeWindowSystem(int *argcp, char **argv)
+ {
+ 
+     if (!this->Application::initializeWindowSystem(argcp, argv))
+@@ -375,7 +375,7 @@ boolean IBMApplication::initializeWindow
+     return TRUE;
+ }
+ 
+-boolean IBMApplication::initialize(unsigned int* argcp,
++boolean IBMApplication::initialize(int*          argcp,
+ 				   char**        argv)
+ {
+     if (!this->Application::initialize(argcp,argv))
+diff -up dx-4.4.4/src/uipp/base/IBMApplication.h.gcc43 dx-4.4.4/src/uipp/base/IBMApplication.h
+--- dx-4.4.4/src/uipp/base/IBMApplication.h.gcc43	2003-09-20 07:35:22.000000000 +0200
++++ dx-4.4.4/src/uipp/base/IBMApplication.h	2008-01-07 21:50:19.000000000 +0100
+@@ -77,7 +77,7 @@ class IBMApplication : public Applicatio
+     //
+     // Initialize the window system.
+     //
+-    virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv);
++    virtual boolean initializeWindowSystem(int *argcp, char **argv);
+ 
+     //
+     // Protected member data:
+@@ -88,7 +88,7 @@ class IBMApplication : public Applicatio
+ 
+     HelpWin		*helpWindow;
+ 
+-    boolean initialize(unsigned int* argcp, char** argv);
++    boolean initialize(int* argcp, char** argv);
+ 
+     //
+     // Load application specific action routines
+diff -up dx-4.4.4/src/uipp/tutor/TutorApplication.h.gcc43 dx-4.4.4/src/uipp/tutor/TutorApplication.h
+--- dx-4.4.4/src/uipp/tutor/TutorApplication.h.gcc43	1999-05-10 17:46:30.000000000 +0200
++++ dx-4.4.4/src/uipp/tutor/TutorApplication.h	2008-01-07 21:49:29.000000000 +0100
+@@ -69,7 +69,7 @@ class TutorApplication : public IBMAppli
+     // Overrides the Application class version:
+     //   Initializes Xt Intrinsics with option list (switches).
+     //
+-    virtual boolean initialize(unsigned int* argcp,
++    virtual boolean initialize(int*       argcp,
+ 			    char**        argv);
+ 
+     //
+diff -up dx-4.4.4/src/uipp/tutor/Main.C.gcc43 dx-4.4.4/src/uipp/tutor/Main.C
+--- dx-4.4.4/src/uipp/tutor/Main.C.gcc43	2000-05-16 20:53:15.000000000 +0200
++++ dx-4.4.4/src/uipp/tutor/Main.C	2008-01-07 19:57:39.000000000 +0100
+@@ -31,7 +31,7 @@ extern "C" void HCLXmInit();
+ //
+ const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
+  
+-int main(unsigned int argc,
++int main( int          argc,
+ 	  char**       argv)
+ {
+ #if defined(HAVE_HCLXMINIT)
+diff -up dx-4.4.4/src/uipp/tutor/TutorApplication.C.gcc43 dx-4.4.4/src/uipp/tutor/TutorApplication.C
+--- dx-4.4.4/src/uipp/tutor/TutorApplication.C.gcc43	2006-05-08 18:20:14.000000000 +0200
++++ dx-4.4.4/src/uipp/tutor/TutorApplication.C	2008-01-07 21:56:09.000000000 +0100
+@@ -196,7 +196,7 @@ InitializeSignals(void)
+ #endif       
+ }            
+ 
+-boolean TutorApplication::initialize(unsigned int* argcp,
++boolean TutorApplication::initialize(int*    argcp,
+ 			       char**        argv)
+ {
+     ASSERT(argcp);
+diff -up dx-4.4.4/src/uipp/widgets/MultiText.h.gcc43 dx-4.4.4/src/uipp/widgets/MultiText.h
+--- dx-4.4.4/src/uipp/widgets/MultiText.h.gcc43	2006-01-03 01:12:34.000000000 +0100
++++ dx-4.4.4/src/uipp/widgets/MultiText.h	2008-01-07 19:06:27.000000000 +0100
+@@ -91,7 +91,7 @@ typedef struct _XmMultiTextClassRec* XmM
+ #define XmNsmoothScroll		"smoothScroll"
+ #define XmNwaitCursorCount	"waitCursorCount"
+ 
+-#if !(defined(_Xm_h) || defined(XM_H))
++#if !(defined(_Xm_h) || defined(XM_H) || defined(_XM_XM_H))
+ #define XmNmarginHeight		"marginHeight"
+ #define XmNmarginWidth		"marginWidth"
+ #define XmNwordWrap		"wordWrap"
+@@ -109,7 +109,7 @@ typedef struct _XmMultiTextClassRec* XmM
+ #define XmCSmoothScroll		"SmoothScroll"
+ #define XmCWaitCursorCount	"WaitCursorCount"
+ 
+-#if !(defined(_Xm_h) || defined(XM_H))
++#if !(defined(_Xm_h) || defined(XM_H) || defined(_XM_XM_H))
+ #define XmCMarginHeight		"MarginHeight"
+ #define XmCMarginWidth		"MarginWidth"
+ #define XmCWordWrap		"WordWrap"
+diff -up dx-4.4.4/src/uipp/dxui/Main.C.gcc43 dx-4.4.4/src/uipp/dxui/Main.C
+--- dx-4.4.4/src/uipp/dxui/Main.C.gcc43	2005-12-07 18:50:53.000000000 +0100
++++ dx-4.4.4/src/uipp/dxui/Main.C	2008-01-07 19:57:21.000000000 +0100
+@@ -48,7 +48,7 @@ extern unsigned long _etext;
+ //
+ const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
+  
+-int main(unsigned int argc,
++int main( int          argc,
+ 	  char**       argv)
+ {
+ #if defined(HAVE_HCLXMINIT)
+diff -up dx-4.4.4/src/uipp/prompter/GARApplication.h.gcc43 dx-4.4.4/src/uipp/prompter/GARApplication.h
+--- dx-4.4.4/src/uipp/prompter/GARApplication.h.gcc43	2003-09-20 07:33:21.000000000 +0200
++++ dx-4.4.4/src/uipp/prompter/GARApplication.h	2008-01-07 21:49:05.000000000 +0100
+@@ -129,7 +129,7 @@ class GARApplication : public IBMApplica
+     // Overrides the Application class version:
+     //   Initializes Xt Intrinsics with option list (switches).
+     //
+-    virtual boolean initialize(unsigned int* argcp,
++    virtual boolean initialize(int*       argcp,
+ 			    char**        argv);
+ 
+     CommandScope       *commandScope;   // command scope
+diff -up dx-4.4.4/src/uipp/prompter/Main.C.gcc43 dx-4.4.4/src/uipp/prompter/Main.C
+--- dx-4.4.4/src/uipp/prompter/Main.C.gcc43	2000-05-16 20:52:59.000000000 +0200
++++ dx-4.4.4/src/uipp/prompter/Main.C	2008-01-07 19:57:01.000000000 +0100
+@@ -17,7 +17,7 @@ extern "C" void HCLXmInit();
+ #endif
+ 
+ 
+-int main(unsigned int argc,
++int main( int          argc,
+ 	  char**       argv)
+ {
+ #if defined(HAVE_HCLXMINIT)
+diff -up dx-4.4.4/src/uipp/prompter/GARApplication.C.gcc43 dx-4.4.4/src/uipp/prompter/GARApplication.C
+--- dx-4.4.4/src/uipp/prompter/GARApplication.C.gcc43	2006-05-08 18:20:13.000000000 +0200
++++ dx-4.4.4/src/uipp/prompter/GARApplication.C	2008-01-07 21:54:28.000000000 +0100
+@@ -198,7 +198,7 @@ InitializeSignals(void)
+     }
+ }            
+ 
+-boolean GARApplication::initialize(unsigned int* argcp,
++boolean GARApplication::initialize(int*      argcp,
+ 			       char**        argv)
+ {
+     ASSERT(argcp);
+diff -up dx-4.4.4/src/uipp/dxuilib/DXApplication.h.gcc43 dx-4.4.4/src/uipp/dxuilib/DXApplication.h
+--- dx-4.4.4/src/uipp/dxuilib/DXApplication.h.gcc43	2006-05-08 18:20:10.000000000 +0200
++++ dx-4.4.4/src/uipp/dxuilib/DXApplication.h	2008-01-07 21:14:12.000000000 +0100
+@@ -372,7 +372,7 @@ class DXApplication : public IBMApplicat
+     // Overrides the Application class version:
+     //   Initializes Xt Intrinsics with option list (switches).
+     //
+-    virtual boolean initialize(unsigned int* argcp,
++    virtual boolean initialize(int*       argcp,
+ 			    char**        argv);
+ 
+     //
+diff -up dx-4.4.4/src/uipp/dxuilib/DXApplication.C.gcc43 dx-4.4.4/src/uipp/dxuilib/DXApplication.C
+--- dx-4.4.4/src/uipp/dxuilib/DXApplication.C.gcc43	2006-06-22 21:45:34.000000000 +0200
++++ dx-4.4.4/src/uipp/dxuilib/DXApplication.C	2008-01-07 21:32:56.000000000 +0100
+@@ -2248,7 +2248,7 @@ void DXApplication::installDefaultResour
+     this->setDefaultResources(baseWidget, _defaultDXResources);
+     this->IBMApplication::installDefaultResources(baseWidget);
+ }
+-boolean DXApplication::initialize(unsigned int* argcp,
++boolean DXApplication::initialize(int* argcp,
+ 								  char**        argv)
+ {
+ 	boolean wasSetBusy = FALSE;
+diff -up dx-4.4.4/src/uipp/mb/Main.C.gcc43 dx-4.4.4/src/uipp/mb/Main.C
+--- dx-4.4.4/src/uipp/mb/Main.C.gcc43	2000-05-20 19:49:40.000000000 +0200
++++ dx-4.4.4/src/uipp/mb/Main.C	2008-01-07 19:56:41.000000000 +0100
+@@ -22,7 +22,7 @@ extern "C" void HCLXmInit();
+ //
+ const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
+ 
+-int main(unsigned int argc,
++int main( int          argc,
+ 	  char**       argv)
+ {
+ #if defined(HAVE_HCLXMINIT)
+diff -up dx-4.4.4/src/uipp/mb/MBApplication.C.gcc43 dx-4.4.4/src/uipp/mb/MBApplication.C
+--- dx-4.4.4/src/uipp/mb/MBApplication.C.gcc43	2006-05-08 18:20:13.000000000 +0200
++++ dx-4.4.4/src/uipp/mb/MBApplication.C	2008-01-07 21:51:15.000000000 +0100
+@@ -117,7 +117,7 @@ InitializeSignals(void)
+ #endif       
+ }            
+ 
+-boolean MBApplication::initialize(unsigned int* argcp,
++boolean MBApplication::initialize(int*       argcp,
+ 			       char**        argv)
+ {
+     ASSERT(argcp);
+diff -up dx-4.4.4/src/uipp/mb/MBApplication.h.gcc43 dx-4.4.4/src/uipp/mb/MBApplication.h
+--- dx-4.4.4/src/uipp/mb/MBApplication.h.gcc43	1999-05-10 17:46:25.000000000 +0200
++++ dx-4.4.4/src/uipp/mb/MBApplication.h	2008-01-07 21:48:38.000000000 +0100
+@@ -51,7 +51,7 @@ class MBApplication : public IBMApplicat
+     // Overrides the Application class version:
+     //   Initializes Xt Intrinsics with option list (switches).
+     //
+-    virtual boolean initialize(unsigned int* argcp,
++    virtual boolean initialize(int*       argcp,
+ 			    char**        argv);
+ 
+     static MBResource	resource;
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-installpaths.patch b/sci-visualization/opendx/files/opendx-4.4.4-installpaths.patch
new file mode 100644
index 000000000000..3c0b6d9a899c
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-installpaths.patch
@@ -0,0 +1,330 @@
+diff -up dx-4.4.4/bin/dx.in.r dx-4.4.4/bin/dx.in
+--- dx-4.4.4/bin/dx.in.r	2004-05-31 18:12:05.000000000 +0200
++++ dx-4.4.4/bin/dx.in	2009-01-26 23:57:11.000000000 +0100
+@@ -60,14 +60,7 @@ exit 1
+ #
+ longhelp() {
+ 
+-if test -f "$dxroot/man/catl/dx.l" ; then
+-    more "$dxroot/man/catl/dx.l"
+-else
+-    echo "cannot find $dxroot/man/catl/dx.l"
+-    echo "set the DXROOT environment variable to the root of the"
+-    echo "dx installation tree and try again."
+-fi
+-exit 1
++man dx
+ 
+ cat << EOFlonghelp
+ command line parameters:
+@@ -286,7 +279,7 @@ fi
+ 
+ 
+ if [ -z "$DXROOT" ]; then
+-  prefix=@prefix@
++  prefix=@libdir@
+   DXROOT=$prefix/dx
+ fi
+ export DXROOT
+@@ -507,7 +507,7 @@ export DXARCH
+ 
+ # default to running locally, from @prefix@/dx  
+ exhost=$thishost
+-dxroot=@prefix@/dx
++dxroot=@libdir@/dx
+ startup=1   # run the startup window by default
+ 
+ 
+diff -up dx-4.4.4/bin/Makefile.am.r dx-4.4.4/bin/Makefile.am
+--- dx-4.4.4/bin/Makefile.am.r	2003-07-12 02:11:37.000000000 +0200
++++ dx-4.4.4/bin/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-dxbindir = $(prefix)/dx/bin
++dxbindir = $(libdir)/dx/bin
+ bindir = $(prefix)/bin
+ 
+ EXTRA_SCRIPTS = mdf2c dx
+diff -up dx-4.4.4/bin/mdf2c.in.r dx-4.4.4/bin/mdf2c.in
+--- dx-4.4.4/bin/mdf2c.in.r	1999-12-14 05:13:04.000000000 +0100
++++ dx-4.4.4/bin/mdf2c.in	2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ # Configure is looking for the following line
+-prefix=@prefix@
++prefix=@libdir@
+ DFLTROOT=$prefix/dx
+ root=${DXROOT=${DXEXECROOT=$DFLTROOT}}
+ 
+diff -up dx-4.4.4/doc/Makefile.am.r dx-4.4.4/doc/Makefile.am
+--- dx-4.4.4/doc/Makefile.am.r	1999-04-05 13:57:03.000000000 +0200
++++ dx-4.4.4/doc/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-docdir = $(prefix)/dx/doc
++docdir = $(datadir)/dx/doc
+ 
+ doc_DATA = \
+ 	README README_SMP README_alphax README_aviion README_hp700 \
+diff -up dx-4.4.4/fonts/Makefile.am.r dx-4.4.4/fonts/Makefile.am
+--- dx-4.4.4/fonts/Makefile.am.r	2003-07-12 02:11:37.000000000 +0200
++++ dx-4.4.4/fonts/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-fontdir = $(prefix)/dx/fonts
++fontdir = $(libdir)/dx/fonts
+ 
+ font_DATA = \
+ 	README area.dx cyril_d.dx \
+diff -up dx-4.4.4/help/Makefile.am.r dx-4.4.4/help/Makefile.am
+--- dx-4.4.4/help/Makefile.am.r	2003-07-12 02:11:37.000000000 +0200
++++ dx-4.4.4/help/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-helpdir = $(prefix)/dx/help
++helpdir = $(libdir)/dx/help
+ 
+ EXTRA_DIST = $(helpfiles1) $(helpfiles2) $(helpfiles3) $(helpfiles4) $(helpfiles5)  \
+ 	$(helpfiles6) $(helpfiles7) $(helpfiles8) $(helpfiles9) $(helpfiles10)  \
+diff -up dx-4.4.4/html/images/Makefile.am.r dx-4.4.4/html/images/Makefile.am
+--- dx-4.4.4/html/images/Makefile.am.r	2002-04-01 10:51:13.000000000 +0200
++++ dx-4.4.4/html/images/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,5 +1,5 @@
+ 
+-imagesdir = $(prefix)/dx/html/images
++imagesdir = $(libdir)/dx/html/images
+ 
+ images1 = \
+ 	3dcurs.gif adctlpt.gif arch.gif autoax.gif autoexp.gif		\
+diff -up dx-4.4.4/html/Makefile.am.r dx-4.4.4/html/Makefile.am
+--- dx-4.4.4/html/Makefile.am.r	2003-07-12 02:11:39.000000000 +0200
++++ dx-4.4.4/html/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-htmldir = $(prefix)/dx/html
++htmldir = $(libdir)/dx/html
+ 
+ SUBDIRS = pages images
+ 
+diff -up dx-4.4.4/html/pages/Makefile.am.r dx-4.4.4/html/pages/Makefile.am
+--- dx-4.4.4/html/pages/Makefile.am.r	2002-06-20 06:38:03.000000000 +0200
++++ dx-4.4.4/html/pages/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,4 +1,4 @@
+-pagesdir = $(prefix)/dx/html/pages
++pagesdir = $(libdir)/dx/html/pages
+ 
+ pages1 = \
+ 	insgu002.htm insgu003.htm insgu004.htm insgu005.htm insgu006.htm \
+diff -up dx-4.4.4/include/dx/Makefile.am.r dx-4.4.4/include/dx/Makefile.am
+--- dx-4.4.4/include/dx/Makefile.am.r	1999-05-26 01:35:16.000000000 +0200
++++ dx-4.4.4/include/dx/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-dxincdir = $(prefix)/dx/include/dx
++dxincdir = $(prefix)/include/dx
+  
+ dxinc_HEADERS = \
+ 	UserInteractors.h advanced.h arch.h array.h arrayhandles.h \
+diff -up dx-4.4.4/include/Makefile.am.r dx-4.4.4/include/Makefile.am
+--- dx-4.4.4/include/Makefile.am.r	2006-04-09 05:44:49.000000000 +0200
++++ dx-4.4.4/include/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,4 +1,4 @@
+-dxincdir = $(prefix)/dx/include
++dxincdir = $(prefix)/include
+ SUBDIRS = dx
+ dxinc_HEADERS = dxl.h dxstereo.h
+ nodist_dxinc_HEADERS = dxconfig.h
+diff -up dx-4.4.4/lib/Makefile.am.r dx-4.4.4/lib/Makefile.am
+--- dx-4.4.4/lib/Makefile.am.r	2003-08-22 01:22:13.000000000 +0200
++++ dx-4.4.4/lib/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,4 +1,4 @@
+-libsdir = $(prefix)/dx/lib
++libsdir = $(libdir)/dx/lib
+ 
+ libs_DATA = colors.txt dxexec.def dxexec.exp dxexec.imp dxexec.ifs \
+ 	dxfSaveCurrentImage.net dxrc mdf2c.awk messages outboard.c
+diff -up dx-4.4.4/man/Makefile.am.r dx-4.4.4/man/Makefile.am
+--- dx-4.4.4/man/Makefile.am.r	1999-04-03 18:31:28.000000000 +0200
++++ dx-4.4.4/man/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,4 +1,4 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-SUBDIRS = manl catl
++SUBDIRS = manl
+ 
+diff -up dx-4.4.4/man/manl/Makefile.am.r dx-4.4.4/man/manl/Makefile.am
+--- dx-4.4.4/man/manl/Makefile.am.r	2002-05-20 06:47:06.000000000 +0200
++++ dx-4.4.4/man/manl/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-mandir = $(prefix)/dx/man
++mandir = $(datadir)/man
+ 
+ man_MANS = dx.l
+ EXTRA_DIST = $(man_MANS)
+diff -up dx-4.4.4/src/exec/dxexec/Makefile.am.r dx-4.4.4/src/exec/dxexec/Makefile.am
+--- dx-4.4.4/src/exec/dxexec/Makefile.am.r	2006-01-11 17:24:39.000000000 +0100
++++ dx-4.4.4/src/exec/dxexec/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -9,7 +9,7 @@ noinst_LTLIBRARIES = libDXEXEC.la
+ libDXEXEC_la_SOURCES = main.c
+ libDXEXEC_la_CFLAGS = $(AM_CFLAGS)
+ 
+-bindir = $(prefix)/dx/bin_@ARCH@
++bindir = $(libdir)/dx/bin_@ARCH@
+ bin_PROGRAMS = dxexec
+ 
+ dxexec_LDADD = ../dpexec/libDPEXEC.la ../dxmods/libDXMODS.la ../dxmods/user.lo \
+diff -up dx-4.4.4/src/exec/dxmods/Makefile.am.r dx-4.4.4/src/exec/dxmods/Makefile.am
+--- dx-4.4.4/src/exec/dxmods/Makefile.am.r	2003-08-19 00:51:10.000000000 +0200
++++ dx-4.4.4/src/exec/dxmods/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,8 +1,8 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+ INCLUDES = -I${top_srcdir}/include -I${srcdir}/../dpexec -I$(BUILDBASE)/include -D@ARCH@
+ 
+-dxmdfdir = $(prefix)/dx/lib
++dxmdfdir = $(libdir)/dx/lib
+ noinst_LTLIBRARIES = libDXMODS.la libusercm.la libuser.la libDXMODSN.la
+ SUFFIXES = .c .y .c .s .h .o 
+ 
+@@ -13,6 +14,8 @@ DISTCLEANFILES = dx.mdf dxcm.mdf user.c 
+ 
+ dxmdf_DATA = dx.mdf
+ 
++user.c: dx.mdf
++
+ _complex.o: _compparse.h
+ 
+ HEADERS1 = \
+diff -up dx-4.4.4/src/exec/libdx/Makefile.am.r dx-4.4.4/src/exec/libdx/Makefile.am
+--- dx-4.4.4/src/exec/libdx/Makefile.am.r	2006-03-27 20:56:53.000000000 +0200
++++ dx-4.4.4/src/exec/libdx/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -7,7 +7,7 @@ MICRO_VERSION=@MICRO_VERSION@
+ #INCLUDES = -I../../../include  -D@ARCH@
+ INCLUDES = -I${top_srcdir}/include  -D@ARCH@
+ 
+-dxlibdir = $(prefix)/dx/lib_@ARCH@
++dxlibdir = $(libdir)/dx/lib_@ARCH@
+ 
+ noinst_LTLIBRARIES = libLIBDX.la libcallm.la libmem.la
+ #dxlib_LIBRARIES = libDXlite.a 
+diff -up dx-4.4.4/src/exec/Makefile.am.r dx-4.4.4/src/exec/Makefile.am
+--- dx-4.4.4/src/exec/Makefile.am.r	2003-09-17 00:40:40.000000000 +0200
++++ dx-4.4.4/src/exec/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ SUBDIRS = libdx dxmods hwrender dpexec dxexec
+ 
+-dxlibdir = $(prefix)/dx/lib_@ARCH@
++dxlibdir = $(libdir)/dx/lib_@ARCH@
+ 
+ MAJOR_VERSION=@MAJOR_VERSION@
+ MINOR_VERSION=@MINOR_VERSION@
+diff -up dx-4.4.4/src/misc/Makefile.am.r dx-4.4.4/src/misc/Makefile.am
+--- dx-4.4.4/src/misc/Makefile.am.r	2003-07-12 02:12:13.000000000 +0200
++++ dx-4.4.4/src/misc/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -4,7 +4,7 @@ INCLUDES = -I${top_srcdir}/include -D@AR
+ 
+ dxbindir = $(prefix)/bin
+ noinst_PROGRAMS = dxlocal
+-archmakdir = $(prefix)/dx/lib_$(ARCH)
++archmakdir = $(libdir)/dx/lib_$(ARCH)
+ archmak_DATA = arch.mak
+ 
+ dxlocal_SOURCES = dx.c utils.c
+@@ -15,5 +15,5 @@ install-exec-local: 
+ 	if test ! -z "@INSTALL_BIN_PROGRAM@" ; then		         \
+ 		$(mkinstalldirs) $(prefix)/bin ;                	         \
+ 		$(INSTALL) dxlocal@EXEEXT@ 				         \
+-		$(prefix)/dx/bin_$(ARCH)/@INSTALL_BIN_PROGRAM@@EXEEXT@ ; \
++		$(libdir)/dx/bin_$(ARCH)/@INSTALL_BIN_PROGRAM@@EXEEXT@ ; \
+ 	fi
+diff -up dx-4.4.4/src/uipp/dxl/Makefile.am.r dx-4.4.4/src/uipp/dxl/Makefile.am
+--- dx-4.4.4/src/uipp/dxl/Makefile.am.r	2003-07-12 02:12:16.000000000 +0200
++++ dx-4.4.4/src/uipp/dxl/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -7,7 +7,7 @@ MICRO_VERSION=@MICRO_VERSION@
+ 
+ INCLUDES = -I${top_srcdir}/include  -D@ARCH@
+ 
+-dxlibdir = $(prefix)/dx/lib_@ARCH@
++dxlibdir = $(libdir)/dx/lib_@ARCH@
+ 
+ noinst_HEADERS = \
+ 	dxlP.h \
+diff -up dx-4.4.4/src/uipp/dxui/Makefile.am.r dx-4.4.4/src/uipp/dxui/Makefile.am
+--- dx-4.4.4/src/uipp/dxui/Makefile.am.r	2003-07-12 02:12:17.000000000 +0200
++++ dx-4.4.4/src/uipp/dxui/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -I${srcdir}/../dxuilib -D@ARCH@
+ 
+-dxbindir = $(prefix)/dx/bin_@ARCH@
++dxbindir = $(libdir)/dx/bin_@ARCH@
+ dxbin_PROGRAMS = dxui
+ 
+ 
+diff -up dx-4.4.4/src/uipp/mb/Makefile.am.r dx-4.4.4/src/uipp/mb/Makefile.am
+--- dx-4.4.4/src/uipp/mb/Makefile.am.r	2003-08-20 16:21:33.000000000 +0200
++++ dx-4.4.4/src/uipp/mb/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -I${srcdir}/../widgets -D@ARCH@
+ 
+-dxbindir = $(prefix)/dx/bin_@ARCH@
++dxbindir = $(libdir)/dx/bin_@ARCH@
+ 
+ dxbin_PROGRAMS = builder
+ 
+diff -up dx-4.4.4/src/uipp/prompter/Makefile.am.r dx-4.4.4/src/uipp/prompter/Makefile.am
+--- dx-4.4.4/src/uipp/prompter/Makefile.am.r	2003-11-04 05:20:14.000000000 +0100
++++ dx-4.4.4/src/uipp/prompter/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ INCLUDES =  -I${srcdir}/../base -I${top_srcdir}/include -D@ARCH@
+ 
+-dxbindir = $(prefix)/dx/bin_@ARCH@
++dxbindir = $(libdir)/dx/bin_@ARCH@
+ 
+ dxbin_PROGRAMS = prompter
+ 
+diff -up dx-4.4.4/src/uipp/startup/Makefile.am.r dx-4.4.4/src/uipp/startup/Makefile.am
+--- dx-4.4.4/src/uipp/startup/Makefile.am.r	2003-07-12 02:12:29.000000000 +0200
++++ dx-4.4.4/src/uipp/startup/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ INCLUDES =  -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@
+ 
+-dxbindir = $(prefix)/dx/bin_@ARCH@
++dxbindir = $(libdir)/dx/bin_@ARCH@
+ 
+ dxbin_PROGRAMS = startupui
+ 
+diff -up dx-4.4.4/src/uipp/tutor/Makefile.am.r dx-4.4.4/src/uipp/tutor/Makefile.am
+--- dx-4.4.4/src/uipp/tutor/Makefile.am.r	2003-07-12 02:12:29.000000000 +0200
++++ dx-4.4.4/src/uipp/tutor/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@
+ 
+-dxbindir = $(prefix)/dx/bin_@ARCH@
++dxbindir = $(libdir)/dx/bin_@ARCH@
+ 
+ dxbin_PROGRAMS = tutor
+ 
+diff -up dx-4.4.4/src/uipp/ui/Makefile.am.r dx-4.4.4/src/uipp/ui/Makefile.am
+--- dx-4.4.4/src/uipp/ui/Makefile.am.r	2001-04-12 16:29:02.000000000 +0200
++++ dx-4.4.4/src/uipp/ui/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-uidatadir = $(prefix)/dx/ui
++uidatadir = $(libdir)/dx/ui
+ 
+ DATA1 = \
+ 	icon50.dat icon50.xpm logo.dat logo.xpm ui.mdf Basic2D.cfg Basic2D.net \
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-libtool.patch b/sci-visualization/opendx/files/opendx-4.4.4-libtool.patch
new file mode 100644
index 000000000000..2a5aad6d439a
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-libtool.patch
@@ -0,0 +1,11 @@
+diff -Naur dx-4.4.4/configure.ac dx-4.4.4.new/configure.ac
+--- dx-4.4.4/configure.ac	2006-08-21 17:56:08.000000000 -0400
++++ dx-4.4.4.new/configure.ac	2008-06-29 07:31:08.000000000 -0400
+@@ -10,6 +10,7 @@
+ AM_INIT_AUTOMAKE
+ AC_DISABLE_SHARED
+ AC_PROG_LIBTOOL
++AC_PROG_CXX
+ 
+ VERSION_STRING="04.4.4000"
+ MAJOR_VERSION=4
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-magick.patch b/sci-visualization/opendx/files/opendx-4.4.4-magick.patch
new file mode 100644
index 000000000000..5b50470970c3
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-magick.patch
@@ -0,0 +1,90 @@
+newer magick libraries, use pkg-config, add possibility to link with
+graphicsmagick, fix for as-needed
+
+--- dx-4.4.4.orig/src/exec/dxmods/_im_image.c
++++ dx-4.4.4/src/exec/dxmods/_im_image.c
+@@ -329,7 +329,7 @@
+             DestroyImageInfo(new_frame_info);
+             DestroyImageInfo(image_info);
+ #if MagickLibVersion > 0x0537
+-            DestroyConstitute();
++            ConstituteComponentTerminus();
+ #endif
+              DXSetError(ERROR_INTERNAL, "reason = %s, description = %s",
+                         image->exception.reason,
+@@ -346,7 +346,7 @@
+             DestroyImageInfo(new_frame_info);
+             DestroyImageInfo(image_info);
+ #if MagickLibVersion > 0x0537
+-            DestroyConstitute();
++            ConstituteComponentTerminus();
+ #endif
+             DXErrorReturn( ERROR_INTERNAL , "out of memory allocating buffer _im_image.c");
+         }
+@@ -375,7 +375,7 @@
+         DestroyImageInfo(image_info);
+         DestroyImageInfo(new_frame_info);
+ #if MagickLibVersion > 0x0537
+-        DestroyConstitute();
++        ConstituteComponentTerminus();
+ #endif
+         
+         DEBUGMESSAGE("back from DestroyImage");
+@@ -491,7 +491,7 @@
+         DestroyImage(image);
+         DestroyImageInfo(image_info);
+ #if MagickLibVersion > 0x0537
+-        DestroyConstitute();
++        ConstituteComponentTerminus();
+ #endif
+     }
+     return (OK);
+--- dx-4.4.4.orig/configure.ac
++++ dx-4.4.4/configure.ac
+@@ -799,7 +799,29 @@
+ LIB_MAGICK=''
+ if test "$with_magick" != 'no'
+ then
+-    AS_MESSAGE([checking for ImageMagick support ......])
++    found=0
++    static_lib="libGraphicsMagick.a"
++    PKG_CHECK_MODULES(GraphicsMagick, GraphicsMagick, [found=1], [found=0])
++    MAGICK_CFLAGS="$GraphicsMagick_CFLAGS"
++    MAGICK_LIBS="$GraphicsMagick_LIBS"
++    if test $found -eq 0
++    then
++        static_lib="libMagick.a"
++        PKG_CHECK_MODULES(ImageMagick, ImageMagick, [found=1], [found=0])
++        MAGICK_CFLAGS="$ImageMagick_CFLAGS"
++        MAGICK_LIBS="$ImageMagick_LIBS"
++    fi
++    if test $found -eq 1
++    then
++	CFLAGS="$CFLAGS $MAGICK_CFLAGS"
++dnl UNIQUIFY will remove duplicate library tokens leaving the last instance.
++	AC_UTILS_UNIQUIFY([$LIBS $MAGICK_LIBS], LIBS)
++	FMT_LIBS="$FMT_LIBS $static_lib"
++	AC_DEFINE(HAVE_LIBMAGICK, 1, [Define to 1 if you have the ImageMagick libraries])
++        have_magick='yes'
++dnl legacy checks installations without pkg-config
++    else
++    AS_MESSAGE([checking for ImageMagick support (no pkg-config) ......])
+     AC_CHECK_PROG(HAVE_MC, Magick-config, yes, no)
+ 
+     failed=0;
+@@ -866,6 +888,7 @@
+   fi
+ fi
+ fi
++fi
+ 
+ AC_LANG([C++])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int a = true;]])],
+--- dx-4.4.4.orig/src/exec/dxmods/Makefile.am
++++ dx-4.4.4/src/exec/dxmods/Makefile.am
+@@ -113,4 +113,5 @@
+ 	$(SOURCES6) \
+ 	$(SOURCES7)
+ 
++libDXMODS_la_LIBADD = @MAGICK_LIBS@
+ @LOCALMAKE@
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-null.patch b/sci-visualization/opendx/files/opendx-4.4.4-null.patch
new file mode 100644
index 000000000000..5d3022a3a9d1
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-null.patch
@@ -0,0 +1,14 @@
+diff -up dx-4.4.4/src/exec/libdx/xwindow.c.null dx-4.4.4/src/exec/libdx/xwindow.c
+--- dx-4.4.4/src/exec/libdx/xwindow.c.null	2000-06-12 07:45:40.000000000 +0200
++++ dx-4.4.4/src/exec/libdx/xwindow.c	2009-11-08 15:10:13.000000000 +0100
+@@ -29,7 +29,9 @@ Error
+ DXRegisterWindowHandlerWithCheckProc(Error (*proc) (int, Pointer),
+ 		int (*check)(int, Pointer), Display *d, Pointer arg)
+ {
+-    int fd = ConnectionNumber(d);
++    int fd;
++    if (d) fd = ConnectionNumber(d);
++    else return ERROR;
+ 
+     if (! DXRegisterInputHandlerWithCheckProc(proc, check, fd, arg))
+ 	return ERROR;
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-open.patch b/sci-visualization/opendx/files/opendx-4.4.4-open.patch
new file mode 100644
index 000000000000..b62ebd094be7
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-open.patch
@@ -0,0 +1,34 @@
+diff -up dx-4.4.4/src/exec/libdx/fileio.c.open dx-4.4.4/src/exec/libdx/fileio.c
+--- dx-4.4.4/src/exec/libdx/fileio.c.open	2006-01-05 23:55:47.000000000 +0100
++++ dx-4.4.4/src/exec/libdx/fileio.c	2008-09-24 19:16:30.000000000 +0200
+@@ -263,7 +263,7 @@ Error _dxffile_open(char *name, int rw)
+ 	case 2:/* read/write */
+ 		fd = open(name, O_RDWR);
+ 		if (fd < 0) {
+-			fd = open(name, O_WRONLY | O_CREAT);
++			fd = open(name, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
+ 			if (fd < 0) {
+ 				DXSetError(ERROR_DATA_INVALID, 
+ 				"can't open/create file '%s'", name);
+diff -up dx-4.4.4/src/exec/libdx/plock.c.open dx-4.4.4/src/exec/libdx/plock.c
+--- dx-4.4.4/src/exec/libdx/plock.c.open	2002-07-17 06:48:18.000000000 +0200
++++ dx-4.4.4/src/exec/libdx/plock.c	2008-09-24 19:16:30.000000000 +0200
+@@ -37,7 +37,8 @@ struct seminfo *__buf;      /* buffer fo
+ 
+ #define SEM_FLAGS  	 (IPC_CREAT | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
+ #define SHM_FLAGS  	 (IPC_CREAT | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
+-#define OPEN_FLAGS 	 (O_CREAT | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
++#define OPEN_FLAGS	 (O_CREAT)
++#define OPEN_MODE 	 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
+ #define IS_MINE(a)	 (locks->_owner[a] == getpid())
+ #define SET_OWNER(a)	 (locks->_owner[a] = getpid())
+ #define CLEAR_OWNER(a)	 (locks->_owner[a] = 0)
+@@ -268,7 +269,7 @@ PLockInit()
+ 
+     if (stat(LOCKFILE, &statbuf))
+     {
+-        int fd = open(LOCKFILE, OPEN_FLAGS);
++        int fd = open(LOCKFILE, OPEN_FLAGS, OPEN_MODE);
+ 	if (fd < 0)
+ 	{
+ 	    fprintf(stderr, "initLocks: error accessing locks shared block: open\n");
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-szip.patch b/sci-visualization/opendx/files/opendx-4.4.4-szip.patch
new file mode 100644
index 000000000000..488379b4f1b6
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-szip.patch
@@ -0,0 +1,55 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -148,6 +148,12 @@ AC_ARG_WITH(netcdf,
+ 	      [with_netcdf=$withval],
+ 	      [with_netcdf='yes'])
+ 
++# Enable szip.
++AC_ARG_WITH(szlib,
++	      [  --with-szlib            Use szlib library for external szlib I/O (default is yes)],
++	      [with_szlib=$withval],
++	      [with_szlib='yes'])
++
+ # Enable 64-bit arenas, if supported
+ AC_ARG_WITH(large-arenas,
+               [  --with-large-arenas     enable 64-bit arenas, when available (default is no)],
+@@ -790,6 +796,39 @@ fi
+ 
+ 
+ #
++# Check for szlib
++#
++have_szlib='no'
++LIB_SZLIB=''
++if test "$with_szlib" != 'no'
++then
++    AS_MESSAGE([checking for szlib ......])
++    failed=0;
++    passed=0;
++    AC_CHECK_HEADERS(szlib.h, passed=`expr $passed + 1`,failed=`expr $failed + 1`)
++    AC_CHECK_LIB(sz, SZ_BufftoBuffCompress,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
++    AC_MSG_CHECKING(if szlib package is complete)
++    if test $passed -gt 0
++    then
++    if test $failed -gt 0
++    then
++	AC_MSG_RESULT(no -- some components failed test)
++        have_szlib='no (failed tests)'
++    else
++	LIB_SZLIB='-lsz'
++	LIBS="$LIB_SZLIB $LIBS"
++	FMT_LIBS="$FMT_LIBS libsz.a"
++	AC_DEFINE(HAVE_LIBSZIP, 1, [Define to 1 if you have the SZLIB libraries])
++	AC_MSG_RESULT(yes)
++        have_szlib='yes'
++    fi
++    else
++        AC_MSG_RESULT(no)
++    fi
++fi
++
++
++#
+ # Check for IMAGEMAGICK
+ #
+ have_magick='no'
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-xdg.patch b/sci-visualization/opendx/files/opendx-4.4.4-xdg.patch
new file mode 100644
index 000000000000..018dcd644b87
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-xdg.patch
@@ -0,0 +1,26 @@
+diff -up bin/url_handler.sh.orig bin/url_handler.sh
+--- a/bin/url_handler.sh
++++ b/bin/url_handler.sh
+@@ -27,21 +27,7 @@ case $method in
+ 	mailto)	mutt `echo "$url" | sed 's;^[^:]*:\(.*\);\1;'`
+ 		;;
+ 
+-        *)      use_xbrowser=n
+-		case "$DISPLAY" in
+-                   :0)       use_xbrowser=y
+-                             ;;
+-                   :0.*)     use_xbrowser=y
+-                             ;;
+-                   unix:0.*) use_xbrowser=y
+-                             ;;
+-                esac
+-		if [ $use_xbrowser = n ]; then
+-			lynx "$url" 
+-		else
+-			netscape -remote "openURL($url)" 2> /dev/null || \
+-			(netscape "$url" &)
+-                fi
++        *) xdg-open "$url"
+ 		;;
+ esac
+ 
diff --git a/sci-visualization/opendx/metadata.xml b/sci-visualization/opendx/metadata.xml
new file mode 100644
index 000000000000..6d247e3f3a3d
--- /dev/null
+++ b/sci-visualization/opendx/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
+<longdescription lang="en">
+  The Open Data Explorer brings together dynamic computational
+  and rendering tools in a dynamic, programmable framework that
+  enables users to rapidly create visualizations of highly complex
+  data from disparate sources.
+     
+  Data Explorer can be used to add visualization capabilities to
+  existing applications. It is used by companies and institutions for
+  applications in a large variety of visualization fields including
+  computational fluid dynamics, medical imagery, computational
+  chemistry, and engineering analysis.
+</longdescription>
+<use>
+  <flag name="cdf">Add support for <pkg>sci-libs/cdf</pkg> data exchange
+    format</flag>
+  <flag name="hdf">Add support for the Hierarchical Data Format
+    (<pkg>sci-libs/hdf</pkg>)</flag>
+</use>
+</pkgmetadata>
diff --git a/sci-visualization/opendx/opendx-4.4.4-r5.ebuild b/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
new file mode 100644
index 000000000000..cd523aace726
--- /dev/null
+++ b/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+MYP=dx-${PV}
+inherit eutils flag-o-matic autotools multilib
+
+DESCRIPTION="3D data visualization tool"
+HOMEPAGE="http://www.opendx.org/"
+SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz"
+
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="hdf cdf netcdf tiff imagemagick szip smp"
+
+RDEPEND="x11-libs/libXmu
+	x11-libs/libXi
+	x11-libs/libXp
+	x11-libs/libXpm
+	>=x11-libs/motif-2.3:0
+	virtual/opengl
+	virtual/glu
+	szip? ( virtual/szip )
+	hdf? ( sci-libs/hdf )
+	cdf? ( sci-libs/cdf )
+	netcdf? ( sci-libs/netcdf )
+	tiff? ( media-libs/tiff )
+	imagemagick? ( virtual/imagemagick-tools )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-4.3.2-sys.h.patch"
+	epatch "${FILESDIR}/${P}-installpaths.patch"
+	epatch "${FILESDIR}/${P}-xdg.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+	epatch "${FILESDIR}/${P}-dx-errno.patch"
+	epatch "${FILESDIR}/${P}-libtool.patch"
+	epatch "${FILESDIR}/${P}-concurrent-make-fix.patch"
+	epatch "${FILESDIR}/${P}-open.patch"
+	epatch "${FILESDIR}/${P}-szip.patch"
+	epatch "${FILESDIR}/${P}-null.patch"
+	epatch "${FILESDIR}/${P}-magick.patch"
+	eautoreconf
+}
+
+src_configure() {
+	# check flag filtering
+	# with gcc 3.3.2 I had an infinite loop on src/exec/libdx/zclipQ.c
+	append-flags -fno-strength-reduce
+
+	# (#82672)
+	filter-flags -finline-functions
+	replace-flags -O3 -O2
+
+	# opendx uses this variable
+	unset ARCH
+
+	# javadx is currently broken. we may try to fix it someday.
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--with-x \
+		--without-javadx \
+		$(use_with szip szlib) \
+		$(use_with cdf) \
+		$(use_with netcdf) \
+		$(use_with hdf) \
+		$(use_with tiff) \
+		$(use_with imagemagick magick) \
+		$(use_enable smp smp-linux)
+}
+
+src_install() {
+	default
+	newicon src/uipp/ui/icon50.xpm ${PN}.xpm
+	make_desktop_entry dx "Open Data Explorer"
+}
diff --git a/sci-visualization/opendx/opendx-4.4.4-r6.ebuild b/sci-visualization/opendx/opendx-4.4.4-r6.ebuild
new file mode 100644
index 000000000000..2aae53cbc9d5
--- /dev/null
+++ b/sci-visualization/opendx/opendx-4.4.4-r6.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MYP=dx-${PV}
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="3D data visualization tool"
+HOMEPAGE="http://www.opendx.org/"
+SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz
+	https://dev.gentoo.org/~soap/distfiles/${PN}-4.4.4_p20160917-fix-c++14.patch.bz2"
+
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="hdf cdf netcdf tiff imagemagick szip smp"
+
+RDEPEND="x11-libs/libXmu
+	x11-libs/libXi
+	x11-libs/libXp
+	x11-libs/libXpm
+	>=x11-libs/motif-2.3:0
+	virtual/opengl
+	virtual/glu
+	szip? ( virtual/szip )
+	hdf? ( sci-libs/hdf )
+	cdf? ( sci-libs/cdf )
+	netcdf? ( sci-libs/netcdf )
+	tiff? ( media-libs/tiff:0 )
+	imagemagick? ( virtual/imagemagick-tools )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MYP}"
+PATCHES=(
+	"${FILESDIR}/${PN}-4.3.2-sys.h.patch"
+	"${FILESDIR}/${P}-installpaths.patch"
+	"${FILESDIR}/${P}-xdg.patch"
+	"${FILESDIR}/${P}-gcc43.patch"
+	"${FILESDIR}/${P}-dx-errno.patch"
+	"${FILESDIR}/${P}-libtool.patch"
+	"${FILESDIR}/${P}-concurrent-make-fix.patch"
+	"${FILESDIR}/${P}-open.patch"
+	"${FILESDIR}/${P}-szip.patch"
+	"${FILESDIR}/${P}-null.patch"
+	"${WORKDIR}/${PN}-4.4.4_p20160917-fix-c++14.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# check flag filtering
+	# with gcc 3.3.2 I had an infinite loop on src/exec/libdx/zclipQ.c
+	append-flags -fno-strength-reduce
+
+	# (#82672)
+	filter-flags -finline-functions
+	replace-flags -O3 -O2
+
+	# opendx uses this variable
+	unset ARCH
+
+	# javadx is currently broken. we may try to fix it someday.
+	econf \
+		--with-x \
+		--without-javadx \
+		$(use_with szip szlib) \
+		$(use_with cdf) \
+		$(use_with netcdf) \
+		$(use_with hdf) \
+		$(use_with tiff) \
+		$(use_with imagemagick magick) \
+		$(use_enable smp smp-linux)
+}
+
+src_install() {
+	default
+	newicon src/uipp/ui/icon50.xpm ${PN}.xpm
+	make_desktop_entry dx "Open Data Explorer"
+}
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
new file mode 100644
index 000000000000..9bfeb44a5191
--- /dev/null
+++ b/sci-visualization/paraview/Manifest
@@ -0,0 +1,9 @@
+AUX paraview-4.0.1-xdmf-cstring.patch 360 SHA256 4505a480b3775d20cde98f724a20c8b0dbf4f3baf6068013bf69b0e54c1f8473 SHA512 5577b7bae26959546795721d712c4e4f6a5403b35c0871040f6c74c07cd3aecd5b03e9f7a07ef49714b8adb4c7cc880385215b8742895006d2ad3dfeccc50472 WHIRLPOOL e0d0c1603ba4ca66fc05dd5049215f2c988f3452763772df35c7fd6a8cb6fa779fd4efbccd20a01f19778f7c0b1db78e0af12716137976ae7bf54923a6bc0642
+AUX paraview-5.3.0-fix_buildsystem.patch 797 SHA256 abad98f133e817605923d3595ea9e4e579810ca2c0466f6eb29e365e872d6d29 SHA512 18526dc29219fd8dbc3679920ce271977cfb153a51cf217d49ba544510da23ee02f57b3ee9450ad9ee421d272a18fecdf3bd5043225cc16d04a2b115f62ce1f0 WHIRLPOOL 61a5c9e8088bb4aa71d8e0facf944832dce5b27a216ae80bc956d62285b9d7a6033a8958166f1027d7c0a492b5ce00670f69527f86901f16f148fb74915171cb
+DIST ParaView-v5.2.0.tar.gz 47087129 SHA256 894e42ef8475bb49e4e7e64f4ee2c37c714facd18bfbb1d6de7f69676b062c96 SHA512 d46b71a03717bde164fe2b6cdcc1c478384ad0d379e203e75e69e1532f8703b4ce12f8992d39e61d09e2ad7bbf1e249fc1f00c4cdd65aabef831e0dca83485f1 WHIRLPOOL bfc63e95d899e9d7be5432f5e6b6e7a68731726b199a7dd897a4bcbe242537fa5cf2210d20ef4c725ab8af92609b0fb875078ec537577a074672776771f4fd2f
+DIST ParaView-v5.3.0.tar.gz 45173528 SHA256 046631bbf00775edc927314a3db207509666c9c6aadc7079e5159440fd2f88a0 SHA512 3dc3c2a1c27a0f0dc82fc04ce84477a26aacb329d6ea42c276c4204e39d11bc78adbc1807e1e7168aade31aa48b6d628775841b8b94b5122084eac46e358a23f WHIRLPOOL b69945d2f260a2419339bb289eaca252f018557c520c96fb64c0625e72587e2f3f159fff83b845f29d7de55f50547463cca9b7fe6d0920a2f95cb58a707930b3
+EBUILD paraview-5.2.0.ebuild 9341 SHA256 9e2e926e129d577d33dc74dd39dc1d6ae6d777bc0fc0333c5060af47d06d30df SHA512 34d36ff8075d23da52fab1ef7e97fdea9440dcc753117adc80e886ed3b687d8d29d1f6cf49b52e5b84e4d1c59cf6ecf4a12ccdf57b8dd8d031e7db42310f6336 WHIRLPOOL 0cf9915b990b103319bb24fe7e36b71b7b0071cce90b59d3338d6d1039a54938345f6ba43d5e65d3118530ce3c2d60aafa774fab461191593b9de2da7c0c1635
+EBUILD paraview-5.3.0.ebuild 9225 SHA256 8aa5d4df342ca5149da1fea0120e28b7dde2174213f59e40e318fbbfd2b9cf8a SHA512 11756984a9d9f861d4dd2a8ca9eb3950e910f568a8a9556137fc2a6e823762528abaf2519a921494de1dbd1d6f90057ebdd60562d50e6aef33b55b0e7e518fb2 WHIRLPOOL 8d4926730729124e123215990f7ebf41e26682d00e3631323cafc507c46f6efc05c39cb414b1870557d7de1084d8ebc67a3c1c917706829fafc3d4c789330f90
+MISC ChangeLog 9681 SHA256 739ff54a9818f86cd405fd881c1d09be9c2403731669e342ce1c69afcabd2d43 SHA512 58dd16305dbcf08bea6e5c024932a670f7145001a27b33225189d1db96f8687d1520747e37116ceb60330f2dcca0ec3b775eb6099431c8cc2e1fbae2f59a5953 WHIRLPOOL 57cc0d18b9c54f2fb96955af9097a6835f3f34b16bffc3199a7a6093ef10ef870a5bb7fed19e2c9df157a3d095093ff5c797156db8f296ce85e874323339774c
+MISC ChangeLog-2015 19042 SHA256 1e2fe3a96e96ad81b607e717a70b77a8622d0d311b80751c74256789519e91d8 SHA512 37cc7a1ea90f479d32f1d703e8ab03a9fb6a6ed1a42d5906237de084283b8dc4a54ec7a8629e416beddbccf2b87d44f4be063f8936397847c9fd002c55408e97 WHIRLPOOL 1b58a32c46e9f631829c126e39cfe8a20f4ecd87aee03c792e38111592839060b2ca585c4aa22e17816bb99049ed9c80e9f86d516d8bfb9eb0d3cb3e3e9de6da
+MISC metadata.xml 748 SHA256 72450380acf2c00869d65907d7e1578aa4caf676363ee61223fa84fadaa68153 SHA512 5354c12b5448883903bca724a5d3adfc1cccf352d378317f7ab43f3e4125e2329d9477081eff7e37c8602aaba2aa6df0c73a240d409541017555920f57847d65 WHIRLPOOL 08bc77c3c38b038314bce0573d0ad7d7c4707cb3ff90d2ed2fe168f9a0c5e31eb0cb0056eaf0929256e61d4aec86f18c115ccc627ff5da20a95b2a3beb2c8902
diff --git a/sci-visualization/paraview/files/paraview-4.0.1-xdmf-cstring.patch b/sci-visualization/paraview/files/paraview-4.0.1-xdmf-cstring.patch
new file mode 100644
index 000000000000..665f40ad4fa7
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-4.0.1-xdmf-cstring.patch
@@ -0,0 +1,12 @@
+gcc header fix
+
+--- ParaView-3.98.0-src/VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfObject.h
++++ ParaView-3.98.0-src/VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfObject.h
+@@ -82,6 +82,7 @@
+ # ifdef UNIX
+ #  include "sys/file.h"
+ #  include "strings.h"
++#  include <cstring>
+ #  define STRCASECMP strcasecmp
+ #  define STRNCASECMP strncasecmp
+ #  define STRCMP strcmp
diff --git a/sci-visualization/paraview/files/paraview-5.3.0-fix_buildsystem.patch b/sci-visualization/paraview/files/paraview-5.3.0-fix_buildsystem.patch
new file mode 100644
index 000000000000..600c7d43744a
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-5.3.0-fix_buildsystem.patch
@@ -0,0 +1,24 @@
+From dcc3d775bddc270aa1a4d06f85807979ab0c8358 Mon Sep 17 00:00:00 2001
+From: Matthias Maier <tamiko@kyomu.43-1.org>
+Date: Thu, 1 Jun 2017 02:27:16 -0500
+Subject: [PATCH] fix buildsystem
+
+---
+ VTK/Utilities/Doxygen/CMakeLists.txt | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/VTK/Utilities/Doxygen/CMakeLists.txt b/VTK/Utilities/Doxygen/CMakeLists.txt
+index 3f285f6..7ebf3ee 100644
+--- a/VTK/Utilities/Doxygen/CMakeLists.txt
++++ b/VTK/Utilities/Doxygen/CMakeLists.txt
+@@ -80,7 +80,4 @@ if(NOT VTK_INSTALL_NO_DOCUMENTATION)
+   install(FILES doc_readme.txt
+     DESTINATION ${VTK_INSTALL_DOXYGEN_DIR}
+     COMPONENT Development)
+-  install(DIRECTORY ${VTK_BINARY_DIR}/Utilities/Doxygen/doc/html
+-      DESTINATION ${VTK_INSTALL_DOXYGEN_DIR}
+-      COMPONENT Development)
+ endif()
+-- 
+2.13.0
+
diff --git a/sci-visualization/paraview/metadata.xml b/sci-visualization/paraview/metadata.xml
new file mode 100644
index 000000000000..d2593b87682c
--- /dev/null
+++ b/sci-visualization/paraview/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>tamiko@gentoo.org</email>
+    <name>Matthias Maier</name>
+  </maintainer>
+  <use>
+    <flag name="boost">Enable the usage of dev-libs/boost</flag>
+    <flag name="coprocessing">Enable the coprocessing infrastructure which is mainly useful in the context of clusters</flag>
+    <flag name="cg">Add support for nvidia's cg shaders</flag>
+    <flag name="nvcontrol">Add NVCONTROL support for OpenGL options</flag>
+    <flag name="plugins">Build and install additional plugins</flag>
+    <flag name="development">Install development files including headers</flag>
+  </use>
+</pkgmetadata>
diff --git a/sci-visualization/paraview/paraview-5.2.0.ebuild b/sci-visualization/paraview/paraview-5.2.0.ebuild
new file mode 100644
index 000000000000..e699e91e48cb
--- /dev/null
+++ b/sci-visualization/paraview/paraview-5.2.0.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils cmake-utils multilib python-single-r1 toolchain-funcs versionator
+
+MAIN_PV=$(get_major_version)
+MAJOR_PV=$(get_version_component_range 1-2)
+MY_P="ParaView-v${PV}"
+
+DESCRIPTION="ParaView is a powerful scientific data visualization application"
+HOMEPAGE="http://www.paraview.org"
+SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="paraview GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp plugins python +qt5 sqlite tcl test tk"
+RESTRICT="test"
+
+REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} )
+	mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/jsoncpp
+	dev-libs/libxml2:2
+	dev-libs/protobuf
+	media-libs/freetype
+	media-libs/libpng:0
+	media-libs/libtheora
+	media-libs/tiff:0=
+	sci-libs/hdf5[mpi=]
+	>=sci-libs/netcdf-4.2[hdf5]
+	>=sci-libs/netcdf-cxx-4.2:3
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	virtual/glu
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt
+	coprocessing? (
+		plugins? (
+			dev-python/PyQt5
+			dev-qt/qtgui:5[-gles2]
+		)
+	)
+	ffmpeg? ( virtual/ffmpeg )
+	mpi? ( virtual/mpi[cxx,romio] )
+	mysql? ( virtual/mysql )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/sip[${PYTHON_USEDEP}]
+		dev-python/twisted-core
+		dev-python/zope-interface[${PYTHON_USEDEP}]
+		mpi? ( dev-python/mpi4py )
+		qt5? ( dev-python/PyQt5[opengl,webkit,${PYTHON_USEDEP}] )
+	)
+	qt5? (
+		dev-qt/designer:5
+		dev-qt/qtgui:5[-gles2]
+		dev-qt/qthelp:5
+		dev-qt/qtopengl:5[-gles2]
+		dev-qt/qtsql:5
+		dev-qt/qttest:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtx11extras:5
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	tcl? ( dev-lang/tcl:0= )
+	tk? ( dev-lang/tk:0= )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.4
+	boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] )
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+		eerror "For USE=openmp a gcc with openmp support is required"
+		eerror
+		return 1
+	fi
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
+}
+
+src_prepare() {
+
+	default
+	epatch "${PATCHES[@]}"
+
+	# lib64 fixes
+	sed -i \
+		-e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
+		 VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/CMakeLists.txt || die
+	sed -i \
+		-e "s:\/lib\/python:\/$(get_libdir)\/python:g" \
+		 VTK/ThirdParty/xdmf2/vtkxdmf2/CMake/setup_install_paths.py || die
+	sed -i \
+		-e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
+		CMakeLists.txt \
+		Plugins/SciberQuestToolKit/CMakeLists.txt \
+		ParaViewConfig.cmake.in \
+		CoProcessing/PythonCatalyst/vtkCPPythonScriptPipeline.cxx \
+		ParaViewCore/ClientServerCore/Core/vtkProcessModuleInitializePython.h \
+		ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx \
+		Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt \
+		Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt || die
+
+	# no proper switch
+	use nvcontrol || {
+		sed -i \
+			-e '/VTK_USE_NVCONTROL/s#1#0#' \
+			VTK/Rendering/OpenGL/CMakeLists.txt || die
+	}
+}
+
+src_configure() {
+	if use qt5; then
+		export QT_SELECT=qt5
+	fi
+
+	# VTK_USE_SYSTEM_QTTESTING
+	# PARAVIEW_USE_SYSTEM_AUTOBAHN
+	local mycmakeargs=(
+		-DPV_INSTALL_LIB_DIR="${PVLIBDIR}"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include
+		-DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so
+		-DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
+		-DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
+		-DBUILD_SHARED_LIBS=ON
+		-DCMAKE_COLOR_MAKEFILE=TRUE
+		-DCMAKE_USE_PTHREADS=ON
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DPARAVIEW_USE_SYSTEM_MPI4PY=ON
+		-DPROTOC_LOCATION=$(type -P protoc)
+		-DVTK_Group_StandAlone=ON
+		-DVTK_RENDERING_BACKEND=OpenGL2
+		-DVTK_USE_FFMPEG_ENCODER=OFF
+		-DVTK_USE_OFFSCREEN=TRUE
+		-DVTK_USE_SYSTEM_EXPAT=ON
+		-DVTK_USE_SYSTEM_FREETYPE=ON
+		-DVTK_USE_SYSTEM_GL2PS=OFF
+		-DVTK_USE_SYSTEM_HDF5=ON
+		-DVTK_USE_SYSTEM_JPEG=ON
+		-DVTK_USE_SYSTEM_JSONCPP=ON
+		-DVTK_USE_SYSTEM_LIBXML2=ON
+		-DVTK_USE_SYSTEM_NETCDF=ON
+		-DVTK_USE_SYSTEM_OGGTHEORA=ON
+		-DVTK_USE_SYSTEM_PNG=ON
+		-DVTK_USE_SYSTEM_PROTOBUF=ON
+		-DVTK_USE_SYSTEM_TIFF=ON
+		-DVTK_USE_SYSTEM_TWISTED=ON
+		-DVTK_USE_SYSTEM_XDMF2=OFF
+		-DVTK_USE_SYSTEM_ZLIB=ON
+		-DVTK_USE_SYSTEM_ZOPE=ON
+		# force this module due to incorrect build system deps
+		# wrt bug 460528
+		-DModule_vtkUtilitiesProcessXML=ON
+		)
+
+	# TODO: XDMF_USE_MYSQL?
+	# VTK_WRAP_JAVA
+	mycmakeargs+=(
+		$(cmake-utils_use development PARAVIEW_INSTALL_DEVELOPMENT_FILES)
+		$(cmake-utils_use qt5 PARAVIEW_BUILD_QT_GUI)
+		$(usex qt5 "-DPARAVIEW_QT_VERSION=5" "")
+		$(cmake-utils_use qt5 Module_vtkGUISupportQtOpenGL)
+		$(cmake-utils_use qt5 Module_vtkGUISupportQtSQL)
+		$(cmake-utils_use qt5 Module_vtkGUISupportQtWebkit)
+		$(cmake-utils_use qt5 Module_vtkRenderingQt)
+		$(cmake-utils_use qt5 Module_vtkViewsQt)
+		$(cmake-utils_use qt5 VTK_Group_ParaViewQt)
+		$(cmake-utils_use qt5 VTK_Group_Qt)
+		$(cmake-utils_use !qt5 PQWIDGETS_DISABLE_QTWEBKIT)
+		$(cmake-utils_use boost Module_vtkInfovisBoost)
+		$(cmake-utils_use boost Module_vtkInfovisBoostGraphAlg)
+		$(cmake-utils_use mpi PARAVIEW_USE_MPI)
+		$(cmake-utils_use mpi PARAVIEW_USE_MPI_SSEND)
+		$(cmake-utils_use mpi PARAVIEW_USE_ICE_T)
+		$(cmake-utils_use mpi VTK_Group_MPI)
+		$(cmake-utils_use mpi VTK_XDMF_USE_MPI)
+		$(cmake-utils_use mpi XDMF_BUILD_MPI)
+		$(cmake-utils_use python PARAVIEW_ENABLE_PYTHON)
+		$(cmake-utils_use python VTK_Group_ParaViewPython)
+		$(cmake-utils_use python XDMF_WRAP_PYTHON)
+		$(cmake-utils_use python Module_vtkPython)
+		$(cmake-utils_use python Module_pqPython)
+		$(cmake-utils_use python Module_vtkWrappingPythonCore)
+		$(cmake-utils_use python Module_vtkPVPythonSupport)
+		$(cmake-utils_use python Module_AutobahnPython)
+		$(cmake-utils_use python Module_Twisted)
+		$(cmake-utils_use python Module_ZopeInterface)
+		$(cmake-utils_use python Module_vtkmpi4py)
+		$(usex qt5 "$(cmake-utils_use python Module_pqPython)" "-DModule_pqPython=OFF")
+		$(cmake-utils_use doc BUILD_DOCUMENTATION)
+		$(cmake-utils_use doc PARAVIEW_BUILD_WEB_DOCUMENTATION)
+		$(cmake-utils_use examples BUILD_EXAMPLES)
+		$(cmake-utils_use cg VTK_USE_CG_SHADERS)
+		$(cmake-utils_use mysql Module_vtkIOMySQL)
+		$(cmake-utils_use sqlite Module_vtksqlite)
+		$(cmake-utils_use coprocessing PARAVIEW_ENABLE_CATALYST)
+		$(cmake-utils_use ffmpeg PARAVIEW_ENABLE_FFMPEG)
+		$(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER)
+		$(cmake-utils_use ffmpeg Module_vtkIOFFMPEG)
+		$(cmake-utils_use tk VTK_Group_Tk)
+		$(cmake-utils_use tk VTK_USE_TK)
+		$(cmake-utils_use tk Module_vtkRenderingTk)
+		$(cmake-utils_use tcl Module_vtkTclTk)
+		$(cmake-utils_use tcl Module_vtkWrappingTcl)
+		$(cmake-utils_use test BUILD_TESTING)
+		)
+
+	if use openmp; then
+		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
+	fi
+
+	if use qt5 ; then
+		mycmakeargs+=( -DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer )
+		if use python ; then
+			# paraview cannot guess sip directory properly
+			mycmakeargs+=( -DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)" )
+		fi
+	fi
+
+	# TODO: MantaView VaporPlugin VRPlugin
+	mycmakeargs+=(
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AdiosReader)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ArrowGlyph)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_EyeDomeLighting)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ForceTime)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_GMVReader)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader)
+		$(cmake-utils_use plugins RAVIEW_BUILD_PLUGIN_MobileRemoteControl)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_NonOrthogonalSource)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PacMan)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PointSprite)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PrismPlugin)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_QuadView)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SLACTools)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SciberQuestToolKit)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SierraPlotTools)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_StreamingParticles)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SurfaceLIC)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_UncertaintyRendering)
+		# these are always needed for plugins
+		$(cmake-utils_use plugins Module_vtkFiltersFlowPaths)
+		$(cmake-utils_use plugins Module_vtkPVServerManagerApplication)
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# set up the environment
+	echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN}
+
+	newicon "${S}"/Applications/ParaView/pvIcon-32x32.png paraview.png
+	make_desktop_entry paraview "Paraview" paraview
+
+	use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
+}
diff --git a/sci-visualization/paraview/paraview-5.3.0.ebuild b/sci-visualization/paraview/paraview-5.3.0.ebuild
new file mode 100644
index 000000000000..221ba8da9255
--- /dev/null
+++ b/sci-visualization/paraview/paraview-5.3.0.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils cmake-utils multilib python-single-r1 toolchain-funcs versionator
+
+MAIN_PV=$(get_major_version)
+MAJOR_PV=$(get_version_component_range 1-2)
+MY_P="ParaView-v${PV}"
+
+DESCRIPTION="ParaView is a powerful scientific data visualization application"
+HOMEPAGE="http://www.paraview.org"
+SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="paraview GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp plugins python +qt5 sqlite tcl test tk"
+RESTRICT="test"
+
+REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} )
+	mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/jsoncpp
+	dev-libs/libxml2:2
+	dev-libs/protobuf
+	media-libs/freetype
+	media-libs/libpng:0
+	media-libs/libtheora
+	media-libs/tiff:0=
+	sci-libs/hdf5[mpi=]
+	>=sci-libs/netcdf-4.2[hdf5]
+	>=sci-libs/netcdf-cxx-4.2:3
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	virtual/glu
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt
+	coprocessing? (
+		plugins? (
+			dev-python/PyQt5
+			dev-qt/qtgui:5[-gles2]
+		)
+	)
+	ffmpeg? ( virtual/ffmpeg )
+	mpi? ( virtual/mpi[cxx,romio] )
+	mysql? ( virtual/mysql )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/sip[${PYTHON_USEDEP}]
+		dev-python/twisted-core
+		dev-python/zope-interface[${PYTHON_USEDEP}]
+		mpi? ( dev-python/mpi4py )
+		qt5? ( dev-python/PyQt5[opengl,webkit,${PYTHON_USEDEP}] )
+	)
+	qt5? (
+		dev-qt/designer:5
+		dev-qt/qtgui:5[-gles2]
+		dev-qt/qthelp:5
+		dev-qt/qtopengl:5[-gles2]
+		dev-qt/qtsql:5
+		dev-qt/qttest:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtx11extras:5
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	tcl? ( dev-lang/tcl:0= )
+	tk? ( dev-lang/tk:0= )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.4
+	boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] )
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
+	"${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+		eerror "For USE=openmp a gcc with openmp support is required"
+		eerror
+		return 1
+	fi
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
+}
+
+src_prepare() {
+
+	default
+	epatch "${PATCHES[@]}"
+
+	# lib64 fixes
+	sed -i \
+		-e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
+		 VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/CMakeLists.txt || die
+	sed -i \
+		-e "s:\/lib\/python:\/$(get_libdir)\/python:g" \
+		 VTK/ThirdParty/xdmf2/vtkxdmf2/CMake/setup_install_paths.py || die
+	sed -i \
+		-e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
+		CMakeLists.txt \
+		ParaViewConfig.cmake.in \
+		CoProcessing/PythonCatalyst/vtkCPPythonScriptPipeline.cxx \
+		ParaViewCore/ClientServerCore/Core/vtkProcessModuleInitializePython.h \
+		ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx || die
+
+	# no proper switch
+	use nvcontrol || {
+		sed -i \
+			-e '/VTK_USE_NVCONTROL/s#1#0#' \
+			VTK/Rendering/OpenGL/CMakeLists.txt || die
+	}
+}
+
+src_configure() {
+	if use qt5; then
+		export QT_SELECT=qt5
+	fi
+
+	# VTK_USE_SYSTEM_QTTESTING
+	# PARAVIEW_USE_SYSTEM_AUTOBAHN
+	local mycmakeargs=(
+		-DPV_INSTALL_LIB_DIR="${PVLIBDIR}"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include
+		-DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so
+		-DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
+		-DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
+		-DBUILD_SHARED_LIBS=ON
+		-DCMAKE_COLOR_MAKEFILE=TRUE
+		-DCMAKE_USE_PTHREADS=ON
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DPARAVIEW_USE_SYSTEM_MPI4PY=ON
+		-DPROTOC_LOCATION=$(type -P protoc)
+		-DVTK_Group_StandAlone=ON
+		-DVTK_RENDERING_BACKEND=OpenGL2
+		-DVTK_USE_FFMPEG_ENCODER=OFF
+		-DVTK_USE_OFFSCREEN=TRUE
+		-DVTK_USE_SYSTEM_EXPAT=ON
+		-DVTK_USE_SYSTEM_FREETYPE=ON
+		-DVTK_USE_SYSTEM_GL2PS=OFF
+		-DVTK_USE_SYSTEM_HDF5=ON
+		-DVTK_USE_SYSTEM_JPEG=ON
+		-DVTK_USE_SYSTEM_JSONCPP=ON
+		-DVTK_USE_SYSTEM_LIBXML2=ON
+		-DVTK_USE_SYSTEM_NETCDF=ON
+		-DVTK_USE_SYSTEM_OGGTHEORA=ON
+		-DVTK_USE_SYSTEM_PNG=ON
+		-DVTK_USE_SYSTEM_PROTOBUF=ON
+		-DVTK_USE_SYSTEM_TIFF=ON
+		-DVTK_USE_SYSTEM_TWISTED=ON
+		-DVTK_USE_SYSTEM_XDMF2=OFF
+		-DVTK_USE_SYSTEM_ZLIB=ON
+		-DVTK_USE_SYSTEM_ZOPE=ON
+		# force this module due to incorrect build system deps
+		# wrt bug 460528
+		-DModule_vtkUtilitiesProcessXML=ON
+		)
+
+	# TODO: XDMF_USE_MYSQL?
+	# VTK_WRAP_JAVA
+	mycmakeargs+=(
+		$(cmake-utils_use development PARAVIEW_INSTALL_DEVELOPMENT_FILES)
+		$(cmake-utils_use qt5 PARAVIEW_BUILD_QT_GUI)
+		$(usex qt5 "-DPARAVIEW_QT_VERSION=5" "")
+		$(cmake-utils_use qt5 Module_vtkGUISupportQtOpenGL)
+		$(cmake-utils_use qt5 Module_vtkGUISupportQtSQL)
+		$(cmake-utils_use qt5 Module_vtkGUISupportQtWebkit)
+		$(cmake-utils_use qt5 Module_vtkRenderingQt)
+		$(cmake-utils_use qt5 Module_vtkViewsQt)
+		$(cmake-utils_use qt5 VTK_Group_ParaViewQt)
+		$(cmake-utils_use qt5 VTK_Group_Qt)
+		$(cmake-utils_use !qt5 PQWIDGETS_DISABLE_QTWEBKIT)
+		$(cmake-utils_use boost Module_vtkInfovisBoost)
+		$(cmake-utils_use boost Module_vtkInfovisBoostGraphAlg)
+		$(cmake-utils_use mpi PARAVIEW_USE_MPI)
+		$(cmake-utils_use mpi PARAVIEW_USE_MPI_SSEND)
+		$(cmake-utils_use mpi PARAVIEW_USE_ICE_T)
+		$(cmake-utils_use mpi VTK_Group_MPI)
+		$(cmake-utils_use mpi VTK_XDMF_USE_MPI)
+		$(cmake-utils_use mpi XDMF_BUILD_MPI)
+		$(cmake-utils_use python PARAVIEW_ENABLE_PYTHON)
+		$(cmake-utils_use python VTK_Group_ParaViewPython)
+		$(cmake-utils_use python XDMF_WRAP_PYTHON)
+		$(cmake-utils_use python Module_vtkPython)
+		$(cmake-utils_use python Module_pqPython)
+		$(cmake-utils_use python Module_vtkWrappingPythonCore)
+		$(cmake-utils_use python Module_vtkPVPythonSupport)
+		$(cmake-utils_use python Module_AutobahnPython)
+		$(cmake-utils_use python Module_Twisted)
+		$(cmake-utils_use python Module_ZopeInterface)
+		$(cmake-utils_use python Module_vtkmpi4py)
+		$(usex qt5 "$(cmake-utils_use python Module_pqPython)" "-DModule_pqPython=OFF")
+		$(cmake-utils_use doc BUILD_DOCUMENTATION)
+		$(cmake-utils_use doc PARAVIEW_BUILD_WEB_DOCUMENTATION)
+		$(cmake-utils_use examples BUILD_EXAMPLES)
+		$(cmake-utils_use cg VTK_USE_CG_SHADERS)
+		$(cmake-utils_use mysql Module_vtkIOMySQL)
+		$(cmake-utils_use sqlite Module_vtksqlite)
+		$(cmake-utils_use coprocessing PARAVIEW_ENABLE_CATALYST)
+		$(cmake-utils_use ffmpeg PARAVIEW_ENABLE_FFMPEG)
+		$(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER)
+		$(cmake-utils_use ffmpeg Module_vtkIOFFMPEG)
+		$(cmake-utils_use tk VTK_Group_Tk)
+		$(cmake-utils_use tk VTK_USE_TK)
+		$(cmake-utils_use tk Module_vtkRenderingTk)
+		$(cmake-utils_use tcl Module_vtkTclTk)
+		$(cmake-utils_use tcl Module_vtkWrappingTcl)
+		$(cmake-utils_use test BUILD_TESTING)
+		)
+
+	if use openmp; then
+		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
+	fi
+
+	if use qt5 ; then
+		mycmakeargs+=( -DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer )
+		if use python ; then
+			# paraview cannot guess sip directory properly
+			mycmakeargs+=( -DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)" )
+		fi
+	fi
+
+	# TODO: MantaView VaporPlugin VRPlugin
+	mycmakeargs+=(
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AdiosReader)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ArrowGlyph)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_EyeDomeLighting)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ForceTime)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_GMVReader)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader)
+		$(cmake-utils_use plugins RAVIEW_BUILD_PLUGIN_MobileRemoteControl)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_NonOrthogonalSource)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PacMan)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PointSprite)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PrismPlugin)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_QuadView)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SLACTools)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SciberQuestToolKit)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SierraPlotTools)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_StreamingParticles)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SurfaceLIC)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_UncertaintyRendering)
+		# these are always needed for plugins
+		$(cmake-utils_use plugins Module_vtkFiltersFlowPaths)
+		$(cmake-utils_use plugins Module_vtkPVServerManagerApplication)
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# set up the environment
+	echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN}
+
+	newicon "${S}"/Applications/ParaView/pvIcon-32x32.png paraview.png
+	make_desktop_entry paraview "Paraview" paraview
+
+	use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
+}
diff --git a/sci-visualization/pythonprop/Manifest b/sci-visualization/pythonprop/Manifest
new file mode 100644
index 000000000000..8fd246bd1d74
--- /dev/null
+++ b/sci-visualization/pythonprop/Manifest
@@ -0,0 +1,7 @@
+DIST pythonprop-0.13.tar.gz 217721 SHA256 c89aa97876755679ccb2fa9baf7b1d20dc7a36f4b8aa4aa35cbf338e7370cbf5 SHA512 b637f48369c926c8dd680a433d46236dc4fa70be79b2325d8f82e320b2d75b1e6d7d992bd81022d27fb6ab118d92178c7ad5ad94f6011a396e4a28d7431bbf2b WHIRLPOOL b6e43058d0495cf54cc7b0f3755531ac06b6c196adc6b76ac1ccd0e60a4b46be477c06d6c480d6822ba75d8da1594c9d727996d52cf4ef80daecaa6df1bd5ec4
+DIST pythonprop-0.18.tar.gz 1158035 SHA256 51689ce55a73ad4568c34ea882ce0e1dcae9364aa9628804256b31d33163f048 SHA512 2ca796f215e5aab33bee7dd161358c3065b464587597363dee9f03758cf666cca1b70f5b83e8ac266e21f77b806711cb6f48a1d7c3cd0b97f1461e897f5f9f80 WHIRLPOOL 43dfd007fb6f43308e8c29159bd3ffa9ab498c7b4cfe3ff02634df78da5484bf77f4f6d30323e6f866266f36a6358e32259f9f9946ed97ed0208232fe196c608
+EBUILD pythonprop-0.13.ebuild 593 SHA256 8c00aa255209fdc932b1f2db626abb1efaa1a2a2bb445bb8c7ba0b6e33bc4bdd SHA512 d9d38cd3e60fbff6adf61d8d6a04253ecb0ae11e56e65da29f5652b0c63ad5e49a3453ea66b98b0c859a01977041e688a1ad77d103ff8d4f3e46403506ec4883 WHIRLPOOL 3025e32494298ad81b5d78f30211526c893e946a79c762dd31bec37507becf41c6ab6c2355ba259527ce7319789b56287889384fbcdfa4977b5e5c53b215d3c2
+EBUILD pythonprop-0.18.ebuild 875 SHA256 b43c5b58e3167e3b9d07caa67f766c494742beb181e1221bebf02c970e8e1de2 SHA512 afb6b3a775918bbd8d77b72cee642ab972fcc2660b19ec763f74ecd71d636d209152b263b162086928ddd3cbdaee265fbaaf1f34bd80d84f97075a2c06ccd3aa WHIRLPOOL 6308cee7f23d0581e5309f226adc4c82785b69138da3554addd7bb3cf8f3b71cced7bd9c804b44fd24967cdb4a6ed9a0b9066a2db752c5fcce143d27b56e2b97
+MISC ChangeLog 2973 SHA256 c66260af20572e753476148a567b955d7655a82a80c62a7356a1651b66e55c59 SHA512 e1a398d2b25dce683dbfe65e23eff06efe1e3b9e6a415ae7eafabe3e5ec7b70831a7c245d16462836ef7c6d5379af57a63929dfd3d8d75f4bcaca9d9b480c541 WHIRLPOOL 4ec23c869f3604637cb46f4110572b3ab5ca27bde049fa011b2a21bcc59d680f3f6728b361d26eb6803e7bf9b8d887c68f52ba4a6fb3c2de68a922eff7886c65
+MISC ChangeLog-2015 814 SHA256 3f28f76a56fb8a4c7e14bac9c55214e366b538a75a39ab3ea4dc19088127f301 SHA512 26016e523fbcb319d10c711d89ce9c14f8d96cb46beb8e07cad1f9597104393be71288a0ffc084bd5ddb9a88d6a743b560edd83187923552be2ff5652d0b89b4 WHIRLPOOL 99f67c19d165f9a041700c0902496d986b591b92f44b4761a93fb211de9fcfaaf009cfa8c6c34e24bc9691e6eade423d5ed6ae18a8952afaaeaa6e021f759213
+MISC metadata.xml 459 SHA256 17a88be299c49df1ddd7def5dc8930ef492231e2e952dce9c9eeb9617d28a758 SHA512 23f2836015bd753b0a4957be9efa3347d2f5c6b79ec041465120aa9e8e6565397ba343ea8a393273eaab3c146b8555914b4a1e8bba2a0c4596bc49833388e8f1 WHIRLPOOL 97c5aac548659e6a1c93e80748d765da08b93429835819aee50634a25e9ebf6da088e485a203d92b9da9a5dd31e07a2bb6856599f389f912220371b7b37b9678
diff --git a/sci-visualization/pythonprop/metadata.xml b/sci-visualization/pythonprop/metadata.xml
new file mode 100644
index 000000000000..e2d993b004b1
--- /dev/null
+++ b/sci-visualization/pythonprop/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tomjbe@gentoo.org</email>
+		<name>Thomas Beierlein</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci-electronics@gentoo.org</email>
+		<name>Gentoo Electronics Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pythonprop</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-visualization/pythonprop/pythonprop-0.13.ebuild b/sci-visualization/pythonprop/pythonprop-0.13.ebuild
new file mode 100644
index 000000000000..b5063be83fa5
--- /dev/null
+++ b/sci-visualization/pythonprop/pythonprop-0.13.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Scripts to prepare and plot VOACAP propagation predictions"
+HOMEPAGE="http://www.qsl.net/hz1jw/pythonprop"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/matplotlib[gtk2,${PYTHON_USEDEP}]
+	dev-python/basemap[${PYTHON_USEDEP}]
+	sci-electronics/voacapl
+"
+DEPEND="${RDEPEND}"
diff --git a/sci-visualization/pythonprop/pythonprop-0.18.ebuild b/sci-visualization/pythonprop/pythonprop-0.18.ebuild
new file mode 100644
index 000000000000..96d40ecb22de
--- /dev/null
+++ b/sci-visualization/pythonprop/pythonprop-0.18.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Scripts to prepare and plot VOACAP propagation predictions"
+HOMEPAGE="http://www.qsl.net/hz1jw/pythonprop"
+SRC_URI="http://www.qsl.net/h/hz1jw/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/basemap[${PYTHON_USEDEP}]
+	sci-electronics/voacapl
+"
+DEPEND="${RDEPEND}
+	app-text/gnome-doc-utils
+	app-text/rarian
+"
+
+src_prepare() {
+	# do not call update_destop_database here
+	sed -ie "s/UPDATE_DESKTOP = /UPDATE_DESKTOP = # /g" data/Makefile.in || die
+	# fix Desktop Entry
+	sed -ie "s/HamRadio/HamRadio;/g" data/voacapgui.desktop.in || die
+}
diff --git a/sci-visualization/pyxplot/Manifest b/sci-visualization/pyxplot/Manifest
new file mode 100644
index 000000000000..e69881e99a3c
--- /dev/null
+++ b/sci-visualization/pyxplot/Manifest
@@ -0,0 +1,5 @@
+DIST pyxplot_0.9.2.tar.gz 4131841 SHA256 1c592a0bc77caec445a8d72534471c01d66ca1806309e6c983847c2e0b95e689 SHA512 34c43fec36dd579161c7adb9f0bab012c5d3e59c904526f82a70a31685b88a231c300ab4dbdff376b29fdd5698c376d55f7a2f2786d7960c4de7e6e0776fa844 WHIRLPOOL f380489231f01ad81f983bb7fe11fb0323ca3d5dedeb60c84739e122c567e3581bb04962ecf83f21751d49a773d129b2b332b0aed4e9192ec064b5ee14714881
+EBUILD pyxplot-0.9.2-r1.ebuild 948 SHA256 1d58bf7816420be82f0008550c050e36ecd97097c265e42d75b88ef9c5f36355 SHA512 c00ed18ff4a4e28754ed15b447b6edfa87125924a1ef795d49ff125cf626f6b767355d0393d7c644ea0f1fbf08859e4d6990b1f64a5b52fc190aed1c681b4f47 WHIRLPOOL 5892ffe7aad34f67c674874840cd1e6a11141797d8ce7fa8515a227d48da02f25b7c8e1ba789fbe9c79fafed69ef86e331a253da9e25618e0013c5dc19e89b7a
+MISC ChangeLog 2901 SHA256 2f0d183581513c21bf3c4ee18b3994d953e8bc5296e8b2adcfc4920a3214f65f SHA512 65220c8e78551c1cc99fd33f0a9e6c332d01b1f3b732d0b496f721b5ea507ce3700a38ae999974ed5ef38f9086ec9f0ca0de45181eee4a92faa62b233c87221d WHIRLPOOL fcb9a3bbc4f3cc01b1d1ed03fa4ffd7258a995086e640f2cd7c84a86f31c0452d9e3dfbeafb0c37169eb928706726d4d2e8c2e55c112bed056c3d99c26d8bb9f
+MISC ChangeLog-2015 5158 SHA256 28676e897595f22a7b70c72cfb6a1b0940265c36e20b5cf4a42429c5457e3a6b SHA512 057ce336fb76a7bf4375beafe5a7c36cdbe69ea9dbe5e9f32b1edeaaaf0f6317e73a441657428c6cd99a5964321526db2d45d4177f389decc9147a9a7c927f95 WHIRLPOOL 0beffb7f77acaafb4208bf6b6ecf401239a94f5487db8d1af5a330bd4dab7b2b0ab5493d72db25ae0cc34ee4ea7a9eea6b34ff0743b523774b4e1b1ef0b91790
+MISC metadata.xml 649 SHA256 ed785663147c7ba9e46d7ee2f85a182d3023262bed0f3b7b20daf2cc42e76824 SHA512 2f9b6c06f24dccd4c954dc35cd4ac2b286ff77c5cf5794ed8ec6e20af4050c09099c84bdd75402823aed922f879b8d4340d9f6ce8763e116c0ba476853475531 WHIRLPOOL 44d7bf705367b3fefc6446cbfbb404dc33f77099c5064bc5df13192a6db314217bd3de0282e3ec62098f9496137217f526957a0cb51dfb19ed4cd5ead03022b0
diff --git a/sci-visualization/pyxplot/metadata.xml b/sci-visualization/pyxplot/metadata.xml
new file mode 100644
index 000000000000..ca88d83c110e
--- /dev/null
+++ b/sci-visualization/pyxplot/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  PyXPlot is a command-line graphing package with a simple interface
+  that produces publication-quality output. Its command line interface is very
+  gnuplot oriented and has actually some compatibility. The output
+  is based on LaTeX typesetting environment.
+</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">pyxplot</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-visualization/pyxplot/pyxplot-0.9.2-r1.ebuild b/sci-visualization/pyxplot/pyxplot-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..614513710085
--- /dev/null
+++ b/sci-visualization/pyxplot/pyxplot-0.9.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit multilib python-single-r1
+
+DESCRIPTION="Gnuplot like graphing program publication-quality figures"
+HOMEPAGE="http://www.pyxplot.org.uk/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	app-text/gv
+	dev-libs/libxml2:2
+	media-libs/libpng:0=
+	sci-libs/cfitsio
+	sci-libs/fftw:3.0=
+	sci-libs/gsl
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/latex-base
+	virtual/imagemagick-tools
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed \
+		-e "s:/usr/local:${EPREFIX}/usr/:" \
+		-e "s:/lib/:/$(get_libdir)/:" \
+		-e "s:/doc/${PN}:/doc/${PF}:" \
+		-i Makefile.skel || die "sed Makefile.skel failed"
+	sed -i -e 's/-ltermcap//' configure || die
+}
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
new file mode 100644
index 000000000000..c69d94a37fa7
--- /dev/null
+++ b/sci-visualization/qtiplot/Manifest
@@ -0,0 +1,24 @@
+AUX qtiplot-0.9.7.10-dont-install-qwt.patch 605 SHA256 161657d37de71ea58fc0e0af3495dc45082f5c398bd82c70e40968b23d0b898b SHA512 c2ff3cac3745c0f6b15aaecd64601b0869684c850de4b431b719bf448c08e86906ca1f506fdc4c2e8da6e44ed79376f5338b0f96fd89b59f72db6159596c06b2 WHIRLPOOL a65bc19da769e3bd977825cc8c6256dfcec4fde0af5fe5ca4a1619447fd903ebf86b4c439e9899a0506d15efb53d3f29ff339fb684d045d9d5de8b67e70e4a68
+AUX qtiplot-0.9.8.6-gold.patch 535 SHA256 601bdea70053618be63f446c7c35fc991587a5ca439260d75bcb84308d116784 SHA512 fae41593f480c0d32a4a1f619d735bbd67ff3d97ae5d2e6813ef7f487fb3dac6edb99022f34ab6e725358bddef988de025d2d6261c93f9c1429dd2329649b04f WHIRLPOOL 4d0f7e48049d70f9f314397e8b3378774f134bc6ea71a89bc26a08806436798c05be65c214d33e2fff7ff415712def6466e32e24f77bfee687d7cbcb6f8d0fb5
+AUX qtiplot-0.9.8.7-kde.patch 454 SHA256 5cfe122907403ed1f766118934aa42eac05db41efabd0c6618df17af16e3aff1 SHA512 6de43a6fea8dee412b5b9b0ca8d36099167febbf86292222077cbd9bc3055808e317ad1ef4b721b76b7fdec7b26520ee5edc27407b0ac44e0e2d73256424f620 WHIRLPOOL 15a5615d9851e4a9844b0529bf3bb7d2edb4449a7276d8575b6c2cc1b6438a4c81ddaf706f51878ad0fcf19dab0f369fc5664343021039a14cec6bbab4e13df7
+AUX qtiplot-0.9.8.8-system-gl2ps.patch 2436 SHA256 0787155b465aa6cdf4b2c12a87dd68e6b5aa2197b041b06a550023c1ca96c81c SHA512 d5342962c2710048eac398b3122bbf1bbfb7360dff2aad759fa8fe111d23b761f1bcfd8597ebba996813c082d9c746ad2d4b393e00c527845ca7a684f698b4d2 WHIRLPOOL a1e0addc9746f3e0829aa15f9549deadcfeb7621de307c2ec398cacecde49f67cc0288e5afc1f24079fa69f299ab90ea6846c407cb01aef525b01b5420e1214c
+AUX qtiplot-0.9.8.9-PyQt4-4.10.patch 1089 SHA256 58f2c8e64b315dc670452ee777084bcfe8869b6175fdb9f66afc3c8218a5aee2 SHA512 6c85172fda42f0f381a7146080a92858c850d92eca0c580afe0ce384f4bf124afdc94b809af78bc6d9373a5921be5647a79d0159ae3f26daeb911a7e0bb072fb WHIRLPOOL 1852b83df00ece7ac882e712da496d39439794f879fe918a9c4504f9fde3010c0ac6e0a6c2a34e2ca205efcf42dae9869411a783bcb982b6f86f2a5bad024cb7
+AUX qtiplot-0.9.8.9-PyQt4-4.11.3.patch 1098 SHA256 cc7f66e28467d849101421eca45b0497245acb3affeca8323b66c96c7381ee48 SHA512 58268def88227cfb765873bc4b809c3f3851bf9bb09a3e3fd1b54e6158de9294226e3394968312c25cf452ddf02af9078a494e9d62149f458f5b67d21438c740 WHIRLPOOL ef8d0fa9c1ff1196dbf7b66fe6d716e462d0b524a3883e04cb820e4c3b44c7b22c0cb0f5851d62b1a5abfa101c2e7beb441f30b64a76b05597bab9c66f0134a9
+AUX qtiplot-0.9.8.9-adopt_to_alglib3.patch 3596 SHA256 5256ff47807762def7de5c00ef206c73c15d5c61c0fd1087aa6b1a7b866aca32 SHA512 7e1a1b1ce174c010c66025e3d84975d2f636924abf5f4f862d3e3a367731fb25856e017bc3fd8e6a726ce3d707143b704dafef8b272a6307b3f17747c2a35b67 WHIRLPOOL 1826c5131f59d42a70d66535b55936916e15cb6f8200e03521f762d82daf930588879eed958db8ceadcf652c3ca09a2ac029e3b1623446da1d3177cf6362aef5
+AUX qtiplot-0.9.8.9-crasher_without_internet.patch 939 SHA256 d2d51f7e560296c11501c6882d4e201c248afd9b0359670c276a33558d5953a4 SHA512 d32a0302ec508d9646b1e2c40a69329d376d9c8e859a607044e5fd9cfa6a59a5b89ff5c21c8a56c110cc0747ddf8538751f28309635c3ef97876abeae7782f4a WHIRLPOOL 424574675f53aa863fcf22c023f4c56250c1e6f345fbf181fb87a6c0eb4cffc5bf9bd8a54a97a55ef1d4d0be5872fc7464ca6de4d9b25844bf8412da8d3b5504
+AUX qtiplot-0.9.8.9-gsl-2.patch 1285 SHA256 31b4dfaabc58de6b0675d79ed77d732b0b9b595f2d8faeb15299c24c77457d3d SHA512 04c77ffb1f187bfeee813c2a1947922aec2f05cbfdd6e3a11be81924c6dcf302a365c05ceef60f9138105235c3413c5dbcb494ac18ff58da1d99ad49c9f68e84 WHIRLPOOL 8fe54c238a68276bb8d0731fd5bbac212dee2316d55b8f2e7af48e5362654441b0221cef470277f2cf205b3834f90c3958167210ebb56e53005927f86a0b4f23
+AUX qtiplot-0.9.8.9-origin-2.patch 1713 SHA256 f48441a91326dbea572d52d9e22449fc29c3e205ce90925f277a1121233a4c40 SHA512 516addaab1a21aff57dece95e424afc7df6cbc5422962aef668f991d52122d07e44b8b17b985edde3074ac8d846c8f54a6ef857a5924ae393da56852692dd64d WHIRLPOOL d9455e9acfe6030c068f5076a1308eecbfbb5810af2a911a62242f58ce0e578a1dcf2c2a2c519dab26f4110ef7916b1663cf433c6e3bdeec8324178a0bc93a09
+AUX qtiplot-0.9.8.9-private.patch 696 SHA256 3f02d460e8df60d661b26ab2b6fb8188d60c7645d35db01d4adfabdae6f2d1be SHA512 e7ae0f1b010f5d4ed69e553932f97c97f643c948795619bbf33ff8d6137a3f02dc4832b434aa28c43ba71a01c9ebd5c60642d14cb24f0c83f2cb866955cb9815 WHIRLPOOL aacf9282fe0bbe6dab535b8246f75bf241eba32eb97e0e436aeb538296121726f0808cb65ada072181160b383d4d0b2f3a705aa01a0f79f4e94868c792b9734c
+AUX qtiplot-0.9.8.9-qt48.patch 984 SHA256 e434763efdad1693dadd7c94d5871d4b5d808ceebbaf7b2acd434b9b6166eb29 SHA512 5405786c3b42626d34f3fdf7f04f186def79b0b242cb1850cf5075b020d39f601cfa961aaf21e7a9276f4c2ce12cde4cc426f5f879be8135fd4bf10f9728098b WHIRLPOOL 3c3e087efe57e542077e3901ce9741df12eafd5fa79bac0cdef2cb183fad546b6b639f8647b20ccfec045fc8d9bd7a18ea2ed9abc4f5a8fc805fe19ec8a47a4a
+AUX qtiplot-0.9.8.9-set_col_values.patch 945 SHA256 969a7158e8c8b6cbf03a6dc06620730b3c10a0d12c51c933cb4d825d64174c93 SHA512 7de22eca7cc9ac40321c450d406fffe5b76a88b34bd9ddb8fda801f7d70d67f5747ee3144eb2a14d5e30a8c31b6f27b229f96e206ebbea5b6e22494c393cd1eb WHIRLPOOL 74f41cd537ea0f49bc85001cf86ad4dbad09c22af505bc7a9a4387ccc65cad1fa2aa7f933512faaf84b5121a16dcc1c7c8329e4d138d20732d0952382fc05700
+AUX qtiplot-0.9.8.9-sip-4.15.patch 1248 SHA256 06634d1555aef2e7bf2c2aa081522b69eb8c61e64e848f32931014984035d39f SHA512 5db9db5189ba3914dfe2413d899438e8f5da267d6d1367eef3a781592ab7b70e4381e5eb35dca8a60bb9b0540187586d4f75f80b90afa15a9aecb4bf872f66c4 WHIRLPOOL 8d537a391bdd226abc4520f709d842ce5c9935459ac2cb989844c35933c6a3c609726eac609504c7dfdeecc001e10deec1315e679d2b22f70daa3c68311a5b96
+AUX qtiplot-0.9.8.9-sip-4.19.patch 1548 SHA256 48dcbb31c79496587bccbd79f0bbb2b5f68c9b4fe5029b5dd638ef92df3fa72a SHA512 c3ddce29bda642b8d9deccd53136ca25c0a2d5b97547a7219be7f30400abfd595f23f49d4d7049382d3b481e111db01c3d89f0625aedf0b4c1c3eafd65672c5f WHIRLPOOL 6228d73f484ec0f9c34d2ce498c6a63ca7d5b1482cb4db21dbf3f075e4e789f067aa583eac4b6fc7b8932fab5e52ff8ce3c4bdeaa8d30044af58ed31c90ea43a
+DIST qtiplot-0.9.8.9-origin.patch.bz2 104708 SHA256 e83d7212be0fadae31b14c8a86b655fdb3b7c7b8fc80b1e2d91eb0a7e96b1e99 SHA512 62f5bb531c2fc7e061661ab5733a70acf9a61ff90a934af42b5741c63478caebabc8240f37d25660f623c5cbcd530e1303e967a095ca99b3452f29cfb5200b69 WHIRLPOOL 94b4b704737c2e6bb86caa00497164749df7eb01b13b49d06daa8f33b3e34d23782bde4fec617f35755c2e2f4286327bb39270bf48a9f020e94ef113f9d962bb
+DIST qtiplot-0.9.8.9-origin.patch.xz 89660 SHA256 8d1a9927fad711b7e357641926b884f68d28f8e2f648f6a7c071514d5d552c11 SHA512 adbd002975bb49997eb610b150c1bbfe9c9617b0b5bbb70f52df7475339b7d68cada175eb9f6048f6ece043ca3dcf5c62ef361d82bc670b1576ee8493d6b757c WHIRLPOOL 41fd5c1627737f060d7a0d99682e58417e050c7655798453a602c1cf9409d5bab319870b6054efe3542ac038c2bc32f804ae427646a3f56290a2c5b1905cbcd4
+DIST qtiplot-0.9.8.9.tar.bz2 16202943 SHA256 a523ea259516d7581abaf2fe376507d152db32f71d88176cff18f5bc391b9ef0 SHA512 3a0cb7b49c508f56228e8e3a259b4fd34c872410ad14ef1d8656372e3e8ab9f92e59094a9cc1a75680099a8832f7472ad31462b3ae8a9e132ac7056d5245cf2a WHIRLPOOL 3cf9d9ab7d58301364a61f6c5ad51858ffe1e6214c5971c1d042c7894fcb70fa4b28fe0e6631f142ab8fa9b2c2b979e4e178bc44b1961cde70b29d9aaa2c7d3f
+EBUILD qtiplot-0.9.8.9-r2.ebuild 6199 SHA256 038c218a508e8ac19b69a15e31cdb2a7653185c3889184e3520ae96f23db8825 SHA512 def75343c2eb7da66633ff27fee433d2cad928b2c19d146931e1bfd07427cbb8da3530a6126e82c570472c27dc1c9c6d95286359d3b9f9cdb5d9c55286dd9c0d WHIRLPOOL 069fafd56e50ba6c11e771db2675b5c1493429cf242f06084776d2bb433ad260a97e2f2bfd9c387fa899f5259550b88a143f70e3671d463c92eab177314336a1
+EBUILD qtiplot-0.9.8.9-r3.ebuild 6240 SHA256 b9e34e119b8e06c57e885bf0f5cc72590d74b160864312ca6cd226d227ee61ea SHA512 12a2a19b0ca2602e0d391303ea232d821c68a1371a0dddb2cba4bd850564ca74db72cd0f1605da7f6c6d0cd29d887d0e95776ffe60177b2bdac5c825f63b01a4 WHIRLPOOL 8baa2773f6062072fecb834f719293e0ed9ae97b5208b7ab5c0e0ad88b4101c99de28666f255c788d6d88de37a566d4ebe7f6596e1ccb4bfd20aedc5b845a7fa
+EBUILD qtiplot-0.9.8.9-r4.ebuild 6221 SHA256 cb4d842b78d7cc7de52bb2b9cb730b70e52d2dfaffa81d507e760f5233b2126c SHA512 31563c2024b29df7167b0530d5ed9c6084150cd2ffb7d0625eeec27eb3288d916f95773ad9a2c1a35daacbf873124cd327921db9890db762ecffcd1100f7bbac WHIRLPOOL e584cf7d430928c8c6e3ce9b2fc5125e4ea1d82e8831644b58124098f8c5f765bc46d7bd072f0a6cb672a1c3c171ea5d51d1907028bc1377e7028581b9fa951d
+MISC ChangeLog 4140 SHA256 bf1053e872c39da23f0f690cb0f5de2db8ddea5212049438772e74ee17caee70 SHA512 68d9f7dc60e5075d80574cc28f0fdb804d54cf39de2753c4bdb8c1db331e1d4d12437695ad2c8bfecddb77b3777415f09bd02be1005f27ab3d40811be5424f49 WHIRLPOOL 5b37c8a9fe2724cc7ea7dcea604ea17ce3c3f99a0eea3b150f558374a459e4f29976d6d7d9aadbfe4ccc741a8e9bfedbdb0bca6a2373fcb287a9fe39e171028d
+MISC ChangeLog-2015 25352 SHA256 4c1a25227a21dac8e5b8bee69b0db6b6d0969b7960504c7ded318697c0f6cf14 SHA512 3ea3daf811697b21ae82f714ef9d3f4b7b708ab6cc9ccc4af0160de297e3d243d5ed147b0a42e73454dd27445eeb01b1232f4fa29d82ed2efcf0cfb268350fd4 WHIRLPOOL aad640c48b2415d5e17490f7eb3fffacb351779c83696da658bc599eb1926f71fc6a82569e47f6fc9b8a94862346fc24847ce884572af506016c1332b01f92ba
+MISC metadata.xml 635 SHA256 263ddfd99f9ba0d0417fa2b37cb2de18aea47a861169f55fbbe8a0547c819e5a SHA512 cda594b03db95c44965d2f703be581e796bb7e5bd289d3db66b95484b8549296121414bd82d10bb6f19505e9a466f7efdaee940e3755dbba21013f668e8a71e1 WHIRLPOOL e140b88d02b77ac3fb0251ea45f7d7e32103f2ec058aad3d4f6a8c437b82f7ec34d06800c5094ff9a9b6a65dc6df653b12408d9266e5ea4c879a7e45fd199df0
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-dont-install-qwt.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-dont-install-qwt.patch
new file mode 100644
index 000000000000..86e4d4c6a9c1
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-dont-install-qwt.patch
@@ -0,0 +1,22 @@
+diff --git a/3rdparty/qwt/qwtconfig.pri b/3rdparty/qwt/qwtconfig.pri
+index b7d0d0e..e36f131 100755
+--- a/3rdparty/qwt/qwtconfig.pri
++++ b/3rdparty/qwt/qwtconfig.pri
+@@ -7,17 +7,6 @@ VER_MIN      = 2
+ VER_PAT      = 0
+ VERSION      = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
+ 
+-unix {
+-    INSTALLBASE    = /usr/local/qwt-5.2.0
+-}
+-
+-win32 {
+-    INSTALLBASE    = C:/Qwt-5.2.0
+-}
+-
+-target.path    = $$INSTALLBASE/lib
+-headers.path   = $$INSTALLBASE/include
+-doc.path       = $$INSTALLBASE/doc
+ 
+ ######################################################################
+ # qmake internal options
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-gold.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-gold.patch
new file mode 100644
index 000000000000..3b6757533a52
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-gold.patch
@@ -0,0 +1,15 @@
+ qtiplot/qtiplot.pro |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
+index 99e0e36..b7cf373 100755
+--- a/qtiplot/qtiplot.pro
++++ b/qtiplot/qtiplot.pro
+@@ -20,6 +20,7 @@ LIBS         += $$MUPARSER_LIBS
+ LIBS         += $$QWT_LIBS
+ LIBS         += $$QWT3D_LIBS
+ LIBS         += $$GSL_LIBS
++LIBS         += -lz
+ 
+ #############################################################################
+ ###################### BASIC PROJECT PROPERTIES #############################
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.7-kde.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.7-kde.patch
new file mode 100644
index 000000000000..af1dca42da42
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.7-kde.patch
@@ -0,0 +1,16 @@
+ qtiplot/src/plot2D/Graph.cpp |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/qtiplot/src/plot2D/Graph.cpp b/qtiplot/src/plot2D/Graph.cpp
+index 626172a..d4eab1b 100755
+--- a/qtiplot/src/plot2D/Graph.cpp
++++ b/qtiplot/src/plot2D/Graph.cpp
+@@ -73,7 +73,8 @@
+ #include <PatternBox.h>
+ #include <SymbolBox.h>
+ #include <LinearColorMap.h>
+ 
++#include <QPaintEngine>
+ #include <QApplication>
+ #include <QBitmap>
+ #include <QClipboard>
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.8-system-gl2ps.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.8-system-gl2ps.patch
new file mode 100644
index 000000000000..d7b40c414b1d
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.8-system-gl2ps.patch
@@ -0,0 +1,76 @@
+ 3rdparty/qwtplot3d/qwtplot3d.pri          |    8 ++++----
+ 3rdparty/qwtplot3d/qwtplot3d.pro          |    3 ---
+ 3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp |    2 +-
+ 3rdparty/qwtplot3d/src/qwt3d_label.cpp    |    2 +-
+ 4 files changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/3rdparty/qwtplot3d/qwtplot3d.pri b/3rdparty/qwtplot3d/qwtplot3d.pri
+index 45a0c3e..16bbe53 100755
+--- a/3rdparty/qwtplot3d/qwtplot3d.pri
++++ b/3rdparty/qwtplot3d/qwtplot3d.pri
+@@ -8,6 +8,8 @@ DEPENDPATH += src \
+     3rdparty\gl2ps
+ INCLUDEPATH += .
+ 
++LIBS+=-lgl2ps
++
+ # Input
+ HEADERS += include/qwt3d_extglwidget.h \
+     include/qwt3d_color.h \
+@@ -37,8 +39,7 @@ HEADERS += include/qwt3d_extglwidget.h \
+     include/qwt3d_volumeplot.h \
+     include/qwt3d_graphplot.h \
+     include/qwt3d_multiplot.h \
+-    include/qwt3d_io_gl2ps.h \
+-    3rdparty/gl2ps/gl2ps.h
++    include/qwt3d_io_gl2ps.h
+ SOURCES += src/qwt3d_extglwidget.cpp \
+     src/qwt3d_axis.cpp \
+     src/qwt3d_color.cpp \
+@@ -62,5 +63,4 @@ SOURCES += src/qwt3d_extglwidget.cpp \
+     src/qwt3d_function.cpp \
+     src/qwt3d_gridplot.cpp \
+     src/qwt3d_meshplot.cpp \
+-    src/qwt3d_io_gl2ps.cpp \
+-    3rdparty/gl2ps/gl2ps.c
++    src/qwt3d_io_gl2ps.cpp
+diff --git a/3rdparty/qwtplot3d/qwtplot3d.pro b/3rdparty/qwtplot3d/qwtplot3d.pro
+index 95c8e26..18d03e3 100755
+--- a/3rdparty/qwtplot3d/qwtplot3d.pro
++++ b/3rdparty/qwtplot3d/qwtplot3d.pro
+@@ -31,9 +31,6 @@ RCC_DIR      = $$DESTDIR/tmp
+ MOC_DIR      = $$DESTDIR/tmp
+ 
+ DEFINES     += GL2PS_HAVE_LIBPNG
+-INCLUDEPATH += ../zlib/
+-INCLUDEPATH += ../libpng/
+-LIBS        += ../libpng/libpng.a
+ 
+ # install
+ target.path = lib
+diff --git a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
+index bc7a9d8..589cfd2 100755
+--- a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
++++ b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
+@@ -6,7 +6,7 @@
+ #include <locale.h>
+ 
+ #include "qwt3d_openglhelper.h"
+-#include "../3rdparty/gl2ps/gl2ps.h"
++#include "gl2ps.h"
+ #include "qwt3d_io_gl2ps.h"
+ #include "qwt3d_plot.h"
+ 
+diff --git a/3rdparty/qwtplot3d/src/qwt3d_label.cpp b/3rdparty/qwtplot3d/src/qwt3d_label.cpp
+index 7e54ad9..cc8bd60 100755
+--- a/3rdparty/qwtplot3d/src/qwt3d_label.cpp
++++ b/3rdparty/qwtplot3d/src/qwt3d_label.cpp
+@@ -1,7 +1,7 @@
+ #include <qbitmap.h>
+ #include "qwt3d_label.h"
+ #include "qwt3d_plot.h"
+-#include "../3rdparty/gl2ps/gl2ps.h"
++#include "gl2ps.h"
+ 
+ using namespace Qwt3D;
+ 
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.10.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.10.patch
new file mode 100644
index 000000000000..67bd0a32d105
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.10.patch
@@ -0,0 +1,32 @@
+ qtiplot/python-sipcmd.py | 21 ++++++++++++++++++---
+ 1 file changed, 18 insertions(+), 3 deletions(-)
+
+diff --git a/qtiplot/python-sipcmd.py b/qtiplot/python-sipcmd.py
+index f643194..d8d1ef2 100755
+--- a/qtiplot/python-sipcmd.py
++++ b/qtiplot/python-sipcmd.py
+@@ -27,6 +27,21 @@
+ #                                                                          #
+ ############################################################################
+ 
+-from PyQt4 import pyqtconfig
+-config = pyqtconfig.Configuration()
+-print " ".join([config.sip_bin, "-I", config.pyqt_sip_dir, config.pyqt_sip_flags])
++from __future__ import print_function
++
++import os
++import sipconfig
++import PyQt4.QtCore
++
++try:
++	# >= 4.10
++	SIP_FLAGS = PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags']
++except:
++	import PyQt4.pyqtconfig
++	SIP_FLAGS = PyQt4.pyqtconfig.Configuration().pyqt_sip_flags
++
++PYQT_SIP_DIR = os.path.join(sipconfig.Configuration().default_sip_dir)
++SIP_BIN = sipconfig.Configuration().sip_bin
++SIP_INC_DIR = sipconfig.Configuration().sip_inc_dir
++
++print(" ".join([SIP_BIN, "-I", PYQT_SIP_DIR, SIP_FLAGS]))
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.11.3.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.11.3.patch
new file mode 100644
index 000000000000..a011782550d6
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.11.3.patch
@@ -0,0 +1,32 @@
+ qtiplot/python-sipcmd.py | 21 ++++++++++++++++++---
+ 1 file changed, 18 insertions(+), 3 deletions(-)
+
+diff --git a/qtiplot/python-sipcmd.py b/qtiplot/python-sipcmd.py
+index f643194..d8d1ef2 100755
+--- a/qtiplot/python-sipcmd.py
++++ b/qtiplot/python-sipcmd.py
+@@ -27,6 +27,21 @@
+ #                                                                          #
+ ############################################################################
+ 
+-from PyQt4 import pyqtconfig
+-config = pyqtconfig.Configuration()
+-print " ".join([config.sip_bin, "-I", config.pyqt_sip_dir, config.pyqt_sip_flags])
++from __future__ import print_function
++
++import os
++import sipconfig
++import PyQt4.QtCore
++
++try:
++	# >= 4.10
++	SIP_FLAGS = PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags']
++except:
++	import PyQt4.pyqtconfig
++	SIP_FLAGS = PyQt4.pyqtconfig.Configuration().pyqt_sip_flags
++
++PYQT_SIP_DIR = os.path.join(sipconfig.Configuration().default_sip_dir, 'PyQt4')
++SIP_BIN = sipconfig.Configuration().sip_bin
++SIP_INC_DIR = sipconfig.Configuration().sip_inc_dir
++
++print(" ".join([SIP_BIN, "-I", PYQT_SIP_DIR, SIP_FLAGS]))
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-adopt_to_alglib3.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-adopt_to_alglib3.patch
new file mode 100644
index 000000000000..8f1bde25a038
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-adopt_to_alglib3.patch
@@ -0,0 +1,115 @@
+Description: adoptation to alglib3.
+Author: Anton Gladky <gladk@debian.org>
+Last-Update: 2013-05-16
+
+--- a/qtiplot/src/analysis/dialogs/GriddingDialog.cpp
++++ b/qtiplot/src/analysis/dialogs/GriddingDialog.cpp
+@@ -41,7 +41,7 @@
+ #include <QComboBox>
+ #include <QLayout>
+ 
+-#include <idwint.h>
++#include <interpolation.h>
+ 
+ GriddingDialog::GriddingDialog(Table* t, const QString& colName, int nodes, QWidget* parent, Qt::WFlags fl )
+ 	: QDialog( parent, fl ),
+@@ -365,26 +365,27 @@
+ 	Matrix* m = app->newMatrix(rows, cols);
+ 	m->setCoordinates(xmin, xmax, ymin, ymax);
+ 
+-	idwinterpolant z;
++	alglib::idwinterpolant z;
++  
+ 	switch (boxMethod->currentIndex()){
+ 		case 0:
+-			idwbuildmodifiedshepardr(xy, d_nodes, 2, boxRadius->value(), z);
++			alglib::idwbuildmodifiedshepardr(xy, d_nodes, 2, boxRadius->value(), z);
+ 		break;
+ 		case 1:
+-			idwbuildmodifiedshepard(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
++			alglib::idwbuildmodifiedshepard(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
+ 		break;
+ 		case 2:
+-			idwbuildnoisy(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
++			alglib::idwbuildnoisy(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
+ 		break;
+ 	}
+ 
+-	ap::real_1d_array p;
++	alglib::real_1d_array p;
+ 	p.setlength(2);
+ 	for (int i = 0; i < rows; i++){
+ 		p(1) = ymin + i*ystep;
+ 		for (int j = 0; j < cols; j++){
+ 			p(0) = xmin + j*xstep;
+-			m->setCell(i, j, idwcalc(z, p));
++			m->setCell(i, j, alglib::idwcalc(z, p));
+ 		}
+ 	}
+ 
+@@ -435,20 +436,20 @@
+ 	double xstep = fabs(xmax - xmin)/(cols - 1);
+ 	double ystep = fabs(ymax - ymin)/(rows - 1);
+ 
+-	idwinterpolant z;
++	alglib::idwinterpolant z;
+ 	switch (boxMethod->currentIndex()){
+ 		case 0:
+-			idwbuildmodifiedshepardr(xy, d_nodes, 2, boxRadius->value(), z);
++			alglib::idwbuildmodifiedshepardr(xy, d_nodes, 2, boxRadius->value(), z);
+ 		break;
+ 		case 1:
+-			idwbuildmodifiedshepard(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
++			alglib::idwbuildmodifiedshepard(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
+ 		break;
+ 		case 2:
+-			idwbuildnoisy(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
++			alglib::idwbuildnoisy(xy, d_nodes, 2, boxModel->currentIndex() + 1, boxNQ->value(), boxNW->value(), z);
+ 		break;
+ 	}
+ 
+-	ap::real_1d_array p;
++	alglib::real_1d_array p;
+ 	p.setlength(2);
+ 
+ 	double **data_matrix = Matrix::allocateMatrixData(cols, rows);
+@@ -456,7 +457,7 @@
+ 		p(1) = ymin + i*ystep;
+ 		for (int j = 0; j < cols; j++){
+ 			p(0) = xmin + j*xstep;
+-			data_matrix[j][i] = idwcalc(z, p);
++			data_matrix[j][i] = alglib::idwcalc(z, p);
+ 		}
+ 	}
+ 
+--- a/qtiplot/src/analysis/dialogs/GriddingDialog.h
++++ b/qtiplot/src/analysis/dialogs/GriddingDialog.h
+@@ -71,7 +71,7 @@
+ 
+ 	QString d_col_name;
+ 	int d_nodes;
+-	ap::real_2d_array xy;
++	alglib::real_2d_array xy;
+ 
+ 	QPushButton* buttonFit;
+ 	QPushButton* buttonCancel;
+--- a/qtiplot/src/matrix/MatrixModel.cpp
++++ b/qtiplot/src/matrix/MatrixModel.cpp
+@@ -45,7 +45,7 @@
+ #include <stdlib.h>
+ 
+ #ifdef HAVE_ALGLIB
+-	#include <spline2d.h>
++	#include <interpolation.h>
+ #endif
+ 
+ MatrixModel::MatrixModel(int rows, int cols, QObject *parent)
+@@ -1026,7 +1026,7 @@
+ #ifdef HAVE_ALGLIB
+ 	QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+ 
+-	ap::real_2d_array oldValues, newValues;
++	alglib::real_2d_array oldValues, newValues;
+ 	oldValues.setlength(d_rows, d_cols);
+ 	newValues.setlength(rows, cols);
+ 
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-crasher_without_internet.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-crasher_without_internet.patch
new file mode 100644
index 000000000000..fe542341e99d
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-crasher_without_internet.patch
@@ -0,0 +1,25 @@
+Description: Crashes if not connected to the internet.
+Author: Scott Howard <showard@debian.org>
+Bug-Debian: http://bugs.debian.org/626915
+
+Index: qtiplot/qtiplot/src/core/ApplicationWindow.cpp
+===================================================================
+--- qtiplot.orig/qtiplot/src/core/ApplicationWindow.cpp	2012-11-07 11:14:15.021706679 -0500
++++ qtiplot/qtiplot/src/core/ApplicationWindow.cpp	2012-11-07 11:14:22.853706641 -0500
+@@ -16228,11 +16228,12 @@
+ 	if (hostInfo.error() != QHostInfo::NoError){
+ 		QApplication::restoreOverrideCursor();
+ 		QMessageBox::critical(this, tr("QtiPlot - Error"), qtiplotWeb + ": " + hostInfo.errorString());
+-		exit(0);
++		QApplication::restoreOverrideCursor();
++	}
++	else {
++		QApplication::restoreOverrideCursor();
++		showDonationsPage();
+ 	}
+-
+-	QApplication::restoreOverrideCursor();
+-	showDonationsPage();
+ }
+ 
+ void ApplicationWindow::parseCommandLineArguments(const QStringList& args)
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-gsl-2.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-gsl-2.patch
new file mode 100644
index 000000000000..9ad891938cd6
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-gsl-2.patch
@@ -0,0 +1,36 @@
+ * Info: Using [gentoo] (https://bugs.gentoo.org/xmlrpc.cgi)
+ * Info: Getting attachment 425760
+ * Info: Viewing attachment: "fix_fit_gsl_fdfsolver.patch"
+diff --git a/qtiplot/src/analysis/Fit.cpp b/qtiplot/src/analysis/Fit.cpp
+index 22cb5be..555f21d 100755
+--- a/qtiplot/src/analysis/Fit.cpp
++++ b/qtiplot/src/analysis/Fit.cpp
+@@ -106,6 +106,7 @@ void Fit::init()
+ gsl_multifit_fdfsolver * Fit::fitGSL(gsl_multifit_function_fdf f, int &iterations, int &status)
+ {
+ 	const gsl_multifit_fdfsolver_type *T;
++	gsl_matrix *J;
+ 	if (d_solver)
+ 		T = gsl_multifit_fdfsolver_lmder;
+ 	else
+@@ -128,7 +129,8 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl_multifit_function_fdf f, int &iteration
+ 	}
+ 
+ 	if (status){
+-	    gsl_multifit_covar (s->J, 0.0, covar);
++	    gsl_multifit_fdfsolver_jac (s, J);
++	    gsl_multifit_covar (J, 0.0, covar);
+ 	    iterations = 0;
+ 	    return s;
+ 	}
+@@ -155,7 +157,8 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl_multifit_function_fdf f, int &iteration
+ 		status = gsl_multifit_test_delta (s->dx, s->x, d_tolerance, d_tolerance);
+ 	} while (inRange && status == GSL_CONTINUE && (int)iter < d_max_iterations);
+ 
+-	gsl_multifit_covar (s->J, 0.0, covar);
++	gsl_multifit_fdfsolver_jac (s, J);
++	gsl_multifit_covar (J, 0.0, covar);
+ 
+ 	iterations = iter;
+ 	return s;
+
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-origin-2.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-origin-2.patch
new file mode 100644
index 000000000000..d85420b790f4
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-origin-2.patch
@@ -0,0 +1,38 @@
+diff -ruN qtiplot-0.9.8.9-origin/qtiplot/exportEMF.pro qtiplot-0.9.8.9/qtiplot/exportEMF.pro
+--- qtiplot-0.9.8.9-origin/qtiplot/exportEMF.pro	2012-01-21 20:39:03.000000000 +0100
++++ qtiplot-0.9.8.9/qtiplot/exportEMF.pro	2012-01-21 20:32:45.000000000 +0100
+@@ -5,6 +5,7 @@
+ 
+ INCLUDEPATH	+= $$QWT_INCLUDEPATH
+ INCLUDEPATH	+= $$GSL_INCLUDEPATH
++INCLUDEPATH	+= $$EMF_INCLUDEPATH
+ 
+ include(src/core/core.pri)
+ include(src/lib/libqti.pri)
+diff -ruN qtiplot-0.9.8.9-origin/qtiplot/qtiplot.pro qtiplot-0.9.8.9/qtiplot/qtiplot.pro
+--- qtiplot-0.9.8.9-origin/qtiplot/qtiplot.pro	2011-11-07 10:17:21.000000000 +0100
++++ qtiplot-0.9.8.9/qtiplot/qtiplot.pro	2012-01-21 20:44:11.000000000 +0100
+@@ -236,9 +236,9 @@
+ ###############################################################
+ 
+ TARGET		=	qtiplot
+-DESTDIR		=	../
++DESTDIR		=	./
+ LIBS		+=	../tmp/qtiplot/libFreeSoftwareQtiPlotExportEMF.a \
+ 				../tmp/qtiplot/libFreeSoftwareQtiPlotImportOPJ.a
+ 
+ include(src/plugins/exportEMF/exportEMF.pri)
+-include(src/plugins/OriginPlugin/OriginPlugin.pri)
+\ Kein Zeilenumbruch am Dateiende.
++include(src/plugins/OriginPlugin/OriginPlugin.pri)
+diff -ruN qtiplot-0.9.8.9-origin/qtiplot/src/plugins/exportEMF/exportEMF.pri qtiplot-0.9.8.9/qtiplot/src/plugins/exportEMF/exportEMF.pri
+--- qtiplot-0.9.8.9-origin/qtiplot/src/plugins/exportEMF/exportEMF.pri	2011-10-27 13:44:34.000000000 +0200
++++ qtiplot-0.9.8.9/qtiplot/src/plugins/exportEMF/exportEMF.pri	2012-01-21 20:51:34.000000000 +0100
+@@ -10,5 +10,5 @@
+ SOURCES		+=  src/plugins/exportEMF/exportEMF.cpp \
+ 				src/plugins/exportEMF/3rdparty/EmfEngine/src/EmfEngine.cpp \
+ 				src/plugins/exportEMF/3rdparty/EmfEngine/src/EmfPaintDevice.cpp
+-				
+-LIBS		+= -lgdi32
++
++LIBS		+= -lEMF
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-private.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-private.patch
new file mode 100644
index 000000000000..7bec3771813c
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-private.patch
@@ -0,0 +1,15 @@
+diff -ruN qtiplot-0.9.8.9.orig/qtiplot/src/plot2D/ImageWidget.h qtiplot-0.9.8.9/qtiplot/src/plot2D/ImageWidget.h
+--- qtiplot-0.9.8.9.orig/qtiplot/src/plot2D/ImageWidget.h	2010-10-17 09:04:05.000000000 +0200
++++ qtiplot-0.9.8.9/qtiplot/src/plot2D/ImageWidget.h	2013-11-01 12:11:36.559973891 +0100
+@@ -67,10 +67,10 @@
+ 	void setWindowName(const QString& name){d_window_name = name;};
+ 
+ 	static QPixmap windowPixmap(ApplicationWindow *mw, const QString& name, const QSize& size);
++	void paintEvent(QPaintEvent *e);
+ 
+ private:
+ 	void draw(QPainter *painter, const QRect& r);
+-	void paintEvent(QPaintEvent *e);
+ 	QPixmap d_pix;
+ 	//! The file from which the image was loaded.
+ 	QString d_file_name;
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-qt48.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-qt48.patch
new file mode 100644
index 000000000000..31c8a5ee7af2
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-qt48.patch
@@ -0,0 +1,29 @@
+ 3rdparty/qwtplot3d/include/qwt3d_openglhelper.h |    2 ++
+ qtiplot/src/plot3D/Cone3D.cpp                   |    1 +
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h b/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h
+index 0ee80de..3d02e3f 100755
+--- a/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h
++++ b/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h
+@@ -8,6 +8,8 @@
+ #include <QtOpenGL/qgl.h>
+ #endif
+ 
++#include <GL/glu.h>
++
+ namespace Qwt3D
+ {
+ 
+diff --git a/qtiplot/src/plot3D/Cone3D.cpp b/qtiplot/src/plot3D/Cone3D.cpp
+index 16df12d..169d5c7 100755
+--- a/qtiplot/src/plot3D/Cone3D.cpp
++++ b/qtiplot/src/plot3D/Cone3D.cpp
+@@ -27,6 +27,7 @@
+  *                                                                         *
+  ***************************************************************************/
+ #include <math.h>
++#include <GL/glu.h>
+ #include "qwt3d_color.h"
+ #include "qwt3d_plot.h"
+ #include <qwt3d_curve.h>
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-set_col_values.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-set_col_values.patch
new file mode 100644
index 000000000000..5afe43eb3daf
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-set_col_values.patch
@@ -0,0 +1,18 @@
+Description: if you don't initialize the "i" variable, or initialize it to 0.0
+ qtiplot won't let you set the column values using muparser.
+Author: Scott Howard <showard@debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707736
+
+Index: qtiplot/qtiplot/src/table/Table.cpp
+===================================================================
+--- qtiplot.orig/qtiplot/src/table/Table.cpp	2013-06-08 02:06:35.550201324 -0400
++++ qtiplot/qtiplot/src/table/Table.cpp	2013-06-08 02:08:30.026204044 -0400
+@@ -564,7 +564,7 @@
+ 	QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+ 
+     muParserScript *mup = new muParserScript(scriptEnv, cmd, this,  QString("<%1>").arg(colName(col)));
+-    double *r = mup->defineVariable("i");
++    double *r = mup->defineVariable("i",startRow + 1.0);
+     mup->defineVariable("j", (double)col);
+     mup->defineVariable("sr", startRow + 1.0);
+     mup->defineVariable("er", endRow + 1.0);
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-sip-4.15.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-sip-4.15.patch
new file mode 100644
index 000000000000..c08163019a3e
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-sip-4.15.patch
@@ -0,0 +1,31 @@
+--- ./qtiplot/src/analysis/FFT.cpp.orig	2011-07-06 11:51:08.000000000 +0000
++++ ./qtiplot/src/analysis/FFT.cpp	2013-10-23 23:07:45.674925476 +0000
+@@ -353,7 +353,7 @@
+ 	ml->arrangeLayers(false, false);
+ }
+ 
+-bool FFT::setDataFromTable(Table *t, const QString& realColName, const QString& imagColName, int from, int to)
++bool FFT::setDataFromTable(Table *t, const QString& realColName, const QString& imagColName, int from, int to, bool unused)
+ {
+ 	d_init_err = true;
+ 
+--- ./qtiplot/src/analysis/FFT.h.orig	2011-07-05 22:05:03.000000000 +0000
++++ ./qtiplot/src/analysis/FFT.h	2013-10-23 23:11:34.277924367 +0000
+@@ -52,6 +52,8 @@
+ 	Matrix *realOutputMatrix(){return d_re_out_matrix;}
+ 	Matrix *imaginaryOutputMatrix(){return d_im_out_matrix;}
+ 
++    bool setDataFromTable(Table *t, const QString& realColName, const QString& imagColName = QString(), int from = 0, int to = -1, bool unused = false);
++
+ private:
+     void init();
+     void output();
+@@ -60,8 +62,6 @@
+ 	void fftTable();
+ 	void fftMatrix();
+ 
+-    bool setDataFromTable(Table *t, const QString& realColName, const QString& imagColName = QString(), int from = 0, int to = -1);
+-
+     double d_sampling;
+     //! Flag telling if an inverse FFT must be performed.
+     bool d_inverse;
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-sip-4.19.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-sip-4.19.patch
new file mode 100644
index 000000000000..a1ea502787c3
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-sip-4.19.patch
@@ -0,0 +1,38 @@
+--- a/qtiplot/src/scripting/qti.sip	2017-02-13 17:01:03.123828499 +0100
++++ b/qtiplot/src/scripting/qti.sip	2017-02-13 17:02:12.628828234 +0100
+@@ -148,14 +148,14 @@
+     }
+     break;
+   case Table::Date:
+-    if (sipCanConvertToType(item, sipType_QDateTime, 0)) {
++    if (sipCanConvertToType(item, sipFindType("QDateTime"), 0)) {
+       int isErr = 0;
+-      QDateTime* dateTime = reinterpret_cast<QDateTime*>(sipConvertToType(item, sipType_QDateTime,
++      QDateTime* dateTime = reinterpret_cast<QDateTime*>(sipConvertToType(item, sipFindType("QDateTime"),
+                             0/*sipTransferObj*/, 0/*flags*/, 0/*state*/, &isErr));
+       if (isErr)
+         return 1;
+       table->setText(row, col, dateTime->toString(table->columnFormat(col)));
+-      delete dateTime;
++      //delete dateTime;
+     }
+     else {
+       if (PyType_Ready(item_type) == 0)
+@@ -164,14 +164,14 @@
+     }
+     break;
+   case Table::Time:
+-    if (sipCanConvertToType(item, sipType_QTime, 0)) {
++    if (sipCanConvertToType(item, sipFindType("QTime"), 0)) {
+       int isErr = 0;
+-      QTime* time = reinterpret_cast<QTime*>(sipConvertToType(item, sipType_QTime,
++      QTime* time = reinterpret_cast<QTime*>(sipConvertToType(item, sipFindType("QTime"),
+                             0/*sipTransferObj*/, 0/*flags*/, 0/*state*/, &isErr));
+       if (isErr)
+         return 1;
+       table->setText(row, col, time->toString(table->columnFormat(col)));
+-      delete time;
++      //delete time;
+     }
+     else {
+       if (PyType_Ready(item_type) == 0)
diff --git a/sci-visualization/qtiplot/metadata.xml b/sci-visualization/qtiplot/metadata.xml
new file mode 100644
index 000000000000..9a33f746ffda
--- /dev/null
+++ b/sci-visualization/qtiplot/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+	Data analysis and scientific plotting package. This is a clone of the
+	popular Origin software available on another well known platform implemented
+	in Qt with powerful 2D and 3D data plotting, ASCII import and powerful
+	spreadsheet data manipulation using column logic. Curve fitting and other
+	statistical tools are also available.
+  </longdescription>
+</pkgmetadata>
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild
new file mode 100644
index 000000000000..3fcaffb291d1
--- /dev/null
+++ b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils qt4-r2 fdo-mime python-single-r1 toolchain-funcs
+
+DESCRIPTION="Qt based clone of the Origin plotting package"
+HOMEPAGE="http://soft.proindependent.com/qtiplot.html
+	http://www.staff.science.uu.nl/~zeven101/qtiplot.html"
+SRC_URI="
+	https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2
+	https://dev.gentoo.org/~dilfridge/distfiles/${P}-origin.patch.bz2"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="bindist doc mono latex python"
+
+LANGS="cn cz de es fr ja ro ru sv"
+for l in ${LANGS}; do
+	lu=${l/cz/cs}
+	lu=${lu/cn/zh_CN}
+	IUSE="${IUSE} linguas_${lu}"
+done
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# qwtplot3d much modified from original upstream
+# >=x11-libs/qwt-5.3 they are using trunk checkouts
+CDEPEND="
+	media-libs/libemf
+	dev-qt/qthelp:4
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	dev-qt/qt3support:4
+	dev-qt/qthelp:4[compat]
+	dev-qt/qtsvg:4
+	>=x11-libs/gl2ps-1.3.5[png]
+	>=dev-cpp/muParser-1.32
+	>=dev-libs/boost-1.35.0:=
+	dev-libs/quazip[qt4]
+	media-libs/libpng:=
+	sci-libs/alglib:=
+	<sci-libs/gsl-2
+	sci-libs/tamu_anova
+	latex? ( dev-tex/qtexengine )
+	mono? ( dev-dotnet/libgdiplus )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-python/sip-4.9[${PYTHON_USEDEP}] )
+	doc? (
+		>=app-text/docbook-sgml-utils-0.6.14-r1
+		>=app-text/docbook-xml-dtd-4.4-r2:4.4 )"
+
+RDEPEND="${CDEPEND}
+	python? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${DISTDIR}"/${P}-origin.patch.bz2
+	"${FILESDIR}"/${P}-origin-2.patch
+	"${FILESDIR}"/${P}-qt48.patch
+	"${FILESDIR}"/${PN}-0.9.8.8-system-gl2ps.patch
+	"${FILESDIR}"/${PN}-0.9.7.10-dont-install-qwt.patch
+	"${FILESDIR}"/${PN}-0.9.8.6-gold.patch
+	"${FILESDIR}"/${PN}-0.9.8.7-kde.patch
+	"${FILESDIR}"/${P}-set_col_values.patch
+	"${FILESDIR}"/${P}-adopt_to_alglib3.patch
+	"${FILESDIR}"/${P}-crasher_without_internet.patch
+	"${FILESDIR}"/${P}-private.patch
+	"${FILESDIR}"/${P}-sip-4.15.patch
+	"${FILESDIR}"/${P}-PyQt4-4.10.patch
+	)
+
+RESTRICT="!bindist? ( bindist )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local mylibs
+
+	qt4-r2_src_prepare
+
+	rm -rf 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/,boost,alglib} || die
+	sed \
+		-e "s:dll:static:g" \
+		-e "/INSTALLS/d" \
+		-i 3rdparty/qwtplot3d/*.pro
+
+	mylibs="${mylibs} -lquazip"
+	use mono && mylibs="${mylibs} $($(tc-getPKG_CONFIG) --libs libgdiplus)"
+
+	# Check build.conf for changes on bump.
+	cat > build.conf <<-EOF
+	# Automatically generated by Gentoo ebuild
+	isEmpty( QTI_ROOT ) {
+	  message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" )
+	}
+
+	MUPARSER_LIBS = $($(tc-getPKG_CONFIG) --libs muparser)
+	GSL_LIBS = $($(tc-getPKG_CONFIG) --libs gsl)
+	QWT_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwt/src
+	QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
+	QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include
+	QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
+	EMF_INCLUDEPATH = "${EPREFIX}/usr/include/libEMF
+	SYS_LIBS = -lgl2ps ${mylibs} -lGLU
+
+	LUPDATE = lupdate
+	LRELEASE = lrelease
+
+	SCRIPTING_LANGS += muParser
+
+	CONFIG          += release
+	CONFIG          += CustomInstall
+	DEFINES         += SCRIPTING_CONSOLE
+
+	LIBPNG_LIBS = $($(tc-getPKG_CONFIG) --libs libpng)
+	TAMUANOVA_LIBS = -ltamuanova
+	TAMUANOVA_INCLUDEPATH = "${EPREFIX}/usr/include/tamu_anova"
+	ALGLIB_LIBS = -lalglib
+
+	EOF
+
+	use bindist && echo "DEFINES         += QTIPLOT_SUPPORT" >> build.conf
+	use bindist || echo "DEFINES         += QTIPLOT_PRO" >> build.conf
+	use python && echo "SCRIPTING_LANGS += Python" >> build.conf
+	use python && echo "PYTHON = ${EPYTHON}" >> build.conf
+	use latex && echo "TEX_ENGINE_LIBS = -lQTeXEngine" >> build.conf
+
+	sed \
+		-e "s:doc/${PN}/manual:doc/${PN}/html:" \
+		-e '/INSTALLS.*documentation/d' \
+		-e '/INSTALLS.*manual/d' \
+		-e "/INSTALLBASE/s: /usr: ${EPREFIX}/usr:g" \
+		-e 's:/usr/local/qtiplot:$$INSTALLBASE:g' \
+		-i qtiplot/qtiplot.pro || die
+
+	if use python; then
+		sed \
+			-e "s:/usr/local/${PN}:${EPREFIX}$(python_get_sitedir)/qtiplot:" \
+			-i qtiplot/qtiplot.pro || die
+	fi
+
+	sed \
+		-e "/^target.path/s:/usr:${EPREFIX}/usr:g" \
+		-i fitPlugins/*/*.pro || die
+
+	sed -e '/manual/d' -i qtiplot.pro || die
+
+	sed -e "s:QTIPLOT_PRO:QTIPLOT_PROFESSIONAL:g" -i qtiplot/src/core/main.cpp || die
+
+	# Drop langs only if LINGUAS is not empty
+	if [[ -n ${LINGUAS} ]]; then
+		for l in ${LANGS}; do
+			lu=${l/cz/cs}
+			lu=${lu/cn/zh_CN}
+			use linguas_${lu} || \
+				sed -e "s:translations/qtiplot_${l}.[tq][sm]::" \
+						-i qtiplot/qtiplot.pro || die
+		done
+	fi
+
+	sed \
+		-e "s:d_python_config_folder + \":\"${EPREFIX}/usr/share/qtiplot:g" \
+		-i qtiplot/src/core/ApplicationWindow.cpp || die
+
+	chmod -x qtiplot/qti_wordlist.txt
+
+	# sed out debian paths
+	sed -e 's:\(/usr/share/sgml/\)docbook/stylesheet/dsssl/modular\(/html/docbook.dsl\):\1stylesheets/dsssl/docbook\2:' \
+		-i manual/qtiplot.dsl || die
+	sed -e 's:\(/usr/share/\)xml/docbook/stylesheet/nwalsh\(/html/chunk.xsl\):\1sgml/docbook/xsl-stylesheets\2:' \
+		-i manual/qtiplot_html.xsl || die
+
+	sed \
+		-e '1i#define OF(x) x' \
+		-i 3rdparty/zlib/minigzip.c || die
+}
+
+src_configure() {
+	use amd64 && export QMAKESPEC="linux-g++-64"
+	eqmake4
+}
+
+src_compile() {
+	emake
+	lrelease qtiplot/qtiplot.pro || die
+	if use doc; then
+		cd manual
+		emake web
+	fi
+}
+
+src_install() {
+	qt4-r2_src_install
+
+	insinto /usr/share/qtiplot
+	doins qtiplot/qti_wordlist.txt
+
+	newicon qtiplot_logo.png qtiplot.png
+	make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot
+
+	use doc && dohtml -r manual/html/*
+
+	use python && python_optimize
+
+	if [[ -n ${LINGUAS} ]]; then
+		insinto /usr/share/${PN}/translations
+		for l in ${LANGS}; do
+			lu=${l/cz/cs}
+			lu=${lu/cn/zh_CN}
+			use linguas_${lu} && \
+				doins qtiplot/translations/qtiplot_${l}.qm
+		done
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		optfeature "Enhanced python support" \
+			dev-python/pygsl dev-python/rpy sci-libs/scipy dev-python/sympy
+	fi
+
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r3.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r3.ebuild
new file mode 100644
index 000000000000..65c127fe41f9
--- /dev/null
+++ b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r3.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils qt4-r2 fdo-mime python-single-r1 toolchain-funcs
+
+DESCRIPTION="Qt based clone of the Origin plotting package"
+HOMEPAGE="http://soft.proindependent.com/qtiplot.html
+	http://www.staff.science.uu.nl/~zeven101/qtiplot.html"
+SRC_URI="
+	https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2
+	https://dev.gentoo.org/~dilfridge/distfiles/${P}-origin.patch.bz2"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="bindist doc mono latex python"
+
+LANGS="cn cz de es fr ja ro ru sv"
+for l in ${LANGS}; do
+	lu=${l/cz/cs}
+	lu=${lu/cn/zh_CN}
+	IUSE="${IUSE} linguas_${lu}"
+done
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# qwtplot3d much modified from original upstream
+# >=x11-libs/qwt-5.3 they are using trunk checkouts
+CDEPEND="
+	media-libs/libemf
+	dev-qt/qthelp:4
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	dev-qt/qt3support:4
+	dev-qt/qthelp:4[compat]
+	dev-qt/qtsvg:4
+	>=x11-libs/gl2ps-1.3.5[png]
+	>=dev-cpp/muParser-1.32
+	>=dev-libs/boost-1.35.0:=
+	dev-libs/quazip[qt4]
+	media-libs/libpng:=
+	sci-libs/alglib:=
+	<sci-libs/gsl-2
+	sci-libs/tamu_anova
+	latex? ( dev-tex/qtexengine )
+	mono? ( dev-dotnet/libgdiplus )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
+		)"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-python/sip-4.16.5[${PYTHON_USEDEP}] )
+	doc? (
+		>=app-text/docbook-sgml-utils-0.6.14-r1
+		>=app-text/docbook-xml-dtd-4.4-r2:4.4 )"
+
+RDEPEND="${CDEPEND}"
+
+PATCHES=(
+	"${DISTDIR}"/${P}-origin.patch.bz2
+	"${FILESDIR}"/${P}-origin-2.patch
+	"${FILESDIR}"/${P}-qt48.patch
+	"${FILESDIR}"/${PN}-0.9.8.8-system-gl2ps.patch
+	"${FILESDIR}"/${PN}-0.9.7.10-dont-install-qwt.patch
+	"${FILESDIR}"/${PN}-0.9.8.6-gold.patch
+	"${FILESDIR}"/${PN}-0.9.8.7-kde.patch
+	"${FILESDIR}"/${P}-set_col_values.patch
+	"${FILESDIR}"/${P}-adopt_to_alglib3.patch
+	"${FILESDIR}"/${P}-crasher_without_internet.patch
+	"${FILESDIR}"/${P}-private.patch
+	"${FILESDIR}"/${P}-sip-4.15.patch
+	"${FILESDIR}"/${P}-PyQt4-4.11.3.patch
+	"${FILESDIR}"/${P}-sip-4.19.patch
+)
+
+RESTRICT="!bindist? ( bindist )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local mylibs
+
+	qt4-r2_src_prepare
+
+	rm -rf 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/,boost,alglib} || die
+	sed \
+		-e "s:dll:static:g" \
+		-e "/INSTALLS/d" \
+		-i 3rdparty/qwtplot3d/*.pro
+
+	mylibs="${mylibs} -lquazip"
+	use mono && mylibs="${mylibs} $($(tc-getPKG_CONFIG) --libs libgdiplus)"
+
+	# Check build.conf for changes on bump.
+	cat > build.conf <<-EOF
+	# Automatically generated by Gentoo ebuild
+	isEmpty( QTI_ROOT ) {
+	  message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" )
+	}
+
+	MUPARSER_LIBS = $($(tc-getPKG_CONFIG) --libs muparser)
+	GSL_LIBS = $($(tc-getPKG_CONFIG) --libs gsl)
+	QWT_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwt/src
+	QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
+	QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include
+	QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
+	EMF_INCLUDEPATH = "${EPREFIX}/usr/include/libEMF
+	SYS_LIBS = -lgl2ps ${mylibs} -lGLU
+
+	LUPDATE = lupdate
+	LRELEASE = lrelease
+
+	SCRIPTING_LANGS += muParser
+
+	CONFIG          += release
+	CONFIG          += CustomInstall
+	DEFINES         += SCRIPTING_CONSOLE
+
+	LIBPNG_LIBS = $($(tc-getPKG_CONFIG) --libs libpng)
+	TAMUANOVA_LIBS = -ltamuanova
+	TAMUANOVA_INCLUDEPATH = "${EPREFIX}/usr/include/tamu_anova"
+	ALGLIB_LIBS = -lalglib
+
+	EOF
+
+	use bindist && echo "DEFINES         += QTIPLOT_SUPPORT" >> build.conf
+	use bindist || echo "DEFINES         += QTIPLOT_PRO" >> build.conf
+	use python && echo "SCRIPTING_LANGS += Python" >> build.conf
+	use python && echo "PYTHON = ${EPYTHON}" >> build.conf
+	use latex && echo "TEX_ENGINE_LIBS = -lQTeXEngine" >> build.conf
+
+	sed \
+		-e "s:doc/${PN}/manual:doc/${PN}/html:" \
+		-e '/INSTALLS.*documentation/d' \
+		-e '/INSTALLS.*manual/d' \
+		-e "/INSTALLBASE/s: /usr: ${EPREFIX}/usr:g" \
+		-e 's:/usr/local/qtiplot:$$INSTALLBASE:g' \
+		-i qtiplot/qtiplot.pro || die
+
+	if use python; then
+		sed \
+			-e "s:/usr/local/${PN}:${EPREFIX}$(python_get_sitedir)/qtiplot:" \
+			-i qtiplot/qtiplot.pro || die
+	fi
+
+	sed \
+		-e "/^target.path/s:/usr:${EPREFIX}/usr:g" \
+		-i fitPlugins/*/*.pro || die
+
+	sed -e '/manual/d' -i qtiplot.pro || die
+
+	sed -e "s:QTIPLOT_PRO:QTIPLOT_PROFESSIONAL:g" -i qtiplot/src/core/main.cpp || die
+
+	# Drop langs only if LINGUAS is not empty
+	if [[ -n ${LINGUAS} ]]; then
+		for l in ${LANGS}; do
+			lu=${l/cz/cs}
+			lu=${lu/cn/zh_CN}
+			use linguas_${lu} || \
+				sed -e "s:translations/qtiplot_${l}.[tq][sm]::" \
+						-i qtiplot/qtiplot.pro || die
+		done
+	fi
+
+	sed \
+		-e "s:d_python_config_folder + \":\"${EPREFIX}/usr/share/qtiplot:g" \
+		-i qtiplot/src/core/ApplicationWindow.cpp || die
+
+	chmod -x qtiplot/qti_wordlist.txt
+
+	# sed out debian paths
+	sed -e 's:\(/usr/share/sgml/\)docbook/stylesheet/dsssl/modular\(/html/docbook.dsl\):\1stylesheets/dsssl/docbook\2:' \
+		-i manual/qtiplot.dsl || die
+	sed -e 's:\(/usr/share/\)xml/docbook/stylesheet/nwalsh\(/html/chunk.xsl\):\1sgml/docbook/xsl-stylesheets\2:' \
+		-i manual/qtiplot_html.xsl || die
+
+	sed \
+		-e '1i#define OF(x) x' \
+		-i 3rdparty/zlib/minigzip.c || die
+}
+
+src_configure() {
+	use amd64 && export QMAKESPEC="linux-g++-64"
+	eqmake4
+}
+
+src_compile() {
+	emake
+	lrelease qtiplot/qtiplot.pro || die
+	if use doc; then
+		cd manual
+		emake web
+	fi
+}
+
+src_install() {
+	qt4-r2_src_install
+
+	insinto /usr/share/qtiplot
+	doins qtiplot/qti_wordlist.txt
+
+	newicon qtiplot_logo.png qtiplot.png
+	make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot
+
+	use doc && dohtml -r manual/html/*
+
+	use python && python_optimize
+
+	if [[ -n ${LINGUAS} ]]; then
+		insinto /usr/share/${PN}/translations
+		for l in ${LANGS}; do
+			lu=${l/cz/cs}
+			lu=${lu/cn/zh_CN}
+			use linguas_${lu} && \
+				doins qtiplot/translations/qtiplot_${l}.qm
+		done
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		optfeature "Enhanced python support" \
+			dev-python/pygsl dev-python/rpy sci-libs/scipy dev-python/sympy
+	fi
+
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r4.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r4.ebuild
new file mode 100644
index 000000000000..42a68ecc39cb
--- /dev/null
+++ b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r4.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils qmake-utils python-single-r1 toolchain-funcs xdg
+
+DESCRIPTION="Qt based clone of the Origin plotting package"
+HOMEPAGE="
+	http://soft.proindependent.com/qtiplot.html
+	http://www.staff.science.uu.nl/~zeven101/qtiplot.html"
+SRC_URI="
+	https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2
+	https://dev.gentoo.org/~jlec/distfiles/${P}-origin.patch.xz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bindist doc mono latex python"
+
+LANGS="cn cz de es fr ja ro ru sv"
+for l in ${LANGS}; do
+	lu=${l/cz/cs}
+	lu=${lu/cn/zh_CN}
+	IUSE="${IUSE} linguas_${lu}"
+done
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# qwtplot3d much modified from original upstream
+# >=x11-libs/qwt-5.3 they are using trunk checkouts
+RDEPEND="
+	>=dev-cpp/muParser-1.32
+	>=dev-libs/boost-1.35.0:=
+	dev-libs/quazip[qt4]
+	dev-qt/qt3support:4
+	dev-qt/qtgui:4
+	dev-qt/qthelp:4
+	dev-qt/qthelp:4[compat]
+	dev-qt/qtopengl:4
+	dev-qt/qtsvg:4
+	media-libs/libemf
+	media-libs/libpng:=
+	sci-libs/alglib:=
+	>=sci-libs/gsl-2
+	sci-libs/tamu_anova
+	>=x11-libs/gl2ps-1.3.5[png]
+	latex? ( dev-tex/qtexengine )
+	mono? ( dev-dotnet/libgdiplus )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		>=app-text/docbook-sgml-utils-0.6.14-r1
+		>=app-text/docbook-xml-dtd-4.4-r2:4.4
+	)
+	python? ( >=dev-python/sip-4.16.5[${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-origin.patch
+	"${FILESDIR}"/${P}-origin-2.patch
+	"${FILESDIR}"/${P}-qt48.patch
+	"${FILESDIR}"/${PN}-0.9.8.8-system-gl2ps.patch
+	"${FILESDIR}"/${PN}-0.9.7.10-dont-install-qwt.patch
+	"${FILESDIR}"/${PN}-0.9.8.6-gold.patch
+	"${FILESDIR}"/${PN}-0.9.8.7-kde.patch
+	"${FILESDIR}"/${P}-set_col_values.patch
+	"${FILESDIR}"/${P}-adopt_to_alglib3.patch
+	"${FILESDIR}"/${P}-crasher_without_internet.patch
+	"${FILESDIR}"/${P}-private.patch
+	"${FILESDIR}"/${P}-sip-4.15.patch
+	"${FILESDIR}"/${P}-PyQt4-4.11.3.patch
+	"${FILESDIR}"/${P}-gsl-2.patch
+	"${FILESDIR}"/${P}-sip-4.19.patch
+)
+
+RESTRICT="!bindist? ( bindist )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local mylibs
+
+	xdg_src_prepare
+
+	rm -rf \
+		3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/,boost,alglib} \
+		|| die
+	sed \
+		-e "s:dll:static:g" \
+		-e "/INSTALLS/d" \
+		-i 3rdparty/qwtplot3d/*.pro || die
+
+	mylibs="${mylibs} -lquazip"
+	use mono && mylibs="${mylibs} $($(tc-getPKG_CONFIG) --libs libgdiplus)"
+
+	# Check build.conf for changes on bump.
+	cat > build.conf <<-EOF
+	# Automatically generated by Gentoo ebuild
+	isEmpty( QTI_ROOT ) {
+	  message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" )
+	}
+
+	MUPARSER_LIBS = $($(tc-getPKG_CONFIG) --libs muparser)
+	GSL_LIBS = $($(tc-getPKG_CONFIG) --libs gsl)
+	QWT_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwt/src
+	QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
+	QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include
+	QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
+	EMF_INCLUDEPATH = "${EPREFIX}"/usr/include/libEMF
+	SYS_LIBS = -lgl2ps ${mylibs} -lGLU
+
+	LUPDATE = lupdate
+	LRELEASE = lrelease
+
+	SCRIPTING_LANGS += muParser
+
+	CONFIG          += release
+	CONFIG          += CustomInstall
+	DEFINES         += SCRIPTING_CONSOLE
+
+	LIBPNG_LIBS = $($(tc-getPKG_CONFIG) --libs libpng)
+	TAMUANOVA_LIBS = -ltamuanova
+	TAMUANOVA_INCLUDEPATH = "${EPREFIX}/usr/include/tamu_anova"
+	ALGLIB_LIBS = -lalglib
+
+	EOF
+
+	use bindist && echo "DEFINES         += QTIPLOT_SUPPORT" >> build.conf
+	use bindist || echo "DEFINES         += QTIPLOT_PRO" >> build.conf
+	use python && echo "SCRIPTING_LANGS += Python" >> build.conf
+	use python && echo "PYTHON = ${EPYTHON}" >> build.conf
+	use latex && echo "TEX_ENGINE_LIBS = -lQTeXEngine" >> build.conf
+
+	sed \
+		-e "s:doc/${PN}/manual:doc/${PN}/html:" \
+		-e '/INSTALLS.*documentation/d' \
+		-e '/INSTALLS.*manual/d' \
+		-e "/INSTALLBASE/s: /usr: ${EPREFIX}/usr:g" \
+		-e 's:/usr/local/qtiplot:$$INSTALLBASE:g' \
+		-i qtiplot/qtiplot.pro || die
+
+	if use python; then
+		sed \
+			-e "s:/usr/local/${PN}:${EPREFIX}$(python_get_sitedir)/qtiplot:" \
+			-i qtiplot/qtiplot.pro || die
+	fi
+
+	sed \
+		-e "/^target.path/s:/usr:${EPREFIX}/usr:g" \
+		-i fitPlugins/*/*.pro || die
+
+	sed -e '/manual/d' -i qtiplot.pro || die
+
+	sed -e "s:QTIPLOT_PRO:QTIPLOT_PROFESSIONAL:g" -i qtiplot/src/core/main.cpp || die
+
+	# Drop langs only if LINGUAS is not empty
+	if [[ -n ${LINGUAS} ]]; then
+		for l in ${LANGS}; do
+			lu=${l/cz/cs}
+			lu=${lu/cn/zh_CN}
+			use linguas_${lu} || \
+				sed -e "s:translations/qtiplot_${l}.[tq][sm]::" \
+						-i qtiplot/qtiplot.pro || die
+		done
+	fi
+
+	sed \
+		-e "s:d_python_config_folder + \":\"${EPREFIX}/usr/share/qtiplot:g" \
+		-i qtiplot/src/core/ApplicationWindow.cpp || die
+
+	chmod -x qtiplot/qti_wordlist.txt
+
+	# sed out debian paths
+	sed \
+		-e 's:\(/usr/share/sgml/\)docbook/stylesheet/dsssl/modular\(/html/docbook.dsl\):\1stylesheets/dsssl/docbook\2:' \
+		-i manual/qtiplot.dsl || die
+	sed \
+		-e 's:\(/usr/share/\)xml/docbook/stylesheet/nwalsh\(/html/chunk.xsl\):\1sgml/docbook/xsl-stylesheets\2:' \
+		-i manual/qtiplot_html.xsl || die
+
+	sed \
+		-e '1i#define OF(x) x' \
+		-i 3rdparty/zlib/minigzip.c || die
+}
+
+src_configure() {
+	use amd64 && export QMAKESPEC="linux-g++-64"
+	eqmake4
+}
+
+src_compile() {
+	default
+	lrelease qtiplot/qtiplot.pro || die
+	if use doc; then
+		cd manual || die
+		emake web
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	insinto /usr/share/qtiplot
+	doins qtiplot/qti_wordlist.txt
+
+	newicon qtiplot_logo.png qtiplot.png
+	make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot
+
+	use doc && dodoc -r manual/html
+
+	use python && python_optimize
+
+	if [[ -n ${LINGUAS} ]]; then
+		insinto /usr/share/${PN}/translations
+		for l in ${LANGS}; do
+			lu=${l/cz/cs}
+			lu=${lu/cn/zh_CN}
+			use linguas_${lu} && \
+				doins qtiplot/translations/qtiplot_${l}.qm
+		done
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		optfeature "Enhanced python support" \
+			dev-python/pygsl dev-python/rpy sci-libs/scipy dev-python/sympy
+	fi
+
+	xdg_pkg_postinst
+}
diff --git a/sci-visualization/quickplot/Manifest b/sci-visualization/quickplot/Manifest
new file mode 100644
index 000000000000..8951f049c0c3
--- /dev/null
+++ b/sci-visualization/quickplot/Manifest
@@ -0,0 +1,9 @@
+DIST quickplot-0.10.6.tar.xz 445172 SHA256 6560dcfade541ed183d0609682a64915d66f437bf7268e1f221216b2a453d878 SHA512 10b5277d8d0b8febc3c663256f3912bdd9d879b3038a5fdd3a7adc223419893ee56b825f04b5bee29883f30acb3b6a329d8e314b049fef26d6220192767d4adb WHIRLPOOL d0f2b49db8fb3e74c7f4483a65bf278dd9c196833f341f2ea5d1d5b91bf36b2549e8465d64eed410e7c63a1cd6bef85e49200f102c79dc9d39a0a59be2e26ede
+DIST quickplot-0.10.8.tar.bz2 531610 SHA256 ec3946daf978f9c18537c88c15be9e84f84097ab3bb7b04dae62edad5ba91456 SHA512 e382206ba70849755e4110070a5e6b128bea4502ef623c59aa041ba84ed407e0ad06c62366b3bbcd71f8a76a3e651a04efab61edeb616ab6321c5680b03afa95 WHIRLPOOL 84216eadfe905741c19ce036c621d6386a538bcee939ea7abd3e6bd90e2249f858b51400fbe8d79a0c3ccb93fabd00915012d3443afebac00c71d667ac4faf5f
+DIST quickplot-1.0.1rc.tar.gz 303055 SHA256 44c39c179eb593c717fc2a6f01058efa7deb2da91f4b91a0d014e03fba35e8a2 SHA512 9cfaaafb7db379fb43b2975d588464288ac18eb21b3248fb02e5a30b0fa0950313a9818cfec23821046f9819d78255f02dff9970668a4b4ed8c4f452d6df3451 WHIRLPOOL f20ff4bac3f990fe39a67368b8f42cafd513b0fd08091ab4befd8592719713f1bb4d01eb76dd87cd28adce26c820a648346b5dfe63f40044ac0080467b2cd870
+EBUILD quickplot-0.10.6.ebuild 1002 SHA256 ea4700678d331330385a15fec170050738cf9ce65e61d5ffb495638b4a47c92b SHA512 a95b5a5f536207d903caa1f910d007f8633cca56459114c03715be693df9c808c04f4ec4c118d60c75d44c2a37353aee00f3dae5c219e25a8a4df8bea0cc9a22 WHIRLPOOL 41bfaa97be3c2567a498d3be40ba4d9c8040ba1b50013150ddfb1d84fb9e9f2908519aeb64766b64b880c0a61f9a62821f5af80af0ad6df6ceb43f49a15da1e7
+EBUILD quickplot-0.10.8.ebuild 1043 SHA256 32ece4d1c3e1a591b533150cbb0193c4f55bb5f6b6363bd2a6ef9e4d0193d08f SHA512 b89f918a04054fc6c1d4dfedf338a9780c538de6fc53718d4416183a53d04c152022685ed6c2344ae9d932e5496935a6c59dc1df0ad6b713db6a60b6b40cbd46 WHIRLPOOL aa9c099c789d9233e9b4dc8dd2366d65e3f612439bc536f6c3f919aa115da41ddef914ba2a3f1d18193394ab2aea6113e719c43bf1e577193c402975668b4cc1
+EBUILD quickplot-1.0.1_rc.ebuild 1061 SHA256 6a6c0cfbd1ca361d784688496ae2a601434f90988f9877bdcfc1fa872cfb6f78 SHA512 dd9fa3f7347719c379997dd5c7b68dbc7f4ae244079c91346c569cb12bb236d46351d50e59c9b406ebeead7a9ed03cc59b1a9a32be017eec6fe10841b284c576 WHIRLPOOL 61dcc2621706a0b296559750a4d380116522658f3281a6393f10b89be9295341adfc8d17dae97309c8ae9264853bd34e79fdbca5d42c7f89c3e93ee9b92e545a
+MISC ChangeLog 2940 SHA256 3a45e1774de8917dbbc2313b7fe8fd194db91033b00ad656e93e65625717bebc SHA512 4a993ebd701f76a386f42ac0ab76999bb4dd379c1557acebbf1addd0769ce9ed070f3ede65ee371d70363109a695cfbce562c5d46bec4a9760caad1b14ed9795 WHIRLPOOL 20c182e292de9855a8b7915d75362e16eb1151a9573b65ef9f037b2ef15d72adb4825ebd65ed78fd8b8664c623df3e54aad50c75a4f84180932ef0052b0ab9dc
+MISC ChangeLog-2015 4894 SHA256 6cffb63b52ca36c5c3f48ee3f0ff9c742fcaadd11fa6e375c1dfcffc7cc18fbe SHA512 cbc237d47403d53f7b0ced063dadf1cf92732db6848d7e9bbe274a7db8d9ac6fcbee39a13185b3497937a224b05e145608a9a0df39cabd349dcab585eb2800cc WHIRLPOOL 3c70e0922eb65d00539d71100909df30c06264587b1fb9c69e7205af114973479737f31d48664755dd411aa55d8865405eb95089256254657fb3391aa1cafff3
+MISC metadata.xml 853 SHA256 3736d12dc7c0c7318d17fca7474731e328b55e1d78ffbd41365b6072f6295bfe SHA512 8485d4cad78fd9161043a10a764dd494f2b9a5aded964366b3bbe519b423c793cdbabeb29c16e207a7f989339390f03beb57bd918d0df70321b7518f501bfece WHIRLPOOL d5e0f76c2f0986e25c8aff19775858f1fcb020bb28912ac2dcae1eedf8b4cd7004ccf01fa596dc8498c7fd3080b11a9a6a8ab0aed2455e294d1f50193e0ad1ae
diff --git a/sci-visualization/quickplot/metadata.xml b/sci-visualization/quickplot/metadata.xml
new file mode 100644
index 000000000000..f2f18fe4b41c
--- /dev/null
+++ b/sci-visualization/quickplot/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+  Quickplot is a fast interactive 2D plotter with infinite zooming, value
+  picking, pipe input, and unlimited plots displayed.  Quickplot is meant for
+  looking at your data quickly and of secondary importance is making static
+  pictures of your data. It's a data viewer, not a plot editor.  It reads
+  ASCII text and sound files. It has lots of command line options, making it
+  very shell script friendly.
+  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">quickplot</remote-id>
+    <remote-id type="github">lanceman2/quickplot</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-visualization/quickplot/quickplot-0.10.6.ebuild b/sci-visualization/quickplot/quickplot-0.10.6.ebuild
new file mode 100644
index 000000000000..f2a1d88660d0
--- /dev/null
+++ b/sci-visualization/quickplot/quickplot-0.10.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils eutils
+
+DESCRIPTION="A fast interactive 2D plotter"
+HOMEPAGE="http://quickplot.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="
+	media-libs/libsndfile
+	>=sys-libs/readline-0.6.2:0=
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed '/libquickplot_la_LIBADD/s:$: -lm:g' -i Makefile.am || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	autotools-utils_src_configure
+}
+
+src_install () {
+	autotools-utils_src_install
+	make_desktop_entry 'quickplot --no-pipe' Quickplot quickplot Graphics
+	mv "${ED}"/usr/share/applications/quickplot*.desktop \
+		"${ED}"/usr/share/applications/quickplot.desktop || die
+}
diff --git a/sci-visualization/quickplot/quickplot-0.10.8.ebuild b/sci-visualization/quickplot/quickplot-0.10.8.ebuild
new file mode 100644
index 000000000000..c543aa5bab0a
--- /dev/null
+++ b/sci-visualization/quickplot/quickplot-0.10.8.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils eutils
+
+DESCRIPTION="A fast interactive 2D plotter"
+HOMEPAGE="http://quickplot.sourceforge.net/ https://github.com/lanceman2/quickplot"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="
+	media-libs/libsndfile
+	>=sys-libs/readline-0.6.2:0=
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed '/libquickplot_la_LIBADD/s:$: -lm:g' -i Makefile.am || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	autotools-utils_src_configure
+}
+
+src_install () {
+	autotools-utils_src_install
+	make_desktop_entry 'quickplot --no-pipe' Quickplot quickplot Graphics
+	mv "${ED}"/usr/share/applications/quickplot*.desktop \
+		"${ED}"/usr/share/applications/quickplot.desktop || die
+}
diff --git a/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild b/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
new file mode 100644
index 000000000000..962d54e5556f
--- /dev/null
+++ b/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+MY_P=${P/_rc/rc}
+
+DESCRIPTION="A fast interactive 2D plotter"
+HOMEPAGE="http://quickplot.sourceforge.net/ https://github.com/lanceman2/quickplot"
+SRC_URI="https://github.com/lanceman2/${PN}/archive/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="
+	media-libs/libsndfile
+	>=sys-libs/readline-0.6.2:0=
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	media-gfx/imagemagick
+	virtual/pkgconfig
+	www-client/lynx"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+src_prepare() {
+	sed -i \
+		-e '/libquickplot_la_LIBADD/s:$: -lm:g' \
+		-e 's/ $(htmldir)/ $(DESTDIR)$(htmldir)/g' \
+		Makefile.am || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-developer \
+		$(use_enable static-libs static)
+}
+
+src_install () {
+	default
+	make_desktop_entry 'quickplot --no-pipe' Quickplot quickplot Graphics
+	mv "${ED%/}"/usr/share/applications/quickplot{*,}.desktop || die
+}
diff --git a/sci-visualization/spectromatic/Manifest b/sci-visualization/spectromatic/Manifest
new file mode 100644
index 000000000000..b52023caecd4
--- /dev/null
+++ b/sci-visualization/spectromatic/Manifest
@@ -0,0 +1,8 @@
+AUX spectromatic-1.0-makefile.patch 1155 SHA256 bd39ec352e6420899f165896fff1989e8fa713e8da4d2026c09c4b7158e08ae5 SHA512 695eba1642daa8a1f5379e1272731000e9de73a3152d9af923ed64331a4a249c17ea1e2adbb1c90b388c667730a88fb8cf529f2dfdfbf1812a1ab7191331f6d3 WHIRLPOOL 0c03cd5be5e3fc079ac39d3d57f498b8c1a0ef24fae5b07629f5fb5ba3d94d7c6f98473e9210e303f97c9ec61ed1bd7596bda8c1c853b21dc7288b9f38049c96
+AUX spectromatic-1.0-stringliteral.patch 2111 SHA256 1860af1eb5029f1fdd4eb078ebac42bc8adf03ace629bc40d55525e2ff1ee6ed SHA512 a15ca056d2d9ff31223e17e4a95120e842850626f1cbff350091449d5e5929cdac731c67d58f1039fab848e3aeda1851cec6b2cb8d1b4ffd906660d264f29a71 WHIRLPOOL dcee9107e3dd13b410df7d64138a379c31d0df1ebe2ee862bb8c66b2b1c5fcb860b919b7ac205a30ba0806eb9d17f61de64ed12c57b1e160bc9efbefe275465c
+AUX spectromatic-1.0-waveheaderstruct-amd64.patch 3821 SHA256 d82ada202841cfa4c7bea26837d0a2b495f196cd1dc1bba5dfb0b699c1773b38 SHA512 45f861395dbe03bfc61120388d833e9997afd14888d4ef3583660676384eacb53755bcd95e4b39150cce6df1f11952260e4460bc15862249af928784e4ddf115 WHIRLPOOL 81e671e0f7b902c52937f7ab864628e5e6f131278cb4f79d9ca71d627236cede721950fb0744853d9fecd62abb6ca0c16d73d132e1d525d5e39e28f23e005aa8
+DIST spectromatic_1.0-1.tar.gz 13724 SHA256 5ed057c6c37cc7c5a6a1c8975cb0a74085baa8b18467f4643d40c0986fc45fd4 SHA512 b83acaacd21f7eb12ee3fd955073e8f95c02649de833a6087cf62786b20d8d1bf9a5b62920c17435510237797c6bc3a378921c4c1c2c4e4f74acbca49becfd6c WHIRLPOOL e724a8159624979980241f14bd72010431ad3c51382b9f29a2b5676b3e0585db2dbcb5341fb1fe599706024ece95d290a6aabd6aa5ac64e837640cdaf52a90fe
+EBUILD spectromatic-1.0-r3.ebuild 765 SHA256 3c54b42ecbbca4a183e236f51f8cb3b3c5936f7227cfc87bebcbee5519498c98 SHA512 565a8b9e535bd9bdb2c657b40144bfe381dbc8389a605831890ff15c7cb2d997665ba74e561e361743ec0f5682cd9063dc6838eb48e069c6939667773555577b WHIRLPOOL 7f14f62fc72adced517eeee810598ed47cc1e0464d89f62d51cfd4c56280041d5d743eb187f1c2025e23f8ca2466e7150aa360b321d8eb66b9ab408889b6025b
+MISC ChangeLog 2598 SHA256 4eb60ddea2aaf0739bbc28e458cef42037e7979f279758754496b5bf8b5e6ed1 SHA512 88639ec38dee3112283b77da0e7a00782ffd6c4b413292c15d94fbe864174703f79d6a386e4f8df030508d24d17dd57fc5dd005bfbe5dd45776625fb35342af0 WHIRLPOOL 0c02f653f289c17dd741713cffc6345e2430e69990a2248deaf1e277a9e1f63986af71c2caa260be4cccaa634ef7ffc15fdfed3d1586fa7a896233fa5f088fd9
+MISC ChangeLog-2015 3225 SHA256 4e06250f17b07acf8df8a18c49cacf2a6b44267d0e56cc0a44974135dce467c5 SHA512 c5321472eeefb218550d4ca3dcb094a760bf2d1d54e0dce508907ed1bb3b9a3ecbbfc841337959afd0c6ff226441f80011d3e321eacf1091488bd377dc16ee2e WHIRLPOOL d6d13fde3af77c9db5bbedb5bd5269baaf8e4bd655cdd201d924e43e04d9722a3b025ecb600a238703d633f881f5db9b68686dd279d8aed3c8701ac83e0a8f88
+MISC metadata.xml 887 SHA256 bfb0364806964e3a5a9b2e1a0bda309de05cac690e42cae4c2a29d1c269a7877 SHA512 1271a92e21dbb7ee8915dd989eb82a2b04d82fd6c791f73a625d34e6192c0d9bc571ae64fd4158d9d9edd7c40d8c8deac988c2f6d682c051cbb1c5376468e715 WHIRLPOOL 8c94c99ccfca612b0b7f12eb82fb7489d83dc93e886bcd732ecfe0a4d4d0186cefe6d9622ac5fa6b866303973e2ea33ae5c2fef80478b68363ec2271d4ef721d
diff --git a/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch b/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch
new file mode 100644
index 000000000000..619aaecf7a89
--- /dev/null
+++ b/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch
@@ -0,0 +1,49 @@
+Respect LDFLAGS, CFLAGS, CC  #334715
+Fix install paths
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,33 +1,29 @@
+ # Makefile for spectromatic
+ 
+-CFLAGS = -O2 -Wall 
+-LIBS = -lgsl -lgslcblas -lpng -lm
++LIBS = -lpng `pkg-config --libs gsl`
+ DESTDIR =
+-TOPLEVEL_HOME = /usr
++TOPLEVEL_HOME ?= /usr
+ 
+-CC = gcc -I.
+-
+ SRC = spectromatic.c wave.c
+ 
+ OBJ = $(SRC:.c=.o)
+ 
+ TARGET = spectromatic
+ 
+-install:	all
+-	mkdir -p $(DESTDIR)$(TOPLEVEL_HOME)/bin
+-	mkdir -p $(DESTDIR)$(TOPLEVEL_HOME)/man/man1
+-	install -o root -g root -m 0755 spectromatic $(DESTDIR)$(TOPLEVEL_HOME)/bin
+-	install -o root -g root -m 0644 man/spectromatic.1 $(DESTDIR)$(TOPLEVEL_HOME)/man/man1
+-
+ all:	$(OBJ)
+-	$(CC) -o $(TARGET) $(OBJ) $(LIBS)
+-	strip $(TARGET)
++	$(CC) $(LDFLAGS) $(OBJ) $(LIBS) -o $(TARGET)
++
++install: $(TARGET)
++	mkdir -p $(DESTDIR)$(TOPLEVEL_HOME)/bin
++	mkdir -p $(DESTDIR)$(TOPLEVEL_HOME)/share/man/man1
++	install -m 0755 spectromatic $(DESTDIR)$(TOPLEVEL_HOME)/bin
++	install -m 0644 man/spectromatic.1 $(DESTDIR)$(TOPLEVEL_HOME)/share/man/man1
+ 
+ clean:
+ 	$(RM) $(TARGET) $(OBJ)
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -c $< 
++	$(CC) $(CFLAGS) -I. -c $< 
+ 
+ .o:
+ 	$(CC) $< $(LIBS) -o $@
diff --git a/sci-visualization/spectromatic/files/spectromatic-1.0-stringliteral.patch b/sci-visualization/spectromatic/files/spectromatic-1.0-stringliteral.patch
new file mode 100644
index 000000000000..d7233c1aab81
--- /dev/null
+++ b/sci-visualization/spectromatic/files/spectromatic-1.0-stringliteral.patch
@@ -0,0 +1,78 @@
+diff -ru spectromatic-1.0/spectromatic.c spectromatic-1.0-new/spectromatic.c
+--- a/spectromatic.c
++++ b/spectromatic.c
+@@ -21,6 +21,7 @@
+  ****************************************************************************/
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <malloc.h>
+ #include <png.h>
+ #include <string.h>
+@@ -37,36 +38,36 @@
+ void usage (char *pname)
+ {
+ 	fprintf (stderr,
+-"
+-Usage: %s [options] file.wav
+-
+-Options:
+-	--window <size>		FFT window size (default: 2048)
+-	
+-	--step <size>		Slide the window by <size> samples each time 
+-				(default: 200)
+-	
+-	--inverse		White/Colour-on-black
+-	
+-	--logarithmic		Intensity is calculated by
+-				log10 (1 + 9 * (amplitude / max_amp)) -
+-				better for visualising weaker signals
+-
+-	--combine XYZ		Determines how a stereo signal is
+-				represented as an RGB image. The argument is
+-				a 3-character block, each character
+-				corresponding to R, G and B components. It
+-				may take values of L, R, A, D, X or Z,
+-				meaning Left, Right, Average, Difference,
+-				Cross-Correlation or Zero respectively.
+-
+-	--verbose		Slightly less quiet
+-	
+-	--version		Print out the version
+-	
+-	--help			You're in it.
+-
+-", pname);
++"\n"
++"Usage: %s [options] file.wav\n"
++"\n"
++"Options:\n"
++"	--window <size>		FFT window size (default: 2048)\n"
++"\n"
++"	--step <size>		Slide the window by <size> samples each time \n"
++"				(default: 200)\n"
++"\n"
++"	--inverse		White/Colour-on-black\n"
++"\n"
++"	--logarithmic		Intensity is calculated by\n"
++"				log10 (1 + 9 * (amplitude / max_amp)) -\n"
++"				better for visualising weaker signals\n"
++"\n"
++"	--combine XYZ		Determines how a stereo signal is\n"
++"				represented as an RGB image. The argument is\n"
++"				a 3-character block, each character\n"
++"				corresponding to R, G and B components. It\n"
++"				may take values of L, R, A, D, X or Z,\n"
++"				meaning Left, Right, Average, Difference,\n"
++"				Cross-Correlation or Zero respectively.\n"
++"\n"
++"	--verbose		Slightly less quiet\n"
++"\n"
++"	--version		Print out the version\n"
++"\n"
++"	--help			You're in it.\n"
++"\n"
++, pname);
+ 	
+ 
+ 	exit (-1);
diff --git a/sci-visualization/spectromatic/files/spectromatic-1.0-waveheaderstruct-amd64.patch b/sci-visualization/spectromatic/files/spectromatic-1.0-waveheaderstruct-amd64.patch
new file mode 100644
index 000000000000..0c4253e7e765
--- /dev/null
+++ b/sci-visualization/spectromatic/files/spectromatic-1.0-waveheaderstruct-amd64.patch
@@ -0,0 +1,103 @@
+--- a/wave.c
++++ b/wave.c
+@@ -1,11 +1,26 @@
+ #include <stdio.h>
+ #include <string.h>
++#include <endian.h>
+ #include "wave.h"
+ 
+ int read_header (FILE *f, waveheaderstruct *header)
+ {
++	waveheaderstruct h;
+ 	fseek (f, 0, SEEK_SET);
+-	return fread (header, 1, sizeof (waveheaderstruct), f);
++	size_t red = fread (&h, 1, sizeof (waveheaderstruct), f);
++	
++	h.length = le32toh(h.length);
++	h.length_chunk = le32toh(h.length_chunk);
++	h.format = le16toh(h.format);
++	h.modus = le16toh(h.modus);
++	h.sample_fq = le32toh(h.sample_fq);
++	h.byte_p_sec = le32toh(h.byte_p_sec);
++	h.byte_p_spl = le16toh(h.byte_p_spl);
++	h.bit_p_spl = le16toh(h.bit_p_spl);
++	h.data_length = le32toh(h.data_length);
++	
++	*header = h;
++	return red;
+ }
+ 
+ int read_frames (FILE *f, int start, int length, char *data)
+@@ -52,12 +67,12 @@
+ 	
+ 	read_header (f, &header);
+ 	
+-	printf ("Length: %lu\n", header.length);
+-	printf ("Length Chunk: %lu\n", header.length_chunk);
++	printf ("Length: %lu\n", (unsigned long)header.length);
++	printf ("Length Chunk: %lu\n", (unsigned long)header.length_chunk);
+ 	printf ("Format: %u\n", header.format);
+ 	printf ("Modus: %u\n", header.modus);
+-	printf ("Sample Frequency: %lu\n", header.sample_fq);
+-	printf ("Bytes per Second: %lu\n", header.byte_p_sec);
++	printf ("Sample Frequency: %lu\n", (unsigned long)header.sample_fq);
++	printf ("Bytes per Second: %lu\n", (unsigned long)header.byte_p_sec);
+ 	printf ("Bytes per Sample: %u\n", header.byte_p_spl);
+-	printf ("Data Length: %lu\n", header.data_length);
++	printf ("Data Length: %lu\n", (unsigned long)header.data_length);
+ }
+--- a/wave.h
++++ b/wave.h
+@@ -22,24 +22,25 @@
+ #ifndef WAVE_H
+ #define WAVE_H
+ 
+-typedef unsigned long ulongT;
+-typedef unsigned short ushortT;
++#include <stdint.h>
+ 
++#pragma pack(push,1)
+ typedef struct {		/* header for WAV-Files */
+-	char		main_chunk[4];	/* 'RIFF' */
+-	unsigned long	length;		/* length of file */
+-	char		chunk_type[4];	/* 'WAVE' */
+-	char		sub_chunk[4];	/* 'fmt' */
+-	unsigned long	length_chunk;	/* length sub_chunk, always 16 bytes */
+-	unsigned short	format;		/* always 1 = PCM-Code */
+-	unsigned short	modus;		/* 1 = Mono, 2 = Stereo */
+-	unsigned long	sample_fq;	/* Sample Freq */
+-	unsigned long	byte_p_sec;	/* Data per sec */
+-	unsigned short	byte_p_spl;	/* Bytes per sample */
+-	unsigned short	bit_p_spl;	/* bits per sample, 8, 12, 16 */
+-	char		data_chunk[4];	/* 'data' */
+-	unsigned long	data_length;	/* length of data */
+-} waveheaderstruct;
++	uint8_t		main_chunk[4];	/* 'RIFF' */
++	uint32_t	length;		/* length of file */
++	uint8_t		chunk_type[4];	/* 'WAVE' */
++	uint8_t		sub_chunk[4];	/* 'fmt' */
++	uint32_t	length_chunk;	/* length sub_chunk, always 16 bytes */
++	uint16_t	format;		/* always 1 = PCM-Code */
++	uint16_t	modus;		/* 1 = Mono, 2 = Stereo */
++	uint32_t	sample_fq;	/* Sample Freq */
++	uint32_t	byte_p_sec;	/* Data per sec */
++	uint16_t	byte_p_spl;	/* Bytes per sample */
++	uint16_t	bit_p_spl;	/* bits per sample, 8, 12, 16 */
++	uint8_t		data_chunk[4];	/* 'data' */
++	uint32_t	data_length;	/* length of data */
++} __attribute__ ((__packed__)) waveheaderstruct;
++#pragma pack(pop)
+ 
+ int read_header (FILE *f, waveheaderstruct *header);
+ int read_frames (FILE *f, int start, int length, char *data);
+--- a/spectromatic.c
++++ b/spectromatic.c
+@@ -217,7 +217,7 @@
+ 		if (header.modus == 2)
+ 			ch2 = (double*) malloc (window_size * sizeof (double));
+ 
+-		fprintf (stderr, "samples = %li, step_size = %i, window_size = %i\n", header.data_length / header.byte_p_spl, step_size, window_size);
++		fprintf (stderr, "samples = %lu, step_size = %i, window_size = %i\n", (unsigned long)header.data_length / header.byte_p_spl, step_size, window_size);
+ 
+ 		for (i = -window_size; i < window_size + (int)(header.data_length / header.byte_p_spl); i += step_size) {
+ 			read_frames (f, i, window_size, data);
diff --git a/sci-visualization/spectromatic/metadata.xml b/sci-visualization/spectromatic/metadata.xml
new file mode 100644
index 000000000000..abcd7bb71213
--- /dev/null
+++ b/sci-visualization/spectromatic/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  Spectromatic is a program for generating spectrograms from audio
+  files. Spectrograms are a form of simple time-frequency analysis which
+  lets you see how the distribution of energy at different frequencies
+  in an audio stream change over time. For example, if you play a scale
+  on a musical instrument, you will see a climbing and/or descending
+  pattern of blobs as you move from left to right.  
+  Spectromatic reads its input as mono or stereo 16-bit wave files, and
+  writes the output image to an elongated PNG image (colour for stereo,
+  grayscale for mono audio). 
+</longdescription>
+</pkgmetadata>
diff --git a/sci-visualization/spectromatic/spectromatic-1.0-r3.ebuild b/sci-visualization/spectromatic/spectromatic-1.0-r3.ebuild
new file mode 100644
index 000000000000..d7bd8aaf7c93
--- /dev/null
+++ b/sci-visualization/spectromatic/spectromatic-1.0-r3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+MY_P=${PN}_${PV}-1
+
+DESCRIPTION="Generates time-frequency analysis images from wav files"
+HOMEPAGE="http://ieee.uow.edu.au/~daniel/software/spectromatic/"
+SRC_URI="http://ieee.uow.edu.au/~daniel/software/spectromatic/dist/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	media-libs/libpng:0=
+	sci-libs/gsl:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-stringliteral.patch
+	"${FILESDIR}"/${P}-waveheaderstruct-amd64.patch
+)
+
+src_configure() {
+	tc-export CC
+	export TOPLEVEL_HOME="${EPREFIX}/usr"
+}
diff --git a/sci-visualization/spyview/Manifest b/sci-visualization/spyview/Manifest
new file mode 100644
index 000000000000..562627a161f3
--- /dev/null
+++ b/sci-visualization/spyview/Manifest
@@ -0,0 +1,8 @@
+AUX spyview-20150124-gcc6cxx14-9.patch 27891 SHA256 67e0dcd5df5786dfc03e4e43b796f6714985333f10a68acba79d22b56de7de13 SHA512 f70140450eca6018773d153a5a318fe197ee4341edfafa9bc6f896488fb9819cff8572142afdf90fd408e30e0d8f21e970ea6875f6769179b7432eb676da3261 WHIRLPOOL 5a1ae179b7255ea9fb9573ca0e0d356e1830681a2c6cfe5ffa1b292f4309f4d9f3a796d3a60f56ad472214bdbfaa3145bf76c49d4fd1b0bf954b6de592ab5a4b
+AUX spyview-20150124-gnuplot_interface_fix.patch 197 SHA256 e613da365f358a3c63bc6d9c47f14eebe02616cad52dfab500378ed87c44eb61 SHA512 c19eb6f4b9990683b57de6b438bb2d1de93c5671855b53ade1993913cc2fd05b0e9a90cdd6f89a7ba924d16c6446d9d8db89da89525313563bfcab04ba035ab0 WHIRLPOOL dfc9c83068a7baeddf3a401c6ed4cce159241e3e2fe518a5684b34787ebf6386a97f2f53ba67a8ad330bab467df2fb37d5416215dc0ea7044e92a64f5c505c99
+DIST spyview-20150124.tgz 14772947 SHA256 11c3b658e0f957403360fdfc99e387e3b2c52af3a70cf5b2d0a5fbadd2a0af34 SHA512 63c58c7729ceab9e1bfbb14b5d257a1d4ca51e43f7b014caffc8adf66767c17b47794b34cfc2f754c2905ff926302d66d438a582fe359a6c8d3e04b072993f5b WHIRLPOOL daea9a31eec83c945032bcc85f29c957633e0ec5270c95e2f88a6ca0a2ed46f8e178ff7519fafc6e0dec9cefed5b4fe2385443563a1dcb5733916775dc747ea2
+EBUILD spyview-20150124-r1.ebuild 1336 SHA256 ac456bf3f1838764e6632351fe007e505759c2bab76f66bd432adf0dbf36af6e SHA512 b34fb41eec507a024698e524335c9cdc9f0778767610e740630f611b2b63407698f916b344d89111f01c6f3625d077f1d1254e1b3b8437803c5626d8f961571e WHIRLPOOL 8350ba362d6f9b915c2e99db862a1139aea3bf5c5636993a21b34b8157980cf7a670b39b15af2c821f883c5b9f0e3fa4e6080c5d90c6a8f7d0121608fa094927
+EBUILD spyview-20150124.ebuild 1256 SHA256 b8906372f248ea5c384a85727ac2f2b2251f228e7dd5f9e85735382f826c39ae SHA512 92066ea34603899b8b016bfa65f2a2eed021718fb711253c5026cef9ce944ba41a2c3e2d165b9142a90f6ff0378f3b3d90a22f2f74b74cbf773aec9fd188ac30 WHIRLPOOL 7cbc1f4ce12bfdb7c7b45c68c0f88477ff4b71305b378ead7e3a3df75049f72492279269c2cffbca202f3b53fa453ecbe78449c22e50ef9882b0cbf332e22075
+MISC ChangeLog 2419 SHA256 fbe5e3f5c489bde00ecc91cff18332d16a3e14d309d51897e76065740bd0587e SHA512 023970852936246c8bf1fee00e2a04d8c8f7f9f1b58740e1fd40f88b8e2ea9e4906053855e47e8222fc5a3c4a4f10caa9b027658b052158a03cd0fa8a2abd91f WHIRLPOOL fe3101349c55892ff17c7a1168184d0d8ef76dd02241c33bc35ce415f5358b7ba55e3aa00e1a03c11c4d7b8cc5219a96762a81c6c01cf2188e61d36b13d42c3c
+MISC ChangeLog-2015 4611 SHA256 00f378900394e104c49615a5b6f91f1a0d6464a9fdaee25b87feb08adb0fee45 SHA512 9bbf12d12a2438715f085dbafb462d911419b066cf5eac8be450891b2a663371b7d617f72eb8eafe69791b0eaf3679373bc73a6c399f506329a6f0eda1f1466b WHIRLPOOL 65a16b63ac04a48ccaad032e9a58518add2c03a5c304d6a77ca5ac9ad65085273ff169f6beb0e005ec64fe0bdc14498887690f078a30f9b458b83aa3e92c1afd
+MISC metadata.xml 346 SHA256 fbf42093f57ae9628489fce74931dbfe26fc60a1dff2e75e85c90ea772325127 SHA512 51dd8374cf0d0a3e18fc12a8a549a553ea9bc0a66b18fdadf39e5f0102e4ac5ddfe403de35372d95d8e2ab06b9b530118b5977ff466952e905fe7facbf23b52f WHIRLPOOL 1ca85b1bf970c0d020041df389af6f7ef7a49f3f71fe892197e9ec898b014e1e97ba1f85ba539a3f42645d5412fef8a0392826ab22716e1f16cd75d028866fd7
diff --git a/sci-visualization/spyview/files/spyview-20150124-gcc6cxx14-9.patch b/sci-visualization/spyview/files/spyview-20150124-gcc6cxx14-9.patch
new file mode 100644
index 000000000000..0c19851d4459
--- /dev/null
+++ b/sci-visualization/spyview/files/spyview-20150124-gcc6cxx14-9.patch
@@ -0,0 +1,1249 @@
+diff --git a/configure.ac b/configure.ac
+index 5e1cfff..f1d777f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,6 +6,9 @@ AC_CONFIG_SRCDIR([spyview/ImageWindow.C])
+ AC_CONFIG_HEADER([config.h])
+ USER_DIRS
+ 
++# For local macros
++AC_CONFIG_MACRO_DIR([m4])
++
+ #
+ # Work out our target
+ #
+@@ -27,6 +30,10 @@ AM_CONDITIONAL(WINDOWS,test $windows_target = yes)
+ AC_PROG_CXX
+ AC_PROG_CC
+ AM_PROG_CC_C_O
++
++# Check for C++11 language standard
++AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
++
+ # Check for fluid
+ AC_PATH_PROG(FLUID,fluid,none)
+ AC_ARG_VAR(FLUID,[path to executable to compile .fl files])
+diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4
+new file mode 100644
+index 0000000..5032bba
+--- /dev/null
++++ b/m4/ax_cxx_compile_stdcxx.m4
+@@ -0,0 +1,982 @@
++# ===========================================================================
++#  https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
++#
++# DESCRIPTION
++#
++#   Check for baseline language coverage in the compiler for the specified
++#   version of the C++ standard.  If necessary, add switches to CXX and
++#   CXXCPP to enable support.  VERSION may be '11' (for the C++11 standard)
++#   or '14' (for the C++14 standard).
++#
++#   The second argument, if specified, indicates whether you insist on an
++#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
++#   -std=c++11).  If neither is specified, you get whatever works, with
++#   preference for an extended mode.
++#
++#   The third argument, if specified 'mandatory' or if left unspecified,
++#   indicates that baseline support for the specified C++ standard is
++#   required and that the macro should error out if no mode with that
++#   support is found.  If specified 'optional', then configuration proceeds
++#   regardless, after defining HAVE_CXX${VERSION} if and only if a
++#   supporting mode is found.
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
++#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
++#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
++#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
++#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
++#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
++#   Copyright (c) 2016 Krzesimir Nowak <qdlacz@gmail.com>
++#
++#   Copying and distribution of this file, with or without modification, are
++#   permitted in any medium without royalty provided the copyright notice
++#   and this notice are preserved.  This file is offered as-is, without any
++#   warranty.
++
++#serial 7
++
++dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
++dnl  (serial version number 13).
++
++AX_REQUIRE_DEFINED([AC_MSG_WARN])
++AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
++  m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"],
++        [$1], [14], [ax_cxx_compile_alternatives="14 1y"],
++        [$1], [17], [ax_cxx_compile_alternatives="17 1z"],
++        [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
++  m4_if([$2], [], [],
++        [$2], [ext], [],
++        [$2], [noext], [],
++        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl
++  m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true],
++        [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
++        [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
++        [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
++  AC_LANG_PUSH([C++])dnl
++  ac_success=no
++  AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
++  ax_cv_cxx_compile_cxx$1,
++  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
++    [ax_cv_cxx_compile_cxx$1=yes],
++    [ax_cv_cxx_compile_cxx$1=no])])
++  if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
++    ac_success=yes
++  fi
++
++  m4_if([$2], [noext], [], [dnl
++  if test x$ac_success = xno; then
++    for alternative in ${ax_cxx_compile_alternatives}; do
++      switch="-std=gnu++${alternative}"
++      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
++      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
++                     $cachevar,
++        [ac_save_CXX="$CXX"
++         CXX="$CXX $switch"
++         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
++          [eval $cachevar=yes],
++          [eval $cachevar=no])
++         CXX="$ac_save_CXX"])
++      if eval test x\$$cachevar = xyes; then
++        CXX="$CXX $switch"
++        if test -n "$CXXCPP" ; then
++          CXXCPP="$CXXCPP $switch"
++        fi
++        ac_success=yes
++        break
++      fi
++    done
++  fi])
++
++  m4_if([$2], [ext], [], [dnl
++  if test x$ac_success = xno; then
++    dnl HP's aCC needs +std=c++11 according to:
++    dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
++    dnl Cray's crayCC needs "-h std=c++11"
++    for alternative in ${ax_cxx_compile_alternatives}; do
++      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
++        cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
++        AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
++                       $cachevar,
++          [ac_save_CXX="$CXX"
++           CXX="$CXX $switch"
++           AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
++            [eval $cachevar=yes],
++            [eval $cachevar=no])
++           CXX="$ac_save_CXX"])
++        if eval test x\$$cachevar = xyes; then
++          CXX="$CXX $switch"
++          if test -n "$CXXCPP" ; then
++            CXXCPP="$CXXCPP $switch"
++          fi
++          ac_success=yes
++          break
++        fi
++      done
++      if test x$ac_success = xyes; then
++        break
++      fi
++    done
++  fi])
++  AC_LANG_POP([C++])
++  if test x$ax_cxx_compile_cxx$1_required = xtrue; then
++    if test x$ac_success = xno; then
++      AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
++    fi
++  fi
++  if test x$ac_success = xno; then
++    HAVE_CXX$1=0
++    AC_MSG_NOTICE([No compiler with C++$1 support was found])
++  else
++    HAVE_CXX$1=1
++    AC_DEFINE(HAVE_CXX$1,1,
++              [define if the compiler supports basic C++$1 syntax])
++  fi
++  AC_SUBST(HAVE_CXX$1)
++  m4_if([$1], [17], [AC_MSG_WARN([C++17 is not yet standardized, so the checks may change in incompatible ways anytime])])
++])
++
++
++dnl  Test body for checking C++11 support
++
++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
++  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
++)
++
++
++dnl  Test body for checking C++14 support
++
++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
++  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
++  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
++)
++
++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17],
++  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
++  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
++  _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
++)
++
++dnl  Tests for new features in C++11
++
++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
++
++// If the compiler admits that it is not ready for C++11, why torture it?
++// Hopefully, this will speed up the test.
++
++#ifndef __cplusplus
++
++#error "This is not a C++ compiler"
++
++#elif __cplusplus < 201103L
++
++#error "This is not a C++11 compiler"
++
++#else
++
++namespace cxx11
++{
++
++  namespace test_static_assert
++  {
++
++    template <typename T>
++    struct check
++    {
++      static_assert(sizeof(int) <= sizeof(T), "not big enough");
++    };
++
++  }
++
++  namespace test_final_override
++  {
++
++    struct Base
++    {
++      virtual void f() {}
++    };
++
++    struct Derived : public Base
++    {
++      virtual void f() override {}
++    };
++
++  }
++
++  namespace test_double_right_angle_brackets
++  {
++
++    template < typename T >
++    struct check {};
++
++    typedef check<void> single_type;
++    typedef check<check<void>> double_type;
++    typedef check<check<check<void>>> triple_type;
++    typedef check<check<check<check<void>>>> quadruple_type;
++
++  }
++
++  namespace test_decltype
++  {
++
++    int
++    f()
++    {
++      int a = 1;
++      decltype(a) b = 2;
++      return a + b;
++    }
++
++  }
++
++  namespace test_type_deduction
++  {
++
++    template < typename T1, typename T2 >
++    struct is_same
++    {
++      static const bool value = false;
++    };
++
++    template < typename T >
++    struct is_same<T, T>
++    {
++      static const bool value = true;
++    };
++
++    template < typename T1, typename T2 >
++    auto
++    add(T1 a1, T2 a2) -> decltype(a1 + a2)
++    {
++      return a1 + a2;
++    }
++
++    int
++    test(const int c, volatile int v)
++    {
++      static_assert(is_same<int, decltype(0)>::value == true, "");
++      static_assert(is_same<int, decltype(c)>::value == false, "");
++      static_assert(is_same<int, decltype(v)>::value == false, "");
++      auto ac = c;
++      auto av = v;
++      auto sumi = ac + av + 'x';
++      auto sumf = ac + av + 1.0;
++      static_assert(is_same<int, decltype(ac)>::value == true, "");
++      static_assert(is_same<int, decltype(av)>::value == true, "");
++      static_assert(is_same<int, decltype(sumi)>::value == true, "");
++      static_assert(is_same<int, decltype(sumf)>::value == false, "");
++      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
++      return (sumf > 0.0) ? sumi : add(c, v);
++    }
++
++  }
++
++  namespace test_noexcept
++  {
++
++    int f() { return 0; }
++    int g() noexcept { return 0; }
++
++    static_assert(noexcept(f()) == false, "");
++    static_assert(noexcept(g()) == true, "");
++
++  }
++
++  namespace test_constexpr
++  {
++
++    template < typename CharT >
++    unsigned long constexpr
++    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
++    {
++      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
++    }
++
++    template < typename CharT >
++    unsigned long constexpr
++    strlen_c(const CharT *const s) noexcept
++    {
++      return strlen_c_r(s, 0UL);
++    }
++
++    static_assert(strlen_c("") == 0UL, "");
++    static_assert(strlen_c("1") == 1UL, "");
++    static_assert(strlen_c("example") == 7UL, "");
++    static_assert(strlen_c("another\0example") == 7UL, "");
++
++  }
++
++  namespace test_rvalue_references
++  {
++
++    template < int N >
++    struct answer
++    {
++      static constexpr int value = N;
++    };
++
++    answer<1> f(int&)       { return answer<1>(); }
++    answer<2> f(const int&) { return answer<2>(); }
++    answer<3> f(int&&)      { return answer<3>(); }
++
++    void
++    test()
++    {
++      int i = 0;
++      const int c = 0;
++      static_assert(decltype(f(i))::value == 1, "");
++      static_assert(decltype(f(c))::value == 2, "");
++      static_assert(decltype(f(0))::value == 3, "");
++    }
++
++  }
++
++  namespace test_uniform_initialization
++  {
++
++    struct test
++    {
++      static const int zero {};
++      static const int one {1};
++    };
++
++    static_assert(test::zero == 0, "");
++    static_assert(test::one == 1, "");
++
++  }
++
++  namespace test_lambdas
++  {
++
++    void
++    test1()
++    {
++      auto lambda1 = [](){};
++      auto lambda2 = lambda1;
++      lambda1();
++      lambda2();
++    }
++
++    int
++    test2()
++    {
++      auto a = [](int i, int j){ return i + j; }(1, 2);
++      auto b = []() -> int { return '0'; }();
++      auto c = [=](){ return a + b; }();
++      auto d = [&](){ return c; }();
++      auto e = [a, &b](int x) mutable {
++        const auto identity = [](int y){ return y; };
++        for (auto i = 0; i < a; ++i)
++          a += b--;
++        return x + identity(a + b);
++      }(0);
++      return a + b + c + d + e;
++    }
++
++    int
++    test3()
++    {
++      const auto nullary = [](){ return 0; };
++      const auto unary = [](int x){ return x; };
++      using nullary_t = decltype(nullary);
++      using unary_t = decltype(unary);
++      const auto higher1st = [](nullary_t f){ return f(); };
++      const auto higher2nd = [unary](nullary_t f1){
++        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
++      };
++      return higher1st(nullary) + higher2nd(nullary)(unary);
++    }
++
++  }
++
++  namespace test_variadic_templates
++  {
++
++    template <int...>
++    struct sum;
++
++    template <int N0, int... N1toN>
++    struct sum<N0, N1toN...>
++    {
++      static constexpr auto value = N0 + sum<N1toN...>::value;
++    };
++
++    template <>
++    struct sum<>
++    {
++      static constexpr auto value = 0;
++    };
++
++    static_assert(sum<>::value == 0, "");
++    static_assert(sum<1>::value == 1, "");
++    static_assert(sum<23>::value == 23, "");
++    static_assert(sum<1, 2>::value == 3, "");
++    static_assert(sum<5, 5, 11>::value == 21, "");
++    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
++
++  }
++
++  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
++  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
++  // because of this.
++  namespace test_template_alias_sfinae
++  {
++
++    struct foo {};
++
++    template<typename T>
++    using member = typename T::member_type;
++
++    template<typename T>
++    void func(...) {}
++
++    template<typename T>
++    void func(member<T>*) {}
++
++    void test();
++
++    void test() { func<foo>(0); }
++
++  }
++
++}  // namespace cxx11
++
++#endif  // __cplusplus >= 201103L
++
++]])
++
++
++dnl  Tests for new features in C++14
++
++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
++
++// If the compiler admits that it is not ready for C++14, why torture it?
++// Hopefully, this will speed up the test.
++
++#ifndef __cplusplus
++
++#error "This is not a C++ compiler"
++
++#elif __cplusplus < 201402L
++
++#error "This is not a C++14 compiler"
++
++#else
++
++namespace cxx14
++{
++
++  namespace test_polymorphic_lambdas
++  {
++
++    int
++    test()
++    {
++      const auto lambda = [](auto&&... args){
++        const auto istiny = [](auto x){
++          return (sizeof(x) == 1UL) ? 1 : 0;
++        };
++        const int aretiny[] = { istiny(args)... };
++        return aretiny[0];
++      };
++      return lambda(1, 1L, 1.0f, '1');
++    }
++
++  }
++
++  namespace test_binary_literals
++  {
++
++    constexpr auto ivii = 0b0000000000101010;
++    static_assert(ivii == 42, "wrong value");
++
++  }
++
++  namespace test_generalized_constexpr
++  {
++
++    template < typename CharT >
++    constexpr unsigned long
++    strlen_c(const CharT *const s) noexcept
++    {
++      auto length = 0UL;
++      for (auto p = s; *p; ++p)
++        ++length;
++      return length;
++    }
++
++    static_assert(strlen_c("") == 0UL, "");
++    static_assert(strlen_c("x") == 1UL, "");
++    static_assert(strlen_c("test") == 4UL, "");
++    static_assert(strlen_c("another\0test") == 7UL, "");
++
++  }
++
++  namespace test_lambda_init_capture
++  {
++
++    int
++    test()
++    {
++      auto x = 0;
++      const auto lambda1 = [a = x](int b){ return a + b; };
++      const auto lambda2 = [a = lambda1(x)](){ return a; };
++      return lambda2();
++    }
++
++  }
++
++  namespace test_digit_separators
++  {
++
++    constexpr auto ten_million = 100'000'000;
++    static_assert(ten_million == 100000000, "");
++
++  }
++
++  namespace test_return_type_deduction
++  {
++
++    auto f(int& x) { return x; }
++    decltype(auto) g(int& x) { return x; }
++
++    template < typename T1, typename T2 >
++    struct is_same
++    {
++      static constexpr auto value = false;
++    };
++
++    template < typename T >
++    struct is_same<T, T>
++    {
++      static constexpr auto value = true;
++    };
++
++    int
++    test()
++    {
++      auto x = 0;
++      static_assert(is_same<int, decltype(f(x))>::value, "");
++      static_assert(is_same<int&, decltype(g(x))>::value, "");
++      return x;
++    }
++
++  }
++
++}  // namespace cxx14
++
++#endif  // __cplusplus >= 201402L
++
++]])
++
++
++dnl  Tests for new features in C++17
++
++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[
++
++// If the compiler admits that it is not ready for C++17, why torture it?
++// Hopefully, this will speed up the test.
++
++#ifndef __cplusplus
++
++#error "This is not a C++ compiler"
++
++#elif __cplusplus <= 201402L
++
++#error "This is not a C++17 compiler"
++
++#else
++
++#if defined(__clang__)
++  #define REALLY_CLANG
++#else
++  #if defined(__GNUC__)
++    #define REALLY_GCC
++  #endif
++#endif
++
++#include <initializer_list>
++#include <utility>
++#include <type_traits>
++
++namespace cxx17
++{
++
++#if !defined(REALLY_CLANG)
++  namespace test_constexpr_lambdas
++  {
++
++    // TODO: test it with clang++ from git
++
++    constexpr int foo = [](){return 42;}();
++
++  }
++#endif // !defined(REALLY_CLANG)
++
++  namespace test::nested_namespace::definitions
++  {
++
++  }
++
++  namespace test_fold_expression
++  {
++
++    template<typename... Args>
++    int multiply(Args... args)
++    {
++      return (args * ... * 1);
++    }
++
++    template<typename... Args>
++    bool all(Args... args)
++    {
++      return (args && ...);
++    }
++
++  }
++
++  namespace test_extended_static_assert
++  {
++
++    static_assert (true);
++
++  }
++
++  namespace test_auto_brace_init_list
++  {
++
++    auto foo = {5};
++    auto bar {5};
++
++    static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value);
++    static_assert(std::is_same<int, decltype(bar)>::value);
++  }
++
++  namespace test_typename_in_template_template_parameter
++  {
++
++    template<template<typename> typename X> struct D;
++
++  }
++
++  namespace test_fallthrough_nodiscard_maybe_unused_attributes
++  {
++
++    int f1()
++    {
++      return 42;
++    }
++
++    [[nodiscard]] int f2()
++    {
++      [[maybe_unused]] auto unused = f1();
++
++      switch (f1())
++      {
++      case 17:
++        f1();
++        [[fallthrough]];
++      case 42:
++        f1();
++      }
++      return f1();
++    }
++
++  }
++
++  namespace test_extended_aggregate_initialization
++  {
++
++    struct base1
++    {
++      int b1, b2 = 42;
++    };
++
++    struct base2
++    {
++      base2() {
++        b3 = 42;
++      }
++      int b3;
++    };
++
++    struct derived : base1, base2
++    {
++        int d;
++    };
++
++    derived d1 {{1, 2}, {}, 4};  // full initialization
++    derived d2 {{}, {}, 4};      // value-initialized bases
++
++  }
++
++  namespace test_general_range_based_for_loop
++  {
++
++    struct iter
++    {
++      int i;
++
++      int& operator* ()
++      {
++        return i;
++      }
++
++      const int& operator* () const
++      {
++        return i;
++      }
++
++      iter& operator++()
++      {
++        ++i;
++        return *this;
++      }
++    };
++
++    struct sentinel
++    {
++      int i;
++    };
++
++    bool operator== (const iter& i, const sentinel& s)
++    {
++      return i.i == s.i;
++    }
++
++    bool operator!= (const iter& i, const sentinel& s)
++    {
++      return !(i == s);
++    }
++
++    struct range
++    {
++      iter begin() const
++      {
++        return {0};
++      }
++
++      sentinel end() const
++      {
++        return {5};
++      }
++    };
++
++    void f()
++    {
++      range r {};
++
++      for (auto i : r)
++      {
++        [[maybe_unused]] auto v = i;
++      }
++    }
++
++  }
++
++  namespace test_lambda_capture_asterisk_this_by_value
++  {
++
++    struct t
++    {
++      int i;
++      int foo()
++      {
++        return [*this]()
++        {
++          return i;
++        }();
++      }
++    };
++
++  }
++
++  namespace test_enum_class_construction
++  {
++
++    enum class byte : unsigned char
++    {};
++
++    byte foo {42};
++
++  }
++
++  namespace test_constexpr_if
++  {
++
++    template <bool cond>
++    int f ()
++    {
++      if constexpr(cond)
++      {
++        return 13;
++      }
++      else
++      {
++        return 42;
++      }
++    }
++
++  }
++
++  namespace test_selection_statement_with_initializer
++  {
++
++    int f()
++    {
++      return 13;
++    }
++
++    int f2()
++    {
++      if (auto i = f(); i > 0)
++      {
++        return 3;
++      }
++
++      switch (auto i = f(); i + 4)
++      {
++      case 17:
++        return 2;
++
++      default:
++        return 1;
++      }
++    }
++
++  }
++
++#if !defined(REALLY_CLANG)
++  namespace test_template_argument_deduction_for_class_templates
++  {
++
++    // TODO: test it with clang++ from git
++
++    template <typename T1, typename T2>
++    struct pair
++    {
++      pair (T1 p1, T2 p2)
++        : m1 {p1},
++          m2 {p2}
++      {}
++
++      T1 m1;
++      T2 m2;
++    };
++
++    void f()
++    {
++      [[maybe_unused]] auto p = pair{13, 42u};
++    }
++
++  }
++#endif // !defined(REALLY_CLANG)
++
++  namespace test_non_type_auto_template_parameters
++  {
++
++    template <auto n>
++    struct B
++    {};
++
++    B<5> b1;
++    B<'a'> b2;
++
++  }
++
++#if !defined(REALLY_CLANG)
++  namespace test_structured_bindings
++  {
++
++    // TODO: test it with clang++ from git
++
++    int arr[2] = { 1, 2 };
++    std::pair<int, int> pr = { 1, 2 };
++
++    auto f1() -> int(&)[2]
++    {
++      return arr;
++    }
++
++    auto f2() -> std::pair<int, int>&
++    {
++      return pr;
++    }
++
++    struct S
++    {
++      int x1 : 2;
++      volatile double y1;
++    };
++
++    S f3()
++    {
++      return {};
++    }
++
++    auto [ x1, y1 ] = f1();
++    auto& [ xr1, yr1 ] = f1();
++    auto [ x2, y2 ] = f2();
++    auto& [ xr2, yr2 ] = f2();
++    const auto [ x3, y3 ] = f3();
++
++  }
++#endif // !defined(REALLY_CLANG)
++
++#if !defined(REALLY_CLANG)
++  namespace test_exception_spec_type_system
++  {
++
++    // TODO: test it with clang++ from git
++
++    struct Good {};
++    struct Bad {};
++
++    void g1() noexcept;
++    void g2();
++
++    template<typename T>
++    Bad
++    f(T*, T*);
++
++    template<typename T1, typename T2>
++    Good
++    f(T1*, T2*);
++
++    static_assert (std::is_same_v<Good, decltype(f(g1, g2))>);
++
++  }
++#endif // !defined(REALLY_CLANG)
++
++  namespace test_inline_variables
++  {
++
++    template<class T> void f(T)
++    {}
++
++    template<class T> inline T g(T)
++    {
++      return T{};
++    }
++
++    template<> inline void f<>(int)
++    {}
++
++    template<> int g<>(int)
++    {
++      return 5;
++    }
++
++  }
++
++}  // namespace cxx17
++
++#endif  // __cplusplus <= 201402L
++
++]])
+diff --git a/spyview/Fl_Listbox.H b/spyview/Fl_Listbox.H
+index 35803fc..832792b 100644
+--- a/spyview/Fl_Listbox.H
++++ b/spyview/Fl_Listbox.H
+@@ -5,7 +5,8 @@
+ #include <string>
+ #include <vector>
+ 
+-using namespace std;
++using std::string;
++using std::vector;
+ 
+ class Fl_Listbox : public Fl_Table
+ {
+diff --git a/spyview/ImageData.C b/spyview/ImageData.C
+index 7ee936a..eaac7a6 100644
+--- a/spyview/ImageData.C
++++ b/spyview/ImageData.C
+@@ -9,6 +9,9 @@
+ #include "mypam.h"
+ #include "../config.h"
+ 
++#include <cmath>
++using std::isnan;
++
+ #include <algorithm>
+ // From http://www.redhat.com/docs/manuals/enterprise/RHEL-3-Manual/gcc/variadic-macros.html
+ 
+@@ -2007,7 +2010,7 @@ void ImageData::grad_mag(double axis_bias)
+   xderv();
+   width = w;
+   height = h;
+-  swap(tmpx,raw_data);
++  std::swap(tmpx,raw_data);
+   yderv();
+   width = w;
+   height = h;
+@@ -2083,7 +2086,7 @@ void ImageData::dderv(double theta) // theta in degrees!
+   xderv();
+   width = w;
+   height = h;
+-  swap(tmpx,raw_data);
++  std::swap(tmpx,raw_data);
+   yderv();
+   width = w;
+   height = h;
+diff --git a/spyview/ImageData.H b/spyview/ImageData.H
+index b68cb73..4cdecb1 100644
+--- a/spyview/ImageData.H
++++ b/spyview/ImageData.H
+@@ -22,7 +22,8 @@
+ 
+ #define CHECK_ARRAY_LIMITS 0
+ 
+-using namespace std;
++using std::string;
++using std::vector;
+ 
+ typedef enum { YZ = 0, XY = 2, XZ = 1 }  mtxcut_t;
+ typedef enum { COLUMNS = 0, INDEX = 1}  gpload_t;
+diff --git a/spyview/ImagePrinter.H b/spyview/ImagePrinter.H
+index d85b440..f34ee67 100644
+--- a/spyview/ImagePrinter.H
++++ b/spyview/ImagePrinter.H
+@@ -11,7 +11,7 @@
+ 
+ #include "ImagePrinter_Control.h"
+ 
+-using namespace std;
++using std::string;
+ 
+ class ImageWindow;
+ class Image_Printer_Control;
+diff --git a/spyview/ImageWindow.C b/spyview/ImageWindow.C
+index b8bd0f9..eeae649 100644
+--- a/spyview/ImageWindow.C
++++ b/spyview/ImageWindow.C
+@@ -12,6 +12,11 @@
+ #include "ImageWindow_Module.H"
+ #include <ctype.h>
+ 
++#include <cmath>
++using std::isnan;
++
++#include "mypam.h"
++
+ #ifdef WIN32
+ 
+ #include <windows.h>
+@@ -36,8 +41,6 @@
+ #define alt(state)   (!(state & FL_CTRL) && !(state & FL_SHIFT) &&  (state & FL_ALT))
+ #define none(state)  (!(state & FL_CTRL) && !(state & FL_SHIFT) && !(state & FL_ALT))
+ 
+-using namespace std;
+-
+ FILE *fopenwarn(const char *name, const char *mode)
+ {
+   FILE *fp = fopen(name, mode);
+@@ -482,7 +485,7 @@ double current_time()
+   stop.tv_usec = (long)(tmpres % 1000000UL);
+ #endif
+   double time = (((double)(stop.tv_sec)) + ((double)(stop.tv_usec) * 1e-6));
+-  if (!isnormal(time))
++  if (!std::isnormal(time))
+     info("time %e sec %d usec %d\n", time, stop.tv_sec, stop.tv_usec);
+   return time;
+ }
+@@ -1609,7 +1612,7 @@ void ImageWindow::runQueue()
+  	  for (int n=0; n<op->num_parameters; n++)
+ 	    {
+ 	      operations_string += "-";
+-	      ostringstream os;
++	      std::ostringstream os;
+ 	      os << op->parameters[n].value;
+ 	      operations_string += os.str();
+ 	    }
+diff --git a/spyview/ImageWindow.H b/spyview/ImageWindow.H
+index 30e94ba..5d1a1e1 100644
+--- a/spyview/ImageWindow.H
++++ b/spyview/ImageWindow.H
+@@ -32,7 +32,7 @@
+ #define VERTLINE 4
+ #define OTHERLINE 8
+ 
+-#include "mypam.h"
++using std::string;
+ 
+ typedef enum { XAXIS, YAXIS, DISTANCE } lc_axis_t;
+ typedef enum { KEEPZOOM, KEEPSIZE, RESETZOOM } window_size_action_t;
+diff --git a/spyview/ImageWindow3d.C b/spyview/ImageWindow3d.C
+index 40b93e6..24fa8f4 100644
+--- a/spyview/ImageWindow3d.C
++++ b/spyview/ImageWindow3d.C
+@@ -5,6 +5,8 @@
+ #define LINEMESH 2
+ #define POLYGONS 3
+ 
++#include "mypam.h"
++
+ ImageWindow3d::ImageWindow3d(int x,int y,int w,int h,const char *l) : Fl_Gl_Window(x,y,w,h,l) 
+ {
+     data_matrix = NULL;
+diff --git a/spyview/ImageWindow3d.H b/spyview/ImageWindow3d.H
+index 683015b..e6f296f 100644
+--- a/spyview/ImageWindow3d.H
++++ b/spyview/ImageWindow3d.H
+@@ -25,9 +25,7 @@
+ #define POINTSOURCE 1
+ #define DIRECTIONAL 2
+ 
+-#include "mypam.h"
+ 
+-using namespace std;
+ 
+ #define LMAX USHRT_MAX
+ 
+diff --git a/spyview/bisector.H b/spyview/bisector.H
+index b22fb8f..c7e64a6 100644
+--- a/spyview/bisector.H
++++ b/spyview/bisector.H
+@@ -2,7 +2,9 @@
+ #define __bisector_h__
+ #include <assert.h>
+ #include <math.h>
+-using namespace std;
++
++#include <cmath>
++using std::isnan;
+ 
+ class bisector
+ {
+diff --git a/spyview/misc.h b/spyview/misc.h
+index 9ed7dfc..8ed8ba8 100644
+--- a/spyview/misc.h
++++ b/spyview/misc.h
+@@ -3,7 +3,7 @@
+ 
+ #include <string>
+ 
+-using namespace std;
++using std::string;
+ 
+ //Some useful functions
+ 
+diff --git a/spyview/spypal_gradient.C b/spyview/spypal_gradient.C
+index e522b42..4997fbd 100644
+--- a/spyview/spypal_gradient.C
++++ b/spyview/spypal_gradient.C
+@@ -22,7 +22,7 @@ void Spypal_Slider_Dragger::start_dragging(Fl_Spypal_GSlider *todrag, bool can_d
+   assert(dragging == NULL);
+   can_delete = can_delete_p;
+   dragging = todrag;
+-  colored = false;
++  colored = NULL;
+   shown = find(g->sliders.begin(),g->sliders.end(), dragging) != g->sliders.end();
+   if(!shown && (Fl::event_inside(g) || !can_delete))
+     show_dragged();
+diff --git a/spyview/spyview.C b/spyview/spyview.C
+index cd99eeb..5e5c1f6 100644
+--- a/spyview/spyview.C
++++ b/spyview/spyview.C
+@@ -27,8 +27,6 @@
+ #include "spypal_import.H"
+ #include <libgen.h>
+ 
+-using namespace std;
+-
+ //How's this for lazy...?
+ char **arg_values;
+ int arg_count;
+diff --git a/spyview/spyview.H b/spyview/spyview.H
+index 3536354..0411e87 100644
+--- a/spyview/spyview.H
++++ b/spyview/spyview.H
+@@ -10,6 +10,8 @@
+ #include <vector>
+ #include "spyview_ui.h"
+ 
++using std::string;
++
+ /*void minl_cb(Fl_Widget *, void *);
+ void maxl_cb(Fl_Widget *, void *);
+ void dminl_cb(Fl_Widget *, void *);
+diff --git a/spyview/spyview3d.C b/spyview/spyview3d.C
+index b9398d5..068d4a1 100644
+--- a/spyview/spyview3d.C
++++ b/spyview/spyview3d.C
+@@ -18,8 +18,6 @@
+ 
+ #include "mypam.h"
+ 
+-using namespace std;
+-
+ int *data;
+ int *databuf;
+ int w,h;
diff --git a/sci-visualization/spyview/files/spyview-20150124-gnuplot_interface_fix.patch b/sci-visualization/spyview/files/spyview-20150124-gnuplot_interface_fix.patch
new file mode 100644
index 000000000000..6f15296012f2
--- /dev/null
+++ b/sci-visualization/spyview/files/spyview-20150124-gnuplot_interface_fix.patch
@@ -0,0 +1,10 @@
+--- a/spyview/Gnuplot_Interface.C
++++ b/spyview/Gnuplot_Interface.C
+@@ -13,6 +13,7 @@
+ #else
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/wait.h>
+ #endif
+ using namespace boost;
+ 
diff --git a/sci-visualization/spyview/metadata.xml b/sci-visualization/spyview/metadata.xml
new file mode 100644
index 000000000000..bf93f4da9f0e
--- /dev/null
+++ b/sci-visualization/spyview/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+  <upstream>
+    <remote-id type="github">gsteele13/spyview</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-visualization/spyview/spyview-20150124-r1.ebuild b/sci-visualization/spyview/spyview-20150124-r1.ebuild
new file mode 100644
index 000000000000..d873c7d008cc
--- /dev/null
+++ b/sci-visualization/spyview/spyview-20150124-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="2D and 3D data visualization and analysis program"
+HOMEPAGE="http://nsweb.tn.tudelft.nl/~gsteele/spyview/"
+SRC_URI="https://github.com/gsteele13/spyview/archive/966012afae2fbb77262bd96a7e530e81b0ed3b90.tar.gz -> $P.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/boost-1.62.0:=
+	media-libs/netpbm
+	x11-libs/fltk:1[opengl]
+	app-text/ghostscript-gpl
+	virtual/glu
+"
+
+DEPEND="${COMMON_DEPEND}
+	sys-apps/groff"
+
+RDEPEND="${COMMON_DEPEND}
+	sci-visualization/gnuplot"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-gnuplot_interface_fix.patch
+	"${FILESDIR}/${P}"-gcc6cxx14-9.patch
+)
+
+src_unpack() {
+	default
+	mv -v "${WORKDIR}"/spyview-*/source "${S}" || die
+}
+
+src_prepare() {
+	append-cflags $(fltk-config --cflags)
+	append-cxxflags $(fltk-config --cxxflags)
+
+	append-cxxflags -std=c++14
+
+	append-cppflags -I"${EPREFIX}"/usr/include/netpbm
+
+	# append-ldflags $(fltk-config --ldflags)
+	# this one leads to an insane amount of warnings
+	append-ldflags -L$(dirname $(fltk-config --libs))
+
+	while IFS="" read -d $'\0' -r file; do
+		sed -i -e 's:-mwindows -mconsole::g' "$file" || die
+	done < <(find "${S}" -name Makefile.am -print0)
+
+	default
+	eautoreconf
+}
diff --git a/sci-visualization/spyview/spyview-20150124.ebuild b/sci-visualization/spyview/spyview-20150124.ebuild
new file mode 100644
index 000000000000..2608591392d7
--- /dev/null
+++ b/sci-visualization/spyview/spyview-20150124.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="2D and 3D data visualization and analysis program"
+HOMEPAGE="http://nsweb.tn.tudelft.nl/~gsteele/spyview/"
+SRC_URI="https://github.com/gsteele13/spyview/archive/966012afae2fbb77262bd96a7e530e81b0ed3b90.tar.gz -> $P.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	dev-libs/boost:=
+	media-libs/netpbm
+	x11-libs/fltk:1[opengl]
+	app-text/ghostscript-gpl
+	virtual/glu
+"
+
+DEPEND="${COMMON_DEPEND}
+	sys-apps/groff"
+
+RDEPEND="${COMMON_DEPEND}
+	sci-visualization/gnuplot"
+
+PATCHES=( ${FILESDIR}/${P}-gnuplot_interface_fix.patch )
+
+src_unpack() {
+	default
+	mv -v "${WORKDIR}"/spyview-*/source "${S}" || die
+}
+
+src_prepare() {
+	append-cflags $(fltk-config --cflags)
+	append-cxxflags $(fltk-config --cxxflags)
+	append-cppflags -I"${EPREFIX}"/usr/include/netpbm
+
+	# append-ldflags $(fltk-config --ldflags)
+	# this one leads to an insane amount of warnings
+	append-ldflags -L$(dirname $(fltk-config --libs))
+
+	while IFS="" read -d $'\0' -r file; do
+		sed -i -e 's:-mwindows -mconsole::g' "$file" || die
+	done < <(find "${S}" -name Makefile.am -print0)
+
+	default
+	eautoreconf
+}
diff --git a/sci-visualization/veusz/Manifest b/sci-visualization/veusz/Manifest
new file mode 100644
index 000000000000..74f30b45f3f6
--- /dev/null
+++ b/sci-visualization/veusz/Manifest
@@ -0,0 +1,9 @@
+AUX veusz.desktop 248 SHA256 dc7e1f66e993227cdab3ec9d3741c24f4887398f782df926a1c5c720710f3776 SHA512 986479153d6409a639f0daab4c2c11836927fce93feecf0bffefd7643cfa9c3ee2c24d374f2c6eaef475bc4bcfe39095c6b12bd0731c585ad213f0a4672c8047 WHIRLPOOL 81943f7498a67394ed6221c6a3ddc03719d0cb950254989401c5f9b068fa0bb8c02fb1c8836ab8250b041bf448057192a1ed6faa9475b4f0300b718efbdd3411
+AUX veusz.xml 346 SHA256 a5d2418b2f530136ac94f60334980f43ac87842756d4664095608f712542cf4f SHA512 c4f049d4648192d932560a2e73088843ecb0a2beea2e628424488d552684a8e69b84628773a08947741690eb732901bc8ae8c52fa926d1b44bf02b9046cb569e WHIRLPOOL 3b3fb053b68d5b8cd2e8a66bfa9f42d83643d9f75191918cdddc2947ab8005534e48630b21498b21f80da85a2cc4fa01bf105bf84b46038d957d9b05b7b6eaec
+DIST veusz-1.25.1.tar.gz 1883416 SHA256 d268df3f92404c0a045a124265f57ebc453069b09729bce8e265401993d56e37 SHA512 0820d2a2d30dd525656b4aad4d39eef1d24c7b98fd93d263974ba2dfb13e4c0d3914f4cb94b016aa1780f20f653df10ce5bf5ee59e9532f26471947565f0a560 WHIRLPOOL 4a03aa40ec8f7ffe187b345be1861818f483cb11036af18d19d3caefa7d98b60dd9de9b4d83ffffb7cc65e369b1269d22fd5c6820b52fcbedce9eccb58103d31
+DIST veusz-1.26.1.tar.gz 1904197 SHA256 b605a8954019712768bbeccb63d0a1f704411bbefb23fbcaaf44a82988e1c623 SHA512 eba9382e91c2653ded0ed409874b7c4db6309c93f5b2ff1b7d5c15fb88ab330f1d626f0a110055c7647a929bf8cad9c78886c2035a1cb5b8cc27159ae7bf481d WHIRLPOOL 526dec848fee6084da1598f70e0eddf037a3c8598103676ad7c847d58776da4b5eb0f32d453c43a93d6e5d77229b34fe3404ff1b7b17e77996ae95627e235d7b
+EBUILD veusz-1.25.1.ebuild 1960 SHA256 4cb8607c628aa71f16a07fc1332cffd07a87f0a4e24129a8f1aace821a471a1c SHA512 daeee8ac7b1a8c2d62fdf0ec2d902b37556f5b965ea1d45b7205e304a26976429dcc9792390355dc68e8ebcd88cd404bb4567b1f1063d1d489acc2e8ff9dd701 WHIRLPOOL 96d66fdcffe7f3694ba184a3a843b745de0886ca743436b76200ec223f7a72dde4270991ee3da8c37940968721ae3fdb5fe1da6bb49d4aba4e45149ce79e9de8
+EBUILD veusz-1.26.1.ebuild 2029 SHA256 32155b2178894732f8b4b0a9e8b7ae36fbc16ceb24c8384a4b853506035f51d0 SHA512 d39fdffd56d2ef4760a81f5b29a87dc38c381604acfddc77ed246a2e6ab07b2c2ee448a5e44327fb901a266a43e199ef1813b6efd5f68745687eb398cb00af79 WHIRLPOOL 29b244b00aa28bc64e8cd8ca6b038c736493b4d18510d050cd21dccdad67298bcd1483cd7db59b99bf1e86e03221ce6ce8906c373e0145c7d26beab578b98cb4
+MISC ChangeLog 4724 SHA256 aa20469c360fcc3754348f95841f991dbd0b1d3c4a0fab12c34ce3abba2fe216 SHA512 84f7f2cf43297348e7d27b580b0f92426afee8d8b1f0f98d84ebcb5a6bf4b70c210719525af4f96ed5be62ff483541173a2aaaf6df8274bc4b304dacda2c1620 WHIRLPOOL dbaba85257204c3ee519c8ba09d04be86b20ab076dfc1f83217c80db19bea1a3a0ed9fb78547db2a95f64dcf30293ea230a82af6b32de72e497a268f99967e20
+MISC ChangeLog-2015 7807 SHA256 f524496c0947fdbd7add5e01d03d927f1c828394dcb066253fd09301488af530 SHA512 2eec40b2080cebf72e85b12efd78be5bec2edd2230f3bca5395ca4bb2019a66b57e375e441884156210439b9dd915171d0cf15cf114bd4667f7ba87eaf5c086a WHIRLPOOL 5e6f20e66fd04fb6093d5b300869b880aec17349e3574bc2e216eb29a7e8c07801db7fe5f4f62c5a145e3a2830dbfbde3718bb8e4d4b4c151f767367e7c22b07
+MISC metadata.xml 976 SHA256 139e9cb3d42c3c9bb558337e686d8035faa81f2740c8c89da591dc5cc13fccec SHA512 0bb2b631d782f6c231775f4838d78f86612fda9fdf8f6ae2fe4ae157c1d4953cc8c54250d02b68ef4b2ee0ea50c4fb2633fd813d0049025365f7a28ba9840ea9 WHIRLPOOL 7ebbf63058549c222e7be808270050d93aa2d44b4a343a638e913311b9264d066ca7c70b6709517e6d4fcea93f8b5b61fceee8f3354714c51d7da6d4b539d7da
diff --git a/sci-visualization/veusz/files/veusz.desktop b/sci-visualization/veusz/files/veusz.desktop
new file mode 100644
index 000000000000..c4780f047e7b
--- /dev/null
+++ b/sci-visualization/veusz/files/veusz.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Veusz
+GenericName=Veusz scientific plotting
+Comment=For graphing and manipulation of scientific data
+MimeType=application/x-veusz;
+Exec=veusz %F
+Icon=veusz
+Terminal=false
+Type=Application
+Categories=Graphics;DataVisualization;
diff --git a/sci-visualization/veusz/files/veusz.xml b/sci-visualization/veusz/files/veusz.xml
new file mode 100644
index 000000000000..7e6d83d322f7
--- /dev/null
+++ b/sci-visualization/veusz/files/veusz.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+  <mime-type type="application/x-veusz">
+    <comment>Veusz saved graph</comment>
+    <glob pattern="*.vsz"/>
+    <magic priority="50">
+        <match type="string" value="# Veusz saved document" offset="0"/>
+    </magic>
+  </mime-type>
+</mime-info>
diff --git a/sci-visualization/veusz/metadata.xml b/sci-visualization/veusz/metadata.xml
new file mode 100644
index 000000000000..6f5dc7659c62
--- /dev/null
+++ b/sci-visualization/veusz/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  A Qt based scientific plotting package written in Python using PyQt. It is
+  designed to produce publication ready Postscript output. It provides a GUI,
+  command line and scripting interface (based on Python) to its plotting
+  facilities.
+</longdescription>
+  <use>
+    <flag name="fits">Add FITS format via <pkg>dev-python/astropy</pkg></flag>
+    <flag name="emf">Add FITS format via <pkg>dev-python/pyemf</pkg></flag>
+    <flag name="minuit">Use Minuit during fitting via<pkg>dev-python/pyminuit</pkg></flag>
+    <flag name="vo">Add Virtual Observatory tools via <pkg>dev-python/astropy</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">veusz</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-visualization/veusz/veusz-1.25.1.ebuild b/sci-visualization/veusz/veusz-1.25.1.ebuild
new file mode 100644
index 000000000000..8ede2c5b7ed4
--- /dev/null
+++ b/sci-visualization/veusz/veusz-1.25.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit eutils fdo-mime distutils-r1 virtualx
+
+DESCRIPTION="Qt scientific plotting package with good Postscript output"
+HOMEPAGE="http://home.gna.org/veusz/"
+SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dbus doc emf fits hdf5 minuit vo"
+
+CDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/PyQt4-4.11.4[compat,X,svg,${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/pyminuit[${PYTHON_USEDEP}] )
+	vo? (
+		dev-python/astropy[${PYTHON_USEDEP}]
+		dev-python/sampy[$(python_gen_usedep 'python2*')]
+	)"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	"
+
+python_test() {
+	distutils_install_for_testing
+	cd tests || die
+	VIRTUALX_COMMAND="${EPYTHON}" \
+		VEUSZ_RESOURCE_DIR="${S}" \
+		virtualmake 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
+	use doc && dodoc Documents/manual.pdf && \
+		dohtml -r Documents/{manimages,manual.html}
+
+	doicon icons/veusz.png
+	domenu "${FILESDIR}"/veusz.desktop
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}"/veusz.xml
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/sci-visualization/veusz/veusz-1.26.1.ebuild b/sci-visualization/veusz/veusz-1.26.1.ebuild
new file mode 100644
index 000000000000..ff2798d960f4
--- /dev/null
+++ b/sci-visualization/veusz/veusz-1.26.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit eutils fdo-mime distutils-r1 virtualx
+
+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 vo"
+
+CDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/PyQt4-4.11.4[compat,X,svg,${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}] ) )
+	vo? (
+		dev-python/astropy[${PYTHON_USEDEP}]
+		dev-python/sampy[$(python_gen_usedep 'python2*')]
+	)"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	"
+
+python_test() {
+	distutils_install_for_testing
+	cd tests || die
+	VIRTUALX_COMMAND="${EPYTHON}" \
+		VEUSZ_RESOURCE_DIR="${S}" \
+		virtualmake 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
+	use doc && dodoc Documents/manual.pdf && \
+		dohtml -r Documents/{manimages,manual.html}
+
+	doicon icons/veusz.png
+	domenu "${FILESDIR}"/veusz.desktop
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}"/veusz.xml
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/sci-visualization/visit/Manifest b/sci-visualization/visit/Manifest
new file mode 100644
index 000000000000..5080b04e9f61
--- /dev/null
+++ b/sci-visualization/visit/Manifest
@@ -0,0 +1,13 @@
+AUX visit-2.12.3-cmakelist.patch 506 SHA256 904ea6453ac768ebd94c9f37ea675e22ade23f6def0b1a799ef6b07c3d35f957 SHA512 528d0b1d48f457958c5b3c21dc08d29f99ec93b5c6a109a82ca356879ec0d6d0cba28025e1369438d5b2fd850ff48afbf01490c3a2ac635130e69c0186a4c676 WHIRLPOOL 7aa107b0a3858d28a53a12d9e76b7adad6185cbd79c84599013e8166789e836d38c1f9582af45a0463ddaa169b5eb346fbcb6ae08254901ef5971227cca2fe6d
+AUX visit-2.12.3-dont_symlink_visit_dir.patch 743 SHA256 bab48080e92a83b339298ca10c45dc32bb0953476d90e9cc772db92da3d02a6d SHA512 c385a3e6fa6c5856223df8c5aea329ba01dd625980257c3cd7d2784eb9e1aca3640e50d2afb0af0e02553dc6f72bb23bec666f3dc726706690c7bd45c6cc5336 WHIRLPOOL bc7bc88200913a44144e45a64f35a2c07aa20bac17572a888ed0f3c71d833e2fb3f7c313930475d84b1fa08d9e67602b1317a25bb1d01153fa8f0a81b21e0791
+AUX visit-2.12.3-findpython.patch 833 SHA256 eb134490d6519b3f8c1eab3bf3eb45471fcb367df47fe042ddce93b9bedcff50 SHA512 9b73e00e7884fed34e63ea51aa14483212227f05c83412a1638a31a56a0685bf7fdfdf511a1a53c9f1a55289ae8d4a0bac8ff92d3380d9c989502d2cb95e8679 WHIRLPOOL 4a6471dc5996e5db1f90f397c2d2de0f55caf50e526a0855972bae3e2428f0a36df22bf63a30f413095ccafdc40252dae27e10b00c756c4d088ae9642e31b4af
+AUX visit-2.12.3-findsilo.patch 585 SHA256 bd97818df6eaaf5b160c982439f17223c5b0d7c35c830a551a7aeac380c3e29e SHA512 76bec5fd134318724d0d2ad59a345d78652867a9680abaca7504af11ddd818a678338afd10bdf9385295f672d265439a1341c1c71697c7a98aae6406abe4565d WHIRLPOOL ef5200ff51dd3d856c504d4ef54f78f8f507f8239834023de01654451f8fb34d63bede72b5883f0cbcf0e7616f843a62ef29ca7c6be136539adc13f24df0f674
+AUX visit-2.12.3-findvtk.patch 1175 SHA256 05ebbbfb6cec054009bb02ed28f79cfe0c992b41c1874dc6b87cf6ed6ebcee4e SHA512 8c45db6d8f00031afc5710109e744af6abc9808cbd86e1c3115047c21f23ad840f76f8d4ff245838075753952f3268e6f753c638ed58e3d6e338e8e1898b0fbd WHIRLPOOL 09be0c2cd445e142a1cbd0dc1d334d23149c688a635a5fc734e2ff4ed506e761a789163e95741442cee94fcc7fb22a7fb52f13208fb53e30a8dae3201172df71
+AUX visit-2.12.3-qwt.patch 550 SHA256 b9d5575f04c5a019422dbce459207045207a3c104123b4c553833dea589e9b5a SHA512 8d0ca1285206ccf8c6eadd6b26ad89e7adc44ab0f5b344bb5eceec87809272ed290f6b7c5c81988283e4d9fa82cc6ed4096a90474bbf0ff361fa9bd8dfe55ec0 WHIRLPOOL 62712a90362ed291cc21dd0a00fc4f7ea8b6d32a3da47e8194c6c8e44acc05871c83cbdef079f4de1805330a7cbaaefae20ef8481160f56d0cb65b3b7b5120d7
+AUX visit-2.12.3-vtklibs.patch 4727 SHA256 32aefb78c5e5fff7a379f592792ec87048b56c442b08d9d862d78eb14277efcf SHA512 5ff42cd456818fc9086d43e1a2af3eedb2a90a8e4dbfabadc51aaf01e649024658ae6bff58a086dc732f9058a5e04099babc2b000bd089a470a047c709dcc85f WHIRLPOOL 4c7cdc497403718814d4c27ceb2b2d93178d0244c6449a2d64f3d84e47f8b78d1eef5e6ffcbfd965ddf376826a73e53470b3dcb36be09199795ae3615c8e8d90
+AUX visit-2.12.3-vtkmpi.patch 3824 SHA256 e224344d8cf577772f0a3defe8547237353cd6726972ddb24911bc56c3297709 SHA512 b12395b397374311f005545b8c18ef85d331533c8a4d8092c0731cc8697523a8be2dfa46307e4566e68b518841df5eb1dd21453db3adba529248a238ff955e40 WHIRLPOOL 6c6e1d023bc45c57458363903215f25015df46b5f0b63d852cbbfd8312e21004da815a05aa85a7196166bb5abd2dfa7c2479f94129b1886563c4d2d2ab8cf8f1
+DIST visit2.12.3.tar.gz 2192737 SHA256 32437b17c50bf001462510f201db2cc7d3e5c8963ae2eb689b20b3f7d60aa35e SHA512 6a3746efb117c55b2403e78e75b5b67afb89e0695717b055b6bcf23c65f453564e09b283b5e6e5c98234196911c2c53898412be6e4c27c21e9fadf8947a9bd26 WHIRLPOOL fa1cf63cea41daf0e1ecce3e7b8c6aa7cc8dd712d35c68bdce730d11b57c5c930b002b8682cf100107cfc0081a2f01bfd3ca91e9d6ff8f3d310f674196c6937c
+EBUILD visit-2.12.3.ebuild 2945 SHA256 362713e0343a627b8ff075de314be883180d98737278ba4d001a2d338d779828 SHA512 25a01a20f6dc3cec2dbe9197e296f7531a72a6a1e11c8adad2e44cd70b355317e78001bacb71d9cd92b58b068f05aca193d5b89417b1dcc94f1a051308b96396 WHIRLPOOL 317326af2bab96fae507f125b9ad6939d7cdd8bb5b0dfae92a43660990990c8a06a14f6fba59144f53a918e6c34870b47cca420db95800e63b4696910e19fd6b
+MISC ChangeLog 4353 SHA256 8a7e178c8e6a845781546789e2e6c41bf4bf87c7ade4a7487a3c6feaf2d396d3 SHA512 79d64a0dea5debda1e82168c870a6753b13d978469530e042b378ecc3568568343ddf2f23116d8020399a3715bbe016cd276aed42e54fa843ce3d173f2aa5c7b WHIRLPOOL 5b8d63c1f13f64041c7755528283867ba80eaa9892a5374734a589423fe98f5531caa40d80a2022c5ffb35f248b520b6babcfda47fe0e3a0acbea23c7041bc9a
+MISC ChangeLog-2015 1480 SHA256 f2575c3f92fc3fa2d26b1369158a07094e07ebfff23d6b5101d4d54003bcd3fa SHA512 515e1766cac2b19685f4f76a9b0e427d9c1c568ef321abdcf37e88f634402162a5a8deca9fb418ae65d40dcab1cbe1d09fbbb2bf6730142c536ddbbde20b6062 WHIRLPOOL 69dccb9be098bda82df2615fcc758a6e32d5307116d15c9d1f6e993f742cde5fc87d79de0a843c84abd1655a7c5ffd5a5f30ab80616c46dec0fbcde2749b2c53
+MISC metadata.xml 741 SHA256 5d0f519eee1eaff67de5a3d3f2d149e8cb8a55e6cc59c25ad463656dd9709519 SHA512 c9a53bb71f13089b96d999088cb8cdc1d71bbf62d2f65dd5e0f6396d903221c4455ceaa988a0b0a5056de2dee4826af5a5b18cb1ca0ed0ad31ac24a3013b819e WHIRLPOOL ed0f688d29619976a3b6b328fc66499ae86c7a48446ee676bc7f6bd3a7bdacf04777a3e55ea45cf40d8cf7617123b2a2f7f449ff8455b5a46a921c52a6ccc7f8
diff --git a/sci-visualization/visit/files/visit-2.12.3-cmakelist.patch b/sci-visualization/visit/files/visit-2.12.3-cmakelist.patch
new file mode 100644
index 000000000000..8c8618a24219
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.12.3-cmakelist.patch
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig	2015-06-25 07:30:40.907149341 +0200
++++ CMakeLists.txt	2015-06-25 07:30:57.537148929 +0200
+@@ -991,7 +991,6 @@
+         DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+                               GROUP_READ GROUP_WRITE GROUP_EXECUTE
+                               WORLD_READ             WORLD_EXECUTE
+-        CONFIGURATIONS "" None Debug Release RelWithDebInfo MinSizeRel
+         FILES_MATCHING PATTERN "*.h"
+         PATTERN "*.hpp"
+         PATTERN ".svn" EXCLUDE
diff --git a/sci-visualization/visit/files/visit-2.12.3-dont_symlink_visit_dir.patch b/sci-visualization/visit/files/visit-2.12.3-dont_symlink_visit_dir.patch
new file mode 100644
index 000000000000..0953e5b9e605
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.12.3-dont_symlink_visit_dir.patch
@@ -0,0 +1,18 @@
+diff -ru visit2.7.1.old2/src/CMakeLists.txt visit2.7.1/src/CMakeLists.txt
+--- visit2.7.1.old2/src/CMakeLists.txt	2014-01-27 22:10:06.520297262 +0100
++++ visit2.7.1/src/CMakeLists.txt	2014-01-27 22:11:30.520298002 +0100
+@@ -807,14 +807,6 @@
+             \"${VISIT_VERSION}\"
+             \"${CMAKE_INSTALL_PREFIX}/beta\")
+         ")
+-    ELSE(VISIT_INSTALL_AS_BETA)
+-        INSTALL(CODE "
+-          MESSAGE(\"Symlinking current to ${VISIT_VERSION}\")
+-          EXECUTE_PROCESS(WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}
+-            COMMAND \${CMAKE_COMMAND} -E create_symlink
+-            \"${VISIT_VERSION}\"
+-            \"${CMAKE_INSTALL_PREFIX}/current\")
+-        ")
+     ENDIF(VISIT_INSTALL_AS_BETA)
+ ENDIF(WIN32)
+ MARK_AS_ADVANCED(
diff --git a/sci-visualization/visit/files/visit-2.12.3-findpython.patch b/sci-visualization/visit/files/visit-2.12.3-findpython.patch
new file mode 100644
index 000000000000..180ffbf379ab
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.12.3-findpython.patch
@@ -0,0 +1,19 @@
+diff -ru visit2.7.1.old/src/CMake/FindVisItPython.cmake visit2.7.1.new/src/CMake/FindVisItPython.cmake
+--- visit2.7.1.old/src/CMake/FindVisItPython.cmake	2013-09-13 21:06:57.000000000 +0200
++++ visit2.7.1.new/src/CMake/FindVisItPython.cmake	2014-01-25 20:30:06.948654123 +0100
+@@ -141,11 +141,12 @@
+   FIND_LIBRARY(PYTHON_LIBRARY
+     NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION}
+     PATHS
+-      ${PYTHON_DIR}/lib
+-      ${PYTHON_DIR}/libs
+-      [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
++    ${PYTHON_DIR}/lib
++    ${PYTHON_DIR}/lib64
++    ${PYTHON_DIR}/libs
++    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
+     NO_DEFAULT_PATH
+     NO_CMAKE_ENVIRONMENT_PATH
+     NO_CMAKE_PATH
+     NO_SYSTEM_ENVIRONMENT_PATH)
+ 
diff --git a/sci-visualization/visit/files/visit-2.12.3-findsilo.patch b/sci-visualization/visit/files/visit-2.12.3-findsilo.patch
new file mode 100644
index 000000000000..04d73c37fc16
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.12.3-findsilo.patch
@@ -0,0 +1,12 @@
+diff -ru visit2.7.1-old/src/CMake/FindSilo.cmake visit2.7.1-new/src/CMake/FindSilo.cmake
+--- visit2.7.1-old/src/CMake/FindSilo.cmake	2013-11-20 20:30:44.000000000 +0100
++++ visit2.7.1-new/src/CMake/FindSilo.cmake	2014-02-01 02:22:29.410541850 +0100
+@@ -90,7 +90,7 @@
+       NO_CMAKE_PATH
+       NO_SYSTEM_ENVIRONMENT_PATH)
+     IF(SILOH5_LIBRARY_EXISTS)
+-        SET_UP_THIRD_PARTY(SILO lib include siloh5)
++        SET_UP_THIRD_PARTY(SILO lib include siloh5 hdf5 z)
+     ELSE(SILOH5_LIBRARY_EXISTS)
+         SET_UP_THIRD_PARTY(SILO lib include silo)
+     ENDIF(SILOH5_LIBRARY_EXISTS)
diff --git a/sci-visualization/visit/files/visit-2.12.3-findvtk.patch b/sci-visualization/visit/files/visit-2.12.3-findvtk.patch
new file mode 100644
index 000000000000..2fec72e1f4f3
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.12.3-findvtk.patch
@@ -0,0 +1,29 @@
+--- visit2.8.2/src/CMake/FindVisItVTK.cmake.orig	2015-01-09 12:18:54.467780216 +0100
++++ visit2.8.2/src/CMake/FindVisItVTK.cmake	2015-01-09 12:19:59.737780932 +0100
+@@ -234,15 +234,22 @@
+ 
+ # check for python wrappers
+ IF (NOT WIN32)
+-    FILE(GLOB VTK_PY_WRAPPERS_DIR ${VTK_LIBRARY_DIRS}/python*/)
++	FILE(GLOB VTK_PY_WRAPPERS_DIRECTORIES ${VTK_LIBRARY_DIRS}/python*/)
+ ELSE (NOT WIN32)
+     IF(${VTK_VERSION} VERSION_LESS "6.1.0")
+-        FILE(GLOB VTK_PY_WRAPPERS_DIR ${VISIT_VTK_DIR}/lib)
++	    FILE(GLOB VTK_PY_WRAPPERS_DIRECTORIES ${VISIT_VTK_DIR}/lib)
+     ELSE()
+-        FILE(GLOB VTK_PY_WRAPPERS_DIR ${VISIT_VTK_DIR}/lib/python*)
++	    FILE(GLOB VTK_PY_WRAPPERS_DIRECTORIES ${VISIT_VTK_DIR}/lib/python*)
+     ENDIF()
+ ENDIF (NOT WIN32)
+-MESSAGE(STATUS "  VTK_PY_WRAPPERS_DIR=${VTK_PY_WRAPPERS_DIR}")
++MESSAGE(STATUS "  VTK_PY_WRAPPERS_DIRECTORIES=${VTK_PY_WRAPPERS_DIRECTORIES}")
++
++FOREACH(X ${VTK_PY_WRAPPERS_DIRECTORIES})
++    IF(EXISTS "${X}/site-packages/vtk")
++      SET(VTK_PY_WRAPPERS_DIR "${X}")
++    ENDIF()
++ENDFOREACH(X)
++ 
+ 
+ IF(EXISTS ${VTK_PY_WRAPPERS_DIR}/site-packages/vtk)
+     MESSAGE(STATUS "Found VTK Python Wrappers - ${VTK_PY_WRAPPERS_DIR}")
diff --git a/sci-visualization/visit/files/visit-2.12.3-qwt.patch b/sci-visualization/visit/files/visit-2.12.3-qwt.patch
new file mode 100644
index 000000000000..b714aec45630
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.12.3-qwt.patch
@@ -0,0 +1,14 @@
+--- CMake/FindQwt.cmake.orig	2017-07-12 07:46:34.560120549 +0200
++++ CMake/FindQwt.cmake	2017-07-12 07:46:58.120121063 +0200
+@@ -54,7 +54,10 @@
+     SET(QWT_LIBRARY ${QWT_LIBRARY_DIR}/${QWT_LIB}/qwt)
+   ENDIF(VISIT_STATIC)
+ ELSE (WIN32)
+-  SET_UP_THIRD_PARTY(QWT lib include qwt)
++  SET(QWT_FOUND true CACHE BOOL "QWT library found" FORCE)
++  SET(QWT_INCLUDE_DIR "/usr/include/qwt6")
++  SET(QWT_LIBRARY_DIR "/usr/lib")
++  SET(QWT_LIB "/usr/lib/libqwt6-qt5.so")
+   SET(QWT_LIBRARY ${QWT_LIB} CACHE STRING "name of qwt library" FORCE)
+ ENDIF (WIN32)
+ 
diff --git a/sci-visualization/visit/files/visit-2.12.3-vtklibs.patch b/sci-visualization/visit/files/visit-2.12.3-vtklibs.patch
new file mode 100644
index 000000000000..a6b47096e813
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.12.3-vtklibs.patch
@@ -0,0 +1,133 @@
+diff -ur visit2.8.2-old/src/engine/main/CMakeLists.txt visit2.8.2-new/src/engine/main/CMakeLists.txt
+--- visit2.8.2-old/src/engine/main/CMakeLists.txt	2014-10-01 00:28:19.000000000 +0200
++++ visit2.8.2-new/src/engine/main/CMakeLists.txt	2015-01-05 15:14:43.850783973 +0100
+@@ -188,8 +188,8 @@
+     ${engine_ser_exe_EPlot_ser}
+     engine_ser 
+     visit_verdict 
+-    vtkjpeg
+-    vtkpng
++    jpeg
++    png
+     ${VTKZLIB_LIB}
+     ${VTK_FREETYPE_LIBRARIES}
+     vtkftgl
+@@ -273,8 +273,8 @@
+         ${engine_par_exe_EPlot_par}
+         engine_par
+         visit_verdict 
+-        vtkjpeg
+-        vtkpng
++        jpeg
++        png
+         ${VTKZLIB_LIB}
+         ${VTK_FREETYPE_LIBRARIES}
+         vtkftgl
+diff -ur visit2.8.2-old/src/mdserver/main/CMakeLists.txt visit2.8.2-new/src/mdserver/main/CMakeLists.txt
+--- visit2.8.2-old/src/mdserver/main/CMakeLists.txt	2014-08-11 23:45:16.000000000 +0200
++++ visit2.8.2-new/src/mdserver/main/CMakeLists.txt	2015-01-05 15:15:41.810784062 +0100
+@@ -119,10 +119,10 @@
+     visit_verdict 
+     vtkCommonCore
+     vtkIOCore 
+-    vtktiff
++    tiff
+     ${VTKZLIB_LIB}
+-    vtkpng
+-    vtkjpeg
++    png
++    jpeg
+     ${ZLIB_LIB} 
+     ${CMAKE_THREAD_LIBS} 
+     ${DL_LIB}
+diff -ur visit2.8.2-old/src/tools/convert/CMakeLists.txt visit2.8.2-new/src/tools/convert/CMakeLists.txt
+--- visit2.8.2-old/src/tools/convert/CMakeLists.txt	2014-08-11 23:46:08.000000000 +0200
++++ visit2.8.2-new/src/tools/convert/CMakeLists.txt	2015-01-05 15:14:28.880783951 +0100
+@@ -105,8 +105,8 @@
+ )
+ 
+ SET(VTK_EXTRA_LIBS
+-vtkjpeg
+-vtkpng
++jpeg
++png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ur visit2.8.2-old/src/tools/dataserver/CMakeLists.txt visit2.8.2-new/src/tools/dataserver/CMakeLists.txt
+--- visit2.8.2-old/src/tools/dataserver/CMakeLists.txt	2014-08-11 23:46:12.000000000 +0200
++++ visit2.8.2-new/src/tools/dataserver/CMakeLists.txt	2015-01-05 15:13:02.000783818 +0100
+@@ -70,9 +70,9 @@
+ )
+ 
+ SET(VTK_EXTRA_LIBS
+-vtktiff
+-vtkjpeg
+-vtkpng
++tiff
++jpeg
++png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ur visit2.8.2-old/src/tools/mcurvit/CMakeLists.txt visit2.8.2-new/src/tools/mcurvit/CMakeLists.txt
+--- visit2.8.2-old/src/tools/mcurvit/CMakeLists.txt	2014-08-11 23:46:11.000000000 +0200
++++ visit2.8.2-new/src/tools/mcurvit/CMakeLists.txt	2015-01-05 15:16:02.400784093 +0100
+@@ -104,9 +104,9 @@
+ )
+ 
+ SET(VTK_EXTRA_LIBS
+-vtktiff
+-vtkjpeg
+-vtkpng
++tiff
++jpeg
++png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ur visit2.8.2-old/src/tools/protocol/CMakeLists.txt visit2.8.2-new/src/tools/protocol/CMakeLists.txt
+--- visit2.8.2-old/src/tools/protocol/CMakeLists.txt	2014-08-11 23:46:14.000000000 +0200
++++ visit2.8.2-new/src/tools/protocol/CMakeLists.txt	2015-01-05 15:12:46.480783795 +0100
+@@ -76,9 +76,9 @@
+ )
+ 
+ SET(VTK_EXTRA_LIBS
+-vtktiff
+-vtkjpeg
+-vtkpng
++tiff
++jpeg
++png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ur visit2.8.2-old/src/viewer/main/CMakeLists.txt visit2.8.2-new/src/viewer/main/CMakeLists.txt
+--- visit2.8.2-old/src/viewer/main/CMakeLists.txt	2014-08-11 23:46:26.000000000 +0200
++++ visit2.8.2-new/src/viewer/main/CMakeLists.txt	2015-01-05 15:12:11.380783741 +0100
+@@ -279,8 +279,8 @@
+     ${viewer_exe_IPlot}
+     ${viewer_exe_VPlot}
+     viewer
+-    vtkpng
+-    vtkjpeg
++    png
++    jpeg
+     ${VTKZLIB_LIB}
+     ${VTK_FREETYPE_LIBRARIES}
+     vtkftgl
+diff -ur visit2.8.2-old/src/visit_vtk/full/CMakeLists.txt visit2.8.2-new/src/visit_vtk/full/CMakeLists.txt
+--- visit2.8.2-old/src/visit_vtk/full/CMakeLists.txt	2014-08-11 23:45:14.000000000 +0200
++++ visit2.8.2-new/src/visit_vtk/full/CMakeLists.txt	2015-01-05 15:11:17.680783659 +0100
+@@ -125,9 +125,9 @@
+ ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES})
+ 
+ IF(HAVE_LIB_R)
+-    TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtktiff vtkFiltersStatisticsGnuR)
++    TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR)
+ ELSE(HAVE_LIB_R)
+-    TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtktiff)
++    TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle)
+ ENDIF(HAVE_LIB_R)
+ # Add vtk definitions
+ ADD_TARGET_DEFINITIONS(visit_vtk "${VTK_DEFINITIONS}")
diff --git a/sci-visualization/visit/files/visit-2.12.3-vtkmpi.patch b/sci-visualization/visit/files/visit-2.12.3-vtkmpi.patch
new file mode 100644
index 000000000000..40aa7b8e2e50
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.12.3-vtkmpi.patch
@@ -0,0 +1,46 @@
+diff -ru visit2.8.2-old/src/tools/annotations/CMakeLists.txt visit2.8.2-new/src/tools/annotations/CMakeLists.txt
+--- visit2.8.2-old/src/tools/annotations/CMakeLists.txt	2014-08-11 23:46:11.000000000 +0200
++++ visit2.8.2-new/src/tools/annotations/CMakeLists.txt	2015-01-07 08:19:35.000735956 +0100
+@@ -54,9 +54,9 @@
+ # Specify the libraries to link against
+ TARGET_LINK_LIBRARIES(text2polys vtkIOLegacy)
+ IF(HAVE_LIB_R)
+-TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR vtksys vtkIOImage)
++TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR vtksys vtkIOMPIImage)
+ ELSE(HAVE_LIB_R)
+-TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtksys vtkIOImage)
++TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtksys vtkIOMPIImage)
+ ENDIF(HAVE_LIB_R)
+ # add vtk definitions
+ ADD_TARGET_DEFINITIONS(time_annotation "${VTK_DEFINITIONS}")
+diff -ru visit2.8.2-old/src/vtkqt/CMakeLists.txt visit2.8.2-new/src/vtkqt/CMakeLists.txt
+--- visit2.8.2-old/src/vtkqt/CMakeLists.txt	2014-08-11 23:46:46.000000000 +0200
++++ visit2.8.2-new/src/vtkqt/CMakeLists.txt	2015-01-07 08:19:00.950735904 +0100
+@@ -64,9 +64,9 @@
+ 
+ # Specify the libraries to link against on Windows & Mac
+ IF(HAVE_LIB_R)
+-    TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} vtkFiltersStatisticsGnuR)
++    TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOMPIImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} vtkFiltersStatisticsGnuR)
+ ELSE(HAVE_LIB_R)
+-    TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY})
++    TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOMPIImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY})
+ ENDIF(HAVE_LIB_R)
+ # Add vtk definitions
+ ADD_TARGET_DEFINITIONS(vtkqt "${VTK_DEFINITIONS}")
+--- visit2.8.2-old/src/visit_vtk/full/CMakeLists.txt	2015-01-14 13:08:53.249224731 +0100
++++ visit2.8.2-new/src/visit_vtk/full/CMakeLists.txt	2015-01-14 13:08:28.569224460 +0100
+@@ -125,9 +125,11 @@
+ ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES})
+ 
+ IF(HAVE_LIB_R)
+-    TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR)
++    TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction
++	    vtkFiltersFlowPaths vtkIOMPIImage vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR)
+ ELSE(HAVE_LIB_R)
+-    TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle)
++    TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction
++	    vtkFiltersFlowPaths vtkIOMPIImage vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle)
+ ENDIF(HAVE_LIB_R)
+ # Add vtk definitions
+ ADD_TARGET_DEFINITIONS(visit_vtk "${VTK_DEFINITIONS}")
diff --git a/sci-visualization/visit/metadata.xml b/sci-visualization/visit/metadata.xml
new file mode 100644
index 000000000000..1279dc32e3c3
--- /dev/null
+++ b/sci-visualization/visit/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <longdescription>
+    VisIt is a free, open source, platform independent, distributed,
+    parallel, visualization tool for visualizing data defined on two-
+    and three-dimensional structured and unstructured meshes.
+  </longdescription>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="cgns">
+      Builds the reader for the CFD General Notation System file format.
+    </flag>
+    <flag name="silo">
+      Adds support for reading .silo files.
+    </flag>
+     <flag name="xdmf2">
+      Support for xdmf2 formated data.
+    </flag>
+  </use>
+</pkgmetadata>
diff --git a/sci-visualization/visit/visit-2.12.3.ebuild b/sci-visualization/visit/visit-2.12.3.ebuild
new file mode 100644
index 000000000000..59ee01722b4e
--- /dev/null
+++ b/sci-visualization/visit/visit-2.12.3.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="A software that delivers parallel interactive visualizations"
+HOMEPAGE="https://wci.llnl.gov/simulation/computer-codes/visit"
+SRC_URI="http://portal.nersc.gov/svn/visit/trunk/releases/${PV}/${PN}${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cgns debug hdf5 mpi netcdf silo tcmalloc threads xdmf2"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	tcmalloc? ( dev-util/google-perftools )
+	cgns? ( sci-libs/cgnslib )
+	hdf5? ( sci-libs/hdf5 )
+	netcdf? ( sci-libs/netcdf )
+	silo? ( sci-libs/silo )
+	=sci-libs/vtk-6.1.0*[imaging,mpi=,python,rendering,qt5,xdmf2?,${PYTHON_USEDEP}]
+	dev-qt/qtx11extras:5
+	sys-libs/zlib
+	x11-libs/qwt:6[qt5]"
+DEPEND="${RDEPEND}
+	xdmf2? ( sci-libs/xdmf2 )
+"
+
+S="${WORKDIR}/${PN}${PV}/src"
+PATCHES=(
+	"${FILESDIR}/${P}-findpython.patch"
+	"${FILESDIR}/${P}-findsilo.patch"
+	"${FILESDIR}/${P}-findvtk.patch"
+	"${FILESDIR}/${P}-vtklibs.patch"
+	"${FILESDIR}/${P}-dont_symlink_visit_dir.patch"
+	"${FILESDIR}/${P}-cmakelist.patch"
+	"${FILESDIR}/${P}-qwt.patch"
+)
+
+src_prepare() {
+	for p in ${PATCHES[@]} ; do
+		epatch "${p}"
+	done
+	if use mpi ; then
+		epatch "${FILESDIR}/${P}-vtkmpi.patch"
+	fi
+
+	sed -i 's/exec python $frontendlauncherpy $0 ${1+"$@"}/exec '${EPYTHON}' $frontendlauncherpy $0 ${1+"$@"}/g' "bin/frontendlauncher"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX=/opt/visit
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_DIR="${EPREFIX}/usr"
+		-DVISIT_PYTHON_SKIP_INSTALL=true
+		-DVISIT_VTK_SKIP_INSTALL=true
+		-DQT_BIN="${EPREFIX}/usr/bin"
+		-DVISIT_ZLIB_DIR="${EPREFIX}/usr"
+		-DVISIT_HEADERS_SKIP_INSTALL=false
+		-DVISIT_QWT_DIR="${EPREFIX}/usr"
+		-DVISIT_QT5=true
+		-DVISIT_QT_DIR=/usr/lib/qt5/
+		$(cmake-utils_use threads VISIT_THREAD)
+	)
+	if use hdf5; then
+		mycmakeargs+=( -DHDF5_DIR="${EPREFIX}/usr" )
+	fi
+	if use tcmalloc; then
+		mycmakeargs+=( -DTCMALLOC_DIR="${EPREFIX}/usr" )
+	fi
+	if use cgns; then
+		mycmakeargs+=( -DCGNS_DIR="${EPREFIX}/usr" )
+	fi
+	if use silo; then
+		mycmakeargs+=( -DSILO_DIR="${EPREFIX}/usr" )
+	fi
+	if use netcdf; then
+		mycmakeargs+=( -DNETCDF_DIR="${EPREFIX}/usr" )
+	fi
+	if use xdmf2; then
+		mycmakeargs+=( -DOPT_VTK_MODS="vtklibxml2" -DVISIT_XDMF_DIR=/usr/ )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	PACKAGES_DIR="${ROOT}opt/${PN}/${PV}/linux-$(arch)/lib/site-packages"
+	cd "${ED}${PACKAGES_DIR}"
+	for i in *; do
+		dosym "${PACKAGES_DIR}/${i}" "$(python_get_sitedir)/$i"
+	done
+
+	cat > "${T}"/99visit <<- EOF
+		PATH=${EPREFIX}/opt/${PN}/bin
+		LDPATH=${EPREFIX}/opt/${PN}/${PV}/linux-$(arch)/lib/
+	EOF
+	doenvd "${T}"/99visit
+}
+
+pkg_postinst () {
+	ewarn "Remember to run "
+	ewarn "env-update && source /etc/profile"
+	ewarn "if you want to use visit in already opened session"
+}
diff --git a/sci-visualization/xd3d/Manifest b/sci-visualization/xd3d/Manifest
new file mode 100644
index 000000000000..f3ed4e0446d1
--- /dev/null
+++ b/sci-visualization/xd3d/Manifest
@@ -0,0 +1,9 @@
+AUX xd3d-8.3.1-cflags.patch 1950 SHA256 86797f593fb4a976dc6ba02aa7db521a39dce328520ccd1942e21f19fb3a0692 SHA512 d89639bca626f59f5b5281b64082ee268f2a576b222d0a2a52fa73de993b82c4700d3f2e60b540c4f2c99b8b4e4fcde53e1db05a416cf1229f5a95d336a2a517 WHIRLPOOL 995a0d5253d9d419cd653b4188d4a89d00dd555c4065b56e8434fcd538ce030c2cce33c5ffa1a6115a311d6dee274053e9cf8fa49ad0875e7ea51fdca749ace6
+AUX xd3d-8.3.1-gentoo.diff 1768 SHA256 98e0d2c700be4388ec9f7d059776b411e0ddbf294cef594b62133c853dc4d029 SHA512 25af94a757f122c2ca98b1814701110ae6a9c3d387e8a6096ba54cc86bbbf8dbfe445c83feb157b071fc90230020c3b4fcd8313a3c915d5bbb314b67ab26be6f WHIRLPOOL c839cda05c997548d4cdc5d4ff06d1e4743459b3085b3173e414f41ba804351ffc09331a81520b2ec79f380d1d3a3a5eae2c4c0028cfe8f85b4e35d56b0c65f2
+AUX xd3d-8.3.1-parallel.patch 2194 SHA256 b855503e929380085258aa0d323342c902b0668702ae8e0e4c3c66d84e02b608 SHA512 d7516dd4fad56d35a0a24c5efb08e67d7c68642b72b6a48355a7c2b595f00e4b0b398c8759552eabf64a1d69072c5062f657b463dc4a2c788cae08d5813e790e WHIRLPOOL cdde8c6151f8a8e8772f2f4f7087a802758d6a0f6a54428ca696d4b9403792e3df0993bb26937e70ae79940dd6806551990676d83b85b72e8e34d098f7dbfbe0
+AUX xd3d-8.3.1-rotated.patch 241 SHA256 3e4016fc9caa107a6ae18b96c20f88aae17f190e3dabcccddf90fa02ae1ef044 SHA512 e5a1f0bc718543e577b1a4faea290f1dbb9e01f7341b1b81f8e90646156babdcd3a600fac9f195a29f97ad3052d432f2ea65d527a33f3e1685e914dc913630ec WHIRLPOOL eddc3796a85b866dd74cf27801922ecd32eb69471bd30860b5c07265fa8dfdb0532ff68f5e658aabba301bc325934397c2fd1c57c62b7e46259020f48fb6a72a
+DIST xd3d-8.3.1.tar.gz 2188216 SHA256 f363cabec88fb5055fe86fb9973d7122e93dfd4a803517b9f90be18131ef8816 SHA512 a02e1b53b1d393c8184866b0693394f596bb3c1eb5f49d00a41dd7bb972f08ba8d1621e7a1f197b015551d9483c9c76c07dac5e199961de775b9ff63c898c89e WHIRLPOOL de1ffd61ee99bc12474a37e37049ceec0d7f36a4d0095f556f2cbffb407cc90f98540052bb7a31666387d310ee169fd06cba68b18dd633583148e46664e74419
+EBUILD xd3d-8.3.1-r1.ebuild 1131 SHA256 202f4e8b510b3ddbf1ad9226788b5588059309904a1c81fc0106012031e81b22 SHA512 c53c418bdfb07d9451b29cb1a337710eb871fdf3693d1a6979349c8e200078e86bae20c1d49f82f9518864f67c346d20263cab40b0714ca6104120bdef20d46c WHIRLPOOL 154b6e4ac9cc0c31c2a2e88fdc73b4f7b5182a91e692f15cd314b4a78ec9d053e11011bb126ad24d95c93f2497167295be934cccb3a54d29c7c6c39a3600a6f1
+MISC ChangeLog 2561 SHA256 2536995f57a29dc7d77ad4e920cf95d6affcb75cf465e8c60a4d1b7351771b83 SHA512 da8dbfe2dd5a85b853a6464fb27dd945525f517ee198a01a00b0e92bacd37aea405e7177a76bedb5ec0dbe97acedb8bdc8667227ef9c4f700b64560fb90c02b9 WHIRLPOOL 1d2282140197c5b517063a4525761995be7bba4018477c522bd20bf9cfae5f722fdc18d82111a3414aae2fe0f8c1e3126fa4b3f48d226779b0aef337d4fc143b
+MISC ChangeLog-2015 3585 SHA256 ab7450d3886b7072dbcbf606bbbfb434c373d8e5b5ab9866971a06d939fcf02c SHA512 adc9245a0f5d688399ff2659b4281d07185d8d376261531e4d541c6dd815fe73574a432139528a1fdab65b5d4d0cd2c6a51b1d3958cc1a9374137b868246763c WHIRLPOOL aa881fbc68cf18518cd8c1ab2bac17ad7a74b18a135090ea19843fae3006966ef542b490c11d75602ccba69960116e47146fd99b11962db5aff8ab2332bcabb0
+MISC metadata.xml 724 SHA256 2df669655ed5da341dae091183a3a35f41411d6b46d1221023a0c402007ff9bc SHA512 49f23749e4d70b5f4c6dc4c3f2cac7c3baae24f7ef6dd1a8243948c3e1e03b43b92da9117d8ff0611c6cb39a51cc8bdffe671f81843a75b0a827d35c20a23010 WHIRLPOOL d7b6fa6050d98a48d4b862dd34b154e0dad8943267f35f6fac4c111fe6c017a16341421c956751c56493ab6964d0d8a36083d3d48604a038c0873c28e60af5d3
diff --git a/sci-visualization/xd3d/files/xd3d-8.3.1-cflags.patch b/sci-visualization/xd3d/files/xd3d-8.3.1-cflags.patch
new file mode 100644
index 000000000000..b62129b41bf4
--- /dev/null
+++ b/sci-visualization/xd3d/files/xd3d-8.3.1-cflags.patch
@@ -0,0 +1,41 @@
+ src/various/Makefile |   16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/various/Makefile b/src/various/Makefile
+index 7188b2a..80f47ec 100644
+--- a/src/various/Makefile
++++ b/src/various/Makefile
+@@ -3,25 +3,25 @@ include ../../RULES
+ all :; make clair clairc3d create_c3d obscur obscurc3d tradavoir translation txt2avoir
+ 
+ clair : clair.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/clair $(INCF) clair.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/clair $(FCFLAGS) $(INCF) clair.f $(LIBRAIRIE) $(LINKOPTX)
+ 
+ clairc3d : clairc3d.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/clairc3d $(INCF) clairc3d.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/clairc3d $(FCFLAGS) $(INCF) clairc3d.f $(LIBRAIRIE) $(LINKOPTX)
+ 
+ create_c3d : create_c3d.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/create_c3d $(INCF) create_c3d.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/create_c3d $(FCFLAGS) $(INCF) create_c3d.f $(LIBRAIRIE) $(LINKOPTX)
+ 
+ obscur : obscur.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/obscur $(INCF) obscur.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/obscur $(FCFLAGS) $(INCF) obscur.f $(LIBRAIRIE) $(LINKOPTX)
+ 
+ obscurc3d : obscurc3d.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/obscurc3d $(INCF) obscurc3d.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/obscurc3d $(FCFLAGS) $(INCF) obscurc3d.f $(LIBRAIRIE) $(LINKOPTX)
+ 
+ tradavoir : tradavoir.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/tradavoir $(INCF) tradavoir.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/tradavoir $(FCFLAGS) $(INCF) tradavoir.f $(LIBRAIRIE) $(LINKOPTX)
+ 
+ translation : translation.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/translation $(INCF) translation.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/translation $(FCFLAGS) $(INCF) translation.f $(LIBRAIRIE) $(LINKOPTX)
+ 
+ txt2avoir : txt2avoir.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/txt2avoir $(INCF) txt2avoir.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/txt2avoir $(FCFLAGS) $(INCF) txt2avoir.f $(LIBRAIRIE) $(LINKOPTX)
diff --git a/sci-visualization/xd3d/files/xd3d-8.3.1-gentoo.diff b/sci-visualization/xd3d/files/xd3d-8.3.1-gentoo.diff
new file mode 100644
index 000000000000..271fd0b8bd58
--- /dev/null
+++ b/sci-visualization/xd3d/files/xd3d-8.3.1-gentoo.diff
@@ -0,0 +1,86 @@
+diff -Naur RULES.gentoo RULES.gentoo
+--- /dev/null		1969-12-31 19:00:00.000000000 -0500
++++ ./RULES.gentoo	2008-01-21 06:41:41.000000000 -0500
+@@ -0,0 +1,82 @@
++#--------------------------------------------------------
++# Configuration file for the Makefiles of xd3d          |
++# Fran�ois Jouve 2005 (Francois.Jouve@Polytechnique.fr) |
++#--------------------------------------------------------
++
++#
++# Modifiable parameters
++#
++
++#
++# Root directory of the distribution
++#
++#XD3D_DIR = $(HOME)/xd3d-8.1.0
++XD3D_DIR = Please_Configure
++
++#
++# Install directory
++#
++#INSTALL_DIR = /usr/local/bin
++INSTALL_DIR = ##D##/usr/bin
++
++#
++# Location of the X11 lib (libX11.a)
++#
++#LIBX11 = /usr/X11R6/lib
++LIBX11 = /usr/##lib##/
++
++#
++# Language parameter
++#
++#LANGUAGE = FRANCAIS
++#LANGUAGE = ENGLISH
++LANGUAGE = ENGLISH
++
++#
++# Max memory for xd3d (MBytes)
++#
++#MEMORY_XD3D = 64
++MEMORY_XD3D = 64
++
++#
++# Fortran compiler
++#
++COMPILF = $(FC)
++
++#
++# C compiler
++#
++COMPILC = $(CC)
++RANLIB  = ranlib
++AR      = ar r
++STRIP   = echo $@
++
++#
++# Options for the Fortran compiler
++#
++OPTF = $(FFLAGS)
++#
++# Options for the C compiler
++#
++OPTC = $(CFLAGS)
++
++#-----------------------------------------------
++# You should not need to change anything below !
++#-----------------------------------------------
++
++SRCDIR = $(XD3D_DIR)/src
++BINDIR = $(XD3D_DIR)/bin
++LIBDIR = $(XD3D_DIR)/lib
++SUFF   =
++INCF   = -I$(XD3D_DIR)/src/include
++INCC   = -I$(LIBX11)/../include
++
++LINK      = $(COMPILF) $(LDFLAGS) -o
++LINKOPT   = -lc -lm
++LINKOPTX  = -L$(LIBX11) -lX11 -lXpm -lc -lm
++LIBRAIRIE = $(LIBDIR)/question_lib.a
++MYXLIB    = $(LIBDIR)/my_Xlib.a
++INTERP    = $(LIBDIR)/interp.a
++
++.f.o: ; $(COMPILF) $(INCF) $(OPTF) -c $*.f
++.c.o: ; $(COMPILC) $(INCC) $(OPTC) -D$(LANGUAGE) -c $*.c
diff --git a/sci-visualization/xd3d/files/xd3d-8.3.1-parallel.patch b/sci-visualization/xd3d/files/xd3d-8.3.1-parallel.patch
new file mode 100644
index 000000000000..3143ff2420c4
--- /dev/null
+++ b/sci-visualization/xd3d/files/xd3d-8.3.1-parallel.patch
@@ -0,0 +1,61 @@
+--- a/src/various/Makefile	2009-12-04 18:16:57.000000000 +0000
++++ b/src/various/Makefile	2009-12-04 18:17:13.000000000 +0000
+@@ -1,6 +1,6 @@
+ include ../../RULES
+ 
+-all :; make clair clairc3d create_c3d obscur obscurc3d tradavoir translation txt2avoir
++all : clair clairc3d create_c3d obscur obscurc3d tradavoir translation txt2avoir
+ 
+ clair : clair.f $(LIBRAIRIE) ;\
+ $(LINK) $(BINDIR)/clair $(INCF) clair.f $(LIBRAIRIE) $(LINKOPTX)
+--- a/src/X/Makefile	2009-12-04 18:16:06.000000000 +0000
++++ b/src/X/Makefile	2009-12-04 18:16:36.000000000 +0000
+@@ -118,7 +118,7 @@
+ lib : $(LIBMARC)
+ $(LIBMARC) : $(OBJETS) $(OBJETSMARC) ; $(AR) $@ $(OBJETS) $(OBJETSMARC) ; $(RANLIB) $@
+ 
+-all :; make ; make lib
++all : lib
+ 
+ clean : ; /bin/rm -f $(OBJETS) $(LIB) $(LIBMARC)
+ 
+--- a/Makefile	2009-12-04 18:12:08.000000000 +0000
++++ b/Makefile	2009-12-04 19:06:37.000000000 +0000
+@@ -13,22 +13,24 @@
+ $(BINDIR)/xd3d$(SUFF) \
+ $(BINDIR)/xgraphic$(SUFF)
+ 
+-all :; make libs ; make utils ; make xgraphic ; make xd3d
++all : libs utils xgraphic xd3d
+ 
+ install :; /bin/cp -pidvu $(EXE) ./infps $(INSTALL_DIR)
+ 
+ libs :; \
+-cd $(SRCDIR)/qlib   ; echo "---- Building utility lib ----" ; make ;\
+-cd $(SRCDIR)/interp ; echo "---- Building parsing lib ----" ; make ;\
+-cd $(SRCDIR)/X      ; echo "---- Building X interface lib ----" ; make
+-
+-xd3d :; cd $(SRCDIR)/d3d ; echo "---- Building xd3d ----" ; make
+-
+-xgraphic :; cd $(SRCDIR)/graphic ; echo "---- Building xgraphic ----" ; make
+-
+-utils :; \
+-echo " ---- Building various utils ----" ;\
+-cd $(SRCDIR)/trad_nopo ; make ;\
+-cd $(SRCDIR)/various  ; make
++cd $(SRCDIR)/qlib   ; echo "---- Building utility lib ----" ; $(MAKE) ;\
++cd $(SRCDIR)/interp ; echo "---- Building parsing lib ----" ;$(MAKE) ;\
++cd $(SRCDIR)/X      ; echo "---- Building X interface lib ----" ; $(MAKE)
++
++xd3d : libs
++	cd $(SRCDIR)/d3d ; echo "---- Building xd3d ----" ; $(MAKE)
++
++xgraphic : libs 
++	cd $(SRCDIR)/graphic ; echo "---- Building xgraphic ----" ; $(MAKE)
++
++utils : libs 
++	echo " ---- Building various utils ----" ;\
++	cd $(SRCDIR)/trad_nopo ; $(MAKE) ;\
++	cd $(SRCDIR)/various  ; $(MAKE)
+ 
+ clean :; /bin/rm -f $(SRCDIR)/*/*.o $(LIBRAIRIE) $(MYXLIB) $(INTERP) $(EXE)
diff --git a/sci-visualization/xd3d/files/xd3d-8.3.1-rotated.patch b/sci-visualization/xd3d/files/xd3d-8.3.1-rotated.patch
new file mode 100644
index 000000000000..2d840c0a1342
--- /dev/null
+++ b/sci-visualization/xd3d/files/xd3d-8.3.1-rotated.patch
@@ -0,0 +1,10 @@
+--- a/src/X/rotated.c	2009-12-04 18:09:55.000000000 +0000
++++ b/src/X/rotated.c	2009-12-04 18:10:37.000000000 +0000
+@@ -29,6 +29,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <string.h>
++#include <stdlib.h>
+ #include "rotated.h"
+ 
+ 
diff --git a/sci-visualization/xd3d/metadata.xml b/sci-visualization/xd3d/metadata.xml
new file mode 100644
index 000000000000..e741a07744ff
--- /dev/null
+++ b/sci-visualization/xd3d/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription>
+  xd3d is a simple scientific visualization tool designed to be easy to learn. 
+  It can plot 2d and 3d meshes, with shadowing, contour plots, vector fields, 
+  iso-contour (3d), as well as 3d surfaces z=f(x,y) defined by an algebraic 
+  expression or a cloud of points. It generates high quality vector PostScript 
+  files for scientific publications and still or animated bitmap images. 
+  It includes the graph plotter xgraphic. 
+</longdescription>
+</pkgmetadata>
diff --git a/sci-visualization/xd3d/xd3d-8.3.1-r1.ebuild b/sci-visualization/xd3d/xd3d-8.3.1-r1.ebuild
new file mode 100644
index 000000000000..b79e8599c1d3
--- /dev/null
+++ b/sci-visualization/xd3d/xd3d-8.3.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit fortran-2 toolchain-funcs
+
+DESCRIPTION="Scientific visualization tool"
+HOMEPAGE="http://www.cmap.polytechnique.fr/~jouve/xd3d/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	app-shells/tcsh"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.diff
+	"${FILESDIR}"/${P}-parallel.patch
+	"${FILESDIR}"/${P}-rotated.patch
+	"${FILESDIR}"/${P}-cflags.patch
+)
+
+src_prepare() {
+	default
+	sed \
+		-e 's:"zutil.h":<zlib.h>:g' \
+		-i src/qlib/timestuff.c || die
+	sed \
+		-e "s:##D##:${ED%/}:" \
+		-e "s:##lib##:$(get_libdir):" \
+		-i RULES.gentoo \
+		|| die "failed to set up RULES.gentoo"
+}
+
+src_configure() {
+	tc-export CC
+	./configure -arch=gentoo || die "configure failed."
+}
+
+src_install() {
+	dodir /usr/bin
+	default
+	dodoc FORMATS
+
+	use doc && dodoc -r Manuals
+	if use examples; then
+		mv {E,e}xamples || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/sci-visualization/xds-viewer/Manifest b/sci-visualization/xds-viewer/Manifest
new file mode 100644
index 000000000000..bb44e2c453be
--- /dev/null
+++ b/sci-visualization/xds-viewer/Manifest
@@ -0,0 +1,6 @@
+AUX xds-viewer-0.6-fix-c++14.patch 2139 SHA256 8e6aba22f4904ff29912af6f2c9c04340a3337d666fbd07dc88bac7adda12478 SHA512 2b6d1d5598a016c2806bd54a027b1b23bbfa78cca4e7293df9e80eef8fbed3b084f29d1c499670a5d4b83681c7761a13897c7ccbe78599f6a0bc1cb468121444 WHIRLPOOL 19927abc42984093c3732aacddcae7b310aadee1e3b2cab2beb4fc9b5f0f168eb3a325f7c5d18cdc4779e41ca10ec54fe8e3effc3aaa592103e3873a9740af7c
+DIST xds-viewer-0.6.tar.gz 408315 SHA256 a4088246f002fd33add8fe1ea5453696e2a3e01d4c1ae189a496274b46da5a75 SHA512 4a7798997147e569aeeabab958b41198da29d336273e4b16b8d3c8766f2a16256727e9620a91b8f202125c9f5daedbd37e79352bb563fd431475b806deb3629e WHIRLPOOL fb5aeb580b01b63b99a417b41b9e9b1649067e4e9fbd20825f08beca24cb17d729270efe07e1ad32cc4d8acd5ac71d5061ba935fbbe111e52db54466722f56f3
+EBUILD xds-viewer-0.6-r1.ebuild 566 SHA256 be13b963ee99fa66335c8684fbef66b6b5c456428708dcecfdcca0c4f7673145 SHA512 f85cc8c389b34a5f58a43b175c44363c1c9f6b3c06598a9a5ad9edc5da6e5745f580f0761981c5872d9da00913556243d442b3ed6fb93a8357bf48586bdff382 WHIRLPOOL e16431cad60cf9baebb25dfee9696b90948758ee939dc3d4c8504ebf6427b31b4feb4adc1620ef66c78203e9a6a83abff8a63218339ddc6e3f448d042d8dec97
+MISC ChangeLog 2752 SHA256 b8b9b2cc5374300cde76af41cf656967ad95d33da4fae6a73e321194d6a3f589 SHA512 a9344269a68f6915731316835db2debb68999400e78c1b45f0885673fce7a51c12c6fd1b58643eca138fdd80b89c9e7013da1beccb7083a71a3ae9f798cc85d6 WHIRLPOOL 1fdf372db266bacfc026996906c43fd6b15ac6033830bd548dd8d01aab0298e999e7bc51b39732b0f0b407fa91028c2c53c9c250c8b646744ce5a6b99ed594ce
+MISC ChangeLog-2015 1237 SHA256 111c018bf4d3c1c8a2a0987d2ef3318f1ad9551b30bf6ae819a7e915f8c0d56c SHA512 b3683b80e70f59f415e7d678be1dc84c65e4cef35392a613ddadfcbc0ebbd620342717957b211ca9e32078144d22ee433affdcfa9746ba400dea4e4002c8e560 WHIRLPOOL 90b208f82fcb284ae9fca0c2602dbfae722923c010d3d0be168373bc6d355de985b0981991357512f231367ce0b6b7cd28e819b38349fdaed26c60c39e79ea5c
+MISC metadata.xml 985 SHA256 6b30b862e36a453c3257749aa2cdf67c7b9f390078cd85da121bb8dc3b91fa4f SHA512 4daebbf5c5b83c76c77ad12467dbb9a5593f6a693acfdc027da7d3b215f53cacf7d4f2f1cc61f13e152e66a19c62d3715151bd9893495d67915d76b4e9d98b0d WHIRLPOOL 3698a029d945732264205ecae3d02c92e40f9d47cc36cd4adf38c1b40c55bc1165dac2be3b1e650a8cef8df3c0ed96a0090b3cefe54b638bbded90a30afd9ecd
diff --git a/sci-visualization/xds-viewer/files/xds-viewer-0.6-fix-c++14.patch b/sci-visualization/xds-viewer/files/xds-viewer-0.6-fix-c++14.patch
new file mode 100644
index 000000000000..612b5038c845
--- /dev/null
+++ b/sci-visualization/xds-viewer/files/xds-viewer-0.6-fix-c++14.patch
@@ -0,0 +1,66 @@
+Fix building with C++14, caused by invalid implicit T* -> bool conversions.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=598126
+
+--- a/src/CbfReader.cpp
++++ b/src/CbfReader.cpp
+@@ -315,12 +315,12 @@
+ 
+ 	for ( int i = 0;i < nx*ny;i++ )
+ 	{
+-		if ( tapin.get( sc ) == 0 )return -4;
++		if ( !tapin.get( sc ) )return -4;
+ 		diff = sc;
+ 		if ( diff == -128 )
+ 		{
+-			if ( tapin.get( uc0 ) == 0 )return -4;
+-			if ( tapin.get( uc1 ) == 0 )return -4;
++			if ( !tapin.get( uc0 ) )return -4;
++			if ( !tapin.get( uc1 ) )return -4;
+ 			tmp0 = uc0;
+ 			if ( uc0 < 0 ) tmp0 += 256; // converting signed to unsigned char
+ 			diff = uc1;
+@@ -329,15 +329,15 @@
+ 			if ( diff > 32767 )diff -= 65536;
+ 			if ( diff == -32768 )
+ 			{
+-				if ( tapin.get( uc0 ) == 0 )return -4;
+-				if ( tapin.get( uc1 ) == 0 )return -4;
++				if ( !tapin.get( uc0 ) )return -4;
++				if ( !tapin.get( uc1 ) )return -4;
+ 				tmp0 = uc0;
+ 				if ( tmp0 < 0 ) tmp0 += 256; // converting signed to unsigned char
+ 				tmp1 = uc1;
+ 				if ( tmp1 < 0 ) tmp1 += 256; // converting signed to unsigned char
+ 				diff = tmp0 + 256 * tmp1;
+-				if ( tapin.get( uc0 ) == 0 )return -4;
+-				if ( tapin.get( uc1 ) == 0 )return -4;
++				if ( !tapin.get( uc0 ) )return -4;
++				if ( !tapin.get( uc1 ) )return -4;
+ 				tmp0 = uc0;
+ 				if ( tmp0 < 0 ) tmp0 += 256; // converting signed to unsigned char
+ 				tmp1 = uc1;
+@@ -359,7 +359,7 @@
+ {
+ 	std::ifstream::pos_type streamPos = tapin.tellg();
+ 
+-	char binaryMarker[5] = {12, 26, 4, 213, '\0'};
++	char binaryMarker[5] = {12, 26, 4, (char)213, '\0'};
+ 	char buffer[5] = {0, 0, 0, 0, '\0'};
+ 
+ 	bool equal = true;
+@@ -448,13 +448,13 @@
+ 
+ int CbfReader::checkImageFormat( std::ifstream& tapin )
+ {
+-	if ( tapin == 0 )return -2; // Cannot open image file
++	if ( !tapin )return -2; // Cannot open image file
+ 
+ 	{ // Check image file format
+ 		std::string s( "###CBF: " );
+ 		char label[9];
+ 		for ( int i = 0;i < 8;i++ )
+-			if ( tapin.get( label[i] ) == false )return -4; // Cannot read image file
++			if ( !tapin.get( label[i] ) )return -4; // Cannot read image file
+ 		label[8] = '\0';
+ 		std::string sLabel = ( std::string )label;
+ 
diff --git a/sci-visualization/xds-viewer/metadata.xml b/sci-visualization/xds-viewer/metadata.xml
new file mode 100644
index 000000000000..0177b9503629
--- /dev/null
+++ b/sci-visualization/xds-viewer/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  XDS-Viewer is a program for viewing X-ray diffraction and control
+  images in the context of data processing by the XDS Program Package
+  (external link). Potential users of the software are scientists
+  working in the field of crystallography. The XDS-Viewer is a
+  standalone program which has build-in support for a subset of the
+  Crystallographic Binary File Format CBF (external link). Other file
+  formats are supported through an external convertion program that
+  comes with XDS. XDS-Viewer will automatically invoke the convertion
+  program for images other than CBF. 
+</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">xds-viewer</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-visualization/xds-viewer/xds-viewer-0.6-r1.ebuild b/sci-visualization/xds-viewer/xds-viewer-0.6-r1.ebuild
new file mode 100644
index 000000000000..f331c821dc71
--- /dev/null
+++ b/sci-visualization/xds-viewer/xds-viewer-0.6-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="X-ray diffraction/control image viewer in the context of data processing by XDS"
+HOMEPAGE="http://xds-viewer.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/libpng:0=
+	dev-qt/qtgui:4"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( src/doc/. )
+PATCHES=( "${FILESDIR}"/${P}-fix-c++14.patch )
diff --git a/sci-visualization/xgraph/Manifest b/sci-visualization/xgraph/Manifest
new file mode 100644
index 000000000000..685762671cb3
--- /dev/null
+++ b/sci-visualization/xgraph/Manifest
@@ -0,0 +1,6 @@
+DIST xgraph-12.1.tar.gz 145278 SHA256 0aa17d3fa3abfa8b6679fc26812a988332a2a0f1f48973d17429089015672b08 SHA512 67c1faea0f423717cf97c4613e7c288ad17e952f7f0c7cc555d3d3cffaaef890b3b8d77f9421ab5842f8c65dea3393820e296b38d7a3eae2a0b80eb0b8fc948c WHIRLPOOL 16f5abba42e42196bed2994b2d83fb5a5266c4d0fdfa0b8bdd52f175f9046c09167544e93f45945cb1cf045319e725f9154c0ffdb9d8ac06eb4e8839a5c7cc3c
+DIST xgraph_12.1-16.debian.tar.gz 23154 SHA256 a10daac6dca06938c4d96b8b82c8070b2763f6e0761030e0dfd2bb3fb338212a SHA512 6942d85d453a63191b11f6f52bee592c765023068d022e62b94b6fc6b0ed46ce57c9cc00bfcb53cd5f943997cef23724513c1433cdfbf11c7debac5760de1d26 WHIRLPOOL c6584cc98b0cf9e5cee85a4f1287dbb836aa7a0165d6c0c1d4066e0aefb4ce700d31e57d54cf8c051a5e1eb5e6c6410d1979b140628ea5ad90dbe1b2bc8fb336
+EBUILD xgraph-12.1-r4.ebuild 988 SHA256 b7a932b1cb0704c5828659063dbb84c48d79940d3b45e18d3fe2988bff420e49 SHA512 ac7b07f87f689eacc452ddc9b3045b4ab01cae0bb58043274404a8b876f4232f384415d0a1b13ab0f19a883f2a0851cf61f036c22466219a86f01de08c246bf5 WHIRLPOOL 2ae23ac54a490471ea9aee33008aeb1c83acde377a3afcb4ca4b75c21469099df67f2f4713ce1bcf78db20e3ca70ec3225d1daec9bd85d461a463ec288b15b50
+MISC ChangeLog 2567 SHA256 8003928cf51f0e504f52ee148c9f49eb7ac3bbc82390e7ea3c4f23884630459e SHA512 477da022053f1d2822c44ec1e7a8446d3d962cbc23b66a36bd1bb9079cc8369c013305c5228e1e07f914d27867752bac0f4bd575c6466b664925d85ebb406903 WHIRLPOOL b9e91ae68d391210a794124541a40c27d4cbc275f6a0be1d5a13f4409367f4f2325f4b4c9d5c3af973cc2baa0b0e092fa08f745f894f65de2f65b1e3ae50fae9
+MISC ChangeLog-2015 2996 SHA256 a9939c1b1edb726643cf44c0a750698a74b65bec664ddffe1bfb8ce118af13c0 SHA512 cc35c2ab847216b7fe073ec09882429fd1b17839a50b4f842a993e3145d19a9099ccb5a87a6136e44869a6ea0c21057a092b85768da1f3b6579327a8f19f1636 WHIRLPOOL 242928c2958d617982b8f18c0d6010097ccf2eb9ac85954de216cca7905c87ca503200f9c7b4ea23ecad3e34d49b55fc0192599abbedc9dcd92219c5c66a85a3
+MISC metadata.xml 773 SHA256 86bbe9baf978dfc226e823a5e398ca18fe47d7144291902aaf97fd83e21d3486 SHA512 4ab2e3db785543deb8f2f541cb64055dab9caa058424e46987896b6100d03cd55a48bda31cfc261225f76374c618e16f19bbfa5526f195f4c0c9ca583830ab04 WHIRLPOOL c629d029f4c8104161d09bb7266fb6742cf69cf1501bf5f9668df2e9e463c2344ceaacd85dd159bb8d5dcb5378e06e783fc3f79b1f26698ee5a935de983b1660
diff --git a/sci-visualization/xgraph/metadata.xml b/sci-visualization/xgraph/metadata.xml
new file mode 100644
index 000000000000..ed93e12b7321
--- /dev/null
+++ b/sci-visualization/xgraph/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Accepts data files or stdin in a form similar to the unix program
+    graph and displays line graphs, scatter plots, or bar charts on an
+    X11 display. Fully annotated with title, axis numbering and
+    labels, and legend. Zooming with the mouse is supported. Can
+    generate hardcopy output to Postscript printers and HPGL
+    plotters. Output can be directly pasted into idraw (drawtool) for
+    further annotation. Particularly useful in shell scripts.
+  </longdescription>
+</pkgmetadata>
diff --git a/sci-visualization/xgraph/xgraph-12.1-r4.ebuild b/sci-visualization/xgraph/xgraph-12.1-r4.ebuild
new file mode 100644
index 000000000000..61f36811879b
--- /dev/null
+++ b/sci-visualization/xgraph/xgraph-12.1-r4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DEB_PR=16
+
+DESCRIPTION="X11 Plotting Utility"
+HOMEPAGE="http://www.isi.edu/nsnam/xgraph/"
+SRC_URI="http://www.isi.edu/nsnam/dist/${P}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_PR}.debian.tar.gz"
+
+LICENSE="xgraph"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples"
+RDEPEND="x11-libs/libSM
+	x11-libs/libX11"
+DEPEND="$RDEPEND"
+
+PATCHES=( "${WORKDIR}"/debian/patches/debian-changes )
+
+src_prepare() {
+	default
+	rm -f configure.in Makefile.in || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc "${WORKDIR}"/debian/changelog
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	dodir /usr/share/man/man1
+	mv "${ED%/}"/usr/share/man/manm/xgraph.man \
+	   "${ED%/}"/usr/share/man/man1/xgraph.1 || die
+	rm -r "${ED%/}"/usr/share/man/manm || die
+}
diff --git a/sci-visualization/xyscan/Manifest b/sci-visualization/xyscan/Manifest
new file mode 100644
index 000000000000..988ba4191bff
--- /dev/null
+++ b/sci-visualization/xyscan/Manifest
@@ -0,0 +1,5 @@
+DIST xyscan-3.31-src.tar.gz 1122203 SHA256 6cfecaf801453fbc20f358ee39370aad950c80769933e5b451e0a5cc927a928d SHA512 418456348d2493cc365c4cae4760a246d8113e1b0cf74c03aa385a5a40b02c20fdb873c007afea7e244e493c52eb2803cee4da0338f6e090ef87f20dc9a50f42 WHIRLPOOL 29a7650fba5270c2106944de2b6bc1200a44e8d92d9dcebe855951310a7eacafe721e529c0801f80317c12a1714782bada04fd1da6d365ebc86d2e83cbce98dc
+EBUILD xyscan-3.3.1-r1.ebuild 1015 SHA256 35f5451a451d858fc36c1a0417e7ee91cf40fd461a7e771f93e9424e98ff8711 SHA512 fc39a7b8a222f5bd7d27b49c143448fa0f6a2218ce3e0992e5272af151f73b0cfa2bf2f141bcc080c254e355b79a6fed89fc03baf45c7429c32ab2b53c2d9b25 WHIRLPOOL a1d2acc12174e5ea05b1c0b4bb0e1ee9f7194a45c14d97adb60d4ae4363fc230159905ce73860ba76358401c4da5324304393abc49eb792347bfec6815e2d551
+MISC ChangeLog 2433 SHA256 5b140e1776c7099892231cb3def33cc3d74b45a6dd5ea78211f11f6b0c8e74fe SHA512 783f0e5bc5ba30fb9cc0c53269a0f34676adbee1012a83dae3694a9463a773026f6af33a2556902e449c2f276a4c8321ffd82fed4e71e123f9d8b4376316cdc2 WHIRLPOOL 5d1851561df791b2fc26d74c5fa8b5118ab3135c71cab34ad79bad6312151392e96fcb7467ec374510f92692a10f5cfd73f69ada3544e833fe4569ea2d03d655
+MISC ChangeLog-2015 2563 SHA256 a6cab7f0a538c0ed9cb870e5983df43a83da1890b38035d5c9a458102e1c2f50 SHA512 de51afbacf1ace7a2a6d90554ad939d96b0d73fb50dd601a2b261359017ccf0eb9f9ab084b521985f1a70cb7a76a89fbcce5cdbe6d67b53db7841df3fb048e12 WHIRLPOOL 4438eaa5eb7089e50df562d7005e55dc7418c0b809b2bf47808497284841932ec9a9fde25a0c820ff0c59708316eb125e13d0abfdce2e1ebbab423f7b483de99
+MISC metadata.xml 569 SHA256 9416094f9df4f53679312019f09085e23cb463446bceecb82f09eccc8e12393f SHA512 1e21a63f37673b02031e6d003ac76dd3b8b8188d4fa848e810fa47e94a20bb66eb780de55ba7d687283b0749819c83f85717bf13f200dad5e3bad446c6177b16 WHIRLPOOL c52febddeb23dd8200376816cd4073b712c67cbc9189f9b2f3c79cd228aba0fed49f72c9a9b897a669833c8424955be13de9017f6e8ed2cbf873689a3145cd80
diff --git a/sci-visualization/xyscan/metadata.xml b/sci-visualization/xyscan/metadata.xml
new file mode 100644
index 000000000000..55a5626aee09
--- /dev/null
+++ b/sci-visualization/xyscan/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
+<longdescription lang="en">
+  xyscan is a tool for scientist in the need to extract data points,
+  i.e. numeric values, from a plot. It allows to scan the plots and
+  extract data points including the size of the error bars (both in x
+  and y). It can handle plots with linear and logarithmic scales.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-visualization/xyscan/xyscan-3.3.1-r1.ebuild b/sci-visualization/xyscan/xyscan-3.3.1-r1.ebuild
new file mode 100644
index 000000000000..5820b1da9667
--- /dev/null
+++ b/sci-visualization/xyscan/xyscan-3.3.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils versionator
+
+MY_PV=$(replace_version_separator 2 '')
+
+DESCRIPTION="Tool for extracting data points from graphs"
+HOMEPAGE="http://star.physics.yale.edu/~ullrich/xyscanDistributionPage/"
+SRC_URI="http://star.physics.yale.edu/~ullrich/${PN}DistributionPage/${MY_PV}/${PN}-${MY_PV}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="l10n_fr"
+
+RDEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4"
+DEPEND="$RDEPEND"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:qApp->applicationDirPath() + \"/../docs\":\"${EPREFIX}/usr/share/doc/${PF}/html\":" \
+		xyscanWindow.cpp || die "Failed to fix docs path"
+}
+
+src_configure() {
+	eqmake4
+}
+
+src_install() {
+	dobin xyscan
+	HTML_DOCS=( docs/en/. )
+	einstalldocs
+	use l10n_fr && dodoc -r docs/fr
+	newicon images/xyscanIcon.png xyscan.png
+	make_desktop_entry xyscan "xyscan data point extractor"
+}
diff --git a/sci-visualization/yt/Manifest b/sci-visualization/yt/Manifest
new file mode 100644
index 000000000000..c17cdc85dd63
--- /dev/null
+++ b/sci-visualization/yt/Manifest
@@ -0,0 +1,7 @@
+DIST yt-3.3.5.tar.gz 8913208 SHA256 4d5c751b81b0daf6dcaff6ec0faefd97138c008019b52c043ab93403d71cedf6 SHA512 1741ce038fc52d446a4fb9d4aab0c9af601cf5ce244979590fc218f54ae9ff2801c5d15ae039c8b51b2a56541646601243c7e3665e3339cb9150b03d869069de WHIRLPOOL 80bddb7b9f80d043699951c3d0f830ca111eaa9b4ab3ff110e010169df4763bbe9bb4575793a3362cfe8583bad0aa0b9ba3d4e524398d24e1c5ba6d9602ec66e
+DIST yt-3.4.0.tar.gz 9989933 SHA256 de52057d1677473a83961d8a1119a9beae3121ec69a4a5469c65348a75096d4c SHA512 762a87bb01edd2c051baec671b07f5977f6842716f7ee0607a87e4f452bb0765cfa0eb7f9eb3509176d78cead23b5f0e5be08cc63a9687732b50498be4dca82e WHIRLPOOL ed529cc416e9dadc7165edb33d1c329f1108f0255e0c03d745edfba2f36446230559c8859aa762c03b38ded736d01298b4887ffc96f1563f9791951b255ba970
+EBUILD yt-3.3.5.ebuild 1048 SHA256 cb3085e826d85b86ee7b57bde98eee18daa243904beebd1e3778f1229a1d4b1a SHA512 e5f6348187471054c3c513077253e54cd395b55e1050b092fc950b281054bde517bbc80503b666ff0e5c199235f4ffaacdc5d98d3331bc987356f69fe34d733a WHIRLPOOL f8e47139c15a666b7d4bdae661eb60c2b7a92461db85eaa2c70f16d8287194ea0a267034aecca95de93773fa4f4efd19617f34c11ca3b971f0fb11af8a0f78b2
+EBUILD yt-3.4.0.ebuild 1117 SHA256 1f1ebd4a887fb98992a6ff7468af93cb609b69e2e64862f93b2527ca6335e776 SHA512 dce7d1a5f907c651f4a4467dea0fbf25da505c30371e27ef1e36c9158917392d2c475288b480bd0e57541e2909e9bfded0b2783dccb44ed62589f0c998005c7e WHIRLPOOL ff65f66fc25897237bdc3e33ce8142f923acf39d45546683efe93d556e3b6d89bd712a294cfb603e31a0b1f7dc2f4f28bc878e5058f61730fca706d8cfae42b2
+MISC ChangeLog 3457 SHA256 4307cab977bcee53c74a98bb54b1e973eb3725a82d57c926fa06a299564a5871 SHA512 b0845fb82664ec659ef0b62a9a11fbdaaa2467c5ce510ccfeef07447accd2429be36612ae89955046f07fc0424370aef2dbebaa3ecd266b6a30c97ddb00a5faa WHIRLPOOL 9b6e4d7dc018b18aaa65874bc3f320f85aaa9c119bf9d4ef390adc32ca2cf25cd5fec5d76aeb9efd8d966819fbcadda1cdaa5c57e12ba0c089494a2632211f24
+MISC ChangeLog-2015 1089 SHA256 23f64cb8f77945a7b121dbfeac5a8e7816e2a9687964d269883707dfc47f5ed8 SHA512 59a892dc1929b951a6f59b58455fbf000172f3e2885d288c85aa1debb437cf46766e01f05bc491746cf5c3d0323538e7f0780d1bee152e7febaac6a25852d206 WHIRLPOOL 2d48007396a0f2a02b8ef02b2e1c4222aaa4643d9b19d2aa9c7ec527bbe975b8fa7d2bb85588a98189c1403e144bd2b9554c9cc548426561e30a52587d72cc1f
+MISC metadata.xml 840 SHA256 c8744807f345217963ea07ad0417824c3b994c92a9a80330780df2c7d30345d1 SHA512 85ab02f7bc606601cd19497cdeda844b08715e4f46a1b54697594b15cc120e880a3bdae98cd9b3a37c5b4b8011c49bf01ad42bf91ff6b8e5b3092f81e33f0d17 WHIRLPOOL 898ccbe7e270043a0059ee28de826441ce43ba57060ef5346c8a19ade62f4cb450fd2c5adec78af2f263e3eb8aa6dbfde239720b94a281fbf981e3cebbc7e85d
diff --git a/sci-visualization/yt/metadata.xml b/sci-visualization/yt/metadata.xml
new file mode 100644
index 000000000000..5b85b9893255
--- /dev/null
+++ b/sci-visualization/yt/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription>
+    yt is an analysis and visualization system written in Python,
+    designed for use with Astrophysical Simulation codes. yt can process data in a
+    myriad of ways and make a variety of visualizations. It is designed to be portable
+    across simulation codes, and it is developed by developers from a variety of
+    institutions and backgrounds.
+  </longdescription>
+  <use>
+    <flag name="hub">Connect to the yt hub with <pkg>dev-python/girder-client</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">yt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-visualization/yt/yt-3.3.5.ebuild b/sci-visualization/yt/yt-3.3.5.ebuild
new file mode 100644
index 000000000000..4161ab6488b1
--- /dev/null
+++ b/sci-visualization/yt/yt-3.3.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Astrophysical Simulation Analysis and Vizualization package"
+HOMEPAGE="http://yt-project.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	dev-python/h5py[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	>=dev-python/cython-0.24[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-20.0[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	append-flags -fno-strict-aliasing
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	nosetests -sv --exclude=test_flake8 || die "Tests fail with ${EPYTHON} ${PWD}"
+	popd >/dev/null || die
+}
diff --git a/sci-visualization/yt/yt-3.4.0.ebuild b/sci-visualization/yt/yt-3.4.0.ebuild
new file mode 100644
index 000000000000..9454b3d1e815
--- /dev/null
+++ b/sci-visualization/yt/yt-3.4.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Astrophysical Simulation Analysis and Vizualization package"
+HOMEPAGE="http://yt-project.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="hub test"
+
+CDEPEND=">=dev-python/numpy-1.10.4[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	dev-python/h5py[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.0[${PYTHON_USEDEP}]
+	hub? ( dev-python/girder-client[${PYTHON_USEDEP}] )
+"
+DEPEND="${CDEPEND}
+	>=dev-python/cython-0.24[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-20.0[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	append-flags -fno-strict-aliasing
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	nosetests -sv --exclude=test_flake8 || die "Tests fail with ${EPYTHON} ${PWD}"
+	popd >/dev/null || die
+}
diff --git a/sci-visualization/zhu3d/Manifest b/sci-visualization/zhu3d/Manifest
new file mode 100644
index 000000000000..ca4125b3222f
--- /dev/null
+++ b/sci-visualization/zhu3d/Manifest
@@ -0,0 +1,8 @@
+AUX zhu3d-4.2.4-gold.patch 286 SHA256 5641b806a3666123ad79535400373eb4d0ca17d27965ee2b054e29b84cf07fb2 SHA512 85b25013ee480b9a2a5e50a19cc7edad95ad9d01de2b92fb6b71b57d9ffbaba0db3a07a3665bed30ec3af53b9794fe51b40f393aa2663892daf22620883dbc50 WHIRLPOOL ffd911c7495c4d20ef8cfbadeffcae71bfc8d19bade01beb50b4002a82ac9e9deea8fb54464908b5a42488e94af103f44d591a4eebad20d914db6c0f24ba9d81
+DIST zhu3d-4.2.4.tar.gz 942827 SHA256 bb40273b69c2b0b3aa295fd4d239cbda68cdc576d728b7ca0de3491e46e7f88f SHA512 7b38fa8da837d0f64ca32face6fe9e1d7d97893c13c3f91bce93c712914dc0ce163137e091423135080c1b1219ebed435ef7dbab3a74edf26c133d7ddb1c6c1e WHIRLPOOL f8ebe1f0e1cab1bd439504c4a2e21599d22d29d606a82503d736407202e8464acbfdddacb4d8b6b11b59eddde7ec38974dcad9b14fcacf480a4994f0dee46c73
+DIST zhu3d-4.2.6.tar.gz 953395 SHA256 59aec1898dd598b4a085f7e83420ff926bbeb73027f29887dcd3495659b529df SHA512 105c68e0bfff7b2dbb71d3ed713033e82a729db7d3d8f6e3de038ced53db0829e0b0b146e6b042d954983af830c6834921be58d72bde90012461047d5d99dfd1 WHIRLPOOL fd28a3a6bf58b1eddf5716f279797ed224cbd16f273992e70d9a93129e923120053e4440103bb3456f7f2bf5b36adf6dc31f9d13ed8214a444101a61c106b5e2
+EBUILD zhu3d-4.2.4.ebuild 1688 SHA256 757d53c858d429dc039951d93c150abe5d0768a079dedde993c56db42dd17ece SHA512 d4211b40d38eef8b5b72cb8fa7c0d180ec6638bbdb2247383658ad89d60fb1128c0e9152bf3b101e3ce349e5e97a7d8fd721a0ffad46651d7e739cea6dc660d8 WHIRLPOOL 75770d96122d7a156b32dc5302b4922c4e0b0240076645df4595ef284db75d92c8d18194d0249309c125378b801c45a8e920bf695b1580193a119c2462e7a19d
+EBUILD zhu3d-4.2.6.ebuild 1701 SHA256 68c0a5ec191c9abfbad49c318de1c175898ea80f7251084c994930ad6ff6aa5f SHA512 f2040ec8e96704000d5d8a07f33114d3252b30252ad733ddb77e129626b2c51db244b65d88b6b29df410ed977c116965225be4d53ea3f4189274eac217eb1d67 WHIRLPOOL 3911c97da2abc64c5f41e16c3a5e69961a47acb5f6899a88e8c32738e1ed585bd81f4909fac270611fdefd975a9c4ce8cc6db9defc64be7f1f4410aa396bc4e2
+MISC ChangeLog 2643 SHA256 7195b6c660c7b1abbe2f74709ddf1b7c242a5fff8d819b323875c7ae6c222a38 SHA512 b2a0dc6b1e305db1df6caca67697bbc503f0edde4fe1ed865660c5dfe9724e2f427ec3fa879ef2950b68f711a4cd40c45eea823f049618595bd087c1cfae67c3 WHIRLPOOL 13070bc76e70ef2c34f913e81bbffc36e35c66315096ddb9ea04576bb34f7a91bcad8c06fc54144bf60f01cd22a399c677600b56d442eb614736623781af8607
+MISC ChangeLog-2015 3805 SHA256 08fe584bb255a5ab66950fb8e340ac21047d51b84c3a9f235281be4e43ed9941 SHA512 2854a4e28101db9ea582786e91a39a958fa93f89515f7b46575bc9bb568d1523f4ebbec6420e33f1612ea99e08c0920a611c9150238765ac80cede1dc009799a WHIRLPOOL 46ef8cee52640d0c8a3db1097118df79f742df2c0f0e748953f369b08debfb5749abcf86cbe48efa52f0ba078bf1cc597641ab5b070f2b87f11ecc76ea0d9222
+MISC metadata.xml 814 SHA256 51a96086ac5c90fc4095b98e24de966753499cbc2412dfaafac3e380b040b5ee SHA512 6444c71fc9c956d40342f4928b0d452ae4f60852b27b607fa2b67615e211842dffe1bb6d4694268411ff08b431e08a4f32e50d8d19e0c0654d296c6231b0062d WHIRLPOOL 76f26bc28ce1b323ff6c7de4f09b8ec661c96c26f158bb37a58b39817f79c17e70fce1478d79265a787b271122f74cd32150eac4befa8e3518df58bb0e2a10f4
diff --git a/sci-visualization/zhu3d/files/zhu3d-4.2.4-gold.patch b/sci-visualization/zhu3d/files/zhu3d-4.2.4-gold.patch
new file mode 100644
index 000000000000..64a6ad42b3d4
--- /dev/null
+++ b/sci-visualization/zhu3d/files/zhu3d-4.2.4-gold.patch
@@ -0,0 +1,11 @@
+--- zhu3d.pro
++++ zhu3d.pro
+@@ -48,7 +48,7 @@
+ CONFIG   += release
+ TARGET    = zhu3d
+ QT       += opengl
+-
++LIBS     += -lGLU
+ 
+ # ============================================================================
+ # Optimisation switches. For both GCC/ICC compilers -O3 is default.
diff --git a/sci-visualization/zhu3d/metadata.xml b/sci-visualization/zhu3d/metadata.xml
new file mode 100644
index 000000000000..cc3c6e1d3cb3
--- /dev/null
+++ b/sci-visualization/zhu3d/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  Zhu3D allows you to interactively view and animate mathematical
+  functions, isosurfaces and a further independent parametric system.
+  Numerical solutions of equation systems are found with an adaptive
+  random search. The OpenGL-viewer supports zooming, scaling, rotating
+  and translating as well as filed lightning or surface properties.
+  Special effects are transparency, textures, fog and motion blur.
+</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">zhu3d</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-visualization/zhu3d/zhu3d-4.2.4.ebuild b/sci-visualization/zhu3d/zhu3d-4.2.4.ebuild
new file mode 100644
index 000000000000..eabd53772ce1
--- /dev/null
+++ b/sci-visualization/zhu3d/zhu3d-4.2.4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+LANGS="cs de es fr zh"
+
+inherit eutils qt4-r2
+
+DESCRIPTION="Interactive 3D mathematical function viewer"
+HOMEPAGE="https://sourceforge.net/projects/zhu3d"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="
+	virtual/glu
+	virtual/opengl
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-gold.patch" )
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	local datadir=/usr/share/${PN}
+	sed \
+		-e "s:^SYSDIR=:SYSDIR=${datadir}/system:" \
+		-e "s:^TEXDIR=:TEXDIR=${datadir}/textures:" \
+		-e "s:^WORKDIR=:WORKDIR=${datadir}/work:" \
+		-e "s:^DOCDIR=:DOCDIR=/usr/share/doc/${PF}/html:" \
+		-i ${PN}.pri || die "sed zhu3d.pri failed"
+
+	sed \
+		-e "/# Optimisation/,/# Include/d" \
+		-i zhu3d.pro || die "optimisation sed failed"
+}
+
+src_install() {
+	# not working: emake install INSTALL_ROOT="${D}" || die
+	dobin zhu3d
+
+	dodoc {readme,src/changelog}.txt
+	dohtml doc/*.png doc/${PN}_en.html
+
+	local lang
+	for lang in ${LANGS} ; do
+		if use linguas_${lang} ; then
+
+			insinto /usr/share/${PN}/system/languages
+			doins system/languages/${PN}_${lang}.qm
+
+			if [ -e doc/${PN}_${lang}.html ] ; then
+				dohtml doc/${PN}_${lang}.html
+			fi
+		fi
+	done
+
+	insinto /usr/share/${PN}
+	doins -r work/textures
+
+	insinto /usr/share/${PN}/work
+	doins -r work/*.zhu work/slideshow
+
+	insinto /usr/share/${PN}/system
+	doins -r system/*.zhu system/icons
+
+	doicon system/icons/${PN}.png
+	make_desktop_entry ${PN} "Zhu3D Function Viewer" ${PN} "Education;Science;Math;Qt"
+}
diff --git a/sci-visualization/zhu3d/zhu3d-4.2.6.ebuild b/sci-visualization/zhu3d/zhu3d-4.2.6.ebuild
new file mode 100644
index 000000000000..d7c48e1a7d16
--- /dev/null
+++ b/sci-visualization/zhu3d/zhu3d-4.2.6.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+LANGS="cs de es fr zh"
+
+inherit eutils qt4-r2
+
+DESCRIPTION="Interactive 3D mathematical function viewer"
+HOMEPAGE="https://sourceforge.net/projects/zhu3d"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="
+	virtual/glu
+	virtual/opengl
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.2.4-gold.patch )
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	local datadir=/usr/share/${PN}
+	sed \
+		-e "s:^SYSDIR=:SYSDIR=${datadir}/system:" \
+		-e "s:^TEXDIR=:TEXDIR=${datadir}/textures:" \
+		-e "s:^WORKDIR=:WORKDIR=${datadir}/work:" \
+		-e "s:^DOCDIR=:DOCDIR=/usr/share/doc/${PF}/html:" \
+		-i ${PN}.pri || die "sed zhu3d.pri failed"
+
+	sed \
+		-e "/# Optimisation/,/# Include/d" \
+		-i zhu3d.pro || die "optimisation sed failed"
+}
+
+src_install() {
+	# not working: emake install INSTALL_ROOT="${D}" || die
+	dobin zhu3d
+
+	dodoc {readme,src/changelog}.txt
+	dohtml doc/*.png doc/${PN}_en.html
+
+	local lang
+	for lang in ${LANGS} ; do
+		if use linguas_${lang} ; then
+
+			insinto /usr/share/${PN}/system/languages
+			doins system/languages/${PN}_${lang}.qm
+
+			if [ -e doc/${PN}_${lang}.html ] ; then
+				dohtml doc/${PN}_${lang}.html
+			fi
+		fi
+	done
+
+	insinto /usr/share/${PN}
+	doins -r work/textures
+
+	insinto /usr/share/${PN}/work
+	doins -r work/*.zhu work/slideshow
+
+	insinto /usr/share/${PN}/system
+	doins -r system/*.zhu system/icons
+
+	doicon system/icons/${PN}.png
+	make_desktop_entry ${PN} "Zhu3D Function Viewer" \
+		${PN} "Education;Science;Math;Qt"
+}
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
commit	4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree	ba5f07bf3f9d22d82e54a462313f5d244036c768 /sci-visualization