add a patch to fix namespace collision, from bug #127750

(Portage version: 2.1_pre7-r2)

4 files changed, 33 insertions, 7 deletions

diff --git a/dev-ruby/ruby-gnomecanvas2/ChangeLog b/dev-ruby/ruby-gnomecanvas2/ChangeLog
index 19e508bd6867..04c8a27c498a 100644
--- a/dev-ruby/ruby-gnomecanvas2/ChangeLog
+++ b/dev-ruby/ruby-gnomecanvas2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/ruby-gnomecanvas2
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gnomecanvas2/ChangeLog,v 1.25 2006/03/30 17:08:43 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gnomecanvas2/ChangeLog,v 1.26 2006/03/31 14:44:36 caleb Exp $
+
+  31 Mar 2006; Caleb Tennis <caleb@gentoo.org>
+  +files/ruby-gnomecanvas2-0.12.0-GnomeCanvasPathDef.patch,
+  ruby-gnomecanvas2-0.12.0.ebuild:
+  add a patch to fix namespace collision, from bug #127750
 
   30 Mar 2006; Ferris McCormick <fmccor@gentoo.org>
   ruby-gnomecanvas2-0.14.1.ebuild:
diff --git a/dev-ruby/ruby-gnomecanvas2/Manifest b/dev-ruby/ruby-gnomecanvas2/Manifest
index 2f61b5d89063..6cf460f40eec 100644
--- a/dev-ruby/ruby-gnomecanvas2/Manifest
+++ b/dev-ruby/ruby-gnomecanvas2/Manifest
@@ -13,6 +13,9 @@ SHA256 aebae7843fb099292f727e51dec0e144e8635b971729e3383f07038b0351afd0 files/di
 MD5 40c205da3125901037d4e44b9e6db96d files/digest-ruby-gnomecanvas2-0.14.1 75
 RMD160 78c250bf80fdc18262e8ee04a030aae9157a45fd files/digest-ruby-gnomecanvas2-0.14.1 75
 SHA256 0ca308d4b2ac8e367873d30133ec61d5592222d3c44a1c676bbd084926b59583 files/digest-ruby-gnomecanvas2-0.14.1 75
+MD5 f49888c74d03bbc232ab3b9e2ad9c9d6 files/ruby-gnomecanvas2-0.12.0-GnomeCanvasPathDef.patch 795
+RMD160 48b233b1fd1f306b612f76b098d48ce8059ef711 files/ruby-gnomecanvas2-0.12.0-GnomeCanvasPathDef.patch 795
+SHA256 2657a45197578bf2593529d26689194c3b7659f50451265b7dcdb836259880b2 files/ruby-gnomecanvas2-0.12.0-GnomeCanvasPathDef.patch 795
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c metadata.xml 157
@@ -22,9 +25,9 @@ SHA256 94c0050d19c3b683264cf1fe97f17ef702c684eb432c90c815adf625493a9b75 ruby-gno
 MD5 feaafc1ede89d9a6aaf88ac1261f919c ruby-gnomecanvas2-0.11.0.ebuild 514
 RMD160 026cbae454e2faedc705c85ce179f2743f232e57 ruby-gnomecanvas2-0.11.0.ebuild 514
 SHA256 cfd68ae21a6a2ebe8de762bc4e7d61ce4f5aa5dd9fcfb2ae4c4b2f78dd0ab3b0 ruby-gnomecanvas2-0.11.0.ebuild 514
-MD5 619d9b55a6b745ef27cb211c233d72cb ruby-gnomecanvas2-0.12.0.ebuild 514
-RMD160 3bb708c0364ffcd3c9da745994a069b6aea7679a ruby-gnomecanvas2-0.12.0.ebuild 514
-SHA256 7505554a636a8847cdec6d1eb666eb3e97c0fd81a146e6a4952319da89ca3116 ruby-gnomecanvas2-0.12.0.ebuild 514
+MD5 5fa5b0e29b5018f6cfff1c0b2c99337d ruby-gnomecanvas2-0.12.0.ebuild 626
+RMD160 bf83b5cba56106dffc033df8a1af6483a2e26924 ruby-gnomecanvas2-0.12.0.ebuild 626
+SHA256 807fcb40ccf6caddf754e97182b6ebb164b819a0818f492e1b69177f1d0ca55e ruby-gnomecanvas2-0.12.0.ebuild 626
 MD5 ea183d5f77109b58e06785cad1829e99 ruby-gnomecanvas2-0.14.1.ebuild 506
 RMD160 82a10ab95143e28a8bf39f454e284d140c16fbe5 ruby-gnomecanvas2-0.14.1.ebuild 506
 SHA256 291018545c9d63a6b6b940b6149e24c6a23591a7a7c467826fcf36ef2ec76df3 ruby-gnomecanvas2-0.14.1.ebuild 506
diff --git a/dev-ruby/ruby-gnomecanvas2/files/ruby-gnomecanvas2-0.12.0-GnomeCanvasPathDef.patch b/dev-ruby/ruby-gnomecanvas2/files/ruby-gnomecanvas2-0.12.0-GnomeCanvasPathDef.patch
new file mode 100644
index 000000000000..349d5fb9628c
--- /dev/null
+++ b/dev-ruby/ruby-gnomecanvas2/files/ruby-gnomecanvas2-0.12.0-GnomeCanvasPathDef.patch
@@ -0,0 +1,12 @@
+diff -Naur ruby-gnome2-all-0.12.0-orig/gnomecanvas/src/rbgnome-canvas-path-def.c ruby-gnome2-all-0.12.0/gnomecanvas/src/rbgnome-canvas-path-def.c
+--- ruby-gnome2-all-0.12.0-orig/gnomecanvas/src/rbgnome-canvas-path-def.c	2005-03-06 16:39:27.000000000 +0100
++++ ruby-gnome2-all-0.12.0/gnomecanvas/src/rbgnome-canvas-path-def.c	2006-03-27 08:52:10.000000000 +0200
+@@ -33,7 +33,7 @@
+ {
+     static GType our_type = 0;
+     if (our_type == 0)
+-        our_type = g_boxed_type_register_static ("GnomeCanvasPathDef",
++        our_type = g_boxed_type_register_static ("RbGnomeCanvasPathDef",
+                                                  (GBoxedCopyFunc)gnome_canvas_path_def_ref,
+                                                  (GBoxedFreeFunc)gnome_canvas_path_def_unref);
+     return our_type;
diff --git a/dev-ruby/ruby-gnomecanvas2/ruby-gnomecanvas2-0.12.0.ebuild b/dev-ruby/ruby-gnomecanvas2/ruby-gnomecanvas2-0.12.0.ebuild
index a1c6d3f3acba..edeaba24f342 100644
--- a/dev-ruby/ruby-gnomecanvas2/ruby-gnomecanvas2-0.12.0.ebuild
+++ b/dev-ruby/ruby-gnomecanvas2/ruby-gnomecanvas2-0.12.0.ebuild
@@ -1,8 +1,8 @@
-# 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-gnomecanvas2/ruby-gnomecanvas2-0.12.0.ebuild,v 1.5 2005/08/26 17:00:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gnomecanvas2/ruby-gnomecanvas2-0.12.0.ebuild,v 1.6 2006/03/31 14:44:36 caleb Exp $
 
-inherit ruby ruby-gnome2
+inherit ruby ruby-gnome2 eutils
 
 DESCRIPTION="Ruby GnomeCanvas2 bindings"
 KEYWORDS="alpha amd64 ia64 ~ppc ~sparc x86"
@@ -12,3 +12,9 @@ DEPEND=">=gnome-base/libgnomecanvas-2.2"
 RDEPEND="${DEPEND}
 	>=dev-ruby/ruby-gtk2-${PV}
 	>=dev-ruby/ruby-libart2-${PV}"
+
+src_unpack()
+{
+	ruby_src_unpack
+	epatch ${FILESDIR}/ruby-gnomecanvas2-0.12.0-GnomeCanvasPathDef.patch
+}