commit:     aab1ae762e33c53c4e54b9e556234138d3a8a8af
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  8 20:30:49 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Sep  8 20:31:01 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=aab1ae76

sync with gx86

Package-Manager: portage-2.2.8-r1

---
 sci-visualization/gnuplot/ChangeLog               |  4 ++++
 sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild | 13 +++++++++----
 sci-visualization/gnuplot/metadata.xml            | 19 +++++++++++++++----
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/sci-visualization/gnuplot/ChangeLog 
b/sci-visualization/gnuplot/ChangeLog
index 5954359..07c4b2b 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Sep 2014; Christoph Junghans <ott...@gentoo.org> gnuplot-5.0.9999.ebuild,
+  metadata.xml:
+  sync with gx86
+
   14 Jul 2014; Christoph Junghans <ott...@gentoo.org> gnuplot-5.0.9999.ebuild:
   added support for libcerf
 

diff --git a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild 
b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
index 071e763..5c1624f 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
@@ -18,15 +18,17 @@ if [[ -z ${PV%%*9999} ]]; then
        ECVS_CVS_OPTIONS="-dP"
        MY_P="${PN}"
        SRC_URI=""
+       KEYWORDS=""
 else
        MY_P="${P/_/.}"
        SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
+       inherit autotools
 fi
 
 LICENSE="gnuplot bitmap? ( free-noncomm )"
 SLOT="0"
-KEYWORDS=""
-IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca lua qt4 readline 
svga wxwidgets X"
+IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt4 
readline svga wxwidgets X"
 
 RDEPEND="
        cairo? (
@@ -45,7 +47,7 @@ RDEPEND="
                >=dev-qt/qtgui-4.5:4
                >=dev-qt/qtsvg-4.5:4 )
        readline? ( sys-libs/readline )
-       sci-libs/libcerf
+       libcerf? ( sci-libs/libcerf )
        svga? ( media-libs/svgalib )
        wxwidgets? (
                x11-libs/wxGTK:2.8[X]
@@ -73,6 +75,9 @@ src_prepare() {
                        emake -C "$dir" -f Makefile.am.in Makefile.am
                done
                eautoreconf
+       else
+               epatch "${FILESDIR}/${PN}-5.0_rc1-libcerf.patch"
+               eautoreconf
        fi
 
        # Add special version identification as required by provision 2
@@ -144,7 +149,7 @@ src_compile() {
        if use doc; then
                # Avoid sandbox violation in epstopdf/ghostscript
                addpredict /var/cache/fontconfig
-               emake -C docs pdf
+               emake -C docs gnuplot.pdf
                emake -C tutorial pdf
        fi
 }

diff --git a/sci-visualization/gnuplot/metadata.xml 
b/sci-visualization/gnuplot/metadata.xml
index 6524891..1a66c94 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -3,16 +3,27 @@
 <pkgmetadata>
   <herd>sci</herd>
   <maintainer>
-    <email>ott...@gentoo.org</email>
-    <name>Christoph Junghans</name>
+    <email>u...@gentoo.org</email>
+    <name>Ulrich Müller</name>
   </maintainer>
   <maintainer>
-    <email>u...@gentoo.org</email>
+    <email>ott...@gentoo.org</email>
+    <name>Christoph Junghans</name>
   </maintainer>
+  <longdescription>
+  Gnuplot is a command-driven interactive function plotting program.
+  It can be used to plot functions and data points in both two- and
+  three-dimensional plots in many different formats. It is designed
+  primarily for the visual display of scientific data.
+</longdescription>
   <use>
     <flag name="gd">Add support for <pkg>media-libs/gd</pkg>.
-               Needed for GIF, JPEG, and PNG image output.</flag>
+    Needed for GIF, JPEG, and PNG image output.</flag>
+<flag name="libcerf">Enable special functions from 
<pkg>sci-libs/libcerf</pkg></flag>
     <flag name="thin-splines">Enable thin plate splines</flag>
     <flag name="bitmap">Enable dot-matrix printers and pbm terminal</flag>
   </use>
+  <upstream>
+    <remote-id type="sourceforge">gnuplot</remote-id>
+  </upstream>
 </pkgmetadata>

Reply via email to