commit: 9fb85b467b6f9e1d65538305262787be6f2d1f3b Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Thu Jul 28 17:35:48 2022 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Thu Jul 28 17:37:23 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fb85b46
sci-visualization/gnuplot: drop 5.4.2-r1 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> sci-visualization/gnuplot/Manifest | 1 - .../gnuplot/files/gnuplot-5.4.2-signed-char.patch | 27 --- sci-visualization/gnuplot/gnuplot-5.4.2-r1.ebuild | 210 --------------------- 3 files changed, 238 deletions(-) diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest index 4e69a3716d6b..5eb28bf74fbd 100644 --- a/sci-visualization/gnuplot/Manifest +++ b/sci-visualization/gnuplot/Manifest @@ -1,3 +1,2 @@ -DIST gnuplot-5.4.2.tar.gz 5640202 BLAKE2B 42bdbe569a4dcd9e65010aff3d0b7428f1c3485bc64429ac0f2c4f157d43c4d640aa2b191430428ec01cb289bd1d43eb95b4167b5b9d236002d54e48b45c0a2a SHA512 e69ca74335cdd69c6013a254ac785dc67cc82713308460971cf6e0a66438716d8892a37344611d1841563efbc4b2b8c5692c13c7b06cff4f30f8d43e2ddfd7d4 DIST gnuplot-5.4.3.tar.gz 5656008 BLAKE2B 44745bfc23f3c9f2d27499e0c1430ac32d7995fd12210d83996b87cd989cfdeca75848f0407ce25271f86b866405e726a56523c88a80a476015423cafb32b501 SHA512 fc35ab68a992acc8e35402c89cb7704c0efe117ec1fb272739d4378289d6c5a2e8f4b747b339fca916e559453547f2405863fb52038576883f0d5643a7220b5e DIST gnuplot-5.4.4.tar.gz 5639573 BLAKE2B 739849d123836c6c982c72a292274d55808cfecd34a36143ecc454b11215951d28efda1815b15048316e96a2f046789b35b8324c53655f2ac1361653235a23b6 SHA512 ec2f4f34e119a79adeaf2bc3ec1e9335147bd8808d6e689844b891b60319b6d0f627d8ec1b90c4df6bae5e6ed6373c51e1fb70373258c32b93cfc4b2ed821cb9 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 -}
