Update ruby-gnome2 to 0.17.0 release.

pkgsrc changes:
   * Add some additional modules:
    	devel/ruby-gnome2-bonobo
    	devel/ruby-gnome2-bonoboui
    	devel/ruby-gnome2-gconf
    	devel/ruby-gnome2-libglade
    	graphics/ruby-gnome2-gtkglext
    	multimedia/ruby-gnome2-gstreamer
    	print/ruby-gnome2-gnomeprintui
    	sysutils/ruby-gnome2-gnomevfs
    	www/ruby-gnome2-gtkhtml2
    	www/ruby-gnome2-gtkmozembed
    	x11/ruby-gnome2-gtksourceview
    	x11/ruby-gnome2-vte
   * Fixed detection of rcairo. It had been broken since switched to gem.
     patch-a{c,h,i,j,k,l.m}
     (It Already in upstream trunk)
   * Add patches for allow to load gem rcairo.
     patch-a{n,o,p}
   * Fixed overwritten glib module when installing modules require generated
     header of glib module.
     Modify to install the header as part of glib module and use bl3.mk.
   * clean up dependency
   * Add test target for modules having unit test.
   * Modified patch-a{a,b,d,f,g} to acceptable by upstream.

Ruby-GNOME2-0.17.0 (2008-09-07)

  Release notes:
  * This Release supports Ruby 1.8.7 and has many bug fixes and
    new bound functions.

  Main changes:
  * Ruby/GLib:
    - [#2060606] Crash when removing ruby applet from gnome panel with 0.7rc1
      [Kouhei Sutou]

  * Ruby/GTK:
    - [#2025651] FTBFS with gtk+ 2.13.5 [Cesare Tirabassi, Kouhei Sutou]

    - [#2043970] Segfaults on 64-bit Linux [Neil Roberts, Kouhei Sutou]

  * Ruby/Pango:
    - [#2043970] Pango::FontDescription#weight= seg fault [Kouhei Sutou]

  * Many other changes, GC bugs, Segfault fixes. See corresponding ChangeLog
    for detailed information on changes and contributors.

    Special thanks for your contributions to: (list in no particular order)
    - Neil Roberts
    - Cesare Tirabassi
    - Arnaud Cornet

19 files changed, 297 insertions, 46 deletions

diff --git a/meta-pkgs/ruby-gnome2/Makefile b/meta-pkgs/ruby-gnome2/Makefile
index 85ceccba54e..d6182743910 100644
--- a/meta-pkgs/ruby-gnome2/Makefile
+++ b/meta-pkgs/ruby-gnome2/Makefile
@@ -1,22 +1,34 @@
-# $NetBSD: Makefile,v 1.10 2008/06/19 15:10:28 taca Exp $
+# $NetBSD: Makefile,v 1.11 2008/09/17 00:21:48 obache Exp $
 #
 
 PKGNAME=	${RUBY_PKGPREFIX}-gnome2-${VERSION}
 COMMENT=	Set of Ruby language bindings for GNOME2
 CATEGORIES=	meta-pkgs gnome
 
-DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-atk>=${VERSION}:../../devel/ruby-gnome2-atk
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-bonobo>=${VERSION}:../../devel/ruby-gnome2-bonobo
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-bonoboui>=${VERSION}:../../devel/ruby-gnome2-bonoboui
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gconf>=${VERSION}:../../devel/ruby-gnome2-gconf
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-libglade>=${VERSION}:../../devel/ruby-gnome2-libglade
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-pango>=${VERSION}:../../devel/ruby-gnome2-pango
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gdkpixbuf>=${VERSION}:../../graphics/ruby-gnome2-gdkpixbuf
-DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-libart>=${VERSION}:../../graphics/ruby-gnome2-libart
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gnomecanvas>=${VERSION}:../../graphics/ruby-gnome2-gnomecanvas
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gtkglext>=${VERSION}:../../graphics/ruby-gnome2-gtkglext
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-libart>=${VERSION}:../../graphics/ruby-gnome2-libart
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-rsvg>=${VERSION}:../../graphics/ruby-gnome2-rsvg
-DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-poppler>=${VERSION}:../../print/ruby-gnome2-poppler
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gstreamer>=${VERSION}:../../multimedia/ruby-gnome2-gstreamer
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gnomeprint>=${VERSION}:../../print/ruby-gnome2-gnomeprint
-DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gnomeprintui>=${VERSION}:../../print/ruby-gnome2-gnomeprintui
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-poppler>=${VERSION}:../../print/ruby-gnome2-poppler
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gnomevfs>=${VERSION}:../../sysutils/ruby-gnome2-gnomevfs
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gtkhtml2>=${VERSION}:../../www/ruby-gnome2-gtkhtml2
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gtkmozembed>=${VERSION}:../../www/ruby-gnome2-gtkmozembed
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gnome>=${VERSION}:../../x11/ruby-gnome2-gnome
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gtksourceview>=${VERSION}:../../x11/ruby-gnome2-gtksourceview
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-panelapplet>=${VERSION}:../../x11/ruby-gnome2-panelapplet
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-vte>=${VERSION}:../../x11/ruby-gnome2-vte
 
 META_PACKAGE=	yes
 
diff --git a/meta-pkgs/ruby-gnome2/Makefile.common b/meta-pkgs/ruby-gnome2/Makefile.common
index b8ba7a2ea33..edf81c6c76f 100644
--- a/meta-pkgs/ruby-gnome2/Makefile.common
+++ b/meta-pkgs/ruby-gnome2/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.5 2008/06/19 15:10:28 taca Exp $
+# $NetBSD: Makefile.common,v 1.6 2008/09/17 00:21:48 obache Exp $
 #
 
-DISTNAME=		ruby-gnome2-0.17.0-rc1
+DISTNAME=		ruby-gnome2-all-0.17.0
 CATEGORIES+=		ruby
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ruby-gnome2/}
 
@@ -11,7 +11,7 @@ PATCHDIR=		${.CURDIR}/../../meta-pkgs/ruby-gnome2/patches
 MAINTAINER=		dieter.NetBSD@pandora.be
 HOMEPAGE=		http://ruby-gnome2.sourceforge.jp/
 
-VERSION=		0.17.0rc1
+VERSION=		0.17.0
 RUBY_HAS_ARCHLIB=	yes
 USE_RUBY_EXTCONF=	yes
 
diff --git a/meta-pkgs/ruby-gnome2/distinfo b/meta-pkgs/ruby-gnome2/distinfo
index 52647bfbacf..e0e8155b30b 100644
--- a/meta-pkgs/ruby-gnome2/distinfo
+++ b/meta-pkgs/ruby-gnome2/distinfo
@@ -1,12 +1,21 @@
-$NetBSD: distinfo,v 1.4 2008/06/19 15:10:28 taca Exp $
+$NetBSD: distinfo,v 1.5 2008/09/17 00:21:48 obache Exp $
 
-SHA1 (ruby-gnome2-0.17.0-rc1.tar.gz) = 372fb444dc1b05d236176895755a5ac87dcbd1a6
-RMD160 (ruby-gnome2-0.17.0-rc1.tar.gz) = 6cc815e2750f34de6f4104101e6f3a7cfb2a037e
-Size (ruby-gnome2-0.17.0-rc1.tar.gz) = 1444553 bytes
-SHA1 (patch-aa) = 316bf9d583e069e029717c7593b1693ce4bccd3e
-SHA1 (patch-ab) = e0d590165bd7ac8442904824d52f6a372c881697
-SHA1 (patch-ac) = 2ab0a3c86950ffd094bdac4abbde1e4cec2133b0
-SHA1 (patch-ad) = 3744e3a173d17d0a96a2f4209c40d34355fe9054
-SHA1 (patch-ae) = 48006ffe136d4471f074793e2d0f030052615bed
-SHA1 (patch-af) = acc1c071ffbe49b64abf4f4f938b1f96d2b4337d
-SHA1 (patch-ag) = 09d87a68006fbe56773e4b12350fa8a5fc133663
+SHA1 (ruby-gnome2-all-0.17.0.tar.gz) = 8afcaedaa3fc5c4b2e86152a4122c28ad4693c07
+RMD160 (ruby-gnome2-all-0.17.0.tar.gz) = 11bd9fa5b54a822c58851b9e69b3837a0e0a5926
+Size (ruby-gnome2-all-0.17.0.tar.gz) = 1483244 bytes
+SHA1 (patch-aa) = e3a71325c58d780ed8f8f0d9f9c11b870a832353
+SHA1 (patch-ab) = ec484594620e8d9528417a24c7fca030708d6d36
+SHA1 (patch-ac) = 924a34bdc09a42bd79e3a3cd859c3421f7e9e711
+SHA1 (patch-ad) = c522d34c269778c328def9494dfe4c4ce9f41161
+SHA1 (patch-ae) = fa5bb916ec56cc4ba96a52bdca82f6995b829843
+SHA1 (patch-af) = bcf18b0e95af531fa17cbea64ae5d5e518538901
+SHA1 (patch-ag) = 167120424cc2a8ed2b8c5ae6ba913e0cb3332e99
+SHA1 (patch-ah) = 0f79c15df24226737efee47959ec7f9a33220912
+SHA1 (patch-ai) = 064fd9cb49440e34f52653df4aeea49cdea0dff6
+SHA1 (patch-aj) = 14359983b816ab91dbd9bc02edccdac5a187c7f5
+SHA1 (patch-ak) = da565ace6ac102dd52c738ecc04a25045136d923
+SHA1 (patch-al) = 0b9ba29ba9ed7fd01d957eea38ee7b8ff7bdf0f8
+SHA1 (patch-am) = 6c6b5a7535a0a08526f264cc32bd8d832271025f
+SHA1 (patch-an) = 7b09fe1f6fd8586bc092857f383a29e63861117c
+SHA1 (patch-ao) = 7563b329b86e96e24c05d6570ab6ef7962b031e6
+SHA1 (patch-ap) = d533557159cc0559b1f057099d123db55c744600
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-aa b/meta-pkgs/ruby-gnome2/patches/patch-aa
index e9c652cf86a..6d50ecce253 100644
--- a/meta-pkgs/ruby-gnome2/patches/patch-aa
+++ b/meta-pkgs/ruby-gnome2/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.1 2008/06/19 15:10:28 taca Exp $
+$NetBSD: patch-aa,v 1.2 2008/09/17 00:21:48 obache Exp $
 
---- atk/src/depend.orig	2008-06-06 23:03:37.000000000 +0900
+--- atk/src/depend.orig	2008-01-03 03:01:59.000000000 +0000
 +++ atk/src/depend
 @@ -1,3 +1,3 @@
  install:
 -	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbatk.h $(sitearchdir)$(target_prefix)
 -	@$(RUBY) -run -e install -- -m 0644 -v rbatkversion.h $(sitearchdir)$(target_prefix)
-+	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbatk.h $(vendorarchdir)$(target_prefix)
-+	@$(RUBY) -run -e install -- -m 0644 -v rbatkversion.h $(vendorarchdir)$(target_prefix)
++	$(INSTALL_DATA) $(srcdir)/rbatk.h $(RUBYARCHDIR)
++	$(INSTALL_DATA) rbatkversion.h $(RUBYARCHDIR)
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ab b/meta-pkgs/ruby-gnome2/patches/patch-ab
index 6620a9ad981..3a525714f9a 100644
--- a/meta-pkgs/ruby-gnome2/patches/patch-ab
+++ b/meta-pkgs/ruby-gnome2/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2008/06/19 15:10:28 taca Exp $
+$NetBSD: patch-ab,v 1.2 2008/09/17 00:21:48 obache Exp $
 
---- glib/src/depend.orig	2008-06-06 23:03:39.000000000 +0900
+--- glib/src/depend.orig	2008-01-03 03:01:59.000000000 +0000
 +++ glib/src/depend
 @@ -1,5 +1,5 @@
  install:
@@ -8,7 +8,7 @@ $NetBSD: patch-ab,v 1.1 2008/06/19 15:10:28 taca Exp $
 -	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgutil.h $(sitearchdir)$(target_prefix)
 -	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgobject.h $(sitearchdir)$(target_prefix)
 -	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgcompat.h $(sitearchdir)$(target_prefix)
-+	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbglib.h $(vendorarchdir)$(target_prefix)
-+	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgutil.h $(vendorarchdir)$(target_prefix)
-+	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgobject.h $(vendorarchdir)$(target_prefix)
-+	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgcompat.h $(vendorarchdir)$(target_prefix)
++	$(INSTALL_DATA) $(srcdir)/rbglib.h $(RUBYARCHDIR)
++	$(INSTALL_DATA) $(srcdir)/rbgutil.h $(RUBYARCHDIR)
++	$(INSTALL_DATA) $(srcdir)/rbgobject.h $(RUBYARCHDIR)
++	$(INSTALL_DATA) $(srcdir)/rbgcompat.h $(RUBYARCHDIR)
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ac b/meta-pkgs/ruby-gnome2/patches/patch-ac
index c67fb3f10e2..2a59542f304 100644
--- a/meta-pkgs/ruby-gnome2/patches/patch-ac
+++ b/meta-pkgs/ruby-gnome2/patches/patch-ac
@@ -1,12 +1,55 @@
-$NetBSD: patch-ac,v 1.1 2008/06/19 15:10:28 taca Exp $
+$NetBSD: patch-ac,v 1.2 2008/09/17 00:21:48 obache Exp $
 
---- glib/src/lib/mkmf-gnome2.rb.orig	2008-06-06 23:03:39.000000000 +0900
+--- glib/src/lib/mkmf-gnome2.rb.orig	2008-06-23 10:00:00.000000000 +0000
 +++ glib/src/lib/mkmf-gnome2.rb
-@@ -241,6 +241,7 @@ end
+@@ -257,7 +257,7 @@ def make_version_header(app_name, pkgnam
+ end
  
  def check_ruby_func
-   $CPPFLAGS << " -I$(sitearchdir) "
+-  $CPPFLAGS << " -I$(sitearchdir) "
 +  $CPPFLAGS << " -I$(vendorarchdir) "
  
    #Other options
-   have_func("rb_define_alloc_func") # for ruby-1.8
+   ruby_header = "ruby.h"
+@@ -296,6 +296,41 @@ def glib_mkenums(prefix, files, g_type_p
+   GLib::MkEnums.create(prefix, files, g_type_prefix, include_files)
+ end
+ 
++def check_cairo
++  return false unless PKGConfig.have_package('cairo')
++
++  have_rb_cairo_h = have_header('rb_cairo.h')
++  unless have_rb_cairo_h
++    begin
++      require 'rubygems'
++      gem 'cairo'
++      require 'cairo'
++      rcairo_src_gem_path_re =
++        /\A#{Regexp.escape(Gem.dir)}\/gems\/cairo-[\d.]+\/src\z/
++      $:.each do |path|
++        if rcairo_src_gem_path_re =~ path
++          $CFLAGS += " -I#{path} "
++          have_rb_cairo_h = have_header('rb_cairo.h')
++          break
++        end
++      end
++    rescue LoadError
++    end
++  end
++
++  if have_rb_cairo_h
++    if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM
++      unless ENV["CAIRO_PATH"]
++        puts "Error! Set CAIRO_PATH."
++        exit 1
++      end
++      add_depend_package("cairo", "src", ENV["CAIRO_PATH"])
++      $defs << "-DRUBY_CAIRO_PLATFORM_WIN32"
++    end
++  end
++  have_rb_cairo_h
++end
++
+ check_ruby_func
+ 
+ if /mingw/ =~ RUBY_PLATFORM
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ad b/meta-pkgs/ruby-gnome2/patches/patch-ad
index 42e74581f2c..130ba745636 100644
--- a/meta-pkgs/ruby-gnome2/patches/patch-ad
+++ b/meta-pkgs/ruby-gnome2/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2008/06/19 15:10:28 taca Exp $
+$NetBSD: patch-ad,v 1.2 2008/09/17 00:21:48 obache Exp $
 
---- gtk/src/depend.orig	2008-06-06 23:03:41.000000000 +0900
+--- gtk/src/depend.orig	2008-01-03 03:01:59.000000000 +0000
 +++ gtk/src/depend
 @@ -1,2 +1,2 @@
  install:
 -	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgtk.h $(sitearchdir)$(target_prefix)
-+	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgtk.h $(vendorarchdir)$(target_prefix)
++	$(INSTALL_DATA) $(srcdir)/rbgtk.h $(RUBYARCHDIR)
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ae b/meta-pkgs/ruby-gnome2/patches/patch-ae
index 88918aa6779..feb840ee237 100644
--- a/meta-pkgs/ruby-gnome2/patches/patch-ae
+++ b/meta-pkgs/ruby-gnome2/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2008/06/19 15:10:28 taca Exp $
+$NetBSD: patch-ae,v 1.2 2008/09/17 00:21:48 obache Exp $
 
---- gtk/src/rbgtk.h.orig	2008-06-06 14:03:41.000000000 +0000
+--- gtk/src/rbgtk.h.orig	2008-04-14 11:00:40.000000000 +0000
 +++ gtk/src/rbgtk.h
 @@ -18,6 +18,7 @@
  #include "ruby.h"
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-af b/meta-pkgs/ruby-gnome2/patches/patch-af
index a40c78408d2..1ad6d89b38e 100644
--- a/meta-pkgs/ruby-gnome2/patches/patch-af
+++ b/meta-pkgs/ruby-gnome2/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2008/06/19 15:10:28 taca Exp $
+$NetBSD: patch-af,v 1.2 2008/09/17 00:21:48 obache Exp $
 
---- libart/src/depend.orig	2008-06-06 23:03:45.000000000 +0900
+--- libart/src/depend.orig	2008-01-03 03:01:59.000000000 +0000
 +++ libart/src/depend
 @@ -1,2 +1,2 @@
  install:
 -	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbart.h $(sitearchdir)$(target_prefix)
-+	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbart.h $(vendorarchdir)$(target_prefix)
++	$(INSTALL_DATA) $(srcdir)/rbart.h $(RUBYARCHDIR)
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ag b/meta-pkgs/ruby-gnome2/patches/patch-ag
index 1968c9566c4..f1175c22f2a 100644
--- a/meta-pkgs/ruby-gnome2/patches/patch-ag
+++ b/meta-pkgs/ruby-gnome2/patches/patch-ag
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.1 2008/06/19 15:10:28 taca Exp $
+$NetBSD: patch-ag,v 1.2 2008/09/17 00:21:48 obache Exp $
 
---- pango/src/depend.orig	2008-06-06 23:03:45.000000000 +0900
+--- pango/src/depend.orig	2008-01-03 03:01:59.000000000 +0000
 +++ pango/src/depend
 @@ -1,3 +1,3 @@
  install:
 -	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbpango.h $(sitearchdir)$(target_prefix)
 -	@$(RUBY) -run -e install -- -m 0644 -v rbpangoversion.h $(sitearchdir)$(target_prefix)
-+	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbpango.h $(vendorarchdir)$(target_prefix)
-+	@$(RUBY) -run -e install -- -m 0644 -v rbpangoversion.h $(vendorarchdir)$(target_prefix)
++	$(INSTALL_DATA) $(srcdir)/rbpango.h $(RUBYARCHDIR)
++	$(INSTALL_DATA) rbpangoversion.h $(RUBYARCHDIR)
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ah b/meta-pkgs/ruby-gnome2/patches/patch-ah
new file mode 100644
index 00000000000..7e55872aece
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-ah
@@ -0,0 +1,24 @@
+$NetBSD: patch-ah,v 1.1 2008/09/17 00:21:48 obache Exp $
+
+--- gdkpixbuf/extconf.rb.orig	2008-06-11 00:11:07.000000000 +0000
++++ gdkpixbuf/extconf.rb
+@@ -21,17 +21,8 @@ have_func("gdk_pixbuf_set_option", "gdk-
+ end
+ have_header("gdk-pixbuf/gdk-pixbuf-io.h")
+ 
+-if PKGConfig.have_package('cairo') and
+-    PKGConfig.have_package('gdk-2.0') and
+-    have_header('rb_cairo.h')
+-  if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM
+-    unless ENV["CAIRO_PATH"]
+-      puts "Error! Set CAIRO_PATH."
+-      exit 1
+-    end
+-    add_depend_package("cairo", "src", ENV["CAIRO_PATH"])
+-    $defs << "-DRUBY_CAIRO_PLATFORM_WIN32"
+-  end
++if PKGConfig.have_package('gdk-2.0')
++  check_cairo
+ end
+ 
+ add_depend_package("glib2", "glib/src", TOPDIR)
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ai b/meta-pkgs/ruby-gnome2/patches/patch-ai
new file mode 100644
index 00000000000..3de92049a6e
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-ai
@@ -0,0 +1,23 @@
+$NetBSD: patch-ai,v 1.1 2008/09/17 00:21:48 obache Exp $
+
+--- gtk/extconf.rb.orig	2008-07-23 23:51:22.000000000 +0000
++++ gtk/extconf.rb
+@@ -65,17 +65,7 @@ end
+ 
+ have_func("rb_errinfo")
+ 
+-PKGConfig.have_package('cairo')
+-if have_header('rb_cairo.h')
+-  if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM
+-    unless ENV["CAIRO_PATH"]
+-      puts "Error! Set CAIRO_PATH."
+-      exit 1
+-    end
+-    add_depend_package("cairo", "src", ENV["CAIRO_PATH"])
+-    $defs << "-DRUBY_CAIRO_PLATFORM_WIN32"
+-  end
+-end
++check_cairo
+ 
+ add_depend_package("glib2", "glib/src", TOPDIR)
+ add_depend_package("pango", "pango/src", TOPDIR)
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-aj b/meta-pkgs/ruby-gnome2/patches/patch-aj
new file mode 100644
index 00000000000..ee1426ffa7e
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-aj
@@ -0,0 +1,22 @@
+$NetBSD: patch-aj,v 1.1 2008/09/17 00:21:48 obache Exp $
+
+--- poppler/extconf.rb.orig	2008-06-11 00:27:07.000000000 +0000
++++ poppler/extconf.rb
+@@ -20,16 +20,7 @@ poppler_header = "poppler.h"
+ have_func("poppler_page_render_selection_to_pixbuf", poppler_header)
+ have_struct_member("PopplerImageMapping", "image_id", poppler_header)
+ 
+-if PKGConfig.have_package('cairo') and have_header('rb_cairo.h')
+-  if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM
+-    unless ENV["CAIRO_PATH"]
+-      puts "Error! Set CAIRO_PATH."
+-      exit 1
+-    end
+-    add_depend_package("cairo", "src", ENV["CAIRO_PATH"])
+-    $defs << "-DRUBY_CAIRO_PLATFORM_WIN32"
+-  end
+-end
++check_cairo
+ 
+ add_depend_package("glib2", "glib/src", TOPDIR)
+ add_depend_package("gtk2", "gtk/src", TOPDIR)
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ak b/meta-pkgs/ruby-gnome2/patches/patch-ak
new file mode 100644
index 00000000000..4c9d1e74720
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-ak
@@ -0,0 +1,23 @@
+$NetBSD: patch-ak,v 1.1 2008/09/17 00:21:48 obache Exp $
+
+--- rsvg/extconf.rb.orig	2008-06-11 00:00:42.000000000 +0000
++++ rsvg/extconf.rb
+@@ -26,17 +26,7 @@ have_func("rsvg_handle_get_pixbuf_sub", 
+ have_header("librsvg/rsvg-gz.h")
+ have_type("RsvgDimensionData", "librsvg/rsvg.h")
+ 
+-if PKGConfig.have_package('cairo') and have_header('rb_cairo.h')
+-  if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM
+-    unless ENV["CAIRO_PATH"]
+-      puts "Error! Set CAIRO_PATH."
+-      exit 1
+-    end
+-    add_depend_package("cairo", "src", ENV["CAIRO_PATH"])
+-    $defs << "-DRUBY_CAIRO_PLATFORM_WIN32"
+-  end
+-  have_header("librsvg/rsvg-cairo.h")
+-end
++check_cairo
+ 
+ add_depend_package("glib2", "glib/src", TOPDIR)
+ 
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-al b/meta-pkgs/ruby-gnome2/patches/patch-al
new file mode 100644
index 00000000000..931002689f2
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-al
@@ -0,0 +1,22 @@
+$NetBSD: patch-al,v 1.1 2008/09/17 00:21:48 obache Exp $
+
+--- vte/extconf.rb.orig	2008-04-13 05:55:27.000000000 +0000
++++ vte/extconf.rb
+@@ -16,16 +16,7 @@ require 'mkmf-gnome2'
+ PKGConfig.have_package(PACKAGE_ID, 0, 12, 1) or exit 1
+ setup_win32(PACKAGE_NAME)
+ 
+-if PKGConfig.have_package('cairo') and have_header('rb_cairo.h')
+-  if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM
+-    unless ENV["CAIRO_PATH"]
+-      puts "Error! Set CAIRO_PATH."
+-      exit 1
+-    end
+-    add_depend_package("cairo", "src", ENV["CAIRO_PATH"])
+-    $defs << "-DRUBY_CAIRO_PLATFORM_WIN32"
+-  end
+-end
++check_cairo
+ 
+ add_depend_package("glib2", "glib/src", TOPDIR)
+ add_depend_package("gtk2", "gtk/src", TOPDIR)
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-am b/meta-pkgs/ruby-gnome2/patches/patch-am
new file mode 100644
index 00000000000..2b3a359b949
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-am
@@ -0,0 +1,23 @@
+$NetBSD: patch-am,v 1.1 2008/09/17 00:21:48 obache Exp $
+
+--- pango/extconf.rb.orig	2008-06-10 23:46:00.000000000 +0000
++++ pango/extconf.rb
+@@ -29,16 +29,8 @@ have_func("pango_attr_iterator_get_attrs
+ have_func("pango_itemize_with_base_dir", pango_header)
+ have_func("pango_font_family_is_monospace", pango_header)
+ 
+-PKGConfig.have_package('pangocairo')
+-if have_header('rb_cairo.h')
+-  if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM
+-    unless ENV["CAIRO_PATH"]
+-      puts "Error! Set CAIRO_PATH."
+-      exit 1
+-    end
+-    add_depend_package("cairo", "src", ENV["CAIRO_PATH"])
+-    $defs << "-DRUBY_CAIRO_PLATFORM_WIN32"
+-  end
++if PKGConfig.have_package('pangocairo')
++  check_cairo
+ end
+ 
+ add_depend_package("glib2", "glib/src", TOPDIR)
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-an b/meta-pkgs/ruby-gnome2/patches/patch-an
new file mode 100644
index 00000000000..d61755fca4f
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-an
@@ -0,0 +1,16 @@
+$NetBSD: patch-an,v 1.1 2008/09/17 00:21:48 obache Exp $
+
+--- gdkpixbuf/lib/gdk_pixbuf2.rb.orig	2006-12-17 08:30:40.000000000 +0000
++++ gdkpixbuf/lib/gdk_pixbuf2.rb
+@@ -1,6 +1,11 @@
+ require 'glib2'
+ begin
++ begin
+   require 'cairo'
++ rescue LoadError
++  require 'rubygems'
++  require 'cairo'
++ end
+ rescue LoadError
+ end
+ require 'gdk_pixbuf2.so'
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ao b/meta-pkgs/ruby-gnome2/patches/patch-ao
new file mode 100644
index 00000000000..e489f496ff5
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-ao
@@ -0,0 +1,17 @@
+$NetBSD: patch-ao,v 1.1 2008/09/17 00:21:48 obache Exp $
+
+--- gtk/src/lib/gtk2/base.rb.orig	2008-04-10 14:18:40.000000000 +0000
++++ gtk/src/lib/gtk2/base.rb
+@@ -13,7 +13,12 @@ require 'glib2'
+ require 'atk'
+ require 'pango'
+ begin
++ begin
+   require 'cairo'
++ rescue LoadError
++  require 'rubygems'
++  require 'cairo'
++ end
+ rescue LoadError
+ end
+ require 'gtk2.so'
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ap b/meta-pkgs/ruby-gnome2/patches/patch-ap
new file mode 100644
index 00000000000..9451215a5d9
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-ap
@@ -0,0 +1,17 @@
+$NetBSD: patch-ap,v 1.1 2008/09/17 00:21:48 obache Exp $
+
+--- pango/src/lib/pango.rb.orig	2007-12-28 09:04:22.000000000 +0000
++++ pango/src/lib/pango.rb
+@@ -8,7 +8,12 @@
+ 
+ require 'glib2'
+ begin
++ begin
+   require 'cairo'
++ rescue LoadError
++  require 'rubygems'
++  require 'cairo'
++ end
+ rescue LoadError
+ end
+ require 'pango.so'