diff options
Diffstat (limited to 'sci-visualization')
60 files changed, 1110 insertions, 1360 deletions
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz Binary files differindex 77e2b6108010..e8046dc9384f 100644 --- a/sci-visualization/Manifest.gz +++ b/sci-visualization/Manifest.gz diff --git a/sci-visualization/fityk/Manifest b/sci-visualization/fityk/Manifest index 9b73dcc09048..b4686136b84b 100644 --- a/sci-visualization/fityk/Manifest +++ b/sci-visualization/fityk/Manifest @@ -1,6 +1,3 @@ -AUX fityk-1.3.1-fix-gtk3.patch 887 BLAKE2B 3cb5efcda7d696c491bc5d4b4215714b19fc0e876cc59c5b37999c6950e1a26ab979cf0a4c50bd7cbe4a3bde26b4b394b07819381a6b11eff957f375a5d49f90 SHA512 a835ad7ef3ae084ac11195924eb4305cf1dcb8282fa393719c7bfd4983fcf51143744954051ee5b0dfc7956322890d1391ee5c4e3b0fcd27924cc042db5a0cdb -DIST fityk-1.3.1.tar.bz2 1518937 BLAKE2B 6eb13646e1b5cf3fb0763bcf3e91a1877d89f14f1b986f1065fd27052e7110b357c99431a326a6c1fa2ba002300912b922cd3d5589ac5da367d2fbcee209f9a2 SHA512 4a7a65691af8b8d5b47461133b7870ea21ea04ac2ee8ee5714a6b9bab2f072baa6b5d8bf011baba09c62a7ce2dc9d60f3040cc6fdb77dc498b6e03a24fc0fe08 DIST fityk-1.3.2.tar.bz2 1611794 BLAKE2B 294d64ed34532e7c126a7128c6f027004c86093293f335d5d900bffc5e1fc6d56b48f8a1ca0739f00b9983f9d21c544a3296a12e187401c0bf429cb545be10d7 SHA512 6871358cc1d12479f4ae8d76260412095fa17247b2bd76d7b036be330d73b8aac6d242239aea5c086a2eefad1bc387caa83e5a61452016cd77ea6a88e387aee3 -EBUILD fityk-1.3.1-r102.ebuild 1340 BLAKE2B 998740e227b596f9a71a42debde82d05f18347ec7310cffad14bab84367da40412ce170aa93b0b14bc87d7a729695c5e936b55d130636f3b129ca774571498b7 SHA512 cabb30710dac2a0b9ea93db7a5a33cbb1a885b57c887da86b5cc6c12e1fc720f1d2a576eb834bb2eb6b12ed952d159487b0b403e184a36dda27c5f830b94f1be EBUILD fityk-1.3.2.ebuild 1337 BLAKE2B c874cfa55702b8cc25c7ebc9ac94a843e3377b4b678b5922f9cd16870c4e41ff3c83a11ff6b71bb61e5b3dcccc22aa7af84bf61a37cfcd7765ff21bd2d353cd1 SHA512 f03b3cf0af62bdafd7ebc1609050d0139fb4b6d362dd2c50533ad8232ca75d4ff3fe83e81d6966b95baef13082c600f8253aa129bafa1507bce76da15c0392aa MISC metadata.xml 1381 BLAKE2B b1f8a99839a3f426d68ef879b5f7cc8e06c6e82558135040d43fb913b0a42ae678a684d5c9c15e11487624b58f716df66771491cf400f976bdb156d75af51d17 SHA512 3d65b0d4a387a26d5c6cc716c93dbdf8d167bebf9191e2d71f430271240a8c935057ce26718941ac4edbb663501c441537bf3cde4840fe779f73ab75ac67eb4f 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/gcalc/Manifest b/sci-visualization/gcalc/Manifest index 45aeb3342a55..2029c378b4d9 100644 --- a/sci-visualization/gcalc/Manifest +++ b/sci-visualization/gcalc/Manifest @@ -1,3 +1,3 @@ DIST GCalc-3.1-rc1.tar.gz 543699 BLAKE2B d9d9c05ef8d0eca0f5c67ab250ca6df66e5061e458c6adaf53a612ead63e904a4d3c3d8dc381288eb06b626ae2eefff0a69b83583e77b38590a95093d5db4b39 SHA512 6cf66bb1a3867370c027c1c5b82f30b22d146483a8be4a997a6f917142bc83d732cc064eb3f2ff28ea4fcb1583695097d218c7fa092e78d8fb9ba2511261cbda -EBUILD gcalc-3.1_rc1-r2.ebuild 788 BLAKE2B 5a6726e898b50134461c3fd4ef3a7d146493c03970be0c21dc7938ddb059c9d97bfc4ac8269c7b6487126aadb22710eeb7a351c8e4e71546a67fa9e583727c08 SHA512 c11ed2ad0ab37c27b909619ca23a8e6b48283af8929711ffcbf34ff78022c4143d6cde7ab9094c655370208e49133ad56360a8166f072508069f74ba257c4e87 +EBUILD gcalc-3.1_rc1-r3.ebuild 821 BLAKE2B 6412a5b3ae9bb36144eeb06080c96c743c2179672ca574c613a1cfe45fcc00d75aabb0923d4e5867edeb625494bc3b3ecdf1c084611c4f855473c61aae73ca7b SHA512 655bc4bfc06a1fd1b2786baf175d29ec313912f0b098b1114a1f353129f84033eca757f547be6caf1431194800b34b1bec7e9133d9a6ebb26298ded1676056f4 MISC metadata.xml 343 BLAKE2B b7ed32ab44656a5b3a62221431ac1fc56e5b14bb87ee6940467bdf77b25b1f1a2eaf4bf2fd4273d826df3c46aee8e6a2672d23a642ba5ee3036a03f2997b192e SHA512 09d2eae942294d202cc820d65fb616daf2b46de42dc78857a69aae66497e2043a5b08c1b0dc5530adb69b3013ccf7d2407c196fd9bac46de012e2999ea5d3fa9 diff --git a/sci-visualization/gcalc/gcalc-3.1_rc1-r2.ebuild b/sci-visualization/gcalc/gcalc-3.1_rc1-r3.ebuild index f5a27970376f..825f3b99f106 100644 --- a/sci-visualization/gcalc/gcalc-3.1_rc1-r2.ebuild +++ b/sci-visualization/gcalc/gcalc-3.1_rc1-r3.ebuild @@ -1,38 +1,37 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop java-pkg-2 java-pkg-simple MY_P="GCalc-${PV/_/-}" DESCRIPTION="Java Mathematical Graphing System" -HOMEPAGE="http://gcalc.net/" -SRC_URI="http://gcalc.net/files/${MY_P}.tar.gz" +HOMEPAGE="https://gcalc.net/" +SRC_URI="https://gcalc.net/files/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" -KEYWORDS="~amd64" SLOT="0" +KEYWORDS="~amd64" -RDEPEND=">=virtual/jre-1.8:*" DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" -S="${WORKDIR}/${MY_P}" +JAVA_MAIN_CLASS="net.gcalc.calc.GCalc" +JAVA_RESOURCE_DIRS="res" +JAVA_SRC_DIR="src" src_prepare() { + java-pkg-2_src_prepare java-pkg_clean - default -} - -src_compile() { - java-pkg-simple_src_compile - java-pkg_addres ${PN}.jar src ! -name "*.html" + mkdir res || die + mv {src,res}/resources || die + cp {src,res}/pluginlist.xml || die } src_install() { java-pkg-simple_src_install - java-pkg_dolauncher gcalc --main net.gcalc.calc.GCalc - - newicon src/resources/gicon.png ${PN}.png + newicon res/resources/gicon.png ${PN}.png make_desktop_entry ${PN} "GCalc Java Mathematical Graphing System" } diff --git a/sci-visualization/ggobi/Manifest b/sci-visualization/ggobi/Manifest index 2acf41c3e510..39a2351d457d 100644 --- a/sci-visualization/ggobi/Manifest +++ b/sci-visualization/ggobi/Manifest @@ -2,6 +2,8 @@ AUX ggobi-2.1.10-desktop.patch 321 BLAKE2B 68dd4823b4e1fbe102664c0223791eb65c247 AUX ggobi-2.1.11-Wformat-security.patch 1109 BLAKE2B e629aa6d52caecb00c962f531ea3afb151efb5f0dbb813e8142706de6860792449c4cbc8cfacb70a020c81010ee19fb0c0f2346da60a57dac103b4e079c11565 SHA512 18162cc1ab6e8065de5602b54058f4ee11f9cb25d8ab0ed3bc176802687009f9d75c7c3a9909cd3439544c8989de0d53e3bd9744183f44fc07e8b6ba456200e5 AUX ggobi-2.1.8-plugindir.patch 426 BLAKE2B fe043ae4458c441cc0e5164023e6ffa0e75ce005a80c9740d236975d6bca02fc89dd0d87c79d318f54e08318c8d3726c00fe2c2413c41dbdfe1876de43c173c6 SHA512 3e55ca6e23d888907428d36a23583cc9067fa91204f7aa0328529039ab390ef55b62bd290b56053f70bb5b12d26e144f0dd96cedfae5b4ca426bc24d48b4ea48 AUX ggobi-2.1.9-as-needed.patch 2157 BLAKE2B 17d09319c9328badb9b5e96bfda2bd56aae0a9f77696b9f5c8a5a858c255a127bca074cc0e74aa94b61193c4ccaadf4b11b1437650043198ed3bf382b9ef8711 SHA512 ed3ebacd819473df3a4bf712c749d354a5589a2a533d880811732da8e7d71122aaebdcea1da73056bd1aada4c2b695a9e6cb60db7f8daddbce1a2d84e670d502 +DIST ggobi-2.1.12.tar.gz 1730589 BLAKE2B 11ce66d66fc11ed3b7e7dde20e978348eaf8e8d42f46d99de014cd7efb23109d5e50ad2702fb492cdc4939b2c04bb17ff775918f26467e28eb2a1841117709ab SHA512 f4096bf7acc05cf300f4b67f02d7ee7b942fc21cfa26203440f5fe47600b3bf3a9029b8005d757b32cbe047d6a4ec6bd375cdf6d791fa8e1658918f8655dca1c DIST ggobi_2.1.11.orig.tar.bz2 2787709 BLAKE2B e4b853f3212abda00150e6a3b3a344638225bdc564c109632c7ca2f9cb8cc41d35af9df1ee153d2ede3bd3191d9219e2bdd6bd6bc9c64f42447dfe17562361f1 SHA512 d34c6569d05d1e680101b62745012940c1e18c1588cd37b89b26b89e9eed9bab8fc53e0585a595b6cb4c9f2bb7d603ca4252cb6a6ba344bbc24e5cc5fd8a6dc1 EBUILD ggobi-2.1.11.ebuild 1398 BLAKE2B a021bc3c9dfa0d31288950b7457e00715c1c519c49692e841055ba9ff896fcc3b72d54d38acee3a3d1d6ac34c3ba6ef3c846cc7f3bb60154f93109d186d8b773 SHA512 5f0dd19e1e7215b3b5e4e21bcf792ceaa4f68f862a325dbc1543a8dac29d3a19d051f2d42ecb09e4f3bb053f75af9d53277fdeeff04a1c82185f915a67b14e3b -MISC metadata.xml 625 BLAKE2B 5a2e7a64c0c7739ab933c6d27850b7c56fa705398c14f3315d9d92645a8f8dea1de278847251c0b7532100af2cbd82829602c433470b31d82e342cb0e41e68e2 SHA512 bae4dd5f83c87c129b08e415dc30b11a553ea5611bcc084f177d042bf8b4cc6df4a49838f4da721153138525d20dc7ca65f0327db101bc0084a5a5b4b8c9a963 +EBUILD ggobi-2.1.12.ebuild 1091 BLAKE2B 4cb8217b784ebe4759233bfabc7d36d71f286eb6d01e1cfc235f3f778f44a372473813c4444762a375f09ff5c7d4133eef68adff8e964395c7afb506052ceab3 SHA512 a85a0441d2d78b88b97a5a988581ae1aaa56b522a22bbe0af77085ca6a1ee0115b7e900229a6acdf80d36b571eb38661b24b54ce730a1b25cea34db40c768e63 +MISC metadata.xml 701 BLAKE2B 31da61d14e9a98adad0028b5057e6bf39bfa20b87f0a5345e715b2c082731aedcae351587775cb15fe890cdddd73f8feed8054665a66034f9d79a013249e6012 SHA512 2c323be61a8039ffd6fc45e2c3f10211667c6c17dacf004c483cfc641c49a3a7e5bd3210fdc1ce0c8e39fbc47228dc6c036d53b82e9490f42067f9b93799cbd9 diff --git a/sci-visualization/ggobi/ggobi-2.1.12.ebuild b/sci-visualization/ggobi/ggobi-2.1.12.ebuild new file mode 100644 index 000000000000..ec5c7c800e29 --- /dev/null +++ b/sci-visualization/ggobi/ggobi-2.1.12.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit xdg + +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="https://github.com/ggobi/ggobi/releases/download/${PV}/${P}.tar.gz" + +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}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-2.1.10-desktop.patch +) + +src_prepare() { + default + + # need the ${S} for recursivity lookup + #AT_M4DIR="${S}"/m4 eautoreconf +} + +src_configure() { + econf \ + --disable-rpath \ + $(use_enable nls) +} + +src_compile() { + emake all ggobirc +} + +src_install() { + default + + insinto /etc/xdg/ggobi + doins ggobirc + + 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 5958ca61110a..d9ff71b39daf 100644 --- a/sci-visualization/ggobi/metadata.xml +++ b/sci-visualization/ggobi/metadata.xml @@ -12,4 +12,7 @@ scatterplot, barchart and parallel coordinates plots. Plots are interactive and linked with brushing and identification. </longdescription> + <upstream> + <remote-id type="github">ggobi/ggobi</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-visualization/gle/Manifest b/sci-visualization/gle/Manifest index 0b784632deba..dd1a2af01dc6 100644 --- a/sci-visualization/gle/Manifest +++ b/sci-visualization/gle/Manifest @@ -6,5 +6,5 @@ DIST gle-4.3.4.pdf 3950922 BLAKE2B 7151b88bdbcf55c6a23b2190cbc00d1cbec78c3026487 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 -EBUILD gle-4.3.4-r1.ebuild 2254 BLAKE2B 2fe9fa87bdf5715ad50493119819302d049d37d92c1571c4a0a84e26ab3801d1ff97ca89790fd26eb59a51f505cb01e3657cf38da6a98c33f870d0e4b24331d9 SHA512 cd4cdabc55b8ec72426400a9c8d4a865f9cf7edd6526f8432f80f7b13483e731b2d288c3f5d1e2fa726266cbceace4edb56e616eda56ee74a834270cf0dfb023 +EBUILD gle-4.3.4-r1.ebuild 2375 BLAKE2B 11f79f22c126a936d2423eadace3fa19ee8bd3797d983a8065ea74b25f9d5c12b82221477397f5439e00c839113a9aa8b1fd131033c3ea77bc0f0394a2db9aaf SHA512 7dd0ab155e7cbe5edab2b153c69816d43b95c923dab723c7a3edb0899c57ff541da2699d25729ab2c3c65de6467f54954956ece854fb657925469eb499b1610d MISC metadata.xml 758 BLAKE2B ea6e049fe37e4fc4cc9510774bb13ec9d2107ca1e4078a9bf22afadb59a375ced01aab6cffc674bcce01e4e51960db830e7a381600322f903f6b1407cd11ae13 SHA512 953fa5de474729f4196392b9ccb09d9a07799c26d5e5ef3422bc8e737bb666c8bd66e1931c225d049e30be31fc427909225d5457b95c78de2f2073d0108d2620 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 6482054252fc..c09f33f1b448 100644 --- a/sci-visualization/gnuplot/Manifest +++ b/sci-visualization/gnuplot/Manifest @@ -1,11 +1,12 @@ AUX gnuplot-5.0.6-no-picins.patch 956 BLAKE2B 41485f39f7640426624abcfa3f9231768044d11a6fdea838a964070465d2af00149bed5715a2a97ec6cfd1dddd32169a0694685d36c806982eb1b10676f4dd28 SHA512 fe66f0d8045be89d6464b9de9aa7d80196b4eccf0d0aab3daf6b0a121f5565bb96f11e0f96d9d9c296795b86e11300ddb9811100671fc4470d2dbf8097fbb02c AUX gnuplot-6.0.0-configure.patch 401 BLAKE2B 82246d32c49730c0688b810f19984338f072896b694dcf36bc4aedcfe65112f384323c15cf9d3ee10a9200f6b3b38f5065e97fc40537e9b9c1b9daa1c4c79a8c SHA512 4d959633c82be8532eee5ec84f90aaf5863f5d5d420d37c8c14bf7adf3df39726ff8d3e9b3befb933fd6aee8b4a73410b4aad7e08538ca27739f4db61e47243b +AUX gnuplot-6.0.1-watchpoints.patch 401 BLAKE2B 1fdb7c17fadac15e36dc35f5a1409618f99b6f53a7ee8c7b3a74ffe0c36f5da087e3faaea661bb861523e29a786cc72832b068639900ab296ef4a625af220d65 SHA512 b380fbfb3c9aa8380806f1061b6e79fbb8f9eb306ab9d031dc938c38b33d86fe5698503059f62d862bf39de2089fc3ae3f5815dacb799b38e54732d438a80173 AUX gnuplot-6.1-no-picins.patch 628 BLAKE2B ab7ffcfecee328d4a8653af0c5cf80470ac65299b5576835db5083b01b461b359775b2b72ef87a757072cce406daa18d3b116bae2c89f8291cd4154e0a7300e4 SHA512 45f5db5745de1d96a2abf987f2d5e85a827bbd298675f4f4b1526ff96d22de12c4b8de75b86fb87447891aaa9e45b158531d1bf7386617824057b56c9de5f0c3 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 -EBUILD gnuplot-5.4.10.ebuild 5045 BLAKE2B 34f31c96cc89f8aa0d87a88490fbf947dd6dd60cd1e783761863b2efc7435d4a7259fc5a67a0f41396cc198040304360e1f81c985d4a76b6edc1b82cc7544302 SHA512 c02c3845169bb46a9a9759b17e4c3b1bec7467147bb45c5444f41895c22457608661b12aa6d136f0b9562ed295a8b375576935134fb2ca49cf1f84c4db59bcba -EBUILD gnuplot-5.4.8.ebuild 5045 BLAKE2B 34f31c96cc89f8aa0d87a88490fbf947dd6dd60cd1e783761863b2efc7435d4a7259fc5a67a0f41396cc198040304360e1f81c985d4a76b6edc1b82cc7544302 SHA512 c02c3845169bb46a9a9759b17e4c3b1bec7467147bb45c5444f41895c22457608661b12aa6d136f0b9562ed295a8b375576935134fb2ca49cf1f84c4db59bcba -EBUILD gnuplot-6.0.0.ebuild 5005 BLAKE2B 17de0ee76b7dee095501cafcdfa30b00d44dab4cff1c96e2b309e3b9940fa25b6b25c8b1ab314112fc0df51e091cc231e480e8eb53d4c5e9b335d746b5e487a7 SHA512 02680b378407120980cb61cd36b2400bb1ba0583ccd3f6944c05a4d4633ce2860f7ee984c4ad3ac1ca0eededf1a675c0ab451a46d61b893c55ae57fc02c6ddf8 -EBUILD gnuplot-6.1.9999.ebuild 4962 BLAKE2B bfebc677042f2d56e3c553c19cdf0afc0c06988feb6d0a780cfb14d6b04e480e1fb2cb949650e18a5b6ba1fb8a770d46ea85702caf9507935b79e025303d1f2d SHA512 c1a8e70f0b7e82723045df2bd70c3858b4d0619923d20623a1d632e4f35be044f6b61b76c31996ad37c3a07eda026b742525474b14217e65ba22b5917ab7feea -MISC metadata.xml 1070 BLAKE2B 92ac6f016dedc1ee0aced2792c735e692efac0b0c045b7119d6f2268ed9a7ee3c2437a4038ff45799670265e01f74d8470e3c0abf45b35980a4e761fcd802d19 SHA512 04100f29255dd4d3caf3c81a39f7d6f8ad341598e89555219ba054e980484da00835c2226f35a2b63ec5f27238a97003c7bdac28ca504aed68af0fad737beb8a +DIST gnuplot-6.0.1.tar.gz 7528936 BLAKE2B d385d4dc8a4af83f121bd062e014d8845078f5aeb84244f4cce7c17b7cf71c5fc66bd7b8623504ab53567b4123fc739506f7d2f8e4f8ad184258a7568f0223a2 SHA512 47e72ac444f35e22a5de111da3333c80846226d87411a3168e45a8433a258e351ad9b6f0ba21d76f2456042b755123a697b685fd2552b4bd9edc5b97fafcbc62 +DIST gnuplot-6.0.2.tar.gz 7637308 BLAKE2B e06923c89f3f89bcefbf69c469036763d0da5cdc8c860e07631be7bef12a7e2e81b1315aa671c1e6a6948202e860bd0dcd4f0f57c1dba9b9cff37659ce586999 SHA512 5c26c91a91238be0dad91b0835427355b4db526e6a83225219219b3c980e245abcd4b54d1c693523d645c469f3c610658da0c889df691ba8ba6799efe440ed01 +EBUILD gnuplot-5.4.10.ebuild 4855 BLAKE2B 95ec7836b7e5b13260288e3b7504ee1361c271558ff38dcd94fa0a41c0ca286a194edf53e8ae316894966ffe74ddc8ac6df99757a3bd9a64a58ae7bdba521c84 SHA512 ebb13fd716d50e70ae7b5724fdd2155c08ab3e4351f411f56bcc2c24ac1c438378ffecf6c8be4fed53c6655ab9f6433b19a058bc49d246800914877a031a406c +EBUILD gnuplot-6.0.1-r1.ebuild 5295 BLAKE2B e1da1d07cef71c4ff8f079c81720c6310eabbfa7857ac1ef38e34990c8e3282f177f69879f67ca2c7989a0b1ef4898d317ec65d03895c173fcc5f6e0776c4b71 SHA512 0fc96ce006c8ab4f0d2d67c89894d9f5d071c92705ac7058f896aa33294ef87e4bf7cc282b08cbf4de69f35f714ca4e35db962616fed03490545998b35bb773c +EBUILD gnuplot-6.0.2.ebuild 5213 BLAKE2B 5eef0bb6e02b8b9308363464f1fbab664b7fa743cc45c7af66e0c2c72fc52439528d1cab8f093ce407e23128b4a9409de3c8460f3b22335da59fd33015360220 SHA512 7b90196301ebc006e610c111bbf72d65814127e47410db7f3e9655c50593d924e5bda820b442c707a211de463765a7dbe72e640c62818c44dfc55551eda85f41 +EBUILD gnuplot-6.1.9999.ebuild 5089 BLAKE2B 1a010613388ba22e00033ccfab686216e1855b2203dbb7e5f6ceb2153985863228642476af641aa636de8fca515618358523b4327654f426f9bf9fce1505434e SHA512 848df7e391f037f1dba2b9c550bb8f9927460236acf061e3fa08513a814393c7c8b3b7cd92f8182cdd637dea029a26e2ed676621e7806f81a9ccbb3feaa181ee +MISC metadata.xml 1487 BLAKE2B f903fd16007f638163484d2c635c1eea3040cee929230f9c6578f190a65707ade22d7e08a7a9d2f354bafa7ed92c85b7db0182fe1b8584ce0e201665b8cadd55 SHA512 fe61bdbea5637e7eba0c1e726404068c861b151843c88da1972df2b132ff40d9e402a7b39f02750a05a233c17c572fd78ff26cadcb2f5fd9f0a9e201caa9da63 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..b130a44172d5 100644 --- a/sci-visualization/gnuplot/gnuplot-5.4.10.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.4.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,14 +20,14 @@ 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 ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X" +IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua readline regis wxwidgets X" REQUIRED_USE=" doc? ( gd ) lua? ( ${LUA_REQUIRED_USE} )" @@ -45,13 +45,6 @@ RDEPEND=" >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( ${LUA_DEPS} ) - 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 ) wxwidgets? ( @@ -73,8 +66,7 @@ BDEPEND=" dev-texlive/texlive-latexextra dev-texlive/texlive-langgreek dev-texlive/texlive-mathscience - app-text/ghostscript-gpl ) - qt5? ( dev-qt/linguist-tools:5 )" + app-text/ghostscript-gpl )" IDEPEND="latex? ( virtual/latex-base )" @@ -137,8 +129,8 @@ src_configure() { $(use_with lua) \ $(use_with regis) \ $(use_with X x) \ + --without-qt \ --enable-stats \ - $(use_with qt5 qt qt5) \ $(use_enable wxwidgets) \ DIST_CONTACT="https://bugs.gentoo.org/" \ EMACS=no diff --git a/sci-visualization/gnuplot/gnuplot-5.4.8.ebuild b/sci-visualization/gnuplot/gnuplot-6.0.1-r1.ebuild index d09ffadae337..85bfbaf518ef 100644 --- a/sci-visualization/gnuplot/gnuplot-5.4.8.ebuild +++ b/sci-visualization/gnuplot/gnuplot-6.0.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,24 +20,25 @@ 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 ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X" +IUSE="amos aqua bitmap cairo doc examples +gd gpic latex libcaca libcerf lua metafont metapost 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] ) - ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( @@ -45,13 +46,10 @@ RDEPEND=" >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( ${LUA_DEPS} ) - 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= ) + qt6? ( + dev-qt/qt5compat:6 + dev-qt/qtbase:6[gui,network,widgets] + dev-qt/qtsvg:6 ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) wxwidgets? ( @@ -74,7 +72,7 @@ BDEPEND=" dev-texlive/texlive-langgreek dev-texlive/texlive-mathscience app-text/ghostscript-gpl ) - qt5? ( dev-qt/linguist-tools:5 )" + qt6? ( dev-qt/qttools:6[linguist] )" IDEPEND="latex? ( virtual/latex-base )" @@ -82,7 +80,9 @@ GP_VERSION="${PV%.*}" TEXMF="${EPREFIX}/usr/share/texmf-site" PATCHES=( - "${FILESDIR}"/${PN}-5.0.6-no-picins.patch + "${FILESDIR}"/${PN}-6.1-no-picins.patch + "${FILESDIR}"/${PN}-6.0.0-configure.patch + "${FILESDIR}"/${PN}-6.0.1-watchpoints.patch ) pkg_setup() { @@ -128,17 +128,21 @@ 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 ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \ + $(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 qt6 qt qt6) \ $(use_with regis) \ + $(use_with tgif) \ $(use_with X x) \ --enable-stats \ - $(use_with qt5 qt qt5) \ $(use_enable wxwidgets) \ DIST_CONTACT="https://bugs.gentoo.org/" \ EMACS=no @@ -150,16 +154,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() { @@ -189,7 +195,7 @@ src_install() { if use doc; then # Manual, FAQ - dodoc docs/gnuplot.pdf FAQ.pdf + dodoc docs/gnuplot.pdf #FAQ.pdf # Documentation for making PostScript files docinto psdoc dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README} diff --git a/sci-visualization/gnuplot/gnuplot-6.0.0.ebuild b/sci-visualization/gnuplot/gnuplot-6.0.2.ebuild index 6dc345a591ee..90c9c00cbe7a 100644 --- a/sci-visualization/gnuplot/gnuplot-6.0.0.ebuild +++ b/sci-visualization/gnuplot/gnuplot-6.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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 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 ) @@ -44,13 +46,10 @@ RDEPEND=" >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( ${LUA_DEPS} ) - 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= ) + qt6? ( + dev-qt/qt5compat:6 + dev-qt/qtbase:6[gui,network,widgets] + dev-qt/qtsvg:6 ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) wxwidgets? ( @@ -73,7 +72,7 @@ BDEPEND=" dev-texlive/texlive-langgreek dev-texlive/texlive-mathscience app-text/ghostscript-gpl ) - qt5? ( dev-qt/linguist-tools:5 )" + qt6? ( dev-qt/qttools:6[linguist] )" IDEPEND="latex? ( virtual/latex-base )" @@ -82,7 +81,6 @@ TEXMF="${EPREFIX}/usr/share/texmf-site" PATCHES=( "${FILESDIR}"/${PN}-6.1-no-picins.patch - "${FILESDIR}"/${PN}-6.0.0-configure.patch ) pkg_setup() { @@ -128,16 +126,21 @@ 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 qt6 qt qt6) \ $(use_with regis) \ + $(use_with tgif) \ $(use_with X x) \ --enable-stats \ - $(use_with qt5 qt qt5) \ $(use_enable wxwidgets) \ DIST_CONTACT="https://bugs.gentoo.org/" \ EMACS=no @@ -149,16 +152,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..6dbe8779a478 100644 --- a/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild +++ b/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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 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 ) @@ -44,13 +46,10 @@ RDEPEND=" >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( ${LUA_DEPS} ) - 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= ) + qt6? ( + dev-qt/qt5compat:6 + dev-qt/qtbase:6[gui,network,widgets] + dev-qt/qtsvg:6 ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) wxwidgets? ( @@ -73,7 +72,7 @@ BDEPEND=" dev-texlive/texlive-langgreek dev-texlive/texlive-mathscience app-text/ghostscript-gpl ) - qt5? ( dev-qt/linguist-tools:5 )" + qt6? ( dev-qt/qttools:6[linguist] )" IDEPEND="latex? ( virtual/latex-base )" @@ -127,16 +126,21 @@ 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 qt6 qt qt6) \ $(use_with regis) \ + $(use_with tgif) \ $(use_with X x) \ --enable-stats \ - $(use_with qt5 qt qt5) \ $(use_enable wxwidgets) \ DIST_CONTACT="https://bugs.gentoo.org/" \ EMACS=no 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 268f079122f9..ad89f8e49c63 100644 --- a/sci-visualization/gr/Manifest +++ b/sci-visualization/gr/Manifest @@ -1,6 +1,6 @@ AUX gr-0.53.0-musl.patch 797 BLAKE2B 4eb48a510b19a23cc4c82e0f81a1f9753c96f0554edecf4a4163b17be9505e8c8d0710f9c97c49dadb84fefe69cab27a3bfbb6cfe04b97b0d9a260b6e4042fe5 SHA512 5080806ed0598d404a380c3d8fe10207dd3fc1245b76992c341261f43b9727a82f7ebd85e582c606d6ccaf72eb04a57d21ccc0168e5c19b6b37cb2b265fa0018 -DIST gr-0.72.4.tar.gz 9067899 BLAKE2B 827c80dbfc3483abe4af217c06549c64aa134446e831a5d7fab3906a3aac7bb23b66f8b98674220ff1b6fbd5fad60b9a8e7f7361a27370c033d9375a18f63234 SHA512 4ae1aae6854995ae58327d41930cedd96ef973ce65467f48f24d9985b27b5af2aa0eb6832a801b46e6fa71cade99117957c96738cb000306b0574b0e471692fb DIST gr-0.73.3.tar.gz 10076655 BLAKE2B 13bd461b39a86473290912f5a9ba5a4b5ea3ffc8865f6909aad1fc92acf6d39fdb12910e2bf0f8108b7bef1016652515c6cc188db0b98dd052459400b30895ba SHA512 f45daefd880eec9380a2a31f1cd3b124469c1d33c34a9d13a3718b1978da507620b6f7cc025dd20be81a70f52537dbb4537548d8cc32e133693d9b7ae2f476e5 -EBUILD gr-0.72.4.ebuild 2289 BLAKE2B 276f7a9dac58ccf66591c518742837c1e20f4c40690c98744287553bb96d6d4b15d079a425c72465ee5330eda126ec4b5746c596ffc7ecc2b189b63be513db85 SHA512 5c29d01631d8ad9a66af9539bfd5cd41d7b7c811d761d7b2c73fb80ae8bc07be8bb3610d008da10a0669e56828da454ce35844e2e34d47817defe269094e0fe5 +DIST gr-0.73.6.tar.gz 10109682 BLAKE2B 15499dc9dbe42b3530edcba29a1ca82f05051a499a0656af1fa94a90d6b9ac3a321118694c80f2e52b092a8b3840105d92cf6df1fe079062183ea11de995c20b SHA512 4b96b55c540ec2984042ff308c7ef73cfed1008c4de8a4b77be3e13db06cfeb648e5e0ec511a2387b4c545005aa7924d40b74c0d8a62f30d2c36388e3f2b9128 EBUILD gr-0.73.3.ebuild 2297 BLAKE2B 87bbba0668d22bc6f43c123dab81a9e92f9d99180176778a415ba49ab198a9d9c7deed65f53f57c834ec34b4bc5ae5e5276826f77234525f540fa71dcab69a5e SHA512 e106db36df8c4a23144cff2eadab161e94945a357a2611274e9ab181a394941d6451ca3f894c681422f1922b6a456e6c86d8f5be52d55429171898bafc7e3f51 +EBUILD gr-0.73.6.ebuild 2297 BLAKE2B 87bbba0668d22bc6f43c123dab81a9e92f9d99180176778a415ba49ab198a9d9c7deed65f53f57c834ec34b4bc5ae5e5276826f77234525f540fa71dcab69a5e SHA512 e106db36df8c4a23144cff2eadab161e94945a357a2611274e9ab181a394941d6451ca3f894c681422f1922b6a456e6c86d8f5be52d55429171898bafc7e3f51 MISC metadata.xml 430 BLAKE2B 922435158e29d041da262d3aeea2acaf7e3bc422b3e474ff4f3b80aecc014b07c44135dc8ac24d04a39492570d1e3125227c35219b152a4e55bccde56ab00482 SHA512 7a68b4489a3de564b6239ea25d02ffa19384ea2b7813c26d68931784e863b7199a2b17ac99165e67062c4b594ce4895b6459c4c695db0c1db4c55c9fbaac4655 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 b953a7400386..5269a24c7851 100644 --- a/sci-visualization/grace/Manifest +++ b/sci-visualization/grace/Manifest @@ -2,9 +2,12 @@ AUX grace-5.1.21-fortran.patch 649 BLAKE2B c0de10fc82809fa0ec73e6fdc03e7b50ac18f AUX grace-5.1.22-dlmodule.patch 355 BLAKE2B baee835ed77d6720f145a7973a5a1e58359d129eb514b4e8ec13f3390dcd39f9842cee30a6ac131b79c2f3deaffecf76e41ddb5df0b8a26f67aa1b85959aaddb SHA512 8ce040b56992712a11f2d00aa1aca67120e16df187ffed9541bb5fdc390c7555461d3ccbfbc3448e68d9a41b6b3bf9d1d2f3dca10259393c96665e3ba489ef34 AUX grace-5.1.25-honor-noask.patch 419 BLAKE2B 5fdfc9228d001ec8a0016b8dfc5a4df1d95f0a0931e602d2f2a4099ae88b65904546f337528b28a4de2af6561bf05172d25bad0a75bd3eb343c0fdafc92efde8 SHA512 5b089de3b58d7107674cb8f07fceb0ef639208a534c56d785add156b04857fe9ae2a04edd68ec1f74eac12a2a32d255550782042801a092137cd24b481368d04 AUX grace-c99.patch 346 BLAKE2B dc63430fd61f1dd53e3f0bc9515d61929d834e957af03c02c607eab8061c05c1e74bf5db57c08182e5bc95d005216b11d79309cd06fddee4b2578f7fe99f304b SHA512 880e825ee4ebbbb5bc7d8fb500bd54f773982817a6c52606d4b7f3a02bacc627416a08b1aa3f0e1a121424f4b0f8d9a9f23d239376d477239a5511b5c2f63c86 +AUX grace-configure-c99.patch 2322 BLAKE2B 0c7553d7ddf9ac5efc44f0e45c39d68910235eaf9d37192564dc9cc653e35d37a7d1535bf3630b28e5930bb14cb426e60aa5536e3ff7406e5e5b53d642ab437d SHA512 e0bad3183fbb0dadf707040570ef589da3bd15c2e5d060da9b98ee55219a533e5a22520d92e1116fa35aed88cb0ac36762322d9ae710bc547c7521f9542238a6 AUX grace.desktop 161 BLAKE2B a401e23fc2ee22cd47c36becfa742f5acafd2359185a92f1156159c2ea480a17a82219182873aaf9da4e6582bce6ac1ef62b66b1330759214fc21a364c376ac6 SHA512 6d43de6f8d5f85c3fff36202320864ea3611d3ee842efa677ad59ae1390c6499f9f14aefd37345c0cec62024637b057e804efd26577c45b4f7a5bb6717952b2a 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 EBUILD grace-5.1.25_p13-r1.ebuild 2861 BLAKE2B fd95edcc79f9ff9a4ca9b182a9336cbf2e007c93bcdaf7ab150b9c69cf2cd0dfe7aad1ade60f881a066d9814b3796f344ddd424d71c79a141b8c6c1a4f42aeb7 SHA512 17840bb0c82d8be359b20417548292927769ffe2e2529bee7d7bd80cabbf4ec679d71a71f9c5827fa30fa2609e56d1f4f02ff58dbb268d283f75ec727c6940c1 EBUILD grace-5.1.25_p13-r2.ebuild 3035 BLAKE2B 1faa0d707ee3d67a467337a8536b1bd272fd46481bca105faa0c1156c567c760aa02a87c3fce66614add4f1d8cf9dba83e657eac1920517dc7495edf8daeca25 SHA512 904f1db858eecc94d7c8d5bbf23b195699cef23311d00431f1655eb835d0f6e75449c597f677b68a8089ae5fd6cf7851114cdcc8c9a9595537ff3e02fcfd011e +EBUILD grace-5.1.25_p17.ebuild 3357 BLAKE2B 49b80c7b9d8435478dd8cf1d27948cad9bdbaa1895c472c63705c3f2a59cac1da2070e41eef5996ef0e2e2ded9ee7aadf495c8485f1b66476d6503ababec396a SHA512 b5bdc2a93ace7b0d26e7177af02954e22b1d501c5505df527ec236247fb37f8056f7fd798fe305f6d955d43b5988d711723a6f0dc0f8cb9a3e373fd0a2de7b8f MISC metadata.xml 731 BLAKE2B feed7db30735c68833d77ff620fba0fe0aa1bce8a5dbe28acc9fe173cd5ac43db832b1c7f6561c7ae4806518a8ac307bc8dd0e6d7fa0c01cfd2dfda1733bd50d SHA512 e8a3ba01961a1c0bcc3627670ddb286395f85d481ba1892aba65b5c661337b29e93e4457a3b86813d2381073e8bff9a2bef8b70fc19cdd4c0bca2dfafded8334 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/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest index 447d695d4c71..ed8fa8a83076 100644 --- a/sci-visualization/gwyddion/Manifest +++ b/sci-visualization/gwyddion/Manifest @@ -1,8 +1,4 @@ -AUX gwyddion-2.60-automagic.patch 1552 BLAKE2B c106acfee1e00d8a4ade965cddab943bc79c246503fb51e53d20ba6a3b8b0a76cc433b75e867d448d7622ef190f1f54225b0f45be3860d32672397090be619d9 SHA512 50eca983c81bb14c33415e3ad69bf2e18be4a88fb674537dc335d8aa9986edb1baa962f7a4eead41d70b54828729165d413387c64696a0f4e1aa9ad49675afb0 AUX gwyddion-2.62-automagic.patch 1527 BLAKE2B 85b5267bd011125c979cdec5885e8f61fc39bfdcac864405a5d37f26543e62f4b5762129e1537ae871dfbb109226364e66fc3576340e704b671df025986846bc SHA512 cd335f0a264679159bb4f98cdac8b37357f886b49d6d98662f2550ba0b5e5d911530c31b0238574ee1b42d6dbe8fc9ff77e3d8ce985baaabc5e58a145f057ffb -DIST gwyddion-2.61.tar.xz 4982092 BLAKE2B e4949558c52d2a6e97415b65e6816061c117868bdd2f39b341c3f740500f71dd38500323a389058b65f9c30feb9d5fd1e93bc29881b464cdb66981639fe280ed SHA512 c2fff49d52e4c439bf96e68be3534948c1fd48ade9b1e59e2d2d7d607170b5e7ce09e9cde3873ecca526de1561b028f39785dc363186f9f3d4ef0d259d313675 DIST gwyddion-2.62.tar.xz 5010676 BLAKE2B 18012dfe050753413834e8a3734ec82989f375d81ac0242a6bbaf630da1a7741e9701d3c7a8c0dc03cfde8f93de9848ae106731f057c902f44ba1caf0cd79520 SHA512 93aff13f865fab045e17bd6c7633d714c4a97980ff10093f38c35e6dd39a0ed9680185f7a81a198522b623260cf6086d40e2b6a63a1cb59bc176eadf87fb85e1 -EBUILD gwyddion-2.61-r1.ebuild 2022 BLAKE2B b4728c6dfd5ffb2f39fdc595d1ec15b66f3fca6b8d4f06a4f464392920155ff3fc426b7b35493543b8eac062a883a685619f01e57a32c1f494811ecc922b086e SHA512 0ccf38ca8c368bafd55777c3b0bfef1427abe520033982fdaf43528493eaab73aad0821ab07fd5169a7fd90809fc6fb0e43b6e5d20536459bdc76f6e2f307b0c -EBUILD gwyddion-2.62-r2.ebuild 2023 BLAKE2B 2f0ead807c4cc07fed3d5d96beb8515430b304ef022868f3f98fe301e611810c34c0e01c9700426c8c83b2836df33dd7076c36461c3d08852f0878d1511c4a67 SHA512 7a93d2334512d1c36f927661a92a8fea388a444ecf1193bccc0242f4dd7b3d686d9b16cb583e384ba0068e6ce3827ce173088b810181493f95b78c913d88ab39 EBUILD gwyddion-2.62-r3.ebuild 2022 BLAKE2B a1b12590240528f97cf786e9f05b7492bc69bab251f5956e4bca3eb65c2514843fd4099b557b292344936fab06a50da7f16f3670cef87a587b36d94c8c2ce3bf SHA512 49acd0781ba0a26d50f52e9ddbc7dc32456b4ecec19b647bbfbbf16ed89d4722f02b214ce0e2760a1fe7fbd64e123aeb20883d6324573e8b3be76c51ce3b5f82 MISC metadata.xml 1154 BLAKE2B f5b963012cfc1842557eb4a678d9f1d3dbbefd08ea53e37306b747dd41336fe04418f97487e909a5c58eac4c97dc694a8be90be7b16079449be5269e869549a5 SHA512 612def01f5ce5f6681525c129abe4f58507aac92dc61d1d5ccdb1f95cd7625c5b79beda9eabc9ebf3e76808eeacbebd92ddb4e74476eace966d4ef4c32a68f67 diff --git a/sci-visualization/gwyddion/files/gwyddion-2.60-automagic.patch b/sci-visualization/gwyddion/files/gwyddion-2.60-automagic.patch deleted file mode 100644 index ac68ac0a2861..000000000000 --- a/sci-visualization/gwyddion/files/gwyddion-2.60-automagic.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 2.x+ - # Optional. Used for HDR greyscale OpenEXR pixmap import/export. --enable_exr=$have_cxx --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 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. --PKG_CHECK_MODULES(CFITSIO, [cfitsio], -+GWY_WITH([cfitsio],,[build with cfitsio support]) -+if test "x$enable_cfitsio" != "xno"; then -+ PKG_CHECK_MODULES(CFITSIO, [cfitsio], - [AC_DEFINE(HAVE_CFITSIO,1, - [Define if we have the cfitsio package.])], - [enable_cfitsio=no]) -+fi - AM_CONDITIONAL([HAVE_CFITSIO],[test "x$enable_cfitsio" != xno]) - - ############################################################################# diff --git a/sci-visualization/gwyddion/gwyddion-2.61-r1.ebuild b/sci-visualization/gwyddion/gwyddion-2.61-r1.ebuild deleted file mode 100644 index 1c242c79a51f..000000000000 --- a/sci-visualization/gwyddion/gwyddion-2.61-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2024 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.60-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.62-r2.ebuild b/sci-visualization/gwyddion/gwyddion-2.62-r2.ebuild deleted file mode 100644 index 96d176c56a7e..000000000000 --- a/sci-visualization/gwyddion/gwyddion-2.62-r2.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2024 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.60-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/labplot/Manifest b/sci-visualization/labplot/Manifest index d6e4d2bf3357..8ccfd9ad393a 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1,7 +1,5 @@ -AUX labplot-2.9.0-discount-3.patch 3386 BLAKE2B 8b9fba76ca24665279bf96e8875a22d7a841cadd84f0a154ee010d2aa0078520403331589b94528b3816cb6cda8c7b1a369374971e08b9756436c827dbc80702 SHA512 43fa587c33ec12346535cfb8ce6ce2a5faa303ffa9cf574cb6bcd4764142bbb76a04f1f9ea73e82c9a0ade14c6d6cba1644f5a4551ea34a3d3d69fedef481d96 -DIST labplot-2.10.1.tar.xz 23193988 BLAKE2B dbea843dcf0761eb40d9a386f8df13b45a889bf41ff1a40434b521f591fb2c776de4c474f553776f43ad3ee85224e919521efdabd853f8d0cc1c0c9ad32a4df8 SHA512 12c8b62519861255dd8cb4ecc3ad4ff34f1862b8e386a9aa97e4f3a2dd0b8989cf14b9dafcea41da2575bd57c0ef9803a15ac9347365cdeea6309dcfda4cd7da -DIST labplot-2.9.0.tar.xz 21413512 BLAKE2B ab3c579eb64ee4b9b558db63210b1d2210210e1ee2df7fd986d75ebbacab96c4cd05a8fc4698859373e011bd47c55a1abc73d0e8107dd3e3f1b60ce87e1f14d4 SHA512 d06e373e463d9cf3df81eec367167350572975366785b6c88bdab947288fbc21a9eb8e706cb1a831967b8bf0a8039f2f919e14ae7cfb40b21e66f862e38c5d45 -EBUILD labplot-2.10.1.ebuild 2750 BLAKE2B 1f2e880ed5cd3081c212bbdda2b4895ec842859941629f810dc2bdf997280ddc8f3dd18384cce47a12c47e1371e2d9b469002d5872247b9bd2b6a197ae38dab3 SHA512 4b0da65263d30f4e46675d22fd99a0f04ad4d5c4bacb86a9f36652452196bb1e3f4bc6c5be36301a8f1a0074a8bb402e59c9a42be55cb1c9be17bb22f5e210ab -EBUILD labplot-2.9.0-r1.ebuild 2698 BLAKE2B bce72a7aca24ec3b4eb5b271f3c5efb6d259c276a51b61c41021779828341a3300563a1bbd1b4c189a6b1de90303602e578aceab8681b890a5d059dff7b8b061 SHA512 61a5315aad78cd6ea3c70dc7b04abbf9514d7be07998da61109f98f8c90b818f4bfab16ec1676d31671e2ce654d07918c30d5690695795dbfca2a05d41c4d94d -EBUILD labplot-9999.ebuild 2750 BLAKE2B 1f2e880ed5cd3081c212bbdda2b4895ec842859941629f810dc2bdf997280ddc8f3dd18384cce47a12c47e1371e2d9b469002d5872247b9bd2b6a197ae38dab3 SHA512 4b0da65263d30f4e46675d22fd99a0f04ad4d5c4bacb86a9f36652452196bb1e3f4bc6c5be36301a8f1a0074a8bb402e59c9a42be55cb1c9be17bb22f5e210ab -MISC metadata.xml 1455 BLAKE2B ccc8422453061ab92164dd78226e60a06d242f47a6e51e391f20d868e8a07dbe1f67a7fc7bec2bb173acbe8b6097258b2fbf2bcd41502d3a8bdaf98de94a3235 SHA512 50aa6fdfbd7f3aa88cc16bb5fdfd58e746a7a42f659d2803699fadf41f31cfbfeaa84ad186c0701e9115e6fa12450638cfc3124d914b3d52ef8bcb3240eccb36 +AUX labplot-2.11.1-ods-buildfix.patch 1410 BLAKE2B ff97af93ac85e4ceb71c5b7166618a765d0f527f0d6435af86c8d2d4688b3733898ca0031f73a9f33b2f91af9b103a20b224ccc6502502b92dea42cec3dfaa46 SHA512 6e0549b2d44146d56b13b73c0a27cb981be9bc23063f284fc709ff5009b65948ac020a43a439d22861ffc2ea3d2c156e23b4176a85c7aca761c6f6b340bf9765 +DIST labplot-2.11.1.tar.xz 24180904 BLAKE2B c2b94db140ca47f648f2b7e82956a88fa36819aa666430d69b0c328d46a254e0fe9991d4ea61581c4c8da0f44694b2016471090a166e8beeb378f1e02eb6b2c7 SHA512 51a039c7eec5a2e104079b1dc7bfe1ecdc2c4e3327bcfbdc99e1b2fbae2b2be5db3a1a2c319e30d41a7cfcf177be756e8e3bb05d9a58c8418e43900dfad6b3b1 +EBUILD labplot-2.11.1.ebuild 3139 BLAKE2B c7b8b87c5fd47ca487bca962b7c0d87cbbdd80af95792702acd3e4ddd24b626ca62f2d4cb419a315f83215001bfa86e35963f7ba48eced32068a2aff63fc00a7 SHA512 8d68f11c98acc48f5426a6afbc1a5a95116f0efe6fd2a8a555df8f8ec6c81bad0ec2b2b63cb65cdf1c57291c620ddb5766e06f3aefaf44c93cf572fae6da4c45 +EBUILD labplot-9999.ebuild 3058 BLAKE2B 8d21210a9e0ac5c4230b3a1e88562119c95b5371a1205a92f906be38bddb44876ab7d2400879745a364a6ca6b559bb6a2d95c43a39c9b0bb175610047b754029 SHA512 346e0e612ea8a2c5d6e7214fbaa0fc652496284ddee45f497ebd94f3489af958d949fb5186c482723f2f704507ae27533b31d232852c573893e92ce0c7e2cc0f +MISC metadata.xml 1874 BLAKE2B f9d483d16a3a07ab47c50239dae8ab7d8dd213ee0c9e803006cffbb8f3bb07a71d0aa61e107c938d75b72ca185d3ed30d2c6cb4e2decde252edf5b02cd7ee65c SHA512 0c227a299923a20c4ed35b7e893a637f33e37702438e76a4ada426f5bfe94fd7ee0ade8b980eee72e2500ac2ce9d9169612026c181441ac54ac7cc199f0dd01a 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..b73963a92781 100644 --- a/sci-visualization/labplot/labplot-9999.ebuild +++ b/sci-visualization/labplot/labplot-9999.ebuild @@ -3,11 +3,10 @@ EAPI=8 -ECM_HANDBOOK="forceoptional" +ECM_HANDBOOK="optional" 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,35 @@ 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 cantor fftw fits hdf5 libcerf markdown matio netcdf ods origin root serial share telemetry xlsx" 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 + >=kde-apps/cantor-24.12.0:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 ) - 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 +53,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_EIGEN3=$(usex eigen) + -DENABLE_XLSX=$(usex xlsx) -DENABLE_FFTW=$(usex fftw) -DENABLE_FITS=$(usex fits) -DENABLE_HDF5=$(usex hdf5) @@ -87,10 +97,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..a732a5fd8ea0 100644 --- a/sci-visualization/labplot/metadata.xml +++ b/sci-visualization/labplot/metadata.xml @@ -14,17 +14,21 @@ <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/paraview/Manifest b/sci-visualization/paraview/Manifest index 1c11c3b721ea..12cfcd1ebd17 100644 --- a/sci-visualization/paraview/Manifest +++ b/sci-visualization/paraview/Manifest @@ -1,9 +1,7 @@ -AUX paraview-5.11.1-missing-include.patch 554 BLAKE2B 12950a55fa80cd729cee64a85a9f88f2bfd886e1bf8fb05fa35b3f838181a80e015892042d876d306bfd24f880d02a64bfe6bedd9a6237743e6f4db874769d24 SHA512 82d2176018eef081a89982ee0529e2dd622c3331b79376a85e6306be3cefdc3087bfca0634e6502445242fd5e50f7d086f706e565c9f922224621aa48f1f0115 +AUX paraview-5.13.0-cmake-3.31-compat.patch 734 BLAKE2B b3a2a8dc651a80e33f6e5e7217ef0d4f2e79437b97be40963296e55f04d21d8f01a907191194a16ade7d283f63359e488ad2e3c95282b0381970c2f7ab8db491 SHA512 3493cc97272db63a9e5a09156124ea64941a0203d0acb2e6bfdfb3e426c4a146a14db23f43161343935fdcb0f1c664a6d48b97e508d9d3d09951f580dff6fbe1 AUX paraview-5.5.0-allow_custom_build_type.patch 1036 BLAKE2B ff00093034196935e9075c5751f8a64027da009679de5c3f5b941681e65df9b91b0a05a3f0201a873313d859f029596739b1c5d705a1c35ae3cc83251312774e SHA512 0c79315d28b98d4cf45bfd48198dbb3315ebf6ffbd05e9720b35e7bdea05bd98c086dbb02cd7ac6d9580f504c7d29f498244d2b30d9e2932e881261a78b020c7 -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 -EBUILD paraview-5.11.1-r1.ebuild 6251 BLAKE2B 4452567cb75694727d5456beb8dddbab0276098563be8a1b965e0fbdbc13609879872f9dfdc61307944c7417fa344f719334d02ea8ccda10e047c1518b287472 SHA512 dbe57b15c77fd073cc03ca0ec07c4edb2c5ee4f3f12c5bd112345d70efd55de92a94c967a7a556d79b42ca72e45d344ef32d92bf719a72b71f1b0a139f555356 -EBUILD paraview-5.12.0.ebuild 6260 BLAKE2B 66604c9c100146d68b7805333867b738a79b2b428807d7e5c8314256f9dce6fb616c9d5e6f7e508f48c859e7f939f4eb4c993e2b12c3ec264f734a107baddbd4 SHA512 0bc757085502574c37d97b64c38644c0d655e80ea38937fa086d656e1a005748776a28e3445e56e5b8001b91a71c865a4c26761f5ec823bda62bc8c2ad1de4df -EBUILD paraview-5.12.0_rc1-r1.ebuild 6260 BLAKE2B 4d24c2c876ccc685ff46b5d4d2a8eba2fd95f6205b90e1b8a60f15bdfb62923bd437a8ae109cb6ec155c1f12eebba700befd500b777744c2342ff086028a198c SHA512 268ea39ad59659ba289743681b29636db53c9634cc53002c6d04ecc0b91d88f217d8673c2e76360063ea7d23e7bb110ef5295eccb25fc70d3fd3d7e962acafb8 +DIST ParaView-v5.13.0.tar.xz 133195632 BLAKE2B f4e639d01667dfb7ad02fa51133b1e2d29429aefa89e7f77772d0080aa537d910f9b6f7868e4a31d52b392762c38d94ec228b2a754936409077eb2f8ffcf7f1c SHA512 ba0051902efb2a9c599e500f85f9b20bc46eead1e1f68daa0fea0295ee606844fb72fb8eee04f67f7cced3a35be2b2b442c6f1160fc4f2c2eedfbe9c440b5b1f +DIST ParaView-v5.13.1.tar.xz 146354760 BLAKE2B 359477ea277ec3eebbd6c55fa41d9a8fbdbcef210cc9da60351b08ccd5501b36fac7f5aa41327840e48eef81d4ce279946c956557832562554fc36a236916b91 SHA512 ff352b888f82b2a453ed66c0f7773b1f2c76807cb2e17190776a99970d9b566cc3dcf226def3d580a52c3274c620087ba7f5a0db16146785321ef4324b7ff57e +EBUILD paraview-5.13.0.ebuild 6113 BLAKE2B 4c683ce9a56f40d5c3e3c3fd01821306456391cf655b2357b59dc69314f43afa0b12a3d312d469bdc04575cab68bb653f712eee8b1f82a310cfe2f2c5cba9fb9 SHA512 88b50b89aab2b4ae72d9d3e9583aa98f39b9b0373de1a109da395ea7785fab3323bd57739cd7a4ef688d9692a4d7a924ecdc4bd86450f1a9dd8d43aff5dbe168 +EBUILD paraview-5.13.1.ebuild 6121 BLAKE2B 2d4d28e0a1ef10e23841734b219491a5cd687aa622fea15f6e7d90429fb01e6eaebf50e62c7b9d2bc82f5997f8bd867922915d420678d8d3bef35c8a1598cb60 SHA512 4484e216eafe0556054caa74fcf9b472bbb5d58ceb42eb923b02eb75393dbd93320e384cc657646f93cd4d880cc21072c29656ffd93d683af2158c08a60bdf8c MISC metadata.xml 683 BLAKE2B 28b4017609ac733ac1c1ff4cb4ac3b5341f72180f487542b9db3b8bee59357ac9fed25bc0287a2f8c93f7429d098d1b26c74741b86b943564a4caafd7ee8450e SHA512 0bd4a1c8331532529d405f36c4556f57caecc299ceddd4ca8ff23138d96bd450c1d4fade7f02edddd8f9b3062d6b31bcb9a7696b2b628494c1d1b60d0312bc91 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 deleted file mode 100644 index d59d78412750..000000000000 --- a/sci-visualization/paraview/files/paraview-5.11.1-missing-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -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.13.0-cmake-3.31-compat.patch b/sci-visualization/paraview/files/paraview-5.13.0-cmake-3.31-compat.patch new file mode 100644 index 000000000000..715cbe3fcf00 --- /dev/null +++ b/sci-visualization/paraview/files/paraview-5.13.0-cmake-3.31-compat.patch @@ -0,0 +1,15 @@ +From https://gitlab.kitware.com/paraview/paraview/-/commit/f1543ffcb1db1832d00c0fe8d183c1b63af96827?merge_request_iid=7135 + +diff --git a/CMake/ParaViewCompilerExtraFlags.cmake b/CMake/ParaViewCompilerExtraFlags.cmake +index 4feb06da0c481c382605effeee20cc4a00f59cfe..4c1b87876f0b444e751dd3a6ee66d485ae09c32b 100644 +--- a/CMake/ParaViewCompilerExtraFlags.cmake ++++ b/CMake/ParaViewCompilerExtraFlags.cmake +@@ -37,7 +37,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) + set_target_properties(paraviewbuild + PROPERTIES + INTERFACE_LINK_OPTIONS +- "LINKER:SHELL:${PARAVIEW_EXTRA_SHARED_LINKER_FLAGS} -lc ${CMAKE_SHARED_LINKER_FLAGS}") ++ "LINKER:SHELL:${PARAVIEW_EXTRA_SHARED_LINKER_FLAGS} -lc") + endif() + endif() + diff --git a/sci-visualization/paraview/paraview-5.12.0.ebuild b/sci-visualization/paraview/paraview-5.12.0.ebuild deleted file mode 100644 index ec1f53f6c0b3..000000000000 --- a/sci-visualization/paraview/paraview-5.12.0.ebuild +++ /dev/null @@ -1,245 +0,0 @@ -# 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.11.1-r1.ebuild b/sci-visualization/paraview/paraview-5.13.0.ebuild index a33be6ae9bc3..610b10157aeb 100644 --- a/sci-visualization/paraview/paraview-5.11.1-r1.ebuild +++ b/sci-visualization/paraview/paraview-5.13.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DOCS_BUILDER="doxygen" inherit cmake flag-o-matic desktop docs python-single-r1 qmake-utils toolchain-funcs xdg @@ -22,15 +22,15 @@ S="${WORKDIR}/${MY_P}" 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" +IUSE="boost cg examples ffmpeg mpi nvcontrol openmp offscreen plugins python +qt6 +sqlite test tk +webengine" RESTRICT="mirror test" REQUIRED_USE=" python? ( mpi ${PYTHON_REQUIRED_USE} ) - webengine? ( qt5 ) - qt5? ( sqlite ) - ?? ( offscreen qt5 )" + webengine? ( qt6 ) + qt6? ( sqlite ) + ?? ( offscreen qt6 )" RDEPEND=" app-arch/lz4 @@ -72,24 +72,19 @@ RDEPEND=" dev-python/twisted[${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}] mpi? ( dev-python/mpi4py ) - qt5? ( dev-python/PyQt5[opengl,${PYTHON_USEDEP}] ) + qt6? ( dev-python/pyqt6[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 + qt6? ( + dev-qt/qt5compat:6 + dev-qt/qtbase:6[gui,opengl,sql] + dev-qt/qtdeclarative:6 + dev-qt/qtsvg:6 + dev-qt/qttools:6[assistant,designer,widgets] ) sqlite? ( dev-db/sqlite:3 ) tk? ( dev-lang/tk:0= ) - webengine? ( dev-qt/qtwebengine:5[widgets] )" + webengine? ( dev-qt/qtwebengine:6[widgets] )" DEPEND="${RDEPEND} ${PYTHON_DEPS} boost? ( @@ -105,7 +100,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch - "${FILESDIR}"/${P}-missing-include.patch + "${FILESDIR}"/${P}-cmake-3.31-compat.patch ) # false positive when checking for available HDF5 interface, bug #904731 @@ -149,7 +144,7 @@ src_configure() { -Wno-error=incompatible-function-pointer-types -Wno-error=int-conversion) # Make sure qmlplugindump is in path: - export PATH="$(qt5_get_bindir):${PATH}" + export PATH="$(qt6_get_bindir):${PATH}" local mycmakeargs=( -DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}" @@ -185,12 +180,14 @@ src_configure() { -DModule_pqPython="$(usex python)" -DPARAVIEW_USE_PYTHON="$(usex python)" - # qt5 - -DPARAVIEW_USE_QT="$(usex qt5)" - -DModule_pqPython="$(usex qt5 "$(usex python)" "off")" + # qt6 + -DPARAVIEW_USE_QT="$(usex qt6)" + -DPARAVIEW_QT_VERSION="6" + -DVTK_QT_VERSION="6" + -DModule_pqPython="$(usex qt6 "$(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" + -DVTK_GROUP_ENABLE_Qt="$(usex qt6 YES NO)" + -DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt6/qml" # sqlite -DVTK_MODULE_ENABLE_VTK_sqlite="$(usex sqlite YES NO)" @@ -211,12 +208,10 @@ src_configure() { mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP ) fi - if use qt5; then + if use qt6; 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 diff --git a/sci-visualization/paraview/paraview-5.12.0_rc1-r1.ebuild b/sci-visualization/paraview/paraview-5.13.1.ebuild index 8b65892f70c6..b99ee89f50b9 100644 --- a/sci-visualization/paraview/paraview-5.12.0_rc1-r1.ebuild +++ b/sci-visualization/paraview/paraview-5.13.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DOCS_BUILDER="doxygen" inherit cmake flag-o-matic desktop docs python-single-r1 qmake-utils toolchain-funcs xdg @@ -22,15 +22,15 @@ S="${WORKDIR}/${MY_P}" 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" +IUSE="boost cg examples ffmpeg mpi nvcontrol openmp offscreen plugins python +qt6 +sqlite test tk +webengine" RESTRICT="mirror test" REQUIRED_USE=" python? ( mpi ${PYTHON_REQUIRED_USE} ) - webengine? ( qt5 ) - qt5? ( sqlite ) - ?? ( offscreen qt5 )" + webengine? ( qt6 ) + qt6? ( sqlite ) + ?? ( offscreen qt6 )" RDEPEND=" app-arch/lz4 @@ -72,24 +72,19 @@ RDEPEND=" dev-python/twisted[${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}] mpi? ( dev-python/mpi4py ) - qt5? ( dev-python/PyQt5[opengl,${PYTHON_USEDEP}] ) + qt6? ( dev-python/pyqt6[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 + qt6? ( + dev-qt/qt5compat:6 + dev-qt/qtbase:6[gui,opengl,sql] + dev-qt/qtdeclarative:6 + dev-qt/qtsvg:6 + dev-qt/qttools:6[assistant,designer,widgets] ) sqlite? ( dev-db/sqlite:3 ) tk? ( dev-lang/tk:0= ) - webengine? ( dev-qt/qtwebengine:5[widgets] )" + webengine? ( dev-qt/qtwebengine:6[widgets] )" DEPEND="${RDEPEND} ${PYTHON_DEPS} boost? ( @@ -105,6 +100,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch + "${FILESDIR}"/${PN}-5.13.0-cmake-3.31-compat.patch ) # false positive when checking for available HDF5 interface, bug #904731 @@ -148,7 +144,7 @@ src_configure() { -Wno-error=incompatible-function-pointer-types -Wno-error=int-conversion) # Make sure qmlplugindump is in path: - export PATH="$(qt5_get_bindir):${PATH}" + export PATH="$(qt6_get_bindir):${PATH}" local mycmakeargs=( -DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}" @@ -184,14 +180,14 @@ src_configure() { -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")" + # qt6 + -DPARAVIEW_USE_QT="$(usex qt6)" + -DPARAVIEW_QT_VERSION="6" + -DVTK_QT_VERSION="6" + -DModule_pqPython="$(usex qt6 "$(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" + -DVTK_GROUP_ENABLE_Qt="$(usex qt6 YES NO)" + -DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt6/qml" # sqlite -DVTK_MODULE_ENABLE_VTK_sqlite="$(usex sqlite YES NO)" @@ -212,12 +208,10 @@ src_configure() { mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP ) fi - if use qt5; then + if use qt6; 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 diff --git a/sci-visualization/pythonprop/Manifest b/sci-visualization/pythonprop/Manifest index e8bcbf2c07da..6a302e791b29 100644 --- a/sci-visualization/pythonprop/Manifest +++ b/sci-visualization/pythonprop/Manifest @@ -1,5 +1,5 @@ -AUX pythonprop-drop-portland.patch 4249 BLAKE2B 6b7d2ce79db62d6343f68685383e8e60b8a97ef7dc932719218c8078dac4a058b3fc36b21c0a0db0855a766fbe23d575cd6785511fce15d497cbb5a4964508ff SHA512 b03ac440ae831ca8525f39915c2dbca91858d3a284c9ae4f36b1ac27594e00aab02aa2d090c08d0aeee7e273548e769138fc3a965801d462c181a00cb87aa959 -DIST pythonprop-0.30.1.tar.gz 1141620 BLAKE2B 54554d1a50976aa0516e70ef6cabf8c8c8fe41dc15980d0d06defca2dbf722baa4e98dddb974ea0d6da18e3d634661c980685b89411e8de4cf1cded452bb60a1 SHA512 582442e95732c78b580eceaf8b9d4922a23e5b3c5652738b110a40e1b94f91196755fad6e00370328130acc608121961d4e449199610137a757b086b53184b43 -EBUILD pythonprop-0.30.1-r1.ebuild 1243 BLAKE2B fc4c1e6b0b6102fd7bde6894cc2c10908cf8b23144d0eb0fe1cbd878e0169f7c99599e74a5181b2af0e68e2915e0871d45a2435fbde788382d12e2c25e3a8a78 SHA512 04863b59a1c9f815ec00fe758cc8adab6e2cf73ba89c5017d6fe3ae8b2692ec10d2f39b0600f4893e2b1114040db497836d7c917b948f7a5b2eae75f060f4e7e -EBUILD pythonprop-0.30.1.ebuild 1243 BLAKE2B 79a0ae8f554bf03a457e04e4d159fcd3f94794e59ba9b9cf88abca39914c154bea38f2cc7cec58da3b5032c0056a9ddf75fc35dbeb127e3da9a46ea6da8a1f14 SHA512 afdd5f2dfb7e83ea6145ee45fb275fd5d8ede0b87260a8f982385c55ccdc2db1618d6caa9f2f81ab5d72a4b0c7fd5689c7024104f837618da5176600697dde90 +AUX pythonprop-0.30.1-p20240217.patch 7124 BLAKE2B e95d31710f4201500aeef7d474b8f5c45a935179ac6c79d60e2cfb7e82c553e3be52af207b5797de1a8ec7e4fc916f75600491ca21ee4d71b8bac7f13befca7c SHA512 dfc3ffc902c9415a27e5a74f8dc988bb99c73e9daf8bcdd6c0a57d595014173995cddb0b95df1c69b40b288291af666ac8d4ee432a16615209b04ff7e7c2b5d8 +AUX pythonprop-matplotlib3.9.patch 2976 BLAKE2B 9affdfc859401f1b68326cc80538550c56f018c6e2d79f973b2c3abef552a0e75b392a40853413da3fb843143c86fe694b0083e6770cda874879d2b00c76d94f SHA512 ea2e02691222a7afce0cbae5b83bdaba748b2042a21c256721b5a9c73ae1db7db7b1826a58d42d828b7a33491941b44a0688a1f0015454877f8ba51e1f39b3cb +DIST pythonprop-0.30.1_p20240217.tar.gz 1141620 BLAKE2B 54554d1a50976aa0516e70ef6cabf8c8c8fe41dc15980d0d06defca2dbf722baa4e98dddb974ea0d6da18e3d634661c980685b89411e8de4cf1cded452bb60a1 SHA512 582442e95732c78b580eceaf8b9d4922a23e5b3c5652738b110a40e1b94f91196755fad6e00370328130acc608121961d4e449199610137a757b086b53184b43 +EBUILD pythonprop-0.30.1_p20240217.ebuild 1359 BLAKE2B 57de6b44082ffb293012d02aedd015faddf1f6467c453c67f5c7a87177fa784f8beea05dfa3aab5d873d5e796c96ab7afba7acd4275b627f89188f07b48c5d1e SHA512 1fcce7e3028e05570982b1131aeecc43dad102f4011645e755e41868eb4ecf901088192f5152fe4828b930b01bef3bf2bc8d058ca1b4cad0bcbcddce4361f513 MISC metadata.xml 464 BLAKE2B 51b9b066a69b6dbfb7eac1b069e1481106970d675c0ddafc8131551d4fe676cdda7828c36d50d30b82ea5a97d2f43385c0c420e1a843355dac09aa5b3eadbf93 SHA512 f10cc21761693cf0bd78c19283a8618c0fa7473bded1b87b5fa517ebd860d8d76977d78131af576b2d36cee6ef51d0788b151dbe89418efcd4bb64fc7acfdb92 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/scidavis/Manifest b/sci-visualization/scidavis/Manifest index c263144680eb..67f5cee77f24 100644 --- a/sci-visualization/scidavis/Manifest +++ b/sci-visualization/scidavis/Manifest @@ -1,3 +1,3 @@ DIST scidavis-2.9.0.tar.gz 9348738 BLAKE2B 70af736e0cbe62ffc4b8cc828fffe819b91245f01fa1dc089d1a225ba943495b947562aac84829b8b92664ffbe6e31ecc8f6d9b685adb144c4b21e619739c00e SHA512 3058b11e7864a646c31e5576ac4ebb3e30bcc08f382ee1798183935482236890bbd1090c8e2272c28b54e2498a42dfed801f17fc4c0aca83264ab76f4a7fb7ba -EBUILD scidavis-2.9.0-r1.ebuild 1941 BLAKE2B 54014be69e838b8d7d070b962ffceafcf9290079c37eb0868ea1e34eda55a84ca241952690be5e75c195c10553107f247196dcdec53459669ee72288b2c24742 SHA512 feb85c55ec37adab826da70f7d0357bdd730e9d3c4a2e446b14aa078c65a4f0e45bade231ddd84ea9ef13dabc99032dea8644e2638fb24eb171be2a8aca85a5e +EBUILD scidavis-2.9.0-r1.ebuild 1941 BLAKE2B 33cc029f17ae1dae207e3275a90f149e6b41f2621b44dea0e4c6549f901b782e3cea4b7de8e30d93041782175b1bab54f8b5a1b71ca0f2bf6ef22ddbf5dffd53 SHA512 0fb47eecc6fcb60066df9e797121a61162e52f28a3571486fe271504d49d7034683f6d6bb79f190af7b3204ba0c6f7b57f088f5f284d727b9961ecb6abecf5c8 MISC metadata.xml 897 BLAKE2B 2e65d2072c51ba1f198572dd387485c374e809bc22712def7a3b4de8bdfc97fcfbce9c987be39da534717ecedd6e4fcfbdcedf3c8dd659fa876834441e97078e SHA512 42c36ed30358291a17eee59d1acdac167e7fa63fddab008075f02688dacd67ce5417b522ad79852b9e67fa99d6b147e08b81d5d03dd7f345378921b3acaa1bc0 diff --git a/sci-visualization/scidavis/scidavis-2.9.0-r1.ebuild b/sci-visualization/scidavis/scidavis-2.9.0-r1.ebuild index d57c2b132cbf..43b38866f0c8 100644 --- a/sci-visualization/scidavis/scidavis-2.9.0-r1.ebuild +++ b/sci-visualization/scidavis/scidavis-2.9.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -42,8 +42,8 @@ RDEPEND=" python? ( ${PYTHON_DEPS} $(python_gen_cond_dep ' - >=dev-python/PyQt5-5.15.6[${PYTHON_USEDEP}] - dev-python/PyQt5-sip[${PYTHON_USEDEP}] + >=dev-python/pyqt5-5.15.6[${PYTHON_USEDEP}] + dev-python/pyqt5-sip[${PYTHON_USEDEP}] >=dev-python/sip-6:5[${PYTHON_USEDEP}] ') ) diff --git a/sci-visualization/spyview/Manifest b/sci-visualization/spyview/Manifest index 60be27c29001..8b0af72ba361 100644 --- a/sci-visualization/spyview/Manifest +++ b/sci-visualization/spyview/Manifest @@ -1,5 +1,6 @@ +AUX spyview-2018.12.24-fltk1.4.patch 885 BLAKE2B c12c786d854fab873809100a765a5a87d3d3d0e32180346a280cfa0737a7a2034c37b4cedb7ab7d661ecf8595f03d1ee2e5abd9c9500d888a25b700f75b7abb3 SHA512 8cd6605676e28e76ccd70c523fd01b59d3c0c227db9cfebc1734df75bd44ab6a96ece20510d20051ff4df7f4282808ad7fea4427968654b7840bad546fba581c AUX spyview-no-user-dirs.patch 391 BLAKE2B ef2a6c00b5afbd10de15fb220fdc9ade91d50105501dc613ba0374c355b2703de3ed48c1c6603358084b564de5fa0e6ca9a211ccca9a3043e93f862f06277e9b SHA512 d9ad19ab0fa4d26bc056cb96eb5581988365ed3e7823de1ab4dfd876419912de08f7d0f7c46e16526a774164c10827bc2353816166f64d41922036a684b588c8 DIST spyview-2018.12.24.tgz 15461336 BLAKE2B d88cea7a91b51a695bdc6eb4146b010b196cf24c2f21f16ef47782ed99f6f3b79d2950c35267ea71ac7a14705cb8ed8a4d1e12c03be0d5d8f6ad2f816c197c77 SHA512 b73837491650ccb9cc8f70e5a80700d33c05bbbf6914c778508ba1848db67b28cca0013e142def1f47755fb1370abfd850a55e4b69cca442ba43323029fb6d05 -EBUILD spyview-2018.12.24.ebuild 1534 BLAKE2B 156556c8acbf2f7ccd7c30631689c2dcb6a99d6e1946e7b9ac0da7592c711e7a0d1cec96b100f205250b2b1c05e7f9845e303c3be0d0a8959fc6a39c151b0537 SHA512 443040eb643c4912616534df929863e74a7f27d58b59f8251b195861190d886feb90bb6c814f4d72827526a5c557b9001b3b51b9ae7313db40e1b54732422261 -EBUILD spyview-9999.ebuild 1535 BLAKE2B a56a176b15262d1da8c573808eaea6d21f7e883a6fa996a8bd05797569b0990892317ae33ea9302ac7e5267f52f0072c94bd3f2e1b05979fb789882b37e3a7ee SHA512 244750bfb4ecf6b6eb2b55921afc9bd0ee828aa42424cabddbc7f581809d5a133beca49912924dc2a1ecead7fffa47b02cbd2159f56f3154a5012e7af8dd80ce +EBUILD spyview-2018.12.24-r1.ebuild 1569 BLAKE2B 821f21c7456b5647c56fc5a789532d4ffc20ea9ba0b7ef49e712ee81d93a2a9afd3ef87bb99880f75907d378251410e22f9a45233b6faaff2a9925a31d5d3985 SHA512 84fa1ab9ec4fe6fbf949d6fb31691ea93512c604cdd9dbe4899c9587f2e90c37c2ac3db250d1c10126c058362d8c525cb393b19218665d75919687a110d91e85 +EBUILD spyview-9999.ebuild 1536 BLAKE2B 1acdf973938e0ca342d2a2bbcf4d9f91c8356463a79db76c888e254ec5e3637c073e0394099a8e2cb4e499370f7f7d6cedb9c0d3e800b6debbb4ede7f95543c0 SHA512 6e6d685c3486d4487122d3ccac50665f62c3ea9e023c368069ca3ab77cdcc9e8fbee5f4e54238255b494c499f57c07eb59fd8433cb5a831608357b6fdd61d084 MISC metadata.xml 347 BLAKE2B 9a9e10fe692599a6055ab987a725ec0bdc034e07cc2bc5ae57aa5ba4a7cbe7fb70adeae09feaa8334fd77f3bed48bf58581c3f26f7ce23a3e2588aed674ec09b SHA512 8bfcdcd6294d1e646e922a6fabd2dc0723d9c4400a19480698fb396bec7aba5f034ac78a104a46d3ae48b7b60ed0f0e0174182e8c9d513c82fa3df2416d9ea11 diff --git a/sci-visualization/spyview/files/spyview-2018.12.24-fltk1.4.patch b/sci-visualization/spyview/files/spyview-2018.12.24-fltk1.4.patch new file mode 100644 index 000000000000..eb690101afca --- /dev/null +++ b/sci-visualization/spyview/files/spyview-2018.12.24-fltk1.4.patch @@ -0,0 +1,33 @@ +Deprecated compatibility symlinks are removed. +--- a/spyview/ImageData.C ++++ b/spyview/ImageData.C +@@ -4 +4 @@ +-#include <Fl/filename.H> ++#include <FL/filename.H> +--- a/spyview/spybrowse.C ++++ b/spyview/spybrowse.C +@@ -5,2 +5,2 @@ +-#include <Fl/filename.H> +-#include <Fl/fl_ask.H> ++#include <FL/filename.H> ++#include <FL/fl_ask.H> +--- a/spyview/spybrowse_ui.fl ++++ b/spyview/spybrowse_ui.fl +@@ -11 +11 @@ +-decl {\#include <Fl/Fl_File_Chooser.H>} {public ++decl {\#include <FL/Fl_File_Chooser.H>} {public +--- a/spyview/spybrowse_ui.h ++++ b/spyview/spybrowse_ui.h +@@ -8 +8 @@ +-#include <Fl/Fl_File_Chooser.H> ++#include <FL/Fl_File_Chooser.H> +--- a/spyview/spyview.C ++++ b/spyview/spyview.C +@@ -13 +13 @@ +-#include <Fl/fl_ask.H> ++#include <FL/fl_ask.H> +@@ -15,2 +15,2 @@ +-#include <Fl/Fl_File_Chooser.H> +-#include <Fl/filename.H> ++#include <FL/Fl_File_Chooser.H> ++#include <FL/filename.H> diff --git a/sci-visualization/spyview/spyview-2018.12.24.ebuild b/sci-visualization/spyview/spyview-2018.12.24-r1.ebuild index 6dcdb79c891f..e838a3ecc23f 100644 --- a/sci-visualization/spyview/spyview-2018.12.24.ebuild +++ b/sci-visualization/spyview/spyview-2018.12.24-r1.ebuild @@ -22,7 +22,7 @@ SLOT="0" COMMON_DEPEND=" dev-libs/boost:= media-libs/netpbm - x11-libs/fltk:1[opengl] + x11-libs/fltk:1=[opengl] app-text/ghostscript-gpl virtual/glu " @@ -35,6 +35,7 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/spyview-no-user-dirs.patch" + "${FILESDIR}/${P}-fltk1.4.patch" ) src_unpack() { diff --git a/sci-visualization/spyview/spyview-9999.ebuild b/sci-visualization/spyview/spyview-9999.ebuild index ca495102a00e..e68c6227f788 100644 --- a/sci-visualization/spyview/spyview-9999.ebuild +++ b/sci-visualization/spyview/spyview-9999.ebuild @@ -22,7 +22,7 @@ SLOT="0" COMMON_DEPEND=" dev-libs/boost:= media-libs/netpbm - x11-libs/fltk:1[opengl] + x11-libs/fltk:1=[opengl] app-text/ghostscript-gpl virtual/glu " diff --git a/sci-visualization/veusz/Manifest b/sci-visualization/veusz/Manifest index 69509dc0d37f..848d838c0efe 100644 --- a/sci-visualization/veusz/Manifest +++ b/sci-visualization/veusz/Manifest @@ -1,6 +1,5 @@ AUX veusz.desktop 248 BLAKE2B 02c9b85f9ea12ef0ee9bf8f538788f577ab4314468e94140b80351accece2dcbcf11b39b26468d8c31e3feb9fc8422a1fe5051b00100743f263eba2558861236 SHA512 986479153d6409a639f0daab4c2c11836927fce93feecf0bffefd7643cfa9c3ee2c24d374f2c6eaef475bc4bcfe39095c6b12bd0731c585ad213f0a4672c8047 AUX veusz.xml 346 BLAKE2B c99688c930b3901edcf500c4a99447074a01be6abfd2be714f8c1dccd4318a0270d30f47f92636280f406ba9003540434c52683b0a8f66fb4d672e3436fdb5a1 SHA512 c4f049d4648192d932560a2e73088843ecb0a2beea2e628424488d552684a8e69b84628773a08947741690eb732901bc8ae8c52fa926d1b44bf02b9046cb569e DIST veusz-3.6.2.tar.gz 3330225 BLAKE2B dacadb7f4a4059cab02c07d2af4e53ba3b5714593233ff2995083237416e26425723950603dc542ac58cc355aaf6106c3fd4065efddb9cc7884757e440d3efa2 SHA512 5580171c0259415cf3de11322133fde02e244b65ffede1e83b5e6d17c8a037624860550495dc0b53c7b5e2f65b3ae6b95daa0e95f7164358e1201ffedeb13f51 -EBUILD veusz-3.6.2-r1.ebuild 1705 BLAKE2B c8d8f5e3c9484d829102527d1fa1a7a1cff98ff0ba08a78d9e3c951b480d2335665918085df51dd10173bc27f0ef67f8e0317b0737468c8201341c89b3c7cbde SHA512 ee29e8b7a1c53097a7082cde9cc74cd0bee28ca197bc0ddf4b4bdefae165390dd7435c70205e70ff8b2dc254e39b8d4369462967234c318c328958486d2dfd52 -EBUILD veusz-3.6.2.ebuild 1705 BLAKE2B eb09154d5907624b62c2c918c6a28c86463c1c47d5551fed92bec6f51afdec23b3effeae1ff0cf3a373446287b09ca8fcc4cd14de6786939485fc12e62deac14 SHA512 a53427bc84d7d76e22cabb9f877c1c470eb02c7a0c46d721bba7049bfe972dc0c5228f918e1b86236ef122371bf7badbecacbd12a2ff4a6ca11d42223b4662d5 +EBUILD veusz-3.6.2-r1.ebuild 1706 BLAKE2B effe783543e7a64f7bf554b8cefdcb15dcdb73d6020b5a168f9c7f4e63b5494dd88a78d714cc7d4c7b55c27d742e248347df0f7ff06026edae85160fca72f722 SHA512 c9b6d6e7c87859772a9da89c08ea470c22b83f066c588bd5921981d735a4285f8ec7027e8283f476f65adc1a7ffaea9798f571728a3c92c67cceffcc8692dead MISC metadata.xml 678 BLAKE2B 8eb0a7fd08dc1800899df2f638353b0c85a42a2cd09428fda46c8f96c7c4a900c053ea29d0ca50707d94cf55f1eb69788c61f45a6b3a69bcba19093f9609e67d SHA512 f800d5d25f8b81446f6d5132b3cf2eda516f0ec06bb74dd8e1d708a66c225fd4692fa5fc8d6c5f5ad0ce4389e598b0dcd35dfd79a50f5ab5801d800a5eac1f20 diff --git a/sci-visualization/veusz/veusz-3.6.2-r1.ebuild b/sci-visualization/veusz/veusz-3.6.2-r1.ebuild index 7d00d0397b86..269d16bb2f2a 100644 --- a/sci-visualization/veusz/veusz-3.6.2-r1.ebuild +++ b/sci-visualization/veusz/veusz-3.6.2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools inherit desktop distutils-r1 qmake-utils virtualx xdg @@ -18,7 +18,7 @@ IUSE="dbus hdf5" COMMON_DEPEND=" dev-python/numpy[${PYTHON_USEDEP}] - dev-python/PyQt5[widgets,svg,printsupport,${PYTHON_USEDEP}] + dev-python/pyqt5[widgets,svg,printsupport,${PYTHON_USEDEP}] " RDEPEND="${COMMON_DEPEND} dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) diff --git a/sci-visualization/veusz/veusz-3.6.2.ebuild b/sci-visualization/veusz/veusz-3.6.2.ebuild deleted file mode 100644 index d7aff55dc407..000000000000 --- a/sci-visualization/veusz/veusz-3.6.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dbus hdf5" - -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}] ) -" -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() { - VIRTUALX_COMMAND="${EPYTHON}" \ - VEUSZ_RESOURCE_DIR="${S}" \ - virtx tests/runselftest.py -} - -python_install() { - distutils-r1_python_install - # symlink the license, bug #341653 - rm "${D}/$(python_get_sitedir)"/${PN}/{COPYING,AUTHORS,ChangeLog} || die - mkdir -p "${D}/$(python_get_sitedir)" || die - cat >> "${D}/$(python_get_sitedir)"/${PN}/COPYING <<- EOF - Please visit - - https://www.gnu.org/licenses/gpl-2.0.html - - for the full license text. - EOF -} - -python_install_all() { - distutils-r1_python_install_all - - doicon icons/veusz.png - domenu "${FILESDIR}"/veusz.desktop - insinto /usr/share/mime/packages - doins "${FILESDIR}"/veusz.xml -} diff --git a/sci-visualization/xyscan/Manifest b/sci-visualization/xyscan/Manifest index c677b3bff2ee..741b933eb503 100644 --- a/sci-visualization/xyscan/Manifest +++ b/sci-visualization/xyscan/Manifest @@ -1,3 +1,4 @@ -DIST xyscan-4.30-src.tgz 2700346 BLAKE2B 553e751a8d8320aca0bdfcf9facb528463d4b9179f134c0d2739837af8756760e8831f868737658f21c109c76f87a0c7284c65138b5585481e8201f664f3653e SHA512 f520f9d54893e738e8c93c7f0f4c5940b17e25d2a8dcd42632993b92460cecd388e6bfaa69f3905bdb9e77ea2ec876f3b93d82079d3383d6edc4cc8baec512b6 -EBUILD xyscan-4.3.0.ebuild 1073 BLAKE2B f0c503b9d5f4dff23cdcbeeb916feb5a7c3eb9a92ee13777d44cd85df8ee89c5f4898d253dcb8bb201733f32bd132c5f996a57e2f6e21e593faf63c55e69a55d SHA512 e974ab99d2b52ecb32b10a08f9a9d86f3ad718457cda7493195ae061eede3f3f139989c68fd82acd75ab5fed18c4c04a1eef7e7f05fbd5b335ccbe0e3240b24f +AUX xyscan-4.6.6-qt6.patch 1594 BLAKE2B cbeb4d41db4bd23c589893ee0b7b362ea151252626665eade5e3c8b72e98ab0f1d46745d81c1fbb70258ebb0bd7745060b46a84710ca28a2a64303afedebd5f5 SHA512 368bf1651405ebf63e81ab26494f5282d6a282e417e4c1ce293f4f2068d36a455440403592e8334041c3659eedb88fbb6e5dc5025ede2e3f2fc3306177605381 +DIST xyscan-4.66-src.tgz 7370446 BLAKE2B c52ab2a50a3655f9e224cc8f462d5f94e8bb6e948b1ea1670c981e394d921d20e0c21a0e6b340ed175a57673aacec87ea9fc9c452e475d1767538d9560ca27e0 SHA512 3c7e39ce80f1c67d13687c8982e73a9f8880dcbbc137ec5c65edcf4945a7de7e330c5ff1856d7792b486d2bcc2e4f34e6d6c2284e2e2a0d1e55b8afbc7b79e5e +EBUILD xyscan-4.6.6.ebuild 1122 BLAKE2B c954c3c17d31f2082d016fb5125d20fdfd375ccff3f657475f3b6bcd30f77c5c079e68a7826050cc53a2d724ee3b2169562d6ba547eb1547928a0c4d353553d9 SHA512 5beab802a8ce9819ab6ff18a9db603e4a4369f363ce12f958e80e613333b4e125d89086295844f4fa8598cf95d3b3adf6399eef383f9358f7ce7f0ac8f397983 MISC metadata.xml 576 BLAKE2B 5172dfa745d21417e1767d6268a2618175ca2908ea42d7e5353b78031fe761f9ca4d8df36d58a2483f8a38b52d9e74ae4eace9068d2a6ebb26f4ead59899a40e SHA512 ab4bbc4a2dcb432742574a30c33c12bb5f79576dc55d658f110de5c11c6a2ebcbeacf4fbc6d671528f44f074ab7e70cbed6ee685b7b64884fa5f6833ebbd5cb6 diff --git a/sci-visualization/xyscan/files/xyscan-4.6.6-qt6.patch b/sci-visualization/xyscan/files/xyscan-4.6.6-qt6.patch new file mode 100644 index 000000000000..4188a0b5b402 --- /dev/null +++ b/sci-visualization/xyscan/files/xyscan-4.6.6-qt6.patch @@ -0,0 +1,55 @@ +From fd16e64fc8ca5e7f847001050abeef6d6822c061 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Wed, 29 Jan 2025 19:25:48 +0100 +Subject: [PATCH] Fix Qt6 build for non-Mac + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + src/xyscanWindow.cpp | 2 -- + xyscan.pro | 10 ++-------- + 2 files changed, 2 insertions(+), 10 deletions(-) + +diff --git a/src/xyscanWindow.cpp b/src/xyscanWindow.cpp +index 03e0267..41d554d 100644 +--- a/src/xyscanWindow.cpp ++++ b/src/xyscanWindow.cpp +@@ -51,8 +51,6 @@ + + #if defined(USE_QTPDF) + #include <QPdfDocument> +-#elif defined(USE_POPPLER) && !defined(Q_OS_MAC) +-#include <poppler-qt5.h> + #elif defined(USE_POPPLER) + #include <poppler-qt6.h> + #endif +diff --git a/xyscan.pro b/xyscan.pro +index b792ac7..765fe1e 100644 +--- a/xyscan.pro ++++ b/xyscan.pro +@@ -24,7 +24,7 @@ + VERSION = 4.6.6 + TEMPLATE = app + CONFIG += qt warn_on release c++14 lrelease +-CONFIG += sdk_no_version_check ++CONFIG += sdk_no_version_check link_pkgconfig + QT += network xml widgets printsupport multimedia charts + QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64 + +@@ -55,13 +55,7 @@ macx { + # + unix { + !macx { +- INCLUDEPATH += /usr/include/poppler/qt5/ +- INCLUDEPATH += /usr/include/poppler +- INCLUDEPATH += /usr/local/include/poppler/qt5/ +- INCLUDEPATH += /usr/local/include/poppler +- INCLUDEPATH += /opt/local/include/poppler/qt5/ +- INCLUDEPATH += /opt/local/include/poppler +- LIBS += -L/usr/local/lib/ -L/usr/lib/ -lpoppler -lpoppler-qt5 ++ PKGCONFIG+=poppler-qt6 + } + } + +-- +2.48.1 + diff --git a/sci-visualization/xyscan/xyscan-4.3.0.ebuild b/sci-visualization/xyscan/xyscan-4.3.0.ebuild deleted file mode 100644 index 0d14b12e89a4..000000000000 --- a/sci-visualization/xyscan/xyscan-4.3.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PV=$(ver_rs 2 '') -inherit desktop qmake-utils - -DESCRIPTION="Tool for extracting data points from graphs" -HOMEPAGE="http://rhig.physics.yale.edu/~ullrich/software/xyscan/" -SRC_URI="http://rhig.physics.yale.edu/~ullrich/software/${PN}/Distributions/${MY_PV}/${PN}-${MY_PV}-src.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - app-text/poppler[qt5] - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${PN}" - -src_prepare() { - default - sed -i \ - -e "s:qApp->applicationDirPath() + \"/../docs\":\"${EPREFIX}/usr/share/doc/${PF}/html\":" \ - src/xyscanWindow.cpp || die "Failed to fix docs path" -} - -src_configure() { - eqmake5 -} - -src_install() { - dobin xyscan - local HTML_DOCS=( docs/. ) - einstalldocs - newicon images/xyscanIcon.png xyscan.png - make_desktop_entry xyscan "xyscan data point extractor" -} diff --git a/sci-visualization/xyscan/xyscan-4.6.6.ebuild b/sci-visualization/xyscan/xyscan-4.6.6.ebuild new file mode 100644 index 000000000000..1a1e97ef8a7a --- /dev/null +++ b/sci-visualization/xyscan/xyscan-4.6.6.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV=$(ver_rs 2 '') +inherit desktop qmake-utils + +DESCRIPTION="Tool for extracting data points from graphs" +HOMEPAGE="https://rhig.physics.yale.edu/~ullrich/software/xyscan" +SRC_URI="https://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" + +RDEPEND=" + app-text/poppler[qt6] + dev-qt/qtcharts:6 + dev-qt/qtbase:6[gui,network,ssl,widgets] + dev-qt/qtmultimedia:6 +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-qt/qttools:6[linguist] + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}/${P}-qt6.patch" ) + +src_prepare() { + default + sed -e "/path = /s:\"/usr/share/doc/xyscan/docs\":\"${EPREFIX}/usr/share/doc/${PF}/html\":" \ + -i src/xyscanBaseWindow.cpp || die "Failed to fix docs path" +} + +src_configure() { + eqmake6 +} + +src_install() { + dobin xyscan + local HTML_DOCS=( docs/. ) + einstalldocs + newicon images/xyscanIcon.png xyscan.png + make_desktop_entry xyscan "xyscan data point extractor" +} |