diff options
Diffstat (limited to 'sci-visualization')
38 files changed, 965 insertions, 884 deletions
diff --git a/sci-visualization/fityk/Manifest b/sci-visualization/fityk/Manifest index efa698d3312a..0b4a1c695591 100644 --- a/sci-visualization/fityk/Manifest +++ b/sci-visualization/fityk/Manifest @@ -1,2 +1 @@ -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 deleted file mode 100644 index 7b64f7f582fa..000000000000 --- a/sci-visualization/fityk/files/fityk-1.3.1-fix-gtk3.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index cec78adbde05..000000000000 --- a/sci-visualization/fityk/fityk-1.3.1-r102.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# 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/gle/gle-4.3.4-r1.ebuild b/sci-visualization/gle/gle-4.3.4-r1.ebuild index 38c0f6b7b18f..61ded592c798 100644 --- a/sci-visualization/gle/gle-4.3.4-r1.ebuild +++ b/sci-visualization/gle/gle-4.3.4-r1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake elisp-common +inherit cmake elisp-common flag-o-matic DESCRIPTION="Graphics Layout Engine" -HOMEPAGE="http://glx.sourceforge.io/ https://github.com/vlabella/GLE/" +HOMEPAGE="https://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 @@ -43,6 +43,11 @@ PATCHES=( "${FILESDIR}"/license.patch "${FILESDIR}"/tiff.patch ) SITEFILE="64${PN}-gentoo.el" src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/927779 + # https://github.com/vlabella/GLE/issues/35 + filter-lto + local mycmakeargs=( -DGLE_EXAMPLES_LIBRARY_PATH="${WORKDIR}"/gle-library-${LIB_VERSION} ) diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest index 4bbc33f47f32..f1bb6a6f42f6 100644 --- a/sci-visualization/gnuplot/Manifest +++ b/sci-visualization/gnuplot/Manifest @@ -1,3 +1,3 @@ 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 +DIST gnuplot-6.0.1.tar.gz 7528936 BLAKE2B d385d4dc8a4af83f121bd062e014d8845078f5aeb84244f4cce7c17b7cf71c5fc66bd7b8623504ab53567b4123fc739506f7d2f8e4f8ad184258a7568f0223a2 SHA512 47e72ac444f35e22a5de111da3333c80846226d87411a3168e45a8433a258e351ad9b6f0ba21d76f2456042b755123a697b685fd2552b4bd9edc5b97fafcbc62 diff --git a/sci-visualization/gnuplot/files/gnuplot-6.0.1-watchpoints.patch b/sci-visualization/gnuplot/files/gnuplot-6.0.1-watchpoints.patch new file mode 100644 index 000000000000..699585853919 --- /dev/null +++ b/sci-visualization/gnuplot/files/gnuplot-6.0.1-watchpoints.patch @@ -0,0 +1,17 @@ +https://sourceforge.net/p/gnuplot/bugs/2727/ + +--- a/demo/watchpoints.dem ++++ b/demo/watchpoints.dem +@@ -67,6 +67,12 @@ + pause -1 "<cr> to continue" + + reset ++ ++if (!strstrt(GPVAL_COMPILE_OPTIONS, "+LIBCERF")) { ++ print "This copy of gnuplot does not support FresnelC, FresnelS" ++ exit; ++} ++ + unset key + set title "Find y intercepts of a parametric function" offset 0,-1 + set xrange [-0.1 : 0.9] diff --git a/sci-visualization/gnuplot/gnuplot-5.4.10.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.10.ebuild index d09ffadae337..7d12858f2eb6 100644 --- a/sci-visualization/gnuplot/gnuplot-5.4.10.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.4.10.ebuild @@ -20,7 +20,7 @@ if [[ -z ${PV%%*9999} ]]; then else MY_P="${P/_/.}" SRC_URI="https://downloads.sourceforge.net/gnuplot/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/${MY_P}" diff --git a/sci-visualization/gnuplot/gnuplot-5.4.8.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.8.ebuild index d09ffadae337..7d12858f2eb6 100644 --- a/sci-visualization/gnuplot/gnuplot-5.4.8.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.4.8.ebuild @@ -20,7 +20,7 @@ if [[ -z ${PV%%*9999} ]]; then else MY_P="${P/_/.}" SRC_URI="https://downloads.sourceforge.net/gnuplot/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/${MY_P}" diff --git a/sci-visualization/gnuplot/gnuplot-6.0.1-r1.ebuild b/sci-visualization/gnuplot/gnuplot-6.0.1-r1.ebuild new file mode 100644 index 000000000000..8be4751e4190 --- /dev/null +++ b/sci-visualization/gnuplot/gnuplot-6.0.1-r1.ebuild @@ -0,0 +1,225 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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/" + +if [[ -z ${PV%%*9999} ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main" + EGIT_BRANCH="master" + MY_P="${PN}" + EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}" +else + MY_P="${P/_/.}" + SRC_URI="https://downloads.sourceforge.net/gnuplot/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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="amos aqua bitmap cairo doc examples +gd gpic latex libcaca libcerf lua metafont metapost qt5 qt6 readline regis tgif wxwidgets X" + +REQUIRED_USE=" + doc? ( gd ) + lua? ( ${LUA_REQUIRED_USE} )" + +RDEPEND=" + amos? ( dev-libs/openspecfun ) + cairo? ( + x11-libs/cairo + x11-libs/pango ) + gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) + latex? ( + virtual/latex-base + lua? ( + dev-tex/pgf + >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) + libcaca? ( media-libs/libcaca ) + lua? ( ${LUA_DEPS} ) + qt5? ( !qt6? ( + dev-qt/qtcore:5= + dev-qt/qtgui:5= + dev-qt/qtnetwork:5= + dev-qt/qtprintsupport:5= + dev-qt/qtsvg:5= + dev-qt/qtwidgets:5= ) ) + qt6? ( + dev-qt/qtbase:6=[gui,network,widgets] + dev-qt/qtsvg:6= + dev-qt/qt5compat:6= ) + readline? ( sys-libs/readline:0= ) + libcerf? ( sci-libs/libcerf ) + wxwidgets? ( + x11-libs/wxGTK:${WX_GTK_VER}[X] + x11-libs/cairo + x11-libs/pango + 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? ( !qt6? ( dev-qt/linguist-tools:5 ) )" + +IDEPEND="latex? ( virtual/latex-base )" + +GP_VERSION="${PV%.*}" +TEXMF="${EPREFIX}/usr/share/texmf-site" + +PATCHES=( + "${FILESDIR}"/${PN}-6.1-no-picins.patch + "${FILESDIR}"/${PN}-6.0.0-configure.patch + "${FILESDIR}"/${PN}-6.0.1-watchpoints.patch +) + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + + if [[ ${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 + + 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 + + use wxwidgets && setup-wxwidgets + + tc-export CC CXX #453174 + tc-export_build_env BUILD_CC + export CC_FOR_BUILD=${BUILD_CC} + + use qt5 && use qt6 && ewarn "USE flag \"qt6\" overrides \"qt5\"" + + econf \ + --with-texdir="${TEXMF}/tex/latex/${PN}" \ + --with-readline=$(usex readline gnu builtin) \ + $(use_with amos) \ + $(use_with bitmap bitmap-terminals) \ + $(use_with cairo) \ + $(use_with gd) \ + $(use_with gpic) \ + "$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \ + $(use_with libcerf) \ + $(use_with lua) \ + $(use_with metafont) \ + $(use_with metapost) \ + $(use_with regis) \ + $(use_with tgif) \ + $(use_with X x) \ + --enable-stats \ + $(usev qt6 --with-qt=qt6 || 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" + + emake all + + # pdflatex fails in titlepag.tex: "Argument of  has an extra }." + # Install the pre-built gnuplot.pdf instead. + #if use doc; then + # if use cairo; then + # emake -C docs pdf + # else + # 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 + #fi +} + +src_install() { + emake DESTDIR="${D}" install + + 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 "${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, FAQ + dodoc docs/gnuplot.pdf #FAQ.pdf + # Documentation for making PostScript files + docinto psdoc + dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README} + fi +} + +src_test() { + emake check GNUTERM="dumb" +} + +pkg_postinst() { + use latex && texmf-update + readme.gentoo_print_elog +} + +pkg_postrm() { + use latex && texmf-update +} diff --git a/sci-visualization/gnuplot/gnuplot-6.0.0.ebuild b/sci-visualization/gnuplot/gnuplot-6.0.1.ebuild index 6dc345a591ee..66216ac3e8b4 100644 --- a/sci-visualization/gnuplot/gnuplot-6.0.0.ebuild +++ b/sci-visualization/gnuplot/gnuplot-6.0.1.ebuild @@ -20,19 +20,21 @@ if [[ -z ${PV%%*9999} ]]; then else MY_P="${P/_/.}" SRC_URI="https://downloads.sourceforge.net/gnuplot/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 latex libcaca libcerf lua qt5 readline regis wxwidgets X" +IUSE="amos aqua bitmap cairo doc examples +gd gpic latex libcaca libcerf lua metafont metapost qt5 readline regis tgif wxwidgets X" + REQUIRED_USE=" doc? ( gd ) lua? ( ${LUA_REQUIRED_USE} )" RDEPEND=" + amos? ( dev-libs/openspecfun ) cairo? ( x11-libs/cairo x11-libs/pango ) @@ -83,6 +85,7 @@ TEXMF="${EPREFIX}/usr/share/texmf-site" PATCHES=( "${FILESDIR}"/${PN}-6.1-no-picins.patch "${FILESDIR}"/${PN}-6.0.0-configure.patch + "${FILESDIR}"/${PN}-6.0.1-watchpoints.patch ) pkg_setup() { @@ -128,13 +131,18 @@ src_configure() { econf \ --with-texdir="${TEXMF}/tex/latex/${PN}" \ --with-readline=$(usex readline gnu builtin) \ + $(use_with amos) \ $(use_with bitmap bitmap-terminals) \ $(use_with cairo) \ $(use_with gd) \ + $(use_with gpic) \ "$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \ $(use_with libcerf) \ $(use_with lua) \ + $(use_with metafont) \ + $(use_with metapost) \ $(use_with regis) \ + $(use_with tgif) \ $(use_with X x) \ --enable-stats \ $(use_with qt5 qt qt5) \ @@ -149,16 +157,18 @@ src_compile() { emake all - if use doc; then - if use cairo; then - emake -C docs pdf - else - 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 - fi + # pdflatex fails in titlepag.tex: "Argument of  has an extra }." + # Install the pre-built gnuplot.pdf instead. + #if use doc; then + # if use cairo; then + # emake -C docs pdf + # else + # 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 + #fi } src_install() { diff --git a/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild b/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild index 27a2c21ba8eb..b806a8e6ba15 100644 --- a/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild +++ b/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild @@ -20,7 +20,7 @@ if [[ -z ${PV%%*9999} ]]; then else MY_P="${P/_/.}" SRC_URI="https://downloads.sourceforge.net/gnuplot/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/${MY_P}" diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml index ca422cb5f16b..160c0f25c669 100644 --- a/sci-visualization/gnuplot/metadata.xml +++ b/sci-visualization/gnuplot/metadata.xml @@ -16,12 +16,23 @@ primarily for the visual display of scientific data. </longdescription> <use> - <flag name="gd">Add support for <pkg>media-libs/gd</pkg>. - Needed for GIF, JPEG, and PNG image output.</flag> - <flag name="libcerf">Enable special functions from - <pkg>sci-libs/libcerf</pkg></flag> + <flag name="amos"> + Enable Amos routines for complex Airy and Bessel functions + (<pkg>dev-libs/openspecfun</pkg>) + </flag> <flag name="bitmap">Enable dot-matrix printers and pbm terminal</flag> - <flag name="regis">Enable ReGIS terminal</flag> + <flag name="gd"> + Add support for <pkg>media-libs/gd</pkg>. + Needed for GIF, JPEG, and PNG image output. + </flag> + <flag name="gpic">Include support for gpic terminal</flag> + <flag name="libcerf"> + Enable special functions from <pkg>sci-libs/libcerf</pkg> + </flag> + <flag name="metafont">Include support for metafont terminal</flag> + <flag name="metapost">Include support for metapost terminal</flag> + <flag name="regis">Include support for ReGIS terminal</flag> + <flag name="tgif">Include support for tgif terminal</flag> </use> <upstream> <remote-id type="sourceforge">gnuplot</remote-id> diff --git a/sci-visualization/gr/Manifest b/sci-visualization/gr/Manifest index 83af848e109d..71f05f618b40 100644 --- a/sci-visualization/gr/Manifest +++ b/sci-visualization/gr/Manifest @@ -1,2 +1,2 @@ -DIST gr-0.72.4.tar.gz 9067899 BLAKE2B 827c80dbfc3483abe4af217c06549c64aa134446e831a5d7fab3906a3aac7bb23b66f8b98674220ff1b6fbd5fad60b9a8e7f7361a27370c033d9375a18f63234 SHA512 4ae1aae6854995ae58327d41930cedd96ef973ce65467f48f24d9985b27b5af2aa0eb6832a801b46e6fa71cade99117957c96738cb000306b0574b0e471692fb DIST gr-0.73.3.tar.gz 10076655 BLAKE2B 13bd461b39a86473290912f5a9ba5a4b5ea3ffc8865f6909aad1fc92acf6d39fdb12910e2bf0f8108b7bef1016652515c6cc188db0b98dd052459400b30895ba SHA512 f45daefd880eec9380a2a31f1cd3b124469c1d33c34a9d13a3718b1978da507620b6f7cc025dd20be81a70f52537dbb4537548d8cc32e133693d9b7ae2f476e5 +DIST gr-0.73.6.tar.gz 10109682 BLAKE2B 15499dc9dbe42b3530edcba29a1ca82f05051a499a0656af1fa94a90d6b9ac3a321118694c80f2e52b092a8b3840105d92cf6df1fe079062183ea11de995c20b SHA512 4b96b55c540ec2984042ff308c7ef73cfed1008c4de8a4b77be3e13db06cfeb648e5e0ec511a2387b4c545005aa7924d40b74c0d8a62f30d2c36388e3f2b9128 diff --git a/sci-visualization/gr/gr-0.72.4.ebuild b/sci-visualization/gr/gr-0.73.6.ebuild index 51aaeb29fc39..8e55d4f9c9ba 100644 --- a/sci-visualization/gr/gr-0.72.4.ebuild +++ b/sci-visualization/gr/gr-0.73.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2023 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86" IUSE="agg cairo ffmpeg postscript tiff truetype" DEPEND=" - dev-qt/qtgui:5 + dev-qt/qtgui:= media-libs/fontconfig media-libs/glfw media-libs/libjpeg-turbo:= @@ -34,7 +34,6 @@ DEPEND=" truetype? ( media-libs/freetype ) " RDEPEND="${DEPEND}" -BDEPEND="" PATCHES=( "${FILESDIR}/${PN}-0.53.0-musl.patch" @@ -44,7 +43,7 @@ REQUIRED_USE="cairo? ( truetype )" src_configure() { if use agg ; then - mycmakeargs+=( -DAGG_LIBRARY=libagg.so -DAGG_INCLUDE_DIR=/usr/include/agg2 ) + mycmakeargs+=( -DAGG_LIBRARY=/usr/$(get_libdir)/libagg.so -DAGG_INCLUDE_DIR=/usr/include/agg2 ) else mycmakeargs+=( -DAGG_LIBRARY= ) fi diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest index fdbc3eb13346..22f0aa59fe77 100644 --- a/sci-visualization/grace/Manifest +++ b/sci-visualization/grace/Manifest @@ -1,2 +1,3 @@ DIST grace-5.1.25.tar.gz 2957689 BLAKE2B f46032c92aa2ed2484ca05c0eb858f47adfa88517e7d06c0d95a6d23c044356edfc52b9a7566a625ef5f4a1a4b5450b0ce065a94ba15c59fb8395d53c85872c9 SHA512 9ea68483af1dfc98d217ae730b7a51b66deae5aaa8dfda29d5a3337ed4b5728b45aa03f561bf7d4173e73d6af8dee03cbabd95c0c8dd36999303c89451a3728a DIST grace_5.1.25-13.debian.tar.xz 110248 BLAKE2B 19dce6ed1b9e1d93d87036f5aba5ee262d54a58bc7daf2039fb2246bd2f45e413832561a33f8cb1b793fdf30831b0282f00e60efe3980df7875d2923a9f32f76 SHA512 51ee85525557c630fc3e208eb9b72b8973de6351698766ade1a59af6b9f16bc1b6b9c2c40d2270eb33d55806c4762c7b5d10b14f2a470ff00cfae2c9351bc922 +DIST grace_5.1.25-17.debian.tar.xz 112540 BLAKE2B 6637c87cda3dadbb3cf8040811e227a080a116101ee0da9c51d068e811bbe7516ae8ef462dcc50bd6d53a88765908ca955cd9b1bbebcfff37da1c40d7c76f640 SHA512 2d9a05e7f409893193e23f904d82afc6e930ae7b051b9ddcfa62c6ddfb0f892cc931f41968fa52ef95ea9c1aef4138de4bdac570789e494a0f6308e355b2bda7 diff --git a/sci-visualization/grace/files/grace-configure-c99.patch b/sci-visualization/grace/files/grace-configure-c99.patch new file mode 100644 index 000000000000..ff8cf077a5f1 --- /dev/null +++ b/sci-visualization/grace/files/grace-configure-c99.patch @@ -0,0 +1,89 @@ +From 625be283aa5fcfe0cfe1cc3851226d7677a21cdc Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Mon, 2 Sep 2024 20:00:20 -0400 +Subject: [PATCH] configure: fix implicit function declarations + +Import fedora patch: +https://src.fedoraproject.org/rpms/grace/blob/rawhide/f/grace-configure-c99-1.patch + +Do not call the XmRegisterConverters function because current Motif +does not declare it (but still exports it). With this call, the +result of this configure check depends on whether the compiler +supports implicit function declarations or not. + +Additionally add missing includes to various checks that lacked them. +Florian's patch moved from exit to return, but adding the includes is +shorter. +--- + configure | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/configure b/configure +index d58ce51..3f3c1f3 100755 +--- a/configure ++++ b/configure +@@ -4931,6 +4931,7 @@ else + /* end confdefs.h. */ + + #include <stdio.h> ++#include <stdlib.h> + #include <string.h> + + #define LOG2EA 0.44269504088896340735992 +@@ -8309,6 +8310,7 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#include <stdlib.h> + #include <string.h> + #include <zlib.h> + int main(void) { +@@ -8395,6 +8397,7 @@ else + /* end confdefs.h. */ + + #include <stdio.h> ++#include <stdlib.h> + #include <jpeglib.h> + int main(void) { + int vinc; +@@ -8479,6 +8482,7 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#include <stdlib.h> + #include <string.h> + #include <png.h> + int main(void) { +@@ -8566,6 +8570,8 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#include <stdlib.h> ++#include <string.h> + #include <pdflib.h> + int main(void) { + char *vinc; +@@ -9516,11 +9522,11 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#include <stdlib.h> + #include <Xm/XmAll.h> + int main(void) { + int vlibn, vincn; + vincn = XmVersion; +- XmRegisterConverters(); + vlibn = xmUseVersion; + if (vincn < 1002) { + exit(1); +@@ -9790,6 +9796,7 @@ else + /* end confdefs.h. */ + + #include <XmHTML/XmHTML.h> ++#include <stdlib.h> + int main(void) { + int vlib, vinc; + vlib = XmHTMLGetVersion(); +-- +2.44.2 + diff --git a/sci-visualization/grace/grace-5.1.25_p17.ebuild b/sci-visualization/grace/grace-5.1.25_p17.ebuild new file mode 100644 index 000000000000..2e8a4182babb --- /dev/null +++ b/sci-visualization/grace/grace-5.1.25_p17.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +FORTRAN_NEEDED=fortran + +inherit desktop flag-o-matic fortran-2 toolchain-funcs xdg + +DESCRIPTION="Motif based XY-plotting tool" +HOMEPAGE="https://plasma-gate.weizmann.ac.il/Grace/" +SRC_URI=" + ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P/_p*}.tar.gz + mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz +" + +SLOT="0" +LICENSE="GPL-2 LGPL-2" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="fftw fortran jpeg netcdf png" + +DEPEND=" + media-libs/t1lib + media-libs/tiff:= + sys-libs/zlib + >=x11-libs/motif-2.3:0 + x11-libs/xbae + 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=( + # Fix for missing defines when fortran is disabled + "${FILESDIR}"/${PN}-5.1.21-fortran.patch + # Fix a leak (from freebsd) + "${FILESDIR}"/${PN}-5.1.22-dlmodule.patch + # Honor -noask option and avoid accidentally overwritting files + "${FILESDIR}"/${PN}-5.1.25-honor-noask.patch + # Fix C99 compat (from Fedora); included in debian "source-hardening"??? + #"${FILESDIR}"/${PN}-c99.patch + "${FILESDIR}"/${PN}-configure-c99.patch +) + +pkg_setup() { + fortran-2_pkg_setup +} + +src_prepare() { + default + + # Debian patches + for p in $(<"${WORKDIR}"/debian/patches/series) ; do + # We have a safer one + [[ ${p} = configure-implicit-declarations.diff ]] && continue + + eapply -p1 "${WORKDIR}/debian/patches/${p}" + done + + # don't strip if not asked for + sed -i \ + -e 's:$(INSTALL_PROGRAM) -s:$(INSTALL_PROGRAM):g' \ + {auxiliary,grconvert,src}/Makefile || die + + sed -i \ + -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \ + -e "s:\$(GRACE_HOME)/lib:\$(PREFIX)/$(get_libdir):g" \ + -e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \ + -e 's:$(PREFIX)/man:$(PREFIX)/share/man:g' \ + Makefile */Makefile || die "sed failed" + + sed -i \ + -e 's:bin/grconvert:grconvert:' \ + -e 's:auxiliary/fdf2fit:fdf2fit:' \ + gracerc || die +} + +src_configure() { + # -Werror=strict-aliasing, -Werror=lto-type-mismatch + # https://bugs.gentoo.org/863293 + append-flags -fno-strict-aliasing + filter-lto + + tc-export CC AR + + # the configure script just produces a basic Make.conf + # and a config.h + econf \ + --disable-pdfdrv \ + --disable-xmhtml \ + --without-bundled-xbae \ + --without-bundled-t1lib \ + --enable-grace-home="${EPREFIX}"/usr/share/${PN} \ + --with-helpviewer="xdg-open %s" \ + --with-editor="xdg-open %s" \ + --with-printcmd="lpr" \ + --x-includes="${EPREFIX}"/usr/include \ + --x-libraries="${EPREFIX}"/usr/$(get_libdir) \ + $(use_with fftw) \ + $(use_enable fortran f77-wrapper) \ + $(use_enable netcdf) \ + $(use_enable jpeg jpegdrv) \ + $(use_enable png pngdrv) \ + $(use_with fortran f77 $(tc-getFC)) +} + +src_install() { + default + + dosym ../../${PN}/examples /usr/share/doc/${PF}/examples + dosym ../../${PN}/doc /usr/share/doc/${PF}/html + + doman "${ED}"/usr/share/doc/${PF}/html/*.1 + rm -f "${ED}"/usr/share/doc/${PF}/html/*.1 || die + + domenu "${FILESDIR}"/${PN}.desktop + 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/labplot/Manifest b/sci-visualization/labplot/Manifest index dce5e0b4765d..8231c1048a99 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1,2 +1 @@ -DIST labplot-2.10.1.tar.xz 23193988 BLAKE2B dbea843dcf0761eb40d9a386f8df13b45a889bf41ff1a40434b521f591fb2c776de4c474f553776f43ad3ee85224e919521efdabd853f8d0cc1c0c9ad32a4df8 SHA512 12c8b62519861255dd8cb4ecc3ad4ff34f1862b8e386a9aa97e4f3a2dd0b8989cf14b9dafcea41da2575bd57c0ef9803a15ac9347365cdeea6309dcfda4cd7da -DIST labplot-2.9.0.tar.xz 21413512 BLAKE2B ab3c579eb64ee4b9b558db63210b1d2210210e1ee2df7fd986d75ebbacab96c4cd05a8fc4698859373e011bd47c55a1abc73d0e8107dd3e3f1b60ce87e1f14d4 SHA512 d06e373e463d9cf3df81eec367167350572975366785b6c88bdab947288fbc21a9eb8e706cb1a831967b8bf0a8039f2f919e14ae7cfb40b21e66f862e38c5d45 +DIST labplot-2.11.1.tar.xz 24180904 BLAKE2B c2b94db140ca47f648f2b7e82956a88fa36819aa666430d69b0c328d46a254e0fe9991d4ea61581c4c8da0f44694b2016471090a166e8beeb378f1e02eb6b2c7 SHA512 51a039c7eec5a2e104079b1dc7bfe1ecdc2c4e3327bcfbdc99e1b2fbae2b2be5db3a1a2c319e30d41a7cfcf177be756e8e3bb05d9a58c8418e43900dfad6b3b1 diff --git a/sci-visualization/labplot/files/labplot-2.11.1-ods-buildfix.patch b/sci-visualization/labplot/files/labplot-2.11.1-ods-buildfix.patch new file mode 100644 index 000000000000..affddeeaae5b --- /dev/null +++ b/sci-visualization/labplot/files/labplot-2.11.1-ods-buildfix.patch @@ -0,0 +1,38 @@ +From 0edfd2862a8f953cdd06ffe4940e1da5b7b5dc17 Mon Sep 17 00:00:00 2001 +From: Alexander Semke <alexander.semke@web.de> +Date: Mon, 15 Jul 2024 09:56:40 +0200 +Subject: [PATCH] Minor qt6 related fixes. + +--- + src/kdefrontend/datasources/OdsOptionsWidget.cpp | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/kdefrontend/datasources/OdsOptionsWidget.cpp b/src/kdefrontend/datasources/OdsOptionsWidget.cpp +index 6424032dd..c90943695 100644 +--- a/src/kdefrontend/datasources/OdsOptionsWidget.cpp ++++ b/src/kdefrontend/datasources/OdsOptionsWidget.cpp +@@ -67,9 +67,9 @@ void OdsOptionsWidget::sheetSelectionChanged() { + } + + if (selectedItems.size() > 1) +- emit enableDataPortionSelection(false); ++ Q_EMIT enableDataPortionSelection(false); + else // one selected item +- emit enableDataPortionSelection(true); ++ Q_EMIT enableDataPortionSelection(true); + + auto* item = selectedItems.last(); + auto* const filter = static_cast<OdsFilter*>(m_fileWidget->currentFileFilter()); +@@ -98,7 +98,8 @@ void OdsOptionsWidget::sheetSelectionChanged() { + const int maxColumns = 100; + for (int row = 0; row < rowCount; ++row) { + auto lineString = importedStrings.at(row); +- colCount = std::min(maxColumns, lineString.size()); ++ const int size = lineString.size(); ++ colCount = std::min(maxColumns, size); + if (row == 0) { + ui.twPreview->setColumnCount(colCount); + +-- +GitLab + 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 deleted file mode 100644 index e59c1309888d..000000000000 --- a/sci-visualization/labplot/files/labplot-2.9.0-discount-3.patch +++ /dev/null @@ -1,98 +0,0 @@ -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 deleted file mode 100644 index dceb294dff35..000000000000 --- a/sci-visualization/labplot/labplot-2.10.1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# 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.11.1.ebuild b/sci-visualization/labplot/labplot-2.11.1.ebuild new file mode 100644 index 000000000000..2c5e9dedfc90 --- /dev/null +++ b/sci-visualization/labplot/labplot-2.11.1.ebuild @@ -0,0 +1,113 @@ +# 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=6.3.0 +QTMIN=6.6.2 +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="0" +IUSE="eigen fftw fits hdf5 libcerf markdown matio netcdf ods origin root serial share telemetry xlsx" + +# IUSE="cantor" +# cantor? ( +# >=kde-apps/cantor-19.12.0:6 +# >=kde-frameworks/kparts-${KFMIN}:6 +# >=kde-frameworks/kservice-${KFMIN}:6 +# ) +DEPEND=" + app-text/poppler[qt6(-)] + >=dev-qt/qtbase-${QTMIN}:6=[concurrent,gui,network,sql,widgets] + >=dev-qt/qtsvg-${QTMIN}:6 + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/syntax-highlighting-${KFMIN}:6 + >=sci-libs/gsl-1.15:= + eigen? ( dev-cpp/eigen:3= ) + xlsx? ( 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:= ) + ods? ( + dev-libs/libixion:= + dev-libs/liborcus:= + ) + origin? ( sci-libs/liborigin:2 ) + root? ( + app-arch/lz4 + sys-libs/zlib + ) + serial? ( >=dev-qt/qtserialport-${QTMIN}:6 ) + share? ( >=kde-frameworks/purpose-${KFMIN}:6 ) + telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 ) +" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5 +" +# not packaged: dev-qt/qtmqtt, bug 683994 +BDEPEND=" + app-alternatives/yacc + sys-devel/gettext +" + +PATCHES=( "${FILESDIR}/${P}-ods-buildfix.patch" ) + +src_prepare() { + ecm_src_prepare + + sed -e "/^ *find_package.*QT NAMES/s/Qt5 //" \ + -i CMakeLists.txt || die # ensure Qt6 build +} + +src_configure() { + local mycmakeargs=( + -DENABLE_MQTT=OFF # not packaged + -DENABLE_READSTAT=OFF # not packaged + -DENABLE_VECTOR_BLF=OFF # not packaged + -DENABLE_CANTOR=OFF # $(usex cantor) + -DENABLE_EIGEN3=$(usex eigen) + -DENABLE_XLSX=$(usex xlsx) + -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_ORCUS=$(usex ods) + -DENABLE_LIBORIGIN=$(usex origin) + $(cmake_use_find_package share KF6Purpose) + -DENABLE_ROOT=$(usex root) + -DENABLE_QTSERIALPORT=$(usex serial) + $(cmake_use_find_package telemetry KUserFeedbackQt6) # FIXME: should be KF6UserFeedback + -DENABLE_TESTS=$(usex test) + ) + + ecm_src_configure +} diff --git a/sci-visualization/labplot/labplot-2.9.0-r1.ebuild b/sci-visualization/labplot/labplot-2.9.0-r1.ebuild deleted file mode 100644 index 0b0ac52a1aad..000000000000 --- a/sci-visualization/labplot/labplot-2.9.0-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# 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}/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="5" -IUSE="cantor 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 - ) - 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 -" - -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) - ) - - ecm_src_configure -} diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-9999.ebuild index dceb294dff35..4684a482542b 100644 --- a/sci-visualization/labplot/labplot-9999.ebuild +++ b/sci-visualization/labplot/labplot-9999.ebuild @@ -5,9 +5,8 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" -KFMIN=5.88.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" +KFMIN=6.3.0 +QTMIN=6.6.2 inherit ecm kde.org DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks" @@ -18,39 +17,36 @@ if [[ ${KDE_BUILD_TYPE} = release ]]; then fi LICENSE="GPL-2" -SLOT="5" -IUSE="cantor excel fftw fits hdf5 libcerf markdown matio netcdf origin root serial telemetry" +SLOT="0" +IUSE="eigen fftw fits hdf5 libcerf markdown matio netcdf ods origin root serial share telemetry xlsx" +# IUSE="cantor" +# cantor? ( +# >=kde-apps/cantor-19.12.0:6 +# >=kde-frameworks/kparts-${KFMIN}:6 +# >=kde-frameworks/kservice-${KFMIN}:6 +# ) 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 + app-text/poppler[qt6(-)] + >=dev-qt/qtbase-${QTMIN}:6=[concurrent,gui,network,sql,widgets] + >=dev-qt/qtsvg-${QTMIN}:6 + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/syntax-highlighting-${KFMIN}:6 >=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:= ) + eigen? ( dev-cpp/eigen:3= ) + xlsx? ( dev-libs/qxlsx:= ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) @@ -58,28 +54,43 @@ DEPEND=" markdown? ( app-text/discount:= ) matio? ( sci-libs/matio:= ) netcdf? ( sci-libs/netcdf:= ) + ods? ( + dev-libs/libixion:= + dev-libs/liborcus:= + ) origin? ( sci-libs/liborigin:2 ) root? ( app-arch/lz4 sys-libs/zlib ) - serial? ( >=dev-qt/qtserialport-${QTMIN}:5 ) - telemetry? ( kde-frameworks/kuserfeedback:5 ) + serial? ( >=dev-qt/qtserialport-${QTMIN}:6 ) + share? ( >=kde-frameworks/purpose-${KFMIN}:6 ) + telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 ) +" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5 " -RDEPEND="${DEPEND}" # not packaged: dev-qt/qtmqtt, bug 683994 BDEPEND=" app-alternatives/yacc sys-devel/gettext " +src_prepare() { + ecm_src_prepare + + sed -e "/^ *find_package.*QT NAMES/s/Qt5 //" \ + -i CMakeLists.txt || die # ensure Qt6 build +} + 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_CANTOR=OFF # $(usex cantor) + -DENABLE_EIGEN3=$(usex eigen) + -DENABLE_XLSX=$(usex xlsx) -DENABLE_FFTW=$(usex fftw) -DENABLE_FITS=$(usex fits) -DENABLE_HDF5=$(usex hdf5) @@ -87,10 +98,12 @@ src_configure() { -DENABLE_DISCOUNT=$(usex markdown) -DENABLE_MATIO=$(usex matio) -DENABLE_NETCDF=$(usex netcdf) + -DENABLE_ORCUS=$(usex ods) -DENABLE_LIBORIGIN=$(usex origin) + $(cmake_use_find_package share KF6Purpose) -DENABLE_ROOT=$(usex root) -DENABLE_QTSERIALPORT=$(usex serial) - $(cmake_use_find_package telemetry KUserFeedback) + $(cmake_use_find_package telemetry KUserFeedbackQt6) # FIXME: should be KF6UserFeedback -DENABLE_TESTS=$(usex test) ) diff --git a/sci-visualization/labplot/metadata.xml b/sci-visualization/labplot/metadata.xml index 96a92087bc72..cd20ab7b75cd 100644 --- a/sci-visualization/labplot/metadata.xml +++ b/sci-visualization/labplot/metadata.xml @@ -14,17 +14,20 @@ <name>Gentoo KDE Project</name> </maintainer> <upstream> - <bugs-to>https://bugs.kde.org/</bugs-to> + <bugs-to>https://bugs.kde.org/enter_bug.cgi?product=LabPlot2</bugs-to> + <remote-id type="kde-invent">education/labplot</remote-id> </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="eigen">Enable support for fast baseline removal via <pkg>dev-cpp/eigen</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="ods">Enable support for importing/exporting OpenDocument spreadsheets (.ods) via <pkg>dev-libs/liborcus</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> + <flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag> + <flag name="xlsx">Enable support for importing/exporting Microsoft Excel files (.xlsx) via <pkg>dev-libs/qxlsx</pkg></flag> </use> </pkgmetadata> diff --git a/sci-visualization/pythonprop/Manifest b/sci-visualization/pythonprop/Manifest index afd8adc4b993..8edeec777311 100644 --- a/sci-visualization/pythonprop/Manifest +++ b/sci-visualization/pythonprop/Manifest @@ -1 +1 @@ -DIST pythonprop-0.30.1.tar.gz 1141620 BLAKE2B 54554d1a50976aa0516e70ef6cabf8c8c8fe41dc15980d0d06defca2dbf722baa4e98dddb974ea0d6da18e3d634661c980685b89411e8de4cf1cded452bb60a1 SHA512 582442e95732c78b580eceaf8b9d4922a23e5b3c5652738b110a40e1b94f91196755fad6e00370328130acc608121961d4e449199610137a757b086b53184b43 +DIST pythonprop-0.30.1_p20240217.tar.gz 1141620 BLAKE2B 54554d1a50976aa0516e70ef6cabf8c8c8fe41dc15980d0d06defca2dbf722baa4e98dddb974ea0d6da18e3d634661c980685b89411e8de4cf1cded452bb60a1 SHA512 582442e95732c78b580eceaf8b9d4922a23e5b3c5652738b110a40e1b94f91196755fad6e00370328130acc608121961d4e449199610137a757b086b53184b43 diff --git a/sci-visualization/pythonprop/files/pythonprop-0.30.1-p20240217.patch b/sci-visualization/pythonprop/files/pythonprop-0.30.1-p20240217.patch new file mode 100644 index 000000000000..61e26db5a736 --- /dev/null +++ b/sci-visualization/pythonprop/files/pythonprop-0.30.1-p20240217.patch @@ -0,0 +1,169 @@ +diff --git a/data/voacapgui.desktop.in b/data/voacapgui.desktop.in +index 3237a87..175d7d8 100644 +--- a/data/voacapgui.desktop.in ++++ b/data/voacapgui.desktop.in +@@ -3,4 +3,5 @@ Type=Application + Exec=voacapgui + Name=voacapgui + Categories=Science;HamRadio ++Keywords=amateur;ham;hf;prediction;plot;radio;voacap; + Icon=@PACKAGE@ +diff --git a/man/voa3DPlot.1 b/man/voa3DPlot.1 +new file mode 100644 +index 0000000..1336eea +--- /dev/null ++++ b/man/voa3DPlot.1 +@@ -0,0 +1,36 @@ ++.TH voa3DPlot 1 "FEV 2024" Linux "User Manuals" ++.SH NAME ++voa3DPlot \- Plot the contents of VOACAP output files in a 3D format ++.SH SYNOPSIS ++.B voa3DPlot [options] file ++.SH DESCRIPTION ++.B voa3DPlot ++A python script used to graphically display the contents of output files produced by VOACAP. ++.SH OPTIONS ++.IP --version ++Shows program version number and exit. ++.IP "-h, --help" ++Shows a help message and exit. ++.IP "-b band, --band=band" ++Displays a band plan indicated by 'band', an integer value from 1 to 3 (1:SWL, 2:UK AMATEUR BANDS and 3:KSA AMATEUR BANDS). ++.IP "-f max_frequency, --freqmax=max_frequency" ++Specifies the maximum frequency (MHz) to display on the Y axis. ++.IP "-g group, --group=group" ++Specifies the group(s) within a file containing multiple groups to plot. Multiple groups must be separated by commas, e.g. '-g 1,3,4' (default = 1). ++.IP "-l 'label', --label='label'" ++Specifies the text label to be printed as a main title at the top of the plot. ++.IP "-m colourmap, --cmap=colourmap" ++Specifies the colourmap to use. Supported colour maps are 'autumn', 'bone', 'cool', 'copper',', 'hot', 'hsv', 'jet', 'pink', 'spring', 'summer', 'winter' (default = 'jet'). ++.IP "-o outputfile, --outfile=outputfile" ++Used to specify an output file to save the plot to. ++.IP "-q, --quiet" ++Process quietly, don't produce a graph on the screen. This only makes sense when used in conjunction with the -o option. ++.IP "-t type, --datatype=type" ++Specifies the type of image to plot. Supported image types are 0:None 1:MUFday 2:REL 3:SNR 4:S DBW (default = 1). ++.IP "-z timezone, --timezone=timezone" ++Specifies the timezone to shift the plots to. ++.SH AUTHORS ++This program was written by James Watson (M0DNS) <jimwatson at mac dot com>. ++ ++This manual page was written by David da Silva Polverari <polverari@debian.org> ++for the Debian Project (but may be used by others). +diff --git a/man/voaAreaPlot.1 b/man/voaAreaPlot.1 +index 8ddcfde..eb8c76a 100644 +--- a/man/voaAreaPlot.1 ++++ b/man/voaAreaPlot.1 +@@ -46,7 +46,7 @@ POI_FILE is a text file with points of interest to plot on the map. The file is + .IP "-p PROJECTION, --projection=PROJECTION" + PROJECTION specifies the map projection. Valid values are 'cyl' (Equidistant + Cylindrical), 'mill' (Miller Cylindrical), gall' (Gall Stereographic), +-'robin' (Robinson), 'vandg' (van der Grinten), 'sinu' (Sinusoidal), 'mbtfpq' ++\(aqrobin' (Robinson), 'vandg' (van der Grinten), 'sinu' (Sinusoidal), 'mbtfpq' + (McBryde-Thomas Flat Polar Quartic), 'eck4' (Eckert IV), 'kav7' (Kavrayskiy + VII), 'moll' (Mollweide), 'hammer' (Hammer). + .IP "-r RESOLUTION, --resolution=RESOLUTION" +diff --git a/man/voaAreaPlotgui.1 b/man/voaAreaPlotgui.1 +new file mode 100644 +index 0000000..88d07d6 +--- /dev/null ++++ b/man/voaAreaPlotgui.1 +@@ -0,0 +1,13 @@ ++.TH voaAreaPlotgui 1 "FEV 2024" Linux "User Manuals" ++.SH NAME ++voaAreaPlotgui \- Graphical frontend to the voaAreaPlot application ++.SH SYNOPSIS ++.B voaAreaPlotgui file ++.SH DESCRIPTION ++.B voaAreaPlotgui ++is a graphical user interface to the voaAreaPlot application. It plots the file contents according to the parameters set on the user interface. ++.SH AUTHORS ++This program was written by James Watson (M0DNS) <jimwatson at mac dot com>. ++ ++This manual page was written by David da Silva Polverari <polverari@debian.org> ++for the Debian Project (but may be used by others). +diff --git a/man/voaP2PPlotgui.1 b/man/voaP2PPlotgui.1 +new file mode 100644 +index 0000000..457a6a0 +--- /dev/null ++++ b/man/voaP2PPlotgui.1 +@@ -0,0 +1,13 @@ ++.TH voaP2PPlotgui 1 "FEV 2024" Linux "User Manuals" ++.SH NAME ++voaP2PPlotgui \- Graphical frontend to the voaP2PPlot application ++.SH SYNOPSIS ++.B voaP2PPlotgui file ++.SH DESCRIPTION ++.B voaP2PPlotgui ++is a graphical user interface to the voaP2PPlot application. It plots the file contents according to the parameters set on the user interface. ++.SH AUTHORS ++This program was written by James Watson (M0DNS) <jimwatson at mac dot com>. ++ ++This manual page was written by David da Silva Polverari <polverari@debian.org> ++for the Debian Project (but may be used by others). +diff --git a/man/voacapgui.1 b/man/voacapgui.1 +new file mode 100644 +index 0000000..31b12eb +--- /dev/null ++++ b/man/voacapgui.1 +@@ -0,0 +1,13 @@ ++.TH voacapgui 1 "FEV 2024" Linux "User Manuals" ++.SH NAME ++voacapgui \- An input GUI for voacapl ++.SH SYNOPSIS ++.B voacapgui ++.SH DESCRIPTION ++.B voacapgui ++is a graphical user interface frontend for \fBvoacapl\fP. It generates voacap input files from user input data and plots the resulting predictions. ++.SH AUTHORS ++This program was written by James Watson (M0DNS) <jimwatson at mac dot com>. ++ ++This manual page was written by David da Silva Polverari <polverari@debian.org> ++for the Debian Project (but may be used by others). +diff --git a/src/pythonprop/voaAreaPlot.py b/src/pythonprop/voaAreaPlot.py +index a0bd789..01f5d86 100644 +--- a/src/pythonprop/voaAreaPlot.py ++++ b/src/pythonprop/voaAreaPlot.py +@@ -114,6 +114,9 @@ class VOAAreaPlot: + + self.datadir = datadir + ++ # set backend during initialization to avoid switching error ++ matplotlib.use('GTK3Agg') ++ + try: + plot_parameters = VOAFile((in_file)) + plot_parameters.parse_file() +@@ -146,7 +149,10 @@ class VOAAreaPlot: + # sys.exit(1) + + portland = ListedColormap(["#0C3383", "#0b599b","#0a7fb4","#57a18f","#bec255","#f2c438","#f2a638","#ef8235","#e4502a","#d91e1e"]) +- plt.register_cmap(name='portland', cmap=portland) ++ try: ++ plt.register_cmap(name='portland', cmap=portland) ++ except ValueError: ++ print("Portland colormap is already registered") + colMap = color_map + + projection = ccrs.PlateCarree() +diff --git a/src/pythonprop/voaP2PPlot.py b/src/pythonprop/voaP2PPlot.py +index faf87e6..7255667 100644 +--- a/src/pythonprop/voaP2PPlot.py ++++ b/src/pythonprop/voaP2PPlot.py +@@ -136,8 +136,15 @@ class VOAP2PPlot: + + self.image_defs = self.IMG_TYPE_DICT[self.data_type] + self.user_bands = user_bands ++ ++ # set backend during initialization to avoid switching error ++ matplotlib.use('GTK3Agg') ++ + portland = ListedColormap(["#0C3383", "#0b599b","#0a7fb4","#57a18f","#bec255","#f2c438","#f2a638","#ef8235","#e4502a","#d91e1e"]) +- matplotlib.cm.register_cmap(name='portland', cmap=portland) ++ try: ++ matplotlib.cm.register_cmap(name='portland', cmap=portland) ++ except ValueError: ++ print("Portland colormap is already registered") + + if plot_groups[0]=='a': + num_grp = self.df.get_number_of_groups() diff --git a/sci-visualization/pythonprop/files/pythonprop-drop-portland.patch b/sci-visualization/pythonprop/files/pythonprop-drop-portland.patch deleted file mode 100644 index 5a6736b4624b..000000000000 --- a/sci-visualization/pythonprop/files/pythonprop-drop-portland.patch +++ /dev/null @@ -1,87 +0,0 @@ -# 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/files/pythonprop-matplotlib3.9.patch b/sci-visualization/pythonprop/files/pythonprop-matplotlib3.9.patch new file mode 100644 index 000000000000..4cea6f50d4ee --- /dev/null +++ b/sci-visualization/pythonprop/files/pythonprop-matplotlib3.9.patch @@ -0,0 +1,65 @@ +--- a/src/pythonprop/voaAreaPlot.py ++++ b/src/pythonprop/voaAreaPlot.py +@@ -148,15 +148,15 @@ 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"]) ++ portland = ListedColormap(["#0C3383","#0b599b","#0a7fb4","#57a18f","#bec255","#f2c438","#f2a638","#ef8235","#e4502a","#d91e1e"], name="portland") + try: +- plt.register_cmap(name='portland', cmap=portland) ++ matplotlib.colormaps.register(cmap=portland) + except ValueError: + print("Portland colormap is already registered") + colMap = color_map + + projection = ccrs.PlateCarree() +- axes_class = (GeoAxes,dict(map_projection=projection)) ++ axes_class = (GeoAxes,dict(projection=projection)) + + number_of_subplots = len(vg_files) + +@@ -208,7 +208,7 @@ class VOAAreaPlot: + cbar_mode='single', + cbar_pad=0.2, + cbar_size='3%', +- label_mode='') ++ label_mode='L') + + self.main_title_label = fig.suptitle(str(self.image_defs['title']), fontsize=self.main_title_fontsize) + +@@ -292,7 +292,7 @@ class VOAAreaPlot: + ax.plot([xpt],[ypt],'ro') + ax.text(xpt+100000,ypt+100000,location.get_name()) + """ +- gl = ax.gridlines(crs=projection, draw_labels=True, ++ gl = ax.gridlines(crs=projection, draw_labels=["bottom", "left"], + linewidth=1, color='black', alpha=0.75) + gl.xlabels_top = False + gl.xlabels_bottom = False +diff --git a/src/pythonprop/voaP2PPlot.py b/src/pythonprop/voaP2PPlot.py +index 7255667..4a3ff05 100644 +--- a/src/pythonprop/voaP2PPlot.py ++++ b/src/pythonprop/voaP2PPlot.py +@@ -140,9 +140,10 @@ class VOAP2PPlot: + # set backend during initialization to avoid switching error + matplotlib.use('GTK3Agg') + +- portland = ListedColormap(["#0C3383", "#0b599b","#0a7fb4","#57a18f","#bec255","#f2c438","#f2a638","#ef8235","#e4502a","#d91e1e"]) ++ portland = ListedColormap(["#0C3383", "#0b599b","#0a7fb4","#57a18f","#bec255","#f2c438","#f2a638","#ef8235","#e4502a","#d91e1e"], ++name="portland") + try: +- matplotlib.cm.register_cmap(name='portland', cmap=portland) ++ matplotlib.colormaps.register(cmap=portland) + except ValueError: + print("Portland colormap is already registered") + +@@ -203,7 +204,7 @@ class VOAP2PPlot: + cbar_mode='single', + cbar_pad=0.2, + cbar_size='3%', +- label_mode='') ++ label_mode='L') + + self.main_title_label = fig.suptitle(plot_label+str(self.image_defs['title']), fontsize=self.main_title_fontsize) + diff --git a/sci-visualization/pythonprop/pythonprop-0.30.1.ebuild b/sci-visualization/pythonprop/pythonprop-0.30.1.ebuild deleted file mode 100644 index 0c2da111f5a2..000000000000 --- a/sci-visualization/pythonprop/pythonprop-0.30.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..11} ) - -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.30.1-r1.ebuild b/sci-visualization/pythonprop/pythonprop-0.30.1_p20240217.ebuild index 0020e216326c..87ef45d96187 100644 --- a/sci-visualization/pythonprop/pythonprop-0.30.1-r1.ebuild +++ b/sci-visualization/pythonprop/pythonprop-0.30.1_p20240217.ebuild @@ -7,9 +7,13 @@ PYTHON_COMPAT=( python3_{9..12} ) inherit autotools python-single-r1 +MY_PV=$(ver_cut 1-3) + 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" +SRC_URI="https://github.com/jawatson/${PN}/archive/v${MY_PV}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz" + +S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="GPL-3" SLOT="0" @@ -31,7 +35,8 @@ DEPEND="${RDEPEND} app-text/yelp-tools " -PATCHES=( "${FILESDIR}/${PN}-drop-portland.patch" ) +PATCHES=( "${FILESDIR}/${PN}-0.30.1-p20240217.patch" + "${FILESDIR}/${PN}-matplotlib3.9.patch" ) src_prepare() { eapply_user diff --git a/sci-visualization/spectromatic/Manifest b/sci-visualization/spectromatic/Manifest deleted file mode 100644 index ddda39e50c03..000000000000 --- a/sci-visualization/spectromatic/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST spectromatic_1.0-1.tar.gz 13724 BLAKE2B 91fb44ccdd1b41eb99204f654a02e7cff8e1798916936507a41c6f6d3c5726fe3d1d838d782d21604fdf1e1bd67760336cf41b4e016b10849b9f4cffe405cdf7 SHA512 b83acaacd21f7eb12ee3fd955073e8f95c02649de833a6087cf62786b20d8d1bf9a5b62920c17435510237797c6bc3a378921c4c1c2c4e4f74acbca49becfd6c diff --git a/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch b/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch deleted file mode 100644 index ea1fa0a70eec..000000000000 --- a/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch +++ /dev/null @@ -1,49 +0,0 @@ -Respect LDFLAGS, CFLAGS, CC #334715 -Fix install paths - ---- a/Makefile -+++ b/Makefile -@@ -1,33 +1,29 @@ - # Makefile for spectromatic - --CFLAGS = -O2 -Wall --LIBS = -lgsl -lgslcblas -lpng -lm -+LIBS = -lpng `${PKG_CONFIG} --libs gsl` - DESTDIR = --TOPLEVEL_HOME = /usr -+TOPLEVEL_HOME ?= /usr - --CC = gcc -I. -- - SRC = spectromatic.c wave.c - - OBJ = $(SRC:.c=.o) - - TARGET = spectromatic - --install: all -- mkdir -p $(DESTDIR)$(TOPLEVEL_HOME)/bin -- mkdir -p $(DESTDIR)$(TOPLEVEL_HOME)/man/man1 -- install -o root -g root -m 0755 spectromatic $(DESTDIR)$(TOPLEVEL_HOME)/bin -- install -o root -g root -m 0644 man/spectromatic.1 $(DESTDIR)$(TOPLEVEL_HOME)/man/man1 -- - all: $(OBJ) -- $(CC) -o $(TARGET) $(OBJ) $(LIBS) -- strip $(TARGET) -+ $(CC) $(LDFLAGS) $(OBJ) $(LIBS) -o $(TARGET) -+ -+install: $(TARGET) -+ mkdir -p $(DESTDIR)$(TOPLEVEL_HOME)/bin -+ mkdir -p $(DESTDIR)$(TOPLEVEL_HOME)/share/man/man1 -+ install -m 0755 spectromatic $(DESTDIR)$(TOPLEVEL_HOME)/bin -+ install -m 0644 man/spectromatic.1 $(DESTDIR)$(TOPLEVEL_HOME)/share/man/man1 - - clean: - $(RM) $(TARGET) $(OBJ) - - .c.o: -- $(CC) $(CFLAGS) -c $< -+ $(CC) $(CFLAGS) -I. -c $< - - .o: - $(CC) $< $(LIBS) -o $@ diff --git a/sci-visualization/spectromatic/files/spectromatic-1.0-stringliteral.patch b/sci-visualization/spectromatic/files/spectromatic-1.0-stringliteral.patch deleted file mode 100644 index d7233c1aab81..000000000000 --- a/sci-visualization/spectromatic/files/spectromatic-1.0-stringliteral.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff -ru spectromatic-1.0/spectromatic.c spectromatic-1.0-new/spectromatic.c ---- a/spectromatic.c -+++ b/spectromatic.c -@@ -21,6 +21,7 @@ - ****************************************************************************/ - - #include <stdio.h> -+#include <stdlib.h> - #include <malloc.h> - #include <png.h> - #include <string.h> -@@ -37,36 +38,36 @@ - void usage (char *pname) - { - fprintf (stderr, --" --Usage: %s [options] file.wav -- --Options: -- --window <size> FFT window size (default: 2048) -- -- --step <size> Slide the window by <size> samples each time -- (default: 200) -- -- --inverse White/Colour-on-black -- -- --logarithmic Intensity is calculated by -- log10 (1 + 9 * (amplitude / max_amp)) - -- better for visualising weaker signals -- -- --combine XYZ Determines how a stereo signal is -- represented as an RGB image. The argument is -- a 3-character block, each character -- corresponding to R, G and B components. It -- may take values of L, R, A, D, X or Z, -- meaning Left, Right, Average, Difference, -- Cross-Correlation or Zero respectively. -- -- --verbose Slightly less quiet -- -- --version Print out the version -- -- --help You're in it. -- --", pname); -+"\n" -+"Usage: %s [options] file.wav\n" -+"\n" -+"Options:\n" -+" --window <size> FFT window size (default: 2048)\n" -+"\n" -+" --step <size> Slide the window by <size> samples each time \n" -+" (default: 200)\n" -+"\n" -+" --inverse White/Colour-on-black\n" -+"\n" -+" --logarithmic Intensity is calculated by\n" -+" log10 (1 + 9 * (amplitude / max_amp)) -\n" -+" better for visualising weaker signals\n" -+"\n" -+" --combine XYZ Determines how a stereo signal is\n" -+" represented as an RGB image. The argument is\n" -+" a 3-character block, each character\n" -+" corresponding to R, G and B components. It\n" -+" may take values of L, R, A, D, X or Z,\n" -+" meaning Left, Right, Average, Difference,\n" -+" Cross-Correlation or Zero respectively.\n" -+"\n" -+" --verbose Slightly less quiet\n" -+"\n" -+" --version Print out the version\n" -+"\n" -+" --help You're in it.\n" -+"\n" -+, pname); - - - exit (-1); diff --git a/sci-visualization/spectromatic/files/spectromatic-1.0-waveheaderstruct-amd64.patch b/sci-visualization/spectromatic/files/spectromatic-1.0-waveheaderstruct-amd64.patch deleted file mode 100644 index 0c4253e7e765..000000000000 --- a/sci-visualization/spectromatic/files/spectromatic-1.0-waveheaderstruct-amd64.patch +++ /dev/null @@ -1,103 +0,0 @@ ---- a/wave.c -+++ b/wave.c -@@ -1,11 +1,26 @@ - #include <stdio.h> - #include <string.h> -+#include <endian.h> - #include "wave.h" - - int read_header (FILE *f, waveheaderstruct *header) - { -+ waveheaderstruct h; - fseek (f, 0, SEEK_SET); -- return fread (header, 1, sizeof (waveheaderstruct), f); -+ size_t red = fread (&h, 1, sizeof (waveheaderstruct), f); -+ -+ h.length = le32toh(h.length); -+ h.length_chunk = le32toh(h.length_chunk); -+ h.format = le16toh(h.format); -+ h.modus = le16toh(h.modus); -+ h.sample_fq = le32toh(h.sample_fq); -+ h.byte_p_sec = le32toh(h.byte_p_sec); -+ h.byte_p_spl = le16toh(h.byte_p_spl); -+ h.bit_p_spl = le16toh(h.bit_p_spl); -+ h.data_length = le32toh(h.data_length); -+ -+ *header = h; -+ return red; - } - - int read_frames (FILE *f, int start, int length, char *data) -@@ -52,12 +67,12 @@ - - read_header (f, &header); - -- printf ("Length: %lu\n", header.length); -- printf ("Length Chunk: %lu\n", header.length_chunk); -+ printf ("Length: %lu\n", (unsigned long)header.length); -+ printf ("Length Chunk: %lu\n", (unsigned long)header.length_chunk); - printf ("Format: %u\n", header.format); - printf ("Modus: %u\n", header.modus); -- printf ("Sample Frequency: %lu\n", header.sample_fq); -- printf ("Bytes per Second: %lu\n", header.byte_p_sec); -+ printf ("Sample Frequency: %lu\n", (unsigned long)header.sample_fq); -+ printf ("Bytes per Second: %lu\n", (unsigned long)header.byte_p_sec); - printf ("Bytes per Sample: %u\n", header.byte_p_spl); -- printf ("Data Length: %lu\n", header.data_length); -+ printf ("Data Length: %lu\n", (unsigned long)header.data_length); - } ---- a/wave.h -+++ b/wave.h -@@ -22,24 +22,25 @@ - #ifndef WAVE_H - #define WAVE_H - --typedef unsigned long ulongT; --typedef unsigned short ushortT; -+#include <stdint.h> - -+#pragma pack(push,1) - typedef struct { /* header for WAV-Files */ -- char main_chunk[4]; /* 'RIFF' */ -- unsigned long length; /* length of file */ -- char chunk_type[4]; /* 'WAVE' */ -- char sub_chunk[4]; /* 'fmt' */ -- unsigned long length_chunk; /* length sub_chunk, always 16 bytes */ -- unsigned short format; /* always 1 = PCM-Code */ -- unsigned short modus; /* 1 = Mono, 2 = Stereo */ -- unsigned long sample_fq; /* Sample Freq */ -- unsigned long byte_p_sec; /* Data per sec */ -- unsigned short byte_p_spl; /* Bytes per sample */ -- unsigned short bit_p_spl; /* bits per sample, 8, 12, 16 */ -- char data_chunk[4]; /* 'data' */ -- unsigned long data_length; /* length of data */ --} waveheaderstruct; -+ uint8_t main_chunk[4]; /* 'RIFF' */ -+ uint32_t length; /* length of file */ -+ uint8_t chunk_type[4]; /* 'WAVE' */ -+ uint8_t sub_chunk[4]; /* 'fmt' */ -+ uint32_t length_chunk; /* length sub_chunk, always 16 bytes */ -+ uint16_t format; /* always 1 = PCM-Code */ -+ uint16_t modus; /* 1 = Mono, 2 = Stereo */ -+ uint32_t sample_fq; /* Sample Freq */ -+ uint32_t byte_p_sec; /* Data per sec */ -+ uint16_t byte_p_spl; /* Bytes per sample */ -+ uint16_t bit_p_spl; /* bits per sample, 8, 12, 16 */ -+ uint8_t data_chunk[4]; /* 'data' */ -+ uint32_t data_length; /* length of data */ -+} __attribute__ ((__packed__)) waveheaderstruct; -+#pragma pack(pop) - - int read_header (FILE *f, waveheaderstruct *header); - int read_frames (FILE *f, int start, int length, char *data); ---- a/spectromatic.c -+++ b/spectromatic.c -@@ -217,7 +217,7 @@ - if (header.modus == 2) - ch2 = (double*) malloc (window_size * sizeof (double)); - -- fprintf (stderr, "samples = %li, step_size = %i, window_size = %i\n", header.data_length / header.byte_p_spl, step_size, window_size); -+ fprintf (stderr, "samples = %lu, step_size = %i, window_size = %i\n", (unsigned long)header.data_length / header.byte_p_spl, step_size, window_size); - - for (i = -window_size; i < window_size + (int)(header.data_length / header.byte_p_spl); i += step_size) { - read_frames (f, i, window_size, data); diff --git a/sci-visualization/spectromatic/metadata.xml b/sci-visualization/spectromatic/metadata.xml deleted file mode 100644 index 42e957230fc5..000000000000 --- a/sci-visualization/spectromatic/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?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"> - Spectromatic is a program for generating spectrograms from audio - files. Spectrograms are a form of simple time-frequency analysis which - lets you see how the distribution of energy at different frequencies - in an audio stream change over time. For example, if you play a scale - on a musical instrument, you will see a climbing and/or descending - pattern of blobs as you move from left to right. - Spectromatic reads its input as mono or stereo 16-bit wave files, and - writes the output image to an elongated PNG image (colour for stereo, - grayscale for mono audio). - </longdescription> -</pkgmetadata> diff --git a/sci-visualization/spectromatic/spectromatic-1.0-r3.ebuild b/sci-visualization/spectromatic/spectromatic-1.0-r3.ebuild deleted file mode 100644 index b9337658357c..000000000000 --- a/sci-visualization/spectromatic/spectromatic-1.0-r3.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -MY_P=${PN}_${PV}-1 - -DESCRIPTION="Generates time-frequency analysis images from wav files" -HOMEPAGE="http://ieee.uow.edu.au/~daniel/software/spectromatic/" -SRC_URI="http://ieee.uow.edu.au/~daniel/software/spectromatic/dist/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - media-libs/libpng:0= - sci-libs/gsl:=" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-makefile.patch - "${FILESDIR}"/${P}-stringliteral.patch - "${FILESDIR}"/${P}-waveheaderstruct-amd64.patch -) - -src_configure() { - tc-export CC PKG_CONFIG - export TOPLEVEL_HOME="${EPREFIX}/usr" -} diff --git a/sci-visualization/xyscan/xyscan-4.3.0.ebuild b/sci-visualization/xyscan/xyscan-4.3.0.ebuild index 0d14b12e89a4..571e6042a598 100644 --- a/sci-visualization/xyscan/xyscan-4.3.0.ebuild +++ b/sci-visualization/xyscan/xyscan-4.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,11 +9,11 @@ inherit desktop qmake-utils DESCRIPTION="Tool for extracting data points from graphs" HOMEPAGE="http://rhig.physics.yale.edu/~ullrich/software/xyscan/" SRC_URI="http://rhig.physics.yale.edu/~ullrich/software/${PN}/Distributions/${MY_PV}/${PN}-${MY_PV}-src.tgz" +S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" RDEPEND=" app-text/poppler[qt5] @@ -26,8 +26,6 @@ RDEPEND=" " DEPEND="${RDEPEND}" -S="${WORKDIR}/${PN}" - src_prepare() { default sed -i \ |