Adding rrdtool 1.2 patch wrt bug #133422 thanks to Angelo Leto

Package-Manager: portage-2.1_rc1-r3

6 files changed, 63 insertions, 21 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/Manifest b/dev-python/py-rrdtool/Manifest
index eb0bd717f154..c244483172a3 100644
--- a/dev-python/py-rrdtool/Manifest
+++ b/dev-python/py-rrdtool/Manifest
@@ -1,28 +1,37 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b44f3c5b6705d9154f2f35a6484e1021 ChangeLog 1044
-RMD160 91bc80c13af9517645133ee62cd02865a833bee4 ChangeLog 1044
-SHA256 95b4485ec40d2feed433b0e95b8c520febb9ef66b4f7289c1794d463a2c24cc2 ChangeLog 1044
-MD5 7c39c6d40c0cc6a40fd3809a9ea3a7e9 files/digest-py-rrdtool-0.2.1 67
-RMD160 0a75abe2aa94832208ab9880e3a5558e089f8f67 files/digest-py-rrdtool-0.2.1 67
-SHA256 1b726699367961358f986a97b5cf098cc1d3d5e468a5f176b02ce16eebaef060 files/digest-py-rrdtool-0.2.1 67
-MD5 7c39c6d40c0cc6a40fd3809a9ea3a7e9 files/digest-py-rrdtool-0.2.1-r1 67
-RMD160 0a75abe2aa94832208ab9880e3a5558e089f8f67 files/digest-py-rrdtool-0.2.1-r1 67
-SHA256 1b726699367961358f986a97b5cf098cc1d3d5e468a5f176b02ce16eebaef060 files/digest-py-rrdtool-0.2.1-r1 67
-MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
-RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b metadata.xml 159
-SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 metadata.xml 159
-MD5 56eaee5dad8f173a8c4291c04ae6ddf7 py-rrdtool-0.2.1-r1.ebuild 547
-RMD160 66b6ba9654a3a63204c96965b32ff108f9443b28 py-rrdtool-0.2.1-r1.ebuild 547
-SHA256 08dbfdca79d4644dbbcd9b545120f471b324594ff69daec182fa702bc506cde6 py-rrdtool-0.2.1-r1.ebuild 547
+AUX py-rrdtool-rrdtool12.patch 688 RMD160 27409885161bbc58fe3244811a94230eafb2f88a SHA1 8af92a689fdb06d700cbfdfc5b52014b398af97f SHA256 12abb34ba57b122befba3b52dc166359c53cb37701251355fe2f671f457cb3d5 size 688
+MD5 354ca7f69569ffbd95527947c9c2223e files/py-rrdtool-rrdtool12.patch 688
+RMD160 27409885161bbc58fe3244811a94230eafb2f88a files/py-rrdtool-rrdtool12.patch 688
+SHA256 12abb34ba57b122befba3b52dc166359c53cb37701251355fe2f671f457cb3d5 files/py-rrdtool-rrdtool12.patch 688
+DIST py-rrdtool-0.2.1.tar.gz 18809 RMD160 d628555f678f575bb137362a4d2b66749ab77e08 SHA256 3a72b6483c4da110e0a3563f0b0f233d891b78a0fa226d6981e9cc7dd5a53f05 size 18809
+EBUILD py-rrdtool-0.2.1-r1.ebuild 626 RMD160 d257d44ef2484b13bf461fd2a237b7a78a57998b SHA1 4f21ecea9ed71aa2fb8274c6e620295fe849f41b SHA256 ef4a79e73626068f43638abe53646a48bb27d9c303739c0986d50d339837e352 size 626
+MD5 ffbdea426675e10f68edf62eddf4f42a py-rrdtool-0.2.1-r1.ebuild 626
+RMD160 d257d44ef2484b13bf461fd2a237b7a78a57998b py-rrdtool-0.2.1-r1.ebuild 626
+SHA256 ef4a79e73626068f43638abe53646a48bb27d9c303739c0986d50d339837e352 py-rrdtool-0.2.1-r1.ebuild 626
+EBUILD py-rrdtool-0.2.1.ebuild 500 RMD160 826527f12263cc10e2c73a1fff404a2fde80e501 SHA1 39864e078c14395f7905d5a6ac201805e32596aa SHA256 98485d04f8f7a436698e814e448f43265955e5cd794ffd85cb4b1758575e3f7b size 500
 MD5 2b83c4820c2e2533cf5d59152c608f8d py-rrdtool-0.2.1.ebuild 500
 RMD160 826527f12263cc10e2c73a1fff404a2fde80e501 py-rrdtool-0.2.1.ebuild 500
 SHA256 98485d04f8f7a436698e814e448f43265955e5cd794ffd85cb4b1758575e3f7b py-rrdtool-0.2.1.ebuild 500
+MISC ChangeLog 1221 RMD160 8d5535a00ae5ffcbfff7d277c7db46b0cff10d27 SHA1 3932259e101e4f674353add2c3e11cff143f4600 SHA256 fab718f3cae34d183547242522ad8f54c06c4c9c1e0d8ee366f7184113f2bc22 size 1221
+MD5 34913212d079adce68e1eb7845d8f3cd ChangeLog 1221
+RMD160 8d5535a00ae5ffcbfff7d277c7db46b0cff10d27 ChangeLog 1221
+SHA256 fab718f3cae34d183547242522ad8f54c06c4c9c1e0d8ee366f7184113f2bc22 ChangeLog 1221
+MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 size 159
+MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
+RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b metadata.xml 159
+SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 metadata.xml 159
+MD5 6d07d4ccb5fd15f0c5796a43dd2d5ec3 files/digest-py-rrdtool-0.2.1 247
+RMD160 d07107e524b2c6cb9e99663c92aaf107d474425f files/digest-py-rrdtool-0.2.1 247
+SHA256 322eb0044a32eb3a50a21bcc446d8b8655786872ff4e27c66f01837cb2e86a48 files/digest-py-rrdtool-0.2.1 247
+MD5 6d07d4ccb5fd15f0c5796a43dd2d5ec3 files/digest-py-rrdtool-0.2.1-r1 247
+RMD160 d07107e524b2c6cb9e99663c92aaf107d474425f files/digest-py-rrdtool-0.2.1-r1 247
+SHA256 322eb0044a32eb3a50a21bcc446d8b8655786872ff4e27c66f01837cb2e86a48 files/digest-py-rrdtool-0.2.1-r1 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFELpj9JrHF4yAQTrARAlkaAJ9atXxP7NJe2p2ejmxdUu2XJo+uCQCguy2C
-KcDz7EGRYxcul2ycY9gQvd0=
-=rRF0
+iD8DBQFEf2MIz974XjDVpbkRAkFxAJ9eN7bvKvIW6TZTguVojKyBUxbv8gCfbVVW
+OXnyb6MV7+VDmgG++1LF55A=
+=+Q+C
 -----END PGP SIGNATURE-----
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
+}