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

(Portage version: 2.1_rc3-r5)

4 files changed, 40 insertions, 6 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/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
 }