Add gcc-4.1 patch for bug 118151.

Package-Manager: portage-2.0.53

4 files changed, 81 insertions, 12 deletions

diff --git a/dev-ruby/ruby-gdchart/ChangeLog b/dev-ruby/ruby-gdchart/ChangeLog
index 16861a3d42e4..8582afcba21d 100644
--- a/dev-ruby/ruby-gdchart/ChangeLog
+++ b/dev-ruby/ruby-gdchart/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/ruby-gdchart
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gdchart/ChangeLog,v 1.6 2004/12/16 10:12:52 corsair Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gdchart/ChangeLog,v 1.7 2006/01/12 17:57:51 vanquirius Exp $
+
+  12 Jan 2006; Marcelo Goes <vanquirius@gentoo.org>
+  +files/ruby-gdchart-0.0.9_beta-gcc41.patch,
+  ruby-gdchart-0.0.9_beta.ebuild:
+  Add gcc-4.1 patch for bug 118151.
 
   16 Dec 2004; Markus Rothe <corsair@gentoo.org>
   ruby-gdchart-0.0.9_beta.ebuild:
diff --git a/dev-ruby/ruby-gdchart/Manifest b/dev-ruby/ruby-gdchart/Manifest
index 54a62c7459fa..b3de5d053500 100644
--- a/dev-ruby/ruby-gdchart/Manifest
+++ b/dev-ruby/ruby-gdchart/Manifest
@@ -1,4 +1,5 @@
-MD5 858885882685f13fe0f10d20eea589a1 ChangeLog 885
-MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 70e0e7190d3a25a7d3dbe145e71afccd ruby-gdchart-0.0.9_beta.ebuild 835
+MD5 0175e864bbaa1b88498a9e37558579d4 ChangeLog 1057
 MD5 820dabccf812f6ee48883b5a9e77ba16 files/digest-ruby-gdchart-0.0.9_beta 74
+MD5 eb8eac6be228cf88c3996408a6d7e132 files/ruby-gdchart-0.0.9_beta-gcc41.patch 2327
+MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
+MD5 aa84682625c53269d4404b09b4814ee1 ruby-gdchart-0.0.9_beta.ebuild 916
diff --git a/dev-ruby/ruby-gdchart/files/ruby-gdchart-0.0.9_beta-gcc41.patch b/dev-ruby/ruby-gdchart/files/ruby-gdchart-0.0.9_beta-gcc41.patch
new file mode 100644
index 000000000000..5a12c55b6cf7
--- /dev/null
+++ b/dev-ruby/ruby-gdchart/files/ruby-gdchart-0.0.9_beta-gcc41.patch
@@ -0,0 +1,59 @@
+diff --exclude='*~' -Naur ruby-gdchart-0.0.9-beta.orig/gdchart0.11.2dev/gdc.c ruby-gdchart-0.0.9-beta/gdchart0.11.2dev/gdc.c
+--- ruby-gdchart-0.0.9-beta.orig/gdchart0.11.2dev/gdc.c	2002-07-24 00:59:34.000000000 -0300
++++ ruby-gdchart-0.0.9-beta/gdchart0.11.2dev/gdc.c	2006-01-07 16:42:51.000000000 -0200
+@@ -5,6 +5,7 @@
+ #define GDC_LIB
+ #include <math.h>
+ #include "gdc.h"
++#include <string.h>
+ 
+ struct	GDC_FONT_T	GDC_fontc[GDC_numfonts] = { (gdFontPtr)NULL, 8,  5,
+ 											    (gdFontPtr)NULL, 8,  5,
+diff --exclude='*~' -Naur ruby-gdchart-0.0.9-beta.orig/gdchart.c ruby-gdchart-0.0.9-beta/gdchart.c
+--- ruby-gdchart-0.0.9-beta.orig/gdchart.c	2002-09-12 05:19:43.000000000 -0300
++++ ruby-gdchart-0.0.9-beta/gdchart.c	2006-01-07 16:52:09.000000000 -0200
+@@ -235,7 +235,7 @@
+       rb_raise(rb_eTypeError, "%s expect %s", name, "Bool Array");
+ 
+     length = RARRAY(value)->len;
+-    (char*)result = ALLOC_N(char, length);
++    result = (char*)ALLOC_N(char, length);
+ 
+     for (i = 0; i < length; i++) {
+       entry = rb_ary_entry(value, i);
+@@ -272,7 +272,7 @@
+       rb_raise(rb_eTypeError, "%s expect %s", name, "Fixnum Array");
+     
+     length = RARRAY(value)->len;
+-    (int*)result = ALLOC_N(int, length);
++    result = (int*)ALLOC_N(int, length);
+ 
+     for (i = 0; i < length; i++) {
+       entry = rb_ary_entry(value, i);
+@@ -309,7 +309,7 @@
+       rb_raise(rb_eTypeError, "%s expect %s", name, "Fixnum Array");
+ 
+     length = RARRAY(value)->len;
+-    (unsigned long*)result = ALLOC_N(unsigned long, length);
++    result = (unsigned long*)ALLOC_N(unsigned long, length);
+ 
+     for (i = 0; i < length; i++) {
+       entry = rb_ary_entry(value, i);
+@@ -369,7 +369,7 @@
+ 
+   case ANNOTATION_T:
+     /* Because only 1 annotatin is allowd. */
+-    (GDC_ANNOTATION_T*)result = ALLOC(GDC_ANNOTATION_T);
++    result = (GDC_ANNOTATION_T*)ALLOC(GDC_ANNOTATION_T);
+     
+     if (value_to_annotation_t(value, (GDC_ANNOTATION_T*)result) == FALSE) {
+       free(result);
+@@ -384,7 +384,7 @@
+       rb_raise(rb_eTypeError, "%s expect %s Array", name, rb_class2name(cGDChartScatter));
+ 
+     length = RARRAY(value)->len;
+-    (GDC_SCATTER_T*)result = ALLOC_N(GDC_SCATTER_T, length);
++    result = (GDC_SCATTER_T*)ALLOC_N(GDC_SCATTER_T, length);
+ 
+     for (i = 0; i < length; i++) {
+       entry = rb_ary_entry(value, i);
diff --git a/dev-ruby/ruby-gdchart/ruby-gdchart-0.0.9_beta.ebuild b/dev-ruby/ruby-gdchart/ruby-gdchart-0.0.9_beta.ebuild
index d479794cecbd..967610bf80f5 100644
--- a/dev-ruby/ruby-gdchart/ruby-gdchart-0.0.9_beta.ebuild
+++ b/dev-ruby/ruby-gdchart/ruby-gdchart-0.0.9_beta.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 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-gdchart/ruby-gdchart-0.0.9_beta.ebuild,v 1.7 2004/12/16 10:12:52 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gdchart/ruby-gdchart-0.0.9_beta.ebuild,v 1.8 2006/01/12 17:57:51 vanquirius Exp $
 
-inherit ruby
+inherit ruby eutils
 
 MY_P="${P/_/-}"
 DESCRIPTION="Ruby/GDChart is an extension to use Bruce Verderaime's GDCHART library (http://www.fred.net/brv/chart) from Ruby."
@@ -18,15 +18,19 @@ USE_RUBY="ruby16 ruby18 ruby19"
 DEPEND="virtual/ruby
 	media-libs/gd"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+}
 
+src_compile() {
 	ruby extconf.rb || die
 	make || die
 }
 
-src_install () {
-	DESTDIR=${D} emake install || die
+src_install() {
+	make DESTDIR="${D}" install || die
 	dodoc README.en ChangeLog bar_sample.rb pie_sample.rb
 }