diff options
Diffstat (limited to 'sci-visualization')
175 files changed, 2609 insertions, 3712 deletions
diff --git a/sci-visualization/circos/Manifest b/sci-visualization/circos/Manifest index 0f6d694e6c25..023f77023eac 100644 --- a/sci-visualization/circos/Manifest +++ b/sci-visualization/circos/Manifest @@ -1 +1,2 @@ DIST circos-0.55.tgz 10163948 BLAKE2B b4dc821e99ea4ea072b6b2819f257eba920b133f4f4a10ddd119b073c067ba80dff1ffa1377d5b888098d25cf2eea8c92879444bd6a493b3743ab869b45f5302 SHA512 3ebad082acd96b27281e6fcd996fb79022d982a93db59e1f3589a341df7f9855d7554fb92c88c41dc4679e7273d11c0372285a4059ec14a77f11d1d4014db9c1 +DIST circos-0.69-9.tgz 29794907 BLAKE2B 615f3eacdb83ae68c014936b96c1e76280b546dee59bfc1d44aa4f1c09d9962946bd6329107dba6daac4153da5c1e2ac11cf3c658e35b4e9e92184b028144b60 SHA512 2ad8f3def2716a6055deb36c1d44126ce96e23d8fa76c6256b6586ed3bdd641245d885f42424279e8753d9a15385ad73f9f823e27119f16e0be8fc0a01207f37 diff --git a/sci-visualization/circos/circos-0.69.9.ebuild b/sci-visualization/circos/circos-0.69.9.ebuild new file mode 100644 index 000000000000..90bd68efe9c7 --- /dev/null +++ b/sci-visualization/circos/circos-0.69.9.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="${PN}-$(ver_rs 2 -)" +DESCRIPTION="Circular layout visualization of genomic and other data" +HOMEPAGE="http://circos.ca/" +SRC_URI="http://circos.ca/distribution/${MY_PN}.tgz" +S="${WORKDIR}/${MY_PN}" + +LICENSE="GPL-2+ GPL-3+" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="dev-perl/Config-General + dev-perl/Font-TTF + 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 + dev-perl/Statistics-Basic + dev-perl/SVG + dev-perl/Text-Format + dev-perl/Graphics-ColorObject + dev-perl/List-MoreUtils" +RDEPEND="${DEPEND}" + +src_prepare() { + # remove windows only things + rm -r "${S}/bin/${PN}.exe" || die + rm -r "${S}/bin/compile.bat" || die + default +} + +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 index ad181eaa8e9a..d40c46328d1d 100644 --- a/sci-visualization/circos/metadata.xml +++ b/sci-visualization/circos/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-biology@gentoo.org</email> diff --git a/sci-visualization/dash/Manifest b/sci-visualization/dash/Manifest new file mode 100644 index 000000000000..843ae3f81701 --- /dev/null +++ b/sci-visualization/dash/Manifest @@ -0,0 +1,2 @@ +DIST dash-2.16.1.tar.gz 24137908 BLAKE2B 3bb8491f93503a0c6fe89f39e65b565f319914a9dc434048829bdb59d76278185bacf71b1f836863639e3e620bf11f0131c1bf0a89b7712bcdba685ff07131f7 SHA512 468460154fd149ae072e724bd0f95dc3835c6619072068366c57adc59aba86fae614a91a5ec7721ce5fb0c766d2053c18822fa855857b7d82d8b8c0ba753e6a8 +DIST dash-jupyterlab-2.16.1.tgz 2264 BLAKE2B ff0d58422d94a2bd92fc8c84963691e02deea4f194d83024e6ad51a9dc0684d23771574c8ab5a512c991b71cf4176c1388209cedc42f3dc4b706b90db37d7c34 SHA512 6774e010bec5e2da449e42eed27e0853c4827f9286b1747785f41d96d8d4f868b6e5f3042b679ce0c3ba57d8b440e867157c1752548d485b0e62be8f78f536d7 diff --git a/sci-visualization/dash/dash-2.16.1.ebuild b/sci-visualization/dash/dash-2.16.1.ebuild new file mode 100644 index 000000000000..674a30f69e54 --- /dev/null +++ b/sci-visualization/dash/dash-2.16.1.ebuild @@ -0,0 +1,53 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 + +DESCRIPTION="Python framework for building ML & data science web apps" +HOMEPAGE="https://github.com/plotly/dash" +SRC_URI="https://github.com/plotly/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz + https://dev.gentoo.org/~tupone/distfiles/${PN}-jupyterlab-${PV}.tgz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +# Test need some packages not yet in the tree +# flask_talisman +# percy +# ... +RESTRICT="test" + +RDEPEND=" + dev-python/flask-compress[${PYTHON_USEDEP}] + dev-python/importlib-metadata[${PYTHON_USEDEP}] + dev-python/nest-asyncio[${PYTHON_USEDEP}] + dev-python/plotly[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + test? ( dev-python/beautifulsoup4 )" + +distutils_enable_tests pytest + +src_unpack() { + unpack ${P}.tar.gz +} + +src_prepare() { + mkdir dash/labextension/dist || die + # cd @plotly/dash-jupyterlab + # jlpm install + # jlpm build:pack + cp "${DISTDIR}"/${PN}-jupyterlab-${PV}.tgz \ + dash/labextension/dist/${PN}-jupyterlab.tgz \ + || die + distutils-r1_src_prepare +} + +python_install_all() { + distutils-r1_python_install_all + mv "${ED}"/usr/etc "${ED}"/etc || die +} diff --git a/sci-visualization/dash/metadata.xml b/sci-visualization/dash/metadata.xml new file mode 100644 index 000000000000..ab26018b1632 --- /dev/null +++ b/sci-visualization/dash/metadata.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>tupone@gentoo.org</email> + <name>Tupone Alfredo</name> + </maintainer> + <longdescription lang="en"> + Dash is a productive Python framework for building web analytic + applications. + Written on top of Flask, Plotly.js, and React.js, Dash is ideal for + building data visualization apps with highly custom user interfaces in + pure Python. It's particularly suited for anyone who works with data in + Python. + Through a couple of simple patterns, Dash abstracts away all of the + technologies and protocols that are required to build an interactive + web-based application. Dash is simple enough that you can bind a user + interface around your Python code in an afternoon. + Dash apps are rendered in the web browser. You can deploy your apps to + servers and then share them through URLs. Since Dash apps are viewed in + the web browser, Dash is inherently cross-platform and mobile ready. + Dash ships with supercharged components for interactive user + interfaces. A core set of components, written and maintained by the + Dash team, is available in the dash-core-components library. + </longdescription> + <upstream> + <remote-id type="github">plotly/dash</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-visualization/epix/Manifest b/sci-visualization/epix/Manifest index a31bf1db68be..24a058d107b2 100644 --- a/sci-visualization/epix/Manifest +++ b/sci-visualization/epix/Manifest @@ -1 +1 @@ -DIST epix-1.2.11_withpdf.tar.bz2 1709429 BLAKE2B db9cba5b94e27742347f8fc85366399016438681a7016077966e5048b9a178404af8305da7d170722aaac82d85283552f87fbba76b21e788fee546b0e0aebf43 SHA512 16d0edf13711e469a13faba83d47fbab983277a95cfed0e343089258da0b8a56104af9fc217aaa70928c50f10e7d152df93c3638cf2a65a2833142645a829a45 +DIST epix-1.2.19_withpdf.tar.bz2 1757443 BLAKE2B 4c7d78f27d355e078ebbe81f9c5d9b1d342f4f04d5f91260460d0559bfb7fc8204668072c06c8d493eb739c492b2935bffd24cb77cd554cd863734b7d84ff6e1 SHA512 b51821256ccaf9957562964b1342ee1656d1d8456081869797d8c704df3098d2643135767987b0673aa64a16703cb2e21deea4aef7d1598e67b9661b98245cda diff --git a/sci-visualization/epix/epix-1.2.11-r2.ebuild b/sci-visualization/epix/epix-1.2.19.ebuild index 7d479a0bc449..68c038fba49f 100644 --- a/sci-visualization/epix/epix-1.2.11-r2.ebuild +++ b/sci-visualization/epix/epix-1.2.19.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit elisp-common bash-completion-r1 autotools eutils +inherit autotools bash-completion-r1 elisp-common DESCRIPTION="2- and 3-D plotter for creating images (to be used in LaTeX)" HOMEPAGE="https://mathcs.holycross.edu/~ahwang/current/ePiX.html" SRC_URI="https://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2" -SLOT="0" LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" +SLOT="0" +KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="doc emacs examples" DEPEND=" @@ -24,35 +24,40 @@ DEPEND=" RDEPEND="${DEPEND}" SITEFILE=50${PN}-gentoo.el +PATCHES=( "${FILESDIR}"/${P}-autotools.patch ) + src_prepare() { - epatch "${FILESDIR}"/${PN}-1.2.10-autotools.patch + default eautoreconf } src_configure() { - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --disable-epix-el + econf --disable-epix-el } src_install() { default + + newbashcomp bash_completions epix + bashcomp_alias epix flix elaps laps + 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-compile *.el + elisp-install ${PN} *.elc *.el elisp-site-file-install "${FILESDIR}/${SITEFILE}" fi - newbashcomp bash_completions epix - bashcomp_alias epix flix elaps laps + if use doc; then dodoc doc/*gz + docompress -x /usr/share/doc/${PF}/manual{.pdf,.ps,_src.tar}.gz fi + if use examples; then cd samples || die docinto examples - doins *.xp *.flx *c *h README + dodoc *.xp *.flx *c *h README fi } diff --git a/sci-visualization/epix/files/epix-1.2.10-autotools.patch b/sci-visualization/epix/files/epix-1.2.10-autotools.patch deleted file mode 100644 index 03f93cd26c9c..000000000000 --- a/sci-visualization/epix/files/epix-1.2.10-autotools.patch +++ /dev/null @@ -1,85 +0,0 @@ -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/files/epix-1.2.19-autotools.patch b/sci-visualization/epix/files/epix-1.2.19-autotools.patch new file mode 100644 index 000000000000..403d65444f9c --- /dev/null +++ b/sci-visualization/epix/files/epix-1.2.19-autotools.patch @@ -0,0 +1,78 @@ +diff --git a/Makefile.am b/Makefile.am +index 382230e..a0ff51d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -86,11 +86,6 @@ epix elaps flix laps: %: %.in epix.el + -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 --git a/configure.ac b/configure.ac +index 9089c35..2d5fe60 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -9,6 +9,7 @@ AM_MAINTAINER_MODE + 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 --git a/doc/Makefile.am b/doc/Makefile.am +index c888b9a..4789c0a 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -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 @@ EEPICS = $(XPS:.xp=.eepic) + CLEANFILES = *~ *.aux *.dvi *.log *.out *.toc \ + *.idx *.ilg *.ind \ + 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 \ + *.idx *.ilg *.ind + + ## Targets ## +-doc_DATA = manual.pdf.gz manual.ps.gz manual_src.tar.gz ++doc_DATA = + + info_TEXINFOS = epix.texi + +@@ -42,7 +42,6 @@ manual.ps.gz: manual-stamp + + #PDF + manual.pdf.gz: manual-stamp +- gzip -9 -c manual.pdf > manual.pdf.gz + + epix.info: manual-stamp epix.texi + makeinfo epix.texi +diff --git a/samples/Makefile.am b/samples/Makefile.am +index 38bb5cd..7cd7cd4 100644 +--- a/samples/Makefile.am ++++ b/samples/Makefile.am +@@ -7,7 +7,7 @@ FLX = $(wildcard *.flx) + 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 index aa1412a875fc..b6a00968d350 100644 --- a/sci-visualization/epix/metadata.xml +++ b/sci-visualization/epix/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci@gentoo.org</email> @@ -14,5 +14,5 @@ LaTeX: You prepare a human-readable scene description in a text editor, then compile the input file into a picture. use ePiX, however. -</longdescription> + </longdescription> </pkgmetadata> diff --git a/sci-visualization/fig2sxd/metadata.xml b/sci-visualization/fig2sxd/metadata.xml index ab6e7a15619f..456f8bb98f66 100644 --- a/sci-visualization/fig2sxd/metadata.xml +++ b/sci-visualization/fig2sxd/metadata.xml @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://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> diff --git a/sci-visualization/fityk/Manifest b/sci-visualization/fityk/Manifest index 76f11e9286ba..efa698d3312a 100644 --- a/sci-visualization/fityk/Manifest +++ b/sci-visualization/fityk/Manifest @@ -1 +1,2 @@ DIST fityk-1.3.1.tar.bz2 1518937 BLAKE2B 6eb13646e1b5cf3fb0763bcf3e91a1877d89f14f1b986f1065fd27052e7110b357c99431a326a6c1fa2ba002300912b922cd3d5589ac5da367d2fbcee209f9a2 SHA512 4a7a65691af8b8d5b47461133b7870ea21ea04ac2ee8ee5714a6b9bab2f072baa6b5d8bf011baba09c62a7ce2dc9d60f3040cc6fdb77dc498b6e03a24fc0fe08 +DIST fityk-1.3.2.tar.bz2 1611794 BLAKE2B 294d64ed34532e7c126a7128c6f027004c86093293f335d5d900bffc5e1fc6d56b48f8a1ca0739f00b9983f9d21c544a3296a12e187401c0bf429cb545be10d7 SHA512 6871358cc1d12479f4ae8d76260412095fa17247b2bd76d7b036be330d73b8aac6d242239aea5c086a2eefad1bc387caa83e5a61452016cd77ea6a88e387aee3 diff --git a/sci-visualization/fityk/files/fityk-1.3.1-fix-gtk3.patch b/sci-visualization/fityk/files/fityk-1.3.1-fix-gtk3.patch new file mode 100644 index 000000000000..7b64f7f582fa --- /dev/null +++ b/sci-visualization/fityk/files/fityk-1.3.1-fix-gtk3.patch @@ -0,0 +1,31 @@ +From 85ea545db65d7c6fbb94988b85f1e8cf1c9cbba5 Mon Sep 17 00:00:00 2001 +From: Marcin Wojdyr <wojdyr@gmail.com> +Date: Sun, 17 Jan 2021 19:18:47 +0100 +Subject: [PATCH] allow building with wxGTK3 (closes #32) + +It works, but with some problems. + +The separator in wxSplitterWindow is not updated, as per: +http://trac.wxwidgets.org/ticket/16890 + +wxSpinCtrl is much wider (it has [+][-] instead of arrows) +--- + wxgui/app.cpp | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/wxgui/app.cpp b/wxgui/app.cpp +index 526c8f14..1041eccf 100644 +--- a/wxgui/app.cpp ++++ b/wxgui/app.cpp +@@ -8,11 +8,6 @@ + #include <wx/filesys.h> + #include <wx/tooltip.h> + +-#ifdef __WXGTK3__ +-#error "Not everything is working with wxGTK3. Use default wxGTK instead, " \ +- "based on GTK+2. If you want to test it, just remove this #error." +-#endif +- + #include <stdio.h> + #include <stdlib.h> + #include <vector> diff --git a/sci-visualization/fityk/fityk-1.3.1-r102.ebuild b/sci-visualization/fityk/fityk-1.3.1-r102.ebuild new file mode 100644 index 000000000000..cec78adbde05 --- /dev/null +++ b/sci-visualization/fityk/fityk-1.3.1-r102.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..3} ) +WX_GTK_VER=3.0-gtk3 + +inherit flag-o-matic lua-single wxwidgets xdg + +DESCRIPTION="General-purpose nonlinear curve fitting and data analysis" +HOMEPAGE="https://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 wxwidgets" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +DEPEND=" + ${LUA_DEPS} + dev-libs/boost:= + >=sci-libs/xylib-1 + nlopt? ( sci-libs/nlopt ) + readline? ( sys-libs/readline:0= ) + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )" +RDEPEND="${DEPEND} + gnuplot? ( sci-visualization/gnuplot )" +BDEPEND="dev-lang/swig" + +PATCHES=( "${FILESDIR}"/${P}-fix-gtk3.patch ) + +src_configure() { + # codebase relies on dynamic exception specifications + # for SWIG, no point in trying to fix at this point. + # https://github.com/wojdyr/fityk/pull/38 + append-cxxflags -std=c++14 + + use wxwidgets && setup-wxwidgets + + econf \ + --disable-python \ + --disable-static \ + $(use_enable nlopt) \ + $(use_enable wxwidgets GUI) \ + $(use_with readline) \ + --with-wx-config="${WX_CONFIG}" +} + +src_install() { + default + + # no static archives + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-visualization/fityk/fityk-1.3.1.ebuild b/sci-visualization/fityk/fityk-1.3.1.ebuild deleted file mode 100644 index e67e8dead69c..000000000000 --- a/sci-visualization/fityk/fityk-1.3.1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -WX_GTK_VER=3.0 - -PYTHON_COMPAT=( python3_6 ) - -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/fityk-1.3.2.ebuild b/sci-visualization/fityk/fityk-1.3.2.ebuild new file mode 100644 index 000000000000..1b1e85c205c7 --- /dev/null +++ b/sci-visualization/fityk/fityk-1.3.2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} ) +WX_GTK_VER=3.2-gtk3 + +inherit flag-o-matic lua-single wxwidgets xdg + +DESCRIPTION="General-purpose nonlinear curve fitting and data analysis" +HOMEPAGE="https://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 wxwidgets" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +DEPEND=" + ${LUA_DEPS} + dev-libs/boost:= + >=sci-libs/xylib-1 + nlopt? ( sci-libs/nlopt ) + readline? ( sys-libs/readline:0= ) + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} ) +" +RDEPEND="${DEPEND} + gnuplot? ( sci-visualization/gnuplot ) +" +BDEPEND="dev-lang/swig" + +src_configure() { + # codebase relies on dynamic exception specifications + # for SWIG, no point in trying to fix at this point. + # https://github.com/wojdyr/fityk/pull/38 + append-cxxflags -std=c++14 + + use wxwidgets && setup-wxwidgets + + econf \ + --disable-python \ + --disable-static \ + $(use_enable nlopt) \ + $(use_enable wxwidgets GUI) \ + $(use_with readline) \ + --with-wx-config="${WX_CONFIG}" +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die + + mv "${ED}"/usr/share/appdata "${ED}"/usr/share/metainfo || die +} diff --git a/sci-visualization/fityk/metadata.xml b/sci-visualization/fityk/metadata.xml index 94ca66ce2fab..b89ef2e38e00 100644 --- a/sci-visualization/fityk/metadata.xml +++ b/sci-visualization/fityk/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci@gentoo.org</email> @@ -23,7 +23,7 @@ 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> + </longdescription> <use> <flag name="nlopt">Enable optimization with <pkg>sci-libs/nlopt</pkg></flag> </use> diff --git a/sci-visualization/g3data/Manifest b/sci-visualization/g3data/Manifest index a32f39317e66..5bd1b7247aa1 100644 --- a/sci-visualization/g3data/Manifest +++ b/sci-visualization/g3data/Manifest @@ -1 +1 @@ -DIST g3data-1.5.4.tar.gz 127973 BLAKE2B 19e6e6aaa7b33a4c4aa061c76aa2465bdb305ac9023e861dc1db42821cdb83c9b8221f6a5552f37731c3fe21fedc4174d46a7d2c01732916534539d382e6fac2 SHA512 b4651eb6ba87ddb745c46520ccf2d7146d179e69a614d7c6c247b82eaf188b30e955d60e7df59419f63a304a5c5215829d3bea3cc233d2729ff599c523d852e2 +DIST g3data-1.5.4.gh.tar.gz 40296 BLAKE2B ac821f80323ba9d9fe59274bf1b9746ea53273a9b46b2a1f8366be28c5b58c6f098322293a4971ce80d6261de8e9719cea1f527b0c57a4bc3505be966ff14b23 SHA512 965e3d1f68865eea20e38bf428d32974c26407e3ccb736d2049141472d4ddf5bbe3e82fcea00195febb1de021396105217cfa8098b6724b9cedfe9dbbb3c5f76 diff --git a/sci-visualization/g3data/files/g3data-1.5.4-desktop-QA.patch b/sci-visualization/g3data/files/g3data-1.5.4-desktop-QA.patch new file mode 100644 index 000000000000..3391659716da --- /dev/null +++ b/sci-visualization/g3data/files/g3data-1.5.4-desktop-QA.patch @@ -0,0 +1,11 @@ +--- a/data/g3data.desktop ++++ b/data/g3data.desktop +@@ -3,7 +3,7 @@ + Name=g3data + Comment=Data Extraction Tool + Exec=g3data +-Icon=g3data-icon.xpm ++Icon=g3data-icon + Terminal=false + Type=Application + Categories=GNOME;Science;Graphics; diff --git a/sci-visualization/g3data/g3data-1.5.4.ebuild b/sci-visualization/g3data/g3data-1.5.4.ebuild index 09cbc7f4670b..8bcc2cc9695c 100644 --- a/sci-visualization/g3data/g3data-1.5.4.ebuild +++ b/sci-visualization/g3data/g3data-1.5.4.ebuild @@ -1,19 +1,26 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit autotools-utils eutils +inherit autotools DESCRIPTION="Tool for extracting data from graphs" HOMEPAGE="https://github.com/pn2200/g3data" -SRC_URI="https://github.com/downloads/pn2200/g3data/${P}.tar.gz" +SRC_URI="https://github.com/pn2200/g3data/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" RDEPEND="x11-libs/gtk+:2" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${P}-desktop-QA.patch ) + +src_prepare() { + default + + eautoreconf +} diff --git a/sci-visualization/g3data/metadata.xml b/sci-visualization/g3data/metadata.xml index 484cbd6c573d..bec6c7dd10c1 100644 --- a/sci-visualization/g3data/metadata.xml +++ b/sci-visualization/g3data/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci@gentoo.org</email> @@ -9,7 +9,7 @@ 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> + </longdescription> <upstream> <remote-id type="github">pn2200/g3data</remote-id> </upstream> diff --git a/sci-visualization/gcalc/gcalc-3.1_rc1-r1.ebuild b/sci-visualization/gcalc/gcalc-3.1_rc1-r2.ebuild index 285044c90585..f5a27970376f 100644 --- a/sci-visualization/gcalc/gcalc-3.1_rc1-r1.ebuild +++ b/sci-visualization/gcalc/gcalc-3.1_rc1-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils java-pkg-2 java-pkg-simple +inherit desktop java-pkg-2 java-pkg-simple MY_P="GCalc-${PV/_/-}" DESCRIPTION="Java Mathematical Graphing System" @@ -12,12 +12,10 @@ 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" +RDEPEND=">=virtual/jre-1.8:*" +DEPEND=">=virtual/jdk-1.8:*" S="${WORKDIR}/${MY_P}" diff --git a/sci-visualization/gcalc/metadata.xml b/sci-visualization/gcalc/metadata.xml index 32258c002cc2..6091d9a1ad69 100644 --- a/sci-visualization/gcalc/metadata.xml +++ b/sci-visualization/gcalc/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>java@gentoo.org</email> diff --git a/sci-visualization/ggobi/Manifest b/sci-visualization/ggobi/Manifest index 42f809f42b1d..b6808716cc84 100644 --- a/sci-visualization/ggobi/Manifest +++ b/sci-visualization/ggobi/Manifest @@ -1,2 +1 @@ -DIST ggobi_2.1.10.orig.tar.bz2 2776784 BLAKE2B 6e5f5bfcb3b10af425a552da1f0d9eb4ba445d0eced0e5b5a20d3ea88da782f9e333005b929408baeb895a1e62d5e1500a86de5c7353b60ee8fbf950521b00c0 SHA512 40bc4a7fae992bf327d6b36c5aea7802279a3b6229242f31386e771636b4561260914a7fefb6a6337c1e1ab5a0682fbdd626389b83d9b57d0c2d050fac3723e5 DIST ggobi_2.1.11.orig.tar.bz2 2787709 BLAKE2B e4b853f3212abda00150e6a3b3a344638225bdc564c109632c7ca2f9cb8cc41d35af9df1ee153d2ede3bd3191d9219e2bdd6bd6bc9c64f42447dfe17562361f1 SHA512 d34c6569d05d1e680101b62745012940c1e18c1588cd37b89b26b89e9eed9bab8fc53e0585a595b6cb4c9f2bb7d603ca4252cb6a6ba344bbc24e5cc5fd8a6dc1 diff --git a/sci-visualization/ggobi/files/ggobi-2.1.10-desktop.patch b/sci-visualization/ggobi/files/ggobi-2.1.10-desktop.patch index 388cb85c975c..c41581e3c599 100644 --- a/sci-visualization/ggobi/files/ggobi-2.1.10-desktop.patch +++ b/sci-visualization/ggobi/files/ggobi-2.1.10-desktop.patch @@ -1,5 +1,5 @@ ---- xdg/ggobi.desktop.orig 2013-02-24 22:20:02.616872402 -0800 -+++ xdg/ggobi.desktop 2013-02-24 22:20:13.293924862 -0800 +--- a/xdg/ggobi.desktop ++++ b/xdg/ggobi.desktop @@ -6,6 +6,6 @@ Comment=Multivariate interactive graphics for exploratory data analysis TryExec=ggobi diff --git a/sci-visualization/ggobi/files/ggobi-2.1.10-hardened.patch b/sci-visualization/ggobi/files/ggobi-2.1.10-hardened.patch deleted file mode 100644 index 63681a0a03ea..000000000000 --- a/sci-visualization/ggobi/files/ggobi-2.1.10-hardened.patch +++ /dev/null @@ -1,66 +0,0 @@ -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.8-plugindir.patch b/sci-visualization/ggobi/files/ggobi-2.1.8-plugindir.patch index 0476f47a816d..bd831f61ce8a 100644 --- a/sci-visualization/ggobi/files/ggobi-2.1.8-plugindir.patch +++ b/sci-visualization/ggobi/files/ggobi-2.1.8-plugindir.patch @@ -1,5 +1,5 @@ ---- plugins/Makefile.plugin.orig 2009-12-14 22:15:01.000000000 +0000 -+++ plugins/Makefile.plugin 2009-12-14 22:15:16.000000000 +0000 +--- a/plugins/Makefile.plugin ++++ b/plugins/Makefile.plugin @@ -2,7 +2,7 @@ # Every plugin provides a single library to GGobi, define it here. 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 index 3bec9b55c21d..bc6ef01e4075 100644 --- a/sci-visualization/ggobi/files/ggobi-2.1.9-as-needed.patch +++ b/sci-visualization/ggobi/files/ggobi-2.1.9-as-needed.patch @@ -1,5 +1,5 @@ ---- configure.ac.orig 2012-06-26 05:46:07.000000000 +0100 -+++ configure.ac 2012-06-26 05:46:44.000000000 +0100 +--- a/configure.ac ++++ b/configure.ac @@ -178,6 +178,8 @@ echo "Looking for gtk2" @@ -10,8 +10,8 @@ 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 +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -4,7 +4,6 @@ libggobi_la_GOBHEADERS = $(libggobi_la_GOBS:%.gob=ggobi-%.h) libggobi_la_GOBOBJECTS = $(libggobi_la_GOBS:%.gob=ggobi-%.lo) @@ -38,3 +38,24 @@ ggobi_LDFLAGS = -mwindows -s endif +--- a/plugins/GraphLayout/configure.ac ++++ b/plugins/GraphLayout/configure.ac +@@ -44,6 +44,7 @@ + AC_MSG_RESULT(no)]) + + AC_MSG_CHECKING([whether Graphviz API is based on cgraph]) ++save_CFLAGS="${CFLAGS}" + CFLAGS=$LIBGVC_CFLAGS + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ + #include <gvc.h> +@@ -53,8 +54,10 @@ + return 0; + } + ])], graphviz_new_api=yes, graphviz_new_api=no) ++CFLAGS="${save_CFLAGS}" + AC_MSG_RESULT($graphviz_new_api) + if test "$graphviz_new_api" = "yes"; then ++ CFLAGS="${CFLAGS} ${LIBGVC_CFLAGS}" + AC_DEFINE(HAVE_CGRAPH,[1],[define for cgraph-based graphviz]) + fi + diff --git a/sci-visualization/ggobi/ggobi-2.1.10.ebuild b/sci-visualization/ggobi/ggobi-2.1.10.ebuild deleted file mode 100644 index 79dd49b4198b..000000000000 --- a/sci-visualization/ggobi/ggobi-2.1.10.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# 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 index 658728197cf2..12b5c791bf59 100644 --- a/sci-visualization/ggobi/ggobi-2.1.11.ebuild +++ b/sci-visualization/ggobi/ggobi-2.1.11.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils autotools +EAPI=7 + +inherit autotools xdg DESCRIPTION="Visualization program for exploring high-dimensional data" HOMEPAGE="http://www.ggobi.org/" @@ -12,33 +13,35 @@ 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" +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" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${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 +) src_prepare() { - sed -i \ - -e 's|ND_coord_i|ND_coord|' \ - plugins/GraphLayout/graphviz.c || die + default + sed -e 's|ND_coord_i|ND_coord|' \ + -i 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) @@ -50,7 +53,14 @@ src_compile() { src_install() { default + insinto /etc/xdg/ggobi doins ggobirc - use doc || rm "${ED}"/usr/share/doc/${PF}/*.pdf + + if ! use doc; then + rm "${ED}"/usr/share/doc/${PF}/*.pdf || die + fi + + # no static archives + find "${ED}" -name '*.la' -delete || die } diff --git a/sci-visualization/ggobi/metadata.xml b/sci-visualization/ggobi/metadata.xml index 0e5039261b99..5958ca61110a 100644 --- a/sci-visualization/ggobi/metadata.xml +++ b/sci-visualization/ggobi/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci@gentoo.org</email> diff --git a/sci-visualization/gle/Manifest b/sci-visualization/gle/Manifest index e76fdeeb715c..0bb3855bdcd3 100644 --- a/sci-visualization/gle/Manifest +++ b/sci-visualization/gle/Manifest @@ -1 +1,4 @@ -DIST gle-graphics-4.2.5f-src.tar.gz 2330270 BLAKE2B 46435a2366a278a88786a2dd0e0cbcc48d3ba2fc6d895fb07c81216089a10b2223b2ba692b951ee01a6ab014e84cce9aa3969d063ddf7d04501820aa33084c5c SHA512 d459b24577c9c3f8825c368f864532c97d0a37c94018276a60c941d17dce0e55fe738f7eda3227a47848f2fb32fea1dcec29d9751a5be92cde4d8d38a2eeb0f5 +DIST gle-4.3.4.pdf 3950922 BLAKE2B 7151b88bdbcf55c6a23b2190cbc00d1cbec78c3026487337f0bbe2746b22ecf81f549b6e778fcf1f82adc6a71805f3ed7c45bda40328b86a56ef2b78c1fffc4d SHA512 78eef1e97bfbe1a1897b22b7650fba08e170708cf53adfd22cd432081497e2c5845534e43549e7fd5b9e3c9e7e1c937dbc0b64b35c5416ce4cf143c55e5a56a9 +DIST gle-4.3.4.tar.gz 1791581 BLAKE2B a26fcafb3390fcf083a0d3008e22f3e998b71ba44f373fabf5feb8fd494fe8be8941e6f6118e1062b4ad4330a5e2e722b890edecaeba3a7640af954c7067b8d6 SHA512 5b59e0a51b466313b6ae53419137a25764f2b0c4eed8be217e30ba73245afbdbbd74228f5539b50f47dccfd5448be12b18ffa0e935a663bfd2073bb5d5eafeac +DIST gle-library.tar.gz 1073620 BLAKE2B 051f9584dbf3195c7598ae54b12ab8d373e8054e8ff4c3d1dfed70319c29c5cb8bb1f0baff127768bcf9e36e4f52be3b3238e786e1598d1cdfbd6d1af6d6bdd3 SHA512 af6a46f2bd945714679eb9d8ca4c70ca9a741cf6652590eb3a8d9422059f49ce3d2c33418c37899bd54f9e0bc0085ae82ffd2f2b84b77879e2f2d09a0026d12a +DIST gle-mode.el.gz 7359 BLAKE2B bcbc61651f87f3ee1d079fc0a0de38788523a5ee33f56087b89f4e15b9ef5ee4010cf47679c38da3dfae1954ddbfee4728d10c0af6530f645ff63ab2b219da09 SHA512 c8d291c23f53346d8a44b7d95d737da88c6ec0af597fb8298a564a5567a9e9a0db658d14c3cb43157d58614e65cf2293eaeb01528a7a49722a2da07e16f940e1 diff --git a/sci-visualization/gle/files/64gle-gentoo.el b/sci-visualization/gle/files/64gle-gentoo.el index 841503ba6eec..6c60d91fd302 100644 --- a/sci-visualization/gle/files/64gle-gentoo.el +++ b/sci-visualization/gle/files/64gle-gentoo.el @@ -2,5 +2,5 @@ ;;; gle site-lisp configuration (add-to-list 'load-path "@SITELISP@") -(autoload 'gle-mode "gle-mode") (add-to-list 'auto-mode-alist '("\\.gle\\'" . gle-mode)) +(autoload 'gle-mode "gle-mode" "Major mode for gle files." t) diff --git a/sci-visualization/gle/files/gle-4.2.5-c++14.patch b/sci-visualization/gle/files/gle-4.2.5-c++14.patch deleted file mode 100644 index b548816ae065..000000000000 --- a/sci-visualization/gle/files/gle-4.2.5-c++14.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -r -U2 gle-graphics-4.2.5.orig/src/gle/fitcf.h gle-graphics-4.2.5/src/gle/fitcf.h ---- gle-graphics-4.2.5.orig/src/gle/fitcf.h 2015-08-16 13:51:24.000000000 +0600 -+++ gle-graphics-4.2.5/src/gle/fitcf.h 2018-01-13 13:57:23.140749391 +0700 -@@ -182,8 +182,8 @@ - typedef struct Namelist Namelist; - --#define abs(x) ((x) >= 0 ? (x) : -(x)) -+/*#define abs(x) ((x) >= 0 ? (x) : -(x))*/ - #define dabs(x) (doublereal)abs(x) --#define min(a,b) ((a) <= (b) ? (a) : (b)) --#define max(a,b) ((a) >= (b) ? (a) : (b)) -+/*#define min(a,b) ((a) <= (b) ? (a) : (b))*/ -+/*#define max(a,b) ((a) >= (b) ? (a) : (b))*/ - #define dmin(a,b) (doublereal)min(a,b) - #define dmax(a,b) (doublereal)max(a,b) -diff -r -U2 gle-graphics-4.2.5.orig/src/gle/surface/ffitcontour.cpp gle-graphics-4.2.5/src/gle/surface/ffitcontour.cpp ---- gle-graphics-4.2.5.orig/src/gle/surface/ffitcontour.cpp 2015-08-16 13:51:24.000000000 +0600 -+++ gle-graphics-4.2.5/src/gle/surface/ffitcontour.cpp 2018-01-13 14:08:08.169722265 +0700 -@@ -49,7 +49,7 @@ - #include "f2c.h" - #else --#include "f2c.h" - #include <stdio.h> - #include <math.h> -+#include "f2c.h" - #endif - diff --git a/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch b/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch deleted file mode 100644 index c5dd2205dc43..000000000000 --- a/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.gentoo.org/647626 - ---- a/src/gle/gle-poppler.cpp -+++ b/src/gle/gle-poppler.cpp -@@ -194,7 +194,7 @@ - boolean gle_jpeg_empty_output_buffer(j_compress_ptr cinfo) { - gle_jpeg_term_destination(cinfo); - gle_jpeg_init_destination(cinfo); -- return true; -+ return TRUE; - } - - void gle_jpeg_memory_dest(j_compress_ptr cinfo, JOCTET* buffer, GLEWriteFuncAndClosure writeCallback) { -@@ -237,7 +237,7 @@ - cinfo.in_color_space = JCS_RGB; - } - jpeg_set_defaults(&cinfo); -- jpeg_start_compress(&cinfo, true); -+ jpeg_start_compress(&cinfo, TRUE); - JSAMPROW row = new JSAMPLE[cinfo.input_components * width]; - JSAMPROW row_pointer[1]; - row_pointer[0] = row; diff --git a/sci-visualization/gle/files/gle-4.2.5-parallel.patch b/sci-visualization/gle/files/gle-4.2.5-parallel.patch deleted file mode 100644 index eeca1f5946ba..000000000000 --- a/sci-visualization/gle/files/gle-4.2.5-parallel.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -r -U2 gle-graphics-4.2.5.orig/src/gui/MakefileAC.in gle-graphics-4.2.5/src/gui/MakefileAC.in ---- gle-graphics-4.2.5.orig/src/gui/MakefileAC.in 2015-08-16 13:51:24.000000000 +0600 -+++ gle-graphics-4.2.5/src/gui/MakefileAC.in 2018-01-13 14:23:09.066684378 +0700 -@@ -83,12 +83,12 @@ - $(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 diff --git a/sci-visualization/gle/files/gle.sh b/sci-visualization/gle/files/gle.sh new file mode 100644 index 000000000000..38fb09ada2fa --- /dev/null +++ b/sci-visualization/gle/files/gle.sh @@ -0,0 +1,3 @@ +#!/bin/sh +export GLE_TOP=/usr/share/gle +exec /usr/bin/gle.bin $* diff --git a/sci-visualization/gle/files/license.patch b/sci-visualization/gle/files/license.patch new file mode 100644 index 000000000000..05b44088f420 --- /dev/null +++ b/sci-visualization/gle/files/license.patch @@ -0,0 +1,11 @@ +diff -r -U3 src.orig/CMakeLists.txt src/CMakeLists.txt +--- src.orig/CMakeLists.txt 2023-04-11 07:46:19.000000000 +0700 ++++ src/CMakeLists.txt 2023-04-12 21:54:22.107770167 +0700 +@@ -461,7 +461,6 @@ + + # documentation file installation in doc folder + install(FILES +- ../doc/LICENSE.txt + ../doc/README.txt + ../doc/ChangeLog.txt + CONFIGURATIONS Release Debug diff --git a/sci-visualization/gle/files/tiff.patch b/sci-visualization/gle/files/tiff.patch new file mode 100644 index 000000000000..98bdc2e018d8 --- /dev/null +++ b/sci-visualization/gle/files/tiff.patch @@ -0,0 +1,9 @@ +diff -r -U2 src.orig/gui/CMakeLists.txt src/gui/CMakeLists.txt +--- src.orig/gui/CMakeLists.txt 2023-04-11 07:46:19.000000000 +0700 ++++ src/gui/CMakeLists.txt 2023-08-21 13:00:21.039704497 +0700 +@@ -70,4 +70,5 @@ + ${PNG_LIBRARIES} + ${PIXMAN_LIBRARIES} ++ TIFF::TIFF + Qt::Core + Qt::Gui diff --git a/sci-visualization/gle/gle-4.2.5-r1.ebuild b/sci-visualization/gle/gle-4.2.5-r1.ebuild deleted file mode 100644 index dee5f4ae58c9..000000000000 --- a/sci-visualization/gle/gle-4.2.5-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils elisp-common 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 )" -IUSE="X jpeg png tiff doc emacs vim-syntax" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -DEPEND=" - sys-libs/ncurses:0= - X? ( x11-libs/libX11 ) - jpeg? ( virtual/jpeg:0 ) - png? ( media-libs/libpng:0= ) - tiff? ( media-libs/tiff:0 ) - doc? ( dev-texlive/texlive-latexextra ) - emacs? ( >=app-editors/emacs-23.1:* )" - -RDEPEND="${DEPEND} - app-text/ghostscript-gpl - virtual/latex-base - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" - -S="${WORKDIR}"/${MY_P} - -PATCHES=( - "${FILESDIR}"/${P}-parallel.patch - "${FILESDIR}"/${P}-c++14.patch - "${FILESDIR}"/${P}-jpeg-9c.patch -) - -src_prepare() { - default - eaclocal - eautoconf -} - -src_configure() { - # CPPFLAGS are understood as C++ flags - append-cppflags ${CXXFLAGS} - econf \ - --without-rpath \ - --without-qt \ - --with-manip \ - $(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 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/gle-4.3.4-r1.ebuild b/sci-visualization/gle/gle-4.3.4-r1.ebuild new file mode 100644 index 000000000000..38c0f6b7b18f --- /dev/null +++ b/sci-visualization/gle/gle-4.3.4-r1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake elisp-common + +DESCRIPTION="Graphics Layout Engine" +HOMEPAGE="http://glx.sourceforge.io/ https://github.com/vlabella/GLE/" +IUSE="doc emacs" +LIB_VERSION="d476418f006b001dc7f47dcafb413c0557fa44a7" +SRC_URI="https://github.com/vlabella/GLE/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/vlabella/gle-library/archive/${LIB_VERSION}.tar.gz -> ${PN}-library.tar.gz + doc? ( https://github.com/vlabella/GLE/releases/download/v${PV}/gle-manual.pdf -> ${P}.pdf ) + emacs? ( https://dev.gentoo.org/~grozin/gle-mode.el.gz )" +S="${WORKDIR}"/GLE-${PV}/src + +LICENSE="BSD GPL-2+" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="app-text/ghostscript-gpl + dev-libs/boost + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + media-libs/freeglut + media-libs/glu + media-libs/libpng + media-libs/tiff + sys-libs/zlib + media-libs/libjpeg-turbo + x11-libs/cairo + x11-libs/pixman + emacs? ( app-editors/emacs:* )" +RDEPEND="${DEPEND} + virtual/latex-base" + +PATCHES=( "${FILESDIR}"/license.patch "${FILESDIR}"/tiff.patch ) +SITEFILE="64${PN}-gentoo.el" + +src_configure() { + local mycmakeargs=( + -DGLE_EXAMPLES_LIBRARY_PATH="${WORKDIR}"/gle-library-${LIB_VERSION} + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use emacs && elisp-compile "${WORKDIR}"/*.el +} + +src_install() { + pushd "${WORKDIR}"/GLE-${PV}/src_build > /dev/null || die "pushd failed" + newbin gle/gle gle.bin + dobin gui/qgle + insinto /usr/share/${PN} + doins gle/glerc + doins -r gle/font + popd > /dev/null + newbin "${FILESDIR}"/gle.sh gle + dodoc ../doc/README.txt ../doc/ChangeLog.txt + doins TeX/init.tex + mv "${WORKDIR}"/gle-library-${LIB_VERSION}/include "${WORKDIR}"/gle-library-${LIB_VERSION}/gleinc || die "mv failed" + doins -r "${WORKDIR}"/gle-library-${LIB_VERSION}/gleinc + GLE_TOP="${D}"/usr/share/${PN} "${D}"/usr/bin/gle.bin -mkinittex + use doc && dodoc "${DISTDIR}"/*.pdf + if use emacs; then + elisp-install ${PN} "${WORKDIR}"/*.el "${WORKDIR}"/*.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/gle/metadata.xml b/sci-visualization/gle/metadata.xml index 3d73697aa10d..436234231cdc 100644 --- a/sci-visualization/gle/metadata.xml +++ b/sci-visualization/gle/metadata.xml @@ -1,21 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://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> + <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="github">vlabella/gle</remote-id> + <remote-id type="sourceforge">glx</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest index d4d9a15420e8..4bbc33f47f32 100644 --- a/sci-visualization/gnuplot/Manifest +++ b/sci-visualization/gnuplot/Manifest @@ -1,3 +1,3 @@ -DIST gnuplot-5.0.7.tar.gz 5100186 BLAKE2B 97fcefa12148fc2b581113c5283eb09217e87858ae293931758d0bb595fd7aaca4671216956211a3d30492be35f91809a975c9c80c25861c477e9235a8b5b309 SHA512 5d7241dc1472f87af8632110a1e88f83b5ea3f41e1bc8c89a45dc4662a3071d91a25bf9ae5196a2b8bef09c8079c22f635bb947c02def3416d78880d61eea919 -DIST gnuplot-5.2.7.tar.gz 5335673 BLAKE2B 6ca3055f6bb2e032562c7f21beda0adca1087598c7bacc9ab187c7ea4a3d85e08598ddb0ff0660bca081bc17899dbb92bbfbb6acde8b7b5367f12da7a2a14b62 SHA512 f6b77e16b25e5705ea9dad4f89ed5f5a3cf95d3e4215da00be3cbfbcdeee23009e9205156399448526783f25b5b7599b674670c94c01345abafeff74f6c7de93 -DIST gnuplot-5.2.8.tar.gz 5340677 BLAKE2B 169f5bef44a64b3b7a5be40e28ea22ef24ebc7526fe13ab09e16495453c3922712603d63a03c3b4332368d2ae8cbe4ef57ec53e18bbb4ad2cde13e4cc534245a SHA512 513dff15236dcb58c3c5471cdaa0713242787dbf30ef860c3f69152cb87c6392e4973caff5eb178707bbb84c78548e806b2920864a37686bce49425fbfdc4e8c +DIST gnuplot-5.4.10.tar.gz 5687565 BLAKE2B 879159fb4b581aa334b221632af7268047077cd48d89d1cecb0c6c9e855edd40bddfdaa8222177652d6200f81b97b0b52fe719da0641eea817e086832f07664f SHA512 fe5226a243dad62e8617d820764dc5923e76a51a68c58a666a699110f5b5be0f5e759e0586e923472a59ca6d1b30d1093d7a65e9c1d3a36fcd33a95df36ab89f +DIST gnuplot-5.4.8.tar.gz 5684061 BLAKE2B bd897b55e267f50e2f5ce8a49a3a033277577cd972c9effaaaedb0bb2e75908ce34997e389edcc4bd0db1dd8a0d937925216ed6ebf4e51d6700bac50d12e6a47 SHA512 3fe0ed783db85d95bdbc13e24ec5dc9bb6b2d85b3571cc87d3c17c94f4463fb6e681376394e0918cf3915f8f53896e6423ce76cb8b6fdbefcd6ec3e1b3b80125 +DIST gnuplot-6.0.0.tar.gz 7522870 BLAKE2B 619171272c2348db1b676d6d773d34e0b9f1b219e1a43c37287e3347d8ae6147ebc2a88cea5da13f34cb608cc1c8ebf884e89b8975249fd5c19167a38a65c8df SHA512 520b9a74ac64e4d0b0f89dda55f77b27026e60b7a9208e994d321299481d0aa1f8adc91e61682534112bf739311a3d312c5abe08c12ec9bc2a7a6319b53872ea 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 deleted file mode 100644 index c39bc828f268..000000000000 --- a/sci-visualization/gnuplot/files/gnuplot-5.0.1-fix-underlinking.patch +++ /dev/null @@ -1,17 +0,0 @@ -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/files/gnuplot-5.2.2-regis.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.2-regis.patch deleted file mode 100644 index 613a028ee79b..000000000000 --- a/sci-visualization/gnuplot/files/gnuplot-5.2.2-regis.patch +++ /dev/null @@ -1,43 +0,0 @@ -Add configure option for ReGIS support. -https://bugs.gentoo.org/643888 - ---- gnuplot-5.2.2-orig/configure.ac -+++ gnuplot-5.2.2/configure.ac -@@ -1057,6 +1057,13 @@ - AC_DEFINE(HAVE_MIF,1, - [ Define to include support for mif terminal ],)) - -+dnl ReGIS terminal -+AC_ARG_WITH(regis,dnl -+[ --with-regis ReGIS terminal]) -+AS_IF([test "x${with_regis}" = "xyes"], -+ AC_DEFINE(HAVE_REGIS,1, -+ [ Define to include support for ReGIS terminal ],)) -+ - AC_ARG_WITH(cairo,dnl - [ --without-cairo cairo-based terminals (default enabled)],, - [test -z "${with_cairo}" && with_cairo=yes]) -@@ -1350,6 +1357,12 @@ - AC_MSG_RESULT([ mif terminal: no (use --with-mif to enable)]) - fi - -+if test "$with_regis" = yes; then -+ AC_MSG_RESULT([ ReGIS terminal: yes]) -+else -+ AC_MSG_RESULT([ ReGIS terminal: no (use --with-regis to enable)]) -+fi -+ - if test "$is_msdos" = yes; then - AC_MSG_RESULT([ svga terminal (MSDOS/djgpp): yes]) - fi ---- gnuplot-5.2.2-orig/src/term.h -+++ gnuplot-5.2.2/src/term.h -@@ -182,7 +182,7 @@ - #endif - - /* REGIS graphics language */ --#ifdef VMS -+#if defined(VMS) || defined(HAVE_REGIS) - # include "regis.trm" - #endif - diff --git a/sci-visualization/gnuplot/files/gnuplot-5.2.6-caca.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.6-caca.patch deleted file mode 100644 index 4441e4b8c036..000000000000 --- a/sci-visualization/gnuplot/files/gnuplot-5.2.6-caca.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://bugs.gentoo.org/690014 -https://sourceforge.net/p/gnuplot/mailman/message/34342174/ - ---- gnuplot-5.2.6-orig/configure.ac -+++ gnuplot-5.2.6/configure.ac -@@ -1224,6 +1224,7 @@ - if test "${enable_qt_ok}" = yes \ - || test "${enable_wxwidgets_ok}" = yes \ - || test "$GGI_SUPPORT" = yes \ -+ || test "$with_caca" = yes \ - || test "$no_x" != yes; then - enable_mouse=yes; - fi diff --git a/sci-visualization/gnuplot/files/gnuplot-6.0.0-configure.patch b/sci-visualization/gnuplot/files/gnuplot-6.0.0-configure.patch new file mode 100644 index 000000000000..463dccab8c90 --- /dev/null +++ b/sci-visualization/gnuplot/files/gnuplot-6.0.0-configure.patch @@ -0,0 +1,11 @@ +--- gnuplot-6.0.0/configure.ac ++++ gnuplot-6.0.0/configure.ac +@@ -1024,7 +1024,7 @@ + [ Define to support defining a function as a here document]) + ) + +-Enable parsing of deprecated syntax ++dnl Enable parsing of deprecated syntax + AC_ARG_ENABLE(backward-compatibility,dnl + [ --enable-backward-compatibility enable some deprecated syntax ], + [if test "$enableval" = yes; then diff --git a/sci-visualization/gnuplot/files/gnuplot-6.1-no-picins.patch b/sci-visualization/gnuplot/files/gnuplot-6.1-no-picins.patch new file mode 100644 index 000000000000..a0e2c8a429ab --- /dev/null +++ b/sci-visualization/gnuplot/files/gnuplot-6.1-no-picins.patch @@ -0,0 +1,18 @@ +Do not require picins.sty. +https://bugs.gentoo.org/577828#c4 + +--- gnuplot/docs/Makefile.am ++++ gnuplot/docs/Makefile.am +@@ -143,9 +143,10 @@ + $(AM_V_at)GNUPLOT_LIB=$(top_srcdir)/demo $(GNUPLOT_EXE) $(srcdir)/plotstyles.gnu + rm -f gpinsetfigure.tex + printf '%s\n' '\usepackage{graphicx}' \ +- '\usepackage{picins}' \ + '\newcommand{\gpinsetfigure}[1]{' \ +- ' \parpic[r][rt]{\includegraphics[width=3in,keepaspectratio]{#1}}' \ ++ ' \begin{figure}[htb]' \ ++ ' \centering\includegraphics[width=3in,keepaspectratio]{#1}' \ ++ ' \end{figure}' \ + '}' > gpinsetfigure.tex + $(AM_V_GEN)touch $@ + $(AM_V_at)touch figurestyle diff --git a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild deleted file mode 100644 index baf70b0bb6a8..000000000000 --- a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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}" -else - MY_P="${P/_/.}" - SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="gnuplot" -SLOT="0" -IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5 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 ) - qt5? ( dev-qt/qtcore:5= - dev-qt/qtgui:5= - dev-qt/qtnetwork:5= - dev-qt/qtprintsupport:5= - dev-qt/qtsvg:5= - dev-qt/qtwidgets:5= ) - 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 ) - qt5? ( dev-qt/linguist-tools:5 )" - -S="${WORKDIR}/${MY_P}" - -GP_VERSION="${PV%.*}" -E_SITEFILE="lisp/50${PN}-gentoo.el" -TEXMF="${EPREFIX}/usr/share/texmf-site" - -src_prepare() { - eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch - eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch - eapply_user - - 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 - - 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" - setup-wxwidgets - fi - - tc-export CC CXX #453174 - tc-export_build_env BUILD_CC - export CC_FOR_BUILD=${BUILD_CC} - - use qt5 && append-cxxflags -std=c++11 - - 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 qt5 qt qt5) \ - $(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 - if use cairo && use gd; then - emake -C docs pdf - else - ewarn "Cannot build figures unless cairo and gd are enabled." - ewarn "Building documentation without figures." - emake -C docs pdf_nofig - mv docs/nofigures.pdf docs/gnuplot.pdf || die - fi - 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.3.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.10.ebuild index aa399503dd8b..e369717a83f3 100644 --- a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.4.10.ebuild @@ -1,9 +1,12 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets +LUA_COMPAT=( lua5-{1,2,3,4} ) +WX_GTK_VER="3.2-gtk3" + +inherit autotools lua-single readme.gentoo-r1 toolchain-funcs wxwidgets DESCRIPTION="Command-line driven interactive plotting program" HOMEPAGE="http://www.gnuplot.info/" @@ -17,12 +20,17 @@ if [[ -z ${PV%%*9999} ]]; then else MY_P="${P/_/.}" SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi +S="${WORKDIR}/${MY_P}" + LICENSE="gnuplot" SLOT="0" -IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline wxwidgets X" +IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X" +REQUIRED_USE=" + doc? ( gd ) + lua? ( ${LUA_REQUIRED_USE} )" RDEPEND=" cairo? ( @@ -36,7 +44,7 @@ RDEPEND=" dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) - lua? ( dev-lang/lua:0 ) + lua? ( ${LUA_DEPS} ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= @@ -47,34 +55,44 @@ RDEPEND=" readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) wxwidgets? ( - x11-libs/wxGTK:3.0[X] + x11-libs/wxGTK:${WX_GTK_VER}[X] x11-libs/cairo x11-libs/pango - x11-libs/gtk+:2 ) - X? ( x11-libs/libXaw )" + x11-libs/gtk+:3 ) + X? ( + x11-libs/libX11 + x11-libs/libXaw )" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" BDEPEND=" virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra + dev-texlive/texlive-langgreek + dev-texlive/texlive-mathscience app-text/ghostscript-gpl ) qt5? ( dev-qt/linguist-tools:5 )" -S="${WORKDIR}/${MY_P}" +IDEPEND="latex? ( virtual/latex-base )" GP_VERSION="${PV%.*}" -E_SITEFILE="lisp/50${PN}-gentoo.el" TEXMF="${EPREFIX}/usr/share/texmf-site" +PATCHES=( + "${FILESDIR}"/${PN}-5.0.6-no-picins.patch +) + +pkg_setup() { + use lua && lua-single_pkg_setup +} + src_prepare() { - eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch - eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch - eapply_user + default - if [[ -z ${PV%%*9999} ]]; then + if [[ ${PV##*.} = 9999 ]]; then local dir for dir in config demo m4 term tutorial; do emake -C "$dir" -f Makefile.am.in Makefile.am @@ -85,14 +103,6 @@ src_prepare() { # of the gnuplot license sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die - 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 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." - eautoreconf # Make sure we don't mix build & host flags. @@ -109,28 +119,23 @@ src_configure() { sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die fi - if use wxwidgets; then - WX_GTK_VER="3.0" - setup-wxwidgets - fi + use wxwidgets && setup-wxwidgets tc-export CC CXX #453174 tc-export_build_env BUILD_CC export CC_FOR_BUILD=${BUILD_CC} - use qt5 && append-cxxflags -std=c++11 - econf \ --with-texdir="${TEXMF}/tex/latex/${PN}" \ --with-readline=$(usex readline gnu builtin) \ $(use_with bitmap bitmap-terminals) \ $(use_with cairo) \ - $(use_with doc tutorial) \ $(use_with gd) \ "$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \ "$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \ $(use_with libcerf) \ $(use_with lua) \ + $(use_with regis) \ $(use_with X x) \ --enable-stats \ $(use_with qt5 qt qt5) \ @@ -146,8 +151,6 @@ src_compile() { emake all if use doc; then - # Avoid sandbox violation in epstopdf/ghostscript - addpredict /var/cache/fontconfig if use cairo; then emake -C docs pdf else @@ -156,30 +159,37 @@ src_compile() { emake -C docs pdf_nofig mv docs/nofigures.pdf docs/gnuplot.pdf || die fi - emake -C tutorial pdf fi } src_install() { emake DESTDIR="${D}" install - dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES TODO + dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES newdoc term/PostScript/README README-ps newdoc term/js/README README-js use lua && newdoc term/lua/README README-lua + + local DOC_CONTENTS='Gnuplot no longer links against pdflib. You can + use the "pdfcairo" terminal for PDF output.' + use cairo || DOC_CONTENTS+=' It is available with USE="cairo".' + 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." 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* + rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary{1,2,3} || die + rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/plugin/*.{o,so} || die fi if use doc; then - # Manual, tutorial, FAQ - dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf + # Manual, FAQ + dodoc docs/gnuplot.pdf FAQ.pdf # Documentation for making PostScript files docinto psdoc dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README} @@ -187,7 +197,7 @@ src_install() { } src_test() { - GNUTERM="unknown" default_src_test + emake check GNUTERM="dumb" } pkg_postinst() { diff --git a/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.8.ebuild index 4c57d268b612..e369717a83f3 100644 --- a/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.4.8.ebuild @@ -1,9 +1,12 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets +LUA_COMPAT=( lua5-{1,2,3,4} ) +WX_GTK_VER="3.2-gtk3" + +inherit autotools lua-single readme.gentoo-r1 toolchain-funcs wxwidgets DESCRIPTION="Command-line driven interactive plotting program" HOMEPAGE="http://www.gnuplot.info/" @@ -11,18 +14,23 @@ HOMEPAGE="http://www.gnuplot.info/" if [[ -z ${PV%%*9999} ]]; then inherit git-r3 EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main" - EGIT_BRANCH="branch-5-2-stable" + EGIT_BRANCH="master" MY_P="${PN}" EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}" else MY_P="${P/_/.}" SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi +S="${WORKDIR}/${MY_P}" + LICENSE="gnuplot" SLOT="0" -IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline svga wxwidgets X" +IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X" +REQUIRED_USE=" + doc? ( gd ) + lua? ( ${LUA_REQUIRED_USE} )" RDEPEND=" cairo? ( @@ -36,7 +44,7 @@ RDEPEND=" dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) - lua? ( dev-lang/lua:0 ) + lua? ( ${LUA_DEPS} ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= @@ -46,36 +54,45 @@ RDEPEND=" dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) - svga? ( media-libs/svgalib ) wxwidgets? ( - x11-libs/wxGTK:3.0[X] + x11-libs/wxGTK:${WX_GTK_VER}[X] x11-libs/cairo x11-libs/pango - x11-libs/gtk+:2 ) - X? ( x11-libs/libXaw )" + x11-libs/gtk+:3 ) + X? ( + x11-libs/libX11 + x11-libs/libXaw )" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" BDEPEND=" virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra + dev-texlive/texlive-langgreek + dev-texlive/texlive-mathscience app-text/ghostscript-gpl ) qt5? ( dev-qt/linguist-tools:5 )" -S="${WORKDIR}/${MY_P}" +IDEPEND="latex? ( virtual/latex-base )" GP_VERSION="${PV%.*}" -E_SITEFILE="lisp/50${PN}-gentoo.el" TEXMF="${EPREFIX}/usr/share/texmf-site" +PATCHES=( + "${FILESDIR}"/${PN}-5.0.6-no-picins.patch +) + +pkg_setup() { + use lua && lua-single_pkg_setup +} + src_prepare() { - eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch - eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch - eapply_user + default - if [[ -z ${PV%%*9999} ]]; then + if [[ ${PV##*.} = 9999 ]]; then local dir for dir in config demo m4 term tutorial; do emake -C "$dir" -f Makefile.am.in Makefile.am @@ -86,18 +103,6 @@ src_prepare() { # of the gnuplot license sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die - 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." - eautoreconf # Make sure we don't mix build & host flags. @@ -114,31 +119,23 @@ src_configure() { sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die fi - if use wxwidgets; then - WX_GTK_VER="3.0" - setup-wxwidgets - fi + use wxwidgets && setup-wxwidgets tc-export CC CXX #453174 tc-export_build_env BUILD_CC export CC_FOR_BUILD=${BUILD_CC} - use qt5 && append-cxxflags -std=c++11 - econf \ --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 regis) \ $(use_with X x) \ --enable-stats \ $(use_with qt5 qt qt5) \ @@ -151,47 +148,48 @@ 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 - if use cairo && use gd; then + if use cairo; then emake -C docs pdf else - ewarn "Cannot build figures unless cairo and gd are enabled." + ewarn "Cannot build figures unless cairo is enabled." ewarn "Building documentation without figures." emake -C docs pdf_nofig mv docs/nofigures.pdf docs/gnuplot.pdf || die fi - emake -C tutorial pdf fi } src_install() { emake DESTDIR="${D}" install - dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README* RELEASE_NOTES TODO + dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES newdoc term/PostScript/README README-ps newdoc term/js/README README-js use lua && newdoc term/lua/README README-lua + + local DOC_CONTENTS='Gnuplot no longer links against pdflib. You can + use the "pdfcairo" terminal for PDF output.' + use cairo || DOC_CONTENTS+=' It is available with USE="cairo".' + 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." 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* + rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary{1,2,3} || die + rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/plugin/*.{o,so} || die fi if use doc; then - # Manual, tutorial, FAQ - dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf + # Manual, FAQ + dodoc docs/gnuplot.pdf FAQ.pdf # Documentation for making PostScript files docinto psdoc dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README} @@ -199,7 +197,7 @@ src_install() { } src_test() { - GNUTERM="unknown" default_src_test + emake check GNUTERM="dumb" } pkg_postinst() { diff --git a/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild b/sci-visualization/gnuplot/gnuplot-6.0.0.ebuild index 29dde10c36aa..34623105dda5 100644 --- a/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild +++ b/sci-visualization/gnuplot/gnuplot-6.0.0.ebuild @@ -1,9 +1,12 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets +LUA_COMPAT=( lua5-{1,2,3,4} ) +WX_GTK_VER="3.2-gtk3" + +inherit autotools lua-single readme.gentoo-r1 toolchain-funcs wxwidgets DESCRIPTION="Command-line driven interactive plotting program" HOMEPAGE="http://www.gnuplot.info/" @@ -11,32 +14,36 @@ HOMEPAGE="http://www.gnuplot.info/" if [[ -z ${PV%%*9999} ]]; then inherit git-r3 EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main" - EGIT_BRANCH="branch-5-2-stable" + EGIT_BRANCH="master" MY_P="${PN}" EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}" else MY_P="${P/_/.}" SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi +S="${WORKDIR}/${MY_P}" + LICENSE="gnuplot" SLOT="0" -IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis svga wxwidgets X" +IUSE="aqua bitmap cairo doc examples +gd latex libcaca libcerf lua qt5 readline regis wxwidgets X" +REQUIRED_USE=" + doc? ( gd ) + lua? ( ${LUA_REQUIRED_USE} )" 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 ) + lua? ( ${LUA_DEPS} ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= @@ -46,38 +53,46 @@ RDEPEND=" dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) - svga? ( media-libs/svgalib ) wxwidgets? ( - x11-libs/wxGTK:3.0[X] + x11-libs/wxGTK:${WX_GTK_VER}[X] x11-libs/cairo x11-libs/pango - x11-libs/gtk+:2 ) - X? ( x11-libs/libXaw )" + x11-libs/gtk+:3 ) + X? ( + x11-libs/libX11 + x11-libs/libXaw )" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" BDEPEND=" virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra + dev-texlive/texlive-langgreek + dev-texlive/texlive-mathscience app-text/ghostscript-gpl ) qt5? ( dev-qt/linguist-tools:5 )" -S="${WORKDIR}/${MY_P}" +IDEPEND="latex? ( virtual/latex-base )" GP_VERSION="${PV%.*}" -E_SITEFILE="lisp/50${PN}-gentoo.el" TEXMF="${EPREFIX}/usr/share/texmf-site" +PATCHES=( + "${FILESDIR}"/${PN}-6.1-no-picins.patch + "${FILESDIR}"/${PN}-6.0.0-configure.patch +) + +pkg_setup() { + use lua && lua-single_pkg_setup +} + src_prepare() { - eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch - eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch - eapply "${FILESDIR}"/${PN}-5.2.2-regis.patch - eapply "${FILESDIR}"/${PN}-5.2.6-caca.patch - eapply_user + default - if [[ -z ${PV%%*9999} ]]; then + if [[ ${PV##*.} = 9999 ]]; then local dir for dir in config demo m4 term tutorial; do emake -C "$dir" -f Makefile.am.in Makefile.am @@ -88,18 +103,6 @@ src_prepare() { # of the gnuplot license sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die - 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." - eautoreconf # Make sure we don't mix build & host flags. @@ -116,32 +119,22 @@ src_configure() { sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die fi - if use wxwidgets; then - WX_GTK_VER="3.0" - setup-wxwidgets - fi + use wxwidgets && setup-wxwidgets tc-export CC CXX #453174 tc-export_build_env BUILD_CC export CC_FOR_BUILD=${BUILD_CC} - use qt5 && append-cxxflags -std=c++11 - econf \ --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 regis) \ - $(use_with svga linux-vga) \ $(use_with X x) \ --enable-stats \ $(use_with qt5 qt qt5) \ @@ -154,47 +147,48 @@ 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 - if use cairo && use gd; then + if use cairo; then emake -C docs pdf else - ewarn "Cannot build figures unless cairo and gd are enabled." + ewarn "Cannot build figures unless cairo is enabled." ewarn "Building documentation without figures." emake -C docs pdf_nofig mv docs/nofigures.pdf docs/gnuplot.pdf || die fi - emake -C tutorial pdf fi } src_install() { emake DESTDIR="${D}" install - dodoc BUGS ChangeLog NEWS PGPKEYS README* RELEASE_NOTES TODO + dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES newdoc term/PostScript/README README-ps newdoc term/js/README README-js use lua && newdoc term/lua/README README-lua + + local DOC_CONTENTS='Gnuplot no longer links against pdflib. You can + use the "pdfcairo" terminal for PDF output.' + use cairo || DOC_CONTENTS+=' It is available with USE="cairo".' + 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." 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* + rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary{1,2,3} || die + rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/plugin/*.{o,so} || die fi if use doc; then - # Manual, tutorial, FAQ - dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf + # Manual, FAQ + dodoc docs/gnuplot.pdf #FAQ.pdf # Documentation for making PostScript files docinto psdoc dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README} @@ -202,7 +196,7 @@ src_install() { } src_test() { - GNUTERM="unknown" default_src_test + emake check GNUTERM="dumb" } pkg_postinst() { diff --git a/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild b/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild index 258946aad81d..41767efa1265 100644 --- a/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild +++ b/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild @@ -1,9 +1,12 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets +LUA_COMPAT=( lua5-{1,2,3,4} ) +WX_GTK_VER="3.2-gtk3" + +inherit autotools lua-single readme.gentoo-r1 toolchain-funcs wxwidgets DESCRIPTION="Command-line driven interactive plotting program" HOMEPAGE="http://www.gnuplot.info/" @@ -11,33 +14,38 @@ HOMEPAGE="http://www.gnuplot.info/" if [[ -z ${PV%%*9999} ]]; then inherit git-r3 EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main" - EGIT_BRANCH="branch-5-2-stable" + EGIT_BRANCH="master" MY_P="${PN}" EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}" else MY_P="${P/_/.}" SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi +S="${WORKDIR}/${MY_P}" + LICENSE="gnuplot" SLOT="0" -IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis svga wxwidgets X" +IUSE="aqua bitmap cairo doc examples +gd latex libcaca libcerf lua qt5 readline regis wxwidgets X" +REQUIRED_USE=" + doc? ( gd ) + lua? ( ${LUA_REQUIRED_USE} )" 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 ) - qt5? ( dev-qt/qtcore:5= + lua? ( ${LUA_DEPS} ) + qt5? ( + dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= @@ -45,35 +53,45 @@ RDEPEND=" dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) - svga? ( media-libs/svgalib ) wxwidgets? ( - x11-libs/wxGTK:3.0[X] + x11-libs/wxGTK:${WX_GTK_VER}[X] x11-libs/cairo x11-libs/pango - x11-libs/gtk+:2 ) - X? ( x11-libs/libXaw )" + x11-libs/gtk+:3 ) + X? ( + x11-libs/libX11 + x11-libs/libXaw )" + DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" + +BDEPEND=" virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra + dev-texlive/texlive-langgreek + dev-texlive/texlive-mathscience app-text/ghostscript-gpl ) qt5? ( dev-qt/linguist-tools:5 )" -S="${WORKDIR}/${MY_P}" +IDEPEND="latex? ( virtual/latex-base )" GP_VERSION="${PV%.*}" -E_SITEFILE="lisp/50${PN}-gentoo.el" TEXMF="${EPREFIX}/usr/share/texmf-site" +PATCHES=( + "${FILESDIR}"/${PN}-6.1-no-picins.patch +) + +pkg_setup() { + use lua && lua-single_pkg_setup +} + src_prepare() { - eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch - eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch - eapply "${FILESDIR}"/${PN}-5.2.2-regis.patch - eapply "${FILESDIR}"/${PN}-5.2.6-caca.patch - eapply_user + default - if [[ -z ${PV%%*9999} ]]; then + if [[ ${PV##*.} = 9999 ]]; then local dir for dir in config demo m4 term tutorial; do emake -C "$dir" -f Makefile.am.in Makefile.am @@ -84,18 +102,6 @@ src_prepare() { # of the gnuplot license sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die - 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." - eautoreconf # Make sure we don't mix build & host flags. @@ -112,32 +118,22 @@ src_configure() { sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die fi - if use wxwidgets; then - WX_GTK_VER="3.0" - setup-wxwidgets - fi + use wxwidgets && setup-wxwidgets tc-export CC CXX #453174 tc-export_build_env BUILD_CC export CC_FOR_BUILD=${BUILD_CC} - use qt5 && append-cxxflags -std=c++11 - econf \ --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 regis) \ - $(use_with svga linux-vga) \ $(use_with X x) \ --enable-stats \ $(use_with qt5 qt qt5) \ @@ -150,47 +146,48 @@ 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 - if use cairo && use gd; then + if use cairo; then emake -C docs pdf else - ewarn "Cannot build figures unless cairo and gd are enabled." + ewarn "Cannot build figures unless cairo is enabled." ewarn "Building documentation without figures." emake -C docs pdf_nofig mv docs/nofigures.pdf docs/gnuplot.pdf || die fi - emake -C tutorial pdf fi } src_install() { emake DESTDIR="${D}" install - dodoc BUGS ChangeLog NEWS PGPKEYS README* RELEASE_NOTES TODO + dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES newdoc term/PostScript/README README-ps newdoc term/js/README README-js use lua && newdoc term/lua/README README-lua + + local DOC_CONTENTS='Gnuplot no longer links against pdflib. You can + use the "pdfcairo" terminal for PDF output.' + use cairo || DOC_CONTENTS+=' It is available with USE="cairo".' + 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." 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* + rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary{1,2,3} || die + rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/plugin/*.{o,so} || die fi if use doc; then - # Manual, tutorial, FAQ - dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf + # Manual, FAQ + dodoc docs/gnuplot.pdf #FAQ.pdf # Documentation for making PostScript files docinto psdoc dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README} @@ -198,7 +195,7 @@ src_install() { } src_test() { - GNUTERM="unknown" default_src_test + emake check GNUTERM="dumb" } pkg_postinst() { diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml index b258754a4c25..ca422cb5f16b 100644 --- a/sci-visualization/gnuplot/metadata.xml +++ b/sci-visualization/gnuplot/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>ulm@gentoo.org</email> @@ -16,8 +16,6 @@ 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 diff --git a/sci-visualization/gr/Manifest b/sci-visualization/gr/Manifest index 5101eb04b361..5ebf0b226403 100644 --- a/sci-visualization/gr/Manifest +++ b/sci-visualization/gr/Manifest @@ -1 +1,2 @@ -DIST gr-0.50.0.tar.gz 8612608 BLAKE2B 70f4a3c6ce1dac8556646a1632667e6e464a5048f3c44fb689709e3e8218e8d7375db6ff8ce73e11dbeda559fb27c83b7f2b42f0ab518df9b464c8443748c30e SHA512 34ca077ae729e6eda0e5df7046811c77d717f3ef0e34203d6ab3a7f4b67b3aa058a68b9b2d7d78adc8b2f0830a0298778198a6499bd3d6e5697e4b7270cb648a +DIST gr-0.72.0.tar.gz 9064921 BLAKE2B 92f531cd308c8bcec0f36fd57b1aeddfeb555ae4ceb1a394276f37ae515d1b5172ef775d0b33d6aa429ac46021194a4327646a486112032722121c01885c6bfa SHA512 cb04cff65649c4f688c07afaa6959ba08f88f6f9d0935bbd7b29bf58dab2a114609ea45d9849a1acc5bbd0feab4083d692a4364ada653dcbfe7f99e2594d9a42 +DIST gr-0.72.4.tar.gz 9067899 BLAKE2B 827c80dbfc3483abe4af217c06549c64aa134446e831a5d7fab3906a3aac7bb23b66f8b98674220ff1b6fbd5fad60b9a8e7f7361a27370c033d9375a18f63234 SHA512 4ae1aae6854995ae58327d41930cedd96ef973ce65467f48f24d9985b27b5af2aa0eb6832a801b46e6fa71cade99117957c96738cb000306b0574b0e471692fb diff --git a/sci-visualization/gr/files/gr-0.50.0-qt-5.15.patch b/sci-visualization/gr/files/gr-0.50.0-qt-5.15.patch deleted file mode 100644 index 800492350cc6..000000000000 --- a/sci-visualization/gr/files/gr-0.50.0-qt-5.15.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 20204e37d8411b19b69a7ee5c776035c07f7175d Mon Sep 17 00:00:00 2001 -From: Sutou Kouhei <kou@clear-code.com> -Date: Sun, 31 May 2020 11:56:51 +0900 -Subject: [PATCH] Include QPainterPath explicitly for Qt 5.15.0 - ---- - lib/gks/plugin/qt5plugin.cxx | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/gks/plugin/qt5plugin.cxx b/lib/gks/plugin/qt5plugin.cxx -index de9cd3d2..301d7fb9 100644 ---- a/lib/gks/plugin/qt5plugin.cxx -+++ b/lib/gks/plugin/qt5plugin.cxx -@@ -6,6 +6,7 @@ - - #include <QtWidgets/QWidget> - #include <QtGui/QPainter> -+#include <QtGui/QPainterPath> - #include <QtGui/QImage> - #include <QtGui/QGuiApplication> - #include <QtGui/QScreen> diff --git a/sci-visualization/gr/files/gr-0.53.0-musl.patch b/sci-visualization/gr/files/gr-0.53.0-musl.patch new file mode 100644 index 000000000000..5b7f55828583 --- /dev/null +++ b/sci-visualization/gr/files/gr-0.53.0-musl.patch @@ -0,0 +1,29 @@ +From 205a70fdbd69d7877994e7aea5cec6eab79236b2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> +Date: Sat, 26 Feb 2022 19:38:20 +0100 +Subject: [PATCH] Fix build with musl libc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org> +--- + lib/gks/io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/gks/io.c b/lib/gks/io.c +index 669dd81f..50fde2c4 100644 +--- a/lib/gks/io.c ++++ b/lib/gks/io.c +@@ -11,7 +11,7 @@ + #include <io.h> + #endif + +-#if defined(cray) || defined(__SVR4) || defined(_WIN32) ++#if defined(cray) || defined(__SVR4) || defined(_WIN32) || !defined(__GLIBC__) + #include <fcntl.h> + #else + #include <sys/file.h> +-- +2.34.1 + diff --git a/sci-visualization/gr/gr-0.50.0-r1.ebuild b/sci-visualization/gr/gr-0.72.0.ebuild index ddb28dbc2466..0db230abd6ba 100644 --- a/sci-visualization/gr/gr-0.50.0-r1.ebuild +++ b/sci-visualization/gr/gr-0.72.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -12,31 +12,36 @@ SRC_URI="https://github.com/sciapp/gr/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="cairo ffmpeg postscript tiff truetype X" +IUSE="cairo ffmpeg postscript tiff truetype" DEPEND=" dev-qt/qtgui:5 media-libs/fontconfig media-libs/glfw - media-libs/libjpeg-turbo - media-libs/libpng - media-libs/qhull + media-libs/libjpeg-turbo:= + media-libs/libpng:= + media-libs/qhull:= + net-libs/zeromq sys-libs/zlib virtual/opengl + x11-libs/agg + x11-libs/libX11 + x11-libs/libXt cairo? ( x11-libs/cairo ) - ffmpeg? ( media-video/ffmpeg ) + ffmpeg? ( media-video/ffmpeg:= ) postscript? ( app-text/ghostscript-gpl ) - tiff? ( media-libs/tiff ) + tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype ) - X? ( x11-libs/libX11 ) " RDEPEND="${DEPEND}" BDEPEND="" PATCHES=( - "${FILESDIR}/${P}-qt-5.15.patch" + "${FILESDIR}/${PN}-0.53.0-musl.patch" ) +REQUIRED_USE="cairo? ( truetype )" + src_configure() { use cairo || mycmakeargs+=( -DCAIRO_LIBRARY= ) use postscript || mycmakeargs+=( -DGS_LIBRARY= ) @@ -47,6 +52,7 @@ src_configure() { # todo: X11 automagic mycmakeargs+=( -DCMAKE_INSTALL_PREFIX=/usr/gr ) + mycmakeargs+=( -DCMAKE_INSTALL_LIBDIR=lib ) # # I need to have a serious conversation with upstream. # * The main consumer of this package is dev-lang/julia. @@ -54,7 +60,7 @@ src_configure() { # not find it anymore. # * I can't patch julia, since the corresponding scripts are # downloaded at runtime from its package registry ... - # + # * See bug 882619 in addition. cmake_src_configure } @@ -67,7 +73,7 @@ src_install() { echo "LDPATH=/usr/gr/$(get_libdir)" >> "${T}/99gr" doenvd "${T}/99gr" - dosym ../gr/bin/gksqt /usr/bin/gksqt + [[ -f "${ED}/usr/gr/bin/gksqt" ]] && dosym ../gr/bin/gksqt /usr/bin/gksqt elog "${P} relies on the environment variable GRDIR. If you want to use it in a running shell," elog "e.g. with dev-lang/julia, then run \"source /etc/profile\" first." diff --git a/sci-visualization/gr/gr-0.72.4.ebuild b/sci-visualization/gr/gr-0.72.4.ebuild new file mode 100644 index 000000000000..51aaeb29fc39 --- /dev/null +++ b/sci-visualization/gr/gr-0.72.4.ebuild @@ -0,0 +1,86 @@ +# Copyright 2019-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Universal framework for cross-platform visualization applications" +HOMEPAGE="https://gr-framework.org/" +SRC_URI="https://github.com/sciapp/gr/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="agg cairo ffmpeg postscript tiff truetype" + +DEPEND=" + dev-qt/qtgui:5 + media-libs/fontconfig + media-libs/glfw + media-libs/libjpeg-turbo:= + media-libs/libpng:= + media-libs/qhull:= + net-libs/zeromq + sys-libs/zlib + virtual/opengl + x11-libs/libX11 + x11-libs/libXt + agg? ( x11-libs/agg ) + cairo? ( x11-libs/cairo ) + ffmpeg? ( media-video/ffmpeg:= ) + postscript? ( app-text/ghostscript-gpl ) + tiff? ( media-libs/tiff:= ) + truetype? ( media-libs/freetype ) +" +RDEPEND="${DEPEND}" +BDEPEND="" + +PATCHES=( + "${FILESDIR}/${PN}-0.53.0-musl.patch" +) + +REQUIRED_USE="cairo? ( truetype )" + +src_configure() { + if use agg ; then + mycmakeargs+=( -DAGG_LIBRARY=libagg.so -DAGG_INCLUDE_DIR=/usr/include/agg2 ) + else + mycmakeargs+=( -DAGG_LIBRARY= ) + fi + + use cairo || mycmakeargs+=( -DCAIRO_LIBRARY= ) + use postscript || mycmakeargs+=( -DGS_LIBRARY= ) + use ffmpeg || mycmakeargs+=( -DFFMPEG_INCLUDE_DIR= ) + use truetype || mycmakeargs+=( -DFREETYPE_LIBRARY= ) + use tiff || mycmakeargs+=( -DTIFF_LIBRARY= ) + + # todo: X11 automagic + + mycmakeargs+=( -DCMAKE_INSTALL_PREFIX=/usr/gr ) + mycmakeargs+=( -DCMAKE_INSTALL_LIBDIR=lib ) + # + # I need to have a serious conversation with upstream. + # * The main consumer of this package is dev-lang/julia. + # * If I patch gr to install in standard locations, julia does + # not find it anymore. + # * I can't patch julia, since the corresponding scripts are + # downloaded at runtime from its package registry ... + # * See bug 882619 in addition. + + cmake_src_configure +} + +src_install() { + cmake_src_install + find "${ED}" -name '*.a' -delete + + echo "GRDIR=/usr/gr" > "${T}/99gr" + echo "LDPATH=/usr/gr/$(get_libdir)" >> "${T}/99gr" + doenvd "${T}/99gr" + + [[ -f "${ED}/usr/gr/bin/gksqt" ]] && dosym ../gr/bin/gksqt /usr/bin/gksqt + + elog "${P} relies on the environment variable GRDIR. If you want to use it in a running shell," + elog "e.g. with dev-lang/julia, then run \"source /etc/profile\" first." +} diff --git a/sci-visualization/gr/metadata.xml b/sci-visualization/gr/metadata.xml index 80a71f597854..48e49d2a0db8 100644 --- a/sci-visualization/gr/metadata.xml +++ b/sci-visualization/gr/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>dilfridge@gentoo.org</email> <name>Andreas K. Huettel</name> </maintainer> + <use> + <flag name="agg">Enable the libagg anti-grain rendering engine</flag> + </use> </pkgmetadata> diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest index 2814e7189753..fdbc3eb13346 100644 --- a/sci-visualization/grace/Manifest +++ b/sci-visualization/grace/Manifest @@ -1,4 +1,2 @@ DIST grace-5.1.25.tar.gz 2957689 BLAKE2B f46032c92aa2ed2484ca05c0eb858f47adfa88517e7d06c0d95a6d23c044356edfc52b9a7566a625ef5f4a1a4b5450b0ce065a94ba15c59fb8395d53c85872c9 SHA512 9ea68483af1dfc98d217ae730b7a51b66deae5aaa8dfda29d5a3337ed4b5728b45aa03f561bf7d4173e73d6af8dee03cbabd95c0c8dd36999303c89451a3728a -DIST grace.png 338 BLAKE2B 3a109acd9e44929b9efe1fd6b707459b71cfbb601b98a00619096becff8d89fb46f2fe34f4a5c5974b125b4bed9b5f2452fee669627146ba00976dd43a7778b0 SHA512 804a693b867ad63f34964c7388f61719c558d253cb2c7bc7b6bd0647ad9b3ddc6b23d3950091b6804e4a94736f024486cf3dcce5f877135def34712ee95e4031 -DIST grace.png.tar 10240 BLAKE2B 3e99cd04a92b547ed5440475363b140d0183c92d1865f0b4564890f705a87df4e55624d681fa77408948a841eac4358465e49e65fa02615e31ec54ffb84f059d SHA512 e94970b92894e58fd481d2f81e615c38b77fab7039985516a2ad9b2bb2bb7a82f4e3e8cdb639e7c0d55eaad6bf8abc636a342c94a356e3bd0520824252faddcf -DIST grace_5.1.25-7.debian.tar.xz 108904 BLAKE2B 17265969d0501e1b1306733178a680b93d1d5fa96d63df4c14e5b3cba70b68d44d90a77d6ec0aa5243c2a79048bb75aedefeae1a2bab551a6315d253ee831735 SHA512 2fa34337858454c8a28b666fccb7157e9c4895b828f25171c4c6b68316abbf6d4bc54032f1de01ccb6b86068f7059ae2462d18b4a273341f588f49fc35f1bb61 +DIST grace_5.1.25-13.debian.tar.xz 110248 BLAKE2B 19dce6ed1b9e1d93d87036f5aba5ee262d54a58bc7daf2039fb2246bd2f45e413832561a33f8cb1b793fdf30831b0282f00e60efe3980df7875d2923a9f32f76 SHA512 51ee85525557c630fc3e208eb9b72b8973de6351698766ade1a59af6b9f16bc1b6b9c2c40d2270eb33d55806c4762c7b5d10b14f2a470ff00cfae2c9351bc922 diff --git a/sci-visualization/grace/files/grace-5.1.21-netcdf.patch b/sci-visualization/grace/files/grace-5.1.21-netcdf.patch deleted file mode 100644 index d843cb4b284c..000000000000 --- a/sci-visualization/grace/files/grace-5.1.21-netcdf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-ldflags.patch b/sci-visualization/grace/files/grace-5.1.22-ldflags.patch deleted file mode 100644 index 2a65cd233361..000000000000 --- a/sci-visualization/grace/files/grace-5.1.22-ldflags.patch +++ /dev/null @@ -1,41 +0,0 @@ -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 deleted file mode 100644 index 402a5162c584..000000000000 --- a/sci-visualization/grace/files/grace-5.1.22-mkstemp.patch +++ /dev/null @@ -1,55 +0,0 @@ -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-5.1.25-honor-noask.patch b/sci-visualization/grace/files/grace-5.1.25-honor-noask.patch new file mode 100644 index 000000000000..24285e478f04 --- /dev/null +++ b/sci-visualization/grace/files/grace-5.1.25-honor-noask.patch @@ -0,0 +1,13 @@ +--- a/src/files.c~ 2008-04-26 20:25:57.000000000 +0200 ++++ b/src/files.c 2023-09-26 11:39:24.232306135 +0200 +@@ -1098,10 +1098,6 @@ + int noask_save = noask; + + old_fn = get_docname(); +- if (compare_strings(old_fn, fn)) { +- /* If saving under the same name, don't warn about overwriting */ +- noask = TRUE; +- } + + if ((cp = grace_openw(fn)) == NULL) { + noask = noask_save; diff --git a/sci-visualization/grace/files/grace-c99.patch b/sci-visualization/grace/files/grace-c99.patch new file mode 100644 index 000000000000..fb87e39848a9 --- /dev/null +++ b/sci-visualization/grace/files/grace-c99.patch @@ -0,0 +1,12 @@ +diff -ur grace-5.1.25.orig/src/utils.c grace-5.1.25/src/utils.c +--- grace-5.1.25.orig/src/utils.c 2022-12-22 10:40:39.391625263 +0100 ++++ grace-5.1.25/src/utils.c 2022-12-22 10:41:24.732188992 +0100 +@@ -1391,7 +1391,7 @@ + update_app_title(); + } + +-void lock_dirtystate(flag) ++void lock_dirtystate(int flag) + { + dirtystate_lock = flag; + } diff --git a/sci-visualization/grace/grace-5.1.25_p7.ebuild b/sci-visualization/grace/grace-5.1.25_p13-r1.ebuild index 9a41b41a0961..8298d0d1cd3d 100644 --- a/sci-visualization/grace/grace-5.1.25_p7.ebuild +++ b/sci-visualization/grace/grace-5.1.25_p13-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 FORTRAN_NEEDED=fortran -inherit desktop fortran-2 toolchain-funcs +inherit desktop fortran-2 toolchain-funcs xdg DESCRIPTION="Motif based XY-plotting tool" HOMEPAGE="https://plasma-gate.weizmann.ac.il/Grace/" @@ -20,13 +20,13 @@ IUSE="fftw fortran jpeg netcdf png" DEPEND=" media-libs/t1lib - media-libs/tiff:0 + media-libs/tiff:= sys-libs/zlib >=x11-libs/motif-2.3:0 x11-libs/xbae fftw? ( sci-libs/fftw:3.0= ) - jpeg? ( virtual/jpeg:0 ) - netcdf? ( sci-libs/netcdf ) + jpeg? ( media-libs/libjpeg-turbo:= ) + netcdf? ( sci-libs/netcdf:= ) png? ( media-libs/libpng:0= )" RDEPEND="${DEPEND} x11-misc/xdg-utils" @@ -108,4 +108,5 @@ src_install() { newicon -s "${size}" "${WORKDIR}"/debian/icons/grace"${size}".png "${PN}.png" done doicon -s 48 "${WORKDIR}"/debian/icons/grace.png + doicon -s scalable "${WORKDIR}"/debian/grace.svg } diff --git a/sci-visualization/grace/grace-5.1.25.ebuild b/sci-visualization/grace/grace-5.1.25_p13-r2.ebuild index cc86861fbe77..7a5e42ca6de2 100644 --- a/sci-visualization/grace/grace-5.1.25.ebuild +++ b/sci-visualization/grace/grace-5.1.25_p13-r2.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - +EAPI=8 FORTRAN_NEEDED=fortran -inherit eutils fortran-2 toolchain-funcs +inherit desktop fortran-2 toolchain-funcs xdg DESCRIPTION="Motif based XY-plotting tool" HOMEPAGE="https://plasma-gate.weizmann.ac.il/Grace/" SRC_URI=" - http://pkgs.fedoraproject.org/cgit/grace.git/plain/grace.png - https://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar - ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P}.tar.gz" + ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P/_p*}.tar.gz + mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz +" SLOT="0" LICENSE="GPL-2 LGPL-2" @@ -21,27 +20,28 @@ IUSE="fftw fortran jpeg netcdf png" DEPEND=" media-libs/t1lib - media-libs/tiff:0 + media-libs/tiff:= 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 ) + fftw? ( sci-libs/fftw:3.0= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + netcdf? ( sci-libs/netcdf:= ) png? ( media-libs/libpng:0= )" RDEPEND="${DEPEND} x11-misc/xdg-utils" +S="${WORKDIR}/${P/_p*}" + 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 + # Fix for missing defines when fortran is disabled "${FILESDIR}"/${PN}-5.1.21-fortran.patch - # fix a leak (from freebsd) + # Fix a leak (from freebsd) "${FILESDIR}"/${PN}-5.1.22-dlmodule.patch - "${FILESDIR}"/${PN}-5.1.22-ldflags.patch + # Honor -noask option and avoid accidentally overwritting files + "${FILESDIR}"/${PN}-5.1.25-honor-noask.patch + # Fix C99 compat (from Fedora) + "${FILESDIR}"/${PN}-c99.patch ) pkg_setup() { @@ -51,6 +51,11 @@ pkg_setup() { src_prepare() { default + # Debian patches + for p in $(<"${WORKDIR}"/debian/patches/series) ; do + eapply -p1 "${WORKDIR}/debian/patches/${p}" + done + # don't strip if not asked for sed -i \ -e 's:$(INSTALL_PROGRAM) -s:$(INSTALL_PROGRAM):g' \ @@ -99,9 +104,13 @@ src_install() { 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 + 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 + for size in 16 22 24 32; do + newicon -s "${size}" "${WORKDIR}"/debian/icons/grace"${size}".png "${PN}.png" + done + doicon -s 48 "${WORKDIR}"/debian/icons/grace.png + doicon -s scalable "${WORKDIR}"/debian/grace.svg } diff --git a/sci-visualization/grace/metadata.xml b/sci-visualization/grace/metadata.xml index 18165ef0800f..9d54f613e571 100644 --- a/sci-visualization/grace/metadata.xml +++ b/sci-visualization/grace/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci@gentoo.org</email> @@ -14,5 +14,5 @@ averages, DFT/FFT, cross/auto-correlation. Batch mode for unattended plotting. Hardcopy support for PostScript, FrameMaker and several image formats. -</longdescription> + </longdescription> </pkgmetadata> diff --git a/sci-visualization/gri/Manifest b/sci-visualization/gri/Manifest deleted file mode 100644 index f64c3f03e69a..000000000000 --- a/sci-visualization/gri/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gri-2.12.23.tar.gz 1668587 BLAKE2B c7b8e4db5b093599fb9a00870516e3e6a8a93436dc9881f0c889982acd26b9b8637eee261c84be69402361db11c41f7a0989cc29d6bfd5f770a2e8056c89463c SHA512 0b028c56e9603fd00480ad7a92461c1e60f7879d89bffb5b83a2ee52c8870546e584c75478777dbb2d4934095fe9a9d4efd2aa2ff756c1860459a1e0cc0b4216 diff --git a/sci-visualization/gri/files/50gri-gentoo.el b/sci-visualization/gri/files/50gri-gentoo.el deleted file mode 100644 index e07d47c854a4..000000000000 --- a/sci-visualization/gri/files/50gri-gentoo.el +++ /dev/null @@ -1,3 +0,0 @@ -(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 deleted file mode 100644 index b3f3b7301975..000000000000 --- a/sci-visualization/gri/files/gri-2.12.18-postscript.patch +++ /dev/null @@ -1,97 +0,0 @@ -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 deleted file mode 100644 index 14c89978ce7c..000000000000 --- a/sci-visualization/gri/files/gri-2.12.23-perl-5.16.patch +++ /dev/null @@ -1,23 +0,0 @@ - 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 deleted file mode 100644 index dfc56fc574b3..000000000000 --- a/sci-visualization/gri/files/gri-2.12.23-texinfo5.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 deleted file mode 100644 index 00c9320934ef..000000000000 --- a/sci-visualization/gri/gri-2.12.23-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# 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? ( >=app-editors/emacs-23.1:* )" -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 deleted file mode 100644 index d6941215d539..000000000000 --- a/sci-visualization/gri/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?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 index ad1a5fdc2572..53fcf98561ed 100644 --- a/sci-visualization/gwyddion/Manifest +++ b/sci-visualization/gwyddion/Manifest @@ -1,2 +1,2 @@ -DIST gwyddion-2.55.tar.xz 4607560 BLAKE2B 30489d980d3feb6986be4041b59c847673ee589674d5913b4508f28f072eb2f570b98f0b1be01dcf6e1d45e86607582967fd83fe3c859172fcdef3c7bffae741 SHA512 680c33b1f7d36de31274869e7f0af9c06030e04779d6b59f06860ae3f47db4ad45bbf3ee2219bb7b6c01807a807aeafa4f5d0aefe20601e0dda1011acf59fc8e -DIST gwyddion-2.56.tar.xz 4645620 BLAKE2B f4f2ce2bf119a24c3e1919b14db409a81ad286ef2242918f356d2b4c56b498f41cbafa03a136eac5d87b4905529e06982694f19bdf30933454e94d34526962c3 SHA512 cf4a40367ea5b0a671c5df70123ef93f6aecc25322af7eb05e4f32d40e54d9b0d48ddd1df9f2589c468eb511ada3f3ef409603c1513de33ba2482078a9415eae +DIST gwyddion-2.61.tar.xz 4982092 BLAKE2B e4949558c52d2a6e97415b65e6816061c117868bdd2f39b341c3f740500f71dd38500323a389058b65f9c30feb9d5fd1e93bc29881b464cdb66981639fe280ed SHA512 c2fff49d52e4c439bf96e68be3534948c1fd48ade9b1e59e2d2d7d607170b5e7ce09e9cde3873ecca526de1561b028f39785dc363186f9f3d4ef0d259d313675 +DIST gwyddion-2.62.tar.xz 5010676 BLAKE2B 18012dfe050753413834e8a3734ec82989f375d81ac0242a6bbaf630da1a7741e9701d3c7a8c0dc03cfde8f93de9848ae106731f057c902f44ba1caf0cd79520 SHA512 93aff13f865fab045e17bd6c7633d714c4a97980ff10093f38c35e6dd39a0ed9680185f7a81a198522b623260cf6086d40e2b6a63a1cb59bc176eadf87fb85e1 diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch b/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch deleted file mode 100644 index 536790c1ac46..000000000000 --- a/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: gwyddion/modules/file/ambprofile.c -=================================================================== ---- gwyddion/modules/file/ambprofile.c (revision 22650) -+++ gwyddion/modules/file/ambprofile.c (revision 22651) -@@ -32,8 +32,8 @@ - * <comment>Ambios XML profile data</comment> - * <magic priority="80"> - * <match type="string" offset="0" value="<?xml"> -- * <match type="string" offset="40:120" value="<ProfilometerData>"> -- * <match type="string" offset="60:140" value="<Header>"/> -+ * <match type="string" offset="40:120" value="<ProfilometerData>"> -+ * <match type="string" offset="60:140" value="<Header>"/> - * </match> - * </match> - * </magic> diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch b/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch deleted file mode 100644 index 3cebcc684b50..000000000000 --- a/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/data/gwyddion.xml b/data/gwyddion.xml -index d26089f..acb7b90 100644 ---- a/data/gwyddion.xml -+++ b/data/gwyddion.xml -@@ -55,8 +55,8 @@ - <comment>Ambios XML profile data</comment> - <magic priority="80"> - <match type="string" offset="0" value="<?xml"> -- <match type="string" offset="40:120" value="<ProfilometerData>"> -- <match type="string" offset="60:140" value="<Header>"/> -+ <match type="string" offset="40:120" value="<ProfilometerData>"> -+ <match type="string" offset="60:140" value="<Header>"/> - </match> - </match> - </magic> diff --git a/sci-visualization/gwyddion/files/gwyddion-2.56-automagic.patch b/sci-visualization/gwyddion/files/gwyddion-2.60-automagic.patch index 720880570830..ac68ac0a2861 100644 --- a/sci-visualization/gwyddion/files/gwyddion-2.56-automagic.patch +++ b/sci-visualization/gwyddion/files/gwyddion-2.60-automagic.patch @@ -1,23 +1,24 @@ -diff -ruN gwyddion-2.56.orig/configure.ac gwyddion-2.56/configure.ac ---- gwyddion-2.56.orig/configure.ac 2020-06-30 11:04:55.000000000 +0300 -+++ gwyddion-2.56/configure.ac 2020-06-30 13:22:00.881313300 +0300 -@@ -646,11 +646,13 @@ +diff --git a/configure.ac b/configure.ac +index 5a7465a..cc5a54d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -660,11 +660,13 @@ AM_CONDITIONAL([HAVE_CXX],[test "x$have_cxx" != xno]) ############################################################################# - # OpenEXR + # OpenEXR 2.x+ # Optional. Used for HDR greyscale OpenEXR pixmap import/export. -enable_exr=$have_cxx --PKG_CHECK_MODULES(EXR, [OpenEXR], +-PKG_CHECK_MODULES(EXR, [OpenEXR >= 2.0], +GWY_WITH([exr],,[build with OpenEXR support]) +if test "x$enable_exr" != "xno" && "x$have_cxx" != "xno"; then + PKG_CHECK_MODULES(EXR, [OpenEXR], [AC_DEFINE(HAVE_EXR,1, - [Define if we have the OpenEXR package.])], + [Define if we have the OpenEXR 2.x+ package.])], [enable_exr=no]) +fi AM_CONDITIONAL([HAVE_EXR],[test "x$enable_exr" != xno]) ############################################################################# -@@ -665,10 +667,13 @@ +@@ -679,10 +681,13 @@ AM_CONDITIONAL([HAVE_HDF5],[test "x$enable_hdf5" != xno]) ############################################################################# # CFITSIO # Optional. Used for FITS image import. diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-automagic.patch b/sci-visualization/gwyddion/files/gwyddion-2.62-automagic.patch index 405a2552f08b..67259e8e77c5 100644 --- a/sci-visualization/gwyddion/files/gwyddion-2.55-automagic.patch +++ b/sci-visualization/gwyddion/files/gwyddion-2.62-automagic.patch @@ -1,25 +1,27 @@ -diff -ruN gwyddion-2.55.orig/configure.ac gwyddion-2.55/configure.ac ---- gwyddion-2.55.orig/configure.ac 2019-11-04 10:25:16.000000000 +0100 -+++ gwyddion-2.55/configure.ac 2020-01-24 05:22:15.264763441 +0100 -@@ -634,21 +634,25 @@ +diff --git a/configure.ac b/configure.ac +index 5a7465a..cc5a54d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -660,11 +660,13 @@ AM_CONDITIONAL([HAVE_CXX],[test "x$have_cxx" != xno]) ############################################################################# - # OpenEXR + # OpenEXR 2.x+ # Optional. Used for HDR greyscale OpenEXR pixmap import/export. -enable_exr=$have_cxx --PKG_CHECK_MODULES(EXR, [OpenEXR], +-PKG_CHECK_MODULES(EXR, [OpenEXR >= 2.0], +GWY_WITH([exr],,[build with OpenEXR support]) -+if test "x$enable_exr" != "xno" && "x$have_cxx" != "xno"; then ++if test "x$enable_exr" != "xno"; then + PKG_CHECK_MODULES(EXR, [OpenEXR], [AC_DEFINE(HAVE_EXR,1, - [Define if we have the OpenEXR package.])], + [Define if we have the OpenEXR 2.x+ package.])], [enable_exr=no]) +fi AM_CONDITIONAL([HAVE_EXR],[test "x$enable_exr" != xno]) ############################################################################# +@@ -679,10 +681,13 @@ AM_CONDITIONAL([HAVE_HDF5],[test "x$enable_hdf5" != xno]) + ############################################################################# # CFITSIO # Optional. Used for FITS image import. --enable_cfitsio=yes -PKG_CHECK_MODULES(CFITSIO, [cfitsio], +GWY_WITH([cfitsio],,[build with cfitsio support]) +if test "x$enable_cfitsio" != "xno"; then diff --git a/sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild b/sci-visualization/gwyddion/gwyddion-2.61.ebuild index 335e80a5c600..ebe5c91367ff 100644 --- a/sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild +++ b/sci-visualization/gwyddion/gwyddion-2.61.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit autotools gnome2-utils xdg +inherit autotools xdg DESCRIPTION="Framework for Scanning Mode Microscopy data analysis" HOMEPAGE="http://gwyddion.net/" @@ -11,35 +11,41 @@ SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="doc fits gnome nls openexr perl ruby sourceview xml X" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="bzip2 doc fits jansson hdf5 nls openexr openmp perl ruby sourceview unique xml X zlib" RDEPEND=" >=dev-libs/glib-2.32 dev-libs/libzip media-libs/libpng:0= - >=sci-libs/fftw-3.1:3.0= + >=sci-libs/fftw-3.1:3.0=[openmp?] + virtual/libiconv + virtual/libintl x11-libs/cairo >=x11-libs/gtk+-2.18:2 x11-libs/libXmu x11-libs/pango - fits? ( sci-libs/cfitsio ) - gnome? ( gnome-base/gconf:2 ) + bzip2? ( app-arch/bzip2 ) + fits? ( sci-libs/cfitsio[bzip2?] ) + jansson? ( dev-libs/jansson ) + hdf5? ( sci-libs/hdf5[hl,zlib?] ) openexr? ( media-libs/openexr:= ) perl? ( dev-lang/perl:= ) ruby? ( dev-ruby/narray ) + unique? ( dev-libs/libunique:3 ) sourceview? ( x11-libs/gtksourceview:2.0 ) - xml? ( dev-libs/libxml2:2 )" + xml? ( dev-libs/libxml2:2 ) + zlib? ( sys-libs/zlib ) +" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig doc? ( dev-util/gtk-doc ) " PATCHES=( - "${FILESDIR}/${PN}-2.55-automagic.patch" - "${FILESDIR}/${PN}-2.55-mime.patch" - "${FILESDIR}/${PN}-2.55-xml.patch" + "${FILESDIR}/${PN}-2.60-automagic.patch" ) src_prepare() { @@ -47,30 +53,37 @@ src_prepare() { eautoreconf } +# There are python bindings (--enable-pygwy) but they are py2 only +# 3D opengl rendering requires deprecated GTK-2 x11-libs/gtkglext src_configure() { + # hack for bug 741840 + use doc && export GTK_DOC_PATH=/usr/share/gtk-doc + econf \ --disable-rpath \ --without-kde4-thumbnailer \ $(use_enable doc gtk-doc) \ + $(use_enable openmp) \ $(use_enable nls) \ --disable-pygwy \ + --without-python \ + $(use_with bzip2) \ $(use_with fits cfitsio) \ + $(use_with hdf5) \ + $(use_with jansson) \ $(use_with perl) \ - --without-python \ $(use_with ruby) \ - --without-gl \ $(use_with openexr exr) \ + --without-gl \ $(use_with sourceview gtksourceview) \ + $(use_with unique) \ $(use_with xml libxml2) \ $(use_with X x) \ + $(use_with zlib) \ --with-zip=libzip } -pkg_postinst() { - use gnome && gnome2_gconf_install - xdg_pkg_postinst -} - -pkg_prerm() { - use gnome && gnome2_gconf_uninstall +src_install() { + default + find "${ED}" -type f -name "*.la" -delete || die } diff --git a/sci-visualization/gwyddion/gwyddion-2.62-r1.ebuild b/sci-visualization/gwyddion/gwyddion-2.62-r1.ebuild new file mode 100644 index 000000000000..2d4ebc908443 --- /dev/null +++ b/sci-visualization/gwyddion/gwyddion-2.62-r1.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools xdg + +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="bzip2 doc fits jansson hdf5 nls openexr openmp perl ruby sourceview unique xml X zlib" + +RDEPEND=" + >=dev-libs/glib-2.32 + dev-libs/libzip + media-libs/libpng:0= + >=sci-libs/fftw-3.1:3.0=[openmp?] + virtual/libiconv + virtual/libintl + x11-libs/cairo + >=x11-libs/gtk+-2.18:2 + x11-libs/libXmu + x11-libs/pango + bzip2? ( app-arch/bzip2 ) + fits? ( sci-libs/cfitsio[bzip2?] ) + jansson? ( dev-libs/jansson ) + hdf5? ( sci-libs/hdf5[hl,zlib?] ) + openexr? ( media-libs/openexr:= ) + perl? ( dev-lang/perl:= ) + ruby? ( dev-ruby/narray ) + unique? ( dev-libs/libunique:3 ) + sourceview? ( x11-libs/gtksourceview:2.0 ) + xml? ( dev-libs/libxml2:2 ) + zlib? ( sys-libs/zlib ) +" + +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( dev-util/gtk-doc ) +" + +PATCHES=( + "${FILESDIR}/${PN}-2.62-automagic.patch" +) + +src_prepare() { + default + eautoreconf +} + +# There are python bindings (--enable-pygwy) but they are py2 only +# 3D opengl rendering requires deprecated GTK-2 x11-libs/gtkglext +src_configure() { + # hack for bug 741840 + use doc && export GTK_DOC_PATH=/usr/share/gtk-doc + + econf \ + --disable-rpath \ + --without-kde4-thumbnailer \ + $(use_enable doc gtk-doc) \ + $(use_enable openmp) \ + $(use_enable nls) \ + --disable-pygwy \ + --without-python \ + $(use_with bzip2) \ + $(use_with fits cfitsio) \ + $(use_with hdf5) \ + $(use_with jansson) \ + $(use_with perl) \ + $(use_with ruby) \ + $(use_with openexr exr) \ + --without-gl \ + $(use_with sourceview gtksourceview) \ + $(use_with unique) \ + $(use_with xml libxml2) \ + $(use_with X x) \ + $(use_with zlib) \ + --with-zip=libzip +} + +src_install() { + default + find "${ED}" -type f -name "*.la" -delete || die +} diff --git a/sci-visualization/gwyddion/gwyddion-2.56.ebuild b/sci-visualization/gwyddion/gwyddion-2.62.ebuild index de98686272c3..8342a2ef0ea8 100644 --- a/sci-visualization/gwyddion/gwyddion-2.56.ebuild +++ b/sci-visualization/gwyddion/gwyddion-2.62.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit autotools gnome2-utils xdg +inherit autotools xdg DESCRIPTION="Framework for Scanning Mode Microscopy data analysis" HOMEPAGE="http://gwyddion.net/" @@ -12,33 +12,40 @@ SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc fits gnome hdf5 nls openexr perl ruby sourceview xml X" +IUSE="bzip2 doc fits jansson hdf5 nls openexr openmp perl ruby sourceview unique xml X zlib" RDEPEND=" >=dev-libs/glib-2.32 dev-libs/libzip media-libs/libpng:0= - >=sci-libs/fftw-3.1:3.0= + >=sci-libs/fftw-3.1:3.0=[openmp?] + virtual/libiconv + virtual/libintl x11-libs/cairo >=x11-libs/gtk+-2.18:2 x11-libs/libXmu x11-libs/pango - fits? ( sci-libs/cfitsio ) - gnome? ( gnome-base/gconf:2 ) - hdf5? ( sci-libs/hdf5 ) + bzip2? ( app-arch/bzip2 ) + fits? ( sci-libs/cfitsio[bzip2?] ) + jansson? ( dev-libs/jansson ) + hdf5? ( sci-libs/hdf5[hl,zlib?] ) openexr? ( media-libs/openexr:= ) perl? ( dev-lang/perl:= ) ruby? ( dev-ruby/narray ) + unique? ( dev-libs/libunique:3 ) sourceview? ( x11-libs/gtksourceview:2.0 ) - xml? ( dev-libs/libxml2:2 )" + xml? ( dev-libs/libxml2:2 ) + zlib? ( sys-libs/zlib ) +" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig doc? ( dev-util/gtk-doc ) " PATCHES=( - "${FILESDIR}/${PN}-2.56-automagic.patch" + "${FILESDIR}/${PN}-2.60-automagic.patch" ) src_prepare() { @@ -46,31 +53,37 @@ src_prepare() { eautoreconf } +# There are python bindings (--enable-pygwy) but they are py2 only +# 3D opengl rendering requires deprecated GTK-2 x11-libs/gtkglext src_configure() { + # hack for bug 741840 + use doc && export GTK_DOC_PATH=/usr/share/gtk-doc + econf \ --disable-rpath \ --without-kde4-thumbnailer \ $(use_enable doc gtk-doc) \ + $(use_enable openmp) \ $(use_enable nls) \ - $(use_with hdf5) \ --disable-pygwy \ + --without-python \ + $(use_with bzip2) \ $(use_with fits cfitsio) \ + $(use_with hdf5) \ + $(use_with jansson) \ $(use_with perl) \ - --without-python \ $(use_with ruby) \ - --without-gl \ $(use_with openexr exr) \ + --without-gl \ $(use_with sourceview gtksourceview) \ + $(use_with unique) \ $(use_with xml libxml2) \ $(use_with X x) \ + $(use_with zlib) \ --with-zip=libzip } -pkg_postinst() { - use gnome && gnome2_gconf_install - xdg_pkg_postinst -} - -pkg_prerm() { - use gnome && gnome2_gconf_uninstall +src_install() { + default + find "${ED}" -type f -name "*.la" -delete || die } diff --git a/sci-visualization/gwyddion/metadata.xml b/sci-visualization/gwyddion/metadata.xml index b4a33560f643..27795d6781b4 100644 --- a/sci-visualization/gwyddion/metadata.xml +++ b/sci-visualization/gwyddion/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>dilfridge@gentoo.org</email> @@ -15,7 +15,7 @@ scanning probe microscopy techniques (AFM, MFM, STM, NSOM), but generally it can be used for any other height field analysis or image analysis. -</longdescription> + </longdescription> <use> <flag name="sourceview"> Enable support for <pkg>x11-libs/gtksourceview</pkg> @@ -23,5 +23,11 @@ <flag name="fits"> Enable FITS image import via <pkg>sci-libs/cfitsio</pkg> </flag> + <flag name="jansson"> + Enable JSON data manipulation via <pkg>dev-libs/jansson</pkg> + </flag> + <flag name="unique"> + Enable remote control backend via <pkg>dev-libs/libunique</pkg> + </flag> </use> </pkgmetadata> diff --git a/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch b/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch new file mode 100644 index 000000000000..39e2df7d0a64 --- /dev/null +++ b/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch @@ -0,0 +1,32 @@ +From 6a41644c39ffb394c350de3dacbacdffa54a0a2a Mon Sep 17 00:00:00 2001 +From: Adriaan de Groot <groot@kde.org> +Date: Sat, 3 Apr 2021 00:47:52 +0200 +Subject: [PATCH] Fix CMake-time with CMake 3.20 + +Having multiple else-blocks for a single if() is now a syntax +error; they need to be elseif() with only a single +optional else() at the end. +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 593dcb11..f965bd64 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -116,10 +116,10 @@ elseif(kst_3rdparty_download) + elseif(GCC_VERSION VERSION_EQUAL 4.7 OR GCC_VERSION VERSION_GREATER 4.7) + set(ver 4.7) + set(md5 de6e8dbab1bb17eee6057941fddc93e3) +- else(GCC_VERSION VERSION_EQUAL 4.6 OR GCC_VERSION VERSION_GREATER 4.6) ++ elseif(GCC_VERSION VERSION_EQUAL 4.6 OR GCC_VERSION VERSION_GREATER 4.6) + set(ver 4.6) + set(md5 70d8670af9c21eb8fb466654c95d8e4d) +- else(GCC_VERSION VERSION_GREATER 4.4) ++ elseif(GCC_VERSION VERSION_GREATER 4.4) + set(ver 4.4) + set(md5 999248fb40a44543af4dd4cd1be0ceeb) + else() +-- +GitLab + diff --git a/sci-visualization/kst/files/kst-2.0.8-getdata-drop-bogus-lib_debug.patch b/sci-visualization/kst/files/kst-2.0.8-getdata-drop-bogus-lib_debug.patch new file mode 100644 index 000000000000..07baa1a32ab1 --- /dev/null +++ b/sci-visualization/kst/files/kst-2.0.8-getdata-drop-bogus-lib_debug.patch @@ -0,0 +1,23 @@ +--- a/cmake/modules/FindGetdata.cmake 2014-02-13 10:41:44.000000000 +0100 ++++ b/cmake/modules/FindGetdata.cmake 2021-09-07 14:32:16.248930734 +0200 +@@ -49,19 +49,9 @@ + PATHS ${kst_3rdparty_dir} ${PKGGETDATA_LIBRARY_DIRS}) + list(APPEND GETDATA_LIBRARIES_RELEASE ${lib_release}) + list(APPEND GETDATA_LIBRARIES_BOTH optimized ${lib_release}) +- set(lib_debug lib_debug-NOTFOUND CACHE STRING "" FORCE) +- FIND_LIBRARY(lib_debug ${it}d +- HINTS ENV GETDATA_DIR PATH_SUFFIXES lib +- PATHS ${kst_3rdparty_dir} ${PKGGETDATA_LIBRARY_DIRS}) +- list(APPEND GETDATA_LIBRARIES_DEBUG ${lib_debug}) +- list(APPEND GETDATA_LIBRARIES_BOTH debug ${lib_debug}) + endforeach() + +-if(GETDATA_LIBRARIES_DEBUG AND GETDATA_LIBRARIES_RELEASE) +- set(GETDATA_LIBRARIES ${GETDATA_LIBRARIES_BOTH} CACHE STRING "" FORCE) +-else() +- set(GETDATA_LIBRARIES ${GETDATA_LIBRARIES_RELEASE} CACHE STRING "" FORCE) +-endif() ++set(GETDATA_LIBRARIES ${GETDATA_LIBRARIES_RELEASE} CACHE STRING "" FORCE) + + endif() + diff --git a/sci-visualization/kst/files/kst-2.0.8-qt-5.15.patch b/sci-visualization/kst/files/kst-2.0.8-qt-5.15.patch new file mode 100644 index 000000000000..97b42a6d33c2 --- /dev/null +++ b/sci-visualization/kst/files/kst-2.0.8-qt-5.15.patch @@ -0,0 +1,10 @@ +--- a/src/widgets/gradienteditor.h 2014-02-13 09:41:44.000000000 +0000 ++++ b/src/widgets/gradienteditor.h 2021-04-18 14:45:24.654148450 +0100 +@@ -16,6 +16,7 @@ + #include <QHash> + #include <QWidget> + #include <QGradient> ++#include <QPainterPath> + + #include "kstwidgets_export.h" + diff --git a/sci-visualization/kst/kst-2.0.8.ebuild b/sci-visualization/kst/kst-2.0.8-r2.ebuild index d5cfd61e3676..6eea2097dbb3 100644 --- a/sci-visualization/kst/kst-2.0.8.ebuild +++ b/sci-visualization/kst/kst-2.0.8-r2.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - -inherit cmake-utils xdg-utils +EAPI=8 MY_P=Kst-${PV} +inherit cmake flag-o-matic xdg-utils DESCRIPTION="Fast real-time large-dataset viewing and plotting tool" -HOMEPAGE="https://kst.kde.org/" +HOMEPAGE="https://kst-plot.kde.org/ https://invent.kde.org/graphics/kst-plot" SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2 LGPL-2 FDL-1.2" SLOT="0" @@ -24,21 +24,19 @@ RDEPEND=" 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/cfitsio:= + sci-libs/getdata[cxx] + sci-libs/gsl:= + sci-libs/matio:= sci-libs/netcdf-cxx:3 " DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 test? ( dev-qt/qttest:5 ) " - -S=${WORKDIR}/${MY_P} +BDEPEND="dev-qt/linguist-tools:5" DOCS=( AUTHORS README.kstScript ) @@ -46,9 +44,17 @@ PATCHES=( "${FILESDIR}/${P}-includes.patch" "${FILESDIR}/${P}-qt-5.11.patch" "${FILESDIR}/${P}-gsl-2.0.patch" + "${FILESDIR}/${P}-cmake-3.20.patch" # bug 778560 + "${FILESDIR}/${P}-getdata-drop-bogus-lib_debug.patch" # bug 593848 + "${FILESDIR}/${P}-qt-5.15.patch" # bug 593848 ) src_configure() { + # -Werror=odr, -Werror=lto-type=-mismatch + # https://bugs.gentoo.org/863296 + # https://bugs.kde.org/show_bug.cgi?id=484572 + filter-lto + local mycmakeargs=( -Dkst_install_libdir="$(get_libdir)" -Dkst_pch=OFF @@ -59,7 +65,7 @@ src_configure() { -Dkst_test=$(usex test) ) - cmake-utils_src_configure + cmake_src_configure } pkg_postinst() { diff --git a/sci-visualization/kst/metadata.xml b/sci-visualization/kst/metadata.xml index 9f73ea702ac4..b5df2728f226 100644 --- a/sci-visualization/kst/metadata.xml +++ b/sci-visualization/kst/metadata.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> <name>Gentoo Qt Project</name> - </maintainer> + </maintainer> <upstream> <remote-id type="sourceforge">kst</remote-id> <bugs-to>https://bugs.kde.org/</bugs-to> diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest index 256637890742..dce5e0b4765d 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1 +1,2 @@ -DIST labplot-2.7.0.tar.xz 13306532 BLAKE2B 044f6f1e552b6ccbd56791e39af240c97f0c572fae66ede0bbc13e172a88b652b0c42182fa4f6742b386dfd9c17f3041180841fe531387a9f44bd9b00adb8c09 SHA512 73e10ed98694b7633e80ffa7745733392cf9ce36f45e4ef6432d661b015dd3e821ddc791223a32fa55115c68f0d82b90464080915f8bb55cd1907610151a2d0a +DIST labplot-2.10.1.tar.xz 23193988 BLAKE2B dbea843dcf0761eb40d9a386f8df13b45a889bf41ff1a40434b521f591fb2c776de4c474f553776f43ad3ee85224e919521efdabd853f8d0cc1c0c9ad32a4df8 SHA512 12c8b62519861255dd8cb4ecc3ad4ff34f1862b8e386a9aa97e4f3a2dd0b8989cf14b9dafcea41da2575bd57c0ef9803a15ac9347365cdeea6309dcfda4cd7da +DIST labplot-2.9.0.tar.xz 21413512 BLAKE2B ab3c579eb64ee4b9b558db63210b1d2210210e1ee2df7fd986d75ebbacab96c4cd05a8fc4698859373e011bd47c55a1abc73d0e8107dd3e3f1b60ce87e1f14d4 SHA512 d06e373e463d9cf3df81eec367167350572975366785b6c88bdab947288fbc21a9eb8e706cb1a831967b8bf0a8039f2f919e14ae7cfb40b21e66f862e38c5d45 diff --git a/sci-visualization/labplot/files/labplot-2.9.0-discount-3.patch b/sci-visualization/labplot/files/labplot-2.9.0-discount-3.patch new file mode 100644 index 000000000000..e59c1309888d --- /dev/null +++ b/sci-visualization/labplot/files/labplot-2.9.0-discount-3.patch @@ -0,0 +1,98 @@ +From 06837a859c3cc03b175241d84575f747c2a0a779 Mon Sep 17 00:00:00 2001 +From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de> +Date: Mon, 17 Apr 2023 23:15:19 +0200 +Subject: [PATCH] support discount version 3 + +cherry-picked (and merged) commits from git master: +80340872e0fd3780065b847000882cd2c6faaf09 +22c553af43ff2afc42a32f8b9f04c6b426f49300 +--- + CMakeLists.txt | 4 ++++ + cmake/FindDiscount.cmake | 9 ++++++++- + src/backend/worksheet/TextLabel.cpp | 17 +++++++++++++++-- + 3 files changed, 27 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ed478d024..2e28a1aff 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -493,6 +493,10 @@ IF (ENABLE_DISCOUNT) + TYPE OPTIONAL) + IF (Discount_FOUND) + add_definitions (-DHAVE_DISCOUNT) ++ MESSAGE (STATUS "Found Markdown Library Discount ${Discount_VERSION}") ++ IF (${Discount_VERSION} VERSION_GREATER "2.99") ++ add_definitions (-DHAVE_DISCOUNT3) ++ ENDIF () + ELSE () + MESSAGE (STATUS "Discount library NOT FOUND.") + ENDIF () +diff --git a/cmake/FindDiscount.cmake b/cmake/FindDiscount.cmake +index 4919ad6e1..9dd348649 100644 +--- a/cmake/FindDiscount.cmake ++++ b/cmake/FindDiscount.cmake +@@ -10,6 +10,11 @@ + # SPDX-FileCopyrightText: 2018 Sune Vuorela <sune@kde.org> + # SPDX-License-Identifier: BSD-3-Clause + ++find_package(PkgConfig QUIET) ++pkg_check_modules(PC_LIBMARKDOWN libmarkdown QUIET) ++ ++set(Discount_VERSION ${PC_LIBMARKDOWN_VERSION}) ++ + if (Discount_INCLUDE_DIR AND Discount_LIBRARIES) + + # Already in cache +@@ -19,10 +24,12 @@ else (Discount_INCLUDE_DIR AND Discount_LIBRARIES) + + find_library (Discount_LIBRARIES + NAMES markdown libmarkdown ++ HINTS ${PC_LIBMARKDOWN_LIBRARY_DIRS} + ) + + find_path (Discount_INCLUDE_DIR + NAMES mkdio.h ++ HINTS ${PC_LIBMARKDOWN_INCLUDE_DIRS} + ) + + include (FindPackageHandleStandardArgs) +@@ -30,7 +37,7 @@ else (Discount_INCLUDE_DIR AND Discount_LIBRARIES) + + endif (Discount_INCLUDE_DIR AND Discount_LIBRARIES) + +-mark_as_advanced(Discount_INCLUDE_DIR Discount_LIBRARIES) ++mark_as_advanced(Discount_INCLUDE_DIR Discount_LIBRARIES Discount_VERSION) + + if (Discount_FOUND) + add_library(Discount::Lib UNKNOWN IMPORTED) +diff --git a/src/backend/worksheet/TextLabel.cpp b/src/backend/worksheet/TextLabel.cpp +index 815dcb785..1c85c0e9e 100644 +--- a/src/backend/worksheet/TextLabel.cpp ++++ b/src/backend/worksheet/TextLabel.cpp +@@ -576,8 +576,21 @@ void TextLabelPrivate::updateText() { + case TextLabel::Mode::Markdown: { + #ifdef HAVE_DISCOUNT + auto mdCharArray = textWrapper.text.toUtf8(); +- MMIOT* mdHandle = mkd_string(mdCharArray.data(), mdCharArray.size()+1, 0); +- if(!mkd_compile(mdHandle, MKD_LATEX | MKD_FENCEDCODE | MKD_GITHUBTAGS)) { ++#ifdef HAVE_DISCOUNT3 ++ MMIOT* mdHandle = mkd_string(mdCharArray.data(), mdCharArray.size() + 1, nullptr); ++ ++ mkd_flag_t* v3flags = mkd_flags(); ++ mkd_set_flag_num(v3flags, MKD_LATEX); ++ mkd_set_flag_num(v3flags, MKD_FENCEDCODE); ++ mkd_set_flag_num(v3flags, MKD_GITHUBTAGS); ++ ++ if (!mkd_compile(mdHandle, v3flags)) { ++#else ++ MMIOT* mdHandle = mkd_string(mdCharArray.data(), mdCharArray.size() + 1, 0); ++ ++ unsigned int flags = MKD_LATEX | MKD_FENCEDCODE | MKD_GITHUBTAGS; ++ if (!mkd_compile(mdHandle, flags)) { ++#endif + DEBUG(Q_FUNC_INFO << ", Failed to compile the markdown document"); + mkd_cleanup(mdHandle); + return; +-- +2.40.0 + diff --git a/sci-visualization/labplot/labplot-2.10.1.ebuild b/sci-visualization/labplot/labplot-2.10.1.ebuild new file mode 100644 index 000000000000..dceb294dff35 --- /dev/null +++ b/sci-visualization/labplot/labplot-2.10.1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="forceoptional" +KFMIN=5.88.0 +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks" +HOMEPAGE="https://labplot.kde.org/ https://apps.kde.org/labplot2/" +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="5" +IUSE="cantor excel fftw fits hdf5 libcerf markdown matio netcdf origin root serial telemetry" + +DEPEND=" + app-text/poppler + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/syntax-highlighting-${KFMIN}:5 + >=sci-libs/gsl-1.15:= + cantor? ( + >=kde-apps/cantor-19.12.0:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + ) + excel? ( dev-libs/qxlsx:= ) + fftw? ( sci-libs/fftw:3.0= ) + fits? ( sci-libs/cfitsio:= ) + hdf5? ( sci-libs/hdf5:= ) + libcerf? ( sci-libs/libcerf ) + markdown? ( app-text/discount:= ) + matio? ( sci-libs/matio:= ) + netcdf? ( sci-libs/netcdf:= ) + origin? ( sci-libs/liborigin:2 ) + root? ( + app-arch/lz4 + sys-libs/zlib + ) + serial? ( >=dev-qt/qtserialport-${QTMIN}:5 ) + telemetry? ( kde-frameworks/kuserfeedback:5 ) +" +RDEPEND="${DEPEND}" +# not packaged: dev-qt/qtmqtt, bug 683994 +BDEPEND=" + app-alternatives/yacc + sys-devel/gettext +" + +src_configure() { + local mycmakeargs=( + -DENABLE_MQTT=OFF # not packaged + -DENABLE_READSTAT=OFF # not packaged + -DENABLE_VECTOR_BLF=OFF # not packaged + -DENABLE_CANTOR=$(usex cantor) + -DENABLE_EXCEL=$(usex excel) + -DENABLE_FFTW=$(usex fftw) + -DENABLE_FITS=$(usex fits) + -DENABLE_HDF5=$(usex hdf5) + -DENABLE_LIBCERF=$(usex libcerf) + -DENABLE_DISCOUNT=$(usex markdown) + -DENABLE_MATIO=$(usex matio) + -DENABLE_NETCDF=$(usex netcdf) + -DENABLE_LIBORIGIN=$(usex origin) + -DENABLE_ROOT=$(usex root) + -DENABLE_QTSERIALPORT=$(usex serial) + $(cmake_use_find_package telemetry KUserFeedback) + -DENABLE_TESTS=$(usex test) + ) + + ecm_src_configure +} diff --git a/sci-visualization/labplot/labplot-2.7.0.ebuild b/sci-visualization/labplot/labplot-2.9.0-r1.ebuild index fcf591f4a89e..0b0ac52a1aad 100644 --- a/sci-visualization/labplot/labplot-2.7.0.ebuild +++ b/sci-visualization/labplot/labplot-2.9.0-r1.ebuild @@ -1,16 +1,17 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" -KFMIN=5.60.0 -QTMIN=5.12.3 +KFMIN=5.88.0 +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" inherit ecm kde.org DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks" -HOMEPAGE="https://labplot.kde.org/ https://kde.org/applications/education/org.kde.labplot2" +HOMEPAGE="https://labplot.kde.org/ https://apps.kde.org/labplot2/" if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~x86" @@ -18,19 +19,14 @@ fi LICENSE="GPL-2" SLOT="5" -IUSE="cantor fftw fits hdf5 libcerf netcdf root" +IUSE="cantor fftw fits hdf5 libcerf markdown matio netcdf origin root serial telemetry" -# not packaged: dev-qt/qtmqtt, bug 683994 -BDEPEND=" - sys-devel/bison - sys-devel/gettext -" DEPEND=" + app-text/poppler >=dev-qt/qtconcurrent-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtserialport-${QTMIN}:5 >=dev-qt/qtsql-${QTMIN}:5 >=dev-qt/qtsvg-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 @@ -50,7 +46,7 @@ DEPEND=" >=kde-frameworks/syntax-highlighting-${KFMIN}:5 >=sci-libs/gsl-1.15:= cantor? ( - >=kde-apps/cantor-19.08.0:5 + >=kde-apps/cantor-19.12.0:5 >=kde-frameworks/kparts-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 ) @@ -58,25 +54,43 @@ DEPEND=" fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) + markdown? ( app-text/discount:= ) + matio? ( sci-libs/matio:= ) netcdf? ( sci-libs/netcdf:= ) + origin? ( sci-libs/liborigin:2 ) root? ( app-arch/lz4 sys-libs/zlib ) + serial? ( >=dev-qt/qtserialport-${QTMIN}:5 ) + telemetry? ( kde-frameworks/kuserfeedback:5 ) " RDEPEND="${DEPEND}" +# not packaged: dev-qt/qtmqtt, bug 683994 +BDEPEND=" + app-alternatives/yacc + sys-devel/gettext +" + +PATCHES=( "${FILESDIR}/${P}-discount-3.patch" ) src_configure() { local mycmakeargs=( + -DENABLE_MQTT=OFF # not packaged + -DENABLE_READSTAT=OFF # not packaged -DENABLE_CANTOR=$(usex cantor) -DENABLE_FFTW=$(usex fftw) -DENABLE_FITS=$(usex fits) -DENABLE_HDF5=$(usex hdf5) -DENABLE_LIBCERF=$(usex libcerf) + -DENABLE_DISCOUNT=$(usex markdown) + -DENABLE_MATIO=$(usex matio) -DENABLE_NETCDF=$(usex netcdf) + -DENABLE_LIBORIGIN=$(usex origin) -DENABLE_ROOT=$(usex root) + -DENABLE_QTSERIALPORT=$(usex serial) + $(cmake_use_find_package telemetry KUserFeedback) -DENABLE_TESTS=$(usex test) - -DENABLE_MQTT=OFF ) ecm_src_configure diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-9999.ebuild index fcf591f4a89e..dceb294dff35 100644 --- a/sci-visualization/labplot/labplot-9999.ebuild +++ b/sci-visualization/labplot/labplot-9999.ebuild @@ -1,36 +1,32 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" -KFMIN=5.60.0 -QTMIN=5.12.3 +KFMIN=5.88.0 +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" inherit ecm kde.org DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks" -HOMEPAGE="https://labplot.kde.org/ https://kde.org/applications/education/org.kde.labplot2" +HOMEPAGE="https://labplot.kde.org/ https://apps.kde.org/labplot2/" if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" KEYWORDS="~amd64 ~x86" fi LICENSE="GPL-2" SLOT="5" -IUSE="cantor fftw fits hdf5 libcerf netcdf root" +IUSE="cantor excel fftw fits hdf5 libcerf markdown matio netcdf origin root serial telemetry" -# not packaged: dev-qt/qtmqtt, bug 683994 -BDEPEND=" - sys-devel/bison - sys-devel/gettext -" DEPEND=" + app-text/poppler >=dev-qt/qtconcurrent-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtserialport-${QTMIN}:5 >=dev-qt/qtsql-${QTMIN}:5 >=dev-qt/qtsvg-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 @@ -50,33 +46,52 @@ DEPEND=" >=kde-frameworks/syntax-highlighting-${KFMIN}:5 >=sci-libs/gsl-1.15:= cantor? ( - >=kde-apps/cantor-19.08.0:5 + >=kde-apps/cantor-19.12.0:5 >=kde-frameworks/kparts-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 ) + excel? ( dev-libs/qxlsx:= ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) + markdown? ( app-text/discount:= ) + matio? ( sci-libs/matio:= ) netcdf? ( sci-libs/netcdf:= ) + origin? ( sci-libs/liborigin:2 ) root? ( app-arch/lz4 sys-libs/zlib ) + serial? ( >=dev-qt/qtserialport-${QTMIN}:5 ) + telemetry? ( kde-frameworks/kuserfeedback:5 ) " RDEPEND="${DEPEND}" +# not packaged: dev-qt/qtmqtt, bug 683994 +BDEPEND=" + app-alternatives/yacc + sys-devel/gettext +" src_configure() { local mycmakeargs=( + -DENABLE_MQTT=OFF # not packaged + -DENABLE_READSTAT=OFF # not packaged + -DENABLE_VECTOR_BLF=OFF # not packaged -DENABLE_CANTOR=$(usex cantor) + -DENABLE_EXCEL=$(usex excel) -DENABLE_FFTW=$(usex fftw) -DENABLE_FITS=$(usex fits) -DENABLE_HDF5=$(usex hdf5) -DENABLE_LIBCERF=$(usex libcerf) + -DENABLE_DISCOUNT=$(usex markdown) + -DENABLE_MATIO=$(usex matio) -DENABLE_NETCDF=$(usex netcdf) + -DENABLE_LIBORIGIN=$(usex origin) -DENABLE_ROOT=$(usex root) + -DENABLE_QTSERIALPORT=$(usex serial) + $(cmake_use_find_package telemetry KUserFeedback) -DENABLE_TESTS=$(usex test) - -DENABLE_MQTT=OFF ) ecm_src_configure diff --git a/sci-visualization/labplot/metadata.xml b/sci-visualization/labplot/metadata.xml index 150390b19845..96a92087bc72 100644 --- a/sci-visualization/labplot/metadata.xml +++ b/sci-visualization/labplot/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>dilfridge@gentoo.org</email> @@ -13,10 +13,18 @@ <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + </upstream> <use> <flag name="cantor">Enable support for different open-source computer algebra systems via <pkg>kde-apps/cantor</pkg></flag> + <flag name="excel">Enable support for importing/exporting Microsoft Excel files (.xlsx) via <pkg>dev-libs/qxlsx</pkg></flag> <flag name="fits">Enable support for NASA's <pkg>sci-libs/cfitsio</pkg> library</flag> <flag name="libcerf">Enable special functions from <pkg>sci-libs/libcerf</pkg></flag> + <flag name="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag> + <flag name="matio">Enable support for matio (<pkg>sci-libs/matio</pkg>)</flag> + <flag name="origin">Enable support for reading OriginLab OPJ project files through <pkg>sci-libs/liborigin</pkg></flag> <flag name="root">Enable support for CERN's ROOT file type</flag> + <flag name="serial">Enable support for RS232 serial ports using <pkg>dev-qt/qtserialport</pkg></flag> </use> </pkgmetadata> diff --git a/sci-visualization/metadata.xml b/sci-visualization/metadata.xml index 5ac373c53d85..e62db2ea09be 100644 --- a/sci-visualization/metadata.xml +++ b/sci-visualization/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <longdescription lang="en"> The sci-visualization category contains scientific visualization @@ -22,4 +22,3 @@ de visualización. </longdescription> </catmetadata> - diff --git a/sci-visualization/nonolith-connect/Manifest b/sci-visualization/nonolith-connect/Manifest deleted file mode 100644 index 63e8816a4680..000000000000 --- a/sci-visualization/nonolith-connect/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST nonolith-connect-1.1.tar.bz2 559686 BLAKE2B 5a5a0ee7671e20661d182eaa448b96d3f259773618f473cacd94097b80bfcaa0c28d991271bb587ae2efa425f4ce14938dff56eaeb4164dd6aa98ba24a2def8e SHA512 41fe49a21a2f773c04c8054f322d17958b3eadac82e7013c50ff73c13dc31baa4905d52c02b5270d636fbb5348aff7ca8b064a30a81e970083abd6e69f93aff9 diff --git a/sci-visualization/nonolith-connect/files/1.1-cflags-respect.patch b/sci-visualization/nonolith-connect/files/1.1-cflags-respect.patch deleted file mode 100644 index c6b04c5fe339..000000000000 --- a/sci-visualization/nonolith-connect/files/1.1-cflags-respect.patch +++ /dev/null @@ -1,70 +0,0 @@ -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 deleted file mode 100644 index 815c3ca866c7..000000000000 --- a/sci-visualization/nonolith-connect/files/1.1-gcc6.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 deleted file mode 100644 index c8a6bd1d0414..000000000000 --- a/sci-visualization/nonolith-connect/files/nonolith-connect.initd +++ /dev/null @@ -1,17 +0,0 @@ -#!/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 deleted file mode 100644 index 119bc9428076..000000000000 --- a/sci-visualization/nonolith-connect/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?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 deleted file mode 100644 index 955e544fbc61..000000000000 --- a/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# 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 deleted file mode 100644 index f9a4b3cd1542..000000000000 --- a/sci-visualization/opendx-samples/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST dxsamples-4.4.0.tar.gz 7791659 BLAKE2B f3fb5ac4990ed13718390229debd8f72f84f1b751dae6e6497388e31e0e8f3869d9c30cc7e2e2b5a58fc0e32aab3127751451c616c0081606f28dd41250d9924 SHA512 ae740be888728750de2cf21e94094a4aa01adec8ea0cfe937f03a67803ad7cb0d92968c8d4325e22022c698f871d4af45df02d3b8e8639434a1001dd46e0b311 -DIST opendx-samples-4.4.0-install.patch.bz2 4195 BLAKE2B eb520ac16311e4252f36b7911ebff11f21cf16fa3d3b31a8e1209c28d66e78ae66b57c3b3edd4db66f26e82a25f3675c9a5e0ad146bb1b4ed74d1196007cc836 SHA512 3c276355d0796b2713d42ea11ce34d02c72e5b679aff4feb9792ec58c8a3c6aed1d79981d09a93b842d6d47fdc6cacd5fca4fc96f88cc764a90a5adf10797fc6 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 deleted file mode 100644 index 984f84a10336..000000000000 --- a/sci-visualization/opendx-samples/files/opendx-samples-4.4.0-nojava.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- 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 deleted file mode 100644 index 07c8ea7f6e9c..000000000000 --- a/sci-visualization/opendx-samples/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?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 deleted file mode 100644 index 2dbd69320cc6..000000000000 --- a/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# 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 ~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 deleted file mode 100644 index e36d98d42167..000000000000 --- a/sci-visualization/opendx/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST dx-4.4.4.tar.gz 9676049 BLAKE2B d628d2cf7d2cae5cfd1f69c72de06529ee3df0192bcb0973916110cc795fd408c9e297d1161e8685cdd62d0c09a985f41d4b2f72ca69ae2cd74488174e392a31 SHA512 e6ef0075a696c442fd4615eb32b9ebd3f85728321a33297e3402b19bbc6210953a6599d643fc0a20bc349fbc72411326c69187223ee0e65560603d8e6f7527ee -DIST opendx-4.4.4_p20160917-fix-c++14.patch.bz2 3162 BLAKE2B 7998a0099f197ea35543559e69a30b564521cbb0d504e90a64adde2492da2920b2ca4a96fca296ff88ef19f51ea3e0dd40337f205b8fa54133b7f9669d2086c0 SHA512 0d671e5a085b446969fbe57eb9d08e4dd103bc29058ce8c6167c3cad18f14b816a3f2cae329b194ef9827ff6590d31da95fc04176e0824f95bdf89761007bc6f 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 deleted file mode 100644 index 93bf18efb38c..000000000000 --- a/sci-visualization/opendx/files/opendx-4.3.2-sys.h.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 deleted file mode 100644 index ba2c9c8c43c4..000000000000 --- a/sci-visualization/opendx/files/opendx-4.4.4-concurrent-make-fix.patch +++ /dev/null @@ -1,66 +0,0 @@ -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 deleted file mode 100644 index 70c1b28f0e40..000000000000 --- a/sci-visualization/opendx/files/opendx-4.4.4-dx-errno.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 64a3d91fee6c..000000000000 --- a/sci-visualization/opendx/files/opendx-4.4.4-gcc43.patch +++ /dev/null @@ -1,315 +0,0 @@ -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 deleted file mode 100644 index 3c0b6d9a899c..000000000000 --- a/sci-visualization/opendx/files/opendx-4.4.4-installpaths.patch +++ /dev/null @@ -1,330 +0,0 @@ -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-invalid-conversion.patch b/sci-visualization/opendx/files/opendx-4.4.4-invalid-conversion.patch deleted file mode 100644 index 579cceb96842..000000000000 --- a/sci-visualization/opendx/files/opendx-4.4.4-invalid-conversion.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/uipp/dxuilib/EditorWindow.C b/src/uipp/dxuilib/EditorWindow.C -index c406cc1..d6c0765 100644 ---- a/src/uipp/dxuilib/EditorWindow.C -+++ b/src/uipp/dxuilib/EditorWindow.C -@@ -5997,7 +5997,7 @@ char msg[128]; - // - const char *tmpdir = theDXApplication->getTmpDirectory(); - int tmpdirlen = STRLEN(tmpdir); -- if (!tmpdirlen) return FALSE; -+ if (!tmpdirlen) return (char*)FALSE; - if (tmpdir[tmpdirlen-1] == '/') { - sprintf(netfilename, "%sdx%d.net", tmpdir, getpid()); - sprintf(cfgfilename, "%sdx%d.cfg", tmpdir, getpid()); diff --git a/sci-visualization/opendx/files/opendx-4.4.4-libtool.patch b/sci-visualization/opendx/files/opendx-4.4.4-libtool.patch deleted file mode 100644 index 2a5aad6d439a..000000000000 --- a/sci-visualization/opendx/files/opendx-4.4.4-libtool.patch +++ /dev/null @@ -1,11 +0,0 @@ -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-null.patch b/sci-visualization/opendx/files/opendx-4.4.4-null.patch deleted file mode 100644 index 5d3022a3a9d1..000000000000 --- a/sci-visualization/opendx/files/opendx-4.4.4-null.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index b62ebd094be7..000000000000 --- a/sci-visualization/opendx/files/opendx-4.4.4-open.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index 488379b4f1b6..000000000000 --- a/sci-visualization/opendx/files/opendx-4.4.4-szip.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- 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 deleted file mode 100644 index 018dcd644b87..000000000000 --- a/sci-visualization/opendx/files/opendx-4.4.4-xdg.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index 6d247e3f3a3d..000000000000 --- a/sci-visualization/opendx/metadata.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?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-r7.ebuild b/sci-visualization/opendx/opendx-4.4.4-r7.ebuild deleted file mode 100644 index 024c2706ae3c..000000000000 --- a/sci-visualization/opendx/opendx-4.4.4-r7.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2018 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 x86 ~amd64-linux ~x86-linux" -IUSE="hdf cdf netcdf tiff imagemagick szip smp" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt - >=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" - "${FILESDIR}/${P}-invalid-conversion.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 index 3173c63282b3..e93bfb6acbac 100644 --- a/sci-visualization/paraview/Manifest +++ b/sci-visualization/paraview/Manifest @@ -1 +1,3 @@ -DIST ParaView-v5.8.0.tar.xz 49789116 BLAKE2B 25689220f506221731bb5a56c647c249df0de8654a4b3347a7c09067bb5755818597bd7cfff88c2d129f448189b107079995c93599d482f7bf8b4cc6c7430e72 SHA512 43304d62c3f55bc390e68c033fb4c7dc2c0789d0dadbb98ef734b7d9de0419af4c240ce94f36e2b52c939ac950fba1d70dbd9fc3a1e6da37c7ef847b5c8682a2 +DIST ParaView-v5.11.1.tar.xz 79847556 BLAKE2B efef5e519a82ef1c0a7d532578778f6a95f07ebd72ebefd0cbdcff0bfc3af1773601cd102ff81f45f302fcaa4bb6ec7ee68f7dec77f5d4e137c2842fbbb54e11 SHA512 d0e666b49f49e41dba23e23d454a9462f018bd6d832628b0029e8d54760f0439ca97841a26da3126c5144780fc01dc25234a6624fb35346a98d35cbe0e0c98ca +DIST ParaView-v5.12.0-RC1.tar.xz 128908020 BLAKE2B 3222ac21f733559b9f5c7e8c1009a19c0e462e2622805db7d61b683f25d70fc40cf096d699afde6dab9e23c102e3df9251a718d3ecbaac7a56db01c898270cd9 SHA512 1c6a052081e274a120563c5ffc73dadf4e02be237cc0c213a22d0b93a9865713c83992a3fc0cc1c52742b0753546b5b983a3f650989e8a472ac2f7e90383de92 +DIST ParaView-v5.12.0.tar.xz 129439820 BLAKE2B b9a59c22d15ee1582704c7e6c70a259d8b8df5d0f59fb87902ade07bce3ef7b52b055d75bb0876b7a0a9b493a7ef8df377f0ac281c370c72d9b89418efec9657 SHA512 d7ad95105f43672c5f0001f673977b7742cca113b78b0d953f4c55f60a6cf72b8a216515136251f63b8294becb0ea717b5118bf48b78ca8db85949a1b59892c1 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 deleted file mode 100644 index 665f40ad4fa7..000000000000 --- a/sci-visualization/paraview/files/paraview-4.0.1-xdmf-cstring.patch +++ /dev/null @@ -1,12 +0,0 @@ -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.11.1-missing-include.patch b/sci-visualization/paraview/files/paraview-5.11.1-missing-include.patch new file mode 100644 index 000000000000..d59d78412750 --- /dev/null +++ b/sci-visualization/paraview/files/paraview-5.11.1-missing-include.patch @@ -0,0 +1,11 @@ +diff -urNp ParaView-v5.11.1-orig/VTK/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp ParaView-v5.11.1-dwok/VTK/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp +--- ParaView-v5.11.1-orig/VTK/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp 2023-03-30 16:08:08.000000000 +0200 ++++ ParaView-v5.11.1-dwok/VTK/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp 2023-08-26 14:53:20.211944383 +0200 +@@ -33,6 +33,7 @@ + + #include <vector> + #include <string> ++#include <cstdint> + + #define CPL_DLL + 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 deleted file mode 100644 index 600c7d43744a..000000000000 --- a/sci-visualization/paraview/files/paraview-5.3.0-fix_buildsystem.patch +++ /dev/null @@ -1,24 +0,0 @@ -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/files/paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch b/sci-visualization/paraview/files/paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch deleted file mode 100644 index 1f76b84ac2d6..000000000000 --- a/sci-visualization/paraview/files/paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 797f28697d5ba50c1fa2bc5596af626a3c277826 Mon Sep 17 00:00:00 2001 -From: "Andrew J. P. Maclean" <andrew.amaclean@gmail.com> -Date: Wed, 27 May 2020 15:27:15 +1000 -Subject: [PATCH] Qt 5.15 needs the include file QPainterPath - ---- - Rendering/Qt/vtkQtLabelRenderStrategy.cxx | 1 + - Rendering/Qt/vtkQtStringToImage.cxx | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx b/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx -index afda585cca..eca65c64cd 100644 ---- a/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx -+++ b/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx -@@ -41,6 +41,7 @@ - #include <QImage> - #include <QMap> - #include <QPainter> -+#include <QPainterPath> - #include <QPair> - #include <QPixmap> - #include <QTextDocument> -diff --git a/VTK/Rendering/Qt/vtkQtStringToImage.cxx b/VTK/Rendering/Qt/vtkQtStringToImage.cxx -index 659c71570e..fbb9b78f05 100644 ---- a/VTK/Rendering/Qt/vtkQtStringToImage.cxx -+++ b/VTK/Rendering/Qt/vtkQtStringToImage.cxx -@@ -30,6 +30,7 @@ - #include <QFontMetrics> - #include <QImage> - #include <QPainter> -+#include <QPainterPath> - #include <QPixmap> - #include <QString> - #include <QTextDocument> --- -2.26.2 - diff --git a/sci-visualization/paraview/metadata.xml b/sci-visualization/paraview/metadata.xml index 8b232e108f44..7b3120dd0d0d 100644 --- a/sci-visualization/paraview/metadata.xml +++ b/sci-visualization/paraview/metadata.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://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="boost">Enable the usage of <pkg>dev-libs/boost</pkg></flag> <flag name="cg">Add support for nvidia's cg shaders</flag> - <flag name="coprocessing">Enable the coprocessing infrastructure which is mainly useful in the context of clusters</flag> - <flag name="development">Install development files including headers</flag> <flag name="nvcontrol">Add NVCONTROL support for OpenGL options</flag> <flag name="offscreen">Offscreen rendering through OSMesa</flag> <flag name="plugins">Build and install additional plugins</flag> diff --git a/sci-visualization/paraview/paraview-5.8.0-r3.ebuild b/sci-visualization/paraview/paraview-5.11.1-r1.ebuild index ed78dca47642..a33be6ae9bc3 100644 --- a/sci-visualization/paraview/paraview-5.8.0-r3.ebuild +++ b/sci-visualization/paraview/paraview-5.11.1-r1.ebuild @@ -1,30 +1,33 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit cmake-utils desktop gnome2-utils python-single-r1 qmake-utils toolchain-funcs +PYTHON_COMPAT=( python3_{9..11} ) +DOCS_BUILDER="doxygen" +inherit cmake flag-o-matic desktop docs python-single-r1 qmake-utils toolchain-funcs xdg -MAIN_PV=$(ver_cut 0-1) -MAJOR_PV=$(ver_cut 1-2) -MY_P="ParaView-v${PV}" +MAJOR_PV="$(ver_cut 1-2)" +MINOR_PV="$(ver_cut 3)" +RC_PV="$(ver_cut 4-5)" +RC_PV="${RC_PV:+-${RC_PV^^}}" +MY_P="ParaView-v${MAJOR_PV}.${MINOR_PV}${RC_PV}" DESCRIPTION="Powerful scientific data visualization application" HOMEPAGE="https://www.paraview.org" SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}" -LICENSE="paraview GPL-2" -KEYWORDS="~amd64 ~x86" +# TODO: check licenses of plugins (USE=plugins) +LICENSE="BSD MIT PSF-2 VTK" SLOT="0" -IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp offscreen plugins python +qt5 +sqlite test tk +webengine" +KEYWORDS="~amd64 ~x86" +IUSE="boost cg examples ffmpeg mpi nvcontrol openmp offscreen plugins python +qt5 +sqlite test tk +webengine" RESTRICT="mirror test" -# "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL" REQUIRED_USE=" python? ( mpi ${PYTHON_REQUIRED_USE} ) - mysql? ( sqlite ) webengine? ( qt5 ) qt5? ( sqlite ) ?? ( offscreen qt5 )" @@ -40,49 +43,46 @@ RDEPEND=" media-libs/glew:0 media-libs/libpng:0 media-libs/libtheora - media-libs/tiff:0= + media-libs/tiff:= sci-libs/cgnslib sci-libs/hdf5:=[mpi=] >=sci-libs/netcdf-4.2[hdf5] >=sci-libs/netcdf-cxx-4.2:3 sys-libs/zlib virtual/glu - virtual/jpeg:0 + media-libs/libjpeg-turbo:= x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt - coprocessing? ( - dev-python/PyQt5 - dev-qt/qtgui:5[-gles2-only] - ) ffmpeg? ( media-video/ffmpeg ) mpi? ( virtual/mpi[cxx,romio] ) - mysql? ( dev-db/mysql-connector-c ) offscreen? ( >=media-libs/mesa-18.3.6[osmesa] ) !offscreen? ( virtual/opengl ) python? ( ${PYTHON_DEPS} $(python_gen_cond_dep ' - dev-python/constantly[${PYTHON_MULTI_USEDEP}] - dev-python/incremental[${PYTHON_MULTI_USEDEP}] - dev-python/matplotlib[${PYTHON_MULTI_USEDEP}] - dev-python/numpy[${PYTHON_MULTI_USEDEP}] - dev-python/pygments[${PYTHON_MULTI_USEDEP}] - dev-python/sip[${PYTHON_MULTI_USEDEP}] - dev-python/six[${PYTHON_MULTI_USEDEP}] - dev-python/twisted[${PYTHON_MULTI_USEDEP}] - dev-python/zope-interface[${PYTHON_MULTI_USEDEP}] + dev-python/constantly[${PYTHON_USEDEP}] + dev-python/incremental[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/sip:5[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/twisted[${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}] mpi? ( dev-python/mpi4py ) - qt5? ( dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}] ) + qt5? ( dev-python/PyQt5[opengl,${PYTHON_USEDEP}] ) ') ) qt5? ( dev-qt/designer:5 + dev-qt/qtdeclarative:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qthelp:5 dev-qt/qtopengl:5[-gles2-only] dev-qt/qtsql:5 + dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtx11extras:5 dev-qt/qtxmlpatterns:5 @@ -94,34 +94,41 @@ DEPEND="${RDEPEND} ${PYTHON_DEPS} boost? ( $(python_gen_cond_dep ' - dev-libs/boost[mpi?,${PYTHON_MULTI_USEDEP}] + dev-libs/boost[mpi?,python,${PYTHON_USEDEP}] ') ) - doc? ( app-doc/doxygen )" +" -S="${WORKDIR}/${MY_P}" +BDEPEND=" + openmp? ( virtual/fortran ) +" PATCHES=( - "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch - "${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch "${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch - "${FILESDIR}"/${P}-w-vtk-8.2.0-qt-5.15.patch + "${FILESDIR}"/${P}-missing-include.patch ) -CMAKE_MAKEFILE_GENERATOR="emake" #579474 +# false positive when checking for available HDF5 interface, bug #904731 +QA_CONFIG_IMPL_DECL_SKIP=( + H5Pset_coll_metadata_write + H5Pset_all_coll_metadata_ops +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} pkg_setup() { - [[ ${MERGE_TYPE} != "binary" ]] && use openmp && tc-check-openmp + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp use python && python-single-r1_pkg_setup PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV} } src_prepare() { - # Bug #661812 mkdir -p Plugins/StreamLinesRepresentation/doc || die - cmake-utils_src_prepare + cmake_src_prepare # lib64 fixes sed -i \ @@ -133,9 +140,16 @@ src_prepare() { } src_configure() { - if use qt5; then - export QT_SELECT=qt5 - fi + # Needed to compile bundled VTK in ParaView 5.11.1 with gcc 12 + # see also, bug #863299 + filter-lto + append-cflags $(test-flags-CC -fno-strict-aliasing \ + -Wno-error=incompatible-function-pointer-types -Wno-error=int-conversion) + append-cxxflags $(test-flags-CXX -fno-strict-aliasing \ + -Wno-error=incompatible-function-pointer-types -Wno-error=int-conversion) + + # Make sure qmlplugindump is in path: + export PATH="$(qt5_get_bindir):${PATH}" local mycmakeargs=( -DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}" @@ -143,21 +157,9 @@ src_configure() { -DPARAVIEW_BUILD_SHARED_LIBS=ON -DCMAKE_VERBOSE_MAKEFILE=ON - -DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=TRUE - - -DVTK_USE_OGGTHEORA_ENCODER=TRUE - - -DVTK_GROUP_ENABLE_Imaging=YES - -DVTK_GROUP_ENABLE_Rendering=YES - -DVTK_GROUP_ENABLE_StandAlone=YES - -DVTK_GROUP_ENABLE_Views=YES - # boost -DVTK_MODULE_ENABLE_VTK_IOInfovis="$(usex boost YES NO)" - # coprocessing -# -DVTK_MODULE_ENABLE_ParaView_Catalyst="$(usex coprocessing YES NO)" - # doc -DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION="$(usex doc)" @@ -166,18 +168,13 @@ src_configure() { # ffmpeg -DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)" - -DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)" # mpi -DPARAVIEW_USE_MPI="$(usex mpi)" -DXDMF_BUILD_MPI="$(usex mpi)" -DVTK_GROUP_ENABLE_MPI="$(usex mpi YES NO)" - # mysql - -DVTK_MODULE_ENABLE_VTK_IOMySQL="$(usex mysql YES NO)" - # offscreen - -DVTK_USE_X="$(usex !offscreen)" -DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)" -DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)" @@ -189,11 +186,11 @@ src_configure() { -DPARAVIEW_USE_PYTHON="$(usex python)" # qt5 - -DPARAVIEW_INSTALL_DEVELOPMENT_FILES="$(usex development)" -DPARAVIEW_USE_QT="$(usex qt5)" -DModule_pqPython="$(usex qt5 "$(usex python)" "off")" -DVTK_USE_NVCONTROL="$(usex nvcontrol)" -DVTK_GROUP_ENABLE_Qt="$(usex qt5 YES NO)" + -DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt5/qml" # sqlite -DVTK_MODULE_ENABLE_VTK_sqlite="$(usex sqlite YES NO)" @@ -219,36 +216,29 @@ src_configure() { -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so -DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc" + -Dqt_xmlpatterns_executable="$(qt5_get_bindir)/xmlpatterns" ) fi - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install - - # remove wrapper binaries and put the actual executable in place - for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do - if [ -f "${ED}"/usr/lib/"$i" ]; then - mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die - fi - done + cmake_src_install - # set up the environment - echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die - doenvd "${T}"/40${PN} + # remove wrapper binaries and put the actual executable in place + for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do + if [ -f "${ED}"/usr/lib/"$i" ]; then + mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die + fi + done - newicon "${S}"/Clients/ParaView/pvIcon-96x96.png paraview.png - make_desktop_entry paraview "Paraview" paraview + # set up the environment + echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die + doenvd "${T}"/40${PN} - use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV} - } + newicon "${S}"/Clients/ParaView/pvIcon-96x96.png paraview.png + make_desktop_entry paraview "Paraview" paraview - pkg_postinst() { - xdg_icon_cache_update - } - - pkg_postrm() { - xdg_icon_cache_update - } + use python && python_optimize "${ED}/usr/$(get_libdir)/${PN}-${MAJOR_PV}" +} diff --git a/sci-visualization/paraview/paraview-5.12.0.ebuild b/sci-visualization/paraview/paraview-5.12.0.ebuild new file mode 100644 index 000000000000..ec1f53f6c0b3 --- /dev/null +++ b/sci-visualization/paraview/paraview-5.12.0.ebuild @@ -0,0 +1,245 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +DOCS_BUILDER="doxygen" +inherit cmake flag-o-matic desktop docs python-single-r1 qmake-utils toolchain-funcs xdg + +MAJOR_PV="$(ver_cut 1-2)" +MINOR_PV="$(ver_cut 3)" +RC_PV="$(ver_cut 4-5)" +RC_PV="${RC_PV:+-${RC_PV^^}}" +MY_P="ParaView-v${MAJOR_PV}.${MINOR_PV}${RC_PV}" + +DESCRIPTION="Powerful scientific data visualization application" +HOMEPAGE="https://www.paraview.org" +SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}" + +# TODO: check licenses of plugins (USE=plugins) +LICENSE="BSD MIT PSF-2 VTK" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="boost cg examples ffmpeg mpi nvcontrol openmp offscreen plugins python +qt5 +sqlite test tk +webengine" + +RESTRICT="mirror test" + +REQUIRED_USE=" + python? ( mpi ${PYTHON_REQUIRED_USE} ) + webengine? ( qt5 ) + qt5? ( sqlite ) + ?? ( offscreen qt5 )" + +RDEPEND=" + app-arch/lz4 + dev-libs/expat + dev-libs/jsoncpp:= + dev-libs/libxml2:2 + dev-libs/protobuf:= + dev-libs/pugixml + media-libs/freetype + media-libs/glew:0 + media-libs/libpng:0 + media-libs/libtheora + media-libs/tiff:= + sci-libs/cgnslib + sci-libs/hdf5:=[mpi=] + >=sci-libs/netcdf-4.2[hdf5] + >=sci-libs/netcdf-cxx-4.2:3 + sys-libs/zlib + virtual/glu + media-libs/libjpeg-turbo:= + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXt + ffmpeg? ( media-video/ffmpeg ) + mpi? ( virtual/mpi[cxx,romio] ) + offscreen? ( >=media-libs/mesa-18.3.6[osmesa] ) + !offscreen? ( virtual/opengl ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/constantly[${PYTHON_USEDEP}] + dev-python/incremental[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/sip:5[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/twisted[${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}] + mpi? ( dev-python/mpi4py ) + qt5? ( dev-python/PyQt5[opengl,${PYTHON_USEDEP}] ) + ') + ) + qt5? ( + dev-qt/designer:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5[-gles2-only] + dev-qt/qthelp:5 + dev-qt/qtopengl:5[-gles2-only] + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qttest:5 + dev-qt/qtx11extras:5 + dev-qt/qtxmlpatterns:5 + ) + sqlite? ( dev-db/sqlite:3 ) + tk? ( dev-lang/tk:0= ) + webengine? ( dev-qt/qtwebengine:5[widgets] )" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + boost? ( + $(python_gen_cond_dep ' + dev-libs/boost[mpi?,python,${PYTHON_USEDEP}] + ') + ) +" + +BDEPEND=" + openmp? ( virtual/fortran ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch +) + +# false positive when checking for available HDF5 interface, bug #904731 +QA_CONFIG_IMPL_DECL_SKIP=( + H5Pset_coll_metadata_write + H5Pset_all_coll_metadata_ops +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + use python && python-single-r1_pkg_setup + PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV} +} + +src_prepare() { + # Bug #661812 + mkdir -p Plugins/StreamLinesRepresentation/doc || die + + cmake_src_prepare + + # lib64 fixes + sed -i \ + -e "s:/lib/python:/$(get_libdir)/python:g" \ + VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die + sed -i \ + -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \ + Remoting/Application/vtkInitializationHelper.cxx || die +} + +src_configure() { + # Needed to compile bundled VTK in ParaView 5.11.1 with gcc 12 + # see also, bug #863299 + filter-lto + append-cflags $(test-flags-CC -fno-strict-aliasing \ + -Wno-error=incompatible-function-pointer-types -Wno-error=int-conversion) + append-cxxflags $(test-flags-CXX -fno-strict-aliasing \ + -Wno-error=incompatible-function-pointer-types -Wno-error=int-conversion) + + # Make sure qmlplugindump is in path: + export PATH="$(qt5_get_bindir):${PATH}" + + local mycmakeargs=( + -DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}" + -UBUILD_SHARED_LIBS + -DPARAVIEW_BUILD_SHARED_LIBS=ON + -DCMAKE_VERBOSE_MAKEFILE=ON + + # boost + -DVTK_MODULE_ENABLE_VTK_IOInfovis="$(usex boost YES NO)" + + # doc + -DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION="$(usex doc)" + + # examples + -DBUILD_EXAMPLES="$(usex examples)" + + # ffmpeg + -DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)" + + # mpi + -DPARAVIEW_USE_MPI="$(usex mpi)" + -DXDMF_BUILD_MPI="$(usex mpi)" + -DVTK_GROUP_ENABLE_MPI="$(usex mpi YES NO)" + + # offscreen + -DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)" + -DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)" + + # plugins + -DPARAVIEW_PLUGINS_DEFAULT="$(usex plugins)" + + # python + -DModule_pqPython="$(usex python)" + -DPARAVIEW_USE_PYTHON="$(usex python)" + + # qt5 + -DPARAVIEW_USE_QT="$(usex qt5)" + -DPARAVIEW_QT_VERSION="5" + -DVTK_QT_VERSION="5" + -DModule_pqPython="$(usex qt5 "$(usex python)" "off")" + -DVTK_USE_NVCONTROL="$(usex nvcontrol)" + -DVTK_GROUP_ENABLE_Qt="$(usex qt5 YES NO)" + -DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt5/qml" + + # sqlite + -DVTK_MODULE_ENABLE_VTK_sqlite="$(usex sqlite YES NO)" + + # test + -DBUILD_TESTING="$(usex test)" + + # tk + -DVTK_USE_TK="$(usex tk)" + -DVTK_GROUP_ENABLE_Tk="$(usex tk YES NO)" + + # webengine + -DPARAVIEW_USE_QTWEBENGINE="$(usex webengine)" + -DVTK_GROUP_ENABLE_Web="$(usex webengine YES NO)" + ) + + if use openmp; then + mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP ) + fi + + if use qt5; then + mycmakeargs+=( + -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so + -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so + -DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc" + -Dqt_xmlpatterns_executable="$(qt5_get_bindir)/xmlpatterns" + ) + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + + # remove wrapper binaries and put the actual executable in place + for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do + if [ -f "${ED}"/usr/lib/"$i" ]; then + mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die + fi + done + + # set up the environment + echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die + doenvd "${T}"/40${PN} + + newicon "${S}"/Clients/ParaView/pvIcon-96x96.png paraview.png + make_desktop_entry paraview "Paraview" paraview + + use python && python_optimize "${ED}/usr/$(get_libdir)/${PN}-${MAJOR_PV}" +} diff --git a/sci-visualization/paraview/paraview-5.12.0_rc1-r1.ebuild b/sci-visualization/paraview/paraview-5.12.0_rc1-r1.ebuild new file mode 100644 index 000000000000..8b65892f70c6 --- /dev/null +++ b/sci-visualization/paraview/paraview-5.12.0_rc1-r1.ebuild @@ -0,0 +1,245 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +DOCS_BUILDER="doxygen" +inherit cmake flag-o-matic desktop docs python-single-r1 qmake-utils toolchain-funcs xdg + +MAJOR_PV="$(ver_cut 1-2)" +MINOR_PV="$(ver_cut 3)" +RC_PV="$(ver_cut 4-5)" +RC_PV="${RC_PV:+-${RC_PV^^}}" +MY_P="ParaView-v${MAJOR_PV}.${MINOR_PV}${RC_PV}" + +DESCRIPTION="Powerful scientific data visualization application" +HOMEPAGE="https://www.paraview.org" +SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}" + +# TODO: check licenses of plugins (USE=plugins) +LICENSE="BSD MIT PSF-2 VTK" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="boost cg examples ffmpeg mpi nvcontrol openmp offscreen plugins python +qt5 +sqlite test tk +webengine" + +RESTRICT="mirror test" + +REQUIRED_USE=" + python? ( mpi ${PYTHON_REQUIRED_USE} ) + webengine? ( qt5 ) + qt5? ( sqlite ) + ?? ( offscreen qt5 )" + +RDEPEND=" + app-arch/lz4 + dev-libs/expat + dev-libs/jsoncpp:= + dev-libs/libxml2:2 + dev-libs/protobuf:= + dev-libs/pugixml + media-libs/freetype + media-libs/glew:0 + media-libs/libpng:0 + media-libs/libtheora + media-libs/tiff:= + sci-libs/cgnslib + sci-libs/hdf5:=[mpi=] + >=sci-libs/netcdf-4.2[hdf5] + >=sci-libs/netcdf-cxx-4.2:3 + sys-libs/zlib + virtual/glu + media-libs/libjpeg-turbo:= + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXt + ffmpeg? ( media-video/ffmpeg ) + mpi? ( virtual/mpi[cxx,romio] ) + offscreen? ( >=media-libs/mesa-18.3.6[osmesa] ) + !offscreen? ( virtual/opengl ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/constantly[${PYTHON_USEDEP}] + dev-python/incremental[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/sip:5[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/twisted[${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}] + mpi? ( dev-python/mpi4py ) + qt5? ( dev-python/PyQt5[opengl,${PYTHON_USEDEP}] ) + ') + ) + qt5? ( + dev-qt/designer:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5[-gles2-only] + dev-qt/qthelp:5 + dev-qt/qtopengl:5[-gles2-only] + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qttest:5 + dev-qt/qtx11extras:5 + dev-qt/qtxmlpatterns:5 + ) + sqlite? ( dev-db/sqlite:3 ) + tk? ( dev-lang/tk:0= ) + webengine? ( dev-qt/qtwebengine:5[widgets] )" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + boost? ( + $(python_gen_cond_dep ' + dev-libs/boost[mpi?,python,${PYTHON_USEDEP}] + ') + ) +" + +BDEPEND=" + openmp? ( virtual/fortran ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch +) + +# false positive when checking for available HDF5 interface, bug #904731 +QA_CONFIG_IMPL_DECL_SKIP=( + H5Pset_coll_metadata_write + H5Pset_all_coll_metadata_ops +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + use python && python-single-r1_pkg_setup + PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV} +} + +src_prepare() { + # Bug #661812 + mkdir -p Plugins/StreamLinesRepresentation/doc || die + + cmake_src_prepare + + # lib64 fixes + sed -i \ + -e "s:/lib/python:/$(get_libdir)/python:g" \ + VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die + sed -i \ + -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \ + Remoting/Application/vtkInitializationHelper.cxx || die +} + +src_configure() { + # Needed to compile bundled VTK in ParaView 5.11.1 with gcc 12 + # see also, bug #863299 + filter-lto + append-cflags $(test-flags-CC -fno-strict-aliasing \ + -Wno-error=incompatible-function-pointer-types -Wno-error=int-conversion) + append-cxxflags $(test-flags-CXX -fno-strict-aliasing \ + -Wno-error=incompatible-function-pointer-types -Wno-error=int-conversion) + + # Make sure qmlplugindump is in path: + export PATH="$(qt5_get_bindir):${PATH}" + + local mycmakeargs=( + -DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}" + -UBUILD_SHARED_LIBS + -DPARAVIEW_BUILD_SHARED_LIBS=ON + -DCMAKE_VERBOSE_MAKEFILE=ON + + # boost + -DVTK_MODULE_ENABLE_VTK_IOInfovis="$(usex boost YES NO)" + + # doc + -DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION="$(usex doc)" + + # examples + -DBUILD_EXAMPLES="$(usex examples)" + + # ffmpeg + -DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)" + + # mpi + -DPARAVIEW_USE_MPI="$(usex mpi)" + -DXDMF_BUILD_MPI="$(usex mpi)" + -DVTK_GROUP_ENABLE_MPI="$(usex mpi YES NO)" + + # offscreen + -DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)" + -DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)" + + # plugins + -DPARAVIEW_PLUGINS_DEFAULT="$(usex plugins)" + + # python + -DModule_pqPython="$(usex python)" + -DPARAVIEW_USE_PYTHON="$(usex python)" + + # qt5 + -DPARAVIEW_USE_QT="$(usex qt5)" + -DPARAVIEW_QT_VERSION="5" + -DVTK_QT_VERSION="5" + -DModule_pqPython="$(usex qt5 "$(usex python)" "off")" + -DVTK_USE_NVCONTROL="$(usex nvcontrol)" + -DVTK_GROUP_ENABLE_Qt="$(usex qt5 YES NO)" + -DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt5/qml" + + # sqlite + -DVTK_MODULE_ENABLE_VTK_sqlite="$(usex sqlite YES NO)" + + # test + -DBUILD_TESTING="$(usex test)" + + # tk + -DVTK_USE_TK="$(usex tk)" + -DVTK_GROUP_ENABLE_Tk="$(usex tk YES NO)" + + # webengine + -DPARAVIEW_USE_QTWEBENGINE="$(usex webengine)" + -DVTK_GROUP_ENABLE_Web="$(usex webengine YES NO)" + ) + + if use openmp; then + mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP ) + fi + + if use qt5; then + mycmakeargs+=( + -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so + -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so + -DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc" + -Dqt_xmlpatterns_executable="$(qt5_get_bindir)/xmlpatterns" + ) + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + + # remove wrapper binaries and put the actual executable in place + for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do + if [ -f "${ED}"/usr/lib/"$i" ]; then + mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die + fi + done + + # set up the environment + echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die + doenvd "${T}"/40${PN} + + newicon "${S}"/Clients/ParaView/pvIcon-96x96.png paraview.png + make_desktop_entry paraview "Paraview" paraview + + use python && python_optimize "${ED}/usr/$(get_libdir)/${PN}-${MAJOR_PV}" +} diff --git a/sci-visualization/pythonprop/Manifest b/sci-visualization/pythonprop/Manifest index df3b3b966ad0..afd8adc4b993 100644 --- a/sci-visualization/pythonprop/Manifest +++ b/sci-visualization/pythonprop/Manifest @@ -1 +1 @@ -DIST pythonprop-0.29.tar.gz 586118 BLAKE2B ac018f147206b59fbd2295e6e72d6e1a801d6456d8a9784bdb2511b0d9dcecfa455363826680051c90e0fcc83fdc95a16c91df120efb2e70456958276967dec7 SHA512 2fbbffedc9e010fdebeed7a84d23c599a2532ae0b67e6a2ba2da6bea0dc0496cb1f71ac54650285ed35196f33e689fc3d967e3bd7c4fb16832fc484a6b777fcb +DIST pythonprop-0.30.1.tar.gz 1141620 BLAKE2B 54554d1a50976aa0516e70ef6cabf8c8c8fe41dc15980d0d06defca2dbf722baa4e98dddb974ea0d6da18e3d634661c980685b89411e8de4cf1cded452bb60a1 SHA512 582442e95732c78b580eceaf8b9d4922a23e5b3c5652738b110a40e1b94f91196755fad6e00370328130acc608121961d4e449199610137a757b086b53184b43 diff --git a/sci-visualization/pythonprop/files/pythonprop-drop-portland.patch b/sci-visualization/pythonprop/files/pythonprop-drop-portland.patch new file mode 100644 index 000000000000..5a6736b4624b --- /dev/null +++ b/sci-visualization/pythonprop/files/pythonprop-drop-portland.patch @@ -0,0 +1,87 @@ +# Drop 'portland' colormap creation. It is done more than once and actual +# matplotlib do not like redefinitions. +diff --git a/src/pythonprop/voaAreaPlot.py b/src/pythonprop/voaAreaPlot.py +index a0bd789..a3bdd48 100644 +--- a/src/pythonprop/voaAreaPlot.py ++++ b/src/pythonprop/voaAreaPlot.py +@@ -94,7 +94,7 @@ class VOAAreaPlot: + vg_files = [1], + data_type = 1, + time_zone = 0, +- color_map = 'portland', ++ color_map = 'jet', + face_colour = "white", + filled_contours = False, + plot_contours = False, +@@ -145,8 +145,6 @@ class VOAAreaPlot: + # print "-180 < Latitude < 180.0, -90 < Longitude < 90" + # sys.exit(1) + +- portland = ListedColormap(["#0C3383", "#0b599b","#0a7fb4","#57a18f","#bec255","#f2c438","#f2a638","#ef8235","#e4502a","#d91e1e"]) +- plt.register_cmap(name='portland', cmap=portland) + colMap = color_map + + projection = ccrs.PlateCarree() +@@ -498,8 +496,8 @@ def main(in_file, datadir=None): + dest = "color_map", + default = 'jet', + choices = [ 'autumn', 'bone', 'cool', 'copper', 'gray', \ +- 'hot', 'hsv', 'jet', 'pink', 'spring','summer', 'winter', 'portland' ], +- help=_("COLOURMAP - may be one of 'autumn', 'bone', 'cool', 'copper', 'gray', 'hot', 'hsv', 'jet', 'pink', 'spring', 'summer', 'winter' or 'portland'. Default = 'jet'")) ++ 'hot', 'hsv', 'jet', 'pink', 'spring','summer', 'winter' ], ++ help=_("COLOURMAP - may be one of 'autumn', 'bone', 'cool', 'copper', 'gray', 'hot', 'hsv', 'jet', 'pink', 'spring', 'summer' or 'winter'. Default = 'jet'")) + """ + parser.add_argument("-n", "--interest", + dest = "poi_file", +diff --git a/src/pythonprop/voaAreaPlotgui.py b/src/pythonprop/voaAreaPlotgui.py +index c001397..9f75acc 100644 +--- a/src/pythonprop/voaAreaPlotgui.py ++++ b/src/pythonprop/voaAreaPlotgui.py +@@ -84,8 +84,7 @@ class VOAAreaPlotGUI: + 'pink': _('pink'), + 'spring': _('spring'), + 'summer': _('summer'), +- 'winter': _('winter'), +- 'portland': _('portland')} ++ 'winter': _('winter')} + + def __init__(self, + data_source_filename, +diff --git a/src/pythonprop/voaP2PPlot.py b/src/pythonprop/voaP2PPlot.py +index faf87e6..61fe9b9 100644 +--- a/src/pythonprop/voaP2PPlot.py ++++ b/src/pythonprop/voaP2PPlot.py +@@ -136,8 +136,6 @@ class VOAP2PPlot: + + self.image_defs = self.IMG_TYPE_DICT[self.data_type] + self.user_bands = user_bands +- portland = ListedColormap(["#0C3383", "#0b599b","#0a7fb4","#57a18f","#bec255","#f2c438","#f2a638","#ef8235","#e4502a","#d91e1e"]) +- matplotlib.cm.register_cmap(name='portland', cmap=portland) + + if plot_groups[0]=='a': + num_grp = self.df.get_number_of_groups() +@@ -375,8 +373,8 @@ def main(data_file, datadir=None): + dest="color_map", + default='jet', + choices = [ 'autumn', 'bone', 'cool', 'copper', 'gray', \ +- 'hot', 'hsv', 'jet', 'pink', 'spring','summer', 'winter', 'portland' ], +- help=_("COLOURMAP - may be one of 'autumn', 'bone', 'cool', 'copper', 'gray', 'hot', 'hsv', 'jet', 'pink', 'spring', 'summer', 'winter' or 'portland'. Default = 'jet'")) ++ 'hot', 'hsv', 'jet', 'pink', 'spring','summer', 'winter' ], ++ help=_("COLOURMAP - may be one of 'autumn', 'bone', 'cool', 'copper', 'gray', 'hot', 'hsv', 'jet', 'pink', 'spring', 'summer' or 'winter'. Default = 'jet'")) + + parser.add_argument("-o", "--outfile", + dest="save_file", +diff --git a/src/pythonprop/voaP2PPlotgui.py b/src/pythonprop/voaP2PPlotgui.py +index e1c120b..0aca557 100644 +--- a/src/pythonprop/voaP2PPlotgui.py ++++ b/src/pythonprop/voaP2PPlotgui.py +@@ -83,8 +83,7 @@ class VOAP2PPlotGUI: + 'pink': _('pink'), + 'spring': _('spring'), + 'summer': _('summer'), +- 'winter': _('winter'), +- 'portland': _('portland')} ++ 'winter': _('winter')} + + + def __init__(self, data_source_filename, parent = None, datadir=""): diff --git a/sci-visualization/pythonprop/metadata.xml b/sci-visualization/pythonprop/metadata.xml index e2d993b004b1..fbf434b3fa36 100644 --- a/sci-visualization/pythonprop/metadata.xml +++ b/sci-visualization/pythonprop/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>tomjbe@gentoo.org</email> @@ -10,6 +10,6 @@ <name>Gentoo Electronics Project</name> </maintainer> <upstream> - <remote-id type="sourceforge">pythonprop</remote-id> + <remote-id type="github">jawatson/pythonprop</remote-id> </upstream> </pkgmetadata> diff --git a/sci-visualization/pythonprop/pythonprop-0.30.1-r1.ebuild b/sci-visualization/pythonprop/pythonprop-0.30.1-r1.ebuild new file mode 100644 index 000000000000..0020e216326c --- /dev/null +++ b/sci-visualization/pythonprop/pythonprop-0.30.1-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) + +inherit autotools python-single-r1 + +DESCRIPTION="Scripts to prepare and plot VOACAP propagation predictions" +HOMEPAGE="https://www.qsl.net/h/hz1jw/pythonprop" +SRC_URI="https://github.com/jawatson/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] + ') + dev-python/cairocffi + sci-libs/cartopy[${PYTHON_SINGLE_USEDEP}] + sci-electronics/voacapl +" +DEPEND="${RDEPEND} + app-text/yelp-tools +" + +PATCHES=( "${FILESDIR}/${PN}-drop-portland.patch" ) + +src_prepare() { + eapply_user + + eapply ${PATCHES[@]} + + # drop building *.pdf files + sed -i -e "s#docs/user/help##g" Makefile.am || die + # do not call update_destop_database here + sed -ie "s/UPDATE_DESKTOP = /UPDATE_DESKTOP = # /g" data/Makefile.am || die + # fix Desktop Entry + sed -ie "s/HamRadio/HamRadio;/g" data/voacapgui.desktop.in || die + eautoreconf +} + +src_install() { + default + python_optimize +} diff --git a/sci-visualization/pythonprop/pythonprop-0.29.ebuild b/sci-visualization/pythonprop/pythonprop-0.30.1.ebuild index b0d9d7870471..0c2da111f5a2 100644 --- a/sci-visualization/pythonprop/pythonprop-0.29.ebuild +++ b/sci-visualization/pythonprop/pythonprop-0.30.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools python-single-r1 @@ -14,28 +14,30 @@ SRC_URI="https://github.com/jawatson/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" ${PYTHON_DEPS} $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] - dev-python/matplotlib[${PYTHON_MULTI_USEDEP}] - sci-libs/cartopy[${PYTHON_MULTI_USEDEP}] - sci-libs/scipy[${PYTHON_MULTI_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] ') dev-python/cairocffi + sci-libs/cartopy[${PYTHON_SINGLE_USEDEP}] sci-electronics/voacapl " DEPEND="${RDEPEND} - app-text/gnome-doc-utils - app-text/rarian + app-text/yelp-tools " +PATCHES=( "${FILESDIR}/${PN}-drop-portland.patch" ) + src_prepare() { eapply_user + eapply ${PATCHES[@]} + # drop building *.pdf files sed -i -e "s#docs/user/help##g" Makefile.am || die # do not call update_destop_database here diff --git a/sci-visualization/pyxplot/Manifest b/sci-visualization/pyxplot/Manifest deleted file mode 100644 index 033bcb95586b..000000000000 --- a/sci-visualization/pyxplot/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pyxplot_0.9.2.tar.gz 4131841 BLAKE2B 8a5da46f2328ae8e73d7b841dc04b8d972bdaeb7dacaf658349e5235a696334cd806b8f8bc25b9bbebe2074f52f4fb0bad4b22ff305250b1a4d138ea039657e5 SHA512 34c43fec36dd579161c7adb9f0bab012c5d3e59c904526f82a70a31685b88a231c300ab4dbdff376b29fdd5698c376d55f7a2f2786d7960c4de7e6e0776fa844 diff --git a/sci-visualization/pyxplot/metadata.xml b/sci-visualization/pyxplot/metadata.xml deleted file mode 100644 index ca88d83c110e..000000000000 --- a/sci-visualization/pyxplot/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?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-r3.ebuild b/sci-visualization/pyxplot/pyxplot-0.9.2-r3.ebuild deleted file mode 100644 index 7cc957e134be..000000000000 --- a/sci-visualization/pyxplot/pyxplot-0.9.2-r3.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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 - $(python_gen_cond_dep ' - || ( - sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}] - sci-libs/scipy[${PYTHON_MULTI_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/quickplot/Manifest b/sci-visualization/quickplot/Manifest index fc1b8c1e1c84..29730e1cad91 100644 --- a/sci-visualization/quickplot/Manifest +++ b/sci-visualization/quickplot/Manifest @@ -1,3 +1,2 @@ DIST quickplot-0.10.6.tar.xz 445172 BLAKE2B bcb2c694cc6a3777b7d88a5fbd6562d2612f76b0fabde67562ddba44708db0674336b72f5223aa6043524e9c6cb057e518b076086f2c05370bef6eb54b07e8bf SHA512 10b5277d8d0b8febc3c663256f3912bdd9d879b3038a5fdd3a7adc223419893ee56b825f04b5bee29883f30acb3b6a329d8e314b049fef26d6220192767d4adb -DIST quickplot-0.10.8.tar.bz2 531610 BLAKE2B 3092329b471b45c5a9c0387528ee65ac6c83ca3f21f2e4b7cd1b644a958c83eeb019e4da772a72343c45b478d1709b659372886c50b51623c5b756b4be6ba6d0 SHA512 e382206ba70849755e4110070a5e6b128bea4502ef623c59aa041ba84ed407e0ad06c62366b3bbcd71f8a76a3e651a04efab61edeb616ab6321c5680b03afa95 DIST quickplot-1.0.1rc.tar.gz 303055 BLAKE2B 52c8b60b0f79171358d81691f8824e39c1e3bafc1c084c3a52037e8cd1148e8bf68027ccc90593eca15fcbee0074d42ad7def1eb9d1f5c656b86e12adb6cfdcc SHA512 9cfaaafb7db379fb43b2975d588464288ac18eb21b3248fb02e5a30b0fa0950313a9818cfec23821046f9819d78255f02dff9970668a4b4ed8c4f452d6df3451 diff --git a/sci-visualization/quickplot/files/quickplot-1.0.1_rc-automake.patch b/sci-visualization/quickplot/files/quickplot-1.0.1_rc-automake.patch new file mode 100644 index 000000000000..e88259f0bd24 --- /dev/null +++ b/sci-visualization/quickplot/files/quickplot-1.0.1_rc-automake.patch @@ -0,0 +1,22 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -193,7 +193,7 @@ + endif + + # We look at a sndfile symbol when libquickplot runs +-libquickplot_la_LIBADD = $(sndfile_LIBS) ++libquickplot_la_LIBADD = $(sndfile_LIBS) -lm + + if QP_DEBUG + libquickplot_la_SOURCES += debug_spew.c +@@ -336,8 +336,8 @@ + if HAVE_LOCAL_SCREENSHOTS + + install-exec-hook: +- mkdir -p $(htmldir) +- cp ScreenShot_* _ScreenShot_* $(htmldir) ++ mkdir -p $(DESTDIR)$(htmldir) ++ cp ScreenShot_* _ScreenShot_* $(DESTDIR)$(htmldir) + + thumbs.htm: mk_thumbs.htm.bash + ./mk_thumbs.htm.bash > $@ diff --git a/sci-visualization/quickplot/metadata.xml b/sci-visualization/quickplot/metadata.xml index f2f18fe4b41c..5190c76ad566 100644 --- a/sci-visualization/quickplot/metadata.xml +++ b/sci-visualization/quickplot/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci@gentoo.org</email> diff --git a/sci-visualization/quickplot/quickplot-0.10.6.ebuild b/sci-visualization/quickplot/quickplot-0.10.6-r1.ebuild index b3e060ecccee..0fb21de2d5b2 100644 --- a/sci-visualization/quickplot/quickplot-0.10.6.ebuild +++ b/sci-visualization/quickplot/quickplot-0.10.6-r1.ebuild @@ -1,11 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -AUTOTOOLS_AUTORECONF=true - -inherit autotools-utils eutils +inherit autotools desktop DESCRIPTION="A fast interactive 2D plotter" HOMEPAGE="http://quickplot.sourceforge.net/" @@ -20,23 +18,26 @@ RDEPEND=" media-libs/libsndfile >=sys-libs/readline-0.6.2:0= x11-libs/gtk+:3" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { + default + sed '/libquickplot_la_LIBADD/s:$: -lm:g' -i Makefile.am || die - autotools-utils_src_prepare + + eautoreconf } src_configure() { - local myeconfargs=( - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - autotools-utils_src_configure + econf --disable-static } src_install() { - autotools-utils_src_install + default + + find "${ED}" -name '*.la' -delete || die + 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 deleted file mode 100644 index 64c6464035c6..000000000000 --- a/sci-visualization/quickplot/quickplot-0.10.8.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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 index 3b95c16cf526..3679f193db3d 100644 --- a/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild +++ b/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild @@ -1,49 +1,53 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools eutils +inherit autotools desktop MY_P=${P/_rc/rc} DESCRIPTION="A fast interactive 2D plotter" -HOMEPAGE="http://quickplot.sourceforge.net/ https://github.com/lanceman2/quickplot" +HOMEPAGE=" + http://quickplot.sourceforge.net/ + https://github.com/lanceman2/quickplot" SRC_URI="https://github.com/lanceman2/${PN}/archive/${MY_P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_P}" -SLOT="0" LICENSE="GPL-3" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" +SLOT="0" +KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" RDEPEND=" - media-libs/libsndfile + media-libs/libsndfile:= >=sys-libs/readline-0.6.2:0= x11-libs/gtk+:3" -DEPEND="${RDEPEND} - media-gfx/imagemagick +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/imagemagick-tools[png] virtual/pkgconfig - www-client/lynx" + www-client/lynx + dev-vcs/git" -S="${WORKDIR}/${PN}-${MY_P}" +PATCHES=( "${FILESDIR}"/${P}-automake.patch ) 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) + --disable-static \ + --enable-developer } src_install() { default + make_desktop_entry 'quickplot --no-pipe' Quickplot quickplot Graphics - mv "${ED%/}"/usr/share/applications/quickplot{*,}.desktop || die + mv "${ED}"/usr/share/applications/quickplot{*,}.desktop || die + + # no static archives + find "${ED}" -name '*.la' -delete || die } diff --git a/sci-visualization/scidavis/Manifest b/sci-visualization/scidavis/Manifest new file mode 100644 index 000000000000..7cc12ce69cc0 --- /dev/null +++ b/sci-visualization/scidavis/Manifest @@ -0,0 +1 @@ +DIST scidavis-2.9.0.tar.gz 9348738 BLAKE2B 70af736e0cbe62ffc4b8cc828fffe819b91245f01fa1dc089d1a225ba943495b947562aac84829b8b92664ffbe6e31ecc8f6d9b685adb144c4b21e619739c00e SHA512 3058b11e7864a646c31e5576ac4ebb3e30bcc08f382ee1798183935482236890bbd1090c8e2272c28b54e2498a42dfed801f17fc4c0aca83264ab76f4a7fb7ba diff --git a/sci-visualization/scidavis/metadata.xml b/sci-visualization/scidavis/metadata.xml new file mode 100644 index 000000000000..8954aa4356f9 --- /dev/null +++ b/sci-visualization/scidavis/metadata.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>sci@gentoo.org</email> + <name>Gentoo Science Project</name> + </maintainer> + <longdescription lang="en"> + SciDAVis is a user-friendly data analysis and visualization program primarily aimed at high-quality plotting of scientific data. + It strives to combine an intuitive, easy-to-use graphical user interface with powerful features such as Python scriptability. + </longdescription> + <use> + <flag name="origin">Add support for reading OriginLab OPJ project files through <pkg>sci-libs/liborigin</pkg>.</flag> + <flag name="python">Build support for python scripting.</flag> + </use> + <upstream> + <remote-id type="sourceforge">scidavis</remote-id> + <remote-id type="github">SciDAVis/scidavis</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-visualization/scidavis/scidavis-2.9.0-r1.ebuild b/sci-visualization/scidavis/scidavis-2.9.0-r1.ebuild new file mode 100644 index 000000000000..d57c2b132cbf --- /dev/null +++ b/sci-visualization/scidavis/scidavis-2.9.0-r1.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" +DOCS_DEPEND="media-gfx/graphviz" + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit python-single-r1 cmake docs virtualx xdg + +DESCRIPTION="Application for Scientific Data Analysis and Visualization" +HOMEPAGE="https://scidavis.sourceforge.net/ https://github.com/SciDAVis/scidavis/" +SRC_URI="https://github.com/SciDAVis/scidavis/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+ ZLIB" +KEYWORDS="~amd64" +SLOT="0" + +IUSE="doc origin python test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +# requires network +RESTRICT="test" +PROPERTIES="test_network" + +RDEPEND=" + dev-cpp/muParser + 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/gsl:= + >=sys-libs/zlib-1.3[minizip] + x11-libs/qwt:5 + x11-libs/qwtplot3d + origin? ( sci-libs/liborigin ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + >=dev-python/PyQt5-5.15.6[${PYTHON_USEDEP}] + dev-python/PyQt5-sip[${PYTHON_USEDEP}] + >=dev-python/sip-6:5[${PYTHON_USEDEP}] + ') + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-qt/linguist-tools:5 + test? ( + dev-libs/unittest++ + dev-cpp/gtest + ) +" + +src_prepare() { + cmake_src_prepare + + # Remove things which are packaged elsewhere + rm -r 3rdparty/qwt5-qt5 3rdparty/qwtplot3d 3rdparty/liborigin || die +} + +src_configure() { + local mycmakeargs=( + # Even if we disable muparser scripting, we still need MuParser.h + # for Graph3D.cpp. So just enable it unconditionally. Bug 834074 + -DSCRIPTING_MUPARSER=ON + -DORIGIN_IMPORT=$(usex origin) + -DSCRIPTING_PYTHON=$(usex python) + -DBUILD_TESTS=$(usex test) + ) + + if use python; then + mycmakeargs+=( + -DPYTHON_SCRIPTDIR="$(python_get_scriptdir)" + ) + fi + cmake_src_configure +} + +src_compile() { + cmake_src_compile + docs_compile +} + +src_test() { + virtx cmake_src_test +} diff --git a/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch b/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch index 619aaecf7a89..ea1fa0a70eec 100644 --- a/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch +++ b/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch @@ -8,7 +8,7 @@ Fix install paths -CFLAGS = -O2 -Wall -LIBS = -lgsl -lgslcblas -lpng -lm -+LIBS = -lpng `pkg-config --libs gsl` ++LIBS = -lpng `${PKG_CONFIG} --libs gsl` DESTDIR = -TOPLEVEL_HOME = /usr +TOPLEVEL_HOME ?= /usr diff --git a/sci-visualization/spectromatic/metadata.xml b/sci-visualization/spectromatic/metadata.xml index abcd7bb71213..42e957230fc5 100644 --- a/sci-visualization/spectromatic/metadata.xml +++ b/sci-visualization/spectromatic/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci@gentoo.org</email> @@ -15,5 +15,5 @@ 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> + </longdescription> </pkgmetadata> diff --git a/sci-visualization/spectromatic/spectromatic-1.0-r3.ebuild b/sci-visualization/spectromatic/spectromatic-1.0-r3.ebuild index d7bd8aaf7c93..b9337658357c 100644 --- a/sci-visualization/spectromatic/spectromatic-1.0-r3.ebuild +++ b/sci-visualization/spectromatic/spectromatic-1.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,7 +14,6 @@ SRC_URI="http://ieee.uow.edu.au/~daniel/software/spectromatic/dist/${MY_P}.tar.g LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="" RDEPEND=" media-libs/libpng:0= @@ -29,6 +28,6 @@ PATCHES=( ) src_configure() { - tc-export CC + tc-export CC PKG_CONFIG export TOPLEVEL_HOME="${EPREFIX}/usr" } diff --git a/sci-visualization/spyview/metadata.xml b/sci-visualization/spyview/metadata.xml index bf93f4da9f0e..f6eef383d8f6 100644 --- a/sci-visualization/spyview/metadata.xml +++ b/sci-visualization/spyview/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>dilfridge@gentoo.org</email> diff --git a/sci-visualization/spyview/spyview-2018.12.24.ebuild b/sci-visualization/spyview/spyview-2018.12.24.ebuild index 80d0f7cecd27..887b1f8e05b1 100644 --- a/sci-visualization/spyview/spyview-2018.12.24.ebuild +++ b/sci-visualization/spyview/spyview-2018.12.24.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ SLOT="0" IUSE="" COMMON_DEPEND=" - >=dev-libs/boost-1.62.0:= + dev-libs/boost:= media-libs/netpbm x11-libs/fltk:1[opengl] app-text/ghostscript-gpl diff --git a/sci-visualization/spyview/spyview-9999.ebuild b/sci-visualization/spyview/spyview-9999.ebuild index d43c86369ebe..e5448ad183e5 100644 --- a/sci-visualization/spyview/spyview-9999.ebuild +++ b/sci-visualization/spyview/spyview-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ SLOT="0" IUSE="" COMMON_DEPEND=" - >=dev-libs/boost-1.62.0:= + dev-libs/boost:= media-libs/netpbm x11-libs/fltk:1[opengl] app-text/ghostscript-gpl diff --git a/sci-visualization/tensorboard/Manifest b/sci-visualization/tensorboard/Manifest deleted file mode 100644 index c86800261677..000000000000 --- a/sci-visualization/tensorboard/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST tensorboard-1.15.0.zip 3765194 BLAKE2B 54a9987b65d4e2b127789f0e66eb5bdef8c024d19a82867632b44eefc4718bc6eb6c68fa61fdb2306af2c3adbacc3c75ec15f7aa331038b15cec27af2d846f85 SHA512 7b47d60929b4be91b4d56e36fc5a19b79511b8f3a1081fe308d3a107f978f2c5d23ad2d209104de983bc44f4506cdb0cb6e09b37e552dc042600ea16e14827dc -DIST tensorboard-2.0.0.zip 3776140 BLAKE2B 2bfd5b9d5b1c21f7df19ce5dae8a3d72381092630d1f53409fa0b96cab56be323ddef116bab95184d045f82fec88f4162e1f7277b25ed9c19b77189cf1a132ba SHA512 e87ea39eae9b64c3314de771de98c21148517aee4103a4bc23d674273b1a220248d6ba85a9f94481c6d67e8d3733af099b91df3dae38537411082c1595aad73d -DIST tensorboard-2.1.0.zip 3835182 BLAKE2B c2c7dbc1ba4b85c52df6e693e1bd425bd76fe6db7ca25582b57d9c65c68b191dcdba2623ab0560139f1cac1bdf5c7a47261daaaf51fca46f2c5bf441f832a6fd SHA512 7463ace0863b90312a62a7fa96f4eca0147e85cf46ff21729f8996a794d54e14d876d3abe083d6aa4efd8e4e1582f7d5029de367f199981a34d4057b558bc51c -DIST tensorboard-2.2.1.zip 2950617 BLAKE2B 487ad01981f994b23cb5fca8b60d9ed5f13ba13735d2613d1f3154eec9791b4b3068fb9fd50e75e16682e09ceb8a9ed8533ca2c43b6dea73db3adaeef15a889b SHA512 e96f8853d282dc19911cf2210ece0a4d7239f37dcba82e91697c80881fbcc21f12e4ba3e7d2eea7a84c9bb5b6521bf488d93d2312e55af9ec2d2c20f135d94fa diff --git a/sci-visualization/tensorboard/metadata.xml b/sci-visualization/tensorboard/metadata.xml deleted file mode 100644 index d1f23aa30fbd..000000000000 --- a/sci-visualization/tensorboard/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>perfinion@gentoo.org</email> - <name>Jason Zaman</name> - </maintainer> - <longdescription lang="en"> - TensorBoard is a suite of web applications for inspecting and understanding your TensorFlow runs and graphs. - </longdescription> - <upstream> - <remote-id type="github">tensorflow/tensorboard</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-visualization/tensorboard/tensorboard-1.15.0.ebuild b/sci-visualization/tensorboard/tensorboard-1.15.0.ebuild deleted file mode 100644 index 4bf4063d7d7c..000000000000 --- a/sci-visualization/tensorboard/tensorboard-1.15.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) -inherit python-r1 - -DESCRIPTION="TensorFlow's Visualization Toolkit" -HOMEPAGE="https://www.tensorflow.org/" -SRC_URI="https://files.pythonhosted.org/packages/py3/${PN::1}/${PN}/${P}-py3-none-any.whl -> ${P}.zip" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -RDEPEND=" - ${PYTHON_DEPS} - dev-python/bleach[${PYTHON_USEDEP}] - dev-python/grpcio[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/markdown[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=dev-python/setuptools-41[${PYTHON_USEDEP}] - dev-python/werkzeug[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}]" -BDEPEND="app-arch/unzip - ${PYTHON_DEPS}" -PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]" - -S="${WORKDIR}" - -src_prepare() { - eapply_user - - rm -rf "${S}/${PN}/_vendor/bleach" || die - rm -rf "${S}/${PN}/_vendor/html5lib" || die - sed -i -e '/_vendor.bleach/d' -e '/_vendor.html5lib/d' "${S}/${P}.dist-info/RECORD" || die "failed to unvendor" - - find "${S}/${PN}" -name '*.py' -exec sed -i \ - -e 's/^from tensorboard\._vendor import html5lib/import html5lib/' \ - -e 's/^from tensorboard\._vendor import bleach/import bleach/' \ - -e 's/^from tensorboard\._vendor\.html5lib/from html5lib/' \ - -e 's/^from tensorboard\._vendor\.bleach/from bleach/' \ - {} + || die "failed to unvendor" -} - -src_install() { - do_install() { - python_domodule "${PN}" - python_domodule "${P}.dist-info" - } - python_foreach_impl do_install -} diff --git a/sci-visualization/tensorboard/tensorboard-2.0.0.ebuild b/sci-visualization/tensorboard/tensorboard-2.0.0.ebuild deleted file mode 100644 index 4bf4063d7d7c..000000000000 --- a/sci-visualization/tensorboard/tensorboard-2.0.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) -inherit python-r1 - -DESCRIPTION="TensorFlow's Visualization Toolkit" -HOMEPAGE="https://www.tensorflow.org/" -SRC_URI="https://files.pythonhosted.org/packages/py3/${PN::1}/${PN}/${P}-py3-none-any.whl -> ${P}.zip" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -RDEPEND=" - ${PYTHON_DEPS} - dev-python/bleach[${PYTHON_USEDEP}] - dev-python/grpcio[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/markdown[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=dev-python/setuptools-41[${PYTHON_USEDEP}] - dev-python/werkzeug[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}]" -BDEPEND="app-arch/unzip - ${PYTHON_DEPS}" -PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]" - -S="${WORKDIR}" - -src_prepare() { - eapply_user - - rm -rf "${S}/${PN}/_vendor/bleach" || die - rm -rf "${S}/${PN}/_vendor/html5lib" || die - sed -i -e '/_vendor.bleach/d' -e '/_vendor.html5lib/d' "${S}/${P}.dist-info/RECORD" || die "failed to unvendor" - - find "${S}/${PN}" -name '*.py' -exec sed -i \ - -e 's/^from tensorboard\._vendor import html5lib/import html5lib/' \ - -e 's/^from tensorboard\._vendor import bleach/import bleach/' \ - -e 's/^from tensorboard\._vendor\.html5lib/from html5lib/' \ - -e 's/^from tensorboard\._vendor\.bleach/from bleach/' \ - {} + || die "failed to unvendor" -} - -src_install() { - do_install() { - python_domodule "${PN}" - python_domodule "${P}.dist-info" - } - python_foreach_impl do_install -} diff --git a/sci-visualization/tensorboard/tensorboard-2.1.0-r1.ebuild b/sci-visualization/tensorboard/tensorboard-2.1.0-r1.ebuild deleted file mode 100644 index 4b8819557ebe..000000000000 --- a/sci-visualization/tensorboard/tensorboard-2.1.0-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) -inherit python-r1 - -DESCRIPTION="TensorFlow's Visualization Toolkit" -HOMEPAGE="https://www.tensorflow.org/" -SRC_URI="https://files.pythonhosted.org/packages/py3/${PN::1}/${PN}/${P}-py3-none-any.whl -> ${P}.zip" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -RDEPEND=" - ${PYTHON_DEPS} - dev-python/bleach[${PYTHON_USEDEP}] - >=dev-python/google-auth-1.6.3[${PYTHON_USEDEP}] - >=dev-python/google-auth-oauthlib-0.4.1[${PYTHON_USEDEP}] - dev-python/grpcio[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/markdown[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=dev-python/setuptools-41[${PYTHON_USEDEP}] - dev-python/werkzeug[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - >=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]" -BDEPEND="app-arch/unzip - ${PYTHON_DEPS}" -PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]" - -S="${WORKDIR}" - -src_prepare() { - eapply_user - - rm -rf "${S}/${PN}/_vendor/bleach" || die - rm -rf "${S}/${PN}/_vendor/html5lib" || die - sed -i -e '/_vendor.bleach/d' -e '/_vendor.html5lib/d' "${S}/${P}.dist-info/RECORD" || die "failed to unvendor" - - find "${S}/${PN}" -name '*.py' -exec sed -i \ - -e 's/^from tensorboard\._vendor import html5lib/import html5lib/' \ - -e 's/^from tensorboard\._vendor import bleach/import bleach/' \ - -e 's/^from tensorboard\._vendor\.html5lib/from html5lib/' \ - -e 's/^from tensorboard\._vendor\.bleach/from bleach/' \ - {} + || die "failed to unvendor" -} - -src_install() { - do_install() { - python_domodule "${PN}" - python_domodule "${P}.dist-info" - } - python_foreach_impl do_install -} diff --git a/sci-visualization/tensorboard/tensorboard-2.2.1.ebuild b/sci-visualization/tensorboard/tensorboard-2.2.1.ebuild deleted file mode 100644 index 08bb80b2417a..000000000000 --- a/sci-visualization/tensorboard/tensorboard-2.2.1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) -inherit python-r1 - -DESCRIPTION="TensorFlow's Visualization Toolkit" -HOMEPAGE="https://www.tensorflow.org/" -SRC_URI="https://files.pythonhosted.org/packages/py3/${PN::1}/${PN}/${P}-py3-none-any.whl -> ${P}.zip" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -RDEPEND=" - ${PYTHON_DEPS} - dev-python/bleach[${PYTHON_USEDEP}] - >=dev-python/google-auth-1.6.3[${PYTHON_USEDEP}] - >=dev-python/google-auth-oauthlib-0.4.1[${PYTHON_USEDEP}] - dev-python/grpcio[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/markdown[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=dev-python/setuptools-41[${PYTHON_USEDEP}] - dev-python/werkzeug[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - >=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]" -BDEPEND="app-arch/unzip - ${PYTHON_DEPS}" -PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]" - -S="${WORKDIR}" - -src_prepare() { - eapply_user - - rm -rf "${S}/${PN}/_vendor/bleach" || die - rm -rf "${S}/${PN}/_vendor/html5lib" || die - sed -i -e '/_vendor.bleach/d' -e '/_vendor.html5lib/d' "${S}/${P}.dist-info/RECORD" || die "failed to unvendor" - - find "${S}/${PN}" -name '*.py' -exec sed -i \ - -e 's/^from tensorboard\._vendor import html5lib/import html5lib/' \ - -e 's/^from tensorboard\._vendor import bleach/import bleach/' \ - -e 's/^from tensorboard\._vendor\.html5lib/from html5lib/' \ - -e 's/^from tensorboard\._vendor\.bleach/from bleach/' \ - {} + || die "failed to unvendor" - - sed -i -e '/tensorboard-plugin-/d' "${S}/${P}.dist-info/METADATA" || die "failed to remove plugin deps" -} - -src_install() { - do_install() { - python_domodule "${PN}" - python_domodule "${P}.dist-info" - } - python_foreach_impl do_install -} diff --git a/sci-visualization/veusz/Manifest b/sci-visualization/veusz/Manifest index 53a95b40568f..1c3973558f27 100644 --- a/sci-visualization/veusz/Manifest +++ b/sci-visualization/veusz/Manifest @@ -1,2 +1 @@ -DIST veusz-3.1.tar.gz 2524607 BLAKE2B ca5c5a75e02c9461e1d81dc4d2cc09865ebd4424f072616bf0a231a1f592a5c1c5aad93f713ed9ec1d9e2ad39b877a36c236b615d904295608d7990eaf59d5fb SHA512 9b940d1cc224f4729f788abe1e29352d35e69d2f78bae7f072a783d339198a8171b0f0b0a5f5af82ef0f0693550a42409956a9cc3888aa46d110d777e81941a4 -DIST veusz-3.2.tar.gz 2528125 BLAKE2B 614488779d1c0e5d800f2b1c86b82615676b08af46831abd6c55653471b045f0c9d28a8cb7489cbb2391fd5f21ab2d40aa6bff4fc195426f3b07b91f6d4ee8d7 SHA512 01e1a030246a3d6811493968f2f30084b2c465195af166b7bdc4009de4c488350a4fba300acee1959310b318e8dc519f090bfca528491811ca52640c33d048bc +DIST veusz-3.6.2.tar.gz 3330225 BLAKE2B dacadb7f4a4059cab02c07d2af4e53ba3b5714593233ff2995083237416e26425723950603dc542ac58cc355aaf6106c3fd4065efddb9cc7884757e440d3efa2 SHA512 5580171c0259415cf3de11322133fde02e244b65ffede1e83b5e6d17c8a037624860550495dc0b53c7b5e2f65b3ae6b95daa0e95f7164358e1201ffedeb13f51 diff --git a/sci-visualization/veusz/metadata.xml b/sci-visualization/veusz/metadata.xml index 8ac6168821f3..a085490219be 100644 --- a/sci-visualization/veusz/metadata.xml +++ b/sci-visualization/veusz/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci@gentoo.org</email> @@ -10,11 +10,9 @@ 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="minuit">Use Minuit during fitting via<pkg>dev-python/pyminuit</pkg></flag> - </use> + </longdescription> <upstream> <remote-id type="pypi">veusz</remote-id> + <remote-id type="github">veusz/veusz</remote-id> </upstream> </pkgmetadata> diff --git a/sci-visualization/veusz/veusz-3.2.ebuild b/sci-visualization/veusz/veusz-3.6.2-r1.ebuild index 1be659e776eb..7d00d0397b86 100644 --- a/sci-visualization/veusz/veusz-3.2.ebuild +++ b/sci-visualization/veusz/veusz-3.6.2-r1.ebuild @@ -1,40 +1,46 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit desktop distutils-r1 virtualx xdg +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_USE_PEP517=setuptools +inherit desktop distutils-r1 qmake-utils virtualx xdg DESCRIPTION="Qt scientific plotting package with good Postscript output" HOMEPAGE="https://veusz.github.io/" SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz" -SLOT="0" LICENSE="GPL-2" +SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dbus doc hdf5 minuit" -RESTRICT="!test? ( test )" +IUSE="dbus hdf5" -CDEPEND="dev-python/PyQt5[widgets,svg,printsupport,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}]" -RDEPEND="${CDEPEND} +COMMON_DEPEND=" + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/PyQt5[widgets,svg,printsupport,${PYTHON_USEDEP}] +" +RDEPEND="${COMMON_DEPEND} dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] ) - minuit? ( dev-python/iminuit[${PYTHON_USEDEP}] )" -DEPEND="${CDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/sip[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" +" +DEPEND="${COMMON_DEPEND} + dev-python/sip:5[${PYTHON_USEDEP}] +" + +distutils_enable_sphinx Documents/manual-source \ + dev-python/alabaster src_prepare() { distutils-r1_src_prepare xdg_environment_reset } +python_compile() { + distutils-r1_python_compile build_ext --qmake-exe=$(qt5_get_bindir)/qmake +} + python_test() { - distutils_install_for_testing VIRTUALX_COMMAND="${EPYTHON}" \ VEUSZ_RESOURCE_DIR="${S}" \ virtx tests/runselftest.py @@ -57,12 +63,6 @@ python_install() { python_install_all() { distutils-r1_python_install_all - if use doc; then - dodoc Documents/manual/pdf/${PN}.pdf - docinto html - dodoc -r Documents/manual/html - fi - doicon icons/veusz.png domenu "${FILESDIR}"/veusz.desktop insinto /usr/share/mime/packages diff --git a/sci-visualization/veusz/veusz-3.1.ebuild b/sci-visualization/veusz/veusz-3.6.2.ebuild index 112eefc77ad4..d7aff55dc407 100644 --- a/sci-visualization/veusz/veusz-3.1.ebuild +++ b/sci-visualization/veusz/veusz-3.6.2.ebuild @@ -1,40 +1,46 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_6 ) - -inherit desktop distutils-r1 virtualx xdg +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools +inherit desktop distutils-r1 qmake-utils virtualx xdg DESCRIPTION="Qt scientific plotting package with good Postscript output" HOMEPAGE="https://veusz.github.io/" SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz" -SLOT="0" LICENSE="GPL-2" +SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dbus doc hdf5 minuit" -RESTRICT="!test? ( test )" +IUSE="dbus hdf5" -CDEPEND="dev-python/PyQt5[widgets,svg,printsupport,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}]" -RDEPEND="${CDEPEND} +COMMON_DEPEND=" + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/PyQt5[widgets,svg,printsupport,${PYTHON_USEDEP}] +" +RDEPEND="${COMMON_DEPEND} dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] ) - minuit? ( || ( dev-python/iminuit[${PYTHON_USEDEP}] dev-python/pyminuit[${PYTHON_USEDEP}] ) )" -DEPEND="${CDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/sip[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" +" +DEPEND="${COMMON_DEPEND} + dev-python/sip:5[${PYTHON_USEDEP}] +" + +distutils_enable_sphinx Documents/manual-source \ + dev-python/alabaster src_prepare() { distutils-r1_src_prepare xdg_environment_reset } +python_compile() { + distutils-r1_python_compile build_ext --qmake-exe=$(qt5_get_bindir)/qmake +} + python_test() { - distutils_install_for_testing VIRTUALX_COMMAND="${EPYTHON}" \ VEUSZ_RESOURCE_DIR="${S}" \ virtx tests/runselftest.py @@ -57,12 +63,6 @@ python_install() { python_install_all() { distutils-r1_python_install_all - if use doc; then - dodoc Documents/manual/pdf/${PN}.pdf - docinto html - dodoc -r Documents/manual/html - fi - doicon icons/veusz.png domenu "${FILESDIR}"/veusz.desktop insinto /usr/share/mime/packages diff --git a/sci-visualization/xd3d/files/xd3d-8.3.1-gentoo.diff b/sci-visualization/xd3d/files/xd3d-8.3.1-r1-gentoo.patch index 271fd0b8bd58..bca0beca64e6 100644 --- a/sci-visualization/xd3d/files/xd3d-8.3.1-gentoo.diff +++ b/sci-visualization/xd3d/files/xd3d-8.3.1-r1-gentoo.patch @@ -51,8 +51,8 @@ diff -Naur RULES.gentoo RULES.gentoo +# C compiler +# +COMPILC = $(CC) -+RANLIB = ranlib -+AR = ar r ++RANLIB = $(MY_RANLIB) ++AR = $(MY_AR) r +STRIP = echo $@ + +# diff --git a/sci-visualization/xd3d/metadata.xml b/sci-visualization/xd3d/metadata.xml index 3aa6d3eb7819..d7f800042472 100644 --- a/sci-visualization/xd3d/metadata.xml +++ b/sci-visualization/xd3d/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci@gentoo.org</email> diff --git a/sci-visualization/xd3d/xd3d-8.3.1-r1.ebuild b/sci-visualization/xd3d/xd3d-8.3.1-r2.ebuild index b79e8599c1d3..bd416d2b14ed 100644 --- a/sci-visualization/xd3d/xd3d-8.3.1-r1.ebuild +++ b/sci-visualization/xd3d/xd3d-8.3.1-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit fortran-2 toolchain-funcs +inherit edo fortran-2 flag-o-matic toolchain-funcs DESCRIPTION="Scientific visualization tool" HOMEPAGE="http://www.cmap.polytechnique.fr/~jouve/xd3d/" @@ -14,13 +14,12 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples" -RDEPEND=" - x11-libs/libXpm" -DEPEND="${RDEPEND} - app-shells/tcsh" +RDEPEND="x11-libs/libXpm" +DEPEND="${RDEPEND}" +BDEPEND="app-shells/tcsh" PATCHES=( - "${FILESDIR}"/${P}-gentoo.diff + "${FILESDIR}"/${P}-r1-gentoo.patch "${FILESDIR}"/${P}-parallel.patch "${FILESDIR}"/${P}-rotated.patch "${FILESDIR}"/${P}-cflags.patch @@ -28,27 +27,35 @@ PATCHES=( 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" + + sed -i -e 's:"zutil.h":<zlib.h>:g' src/qlib/timestuff.c || die + sed -i -e "s:##lib##:$(get_libdir):" RULES.gentoo || die "failed to set up RULES.gentoo" } src_configure() { tc-export CC - ./configure -arch=gentoo || die "configure failed." + + export MY_AR="$(tc-getAR)" + export MY_RANLIB="$(tc-getRANLIB)" + + # bug #863368 + append-flags -fno-strict-aliasing + filter-lto + + # GCC 10 workaround + # bug #722426 + append-fflags $(test-flags-FC -fallow-argument-mismatch) + + edo ./configure -arch=gentoo } src_install() { dodir /usr/bin - default + emake INSTALL_DIR="${ED}/usr/bin" install dodoc FORMATS use doc && dodoc -r Manuals + if use examples; then mv {E,e}xamples || die dodoc -r examples diff --git a/sci-visualization/xgraph/metadata.xml b/sci-visualization/xgraph/metadata.xml index ed93e12b7321..6ce23eabaf70 100644 --- a/sci-visualization/xgraph/metadata.xml +++ b/sci-visualization/xgraph/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci@gentoo.org</email> diff --git a/sci-visualization/xgraph/xgraph-12.1-r4.ebuild b/sci-visualization/xgraph/xgraph-12.1-r5.ebuild index 61f36811879b..9fbcd83e6526 100644 --- a/sci-visualization/xgraph/xgraph-12.1-r4.ebuild +++ b/sci-visualization/xgraph/xgraph-12.1-r5.ebuild @@ -1,24 +1,25 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 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 +HOMEPAGE="https://www.isi.edu/nsnam/xgraph/" +SRC_URI="https://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" +KEYWORDS="~amd64 ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="examples" + RDEPEND="x11-libs/libSM x11-libs/libX11" -DEPEND="$RDEPEND" +DEPEND="${RDEPEND}" PATCHES=( "${WORKDIR}"/debian/patches/debian-changes ) @@ -36,7 +37,8 @@ src_install() { 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 + + 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/metadata.xml b/sci-visualization/xyscan/metadata.xml index e256ba64de3a..400becd7d379 100644 --- a/sci-visualization/xyscan/metadata.xml +++ b/sci-visualization/xyscan/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci@gentoo.org</email> diff --git a/sci-visualization/yt/Manifest b/sci-visualization/yt/Manifest deleted file mode 100644 index 9391d60a9cf0..000000000000 --- a/sci-visualization/yt/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST yt-3.3.5.tar.gz 8913208 BLAKE2B 34ed3d9fe0109d42ed09456c057447500846936247d08c3e1c8a809e1e9af99c92951bf8fb2baf0baeef3902256399b8077112b4538d5bc2972efc101ddec269 SHA512 1741ce038fc52d446a4fb9d4aab0c9af601cf5ce244979590fc218f54ae9ff2801c5d15ae039c8b51b2a56541646601243c7e3665e3339cb9150b03d869069de -DIST yt-3.4.0.tar.gz 9989933 BLAKE2B 77e6b05f57dcb65c4893b19fc6aa52f1b25657f3b15a08b4f649fa019610f9e749534b204df1163cbad01d3cd16fec8c53277fb9480fa4f120f25076e4ad4ae1 SHA512 762a87bb01edd2c051baec671b07f5977f6842716f7ee0607a87e4f452bb0765cfa0eb7f9eb3509176d78cead23b5f0e5be08cc63a9687732b50498be4dca82e diff --git a/sci-visualization/yt/metadata.xml b/sci-visualization/yt/metadata.xml deleted file mode 100644 index 5b85b9893255..000000000000 --- a/sci-visualization/yt/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?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 deleted file mode 100644 index c8ae43e80214..000000000000 --- a/sci-visualization/yt/yt-3.3.5.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 flag-o-matic - -DESCRIPTION="Astrophysical Simulation Analysis and Vizualization package" -HOMEPAGE="https://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" -RESTRICT="!test? ( 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 deleted file mode 100644 index fd01aa40a1c6..000000000000 --- a/sci-visualization/yt/yt-3.4.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 flag-o-matic - -DESCRIPTION="Astrophysical Simulation Analysis and Vizualization package" -HOMEPAGE="https://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" -RESTRICT="!test? ( 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/metadata.xml b/sci-visualization/zhu3d/metadata.xml index e112f3bfca7b..9cebad4f3859 100644 --- a/sci-visualization/zhu3d/metadata.xml +++ b/sci-visualization/zhu3d/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci-mathematics@gentoo.org</email> |