Add patch to build with rrdtool 1.2, thanks to Angelo Leto in bug #132570. Mark ~amd64.

Package-Manager: portage-2.1_rc3-r5

5 files changed, 63 insertions, 13 deletions

diff --git a/dev-ruby/ruby-rrd/ChangeLog b/dev-ruby/ruby-rrd/ChangeLog
index a115cdb6725b..b8aca92c7889 100644
--- a/dev-ruby/ruby-rrd/ChangeLog
+++ b/dev-ruby/ruby-rrd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/ruby-rrd
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-rrd/ChangeLog,v 1.2 2005/01/04 15:32:47 citizen428 Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-rrd/ChangeLog,v 1.3 2006/06/02 13:07:15 flameeyes Exp $
+
+  02 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/ruby-rrd-rrdtool-1.2.patch, ruby-rrd-1.1.ebuild:
+  Add patch to build with rrdtool 1.2, thanks to Angelo Leto in bug #132570.
+  Mark ~amd64.
 
   04 Jan 2005; Michael Kohl <citizen428@gentoo.org> ruby-rrd-1.1.ebuild:
   Marked stable on x86.
diff --git a/dev-ruby/ruby-rrd/Manifest b/dev-ruby/ruby-rrd/Manifest
index d2f9ea834ac2..b455529dbbd0 100644
--- a/dev-ruby/ruby-rrd/Manifest
+++ b/dev-ruby/ruby-rrd/Manifest
@@ -1,14 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 121a902022fec414755119b6c4aab568 ruby-rrd-1.1.ebuild 669
-MD5 45c39afab992f043a5db54ead23c2c12 ChangeLog 511
+AUX ruby-rrd-rrdtool-1.2.patch 666 RMD160 bbda6b16f71a126675e67165fc4fac7f53e9677e SHA1 a365484a36418d7ae4734dc3a4a0a382fd9e559b SHA256 54abb9d97634d5ccdc26032e01d0d88b5875084befecf18f4421cf10f3ffbdde
+MD5 fb05bd1a735b87a8f43a6b48417d9c5a files/ruby-rrd-rrdtool-1.2.patch 666
+RMD160 bbda6b16f71a126675e67165fc4fac7f53e9677e files/ruby-rrd-rrdtool-1.2.patch 666
+SHA256 54abb9d97634d5ccdc26032e01d0d88b5875084befecf18f4421cf10f3ffbdde files/ruby-rrd-rrdtool-1.2.patch 666
+DIST ruby-rrd-1.1.tar.gz 3026 RMD160 baac8e21c20b90ced00e6c4c282af4d17f755375 SHA1 fc06aa3ba6a4f522b0ffdeebe9b941e89a3e0e00 SHA256 9f91a6e657c1849f430376902edad4c0cacbb911e67e6314d62f33ef4f226452
+EBUILD ruby-rrd-1.1.ebuild 824 RMD160 758327cc102316832ee43a44c8d2e2df4a900394 SHA1 a6ec4dfbb681bea8ffc8dfb5d0390bf3490c0a55 SHA256 77fef472a4496a90cfd7723f13596faa5f49afa1a0146026d6539ad486557d2d
+MD5 e1b932ed86486073352549532b18135b ruby-rrd-1.1.ebuild 824
+RMD160 758327cc102316832ee43a44c8d2e2df4a900394 ruby-rrd-1.1.ebuild 824
+SHA256 77fef472a4496a90cfd7723f13596faa5f49afa1a0146026d6539ad486557d2d ruby-rrd-1.1.ebuild 824
+MISC ChangeLog 714 RMD160 25b19d7db2660ddec37c20ec4d429f5b1621e243 SHA1 9f2f52954ba2079897e383a263d0cae98e4855d7 SHA256 588b41788e4f9021ab19212582f5420d442cccf4ba7b306bd90a12edd139ce8d
+MD5 a7fd8127353a6b7dd525ab6766bbb1da ChangeLog 714
+RMD160 25b19d7db2660ddec37c20ec4d429f5b1621e243 ChangeLog 714
+SHA256 588b41788e4f9021ab19212582f5420d442cccf4ba7b306bd90a12edd139ce8d ChangeLog 714
+MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
 MD5 b522b82d2c47bc548a6607f0f577ab5e metadata.xml 158
-MD5 7eb838ae565ef84c5c54023f60bcd775 files/digest-ruby-rrd-1.1 62
+RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 metadata.xml 158
+SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032 metadata.xml 158
+MD5 5e4b6bb6f7597b63f45e3fa56d218405 files/digest-ruby-rrd-1.1 232
+RMD160 88bfded3caa4bd4c7842a539cadcbbd7579b026b files/digest-ruby-rrd-1.1 232
+SHA256 deb29f463c53ee20f263a6ea62312b188279416cbb3d4816dcfea9d87bc08051 files/digest-ruby-rrd-1.1 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFB2rhN/UDVUK2NELYRAtD/AJ0Rk8UYI1s2lhw9fo3/o71yuflBUgCgiKQ2
-Y1jtR2xDYMes1cNh81S2S54=
-=IYt0
+iD8DBQFEgDgUAiZjviIA2XgRAu0nAKDPeKpdvOkWaIH0Dt8L9p3DFYLSjgCgiT6J
+HNikaX+3A1BNLgUB3Fu9nng=
+=WBQm
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby-rrd/files/digest-ruby-rrd-1.1 b/dev-ruby/ruby-rrd/files/digest-ruby-rrd-1.1
index 8bfa1db7ae3a..ef259923700c 100644
--- a/dev-ruby/ruby-rrd/files/digest-ruby-rrd-1.1
+++ b/dev-ruby/ruby-rrd/files/digest-ruby-rrd-1.1
@@ -1 +1,3 @@
 MD5 e88d7b4675c557ff70f89fb462d0de57 ruby-rrd-1.1.tar.gz 3026
+RMD160 baac8e21c20b90ced00e6c4c282af4d17f755375 ruby-rrd-1.1.tar.gz 3026
+SHA256 9f91a6e657c1849f430376902edad4c0cacbb911e67e6314d62f33ef4f226452 ruby-rrd-1.1.tar.gz 3026
diff --git a/dev-ruby/ruby-rrd/files/ruby-rrd-rrdtool-1.2.patch b/dev-ruby/ruby-rrd/files/ruby-rrd-rrdtool-1.2.patch
new file mode 100644
index 000000000000..2e55ce8cf89a
--- /dev/null
+++ b/dev-ruby/ruby-rrd/files/ruby-rrd-rrdtool-1.2.patch
@@ -0,0 +1,20 @@
+--- ruby-rrd-1.1/main.c	2002-10-22 20:10:30.000000000 +0200
++++ main.c	2006-05-10 11:45:43.990351000 +0200
+@@ -143,10 +143,15 @@
+     char **calcpr, **p;
+     VALUE result, print_results;
+     int i, xsize, ysize;
+-
++    
++    double ymin,ymax; //needed by:
++    FILE *outstream;  //rrd_graph (RRDtool 1.2.6) 
++    
+     a = string_arr_new(args);
+     reset_rrd_state();
+-    rrd_graph(a.len, a.strings, &calcpr, &xsize, &ysize);
++    rrd_graph(a.len, a.strings, &calcpr, &xsize, &ysize,outstream,
++		    &ymin,&ymax); //(RRDtool 1.2.6)
++    //rrd_graph(a.len, a.strings, &calcpr, &xsize, &ysize); //(RRDtool 1.0.*)
+     string_arr_delete(a);
+ 
+     RRD_CHECK_ERROR
diff --git a/dev-ruby/ruby-rrd/ruby-rrd-1.1.ebuild b/dev-ruby/ruby-rrd/ruby-rrd-1.1.ebuild
index 8a9516d47600..340390947b66 100644
--- a/dev-ruby/ruby-rrd/ruby-rrd-1.1.ebuild
+++ b/dev-ruby/ruby-rrd/ruby-rrd-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-rrd/ruby-rrd-1.1.ebuild,v 1.2 2005/01/04 15:32:47 citizen428 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-rrd/ruby-rrd-1.1.ebuild,v 1.3 2006/06/02 13:07:15 flameeyes Exp $
 
 inherit ruby
 
@@ -11,19 +11,26 @@ DESCRIPTION="Simple RRDTool wrapper for Ruby"
 HOMEPAGE="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/"
 SRC_URI="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/contrib/${P}.tar.gz"
 
-KEYWORDS="x86"
+KEYWORDS="~amd64 x86"
 LICENSE="Ruby"
 SLOT="0"
 
 DEPEND="virtual/ruby
 		>=net-analyzer/rrdtool-1.0.47"
 
+src_unpack() {
+	ruby_src_unpack
+
+	has_version '>=net-analyzer/rrdtool-1.2' && \
+		epatch "${FILESDIR}/${PN}-rrdtool-1.2.patch"
+}
+
 src_compile() {
 	ruby extconf.rb || die
 	emake || die
 }
 
 src_install() {
-	einstall || die
+	make DESTDIR="${D}" install || die
 	dodoc README test.rb
 }