Update ruby-gnome2 to 0.90.7.

Removed deprecated binding packages.

== Ruby-GNOME2 0.90.7: 2011-02-02

NOTE: 0.90.x releases are for 1.0.0 major release.

A package fix release of 0.90.6.

=== Changes

==== Ruby/GLib2

  * Improvments
    * force remove "-Wl,--noundefined" linker option because
      Ruby-GNOME2 packages doesn't support the option.
      [Dobai-Pataky Bálint, Kouhei Sutou]

==== Ruby/GTK2

  * Improvments
    * use "MS-Windows" GTK+ theme by default on Windows.
      [ashbb, Kouhei Sutou]

=== Thanks

  * ashbb
  * Dobai-Pataky Bálint

== Ruby-GNOME2 0.90.6: 2011-01-29

NOTE: 0.90.x releases are for 1.0.0 major release.

Removed deprecated packages. All supported packages support
RubyGems. All supported packages except Ruby/VTE,
Ruby/GStreamer and Ruby/GtkMozEmbed support also Windows
binary bundled gem.

=== Changes

==== All

  * remove all deprecated packages.
    [Masaaki Aoyagi]
  * all supported packages support RubyGems.
    [Masaaki Aoyagi]

==== Ruby/GLib2

  * Imrpovements
    * add gnome2-raketask.rb that is a utility library to
      define Rake tasks for Ruby-GNOME2 packages.
      [Masaaki Aoyagi, Kouhei Sutou]

  * Fixes
    * fix GType conversion.
      [Kouhei Sutou]
    * fix rcairo installed by RubyGems detection.
      [Masaaki Aoyagi]

==== Ruby/GIO2

  * Improvements
    * support GIO 2.26.
      [Nikolai Weibull]

==== Ruby/GStreamer

  * Improvements
    * add Gst::MissingURISourceMessage.
      [Vincent Carmona, Kouhei Sutou]
    * support RubyGems.
      [Masaaki Aoyagi]

==== Ruby/Pango

  * Fixes
    * rename Pango::LayoutIter#at_last_line! to
      at_last_line? because at_last_line is a predicate
      method. (at_last_line! still exists for backward compatibility.)
      [mrkn, Kouhei Sutou]

==== Ruby/GtkMozEmbed

  * Improvements
    * support RubyGems.
      [Masaaki Aoyagi]
  * Fixes
    * support "2.0b7" style module version. #3141244
      [reandr, Kouhei Sutou]

==== Ruby/GooCanvas

  * Improvements
    * support RubyGems.
      [Masaaki Aoyagi]

==== Ruby/GtkSourceView2

  * Improvements
    * support RubyGems.
      [Masaaki Aoyagi]

==== Ruby/VTE

  * Improvements
    * support RubyGems.
      [Masaaki Aoyagi]

=== Thanks

  * Vincent Carmona
  * mrkn
  * reandr
  * Nikolai Weibull
  * Masaaki Aoyagi

70 files changed, 133 insertions, 574 deletions

diff --git a/devel/Makefile b/devel/Makefile
index f0343425375..e384a85f6a4 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1431 2011/02/11 08:25:35 adam Exp $
+# $NetBSD: Makefile,v 1.1432 2011/02/11 13:50:06 obache Exp $
 #
 
 COMMENT=	Development utilities
@@ -1258,12 +1258,8 @@ SUBDIR+=	ruby-gettext
 SUBDIR+=	ruby-gettext-activerecord
 SUBDIR+=	ruby-gettext-rails
 SUBDIR+=	ruby-gnome2-atk
-SUBDIR+=	ruby-gnome2-bonobo
-SUBDIR+=	ruby-gnome2-bonoboui
-SUBDIR+=	ruby-gnome2-gconf
 SUBDIR+=	ruby-gnome2-gio
 SUBDIR+=	ruby-gnome2-glib
-SUBDIR+=	ruby-gnome2-libglade
 SUBDIR+=	ruby-gnome2-pango
 SUBDIR+=	ruby-heckle
 SUBDIR+=	ruby-highline
diff --git a/devel/ruby-gnome2-bonobo/DESCR b/devel/ruby-gnome2-bonobo/DESCR
deleted file mode 100644
index 13ce785b66e..00000000000
--- a/devel/ruby-gnome2-bonobo/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Ruby-GNOME 2 is a set of Ruby language bindings for the various
-application development libraries included with the GNOME/GTK+
-environment.
-
-Ruby/Bonobo2 is a Ruby binding of libbonobo-2.x or later.
diff --git a/devel/ruby-gnome2-bonobo/Makefile b/devel/ruby-gnome2-bonobo/Makefile
deleted file mode 100644
index 494d8bd4dcc..00000000000
--- a/devel/ruby-gnome2-bonobo/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2011/01/13 13:37:27 wiz Exp $
-#
-
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-bonobo-${VERSION}
-COMMENT=		Ruby binding of libbonobo-2.x or later
-PKGREVISION=		1
-CATEGORIES=		devel
-
-CONFLICTS+=		ruby[0-9][0-9]-gnome2-bonobo-[0-9]*
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-RUBY_EXTCONF_SUBDIRS=	bonobo
-
-DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
-
-.include "../../x11/gtk2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.ruby-gnome2-glib+=	${RUBY_PKGPREFIX}-gnome2-glib-${VERSION}{,nb*}
-BUILDLINK_DEPMETHOD.ruby-gnome2-glib=	build
-.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/ruby-pkg-config/tool.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/devel/ruby-gnome2-bonobo/PLIST b/devel/ruby-gnome2-bonobo/PLIST
deleted file mode 100644
index b5527cfa712..00000000000
--- a/devel/ruby-gnome2-bonobo/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/10/12 03:09:31 obache Exp $
-lib/pkgconfig/ruby-bonobo2.pc
-${RUBY_VENDORLIB}/bonobo2.rb
-${RUBY_VENDORARCHLIB}/bonobo2.${RUBY_DLEXT}
diff --git a/devel/ruby-gnome2-bonoboui/DESCR b/devel/ruby-gnome2-bonoboui/DESCR
deleted file mode 100644
index c7397fde09b..00000000000
--- a/devel/ruby-gnome2-bonoboui/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Ruby-GNOME 2 is a set of Ruby language bindings for the various
-application development libraries included with the GNOME/GTK+
-environment.
-
-Ruby/BonoboUI2 is a Ruby binding of libbonoboui-2.x or later.
diff --git a/devel/ruby-gnome2-bonoboui/Makefile b/devel/ruby-gnome2-bonoboui/Makefile
deleted file mode 100644
index 809b0a8751d..00000000000
--- a/devel/ruby-gnome2-bonoboui/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2011/01/13 13:37:27 wiz Exp $
-#
-
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-bonoboui-${VERSION}
-COMMENT=		Ruby binding of libbonoboui-2.x or later
-PKGREVISION=		1
-CATEGORIES=		devel
-
-CONFLICTS+=		ruby[0-9][0-9]-gnome2-bonoboui-[0-9]*
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-RUBY_EXTCONF_SUBDIRS=	bonoboui
-
-DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gnome>=${VERSION}:../../x11/ruby-gnome2-gnome
-DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
-
-.include "../../x11/gtk2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.ruby-gnome2-glib+=	${RUBY_PKGPREFIX}-gnome2-glib-${VERSION}{,nb*}
-BUILDLINK_DEPMETHOD.ruby-gnome2-glib=	build
-.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
-.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/ruby-pkg-config/tool.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/devel/ruby-gnome2-bonoboui/PLIST b/devel/ruby-gnome2-bonoboui/PLIST
deleted file mode 100644
index 42f1b84862e..00000000000
--- a/devel/ruby-gnome2-bonoboui/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/10/12 03:09:31 obache Exp $
-lib/pkgconfig/ruby-bonoboui2.pc
-${RUBY_VENDORLIB}/bonoboui2.rb
-${RUBY_VENDORARCHLIB}/bonoboui2.${RUBY_DLEXT}
diff --git a/devel/ruby-gnome2-gconf/DESCR b/devel/ruby-gnome2-gconf/DESCR
deleted file mode 100644
index b1102e151c5..00000000000
--- a/devel/ruby-gnome2-gconf/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Ruby-GNOME 2 is a set of Ruby language bindings for the various
-application development libraries included with the GNOME/GTK+
-environment.
-
-Ruby/GConf2 is a Ruby binding of libgconf-1.2.x or later.
diff --git a/devel/ruby-gnome2-gconf/Makefile b/devel/ruby-gnome2-gconf/Makefile
deleted file mode 100644
index 65c7189a2ca..00000000000
--- a/devel/ruby-gnome2-gconf/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2010/10/23 12:45:08 obache Exp $
-#
-
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gconf-${VERSION}
-COMMENT=		Ruby binding of GConf-1.2.x or later
-CATEGORIES=		devel
-
-CONFLICTS+=		ruby[0-9][0-9]-gnome2-gconf-[0-9]*
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-RUBY_EXTCONF_SUBDIRS=	gconf
-
-do-test:
-	${RUN} cd ${WRKSRC}/gconf/tests; \
-		${SETENV} ${TEST_ENV} ${RUBY} -I ${WRKSRC}/gconf/src unittest.rb
-
-.include "../../devel/GConf/buildlink3.mk"
-.include "../../devel/ruby-pkg-config/tool.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/devel/ruby-gnome2-gconf/PLIST b/devel/ruby-gnome2-gconf/PLIST
deleted file mode 100644
index bc88427c5e5..00000000000
--- a/devel/ruby-gnome2-gconf/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/10/12 03:09:31 obache Exp $
-lib/pkgconfig/ruby-gconf2.pc
-${RUBY_VENDORLIB}/gconf2.rb
-${RUBY_VENDORARCHLIB}/gconf2.${RUBY_DLEXT}
diff --git a/devel/ruby-gnome2-gio/Makefile b/devel/ruby-gnome2-gio/Makefile
index 4891640245d..589ba3e2cb2 100644
--- a/devel/ruby-gnome2-gio/Makefile
+++ b/devel/ruby-gnome2-gio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/10/23 12:45:09 obache Exp $
+# $NetBSD: Makefile,v 1.2 2011/02/11 13:50:09 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gio-${VERSION}
@@ -13,6 +13,9 @@ RUBY_EXTCONF_SUBDIRS=	gio2
 
 DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
 
+do-test:
+	${RUN} cd ${WRKSRC}/gio2/test && ${SETENV} ${TEST_ENV} ${RUBY} load-test.rb
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/ruby-pkg-config/tool.mk"
 .include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/devel/ruby-gnome2-glib/PLIST b/devel/ruby-gnome2-glib/PLIST
index e4edf9d75b5..df70841b5d4 100644
--- a/devel/ruby-gnome2-glib/PLIST
+++ b/devel/ruby-gnome2-glib/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.9 2010/09/23 15:36:00 obache Exp $
+@comment $NetBSD: PLIST,v 1.10 2011/02/11 13:50:09 obache Exp $
 lib/pkgconfig/ruby-glib2.pc
 ${RUBY_VENDORLIB}/glib-mkenums.rb
 ${RUBY_VENDORLIB}/glib2.rb
+${RUBY_VENDORLIB}/gnome2-raketask.rb
 ${RUBY_VENDORLIB}/gnome2-win32-binary-downloader.rb
 ${RUBY_VENDORARCHLIB}/glib-enum-types.h
 ${RUBY_VENDORARCHLIB}/glib2.${RUBY_DLEXT}
diff --git a/devel/ruby-gnome2-libglade/DESCR b/devel/ruby-gnome2-libglade/DESCR
deleted file mode 100644
index 97c2be6841b..00000000000
--- a/devel/ruby-gnome2-libglade/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Ruby-GNOME 2 is a set of Ruby language bindings for the various
-application development libraries included with the GNOME/GTK+
-environment.
-
-Ruby/Libglade2 is a Ruby binding of Libglade2.
diff --git a/devel/ruby-gnome2-libglade/Makefile b/devel/ruby-gnome2-libglade/Makefile
deleted file mode 100644
index 28f088e5dcd..00000000000
--- a/devel/ruby-gnome2-libglade/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2011/01/13 13:37:27 wiz Exp $
-#
-
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-libglade-${VERSION}
-COMMENT=		Ruby binding of libglade
-PKGREVISION=		1
-CATEGORIES=		devel
-
-CONFLICTS+=		ruby[0-9][0-9]-gnome2-libglade-[0-9]*
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-RUBY_EXTCONF_SUBDIRS=	libglade
-
-DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
-
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
-BUILDLINK_API_DEPENDS.ruby-gnome2-glib+=	${RUBY_PKGPREFIX}-gnome2-glib-${VERSION}{,nb*}
-BUILDLINK_DEPMETHOD.ruby-gnome2-glib=	build
-.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
-.include "../../devel/ruby-pkg-config/tool.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/devel/ruby-gnome2-libglade/PLIST b/devel/ruby-gnome2-libglade/PLIST
deleted file mode 100644
index 32003679d3c..00000000000
--- a/devel/ruby-gnome2-libglade/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/10/12 03:09:31 obache Exp $
-bin/ruby-glade-create-template
-lib/pkgconfig/ruby-libglade2.pc
-${RUBY_VENDORLIB}/libglade2.rb
-${RUBY_VENDORARCHLIB}/libglade2.${RUBY_DLEXT}
diff --git a/devel/ruby-gnome2-pango/Makefile b/devel/ruby-gnome2-pango/Makefile
index b058153622e..99044a0b3cc 100644
--- a/devel/ruby-gnome2-pango/Makefile
+++ b/devel/ruby-gnome2-pango/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2011/01/13 13:36:28 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2011/02/11 13:50:09 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-pango-${VERSION}
 COMMENT=		Ruby binding of pango-1.x
-PKGREVISION=		1
 CATEGORIES=		devel fonts
 
 CONFLICTS+=		ruby-gnome2-pango-[0-9]*
diff --git a/graphics/Makefile b/graphics/Makefile
index a3900dc5556..329259bd352 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.580 2011/02/08 13:17:21 adam Exp $
+# $NetBSD: Makefile,v 1.581 2011/02/11 13:50:06 obache Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -374,10 +374,7 @@ SUBDIR+=	ruby-color-japanese
 SUBDIR+=	ruby-color-tools
 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
 SUBDIR+=	ruby-gnuplot
 SUBDIR+=	ruby-imlib2
diff --git a/graphics/ruby-gnome2-gdkpixbuf/Makefile b/graphics/ruby-gnome2-gdkpixbuf/Makefile
index e523544714d..795268e1a83 100644
--- a/graphics/ruby-gnome2-gdkpixbuf/Makefile
+++ b/graphics/ruby-gnome2-gdkpixbuf/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2011/01/13 13:38:18 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2011/02/11 13:50:10 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gdkpixbuf-${VERSION}
 COMMENT=		Ruby binding of GdkPixbuf-2.x
-PKGREVISION=		1
 CATEGORIES=		graphics devel
 
 CONFLICTS+=		ruby-gnome2-gdkpixbuf-[0-9]*
@@ -15,7 +14,6 @@ RUBY_EXTCONF_SUBDIRS=	gdk_pixbuf2
 
 DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
 
-.include "../../graphics/ruby-rcairo/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/ruby-pkg-config/tool.mk"
diff --git a/graphics/ruby-gnome2-gnomecanvas/DESCR b/graphics/ruby-gnome2-gnomecanvas/DESCR
deleted file mode 100644
index 584c09bbb25..00000000000
--- a/graphics/ruby-gnome2-gnomecanvas/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Ruby-GNOME 2 is a set of Ruby language bindings for the various
-application development libraries included with the GNOME/GTK+
-environment.
-
-Ruby/GnomeCanvas2 is a Ruby binding of GnomeCanvas-2.x.
diff --git a/graphics/ruby-gnome2-gnomecanvas/Makefile b/graphics/ruby-gnome2-gnomecanvas/Makefile
deleted file mode 100644
index 230762d7fac..00000000000
--- a/graphics/ruby-gnome2-gnomecanvas/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2011/01/13 13:38:19 wiz Exp $
-#
-
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gnomecanvas-${VERSION}
-COMMENT=		Ruby binding of GnomeCanvas-2.x
-PKGREVISION=		1
-CATEGORIES=		graphics gnome
-
-CONFLICTS+=		ruby-gnome2-gnomecanvas-[0-9]*
-CONFLICTS+=		ruby[0-9][0-9]-gnome2-gnomecanvas-[0-9]*
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-RUBY_EXTCONF_SUBDIRS=	gnomecanvas
-
-DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-libart>=${VERSION}:../../graphics/ruby-gnome2-libart
-DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
-
-BUILDLINK_API_DEPENDS.ruby-gnome2-glib+=	${RUBY_PKGPREFIX}-gnome2-glib-${VERSION}{,nb*}
-BUILDLINK_DEPMETHOD.ruby-gnome2-glib=	build
-.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
-.include "../../graphics/libgnomecanvas/buildlink3.mk"
-.include "../../devel/ruby-pkg-config/tool.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/graphics/ruby-gnome2-gnomecanvas/PLIST b/graphics/ruby-gnome2-gnomecanvas/PLIST
deleted file mode 100644
index 19fc52fa243..00000000000
--- a/graphics/ruby-gnome2-gnomecanvas/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2009/10/12 03:09:31 obache Exp $
-lib/pkgconfig/ruby-gnomecanvas2.pc
-${RUBY_VENDORLIB}/gnomecanvas2.rb
-${RUBY_VENDORARCHLIB}/gnomecanvas2.${RUBY_DLEXT}
diff --git a/graphics/ruby-gnome2-goocanvas/Makefile b/graphics/ruby-gnome2-goocanvas/Makefile
index 9d96570ec51..d78b89ceda2 100644
--- a/graphics/ruby-gnome2-goocanvas/Makefile
+++ b/graphics/ruby-gnome2-goocanvas/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2011/01/13 13:38:19 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2011/02/11 13:50:13 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-goocanvas-${VERSION}
 COMMENT=		Ruby binding of GooCanvas
-PKGREVISION=		1
 CATEGORIES=		graphics gnome
 
 CONFLICTS+=		ruby[0-9][0-9]-gnome2-goocanvas-[0-9]*
diff --git a/graphics/ruby-gnome2-gtkglext/DESCR b/graphics/ruby-gnome2-gtkglext/DESCR
deleted file mode 100644
index ca9da3a0246..00000000000
--- a/graphics/ruby-gnome2-gtkglext/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Ruby-GNOME 2 is a set of Ruby language bindings for the various
-application development libraries included with the GNOME/GTK+
-environment.
-
-Ruby/GtkGLExt is a Ruby binding of GtkGLExt.
diff --git a/graphics/ruby-gnome2-gtkglext/Makefile b/graphics/ruby-gnome2-gtkglext/Makefile
deleted file mode 100644
index c359963527f..00000000000
--- a/graphics/ruby-gnome2-gtkglext/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2011/01/13 13:38:19 wiz Exp $
-#
-
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gtkglext-${VERSION}
-COMMENT=		Ruby binding of gtkglext
-PKGREVISION=		1
-CATEGORIES=		graphics
-
-CONFLICTS+=		ruby[0-9][0-9]-gnome2-gtkglext-[0-9]*
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-RUBY_EXTCONF_SUBDIRS=	gtkglext
-
-DEPENDS+=		${RUBY_PKGPREFIX}-opengl-[0-9]*:../../graphics/ruby-opengl
-DEPENDS+=               ${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
-
-BUILDLINK_API_DEPENDS.ruby-gnome2-glib+=	${RUBY_PKGPREFIX}-gnome2-glib-${VERSION}{,nb*}
-BUILDLINK_DEPMETHOD.ruby-gnome2-glib=	build
-.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
-.include "../../graphics/gtkglext/buildlink3.mk"
-.include "../../devel/ruby-pkg-config/tool.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/graphics/ruby-gnome2-gtkglext/PLIST b/graphics/ruby-gnome2-gtkglext/PLIST
deleted file mode 100644
index 582bb7be77d..00000000000
--- a/graphics/ruby-gnome2-gtkglext/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/10/12 03:09:32 obache Exp $
-lib/pkgconfig/ruby-gtkglext.pc
-${RUBY_VENDORLIB}/gtkglext.rb
-${RUBY_VENDORARCHLIB}/gtkglext.${RUBY_DLEXT}
diff --git a/graphics/ruby-gnome2-libart/DESCR b/graphics/ruby-gnome2-libart/DESCR
deleted file mode 100644
index 6baee297a85..00000000000
--- a/graphics/ruby-gnome2-libart/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Ruby-GNOME 2 is a set of Ruby language bindings for the various
-application development libraries included with the GNOME/GTK+
-environment.
-
-Ruby/Libart2 is a Ruby binding of Libart_lgpl.
diff --git a/graphics/ruby-gnome2-libart/Makefile b/graphics/ruby-gnome2-libart/Makefile
deleted file mode 100644
index 1de4507b581..00000000000
--- a/graphics/ruby-gnome2-libart/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2011/01/13 13:38:19 wiz Exp $
-#
-
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-libart-${VERSION}
-COMMENT=		Ruby binding of Libart_lgpl
-PKGREVISION=		1
-CATEGORIES=		graphics
-
-CONFLICTS+=		ruby-gnome2-libart-[0-9]*
-CONFLICTS+=		ruby[0-9][0-9]-gnome2-libart-[0-9]*
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-RUBY_EXTCONF_SUBDIRS=	libart
-
-BUILD_DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
-
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/libart/buildlink3.mk"
-.include "../../devel/ruby-pkg-config/tool.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/graphics/ruby-gnome2-libart/PLIST b/graphics/ruby-gnome2-libart/PLIST
deleted file mode 100644
index e49edaa5c47..00000000000
--- a/graphics/ruby-gnome2-libart/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2009/10/12 03:09:32 obache Exp $
-lib/pkgconfig/ruby-libart2.pc
-${RUBY_VENDORLIB}/libart2.rb
-${RUBY_VENDORARCHLIB}/libart2.${RUBY_DLEXT}
-${RUBY_VENDORARCHLIB}/rbart.h
diff --git a/graphics/ruby-gnome2-rsvg/Makefile b/graphics/ruby-gnome2-rsvg/Makefile
index b5d92eeb36a..f4f2577653f 100644
--- a/graphics/ruby-gnome2-rsvg/Makefile
+++ b/graphics/ruby-gnome2-rsvg/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2011/01/13 13:38:19 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2011/02/11 13:50:11 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-rsvg-${VERSION}
 COMMENT=		Ruby binding of librsvg
-PKGREVISION=		1
 CATEGORIES=		graphics
 
 CONFLICTS+=		ruby[0-9][0-9]-gnome2-rsvg-[0-9]*
diff --git a/meta-pkgs/ruby-gnome2/Makefile b/meta-pkgs/ruby-gnome2/Makefile
index 6c26bb2a240..52c0063ca67 100644
--- a/meta-pkgs/ruby-gnome2/Makefile
+++ b/meta-pkgs/ruby-gnome2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2010/10/23 12:45:08 obache Exp $
+# $NetBSD: Makefile,v 1.14 2011/02/11 13:50:07 obache Exp $
 #
 
 PKGNAME=	${RUBY_PKGPREFIX}-gnome2-${VERSION}
@@ -6,31 +6,17 @@ COMMENT=	Set of Ruby language bindings for GNOME2
 CATEGORIES=	meta-pkgs gnome
 
 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-gio>=${VERSION}:../../devel/ruby-gnome2-gio
 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-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
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gstreamer>=${VERSION}:../../multimedia/ruby-gnome2-gstreamer
-DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gnomeprint>=${VERSION}:../../print/ruby-gnome2-gnomeprint
-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-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
 
 META_PACKAGE=	yes
diff --git a/meta-pkgs/ruby-gnome2/Makefile.common b/meta-pkgs/ruby-gnome2/Makefile.common
index ce3a9b2efa0..a2f3c1bd8e5 100644
--- a/meta-pkgs/ruby-gnome2/Makefile.common
+++ b/meta-pkgs/ruby-gnome2/Makefile.common
@@ -1,31 +1,17 @@
-# $NetBSD: Makefile.common,v 1.16 2010/11/27 06:14:45 obache Exp $
+# $NetBSD: Makefile.common,v 1.17 2011/02/11 13:50:07 obache Exp $
 #
 # used by devel/ruby-gnome2-atk/Makefile
-# used by devel/ruby-gnome2-bonobo/Makefile
-# used by devel/ruby-gnome2-bonoboui/Makefile
-# used by devel/ruby-gnome2-gconf/Makefile
 # used by devel/ruby-gnome2-gio/Makefile
 # used by devel/ruby-gnome2-glib/Makefile
-# used by devel/ruby-gnome2-libglade/Makefile
 # used by devel/ruby-gnome2-pango/Makefile
 # used by graphics/ruby-gnome2-gdkpixbuf/Makefile
-# used by graphics/ruby-gnome2-gnomecanvas/Makefile
 # used by graphics/ruby-gnome2-goocanvas/Makefile
-# used by graphics/ruby-gnome2-gtkglext/Makefile
-# used by graphics/ruby-gnome2-libart/Makefile
 # used by graphics/ruby-gnome2-rsvg/Makefile
 # used by multimedia/ruby-gnome2-gstreamer/Makefile
-# used by print/ruby-gnome2-gnomeprint/Makefile
-# used by print/ruby-gnome2-gnomeprintui/Makefile
 # used by print/ruby-gnome2-poppler/Makefile
-# used by sysutils/ruby-gnome2-gnomevfs/Makefile
-# used by www/ruby-gnome2-gtkhtml2/Makefile
 # used by www/ruby-gnome2-gtkmozembed/Makefile
-# used by x11/ruby-gnome2-gnome/Makefile
 # used by x11/ruby-gnome2-gtk/Makefile
-# used by x11/ruby-gnome2-gtksourceview/Makefile
 # used by x11/ruby-gnome2-gtksourceview2/Makefile
-# used by x11/ruby-gnome2-panelapplet/Makefile
 # used by x11/ruby-gnome2-vte/Makefile
 
 DISTNAME=		ruby-gnome2-all-${VERSION}
@@ -39,7 +25,7 @@ MAINTAINER=		dieter.NetBSD@pandora.be
 HOMEPAGE=		http://ruby-gnome2.sourceforge.jp/
 LICENSE=		gnu-lgpl-v2.1
 
-VERSION=		0.90.5
+VERSION=		0.90.7
 USE_RUBY_EXTCONF=	yes
 CONFIGURE_ENV+=		RUBYOPT="-Ku"
 
diff --git a/meta-pkgs/ruby-gnome2/distinfo b/meta-pkgs/ruby-gnome2/distinfo
index 9700ecb96ed..c5fda840f41 100644
--- a/meta-pkgs/ruby-gnome2/distinfo
+++ b/meta-pkgs/ruby-gnome2/distinfo
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.19 2011/01/14 08:35:23 obache Exp $
+$NetBSD: distinfo,v 1.20 2011/02/11 13:50:08 obache Exp $
 
-SHA1 (ruby-gnome2-all-0.90.5.tar.gz) = 320fc4c9b65b6494abac894e84013683584acf54
-RMD160 (ruby-gnome2-all-0.90.5.tar.gz) = 7c96480e366bac2408a3790c355ad517cc0b0023
-Size (ruby-gnome2-all-0.90.5.tar.gz) = 1754503 bytes
-SHA1 (patch-au) = bb7b7bcb362e978e4393625ecd490f20c78db70e
+SHA1 (ruby-gnome2-all-0.90.7.tar.gz) = 1030187a5e85b11014e99496e56e0209d010b532
+RMD160 (ruby-gnome2-all-0.90.7.tar.gz) = 03f1f9cbdeb24db961edda6a8144b9fc27394708
+Size (ruby-gnome2-all-0.90.7.tar.gz) = 11753981 bytes
+SHA1 (patch-glib2_lib_mkmf-gnome2.rb) = 83bcf775c3094858acf10c0f9bfc718d3807ac5d
+SHA1 (patch-goocanvas_ext_goocanvas_depend) = feab2164320315293be18efe871422ebf6786280
+SHA1 (patch-gstreamer_ext_gstreamer_depend) = 0466202cc922f1df187f9a29fabd0e4cbcf33bfc
+SHA1 (patch-gtkmozembed_ext_gtkmozembed_depend) = 6b217f4515aa9787ac94d48ae4dd935d154c5128
+SHA1 (patch-gtksourceview2_ext_gtksourceview2_depend) = 1a2c46ceb5e77fb270280499a9585e645b3f6a81
+SHA1 (patch-vte_ext_vte_depend) = a12c3e2495abd9de443f3eb5116724006c9b024e
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-au b/meta-pkgs/ruby-gnome2/patches/patch-au
deleted file mode 100644
index d8c11e9af45..00000000000
--- a/meta-pkgs/ruby-gnome2/patches/patch-au
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-au,v 1.1 2011/01/14 08:35:24 obache Exp $
-
-* for png>=1.5
-  * zlib.h is not included from png.h.
-  * use API instead of direct acess to the main linpng control structures.
-
---- libart/src/rbart_canvas.c.orig	2010-10-28 08:12:38.000000000 +0000
-+++ libart/src/rbart_canvas.c
-@@ -14,6 +14,7 @@
- #include "rbart.h"
- 
- #include <jpeglib.h>
-+#include <zlib.h>
- #include <png.h>
- 
- #define ART_CANVAS_PNG_INTERLACE_ADAM7 1
-@@ -352,7 +353,7 @@ canvas_to_png(argc, argv, r_self)
-         return Qnil;
-     }
- 
--    if (setjmp(png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(png_ptr)))
-     {
-         png_destroy_write_struct(&png_ptr, &info_ptr);
-         return Qnil;
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-glib2_lib_mkmf-gnome2.rb b/meta-pkgs/ruby-gnome2/patches/patch-glib2_lib_mkmf-gnome2.rb
new file mode 100644
index 00000000000..4ae8231d828
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-glib2_lib_mkmf-gnome2.rb
@@ -0,0 +1,24 @@
+$NetBSD: patch-glib2_lib_mkmf-gnome2.rb,v 1.1 2011/02/11 13:50:08 obache Exp $
+
+* Failed to detect non-gem rcairo
+  https://sourceforge.net/tracker/?func=detail&aid=3178228&group_id=53614&atid=470969
+
+--- glib2/lib/mkmf-gnome2.rb.orig	2011-02-02 11:40:57.000000000 +0000
++++ glib2/lib/mkmf-gnome2.rb
+@@ -364,7 +364,7 @@ def check_cairo(options={})
+     rescue LoadError
+     end
+   end
+-  return false if rcairo_source_dir.nil?
++  if !rcairo_source_dir.nil?
+ 
+   if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM
+     options = {}
+@@ -377,6 +377,7 @@ def check_cairo(options={})
+   end
+ 
+   $CFLAGS += " -I#{rcairo_source_dir}/ext/cairo"
++  end
+   PKGConfig.have_package('cairo') and have_header('rb_cairo.h')
+ end
+ 
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-goocanvas_ext_goocanvas_depend b/meta-pkgs/ruby-gnome2/patches/patch-goocanvas_ext_goocanvas_depend
new file mode 100644
index 00000000000..0d68bd93264
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-goocanvas_ext_goocanvas_depend
@@ -0,0 +1,14 @@
+$NetBSD: patch-goocanvas_ext_goocanvas_depend,v 1.1 2011/02/11 13:50:08 obache Exp $
+
+* Failed to install *.pc files
+  https://sourceforge.net/tracker/?func=detail&aid=3178294&group_id=53614&atid=470969
+
+--- goocanvas/ext/goocanvas/depend.orig	2011-01-29 04:25:51.000000000 +0000
++++ goocanvas/ext/goocanvas/depend
+@@ -1,5 +1,5 @@
+ install:
+ 	if test -n "$(pkgconfigdir)"; then			\
+ 	  $(MAKEDIRS) $(pkgconfigdir);				\
+-	  $(INSTALL_DATA) ../ruby-goocanvas.pc $(pkgconfigdir);	\
++	  $(INSTALL_DATA) ruby-goocanvas.pc $(pkgconfigdir);	\
+ 	fi
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-gstreamer_ext_gstreamer_depend b/meta-pkgs/ruby-gnome2/patches/patch-gstreamer_ext_gstreamer_depend
new file mode 100644
index 00000000000..3892c148960
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-gstreamer_ext_gstreamer_depend
@@ -0,0 +1,14 @@
+$NetBSD: patch-gstreamer_ext_gstreamer_depend,v 1.1 2011/02/11 13:50:08 obache Exp $
+
+* Failed to install *.pc files
+  https://sourceforge.net/tracker/?func=detail&aid=3178294&group_id=53614&atid=470969
+
+--- gstreamer/ext/gstreamer/depend.orig	2011-01-21 23:27:42.000000000 +0000
++++ gstreamer/ext/gstreamer/depend
+@@ -1,5 +1,5 @@
+ install:
+ 	if test -n "$(pkgconfigdir)"; then			\
+ 	  $(MAKEDIRS) $(pkgconfigdir);				\
+-	  $(INSTALL_DATA) ../ruby-gstreamer.pc $(pkgconfigdir);	\
++	  $(INSTALL_DATA) ruby-gstreamer.pc $(pkgconfigdir);	\
+ 	fi
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-gtkmozembed_ext_gtkmozembed_depend b/meta-pkgs/ruby-gnome2/patches/patch-gtkmozembed_ext_gtkmozembed_depend
new file mode 100644
index 00000000000..7d553a2d75f
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-gtkmozembed_ext_gtkmozembed_depend
@@ -0,0 +1,15 @@
+$NetBSD: patch-gtkmozembed_ext_gtkmozembed_depend,v 1.1 2011/02/11 13:50:08 obache Exp $
+
+* Failed to install *.pc files
+  https://sourceforge.net/tracker/?func=detail&aid=3178294&group_id=53614&atid=470969
+
+--- gtkmozembed/ext/gtkmozembed/depend.orig	2011-01-21 23:27:48.000000000 +0000
++++ gtkmozembed/ext/gtkmozembed/depend
+@@ -1,6 +1,6 @@
+ install:
+ 	if test -n "$(pkgconfigdir)"; then				\
+ 	  $(MAKEDIRS) $(pkgconfigdir);					\
+-	  $(INSTALL_DATA) ../ruby-gtkmozembed.pc $(pkgconfigdir);	\
++	  $(INSTALL_DATA) ruby-gtkmozembed.pc $(pkgconfigdir);		\
+ 	fi
+ 
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-gtksourceview2_ext_gtksourceview2_depend b/meta-pkgs/ruby-gnome2/patches/patch-gtksourceview2_ext_gtksourceview2_depend
new file mode 100644
index 00000000000..0b0183a80e7
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-gtksourceview2_ext_gtksourceview2_depend
@@ -0,0 +1,14 @@
+$NetBSD: patch-gtksourceview2_ext_gtksourceview2_depend,v 1.1 2011/02/11 13:50:08 obache Exp $
+
+* Failed to install *.pc files
+  https://sourceforge.net/tracker/?func=detail&aid=3178294&group_id=53614&atid=470969
+
+--- gtksourceview2/ext/gtksourceview2/depend.orig	2011-01-21 23:27:28.000000000 +0000
++++ gtksourceview2/ext/gtksourceview2/depend
+@@ -1,5 +1,5 @@
+ install:
+ 	if test -n "$(pkgconfigdir)"; then				\
+ 	  $(MAKEDIRS) $(pkgconfigdir);					\
+-	  $(INSTALL_DATA) ../ruby-gtksourceview2.pc $(pkgconfigdir);	\
++	  $(INSTALL_DATA) ruby-gtksourceview2.pc $(pkgconfigdir);	\
+ 	fi
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-vte_ext_vte_depend b/meta-pkgs/ruby-gnome2/patches/patch-vte_ext_vte_depend
new file mode 100644
index 00000000000..335f42b8674
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-vte_ext_vte_depend
@@ -0,0 +1,14 @@
+$NetBSD: patch-vte_ext_vte_depend,v 1.1 2011/02/11 13:50:08 obache Exp $
+
+* Failed to install *.pc files
+  https://sourceforge.net/tracker/?func=detail&aid=3178294&group_id=53614&atid=470969
+
+--- vte/ext/vte/depend.orig	2011-01-21 23:27:36.000000000 +0000
++++ vte/ext/vte/depend
+@@ -1,5 +1,5 @@
+ install:
+ 	if test -n "$(pkgconfigdir)"; then			\
+ 	  $(MAKEDIRS) $(pkgconfigdir);				\
+-	  $(INSTALL_DATA) ../ruby-vte.pc $(pkgconfigdir);	\
++	  $(INSTALL_DATA) ruby-vte.pc $(pkgconfigdir);		\
+ 	fi
diff --git a/print/Makefile b/print/Makefile
index de012d52124..c848610423f 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.468 2011/02/07 20:17:14 minskim Exp $
+# $NetBSD: Makefile,v 1.469 2011/02/11 13:50:07 obache Exp $
 #
 
 COMMENT=	Desktop publishing
@@ -120,8 +120,6 @@ SUBDIR+=	py-reportlab
 SUBDIR+=	rlpr
 SUBDIR+=	rtf2latex
 SUBDIR+=	rtf2latex2e
-SUBDIR+=	ruby-gnome2-gnomeprint
-SUBDIR+=	ruby-gnome2-gnomeprintui
 SUBDIR+=	ruby-gnome2-poppler
 SUBDIR+=	ruby-pdf-writer
 SUBDIR+=	scribus
diff --git a/print/ruby-gnome2-gnomeprint/DESCR b/print/ruby-gnome2-gnomeprint/DESCR
deleted file mode 100644
index d96827eeec4..00000000000
--- a/print/ruby-gnome2-gnomeprint/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Ruby-GNOME 2 is a set of Ruby language bindings for the various
-application development libraries included with the GNOME/GTK+
-environment.
-
-Ruby/GnomePrint is a Ruby binding of libgnomeprint.
diff --git a/print/ruby-gnome2-gnomeprint/Makefile b/print/ruby-gnome2-gnomeprint/Makefile
deleted file mode 100644
index bdc89331fda..00000000000
--- a/print/ruby-gnome2-gnomeprint/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2011/01/13 13:39:14 wiz Exp $
-#
-
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gnomeprint-${VERSION}
-COMMENT=		Ruby binding of libgnomeprint
-PKGREVISION=		1
-CATEGORIES=		print
-
-CONFLICTS+=		ruby[0-9][0-9]-gnome2-gnomeprint-[0-9]*
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-RUBY_EXTCONF_SUBDIRS=	gnomeprint
-
-DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
-DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-pango>=${VERSION}:../../devel/ruby-gnome2-pango
-DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-libart>=${VERSION}:../../graphics/ruby-gnome2-libart
-
-do-test:
-	${RUN} cd ${WRKSRC}/gnomeprint/test; ${SETENV} ${TEST_ENV} ${RUBY} run-test.rb
-
-.include "../../print/libgnomeprint/buildlink3.mk"
-.include "../../devel/ruby-pkg-config/tool.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/print/ruby-gnome2-gnomeprint/PLIST b/print/ruby-gnome2-gnomeprint/PLIST
deleted file mode 100644
index 5aed89fff28..00000000000
--- a/print/ruby-gnome2-gnomeprint/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2009/10/12 03:09:32 obache Exp $
-lib/pkgconfig/ruby-gnomeprint2.pc
-${RUBY_VENDORLIB}/gnomeprint2.rb
-${RUBY_VENDORARCHLIB}/gnomeprint2.${RUBY_DLEXT}
-${RUBY_VENDORARCHLIB}/rblibgnomeprintversion.h
diff --git a/print/ruby-gnome2-gnomeprint/buildlink3.mk b/print/ruby-gnome2-gnomeprint/buildlink3.mk
deleted file mode 100644
index 174305f2d5a..00000000000
--- a/print/ruby-gnome2-gnomeprint/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:16 joerg Exp $
-
-BUILDLINK_TREE+=	ruby-gnome2-gnomeprint
-
-.if !defined(RUBY_GNOME2_GNOMEPRINT_BUILDLINK3_MK)
-RUBY_GNOME2_GNOMEPRINT_BUILDLINK3_MK:=
-
-.include "../../lang/ruby/rubyversion.mk"
-BUILDLINK_API_DEPENDS.ruby-gnome2-gnomeprint+=	${RUBY_PKGPREFIX}-gnome2-gnomeprint>=0.17.0
-BUILDLINK_PKGSRCDIR.ruby-gnome2-gnomeprint?=	../../print/ruby-gnome2-gnomeprint
-.endif # RUBY_GNOME2_GNOMEPRINT_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-ruby-gnome2-gnomeprint
diff --git a/print/ruby-gnome2-gnomeprintui/DESCR b/print/ruby-gnome2-gnomeprintui/DESCR
deleted file mode 100644
index 0b2033aa6e0..00000000000
--- a/print/ruby-gnome2-gnomeprintui/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Ruby-GNOME 2 is a set of Ruby language bindings for the various
-application development libraries included with the GNOME/GTK+
-environment.
-
-Ruby/GnomePrintUI is a Ruby binding of libgnomeprintui.
diff --git a/print/ruby-gnome2-gnomeprintui/Makefile b/print/ruby-gnome2-gnomeprintui/Makefile
deleted file mode 100644
index fd6298753be..00000000000
--- a/print/ruby-gnome2-gnomeprintui/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2011/01/13 13:39:14 wiz Exp $
-#
-
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gnomeprintui-${VERSION}
-COMMENT=		Ruby binding of libgnomeprintui
-PKGREVISION=		1
-CATEGORIES=		print
-
-CONFLICTS+=		ruby[0-9][0-9]-gnome2-gnomeprintui-[0-9]*
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-RUBY_EXTCONF_SUBDIRS=	gnomeprintui
-
-DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gnomeprint>=${VERSION}:../../print/ruby-gnome2-gnomeprint
-DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
-
-BUILDLINK_API_DEPENDS.ruby-gnome2-glib+=	${RUBY_PKGPREFIX}-gnome2-glib-${VERSION}{,nb*}
-BUILDLINK_DEPMETHOD.ruby-gnome2-glib=	build
-.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
-.include "../../print/libgnomeprintui/buildlink3.mk"
-BUILDLINK_API_DEPENDS.ruby-gnome2-gnomeprint+=	${RUBY_PKGPREFIX}-gnome2-gnomeprint>=${VERSION}{,nb*}
-BUILDLINK_DEPMETHOD.ruby-gnome2-gnomeprint=	build
-.include "../../print/ruby-gnome2-gnomeprint/buildlink3.mk"
-.include "../../devel/ruby-pkg-config/tool.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/print/ruby-gnome2-gnomeprintui/PLIST b/print/ruby-gnome2-gnomeprintui/PLIST
deleted file mode 100644
index 79b5b592f97..00000000000
--- a/print/ruby-gnome2-gnomeprintui/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/10/12 03:09:32 obache Exp $
-lib/pkgconfig/ruby-gnomeprintui2.pc
-${RUBY_VENDORLIB}/gnomeprintui2.rb
-${RUBY_VENDORARCHLIB}/gnomeprintui2.${RUBY_DLEXT}
diff --git a/print/ruby-gnome2-poppler/Makefile b/print/ruby-gnome2-poppler/Makefile
index 944aabaab45..7d4854dbe76 100644
--- a/print/ruby-gnome2-poppler/Makefile
+++ b/print/ruby-gnome2-poppler/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2011/01/31 17:04:32 drochner Exp $
+# $NetBSD: Makefile,v 1.18 2011/02/11 13:50:11 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-poppler-${VERSION}
 COMMENT=		Ruby binding of poppler-glib
-PKGREVISION=		2
 CATEGORIES=		print
 
 CONFLICTS+=		ruby[0-9][0-9]-gnome2-poppler-[0-9]*
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 472d1d654c7..30c4a1b99ba 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.508 2011/02/10 16:26:16 wiz Exp $
+# $NetBSD: Makefile,v 1.509 2011/02/11 13:50:07 obache Exp $
 #
 
 COMMENT=	System utilities
@@ -275,7 +275,6 @@ SUBDIR+=	rtty
 SUBDIR+=	ruby-activesambaldap
 SUBDIR+=	ruby-directory-watcher
 SUBDIR+=	ruby-facter
-SUBDIR+=	ruby-gnome2-gnomevfs
 SUBDIR+=	ruby-notify
 SUBDIR+=	ruby-quota
 SUBDIR+=	ruby-rb-appscript
diff --git a/sysutils/ruby-gnome2-gnomevfs/DESCR b/sysutils/ruby-gnome2-gnomevfs/DESCR
deleted file mode 100644
index 0b400f7153f..00000000000
--- a/sysutils/ruby-gnome2-gnomevfs/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Ruby-GNOME 2 is a set of Ruby language bindings for the various
-application development libraries included with the GNOME/GTK+
-environment.
-
-Ruby/GnomeVFS is a Ruby binding of GnomeVFS-2.0.x.
diff --git a/sysutils/ruby-gnome2-gnomevfs/Makefile b/sysutils/ruby-gnome2-gnomevfs/Makefile
deleted file mode 100644
index 67fb92b662a..00000000000
--- a/sysutils/ruby-gnome2-gnomevfs/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2011/01/13 13:39:25 wiz Exp $
-#
-
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gnomevfs-${VERSION}
-COMMENT=		Ruby binding of gnomevfs
-PKGREVISION=		1
-CATEGORIES=		sysutils
-
-CONFLICTS+=		ruby[0-9][0-9]-gnome2-gnomevfs-[0-9]*
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-RUBY_EXTCONF_SUBDIRS=	gnomevfs
-
-do-test:
-	${RUN} cd ${WRKSRC}/gnomevfs/tests; \
-	for t in  test*.rb; do \
-		${SETENV} ${TEST_ENV} ${RUBY} -I ${WRKSRC}/gnomevfs/src/lib -I ${WRKSRC}/gnomevfs/src $$t; \
-	done
-
-BUILDLINK_API_DEPENDS.ruby-gnome2-glib+=	${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}
-.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
-.include "../../devel/ruby-pkg-config/tool.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/sysutils/ruby-gnome2-gnomevfs/PLIST b/sysutils/ruby-gnome2-gnomevfs/PLIST
deleted file mode 100644
index bbc5b60092c..00000000000
--- a/sysutils/ruby-gnome2-gnomevfs/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/10/12 03:09:32 obache Exp $
-lib/pkgconfig/ruby-gnomevfs.pc
-${RUBY_VENDORLIB}/gnomevfs.rb
-${RUBY_VENDORARCHLIB}/gnomevfs.${RUBY_DLEXT}
diff --git a/www/Makefile b/www/Makefile
index 6026457aec5..7bef016f038 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.780 2011/02/07 12:51:39 taca Exp $
+# $NetBSD: Makefile,v 1.781 2011/02/11 13:50:07 obache Exp $
 #
 
 COMMENT=	Packages related to the World Wide Web
@@ -556,7 +556,6 @@ SUBDIR+=	ruby-cssmin
 SUBDIR+=	ruby-csspool
 SUBDIR+=	ruby-div
 SUBDIR+=	ruby-fcgi
-SUBDIR+=	ruby-gnome2-gtkhtml2
 SUBDIR+=	ruby-gnome2-gtkmozembed
 SUBDIR+=	ruby-htmlsplit
 SUBDIR+=	ruby-innate
diff --git a/www/ruby-gnome2-gtkhtml2/DESCR b/www/ruby-gnome2-gtkhtml2/DESCR
deleted file mode 100644
index fc4812ca61c..00000000000
--- a/www/ruby-gnome2-gtkhtml2/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Ruby-GNOME 2 is a set of Ruby language bindings for the various
-application development libraries included with the GNOME/GTK+
-environment.
-
-Ruby/GtkHtml2 is a Ruby binding of GtkHtml2.
diff --git a/www/ruby-gnome2-gtkhtml2/Makefile b/www/ruby-gnome2-gtkhtml2/Makefile
deleted file mode 100644
index 142f0736306..00000000000
--- a/www/ruby-gnome2-gtkhtml2/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2011/01/13 13:39:40 wiz Exp $
-#
-
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gtkhtml2-${VERSION}
-COMMENT=		Ruby binding of gtkhtml2
-PKGREVISION=		1
-CATEGORIES=		www
-
-CONFLICTS+=		ruby[0-9][0-9]-gnome2-gtkhtml2-[0-9]*
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-RUBY_EXTCONF_SUBDIRS=	gtkhtml2
-
-DEPENDS+=               ${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
-
-BUILDLINK_API_DEPENDS.ruby-gnome2-glib+=	${RUBY_PKGPREFIX}-gnome2-glib-${VERSION}{,nb*}
-BUILDLINK_DEPMETHOD.ruby-gnome2-glib=	build
-.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
-.include "../../www/libgtkhtml/buildlink3.mk"
-.include "../../devel/ruby-pkg-config/tool.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/www/ruby-gnome2-gtkhtml2/PLIST b/www/ruby-gnome2-gtkhtml2/PLIST
deleted file mode 100644
index 96b0b0bda59..00000000000
--- a/www/ruby-gnome2-gtkhtml2/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/10/12 03:09:32 obache Exp $
-lib/pkgconfig/ruby-gtkhtml2.pc
-${RUBY_VENDORLIB}/gtkhtml2.rb
-${RUBY_VENDORARCHLIB}/gtkhtml2.${RUBY_DLEXT}
diff --git a/www/ruby-gnome2-gtkmozembed/Makefile b/www/ruby-gnome2-gtkmozembed/Makefile
index 5ea20b0dec9..147b691a1a1 100644
--- a/www/ruby-gnome2-gtkmozembed/Makefile
+++ b/www/ruby-gnome2-gtkmozembed/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2011/01/13 13:39:40 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2011/02/11 13:50:12 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gtkmozembed-${VERSION}
 COMMENT=		Ruby binding of gtkmozembed
-PKGREVISION=		1
 CATEGORIES=		www
 
 CONFLICTS+=		ruby[0-9][0-9]-gnome2-gtkmozembed-[0-9]*
@@ -16,6 +15,9 @@ DEPENDS+=               ${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-
 
 USE_LANGUAGES=		c c++
 
+do-test:
+	${RUN} cd ${WRKSRC}/gtkmozembed/test; ${SETENV} ${TEST_ENV} ${RUBY} run-test.rb
+
 BUILDLINK_API_DEPENDS.ruby-gnome2-glib+=	${RUBY_PKGPREFIX}-gnome2-glib-${VERSION}{,nb*}
 BUILDLINK_DEPMETHOD.ruby-gnome2-glib=	build
 .include "../../devel/ruby-gnome2-glib/buildlink3.mk"
diff --git a/x11/Makefile b/x11/Makefile
index f914210c14d..086cfc4debc 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.628 2011/02/03 19:00:01 drochner Exp $
+# $NetBSD: Makefile,v 1.629 2011/02/11 13:50:07 obache Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -326,11 +326,8 @@ SUBDIR+=	resourceproto
 SUBDIR+=	rgb
 SUBDIR+=	rox-session
 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
 SUBDIR+=	ruby-tk
diff --git a/x11/ruby-gnome2-gnome/DESCR b/x11/ruby-gnome2-gnome/DESCR
deleted file mode 100644
index 47b4937509c..00000000000
--- a/x11/ruby-gnome2-gnome/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Ruby-GNOME 2 is a set of Ruby language bindings for the various
-application development libraries included with the GNOME/GTK+
-environment.
-
-Ruby/GNOME2 is a Ruby binding of libgnome/libgnomeui-2.x.
diff --git a/x11/ruby-gnome2-gnome/Makefile b/x11/ruby-gnome2-gnome/Makefile
deleted file mode 100644
index ab6ce38b185..00000000000
--- a/x11/ruby-gnome2-gnome/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2011/01/13 13:40:05 wiz Exp $
-#
-
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gnome-${VERSION}
-PKGREVISION=		1
-CATEGORIES=		gnome x11
-COMMENT=		Ruby binding of libgnome/libgnomeui-2.x
-
-CONFLICTS+=		ruby-gnome2-gnome-[0-9]*
-CONFLICTS+=		ruby[0-9][0-9]-gnome2-gnome-[0-9]*
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-RUBY_EXTCONF_SUBDIRS=	gnome
-
-DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gnomecanvas>=${VERSION}:../../graphics/ruby-gnome2-gnomecanvas
-
-BUILDLINK_API_DEPENDS.ruby-gnome2-glib+=	${RUBY_PKGPREFIX}-gnome2-glib-${VERSION}{,nb*}
-BUILDLINK_DEPMETHOD.ruby-gnome2-glib=	build
-.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/ruby-pkg-config/tool.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/x11/ruby-gnome2-gnome/PLIST b/x11/ruby-gnome2-gnome/PLIST
deleted file mode 100644
index 12c281221b3..00000000000
--- a/x11/ruby-gnome2-gnome/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2009/10/12 03:09:32 obache Exp $
-lib/pkgconfig/ruby-gnome2.pc
-${RUBY_VENDORLIB}/gnome2.rb
-${RUBY_VENDORARCHLIB}/gnome2.${RUBY_DLEXT}
diff --git a/x11/ruby-gnome2-gtk/Makefile b/x11/ruby-gnome2-gtk/Makefile
index 1c432a3da41..2b6a367ab78 100644
--- a/x11/ruby-gnome2-gtk/Makefile
+++ b/x11/ruby-gnome2-gtk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2011/01/13 13:36:37 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2011/02/11 13:50:12 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gtk-${VERSION}
-PKGREVISION=		1
 CATEGORIES=		x11
 COMMENT=		Ruby binding of GTK+-2.x
 
diff --git a/x11/ruby-gnome2-gtksourceview/DESCR b/x11/ruby-gnome2-gtksourceview/DESCR
deleted file mode 100644
index b2c6d2dc984..00000000000
--- a/x11/ruby-gnome2-gtksourceview/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Ruby-GNOME 2 is a set of Ruby language bindings for the various
-application development libraries included with the GNOME/GTK+
-environment.
-
-Ruby/GtkSourceView is a Ruby binding of gtksourceview-1.0.x.
diff --git a/x11/ruby-gnome2-gtksourceview/Makefile b/x11/ruby-gnome2-gtksourceview/Makefile
deleted file mode 100644
index 7b3cf99d816..00000000000
--- a/x11/ruby-gnome2-gtksourceview/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2011/01/13 13:40:05 wiz Exp $
-#
-
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gtksourceview-${VERSION}
-COMMENT=		Ruby binding of gtksourceview
-PKGREVISION=		1
-CATEGORIES=		x11
-
-CONFLICTS+=		ruby[0-9][0-9]-gnome2-gtksourceview-[0-9]*
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-RUBY_EXTCONF_SUBDIRS=	gtksourceview
-
-DEPENDS+=               ${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
-
-BUILDLINK_API_DEPENDS.ruby-gnome2-glib+=	${RUBY_PKGPREFIX}-gnome2-glib-${VERSION}{,nb*}
-BUILDLINK_DEPMETHOD.ruby-gnome2-glib=	build
-.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
-.include "../../x11/gtksourceview/buildlink3.mk"
-.include "../../devel/ruby-pkg-config/tool.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/x11/ruby-gnome2-gtksourceview/PLIST b/x11/ruby-gnome2-gtksourceview/PLIST
deleted file mode 100644
index a3950a2ed2e..00000000000
--- a/x11/ruby-gnome2-gtksourceview/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/10/12 03:09:33 obache Exp $
-lib/pkgconfig/ruby-gtksourceview.pc
-${RUBY_VENDORLIB}/gtksourceview.rb
-${RUBY_VENDORARCHLIB}/gtksourceview.${RUBY_DLEXT}
diff --git a/x11/ruby-gnome2-gtksourceview2/Makefile b/x11/ruby-gnome2-gtksourceview2/Makefile
index bfd6550cc4a..0a17ac434fb 100644
--- a/x11/ruby-gnome2-gtksourceview2/Makefile
+++ b/x11/ruby-gnome2-gtksourceview2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2011/01/13 13:40:05 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2011/02/11 13:50:13 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gtksourceview2-${VERSION}
 COMMENT=		Ruby binding of gtksourceview2
-PKGREVISION=		1
 CATEGORIES=		x11
 
 CONFLICTS+=		ruby[0-9][0-9]-gnome2-gtksourceview2-[0-9]*
@@ -15,7 +14,7 @@ RUBY_EXTCONF_SUBDIRS=	gtksourceview2
 DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
 
 do-test:
-	${RUN} cd ${WRKSRC}/gtk/test; ${SETENV} ${TEST_ENV} ${RUBY} run-test.rb
+	${RUN} cd ${WRKSRC}/gtksourceview2/test; ${SETENV} ${TEST_ENV} ${RUBY} run-test.rb
 
 .include "../../x11/gtksourceview2/buildlink3.mk"
 .include "../../devel/ruby-pkg-config/tool.mk"
diff --git a/x11/ruby-gnome2-panelapplet/DESCR b/x11/ruby-gnome2-panelapplet/DESCR
deleted file mode 100644
index d48b0aa409d..00000000000
--- a/x11/ruby-gnome2-panelapplet/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Ruby-GNOME 2 is a set of Ruby language bindings for the various
-application development libraries included with the GNOME/GTK+
-environment.
-
-Ruby/PanelApplet2 is a Ruby binding of libpanel-applet-2.6.x.
diff --git a/x11/ruby-gnome2-panelapplet/Makefile b/x11/ruby-gnome2-panelapplet/Makefile
deleted file mode 100644
index 85462e352c9..00000000000
--- a/x11/ruby-gnome2-panelapplet/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2011/01/13 13:40:05 wiz Exp $
-#
-
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-panelapplet-${VERSION}
-COMMENT=		Ruby binding of libpanel-applet-2.6.x
-PKGREVISION=		1
-CATEGORIES=		x11 gnome
-
-CONFLICTS+=		ruby-gnome2-panelapplet-[0-9]*
-CONFLICTS+=		ruby[0-9][0-9]-gnome2-panelapplet-[0-9]*
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-RUBY_EXTCONF_SUBDIRS=	panel-applet
-
-DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gnome>=${VERSION}:../../x11/ruby-gnome2-gnome
-
-BUILDLINK_API_DEPENDS.ruby-gnome2-glib+=	${RUBY_PKGPREFIX}-gnome2-glib-${VERSION}{,nb*}
-BUILDLINK_DEPMETHOD.ruby-gnome2-glib=	build
-.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
-.include "../../x11/gnome-panel/buildlink3.mk"
-.include "../../devel/ruby-pkg-config/tool.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/x11/ruby-gnome2-panelapplet/PLIST b/x11/ruby-gnome2-panelapplet/PLIST
deleted file mode 100644
index 8db9b917c5a..00000000000
--- a/x11/ruby-gnome2-panelapplet/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2009/10/12 03:09:33 obache Exp $
-lib/pkgconfig/ruby-panelapplet2.pc
-${RUBY_VENDORARCHLIB}/panelapplet2.${RUBY_DLEXT}
-${RUBY_VENDORARCHLIB}/panelapplet2_main.${RUBY_DLEXT}
-${RUBY_VENDORLIB}/panelapplet2.rb
diff --git a/x11/ruby-gnome2-vte/Makefile b/x11/ruby-gnome2-vte/Makefile
index 9b0b5601b76..ce9e42b9fba 100644
--- a/x11/ruby-gnome2-vte/Makefile
+++ b/x11/ruby-gnome2-vte/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2011/01/13 13:40:05 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2011/02/11 13:50:13 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-vte-${VERSION}
 COMMENT=		Ruby binding of vte
-PKGREVISION=		1
 CATEGORIES=		x11
 
 CONFLICTS+=		ruby[0-9][0-9]-gnome2-vte-[0-9]*