1.7 stable on x86. Added mouse patch. Closes #69250

Package-Manager: portage-2.0.51.22-r1

6 files changed, 134 insertions, 6 deletions

diff --git a/dev-python/gnuplot-py/ChangeLog b/dev-python/gnuplot-py/ChangeLog
index 92f3ff5d0bcd..52e15e30d0fe 100644
--- a/dev-python/gnuplot-py/ChangeLog
+++ b/dev-python/gnuplot-py/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/gnuplot-py
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnuplot-py/ChangeLog,v 1.7 2005/06/02 00:40:15 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnuplot-py/ChangeLog,v 1.8 2005/06/04 15:18:26 fserb Exp $
+
+*gnuplot-py-1.7-r1 (04 Jun 2005)
+
+  04 Jun 2005; Fernando Serboncini <fserb@gentoo.org>
+  +files/gnuplot-py-1.7-mousesupport.patch, gnuplot-py-1.7.ebuild,
+  +gnuplot-py-1.7-r1.ebuild:
+  Added mouse support patch. Closes #69250.
+  Marked 1.7 stable on x86.
 
   02 Jun 2005; Luca Barbato <lu_zero@gentoo.org> gnuplot-py-1.7.ebuild:
   Marked ppc
diff --git a/dev-python/gnuplot-py/Manifest b/dev-python/gnuplot-py/Manifest
index 9ee67db6ff84..7fb9ea5ba39c 100644
--- a/dev-python/gnuplot-py/Manifest
+++ b/dev-python/gnuplot-py/Manifest
@@ -1,6 +1,19 @@
-MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 179a335bf88eb35ff06e77ee18aefca1 ChangeLog 1182
 MD5 5e1af2892d7c437f97ed0e124757547f gnuplot-py-1.6.ebuild 617
-MD5 34f01ae2fbd4d4ca6a20af585920350d gnuplot-py-1.7.ebuild 626
-MD5 4b5fdd8283849d3c60e0e519bef370dc ChangeLog 927
+MD5 6c866cb3c5147ee5a902301a77e4ed4f gnuplot-py-1.7.ebuild 623
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 342f68c4db6eb34ab4acca875cd7f47a gnuplot-py-1.7-r1.ebuild 713
 MD5 e78f98cfb3a978120690eb8cc84e5dda files/digest-gnuplot-py-1.6 65
 MD5 f9117dc8628a6185c7db33adeb171577 files/digest-gnuplot-py-1.7 66
+MD5 f9117dc8628a6185c7db33adeb171577 files/digest-gnuplot-py-1.7-r1 66
+MD5 a0f4c4e3e2040dfb4d982653ddd851d5 files/gnuplot-py-1.7-mousesupport.patch 2596
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCocaExtZcznfol0URAmEWAKCZoIWjXU2IeJXj21yv2Z/i9TTOxwCfctQe
+zJD/RrhV3z1NDkc9ApeSlj4=
+=leuK
+-----END PGP SIGNATURE-----
diff --git a/dev-python/gnuplot-py/files/digest-gnuplot-py-1.7-r1 b/dev-python/gnuplot-py/files/digest-gnuplot-py-1.7-r1
new file mode 100644
index 000000000000..3f30a19b9104
--- /dev/null
+++ b/dev-python/gnuplot-py/files/digest-gnuplot-py-1.7-r1
@@ -0,0 +1 @@
+MD5 724f9eee164d6ff763777b22a5851572 gnuplot-py-1.7.tar.gz 107278
diff --git a/dev-python/gnuplot-py/files/gnuplot-py-1.7-mousesupport.patch b/dev-python/gnuplot-py/files/gnuplot-py-1.7-mousesupport.patch
new file mode 100644
index 000000000000..2eaf6ae379ed
--- /dev/null
+++ b/dev-python/gnuplot-py/files/gnuplot-py-1.7-mousesupport.patch
@@ -0,0 +1,75 @@
+--- _Gnuplot.py.orig	2003-10-17 16:28:10.000000000 +0200
++++ _Gnuplot.py	2004-10-28 14:39:20.000000000 +0200
+@@ -18,6 +18,27 @@
+ 
+ import gp, PlotItems, termdefs
+ 
++def test_mouse():
++    """Return whether mouse support is present or not.
++
++    The detection is done by calling gnuplot with a file containing only the
++    "set mouse" command.  If gnuplot does have mouse support, it should simply
++    execute the file silently, producing no output."""
++
++    import os,tempfile,commands
++    
++    tmpname = tempfile.mktemp()
++    tfile = open(tmpname,"w")
++    tfile.write("set mouse")
++    tfile.close()
++    msg = commands.getoutput(gp.GnuplotOpts.gnuplot_command + " " +
++                             tmpname)
++    os.unlink(tmpname)
++    if msg:  # Gnuplot won"t print anything if it has mouse support
++        has_mouse = 0
++    else:
++        has_mouse = 1
++    return has_mouse
+ 
+ class _GnuplotFile:
+     """A file to which gnuplot commands can be written.
+@@ -152,7 +173,7 @@
+         'output' : 'string',
+         }
+ 
+-    def __init__(self, filename=None, persist=None, debug=0):
++    def __init__(self, filename=None, persist=None, debug=0, mouse=None):
+         """Create a Gnuplot object.
+ 
+         Create a 'Gnuplot' object.  By default, this starts a gnuplot
+@@ -172,8 +193,19 @@
+           'debug=1' -- echo the gnuplot commands to stderr as well as
+               sending them to gnuplot.
+ 
++          "mouse=1" -- activate mouse support (officially available as of
++          gnuplot 4.0 under certain platforms).
++
+         """
+ 
++        # The mouse check must be done first, so we can decide whether to use
++        # inline data and fifos or not (they break mouse support)
++        if mouse is None:
++            mouse = test_mouse()
++        if mouse:
++            gp.GnuplotOpts.prefer_inline_data = 0
++            gp.GnuplotOpts.prefer_fifo_data = 0
++            
+         if filename is None:
+             self.gnuplot = gp.GnuplotProcess(persist=persist)
+         else:
+@@ -182,10 +214,14 @@
+                     'Gnuplot with output to file does not allow '
+                     'persist option.')
+             self.gnuplot = _GnuplotFile(filename)
++	    
+         self._clear_queue()
+         self.debug = debug
+         self.plotcmd = 'plot'
+-        self('set terminal %s' % (gp.GnuplotOpts.default_term,))
++	# The "set mouse" command MUST be the VERY FIRST command passed to gnuplot
++	if mouse:
++            self("set mouse")
++	self("set terminal %s" % gp.GnuplotOpts.default_term)
+ 
+     def __call__(self, s):
+         """Send a command string to gnuplot.
diff --git a/dev-python/gnuplot-py/gnuplot-py-1.7-r1.ebuild b/dev-python/gnuplot-py/gnuplot-py-1.7-r1.ebuild
new file mode 100644
index 000000000000..727672f71196
--- /dev/null
+++ b/dev-python/gnuplot-py/gnuplot-py-1.7-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnuplot-py/gnuplot-py-1.7-r1.ebuild,v 1.1 2005/06/04 15:18:26 fserb Exp $
+
+inherit distutils
+
+DESCRIPTION="A python wrapper for Gnuplot"
+HOMEPAGE="http://gnuplot-py.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~s390 ~x86"
+IUSE=""
+
+DEPEND="virtual/python
+	media-gfx/gnuplot
+	dev-python/numeric"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-mousesupport.patch
+}
+
+src_install() {
+	distutils_src_install
+	dohtml doc/Gnuplot/*
+	insinto /usr/share/doc/${PF}
+	doins demo.py
+}
diff --git a/dev-python/gnuplot-py/gnuplot-py-1.7.ebuild b/dev-python/gnuplot-py/gnuplot-py-1.7.ebuild
index 5e1577363e86..624cc7f33e54 100644
--- a/dev-python/gnuplot-py/gnuplot-py-1.7.ebuild
+++ b/dev-python/gnuplot-py/gnuplot-py-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnuplot-py/gnuplot-py-1.7.ebuild,v 1.3 2005/06/02 00:40:15 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnuplot-py/gnuplot-py-1.7.ebuild,v 1.4 2005/06/04 15:18:26 fserb Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ppc s390 ~x86"
+KEYWORDS="~amd64 ppc s390 x86"
 IUSE=""
 
 DEPEND="virtual/python