13 files changed, 5 insertions, 108 deletions
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]*