From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- sci-visualization/gnuplot/Manifest | 5 +- sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild | 8 +- sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild | 206 +++++++++++++++++++++ .../gnuplot/gnuplot-5.5.9999-r1.ebuild | 14 +- 4 files changed, 217 insertions(+), 16 deletions(-) create mode 100644 sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild (limited to 'sci-visualization/gnuplot') diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest index c06589d7bcef..de681bc53ff9 100644 --- a/sci-visualization/gnuplot/Manifest +++ b/sci-visualization/gnuplot/Manifest @@ -1,6 +1,7 @@ AUX gnuplot-5.0.1-fix-underlinking.patch 483 BLAKE2B 1719635d947a5d53fa5b6def65286aa1064e5a80d36d42670890bdda7dc849add342e3574dbee85f0546d953491271354c6946cc157207af700ab1cfde6d0249 SHA512 b5ac3ed830f201ba6018a81bc4860e6da0e41cc9cdc1ac8acc225bf41a0006cbd6e2f8e061ab2bd013ad55b105a02e915e256a09ca4e4faaf4791ea1c3199f28 AUX gnuplot-5.0.6-no-picins.patch 956 BLAKE2B 41485f39f7640426624abcfa3f9231768044d11a6fdea838a964070465d2af00149bed5715a2a97ec6cfd1dddd32169a0694685d36c806982eb1b10676f4dd28 SHA512 fe66f0d8045be89d6464b9de9aa7d80196b4eccf0d0aab3daf6b0a121f5565bb96f11e0f96d9d9c296795b86e11300ddb9811100671fc4470d2dbf8097fbb02c DIST gnuplot-5.4.1.tar.gz 5608076 BLAKE2B 7b2c30acd16b1aec3be9341c019449882a9231afe196bb05dc5d7925681296986de2be3463ca19d62ff1cea6dece0586b6bc8a54881c4fc2ec372635264ebb3d SHA512 2371830636d4c9ee93e9d6566dc2889e96ece3660b63ef4cfb6514e233510e5abaf4f93863bbe9a418f11db8e3b12a15242556aae52bb69591ad7d26e6581121 -EBUILD gnuplot-5.4.1-r1.ebuild 5121 BLAKE2B eb8ccc8f5efc3351dc29045c2868778156c1f25495f916c2cca18434bb64a2b28159852784d81109ad219fad01c6665b9e33b7aea5367f24cd494f88b48701e9 SHA512 71c2561e1576f7859864eea33e56565a5493433b300aacfbd6d392ed049e5157b6c99d4fac3891ec7c691df2e597a5f91b176d160d9385cc02f654262d59c4d2 -EBUILD gnuplot-5.5.9999-r1.ebuild 5129 BLAKE2B d740fb7e7aed7424aa82004a7cfbfac5474117a2160e0fd39164b0adba5948dda63c81083c13ee48c94256e56edddb97add8c76041bb6cb8c71d18a1ef805df3 SHA512 876fb7792dc31c27b204ad2a30c6333905c99c03126d3edbf517dfabad870169d42df5ccce7aed3e66dde9dd699abba7a347ea4513436c1724438bca0967180d +EBUILD gnuplot-5.4.1-r1.ebuild 5112 BLAKE2B cbda6dc26ff05c4b6469e8ba0eae6904cc2c4ce589878e5b52b50e2027cc7cd92cabbe909d9c95e5bc561368cb4437463e519d88c5cc0048bc7e41e18a9684d6 SHA512 27bf7527327905338ef4bc356fe31c6db151f307058515de074340b9f96e9184e17a301d05d6aafdb962493817e49e964381c5ee03736307173f0c73275199fd +EBUILD gnuplot-5.4.1-r2.ebuild 5099 BLAKE2B 13d76018e6800afca391f71a1820a322b57ef0e61fd4a38a1a04258a185ea01d97edc18f621842b799b5f9fd24101379d785fd58a3d751029cb777da2245afeb SHA512 a912f8ca065989a4861539ffda711960df8804ca7fc84c50891f8454104ef539be2d47299ec938667a0fdceaa2ba8dde58963ed1c2d1e9c883c2f8bf5d97f3d2 +EBUILD gnuplot-5.5.9999-r1.ebuild 5100 BLAKE2B 951612f52afede49d5a93e906c063c70e5f97342f5586aa124ea79525d73b10faef7c346f5f32a7b5f48b0357d9a02ed9b25af20c26f3b42262e29439a55402f SHA512 edbfda82aacefeea9d37ecd2ec7520b5e36d1a5b2d15c9c83ebb5002f485d223e0243e45799306772a7d57a15a07282d9e03d369c793f198e8fef7214c304f01 MISC metadata.xml 1069 BLAKE2B 2f42ec584b402482270c5f975c6001702f2d5cf367e9f86c190af4b91d97e3c807434e1963a5e1ed856751f592cf1d28cc25897674f92894409497b173e84e8a SHA512 7433f704ff9bee279a70346522595532c221462a915acedb44be85838a472c8a064670a31f72792d10df038b96595e61788c625614a691e956840b39fc063feb diff --git a/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild index b9535e91c7e2..ff93661495b2 100644 --- a/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild @@ -4,6 +4,7 @@ EAPI=7 LUA_COMPAT=( lua5-{1,2,3} ) +WX_GTK_VER="3.0-gtk3" inherit autotools flag-o-matic lua-single readme.gentoo-r1 toolchain-funcs wxwidgets @@ -52,7 +53,7 @@ RDEPEND=" readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) wxwidgets? ( - x11-libs/wxGTK:3.0-gtk3[X] + x11-libs/wxGTK:${WX_GTK_VER}[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:3 ) @@ -112,10 +113,7 @@ src_configure() { sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die fi - if use wxwidgets; then - WX_GTK_VER="3.0-gtk3" - setup-wxwidgets - fi + use wxwidgets && setup-wxwidgets tc-export CC CXX #453174 tc-export_build_env BUILD_CC diff --git a/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild new file mode 100644 index 000000000000..1dd56629fad6 --- /dev/null +++ b/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild @@ -0,0 +1,206 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1,2,3} ) +WX_GTK_VER="3.0-gtk3" + +inherit autotools flag-o-matic 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 ~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="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 + app-text/ghostscript-gpl ) + qt5? ( dev-qt/linguist-tools:5 )" + +GP_VERSION="${PV%.*}" +E_SITEFILE="lisp/50${PN}-gentoo.el" +TEXMF="${EPREFIX}/usr/share/texmf-site" + +PATCHES=( + "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch + "${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 + # 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.5.9999-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild index 7bfcd53167fe..306871a94a96 100644 --- a/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild @@ -4,6 +4,7 @@ EAPI=7 LUA_COMPAT=( lua5-{1,2,3} ) +WX_GTK_VER="3.0-gtk3" inherit autotools flag-o-matic lua-single readme.gentoo-r1 toolchain-funcs wxwidgets @@ -52,7 +53,7 @@ RDEPEND=" readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) wxwidgets? ( - x11-libs/wxGTK:3.0-gtk3[X] + x11-libs/wxGTK:${WX_GTK_VER}[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:3 ) @@ -112,17 +113,12 @@ src_configure() { sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die fi - if use wxwidgets; then - WX_GTK_VER="3.0-gtk3" - setup-wxwidgets - fi + use wxwidgets && setup-wxwidgets tc-export CC CXX #453174 tc-export_build_env BUILD_CC export CC_FOR_BUILD=${BUILD_CC} - use qt5 && append-cxxflags -std=c++11 - econf \ --with-texdir="${TEXMF}/tex/latex/${PN}" \ --with-readline=$(usex readline gnu builtin) \ @@ -183,8 +179,8 @@ src_install() { # Demo files insinto /usr/share/${PN}/${GP_VERSION} doins -r demo - rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile* - rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary* + 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 -- cgit v1.2.3