Switch ruby-gnome2 packages to using gem.

Bump PKGREVISIONs to denote gem'fy and PLIST changes.
Also take maintainership.

Discussed with and ok'ed by wiz@ on pkgsrc-users@:
 http://mail-index.netbsd.org/pkgsrc-users/2016/01/thread1.html#022813

18 files changed, 287 insertions, 92 deletions

diff --git a/graphics/ruby-gnome2-cairo-gobject/Makefile b/graphics/ruby-gnome2-cairo-gobject/Makefile
index b30f92d4d0c..9ab744212de 100644
--- a/graphics/ruby-gnome2-cairo-gobject/Makefile
+++ b/graphics/ruby-gnome2-cairo-gobject/Makefile
@@ -1,15 +1,18 @@
-# $NetBSD: Makefile,v 1.10 2016/01/11 23:49:33 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2016/01/24 05:03:23 tsutsui Exp $
+#
 
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-cairo-gobject-${VERSION}
+DISTNAME=		cairo-gobject-${VERSION}
+PKGNAME=		${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
 PKGREVISION=		1
 COMMENT=		Ruby binding of cairo-gobject
 CATEGORIES=		graphics gnome
 
-RUBY_EXTCONF_SUBDIRS=	cairo-gobject
+DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
+DEPENDS+=		${RUBY_PKGPREFIX}-cairo>=1.14.3:../../graphics/ruby-cairo
 
-BUILDLINK_API_DEPENDS.ruby-gnome2-glib+=	${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}
 .include "../../devel/ruby-gnome2-glib/buildlink3.mk"
 .include "../../graphics/ruby-cairo/buildlink3.mk"
 .include "../../graphics/cairo-gobject/buildlink3.mk"
-.include "../../devel/ruby-pkg-config/tool.mk"
 .include "../../meta-pkgs/ruby-gnome2/Makefile.common"
+.include "../../lang/ruby/gem.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ruby-gnome2-cairo-gobject/PLIST b/graphics/ruby-gnome2-cairo-gobject/PLIST
index f03a38149a2..75406e79d1e 100644
--- a/graphics/ruby-gnome2-cairo-gobject/PLIST
+++ b/graphics/ruby-gnome2-cairo-gobject/PLIST
@@ -1,3 +1,40 @@
-@comment $NetBSD: PLIST,v 1.1 2013/06/15 09:39:33 obache Exp $
-${RUBY_VENDORLIB}/cairo-gobject.rb
-${RUBY_VENDORARCHLIB}/cairo_gobject.${RUBY_DLEXT}
+@comment $NetBSD: PLIST,v 1.2 2016/01/24 05:03:23 tsutsui Exp $
+${GEM_HOME}/cache/${GEM_NAME}.gem
+${GEM_EXTSDIR}/cairo_gobject.${RUBY_DLEXT}
+${GEM_EXTSDIR}/gem.build_complete
+${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/ext/cairo-gobject/extconf.rb
+${GEM_LIBDIR}/ext/cairo-gobject/rb-cairo-gobject.c
+${GEM_LIBDIR}/ext/cairo-gobject/rb-cairo-gobject.h
+${GEM_LIBDIR}/extconf.rb
+${GEM_LIBDIR}/lib/cairo-gobject.rb
+${GEM_LIBDIR}/lib/cairo_gobject.${RUBY_DLEXT}
+${GEM_LIBDIR}/test/cairo-gobject-test-utils.rb
+${GEM_LIBDIR}/test/run-test.rb
+${GEM_LIBDIR}/test/test_cairoantialias.rb
+${GEM_LIBDIR}/test/test_cairocontent.rb
+${GEM_LIBDIR}/test/test_cairocontext.rb
+${GEM_LIBDIR}/test/test_cairodevicetype.rb
+${GEM_LIBDIR}/test/test_cairoextend.rb
+${GEM_LIBDIR}/test/test_cairofillrule.rb
+${GEM_LIBDIR}/test/test_cairofilter.rb
+${GEM_LIBDIR}/test/test_cairofontslant.rb
+${GEM_LIBDIR}/test/test_cairofonttype.rb
+${GEM_LIBDIR}/test/test_cairofontweight.rb
+${GEM_LIBDIR}/test/test_cairoformat.rb
+${GEM_LIBDIR}/test/test_cairohintmetrics.rb
+${GEM_LIBDIR}/test/test_cairohintstyle.rb
+${GEM_LIBDIR}/test/test_cairoimagesurface.rb
+${GEM_LIBDIR}/test/test_cairolinecap.rb
+${GEM_LIBDIR}/test/test_cairolinejoin.rb
+${GEM_LIBDIR}/test/test_cairooperator.rb
+${GEM_LIBDIR}/test/test_cairopathdatatype.rb
+${GEM_LIBDIR}/test/test_cairopatterntype.rb
+${GEM_LIBDIR}/test/test_cairoregion.rb
+${GEM_LIBDIR}/test/test_cairoregionoverlap.rb
+${GEM_LIBDIR}/test/test_cairoscaledfont.rb
+${GEM_LIBDIR}/test/test_cairostatus.rb
+${GEM_LIBDIR}/test/test_cairosubpixelorder.rb
+${GEM_LIBDIR}/test/test_cairosurfacetype.rb
+${GEM_LIBDIR}/test/test_cairotextclusterflags.rb
+${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/graphics/ruby-gnome2-cairo-gobject/distinfo b/graphics/ruby-gnome2-cairo-gobject/distinfo
new file mode 100644
index 00000000000..f3746d29320
--- /dev/null
+++ b/graphics/ruby-gnome2-cairo-gobject/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2016/01/24 05:03:23 tsutsui Exp $
+
+SHA1 (cairo-gobject-3.0.7.gem) = 7f67a8afd3e0b5a9332b4623d70c96f7279717bc
+RMD160 (cairo-gobject-3.0.7.gem) = d7066026df73f51f5d778c5882f6dbdc1c5c7d99
+SHA512 (cairo-gobject-3.0.7.gem) = d2d401cb4c38e4fcef40ea356820efff675a91c4411ef92e6e45e89da32702fc7205ab356d532d6019ffdd14dadbd7cb5a46b48a131b03f9159c74214ea5b3d8
+Size (cairo-gobject-3.0.7.gem) = 10240 bytes
diff --git a/graphics/ruby-gnome2-clutter-gtk/Makefile b/graphics/ruby-gnome2-clutter-gtk/Makefile
index 1c4fc517636..9fe70812a06 100644
--- a/graphics/ruby-gnome2-clutter-gtk/Makefile
+++ b/graphics/ruby-gnome2-clutter-gtk/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/01/05 09:06:05 obache Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/24 05:03:23 tsutsui Exp $
 #
 
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-clutter-gtk-${VERSION}
+DISTNAME=		clutter-gtk-${VERSION}
+PKGNAME=		${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
+PKGREVISION=		1
 COMMENT=		Ruby binding of Clutter-GTK
 CATEGORIES=		graphics
 
@@ -9,13 +11,7 @@ DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-clutter>=${VERSION}:../../graphics/ruby-gnome
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gtk3>=${VERSION}:../../x11/ruby-gnome2-gtk3
 DEPENDS+=	clutter-gtk>=1.0:../../graphics/clutter-gtk
 
-RUBY_SETUP_SUBDIRS=	clutter-gtk
-
-USE_RUBY_EXTCONF=	no
-USE_RUBY_SETUP=		yes
-USE_RUBY_SETUP_PKG=	yes
-
-do-test:
-	${RUN} cd ${WRKSRC}/clutter-gtk/test; ${SETENV} ${TEST_ENV} ${RUBY} run-test.rb
-
+.include "../../graphics/clutter-gtk/buildlink3.mk"
 .include "../../meta-pkgs/ruby-gnome2/Makefile.common"
+.include "../../lang/ruby/gem.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ruby-gnome2-clutter-gtk/PLIST b/graphics/ruby-gnome2-clutter-gtk/PLIST
index be25e59edc6..caaebec2c2c 100644
--- a/graphics/ruby-gnome2-clutter-gtk/PLIST
+++ b/graphics/ruby-gnome2-clutter-gtk/PLIST
@@ -1,2 +1,16 @@
-@comment $NetBSD: PLIST,v 1.1 2014/01/05 09:06:05 obache Exp $
-${RUBY_VENDORLIB}/clutter-gtk.rb
+@comment $NetBSD: PLIST,v 1.2 2016/01/24 05:03:23 tsutsui Exp $
+${GEM_HOME}/cache/${GEM_NAME}.gem
+${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/lib/clutter-gtk.rb
+${GEM_LIBDIR}/sample/events.rb
+${GEM_LIBDIR}/sample/multistage.rb
+${GEM_LIBDIR}/sample/redhand.png
+${GEM_LIBDIR}/sample/test-actor.rb
+${GEM_LIBDIR}/sample/test-scroll.rb
+${GEM_LIBDIR}/sample/test.rb
+${GEM_LIBDIR}/sample/window-test.rb
+${GEM_LIBDIR}/sample/window-test2.rb
+${GEM_LIBDIR}/test/clutter-gtk-test-utils.rb
+${GEM_LIBDIR}/test/run-test.rb
+${GEM_LIBDIR}/test/test-clutter-gtk-embed.rb
+${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/graphics/ruby-gnome2-clutter-gtk/distinfo b/graphics/ruby-gnome2-clutter-gtk/distinfo
new file mode 100644
index 00000000000..d2734eba152
--- /dev/null
+++ b/graphics/ruby-gnome2-clutter-gtk/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2016/01/24 05:03:23 tsutsui Exp $
+
+SHA1 (clutter-gtk-3.0.7.gem) = 7ae23f6bdcf07449ac625e5e312aa339c71a28cc
+RMD160 (clutter-gtk-3.0.7.gem) = 4c6985e1c27b6b4763d6cda0b25f0587f234bd55
+SHA512 (clutter-gtk-3.0.7.gem) = 34e7d2bf5896eb0b07297bff6dae455b3bbc3ad685eb866941162de4885be74055d3dbc0286dffb0b7c80860502fb00abde54ac8808d2d88f2d94e5ca0c63938
+Size (clutter-gtk-3.0.7.gem) = 21504 bytes
diff --git a/graphics/ruby-gnome2-clutter/Makefile b/graphics/ruby-gnome2-clutter/Makefile
index da8ac34adff..ed594484619 100644
--- a/graphics/ruby-gnome2-clutter/Makefile
+++ b/graphics/ruby-gnome2-clutter/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2014/12/30 08:53:44 obache Exp $
+# $NetBSD: Makefile,v 1.3 2016/01/24 05:03:23 tsutsui Exp $
 #
 
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-clutter-${VERSION}
+DISTNAME=		clutter-${VERSION}
+PKGNAME=		${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
+PKGREVISION=		1
 COMMENT=		Ruby binding of Clutter
 CATEGORIES=		graphics
 
@@ -10,13 +12,7 @@ DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-pango>=${VERSION}:../../devel/ruby-gnome2-pan
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-cairo-gobject>=${VERSION}:../../graphics/ruby-gnome2-cairo-gobject
 DEPENDS+=	clutter>=1.0:../../graphics/clutter
 
-RUBY_SETUP_SUBDIRS=	clutter
-
-USE_RUBY_EXTCONF=	no
-USE_RUBY_SETUP=		yes
-USE_RUBY_SETUP_PKG=	yes
-
-do-test:
-	${RUN} cd ${WRKSRC}/clutter/test; ${SETENV} ${TEST_ENV} ${RUBY} run-test.rb
-
+.include "../../graphics/clutter/buildlink3.mk"
 .include "../../meta-pkgs/ruby-gnome2/Makefile.common"
+.include "../../lang/ruby/gem.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ruby-gnome2-clutter/PLIST b/graphics/ruby-gnome2-clutter/PLIST
index 6a7264a6eb9..c12d001d98e 100644
--- a/graphics/ruby-gnome2-clutter/PLIST
+++ b/graphics/ruby-gnome2-clutter/PLIST
@@ -1,15 +1,50 @@
-@comment $NetBSD: PLIST,v 1.4 2015/12/13 10:52:15 tsutsui Exp $
-${RUBY_VENDORLIB}/clutter.rb
-${RUBY_VENDORLIB}/clutter/actor-iter.rb
-${RUBY_VENDORLIB}/clutter/actor.rb
-${RUBY_VENDORLIB}/clutter/animatable.rb
-${RUBY_VENDORLIB}/clutter/brightness-contrast-effect.rb
-${RUBY_VENDORLIB}/clutter/cairo.rb
-${RUBY_VENDORLIB}/clutter/clutter.rb
-${RUBY_VENDORLIB}/clutter/color.rb
-${RUBY_VENDORLIB}/clutter/event.rb
-${RUBY_VENDORLIB}/clutter/point.rb
-${RUBY_VENDORLIB}/clutter/text-buffer.rb
-${RUBY_VENDORLIB}/clutter/text.rb
-${RUBY_VENDORLIB}/clutter/threads.rb
-${RUBY_VENDORLIB}/clutter/version.rb
+@comment $NetBSD: PLIST,v 1.5 2016/01/24 05:03:23 tsutsui Exp $
+${GEM_HOME}/cache/${GEM_NAME}.gem
+${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/lib/clutter.rb
+${GEM_LIBDIR}/lib/clutter/actor-iter.rb
+${GEM_LIBDIR}/lib/clutter/actor.rb
+${GEM_LIBDIR}/lib/clutter/animatable.rb
+${GEM_LIBDIR}/lib/clutter/brightness-contrast-effect.rb
+${GEM_LIBDIR}/lib/clutter/cairo.rb
+${GEM_LIBDIR}/lib/clutter/clutter.rb
+${GEM_LIBDIR}/lib/clutter/color.rb
+${GEM_LIBDIR}/lib/clutter/event.rb
+${GEM_LIBDIR}/lib/clutter/point.rb
+${GEM_LIBDIR}/lib/clutter/text-buffer.rb
+${GEM_LIBDIR}/lib/clutter/text.rb
+${GEM_LIBDIR}/lib/clutter/threads.rb
+${GEM_LIBDIR}/lib/clutter/version.rb
+${GEM_LIBDIR}/sample/basic-actor.rb
+${GEM_LIBDIR}/sample/bin-layout.rb
+${GEM_LIBDIR}/sample/box-layout.rb
+${GEM_LIBDIR}/sample/canvas.rb
+${GEM_LIBDIR}/sample/constraints.rb
+${GEM_LIBDIR}/sample/drag-action.rb
+${GEM_LIBDIR}/sample/drop-action.rb
+${GEM_LIBDIR}/sample/easing-modes.rb
+${GEM_LIBDIR}/sample/flow-layout.rb
+${GEM_LIBDIR}/sample/grid-layout.rb
+${GEM_LIBDIR}/sample/image-content.rb
+${GEM_LIBDIR}/sample/pan-action.rb
+${GEM_LIBDIR}/sample/redhand.png
+${GEM_LIBDIR}/sample/rounded-rectangle.rb
+${GEM_LIBDIR}/sample/scroll-actor.rb
+${GEM_LIBDIR}/test/clutter-test-utils.rb
+${GEM_LIBDIR}/test/run-test.rb
+${GEM_LIBDIR}/test/test-clutter-actor.rb
+${GEM_LIBDIR}/test/test-clutter-blur-effect.rb
+${GEM_LIBDIR}/test/test-clutter-brightness-contrast-effect.rb
+${GEM_LIBDIR}/test/test-clutter-canvas.rb
+${GEM_LIBDIR}/test/test-clutter-color.rb
+${GEM_LIBDIR}/test/test-clutter-colorize-effect.rb
+${GEM_LIBDIR}/test/test-clutter-desaturate-effect.rb
+${GEM_LIBDIR}/test/test-clutter-feature.rb
+${GEM_LIBDIR}/test/test-clutter-flow-layout.rb
+${GEM_LIBDIR}/test/test-clutter-page-turn-effect.rb
+${GEM_LIBDIR}/test/test-clutter-property-transiton.rb
+${GEM_LIBDIR}/test/test-clutter-shader-effect.rb
+${GEM_LIBDIR}/test/test-clutter-text-buffer.rb
+${GEM_LIBDIR}/test/test-clutter-timeline.rb
+${GEM_LIBDIR}/test/test-clutter-version.rb
+${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/graphics/ruby-gnome2-clutter/distinfo b/graphics/ruby-gnome2-clutter/distinfo
new file mode 100644
index 00000000000..0011b4b19ef
--- /dev/null
+++ b/graphics/ruby-gnome2-clutter/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2016/01/24 05:03:23 tsutsui Exp $
+
+SHA1 (clutter-3.0.7.gem) = d802b9a1201c41d45e9329ef978a6f44371ed335
+RMD160 (clutter-3.0.7.gem) = de975d779e6110a3fb3316717c672b52872463c0
+SHA512 (clutter-3.0.7.gem) = cae1d7a16bae76c448fbba3acff37847a98aeafa1828d1dda9b33e396014de2fd50ef55bbcff83d8d03109439b86f56c37609416c6f4391ecf3c2afbb203678f
+Size (clutter-3.0.7.gem) = 33792 bytes
diff --git a/graphics/ruby-gnome2-gdk3/Makefile b/graphics/ruby-gnome2-gdk3/Makefile
index e1d295dabf1..0f51ffa34a6 100644
--- a/graphics/ruby-gnome2-gdk3/Makefile
+++ b/graphics/ruby-gnome2-gdk3/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2015/05/17 06:45:23 tsutsui Exp $
+# $NetBSD: Makefile,v 1.18 2016/01/24 05:03:23 tsutsui Exp $
 #
 
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gdk3-${VERSION}
+DISTNAME=		gdk3-${VERSION}
+PKGNAME=		${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
+PKGREVISION=		1
 COMMENT=		Ruby binding of GDK3
 CATEGORIES=		graphics
 
@@ -9,18 +11,11 @@ CONFLICTS+=		ruby[0-9][0-9]-gnome2-gdk3-[0-9]*
 
 DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gobject-introspection>=${VERSION}:../../devel/ruby-gnome2-gobject-introspection
 DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-cairo-gobject>=${VERSION}:../../graphics/ruby-gnome2-cairo-gobject
-DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-atk>=${VERSION}:../../devel/ruby-gnome2-atk
 DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-pango>=${VERSION}:../../devel/ruby-gnome2-pango
 DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gdkpixbuf>=${VERSION}:../../graphics/ruby-gnome2-gdkpixbuf
 DEPENDS+=		gtk3+>=3.4.2:../../x11/gtk3
 
-RUBY_SETUP_SUBDIRS=	gdk3
-
-USE_RUBY_EXTCONF=	no
-USE_RUBY_SETUP=		yes
-USE_RUBY_SETUP_PKG=	yes
-
-do-test:
-	${RUN} cd ${WRKSRC}/gdk3/test; ${SETENV} ${TEST_ENV} ${RUBY} run-test.rb
-
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../meta-pkgs/ruby-gnome2/Makefile.common"
+.include "../../lang/ruby/gem.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ruby-gnome2-gdk3/PLIST b/graphics/ruby-gnome2-gdk3/PLIST
index 6f8903d1f5a..8d84ad2d1bb 100644
--- a/graphics/ruby-gnome2-gdk3/PLIST
+++ b/graphics/ruby-gnome2-gdk3/PLIST
@@ -1,15 +1,34 @@
-@comment $NetBSD: PLIST,v 1.3 2015/12/13 10:52:15 tsutsui Exp $
-${RUBY_VENDORLIB}/gdk3.rb
-${RUBY_VENDORLIB}/gdk3/atom.rb
-${RUBY_VENDORLIB}/gdk3/cairo.rb
-${RUBY_VENDORLIB}/gdk3/color.rb
-${RUBY_VENDORLIB}/gdk3/cursor.rb
-${RUBY_VENDORLIB}/gdk3/deprecated.rb
-${RUBY_VENDORLIB}/gdk3/event.rb
-${RUBY_VENDORLIB}/gdk3/loader.rb
-${RUBY_VENDORLIB}/gdk3/rectangle.rb
-${RUBY_VENDORLIB}/gdk3/rgba.rb
-${RUBY_VENDORLIB}/gdk3/screen.rb
-${RUBY_VENDORLIB}/gdk3/window-attr.rb
-${RUBY_VENDORLIB}/gdk3/window.rb
-
+@comment $NetBSD: PLIST,v 1.4 2016/01/24 05:03:23 tsutsui Exp $
+${GEM_HOME}/cache/${GEM_NAME}.gem
+${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/lib/gdk3.rb
+${GEM_LIBDIR}/lib/gdk3/atom.rb
+${GEM_LIBDIR}/lib/gdk3/cairo.rb
+${GEM_LIBDIR}/lib/gdk3/color.rb
+${GEM_LIBDIR}/lib/gdk3/cursor.rb
+${GEM_LIBDIR}/lib/gdk3/deprecated.rb
+${GEM_LIBDIR}/lib/gdk3/event.rb
+${GEM_LIBDIR}/lib/gdk3/loader.rb
+${GEM_LIBDIR}/lib/gdk3/rectangle.rb
+${GEM_LIBDIR}/lib/gdk3/rgba.rb
+${GEM_LIBDIR}/lib/gdk3/screen.rb
+${GEM_LIBDIR}/lib/gdk3/window-attr.rb
+${GEM_LIBDIR}/lib/gdk3/window.rb
+${GEM_LIBDIR}/test/fixture/ruby-gnome2-logo.png
+${GEM_LIBDIR}/test/gdk-test-utils.rb
+${GEM_LIBDIR}/test/run-test.rb
+${GEM_LIBDIR}/test/test-gdk-atom.rb
+${GEM_LIBDIR}/test/test-gdk-cairo.rb
+${GEM_LIBDIR}/test/test-gdk-color.rb
+${GEM_LIBDIR}/test/test-gdk-cursor.rb
+${GEM_LIBDIR}/test/test-gdk-event-mask.rb
+${GEM_LIBDIR}/test/test-gdk-event-type.rb
+${GEM_LIBDIR}/test/test-gdk-event.rb
+${GEM_LIBDIR}/test/test-gdk-geometry.rb
+${GEM_LIBDIR}/test/test-gdk-keyval.rb
+${GEM_LIBDIR}/test/test-gdk-pixbuf.rb
+${GEM_LIBDIR}/test/test-gdk-rectangle.rb
+${GEM_LIBDIR}/test/test-gdk-rgba.rb
+${GEM_LIBDIR}/test/test-gdk-selection.rb
+${GEM_LIBDIR}/test/test-gdk-window-attr.rb
+${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/graphics/ruby-gnome2-gdk3/distinfo b/graphics/ruby-gnome2-gdk3/distinfo
new file mode 100644
index 00000000000..2c53e2473b7
--- /dev/null
+++ b/graphics/ruby-gnome2-gdk3/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2016/01/24 05:03:23 tsutsui Exp $
+
+SHA1 (gdk3-3.0.7.gem) = a2592348fe4789154991c0c4d55c428aa010a8d6
+RMD160 (gdk3-3.0.7.gem) = d1bfc89ed9f0dfa48ee6eed5d43c05968c92f7cb
+SHA512 (gdk3-3.0.7.gem) = 4a95f9ebf8e084d72ca22a644f5aa89195396b3845b5b35b28799ff469b20078748923f3792fa47b868e87eeb9b88d1c3882fb8038fe0960fe015a366a9a6d59
+Size (gdk3-3.0.7.gem) = 24576 bytes
diff --git a/graphics/ruby-gnome2-gdkpixbuf/Makefile b/graphics/ruby-gnome2-gdkpixbuf/Makefile
index 67df6916e6d..8633bb75d02 100644
--- a/graphics/ruby-gnome2-gdkpixbuf/Makefile
+++ b/graphics/ruby-gnome2-gdkpixbuf/Makefile
@@ -1,17 +1,19 @@
-# $NetBSD: Makefile,v 1.35 2013/06/20 09:12:14 obache Exp $
+# $NetBSD: Makefile,v 1.36 2016/01/24 05:03:23 tsutsui Exp $
 #
 
+DISTNAME=		gdk_pixbuf2-${VERSION}
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gdkpixbuf-${VERSION}
+PKGREVISION=		1
 COMMENT=		Ruby binding of GdkPixbuf-2.x
 CATEGORIES=		graphics devel
 
 CONFLICTS+=		ruby-gnome2-gdkpixbuf-[0-9]*
 CONFLICTS+=		ruby[0-9][0-9]-gnome2-gdkpixbuf-[0-9]*
 
-RUBY_EXTCONF_SUBDIRS=	gdk_pixbuf2
-
 DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
 
+.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
-.include "../../devel/ruby-pkg-config/tool.mk"
 .include "../../meta-pkgs/ruby-gnome2/Makefile.common"
+.include "../../lang/ruby/gem.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ruby-gnome2-gdkpixbuf/PLIST b/graphics/ruby-gnome2-gdkpixbuf/PLIST
index 8e7589b88d7..69811870b50 100644
--- a/graphics/ruby-gnome2-gdkpixbuf/PLIST
+++ b/graphics/ruby-gnome2-gdkpixbuf/PLIST
@@ -1,6 +1,45 @@
-@comment $NetBSD: PLIST,v 1.7 2012/01/15 12:34:44 obache Exp $
-lib/pkgconfig/ruby-gdk-pixbuf2.pc
-${RUBY_VENDORLIB}/gdk_pixbuf2.rb
-${RUBY_VENDORARCHLIB}/gdk_pixbuf2.${RUBY_DLEXT}
-${RUBY_VENDORARCHLIB}/rbgdk-pixbuf.h
-${RUBY_VENDORARCHLIB}/rbgdk-pixbuf2conversions.h
+@comment $NetBSD: PLIST,v 1.8 2016/01/24 05:03:23 tsutsui Exp $
+${GEM_HOME}/cache/${GEM_NAME}.gem
+${GEM_EXTSDIR}/gdk_pixbuf2.${RUBY_DLEXT}
+${GEM_EXTSDIR}/gem.build_complete
+${GEM_EXTSDIR}/rbgdk-pixbuf.h
+${GEM_EXTSDIR}/rbgdk-pixbuf2conversions.h
+${GEM_LIBDIR}/README
+${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/ext/gdk_pixbuf2/depend
+${GEM_LIBDIR}/ext/gdk_pixbuf2/extconf.rb
+${GEM_LIBDIR}/ext/gdk_pixbuf2/gdk_pixbuf2.def
+${GEM_LIBDIR}/ext/gdk_pixbuf2/rbgdk-pixbuf-format.c
+${GEM_LIBDIR}/ext/gdk_pixbuf2/rbgdk-pixbuf-loader.c
+${GEM_LIBDIR}/ext/gdk_pixbuf2/rbgdk-pixbuf.c
+${GEM_LIBDIR}/ext/gdk_pixbuf2/rbgdk-pixbuf.h
+${GEM_LIBDIR}/ext/gdk_pixbuf2/rbgdk-pixbuf2conversions.h
+${GEM_LIBDIR}/ext/gdk_pixbuf2/rbgdk-pixbuf2private.h
+${GEM_LIBDIR}/ext/gdk_pixbuf2/rbgdk-pixbufanimation.c
+${GEM_LIBDIR}/ext/gdk_pixbuf2/rbgdk-pixbufanimationiter.c
+${GEM_LIBDIR}/ext/gdk_pixbuf2/rbgdk-pixbufsimpleanim.c
+${GEM_LIBDIR}/ext/gdk_pixbuf2/rbgdk-pixdata.c
+${GEM_LIBDIR}/extconf.rb
+${GEM_LIBDIR}/lib/gdk_pixbuf2.rb
+${GEM_LIBDIR}/lib/gdk_pixbuf2.${RUBY_DLEXT}
+${GEM_LIBDIR}/lib/rbgdk-pixbuf.h
+${GEM_LIBDIR}/lib/rbgdk-pixbuf2conversions.h
+${GEM_LIBDIR}/sample/anim.rb
+${GEM_LIBDIR}/sample/composite.rb
+${GEM_LIBDIR}/sample/flip.rb
+${GEM_LIBDIR}/sample/floppybuddy.gif
+${GEM_LIBDIR}/sample/format.rb
+${GEM_LIBDIR}/sample/gnome-foot.png
+${GEM_LIBDIR}/sample/inline.rb
+${GEM_LIBDIR}/sample/loader.rb
+${GEM_LIBDIR}/sample/pixdata.rb
+${GEM_LIBDIR}/sample/rotate.rb
+${GEM_LIBDIR}/sample/save.rb
+${GEM_LIBDIR}/sample/scale.rb
+${GEM_LIBDIR}/sample/simpleanim.rb
+${GEM_LIBDIR}/sample/utils.rb
+${GEM_LIBDIR}/sample/xpm.rb
+${GEM_LIBDIR}/test/gdk_pixbuf2-test-utils.rb
+${GEM_LIBDIR}/test/run-test.rb
+${GEM_LIBDIR}/test/test-version.rb
+${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/graphics/ruby-gnome2-gdkpixbuf/distinfo b/graphics/ruby-gnome2-gdkpixbuf/distinfo
new file mode 100644
index 00000000000..f22c7d2bc5b
--- /dev/null
+++ b/graphics/ruby-gnome2-gdkpixbuf/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2016/01/24 05:03:23 tsutsui Exp $
+
+SHA1 (gdk_pixbuf2-3.0.7.gem) = b6a799dc8d1097d047e275015ebd2a83feb0879b
+RMD160 (gdk_pixbuf2-3.0.7.gem) = ebf58ea0453dcd5c7e91d87bf174f565d995514f
+SHA512 (gdk_pixbuf2-3.0.7.gem) = b84cc25c73027a564a94ffd9c57e78244644f98eb0699e952b23b96696d255bcccb9994cc3557564b8c015b9fcad8b8b6238c855910151e08cef5cdf253f0b2d
+Size (gdk_pixbuf2-3.0.7.gem) = 26624 bytes
diff --git a/graphics/ruby-gnome2-rsvg/Makefile b/graphics/ruby-gnome2-rsvg/Makefile
index 8d5fb12cf77..2570c102921 100644
--- a/graphics/ruby-gnome2-rsvg/Makefile
+++ b/graphics/ruby-gnome2-rsvg/Makefile
@@ -1,16 +1,20 @@
-# $NetBSD: Makefile,v 1.55 2016/01/11 23:49:34 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2016/01/24 05:03:23 tsutsui Exp $
+#
 
+DISTNAME=		rsvg2-${VERSION}
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-rsvg-${VERSION}
+PKGREVISION=		1
 COMMENT=		Ruby binding of librsvg
 CATEGORIES=		graphics
 
 CONFLICTS+=		ruby[0-9][0-9]-gnome2-rsvg-[0-9]*
 
-RUBY_EXTCONF_SUBDIRS=	rsvg2
-
 DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gdkpixbuf>=${VERSION}:../../graphics/ruby-gnome2-gdkpixbuf
+DEPENDS+=		${RUBY_PKGPREFIX}-cairo>=1.14.3:../../graphics/ruby-cairo
 
+.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/ruby-cairo/buildlink3.mk"
-.include "../../devel/ruby-pkg-config/tool.mk"
 .include "../../meta-pkgs/ruby-gnome2/Makefile.common"
+.include "../../lang/ruby/gem.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ruby-gnome2-rsvg/PLIST b/graphics/ruby-gnome2-rsvg/PLIST
index 7f0c542f107..e3d6ae1a98e 100644
--- a/graphics/ruby-gnome2-rsvg/PLIST
+++ b/graphics/ruby-gnome2-rsvg/PLIST
@@ -1,4 +1,23 @@
-@comment $NetBSD: PLIST,v 1.4 2009/10/12 03:09:32 obache Exp $
-lib/pkgconfig/ruby-rsvg2.pc
-${RUBY_VENDORLIB}/rsvg2.rb
-${RUBY_VENDORARCHLIB}/rsvg2.${RUBY_DLEXT}
+@comment $NetBSD: PLIST,v 1.5 2016/01/24 05:03:23 tsutsui Exp $
+${GEM_HOME}/cache/${GEM_NAME}.gem
+${GEM_EXTSDIR}/gem.build_complete
+${GEM_EXTSDIR}/rsvg2.${RUBY_DLEXT}
+${GEM_LIBDIR}/README
+${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/ext/rsvg2/depend
+${GEM_LIBDIR}/ext/rsvg2/extconf.rb
+${GEM_LIBDIR}/ext/rsvg2/rbrsvg.c
+${GEM_LIBDIR}/ext/rsvg2/rbrsvgdimensiondata.c
+${GEM_LIBDIR}/ext/rsvg2/rbrsvghandle.c
+${GEM_LIBDIR}/ext/rsvg2/rsvg2.def
+${GEM_LIBDIR}/ext/rsvg2/rsvg2.h
+${GEM_LIBDIR}/extconf.rb
+${GEM_LIBDIR}/lib/rsvg2.rb
+${GEM_LIBDIR}/lib/rsvg2.${RUBY_DLEXT}
+${GEM_LIBDIR}/sample/svg-viewer.rb
+${GEM_LIBDIR}/sample/svg2.rb
+${GEM_LIBDIR}/test/rsvg2-test-utils.rb
+${GEM_LIBDIR}/test/run-test.rb
+${GEM_LIBDIR}/test/test-handle.rb
+${GEM_LIBDIR}/test/test-version.rb
+${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/graphics/ruby-gnome2-rsvg/distinfo b/graphics/ruby-gnome2-rsvg/distinfo
new file mode 100644
index 00000000000..4270296b13c
--- /dev/null
+++ b/graphics/ruby-gnome2-rsvg/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2016/01/24 05:03:23 tsutsui Exp $
+
+SHA1 (rsvg2-3.0.7.gem) = b0cc252b563390be0420235deb5113f3c87867b7
+RMD160 (rsvg2-3.0.7.gem) = 20de2209cd869b67edea4c0f86beeeb9baea7d8e
+SHA512 (rsvg2-3.0.7.gem) = 71676eaac9e1d1ee5bdbaf4af55b4c3526af63d166500b68781ea8d7b318fcb6d92b7f701d92998135f63f7c2864f90815378b9b7460adc694d41f4cf192b16b
+Size (rsvg2-3.0.7.gem) = 13824 bytes