From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9607613835A for ; Wed, 4 Nov 2020 20:46:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 81F73E096A; Wed, 4 Nov 2020 20:46:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 581AEE096A for ; Wed, 4 Nov 2020 20:46:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 005CA33D7EF for ; Wed, 4 Nov 2020 20:46:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3D2DA430 for ; Wed, 4 Nov 2020 20:46:29 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1604522771.15b47b709ef9abb8837093941eb79a15016dd513.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild sci-visualization/gnuplot/gnuplot-5.5.9999.ebuild X-VCS-Directories: sci-visualization/gnuplot/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 15b47b709ef9abb8837093941eb79a15016dd513 X-VCS-Branch: master Date: Wed, 4 Nov 2020 20:46:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a524290a-a887-4e5d-a008-95924c54e0c2 X-Archives-Hash: 6609881554cbbeb5ff941db93fad19ed commit: 15b47b709ef9abb8837093941eb79a15016dd513 Author: Ulrich Müller gentoo org> AuthorDate: Wed Nov 4 20:44:38 2020 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Nov 4 20:46:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15b47b70 sci-visualization/gnuplot: Update live ebuild. Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Ulrich Müller gentoo.org> ...lot-5.3.9999.ebuild => gnuplot-5.5.9999.ebuild} | 52 ++++++++++++---------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.5.9999.ebuild similarity index 87% rename from sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild rename to sci-visualization/gnuplot/gnuplot-5.5.9999.ebuild index aa399503dd8..697da1fe767 100644 --- a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.5.9999.ebuild @@ -20,9 +20,11 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 wxwidgets X" +IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X" RDEPEND=" cairo? ( @@ -47,10 +49,10 @@ RDEPEND=" readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) wxwidgets? ( - x11-libs/wxGTK:3.0[X] + x11-libs/wxGTK:3.0-gtk3[X] x11-libs/cairo x11-libs/pango - x11-libs/gtk+:2 ) + x11-libs/gtk+:3 ) X? ( x11-libs/libXaw )" DEPEND="${RDEPEND}" @@ -60,21 +62,23 @@ BDEPEND=" doc? ( virtual/latex-base dev-texlive/texlive-latexextra + dev-texlive/texlive-langgreek app-text/ghostscript-gpl ) qt5? ( dev-qt/linguist-tools:5 )" -S="${WORKDIR}/${MY_P}" - 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 +) + src_prepare() { - eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch - eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch - eapply_user + default - if [[ -z ${PV%%*9999} ]]; then + if [[ ${PV##*.} = 9999 ]]; then local dir for dir in config demo m4 term tutorial; do emake -C "$dir" -f Makefile.am.in Makefile.am @@ -85,14 +89,6 @@ src_prepare() { # of the gnuplot license sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die - DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog - for details. 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." - eautoreconf # Make sure we don't mix build & host flags. @@ -110,7 +106,7 @@ src_configure() { fi if use wxwidgets; then - WX_GTK_VER="3.0" + WX_GTK_VER="3.0-gtk3" setup-wxwidgets fi @@ -125,12 +121,12 @@ src_configure() { --with-readline=$(usex readline gnu builtin) \ $(use_with bitmap bitmap-terminals) \ $(use_with cairo) \ - $(use_with doc tutorial) \ $(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) \ @@ -156,17 +152,24 @@ src_compile() { emake -C docs pdf_nofig mv docs/nofigures.pdf docs/gnuplot.pdf || die fi - emake -C tutorial pdf fi } src_install() { emake DESTDIR="${D}" install - dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES TODO + 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 @@ -178,8 +181,8 @@ src_install() { fi if use doc; then - # Manual, tutorial, FAQ - dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf + # Manual, FAQ + dodoc docs/gnuplot.pdf #FAQ.pdf # Documentation for making PostScript files docinto psdoc dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README} @@ -187,7 +190,8 @@ src_install() { } src_test() { - GNUTERM="unknown" default_src_test + #GNUTERM="unknown" emake check # spiderplot and isosurface tests fail + GNUTERM="dumb" emake check } pkg_postinst() {