From b8c7370a682e4e29cda623222d17a790c01c3642 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 7 Aug 2024 12:37:21 +0100 Subject: gentoo auto-resync : 07:08:2024 - 12:37:20 --- sci-visualization/Manifest.gz | Bin 4344 -> 4335 bytes sci-visualization/fityk/Manifest | 3 - .../fityk/files/fityk-1.3.1-fix-gtk3.patch | 31 --- sci-visualization/fityk/fityk-1.3.1-r102.ebuild | 56 ------ sci-visualization/gle/Manifest | 2 +- sci-visualization/gle/gle-4.3.4-r1.ebuild | 11 +- sci-visualization/gnuplot/Manifest | 7 +- .../gnuplot/files/gnuplot-6.0.1-watchpoints.patch | 17 ++ sci-visualization/gnuplot/gnuplot-6.0.0.ebuild | 209 -------------------- sci-visualization/gnuplot/gnuplot-6.0.1.ebuild | 219 +++++++++++++++++++++ sci-visualization/gnuplot/metadata.xml | 21 +- sci-visualization/xyscan/Manifest | 2 +- sci-visualization/xyscan/xyscan-4.3.0.ebuild | 6 +- 13 files changed, 268 insertions(+), 316 deletions(-) delete mode 100644 sci-visualization/fityk/files/fityk-1.3.1-fix-gtk3.patch delete mode 100644 sci-visualization/fityk/fityk-1.3.1-r102.ebuild create mode 100644 sci-visualization/gnuplot/files/gnuplot-6.0.1-watchpoints.patch delete mode 100644 sci-visualization/gnuplot/gnuplot-6.0.0.ebuild create mode 100644 sci-visualization/gnuplot/gnuplot-6.0.1.ebuild (limited to 'sci-visualization') diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz index a82a791fa84a..9b54ed68450a 100644 Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ 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 -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 - #include - --#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 - #include - #include diff --git a/sci-visualization/fityk/fityk-1.3.1-r102.ebuild b/sci-visualization/fityk/fityk-1.3.1-r102.ebuild deleted file mode 100644 index cec78adbde05..000000000000 --- a/sci-visualization/fityk/fityk-1.3.1-r102.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..3} ) -WX_GTK_VER=3.0-gtk3 - -inherit flag-o-matic lua-single wxwidgets xdg - -DESCRIPTION="General-purpose nonlinear curve fitting and data analysis" -HOMEPAGE="https://fityk.nieto.pl/" -SRC_URI="https://github.com/wojdyr/${PN}/releases/download/v${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="gnuplot nlopt readline wxwidgets" -REQUIRED_USE="${LUA_REQUIRED_USE}" - -DEPEND=" - ${LUA_DEPS} - dev-libs/boost:= - >=sci-libs/xylib-1 - nlopt? ( sci-libs/nlopt ) - readline? ( sys-libs/readline:0= ) - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )" -RDEPEND="${DEPEND} - gnuplot? ( sci-visualization/gnuplot )" -BDEPEND="dev-lang/swig" - -PATCHES=( "${FILESDIR}"/${P}-fix-gtk3.patch ) - -src_configure() { - # codebase relies on dynamic exception specifications - # for SWIG, no point in trying to fix at this point. - # https://github.com/wojdyr/fityk/pull/38 - append-cxxflags -std=c++14 - - use wxwidgets && setup-wxwidgets - - econf \ - --disable-python \ - --disable-static \ - $(use_enable nlopt) \ - $(use_enable wxwidgets GUI) \ - $(use_with readline) \ - --with-wx-config="${WX_CONFIG}" -} - -src_install() { - default - - # no static archives - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-visualization/gle/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..80da9c0a4034 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 +DIST gnuplot-6.0.1.tar.gz 7528936 BLAKE2B d385d4dc8a4af83f121bd062e014d8845078f5aeb84244f4cce7c17b7cf71c5fc66bd7b8623504ab53567b4123fc739506f7d2f8e4f8ad184258a7568f0223a2 SHA512 47e72ac444f35e22a5de111da3333c80846226d87411a3168e45a8433a258e351ad9b6f0ba21d76f2456042b755123a697b685fd2552b4bd9edc5b97fafcbc62 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.0.1.ebuild 5353 BLAKE2B 470564ed59fcf4e7a90ffee9737bcc62b9522bec76d7aef7d41e1d7b11b74cebe6d42530a53799d3529d8183938a0a8858d6ef64a406f7832eb6211e85d489cf SHA512 9055d83f90e060fded97cc45f0a83ca741d5ec068354714d634c18909ed576c87cbd5c3956ef65d27250cefb7901a8f711191cab60145378210b7110baf41cba EBUILD gnuplot-6.1.9999.ebuild 4962 BLAKE2B bfebc677042f2d56e3c553c19cdf0afc0c06988feb6d0a780cfb14d6b04e480e1fb2cb949650e18a5b6ba1fb8a770d46ea85702caf9507935b79e025303d1f2d SHA512 c1a8e70f0b7e82723045df2bd70c3858b4d0619923d20623a1d632e4f35be044f6b61b76c31996ad37c3a07eda026b742525474b14217e65ba22b5917ab7feea -MISC metadata.xml 1070 BLAKE2B 92ac6f016dedc1ee0aced2792c735e692efac0b0c045b7119d6f2268ed9a7ee3c2437a4038ff45799670265e01f74d8470e3c0abf45b35980a4e761fcd802d19 SHA512 04100f29255dd4d3caf3c81a39f7d6f8ad341598e89555219ba054e980484da00835c2226f35a2b63ec5f27238a97003c7bdac28ca504aed68af0fad737beb8a +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 " 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-6.0.0.ebuild b/sci-visualization/gnuplot/gnuplot-6.0.0.ebuild deleted file mode 100644 index 6dc345a591ee..000000000000 --- a/sci-visualization/gnuplot/gnuplot-6.0.0.ebuild +++ /dev/null @@ -1,209 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1,2,3,4} ) -WX_GTK_VER="3.2-gtk3" - -inherit autotools lua-single readme.gentoo-r1 toolchain-funcs wxwidgets - -DESCRIPTION="Command-line driven interactive plotting program" -HOMEPAGE="http://www.gnuplot.info/" - -if [[ -z ${PV%%*9999} ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main" - EGIT_BRANCH="master" - MY_P="${PN}" - EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}" -else - MY_P="${P/_/.}" - SRC_URI="https://downloads.sourceforge.net/gnuplot/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -fi - -S="${WORKDIR}/${MY_P}" - -LICENSE="gnuplot" -SLOT="0" -IUSE="aqua bitmap cairo doc examples +gd latex libcaca libcerf lua qt5 readline regis wxwidgets X" -REQUIRED_USE=" - doc? ( gd ) - lua? ( ${LUA_REQUIRED_USE} )" - -RDEPEND=" - cairo? ( - x11-libs/cairo - x11-libs/pango ) - gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) - latex? ( - virtual/latex-base - lua? ( - dev-tex/pgf - >=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? ( - x11-libs/wxGTK:${WX_GTK_VER}[X] - x11-libs/cairo - x11-libs/pango - x11-libs/gtk+:3 ) - X? ( - x11-libs/libX11 - x11-libs/libXaw )" - -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto )" - -BDEPEND=" - virtual/pkgconfig - doc? ( - virtual/latex-base - dev-texlive/texlive-latexextra - dev-texlive/texlive-langgreek - dev-texlive/texlive-mathscience - app-text/ghostscript-gpl ) - qt5? ( dev-qt/linguist-tools:5 )" - -IDEPEND="latex? ( virtual/latex-base )" - -GP_VERSION="${PV%.*}" -TEXMF="${EPREFIX}/usr/share/texmf-site" - -PATCHES=( - "${FILESDIR}"/${PN}-6.1-no-picins.patch - "${FILESDIR}"/${PN}-6.0.0-configure.patch -) - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_prepare() { - default - - if [[ ${PV##*.} = 9999 ]]; then - local dir - for dir in config demo m4 term tutorial; do - emake -C "$dir" -f Makefile.am.in Makefile.am - done - fi - - # Add special version identification as required by provision 2 - # of the gnuplot license - sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die - - eautoreconf - - # Make sure we don't mix build & host flags. - sed -i \ - -e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \ - -e 's:@CFLAGS@:$(BUILD_CFLAGS):' \ - -e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \ - -e 's:@CC@:$(CC_FOR_BUILD):' \ - docs/Makefile.in || die -} - -src_configure() { - if ! use latex; then - sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die - fi - - use wxwidgets && setup-wxwidgets - - tc-export CC CXX #453174 - tc-export_build_env BUILD_CC - export CC_FOR_BUILD=${BUILD_CC} - - econf \ - --with-texdir="${TEXMF}/tex/latex/${PN}" \ - --with-readline=$(usex readline gnu builtin) \ - $(use_with bitmap bitmap-terminals) \ - $(use_with cairo) \ - $(use_with gd) \ - "$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \ - $(use_with libcerf) \ - $(use_with lua) \ - $(use_with regis) \ - $(use_with X x) \ - --enable-stats \ - $(use_with qt5 qt qt5) \ - $(use_enable wxwidgets) \ - DIST_CONTACT="https://bugs.gentoo.org/" \ - EMACS=no -} - -src_compile() { - # Prevent access violations, see bug 201871 - export VARTEXFONTS="${T}/fonts" - - emake all - - if use doc; then - if use cairo; then - emake -C docs pdf - else - ewarn "Cannot build figures unless cairo is enabled." - ewarn "Building documentation without figures." - emake -C docs pdf_nofig - mv docs/nofigures.pdf docs/gnuplot.pdf || die - fi - fi -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES - newdoc term/PostScript/README README-ps - newdoc term/js/README README-js - use lua && newdoc term/lua/README README-lua - - local DOC_CONTENTS='Gnuplot no longer links against pdflib. You can - use the "pdfcairo" terminal for PDF output.' - use cairo || DOC_CONTENTS+=' It is available with USE="cairo".' - use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output, - you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT - environment variables. See the FAQ file in /usr/share/doc/${PF}/ - for more information." - readme.gentoo_create_doc - - if use examples; then - # Demo files - insinto /usr/share/${PN}/${GP_VERSION} - doins -r demo - rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary{1,2,3} || die - rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/plugin/*.{o,so} || die - fi - - if use doc; then - # Manual, FAQ - dodoc docs/gnuplot.pdf #FAQ.pdf - # Documentation for making PostScript files - docinto psdoc - dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README} - fi -} - -src_test() { - emake check GNUTERM="dumb" -} - -pkg_postinst() { - use latex && texmf-update - readme.gentoo_print_elog -} - -pkg_postrm() { - use latex && texmf-update -} diff --git a/sci-visualization/gnuplot/gnuplot-6.0.1.ebuild b/sci-visualization/gnuplot/gnuplot-6.0.1.ebuild new file mode 100644 index 000000000000..4b998be01f6a --- /dev/null +++ b/sci-visualization/gnuplot/gnuplot-6.0.1.ebuild @@ -0,0 +1,219 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1,2,3,4} ) +WX_GTK_VER="3.2-gtk3" + +inherit autotools lua-single readme.gentoo-r1 toolchain-funcs wxwidgets + +DESCRIPTION="Command-line driven interactive plotting program" +HOMEPAGE="http://www.gnuplot.info/" + +if [[ -z ${PV%%*9999} ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main" + EGIT_BRANCH="master" + MY_P="${PN}" + EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}" +else + MY_P="${P/_/.}" + SRC_URI="https://downloads.sourceforge.net/gnuplot/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +fi + +S="${WORKDIR}/${MY_P}" + +LICENSE="gnuplot" +SLOT="0" +IUSE="amos aqua bitmap cairo doc examples +gd gpic latex libcaca libcerf lua metafont metapost qt5 readline regis tgif wxwidgets X" + +REQUIRED_USE=" + doc? ( gd ) + lua? ( ${LUA_REQUIRED_USE} )" + +RDEPEND=" + amos? ( dev-libs/openspecfun ) + cairo? ( + x11-libs/cairo + x11-libs/pango ) + gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) + latex? ( + virtual/latex-base + lua? ( + dev-tex/pgf + >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) + libcaca? ( media-libs/libcaca ) + lua? ( ${LUA_DEPS} ) + qt5? ( + 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? ( + x11-libs/wxGTK:${WX_GTK_VER}[X] + x11-libs/cairo + x11-libs/pango + x11-libs/gtk+:3 ) + X? ( + x11-libs/libX11 + x11-libs/libXaw )" + +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" + +BDEPEND=" + virtual/pkgconfig + doc? ( + virtual/latex-base + dev-texlive/texlive-latexextra + dev-texlive/texlive-langgreek + dev-texlive/texlive-mathscience + app-text/ghostscript-gpl ) + qt5? ( dev-qt/linguist-tools:5 )" + +IDEPEND="latex? ( virtual/latex-base )" + +GP_VERSION="${PV%.*}" +TEXMF="${EPREFIX}/usr/share/texmf-site" + +PATCHES=( + "${FILESDIR}"/${PN}-6.1-no-picins.patch + "${FILESDIR}"/${PN}-6.0.0-configure.patch + "${FILESDIR}"/${PN}-6.0.1-watchpoints.patch +) + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + + if [[ ${PV##*.} = 9999 ]]; then + local dir + for dir in config demo m4 term tutorial; do + emake -C "$dir" -f Makefile.am.in Makefile.am + done + fi + + # Add special version identification as required by provision 2 + # of the gnuplot license + sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die + + eautoreconf + + # Make sure we don't mix build & host flags. + sed -i \ + -e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \ + -e 's:@CFLAGS@:$(BUILD_CFLAGS):' \ + -e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \ + -e 's:@CC@:$(CC_FOR_BUILD):' \ + docs/Makefile.in || die +} + +src_configure() { + if ! use latex; then + sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die + fi + + use wxwidgets && setup-wxwidgets + + tc-export CC CXX #453174 + tc-export_build_env BUILD_CC + export CC_FOR_BUILD=${BUILD_CC} + + econf \ + --with-texdir="${TEXMF}/tex/latex/${PN}" \ + --with-readline=$(usex readline gnu builtin) \ + $(use_with amos) \ + $(use_with bitmap bitmap-terminals) \ + $(use_with cairo) \ + $(use_with gd) \ + $(use_with gpic) \ + "$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \ + $(use_with libcerf) \ + $(use_with lua) \ + $(use_with metafont) \ + $(use_with metapost) \ + $(use_with regis) \ + $(use_with tgif) \ + $(use_with X x) \ + --enable-stats \ + $(use_with qt5 qt qt5) \ + $(use_enable wxwidgets) \ + DIST_CONTACT="https://bugs.gentoo.org/" \ + EMACS=no +} + +src_compile() { + # Prevent access violations, see bug 201871 + export VARTEXFONTS="${T}/fonts" + + emake all + + # pdflatex fails in titlepag.tex: "Argument of  has an extra }." + # Install the pre-built gnuplot.pdf instead. + #if use doc; then + # if use cairo; then + # emake -C docs pdf + # else + # ewarn "Cannot build figures unless cairo is enabled." + # ewarn "Building documentation without figures." + # emake -C docs pdf_nofig + # mv docs/nofigures.pdf docs/gnuplot.pdf || die + # fi + #fi +} + +src_install() { + emake DESTDIR="${D}" install + + dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES + newdoc term/PostScript/README README-ps + newdoc term/js/README README-js + use lua && newdoc term/lua/README README-lua + + local DOC_CONTENTS='Gnuplot no longer links against pdflib. You can + use the "pdfcairo" terminal for PDF output.' + use cairo || DOC_CONTENTS+=' It is available with USE="cairo".' + use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output, + you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT + environment variables. See the FAQ file in /usr/share/doc/${PF}/ + for more information." + readme.gentoo_create_doc + + if use examples; then + # Demo files + insinto /usr/share/${PN}/${GP_VERSION} + doins -r demo + rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary{1,2,3} || die + rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/plugin/*.{o,so} || die + fi + + if use doc; then + # Manual, FAQ + dodoc docs/gnuplot.pdf #FAQ.pdf + # Documentation for making PostScript files + docinto psdoc + dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README} + fi +} + +src_test() { + emake check GNUTERM="dumb" +} + +pkg_postinst() { + use latex && texmf-update + readme.gentoo_print_elog +} + +pkg_postrm() { + use latex && texmf-update +} diff --git a/sci-visualization/gnuplot/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. - Add support for media-libs/gd. - Needed for GIF, JPEG, and PNG image output. - Enable special functions from - sci-libs/libcerf + + Enable Amos routines for complex Airy and Bessel functions + (dev-libs/openspecfun) + Enable dot-matrix printers and pbm terminal - Enable ReGIS terminal + + Add support for media-libs/gd. + Needed for GIF, JPEG, and PNG image output. + + Include support for gpic terminal + + Enable special functions from sci-libs/libcerf + + Include support for metafont terminal + Include support for metapost terminal + Include support for ReGIS terminal + Include support for tgif terminal gnuplot diff --git a/sci-visualization/xyscan/Manifest b/sci-visualization/xyscan/Manifest index c677b3bff2ee..6853db41127b 100644 --- a/sci-visualization/xyscan/Manifest +++ b/sci-visualization/xyscan/Manifest @@ -1,3 +1,3 @@ DIST xyscan-4.30-src.tgz 2700346 BLAKE2B 553e751a8d8320aca0bdfcf9facb528463d4b9179f134c0d2739837af8756760e8831f868737658f21c109c76f87a0c7284c65138b5585481e8201f664f3653e SHA512 f520f9d54893e738e8c93c7f0f4c5940b17e25d2a8dcd42632993b92460cecd388e6bfaa69f3905bdb9e77ea2ec876f3b93d82079d3383d6edc4cc8baec512b6 -EBUILD xyscan-4.3.0.ebuild 1073 BLAKE2B f0c503b9d5f4dff23cdcbeeb916feb5a7c3eb9a92ee13777d44cd85df8ee89c5f4898d253dcb8bb201733f32bd132c5f996a57e2f6e21e593faf63c55e69a55d SHA512 e974ab99d2b52ecb32b10a08f9a9d86f3ad718457cda7493195ae061eede3f3f139989c68fd82acd75ab5fed18c4c04a1eef7e7f05fbd5b335ccbe0e3240b24f +EBUILD xyscan-4.3.0.ebuild 1064 BLAKE2B 92525fb4539e44cce5aef09950a2d8b9fb49f3c94750195316ea29100e6a6b59acb93f5960e599957c5bc3554d80f333c3354842dd7784c1f86f0fcb82b116ca SHA512 06160815b7d23bc80494f6d91c52265d0062097d53c953df20e9a4cd15423373e739c849ed5000ce00f445439c3858f47424e95cddac10f5bd2879d664c26c35 MISC metadata.xml 576 BLAKE2B 5172dfa745d21417e1767d6268a2618175ca2908ea42d7e5353b78031fe761f9ca4d8df36d58a2483f8a38b52d9e74ae4eace9068d2a6ebb26f4ead59899a40e SHA512 ab4bbc4a2dcb432742574a30c33c12bb5f79576dc55d658f110de5c11c6a2ebcbeacf4fbc6d671528f44f074ab7e70cbed6ee685b7b64884fa5f6833ebbd5cb6 diff --git a/sci-visualization/xyscan/xyscan-4.3.0.ebuild b/sci-visualization/xyscan/xyscan-4.3.0.ebuild index 0d14b12e89a4..571e6042a598 100644 --- a/sci-visualization/xyscan/xyscan-4.3.0.ebuild +++ b/sci-visualization/xyscan/xyscan-4.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,11 +9,11 @@ inherit desktop qmake-utils DESCRIPTION="Tool for extracting data points from graphs" HOMEPAGE="http://rhig.physics.yale.edu/~ullrich/software/xyscan/" SRC_URI="http://rhig.physics.yale.edu/~ullrich/software/${PN}/Distributions/${MY_PV}/${PN}-${MY_PV}-src.tgz" +S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" RDEPEND=" app-text/poppler[qt5] @@ -26,8 +26,6 @@ RDEPEND=" " DEPEND="${RDEPEND}" -S="${WORKDIR}/${PN}" - src_prepare() { default sed -i \ -- cgit v1.2.3