summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Ullmann <jokey@gentoo.org>2006-06-01 21:58:16 +0000
committerMarkus Ullmann <jokey@gentoo.org>2006-06-01 21:58:16 +0000
commitdcde77722404b2fef241750d577b3db5578085de (patch)
treeb943c507843ddb6cb49ea597c70fc6f4dda3b891 /dev-python/py-rrdtool
parentmask new foomatic-db (diff)
downloadgentoo-2-dcde77722404b2fef241750d577b3db5578085de.tar.gz
gentoo-2-dcde77722404b2fef241750d577b3db5578085de.tar.bz2
gentoo-2-dcde77722404b2fef241750d577b3db5578085de.zip
Adding rrdtool 1.2 patch wrt bug #133422 thanks to Angelo Leto
(Portage version: 2.1_rc1-r3)
Diffstat (limited to 'dev-python/py-rrdtool')
-rw-r--r--dev-python/py-rrdtool/ChangeLog6
-rw-r--r--dev-python/py-rrdtool/files/digest-py-rrdtool-0.2.12
-rw-r--r--dev-python/py-rrdtool/files/digest-py-rrdtool-0.2.1-r12
-rw-r--r--dev-python/py-rrdtool/files/py-rrdtool-rrdtool12.patch19
-rw-r--r--dev-python/py-rrdtool/py-rrdtool-0.2.1-r1.ebuild8
5 files changed, 35 insertions, 2 deletions
diff --git a/dev-python/py-rrdtool/ChangeLog b/dev-python/py-rrdtool/ChangeLog
index c552df0c8a35..8ccfbfe7e327 100644
--- a/dev-python/py-rrdtool/ChangeLog
+++ b/dev-python/py-rrdtool/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/py-rrdtool
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py-rrdtool/ChangeLog,v 1.6 2006/04/01 15:14:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-rrdtool/ChangeLog,v 1.7 2006/06/01 21:58:16 jokey Exp $
+
+ 01 Jun 2006; Markus Ullmann <jokey@gentoo.org>
+ +files/py-rrdtool-rrdtool12.patch, py-rrdtool-0.2.1-r1.ebuild:
+ Adding rrdtool 1.2 patch wrt bug #133422 thanks to Angelo Leto
01 Apr 2006; Aron Griffis <agriffis@gentoo.org>
py-rrdtool-0.2.1-r1.ebuild:
diff --git a/dev-python/py-rrdtool/files/digest-py-rrdtool-0.2.1 b/dev-python/py-rrdtool/files/digest-py-rrdtool-0.2.1
index 8256a0ebb783..b44994c2db64 100644
--- a/dev-python/py-rrdtool/files/digest-py-rrdtool-0.2.1
+++ b/dev-python/py-rrdtool/files/digest-py-rrdtool-0.2.1
@@ -1 +1,3 @@
MD5 32aa26ac40274419c4bbd68bed77407d py-rrdtool-0.2.1.tar.gz 18809
+RMD160 d628555f678f575bb137362a4d2b66749ab77e08 py-rrdtool-0.2.1.tar.gz 18809
+SHA256 3a72b6483c4da110e0a3563f0b0f233d891b78a0fa226d6981e9cc7dd5a53f05 py-rrdtool-0.2.1.tar.gz 18809
diff --git a/dev-python/py-rrdtool/files/digest-py-rrdtool-0.2.1-r1 b/dev-python/py-rrdtool/files/digest-py-rrdtool-0.2.1-r1
index 8256a0ebb783..b44994c2db64 100644
--- a/dev-python/py-rrdtool/files/digest-py-rrdtool-0.2.1-r1
+++ b/dev-python/py-rrdtool/files/digest-py-rrdtool-0.2.1-r1
@@ -1 +1,3 @@
MD5 32aa26ac40274419c4bbd68bed77407d py-rrdtool-0.2.1.tar.gz 18809
+RMD160 d628555f678f575bb137362a4d2b66749ab77e08 py-rrdtool-0.2.1.tar.gz 18809
+SHA256 3a72b6483c4da110e0a3563f0b0f233d891b78a0fa226d6981e9cc7dd5a53f05 py-rrdtool-0.2.1.tar.gz 18809
diff --git a/dev-python/py-rrdtool/files/py-rrdtool-rrdtool12.patch b/dev-python/py-rrdtool/files/py-rrdtool-rrdtool12.patch
new file mode 100644
index 000000000000..65bcb8f24c2c
--- /dev/null
+++ b/dev-python/py-rrdtool/files/py-rrdtool-rrdtool12.patch
@@ -0,0 +1,19 @@
+--- _rrdtoolmodule.c 2006-05-16 12:17:46.016327100 +0200
++++ src/_rrdtoolmodule.c 2006-05-16 12:16:51.853797870 +0200
+@@ -233,10 +233,15 @@
+ char **argv, **calcpr;
+ int argc, xsize, ysize, i;
+
++ double ymin,ymax; //needed by:
++ FILE *outstream; //rrd_graph (RRDtool 1.2.*)
++
+ if (create_args("graph", args, &argc, &argv) < 0)
+ return NULL;
+
+- if (rrd_graph(argc, argv, &calcpr, &xsize, &ysize) == -1) {
++ //rrd_graph version 1.2.*
++ if (rrd_graph(argc, argv, &calcpr, &xsize, &ysize,
++ outstream,&ymin,&ymax) == -1) {
+ PyErr_SetString(ErrorObject, rrd_get_error());
+ rrd_clear_error();
+ r = NULL;
diff --git a/dev-python/py-rrdtool/py-rrdtool-0.2.1-r1.ebuild b/dev-python/py-rrdtool/py-rrdtool-0.2.1-r1.ebuild
index 6c2d27634a54..41021add7ea8 100644
--- a/dev-python/py-rrdtool/py-rrdtool-0.2.1-r1.ebuild
+++ b/dev-python/py-rrdtool/py-rrdtool-0.2.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py-rrdtool/py-rrdtool-0.2.1-r1.ebuild,v 1.2 2006/04/01 15:14:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-rrdtool/py-rrdtool-0.2.1-r1.ebuild,v 1.3 2006/06/01 21:58:16 jokey Exp $
inherit distutils
@@ -16,3 +16,9 @@ SLOT="0"
DEPEND="virtual/python
<net-analyzer/rrdtool-1.2
!=net-analyzer/rrdtool-1.2*"
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/${PN}-rrdtool12.patch
+}