Update ruby-gnome2 to 0.18.0.

== Ruby-GNOME2 0.18.0: 2008-09-30

This release fixes some memory leak bugs and has new
experimental packages.

=== Changes

Ruby/GLib:
  * mkmf-gnome2.rb: add check_cairo. [Kouhei Sutou]
  * fixed memory leaks. [Kouhei Sutou]
    * [#2110165] Gdk::Pixbuf memory leak
  * install glib-enum-types.h. [Andy Spencer]
    * [#2106938] Install glib-enum-types.h

Ruby/GTK2:
  * add GTK+ 2.12 related bindings. [Guillaume Cottenceau]
  * fixed initialize order. [Kouhei Sutou]
    * [#2113491] Incorrect initialize order (compiling with mingw)

Ruby/GooCanvas [NEW][EXPERIMENTAL]:
  * added. [Kouhei Sutou]

Ruby/Pango:
  * fixed memory leaks. [Kouhei Sutou]

Ruby/GtkSourceView2 [NEW][EXPERIMENTAL]:
  * add. [yselkowitz]

32 files changed, 123 insertions, 252 deletions

diff --git a/devel/ruby-gnome2-atk/PLIST b/devel/ruby-gnome2-atk/PLIST
index d27b25ae10f..992f6827bf4 100644
--- a/devel/ruby-gnome2-atk/PLIST
+++ b/devel/ruby-gnome2-atk/PLIST
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2008/06/19 15:10:49 taca Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/10/22 10:42:03 obache Exp $
 ${RUBY_VENDORLIB}/atk.rb
 ${RUBY_VENDORARCHLIB}/atk.${RUBY_DLEXT}
+${RUBY_VENDORARCHLIB}/rbatk.h
+${RUBY_VENDORARCHLIB}/rbatkversion.h
diff --git a/devel/ruby-gnome2-glib/Makefile b/devel/ruby-gnome2-glib/Makefile
index ad9f0545b93..62f95090034 100644
--- a/devel/ruby-gnome2-glib/Makefile
+++ b/devel/ruby-gnome2-glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/09/17 00:21:49 obache Exp $
+# $NetBSD: Makefile,v 1.8 2008/10/22 10:42:03 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-glib-${VERSION}
@@ -13,11 +13,6 @@ RUBY_EXTCONF_SUBDIRS=	glib
 
 USE_TOOLS+=		pkg-config
 
-# Need glib-enum-types.h for build ruby-gnome2-{gtk,gnomecanvas}.
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/glib/src/glib-enum-types.h \
-		${DESTDIR}${RUBY_VENDORARCHLIBDIR}
-
 do-test:
 	${RUN} cd ${WRKSRC}/glib/test; ${SETENV} ${TEST_ENV} ${RUBY} run-test.rb
 
diff --git a/devel/ruby-gnome2-glib/PLIST b/devel/ruby-gnome2-glib/PLIST
index 358d98aaf3d..50876361ed0 100644
--- a/devel/ruby-gnome2-glib/PLIST
+++ b/devel/ruby-gnome2-glib/PLIST
@@ -1,7 +1,11 @@
-@comment $NetBSD: PLIST,v 1.5 2008/09/17 00:21:49 obache Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/10/22 10:42:03 obache Exp $
 ${RUBY_VENDORLIB}/glib-mkenums.rb
 ${RUBY_VENDORLIB}/glib2.rb
 ${RUBY_VENDORARCHLIB}/glib2.${RUBY_DLEXT}
 ${RUBY_VENDORARCHLIB}/glib-enum-types.h
+${RUBY_VENDORARCHLIB}/rbgcompat.h
+${RUBY_VENDORARCHLIB}/rbglib.h
+${RUBY_VENDORARCHLIB}/rbgobject.h
+${RUBY_VENDORARCHLIB}/rbgutil.h
 ${RUBY_VENDORLIB}/mkmf-gnome2.rb
 ${RUBY_VENDORLIB}/pkg-config.rb
diff --git a/graphics/Makefile b/graphics/Makefile
index f8977057ff7..af154afe9fd 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.494 2008/10/22 10:29:45 obache Exp $
+# $NetBSD: Makefile,v 1.495 2008/10/22 10:42:02 obache Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -299,6 +299,7 @@ SUBDIR+=	ruby-color
 SUBDIR+=	ruby-gd
 SUBDIR+=	ruby-gnome2-gdkpixbuf
 SUBDIR+=	ruby-gnome2-gnomecanvas
+SUBDIR+=	ruby-gnome2-goocanvas
 SUBDIR+=	ruby-gnome2-gtkglext
 SUBDIR+=	ruby-gnome2-libart
 SUBDIR+=	ruby-gnome2-rsvg
diff --git a/graphics/ruby-gnome2-goocanvas/DESCR b/graphics/ruby-gnome2-goocanvas/DESCR
new file mode 100644
index 00000000000..d8505066070
--- /dev/null
+++ b/graphics/ruby-gnome2-goocanvas/DESCR
@@ -0,0 +1,5 @@
+Ruby-GNOME 2 is a set of Ruby language bindings for the various
+application development libraries included with the GNOME/GTK+
+environment.
+
+Ruby/GooCanvas is a Ruby binding of GooCanvas.
diff --git a/graphics/ruby-gnome2-goocanvas/Makefile b/graphics/ruby-gnome2-goocanvas/Makefile
new file mode 100644
index 00000000000..5ca46210bca
--- /dev/null
+++ b/graphics/ruby-gnome2-goocanvas/Makefile
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2008/10/22 10:42:03 obache Exp $
+#
+
+PKGNAME=		${RUBY_PKGPREFIX}-gnome2-goocanvas-${VERSION}
+COMMENT=		Ruby binding of GooCanvas
+CATEGORIES=		graphics gnome
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+RUBY_EXTCONF_SUBDIRS=	goocanvas
+
+USE_TOOLS+=		pkg-config
+
+.include "../../graphics/goocanvas/buildlink3.mk"
+.include "../../graphics/ruby-rcairo/buildlink3.mk"
+.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/graphics/ruby-gnome2-goocanvas/PLIST b/graphics/ruby-gnome2-goocanvas/PLIST
new file mode 100644
index 00000000000..aad446eacef
--- /dev/null
+++ b/graphics/ruby-gnome2-goocanvas/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2008/10/22 10:42:03 obache Exp $
+${RUBY_VENDORLIB}/goocanvas.rb
+${RUBY_VENDORARCHLIB}/goocanvas.${RUBY_DLEXT}
diff --git a/graphics/ruby-gnome2-libart/PLIST b/graphics/ruby-gnome2-libart/PLIST
index 4d14dbcdeb1..25cb0cf055c 100644
--- a/graphics/ruby-gnome2-libart/PLIST
+++ b/graphics/ruby-gnome2-libart/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/06/20 17:50:48 taca Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/10/22 10:42:03 obache Exp $
 ${RUBY_VENDORLIB}/libart2.rb
 ${RUBY_VENDORARCHLIB}/libart2.${RUBY_DLEXT}
+${RUBY_VENDORARCHLIB}/rbart.h
diff --git a/meta-pkgs/ruby-gnome2/Makefile b/meta-pkgs/ruby-gnome2/Makefile
index d6182743910..7fcf07d41ea 100644
--- a/meta-pkgs/ruby-gnome2/Makefile
+++ b/meta-pkgs/ruby-gnome2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/09/17 00:21:48 obache Exp $
+# $NetBSD: Makefile,v 1.12 2008/10/22 10:42:02 obache Exp $
 #
 
 PKGNAME=	${RUBY_PKGPREFIX}-gnome2-${VERSION}
@@ -14,6 +14,7 @@ DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-libglade>=${VERSION}:../../devel/ruby-gnome2-
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-pango>=${VERSION}:../../devel/ruby-gnome2-pango
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gdkpixbuf>=${VERSION}:../../graphics/ruby-gnome2-gdkpixbuf
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gnomecanvas>=${VERSION}:../../graphics/ruby-gnome2-gnomecanvas
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-goocanvas>=${VERSION}:../../graphics/ruby-gnome2-goocanvas
 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
@@ -27,6 +28,7 @@ DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gtkmozembed>=${VERSION}:../../www/ruby-gnome2
 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-gtksourceview2>=${VERSION}:../../x11/ruby-gnome2-gtksourceview2
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-panelapplet>=${VERSION}:../../x11/ruby-gnome2-panelapplet
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-vte>=${VERSION}:../../x11/ruby-gnome2-vte
 
diff --git a/meta-pkgs/ruby-gnome2/Makefile.common b/meta-pkgs/ruby-gnome2/Makefile.common
index edf81c6c76f..71a2372e75e 100644
--- a/meta-pkgs/ruby-gnome2/Makefile.common
+++ b/meta-pkgs/ruby-gnome2/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.6 2008/09/17 00:21:48 obache Exp $
+# $NetBSD: Makefile.common,v 1.7 2008/10/22 10:42:02 obache Exp $
 #
 
-DISTNAME=		ruby-gnome2-all-0.17.0
+DISTNAME=		ruby-gnome2-all-0.18.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.0
+VERSION=		0.18.0
 RUBY_HAS_ARCHLIB=	yes
 USE_RUBY_EXTCONF=	yes
 
diff --git a/meta-pkgs/ruby-gnome2/distinfo b/meta-pkgs/ruby-gnome2/distinfo
index e0e8155b30b..6097f78f3bc 100644
--- a/meta-pkgs/ruby-gnome2/distinfo
+++ b/meta-pkgs/ruby-gnome2/distinfo
@@ -1,21 +1,14 @@
-$NetBSD: distinfo,v 1.5 2008/09/17 00:21:48 obache Exp $
+$NetBSD: distinfo,v 1.6 2008/10/22 10:42:02 obache Exp $
 
-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
+SHA1 (ruby-gnome2-all-0.18.0.tar.gz) = 2e0e72cae4f84e1f22e2ad01c16ff63f620ce2f2
+RMD160 (ruby-gnome2-all-0.18.0.tar.gz) = 8b708ec1ac36042f0f6ebc09d1cfe3fc559b66e5
+Size (ruby-gnome2-all-0.18.0.tar.gz) = 2231735 bytes
+SHA1 (patch-aa) = 1e3330a13df0786a1e3559a57578c99c6d3fce85
+SHA1 (patch-ab) = 3056c970276c2b6442fb7792a457b356cd1a0cb6
+SHA1 (patch-ac) = 0713a9c0255d7e08769645451ca33282c93e280f
+SHA1 (patch-ad) = c50e2ba5299d48eecfc6d68940efc2562cefa0d0
+SHA1 (patch-af) = b45bd1593f9ca2b577ccfa5693507aae6aad3440
+SHA1 (patch-ag) = e46ee6839e9df605b6cdb04c5c2a2a4970563747
+SHA1 (patch-an) = fe2160188643513011c9a2db8d7a21437c1c3516
+SHA1 (patch-ao) = ec787fd91c52f8ecbf4aa6166bb4b288f35b97b5
+SHA1 (patch-ap) = d14bd0b87149d6cf68a22e5b2ad16e86d50b107c
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-aa b/meta-pkgs/ruby-gnome2/patches/patch-aa
index 6d50ecce253..a04386c1ae3 100644
--- a/meta-pkgs/ruby-gnome2/patches/patch-aa
+++ b/meta-pkgs/ruby-gnome2/patches/patch-aa
@@ -1,10 +1,11 @@
-$NetBSD: patch-aa,v 1.2 2008/09/17 00:21:48 obache Exp $
+$NetBSD: patch-aa,v 1.3 2008/10/22 10:42:02 obache Exp $
 
---- atk/src/depend.orig	2008-01-03 03:01:59.000000000 +0000
+--- atk/src/depend.orig	2008-01-03 02:56:49.000000000 +0000
 +++ atk/src/depend
 @@ -1,3 +1,3 @@
- install:
+-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)
++install-so:
 +	$(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 3a525714f9a..a5e03da7fb3 100644
--- a/meta-pkgs/ruby-gnome2/patches/patch-ab
+++ b/meta-pkgs/ruby-gnome2/patches/patch-ab
@@ -1,14 +1,17 @@
-$NetBSD: patch-ab,v 1.2 2008/09/17 00:21:48 obache Exp $
+$NetBSD: patch-ab,v 1.3 2008/10/22 10:42:02 obache Exp $
 
---- glib/src/depend.orig	2008-01-03 03:01:59.000000000 +0000
+--- glib/src/depend.orig	2008-09-30 14:41:50.000000000 +0000
 +++ glib/src/depend
-@@ -1,5 +1,5 @@
- install:
+@@ -1,6 +1,6 @@
+-install:
 -	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbglib.h $(sitearchdir)$(target_prefix)
 -	@$(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)/glib-enum-types.h $(sitearchdir)$(target_prefix)
++install-so:
 +	$(INSTALL_DATA) $(srcdir)/rbglib.h $(RUBYARCHDIR)
 +	$(INSTALL_DATA) $(srcdir)/rbgutil.h $(RUBYARCHDIR)
 +	$(INSTALL_DATA) $(srcdir)/rbgobject.h $(RUBYARCHDIR)
 +	$(INSTALL_DATA) $(srcdir)/rbgcompat.h $(RUBYARCHDIR)
++	$(INSTALL_DATA) $(srcdir)/glib-enum-types.h $(RUBYARCHDIR)
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ac b/meta-pkgs/ruby-gnome2/patches/patch-ac
index 2a59542f304..23b89dceefb 100644
--- a/meta-pkgs/ruby-gnome2/patches/patch-ac
+++ b/meta-pkgs/ruby-gnome2/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2008/09/17 00:21:48 obache Exp $
+$NetBSD: patch-ac,v 1.3 2008/10/22 10:42:02 obache Exp $
 
---- glib/src/lib/mkmf-gnome2.rb.orig	2008-06-23 10:00:00.000000000 +0000
+--- glib/src/lib/mkmf-gnome2.rb.orig	2008-09-13 11:18:06.000000000 +0000
 +++ glib/src/lib/mkmf-gnome2.rb
 @@ -257,7 +257,7 @@ def make_version_header(app_name, pkgnam
  end
@@ -11,45 +11,3 @@ $NetBSD: patch-ac,v 1.2 2008/09/17 00:21:48 obache Exp $
  
    #Other options
    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 130ba745636..c16a2c934e5 100644
--- a/meta-pkgs/ruby-gnome2/patches/patch-ad
+++ b/meta-pkgs/ruby-gnome2/patches/patch-ad
@@ -1,8 +1,11 @@
-$NetBSD: patch-ad,v 1.2 2008/09/17 00:21:48 obache Exp $
+$NetBSD: patch-ad,v 1.3 2008/10/22 10:42:02 obache Exp $
 
---- gtk/src/depend.orig	2008-01-03 03:01:59.000000000 +0000
+--- gtk/src/depend.orig	2008-09-30 13:00:42.000000000 +0000
 +++ gtk/src/depend
-@@ -1,2 +1,2 @@
- install:
+@@ -1,3 +1,3 @@
+-install:
 -	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgtk.h $(sitearchdir)$(target_prefix)
+-	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgtkconversions.h $(sitearchdir)$(target_prefix)
++install-so:
 +	$(INSTALL_DATA) $(srcdir)/rbgtk.h $(RUBYARCHDIR)
++	$(INSTALL_DATA) $(srcdir)/rbgtkconversions.h $(RUBYARCHDIR)
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ae b/meta-pkgs/ruby-gnome2/patches/patch-ae
deleted file mode 100644
index feb840ee237..00000000000
--- a/meta-pkgs/ruby-gnome2/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2008/09/17 00:21:48 obache Exp $
-
---- gtk/src/rbgtk.h.orig	2008-04-14 11:00:40.000000000 +0000
-+++ gtk/src/rbgtk.h
-@@ -18,6 +18,7 @@
- #include "ruby.h"
- #include "rubysig.h"
- #include "rbgobject.h"
-+#include "glib-enum-types.h"
- #include <gtk/gtk.h>
- 
- #ifdef GDK_WINDOWING_X11
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-af b/meta-pkgs/ruby-gnome2/patches/patch-af
index 1ad6d89b38e..9c990536e18 100644
--- a/meta-pkgs/ruby-gnome2/patches/patch-af
+++ b/meta-pkgs/ruby-gnome2/patches/patch-af
@@ -1,8 +1,9 @@
-$NetBSD: patch-af,v 1.2 2008/09/17 00:21:48 obache Exp $
+$NetBSD: patch-af,v 1.3 2008/10/22 10:42:02 obache Exp $
 
---- libart/src/depend.orig	2008-01-03 03:01:59.000000000 +0000
+--- libart/src/depend.orig	2008-01-03 02:59:38.000000000 +0000
 +++ libart/src/depend
 @@ -1,2 +1,2 @@
- install:
+-install:
 -	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbart.h $(sitearchdir)$(target_prefix)
++install-so:
 +	$(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 f1175c22f2a..e6f867e244e 100644
--- a/meta-pkgs/ruby-gnome2/patches/patch-ag
+++ b/meta-pkgs/ruby-gnome2/patches/patch-ag
@@ -1,10 +1,11 @@
-$NetBSD: patch-ag,v 1.2 2008/09/17 00:21:48 obache Exp $
+$NetBSD: patch-ag,v 1.3 2008/10/22 10:42:02 obache Exp $
 
---- pango/src/depend.orig	2008-01-03 03:01:59.000000000 +0000
+--- pango/src/depend.orig	2008-01-03 03:00:57.000000000 +0000
 +++ pango/src/depend
 @@ -1,3 +1,3 @@
- install:
+-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)
++install-so:
 +	$(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
deleted file mode 100644
index 7e55872aece..00000000000
--- a/meta-pkgs/ruby-gnome2/patches/patch-ah
+++ /dev/null
@@ -1,24 +0,0 @@
-$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
deleted file mode 100644
index 3de92049a6e..00000000000
--- a/meta-pkgs/ruby-gnome2/patches/patch-ai
+++ /dev/null
@@ -1,23 +0,0 @@
-$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
deleted file mode 100644
index ee1426ffa7e..00000000000
--- a/meta-pkgs/ruby-gnome2/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$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
deleted file mode 100644
index 4c9d1e74720..00000000000
--- a/meta-pkgs/ruby-gnome2/patches/patch-ak
+++ /dev/null
@@ -1,23 +0,0 @@
-$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
deleted file mode 100644
index 931002689f2..00000000000
--- a/meta-pkgs/ruby-gnome2/patches/patch-al
+++ /dev/null
@@ -1,22 +0,0 @@
-$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
deleted file mode 100644
index 2b3a359b949..00000000000
--- a/meta-pkgs/ruby-gnome2/patches/patch-am
+++ /dev/null
@@ -1,23 +0,0 @@
-$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
index d61755fca4f..4be268f8098 100644
--- a/meta-pkgs/ruby-gnome2/patches/patch-an
+++ b/meta-pkgs/ruby-gnome2/patches/patch-an
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.1 2008/09/17 00:21:48 obache Exp $
+$NetBSD: patch-an,v 1.2 2008/10/22 10:42:02 obache Exp $
 
---- gdkpixbuf/lib/gdk_pixbuf2.rb.orig	2006-12-17 08:30:40.000000000 +0000
+--- gdkpixbuf/lib/gdk_pixbuf2.rb.orig	2007-10-23 12:51:24.000000000 +0000
 +++ gdkpixbuf/lib/gdk_pixbuf2.rb
 @@ -1,6 +1,11 @@
  require 'glib2'
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ao b/meta-pkgs/ruby-gnome2/patches/patch-ao
index e489f496ff5..e7e19e6dfd1 100644
--- a/meta-pkgs/ruby-gnome2/patches/patch-ao
+++ b/meta-pkgs/ruby-gnome2/patches/patch-ao
@@ -1,6 +1,6 @@
-$NetBSD: patch-ao,v 1.1 2008/09/17 00:21:48 obache Exp $
+$NetBSD: patch-ao,v 1.2 2008/10/22 10:42:02 obache Exp $
 
---- gtk/src/lib/gtk2/base.rb.orig	2008-04-10 14:18:40.000000000 +0000
+--- gtk/src/lib/gtk2/base.rb.orig	2008-04-10 14:01:35.000000000 +0000
 +++ gtk/src/lib/gtk2/base.rb
 @@ -13,7 +13,12 @@ require 'glib2'
  require 'atk'
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ap b/meta-pkgs/ruby-gnome2/patches/patch-ap
index 9451215a5d9..d7640ee514b 100644
--- a/meta-pkgs/ruby-gnome2/patches/patch-ap
+++ b/meta-pkgs/ruby-gnome2/patches/patch-ap
@@ -1,6 +1,6 @@
-$NetBSD: patch-ap,v 1.1 2008/09/17 00:21:48 obache Exp $
+$NetBSD: patch-ap,v 1.2 2008/10/22 10:42:03 obache Exp $
 
---- pango/src/lib/pango.rb.orig	2007-12-28 09:04:22.000000000 +0000
+--- pango/src/lib/pango.rb.orig	2007-12-28 09:01:22.000000000 +0000
 +++ pango/src/lib/pango.rb
 @@ -8,7 +8,12 @@
  
diff --git a/x11/Makefile b/x11/Makefile
index 41d4f9e6335..3d2281ebe58 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.569 2008/10/21 06:31:19 bjs Exp $
+# $NetBSD: Makefile,v 1.570 2008/10/22 10:42:02 obache Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -293,6 +293,7 @@ SUBDIR+=	rox-wallpaper
 SUBDIR+=	ruby-gnome2-gnome
 SUBDIR+=	ruby-gnome2-gtk
 SUBDIR+=	ruby-gnome2-gtksourceview
+SUBDIR+=	ruby-gnome2-gtksourceview2
 SUBDIR+=	ruby-gnome2-panelapplet
 SUBDIR+=	ruby-gnome2-vte
 SUBDIR+=	ruby-gtk
diff --git a/x11/ruby-gnome2-gtk/PLIST b/x11/ruby-gnome2-gtk/PLIST
index eebcb54b4be..3b2112f8969 100644
--- a/x11/ruby-gnome2-gtk/PLIST
+++ b/x11/ruby-gnome2-gtk/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2008/06/19 15:15:06 taca Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/10/22 10:42:03 obache Exp $
 ${RUBY_VENDORLIB}/gtk2.rb
 ${RUBY_VENDORLIB}/gtk2/base.rb
 ${RUBY_VENDORARCHLIB}/gtk2.${RUBY_DLEXT}
+${RUBY_VENDORARCHLIB}/rbgtk.h
+${RUBY_VENDORARCHLIB}/rbgtkconversions.h
 @dirrm ${RUBY_VENDORLIB}/gtk2
diff --git a/x11/ruby-gnome2-gtksourceview2/DESCR b/x11/ruby-gnome2-gtksourceview2/DESCR
new file mode 100644
index 00000000000..1715e3c999b
--- /dev/null
+++ b/x11/ruby-gnome2-gtksourceview2/DESCR
@@ -0,0 +1,5 @@
+Ruby-GNOME 2 is a set of Ruby language bindings for the various
+application development libraries included with the GNOME/GTK+
+environment.
+
+Ruby/GtkSourceView2 is a Ruby binding of gtksourceview-2.x.
diff --git a/x11/ruby-gnome2-gtksourceview2/Makefile b/x11/ruby-gnome2-gtksourceview2/Makefile
new file mode 100644
index 00000000000..1f1ce6e8a5a
--- /dev/null
+++ b/x11/ruby-gnome2-gtksourceview2/Makefile
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2008/10/22 10:42:03 obache Exp $
+#
+
+PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gtksourceview2-${VERSION}
+COMMENT=		Ruby binding of gtksourceview2
+CATEGORIES=		x11
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+RUBY_EXTCONF_SUBDIRS=	gtksourceview2
+
+USE_TOOLS+=		pkg-config
+
+DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
+
+do-test:
+	${RUN} cd ${WRKSRC}/gtk/test; ${SETENV} ${TEST_ENV} ${RUBY} run-test.rb
+
+.include "../../x11/gtksourceview2/buildlink3.mk"
+.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/x11/ruby-gnome2-gtksourceview2/PLIST b/x11/ruby-gnome2-gtksourceview2/PLIST
new file mode 100644
index 00000000000..7333447f096
--- /dev/null
+++ b/x11/ruby-gnome2-gtksourceview2/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2008/10/22 10:42:03 obache Exp $
+${RUBY_VENDORLIB}/gtksourceview2.rb
+${RUBY_VENDORARCHLIB}/gtksourceview2.${RUBY_DLEXT}