From 9403c20e10161812ed5231e7fd14464ca484aa09 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 28 Jul 2022 21:05:25 +0100 Subject: gentoo auto-resync : 28:07:2022 - 21:05:25 --- sci-visualization/Manifest.gz | Bin 5697 -> 5697 bytes sci-visualization/gnuplot/Manifest | 5 +- .../gnuplot/files/gnuplot-5.4.2-signed-char.patch | 27 --- sci-visualization/gnuplot/gnuplot-5.4.2-r1.ebuild | 210 --------------------- sci-visualization/gnuplot/gnuplot-5.4.4.ebuild | 207 ++++++++++++++++++++ 5 files changed, 209 insertions(+), 240 deletions(-) delete mode 100644 sci-visualization/gnuplot/files/gnuplot-5.4.2-signed-char.patch delete mode 100644 sci-visualization/gnuplot/gnuplot-5.4.2-r1.ebuild create mode 100644 sci-visualization/gnuplot/gnuplot-5.4.4.ebuild (limited to 'sci-visualization') diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz index 9a9eff076890..fee4f4c4344d 100644 Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest index 3a7e5c59a578..4fff3a199408 100644 --- a/sci-visualization/gnuplot/Manifest +++ b/sci-visualization/gnuplot/Manifest @@ -1,9 +1,8 @@ AUX gnuplot-5.0.6-no-picins.patch 956 BLAKE2B 41485f39f7640426624abcfa3f9231768044d11a6fdea838a964070465d2af00149bed5715a2a97ec6cfd1dddd32169a0694685d36c806982eb1b10676f4dd28 SHA512 fe66f0d8045be89d6464b9de9aa7d80196b4eccf0d0aab3daf6b0a121f5565bb96f11e0f96d9d9c296795b86e11300ddb9811100671fc4470d2dbf8097fbb02c -AUX gnuplot-5.4.2-signed-char.patch 911 BLAKE2B 1387aee900be9686906743e3f98e011164a913744b4fb1b9617e9a9235a35a1e39456a97372f41aa1767603164be11a36a602fa986848b770fcde08e4ff0baf7 SHA512 ce89ff63565640aa3764d39056430dbabf7bba7bc73ebff5a9f9fd2ad8d6a570d01629dca13fb46a293f86b240cdc6e4d7cdcb820bf497383a085137f0360d85 AUX gnuplot-5.5-no-picins.patch 830 BLAKE2B 8e0a303ff5306f3afa07a585b220fe65440432c455710fc5abd67f7afe73dc923e5b796a3dc184f2195709a9def277933678c05c804cebd9686a6b0353f9a53b SHA512 9ca6c6f53a4940cda8634078556052be966a7f62d1b33566ce42dad066265b65970034f38c0abff66230531b49af4feda5301f6af270b0dd622b28b251b3cf5a -DIST gnuplot-5.4.2.tar.gz 5640202 BLAKE2B 42bdbe569a4dcd9e65010aff3d0b7428f1c3485bc64429ac0f2c4f157d43c4d640aa2b191430428ec01cb289bd1d43eb95b4167b5b9d236002d54e48b45c0a2a SHA512 e69ca74335cdd69c6013a254ac785dc67cc82713308460971cf6e0a66438716d8892a37344611d1841563efbc4b2b8c5692c13c7b06cff4f30f8d43e2ddfd7d4 DIST gnuplot-5.4.3.tar.gz 5656008 BLAKE2B 44745bfc23f3c9f2d27499e0c1430ac32d7995fd12210d83996b87cd989cfdeca75848f0407ce25271f86b866405e726a56523c88a80a476015423cafb32b501 SHA512 fc35ab68a992acc8e35402c89cb7704c0efe117ec1fb272739d4378289d6c5a2e8f4b747b339fca916e559453547f2405863fb52038576883f0d5643a7220b5e -EBUILD gnuplot-5.4.2-r1.ebuild 5130 BLAKE2B 5e10a5250dc13e34a7962c12a4280880e15eb2801ef176d161483c609d2bd05f089ecd4c794b4f7066c9d132f2ad56e33d1ada15a2550951a337fa46d861a2d7 SHA512 37e8bb451c4f3ec5dda87d2e6e0e1bd242cf7ca06c5d0d5a3a24c0c1b8b0ecdd4843cef9befe12918e43d6166f7cc8f7054c120684ac9f3d53c6448a87eb336a +DIST gnuplot-5.4.4.tar.gz 5639573 BLAKE2B 739849d123836c6c982c72a292274d55808cfecd34a36143ecc454b11215951d28efda1815b15048316e96a2f046789b35b8324c53655f2ac1361653235a23b6 SHA512 ec2f4f34e119a79adeaf2bc3ec1e9335147bd8808d6e689844b891b60319b6d0f627d8ec1b90c4df6bae5e6ed6373c51e1fb70373258c32b93cfc4b2ed821cb9 EBUILD gnuplot-5.4.3.ebuild 5005 BLAKE2B d5a18d94757be9cfa1c04f80ad549ef8d239a1b885a8a71e0389a4a58db2168b9269445e42f84f9ade8b2e779f073c958a29b483c5facd55b8f9513d32ec91f5 SHA512 9fd714a3226d87bccf24c2e61ceb7dfc32ef91f5c18cf430b94df68ddee265f8044792f4319148b2235691ed5af2ea13d4ee542f82f9845b0ea3876f5bb85bc2 +EBUILD gnuplot-5.4.4.ebuild 5012 BLAKE2B 0dc58d19d501f3abb299b02248a2ce8d7c9b83b5448aaf06eece78227c1cf868314592fd9ce093f377e3780e5ccb857263ea69c58338a5f8f7a351275391db98 SHA512 c4c05642b6778c9cd7bbe63dcfa6edc9d61cb812146b7e915284c6010aac4ec31bb0ea4d547fca110f234e2dc61a37bd63396ae68020e674edce89e6329a91b3 EBUILD gnuplot-5.5.9999-r1.ebuild 5004 BLAKE2B 50c97333406cb28a5a14405190815e8629dd69028da084ab3cef4720ba3be4b6e12e1382428c60a98e57d3013fabc2d74763239923c05860a59f88bcb5f70844 SHA512 df00dca2a95c77c21a75a68bd925401a6739b5666dd9b120ed133c73379be97fec81307f5e9f6584034520a4a64bc314155e8baefabcaa36024e66a45cff1749 MISC metadata.xml 1070 BLAKE2B 92ac6f016dedc1ee0aced2792c735e692efac0b0c045b7119d6f2268ed9a7ee3c2437a4038ff45799670265e01f74d8470e3c0abf45b35980a4e761fcd802d19 SHA512 04100f29255dd4d3caf3c81a39f7d6f8ad341598e89555219ba054e980484da00835c2226f35a2b63ec5f27238a97003c7bdac28ca504aed68af0fad737beb8a diff --git a/sci-visualization/gnuplot/files/gnuplot-5.4.2-signed-char.patch b/sci-visualization/gnuplot/files/gnuplot-5.4.2-signed-char.patch deleted file mode 100644 index 091dbbc88d8a..000000000000 --- a/sci-visualization/gnuplot/files/gnuplot-5.4.2-signed-char.patch +++ /dev/null @@ -1,27 +0,0 @@ -char defaults to unsigned on ARM, causing a test failure. -Patch from upstream. -https://bugs.gentoo.org/811927 -https://sourceforge.net/p/gnuplot/bugs/2467/ - ---- a/src/marching_cubes.h -+++ b/src/marching_cubes.h -@@ -58,7 +58,7 @@ static const short cube_edge_flags[256]= - First official public domain release - Version 3.00 dated 8-6-94 - */ --static char triangle_table[256][13]= -+static signed char triangle_table[256][13]= - { - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, - { 8, 3, 0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, ---- a/src/qt_table.h -+++ b/src/qt_table.h -@@ -10,7 +10,7 @@ - * collapsed them into quadrangles. - * So there is room for improvement in this table. - */ --static char qt_table[256][13] = -+static signed char qt_table[256][13] = - { - { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, - { 8, 3, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, diff --git a/sci-visualization/gnuplot/gnuplot-5.4.2-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.2-r1.ebuild deleted file mode 100644 index f86d2ca20b28..000000000000 --- a/sci-visualization/gnuplot/gnuplot-5.4.2-r1.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 1999-2021 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.0-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="mirror://sourceforge/gnuplot/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-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" -REQUIRED_USE=" - doc? ( gd ) - lua? ( ${LUA_REQUIRED_USE} )" - -RDEPEND=" - cairo? ( - x11-libs/cairo - x11-libs/pango ) - gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) - ggi? ( media-libs/libggi ) - latex? ( - virtual/latex-base - lua? ( - dev-tex/pgf - >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) - libcaca? ( media-libs/libcaca ) - lua? ( ${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/libXaw )" - -DEPEND="${RDEPEND}" - -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}-5.0.6-no-picins.patch - "${FILESDIR}"/${P}-signed-char.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 ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \ - "$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \ - $(use_with libcerf) \ - $(use_with lua) \ - $(use_with regis) \ - $(use_with X x) \ - --enable-stats \ - $(use_with qt5 qt qt5) \ - $(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 - # Avoid sandbox violation in epstopdf/ghostscript - addpredict /var/cache/fontconfig - 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-5.4.4.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.4.ebuild new file mode 100644 index 000000000000..00a462ed0679 --- /dev/null +++ b/sci-visualization/gnuplot/gnuplot-5.4.4.ebuild @@ -0,0 +1,207 @@ +# Copyright 1999-2022 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.0-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="mirror://sourceforge/gnuplot/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-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" +REQUIRED_USE=" + doc? ( gd ) + lua? ( ${LUA_REQUIRED_USE} )" + +RDEPEND=" + cairo? ( + x11-libs/cairo + x11-libs/pango ) + gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) + ggi? ( media-libs/libggi ) + latex? ( + virtual/latex-base + lua? ( + dev-tex/pgf + >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) + libcaca? ( media-libs/libcaca ) + lua? ( ${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/libXaw )" + +DEPEND="${RDEPEND}" + +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}-5.0.6-no-picins.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 ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \ + "$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \ + $(use_with libcerf) \ + $(use_with lua) \ + $(use_with regis) \ + $(use_with X x) \ + --enable-stats \ + $(use_with qt5 qt qt5) \ + $(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 +} -- cgit v1.2.3