ruby-gnome: Update to 3.3.8, and rename package names to match gems.

Also reorganize several dependencies in Makefile and buildlink3.mk.
See the following post for details:
 https://mail-index.netbsd.org/pkgsrc-users/2019/09/07/msg029327.html
 https://mail-index.netbsd.org/pkgsrc-users/2019/09/13/msg029356.html

Upstream changes (from NEWS):

== Ruby-GNOME 3.3.8: 2019-09-10

This is a partially GLib 2.62.0 support release.

=== Changes

==== All

  * Improvements

    * Changed our project name to Ruby-GNOME from Ruby-GNOME2.
      [GitHub#1277][Suggested by kojix2]
      [GitHub#1291][Patch by kojix2]

    * Stopped to release (({.tar.gz})) because they are no longer
      used.

==== Ruby/GLib2

  * Improvements

    * (({GLib.convert})): Changed to set correct encoding.

    * (({GLib::FILENAME_ENCODING})): Added.

    * Changed to use the same enum object for the same enum value.

    * (({GLib::Enum.find})): Added.

    * (({GLib::Bytes#initialize})): Changed to reuse (({String})) data
      even if the given (({String})) isn't frozen.

    * (({GLib::Bytes.try_convert})): Added.

    * (({GLib::Enum.try_convert})): Added.

    * (({GLib::Flags.try_convert})): Added.

    * (({GLib::Type.try_convert})): Added.

    * (({GLib::MkEnums.create})): Added support for flags to enum
      definition.
      [GitHub#1295][Patch by Mamoru TASAKA]

==== Ruby/GIO2

  * Fixes

    * Renamed to (({Gio::Icon#hash})) from (({Gio::Icon.hash})).
      [GitHub#1293][Reported by Erik Czumadewski]

==== Ruby/GObjectIntrospection

  * Improvements

    * Introduced (({try_convert})) protocol.

==== Ruby/CairoGObject

  * Improvements

    * (({Cairo::Context.try_convert})): Added.

    * (({Cairo::Device.try_convert})): Added.

    * (({Cairo::Pattern.try_convert})): Added.

    * (({Cairo::Surface.try_convert})): Added.

    * (({Cairo::ScaledFont.try_convert})): Added.

    * (({Cairo::FontFace.try_convert})): Added.

    * (({Cairo::FontOptions.try_convert})): Added.

    * (({Cairo::Region.try_convert})): Added.

=== Thanks

  * kojix2

  * Erik Czumadewski

  * Mamoru TASAKA

43 files changed, 193 insertions, 183 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 2c758e7cd19..2d7eb1999e3 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.846 2019/09/08 20:41:10 nia Exp $
+# $NetBSD: Makefile,v 1.847 2019/09/14 18:11:40 tsutsui Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -502,23 +502,23 @@ SUBDIR+=	resize_image
 SUBDIR+=	ristretto
 SUBDIR+=	ruby-RMagick
 SUBDIR+=	ruby-cairo
+SUBDIR+=	ruby-cairo-gobject
 SUBDIR+=	ruby-chunky_png
+SUBDIR+=	ruby-clutter
+SUBDIR+=	ruby-clutter-gdk
+SUBDIR+=	ruby-clutter-gtk
 SUBDIR+=	ruby-color
 SUBDIR+=	ruby-color-japanese
 SUBDIR+=	ruby-color-tools
 SUBDIR+=	ruby-gd
-SUBDIR+=	ruby-gnome2-cairo-gobject
-SUBDIR+=	ruby-gnome2-clutter
-SUBDIR+=	ruby-gnome2-clutter-gdk
-SUBDIR+=	ruby-gnome2-clutter-gtk
-SUBDIR+=	ruby-gnome2-gdk3
-SUBDIR+=	ruby-gnome2-gdkpixbuf
-SUBDIR+=	ruby-gnome2-rsvg
+SUBDIR+=	ruby-gdk3
+SUBDIR+=	ruby-gdk_pixbuf2
 SUBDIR+=	ruby-gnuplot
 SUBDIR+=	ruby-imlib2
 SUBDIR+=	ruby-mini-magick
 SUBDIR+=	ruby-oily_png
 SUBDIR+=	ruby-opengl
+SUBDIR+=	ruby-rsvg2
 SUBDIR+=	ruby-screengif
 SUBDIR+=	s10sh
 SUBDIR+=	sane-backends
diff --git a/graphics/ruby-gnome2-cairo-gobject/DESCR b/graphics/ruby-cairo-gobject/DESCR
index 95237887db1..5a6e3411764 100644
--- a/graphics/ruby-gnome2-cairo-gobject/DESCR
+++ b/graphics/ruby-cairo-gobject/DESCR
@@ -1,4 +1,4 @@
-Ruby-GNOME 2 is a set of Ruby language bindings for the various
+Ruby-GNOME is a set of Ruby language bindings for the various
 application development libraries included with the GNOME/GTK+
 environment.
 
diff --git a/graphics/ruby-gnome2-cairo-gobject/Makefile b/graphics/ruby-cairo-gobject/Makefile
index fcea9ae9d2e..a85472dcbdd 100644
--- a/graphics/ruby-gnome2-cairo-gobject/Makefile
+++ b/graphics/ruby-cairo-gobject/Makefile
@@ -1,19 +1,21 @@
-# $NetBSD: Makefile,v 1.18 2019/01/27 02:23:39 tsutsui Exp $
+# $NetBSD: Makefile,v 1.1 2019/09/14 18:11:37 tsutsui Exp $
 #
 
 DISTNAME=		cairo-gobject-${VERSION}
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
 COMMENT=		Ruby binding of cairo-gobject
 CATEGORIES=		graphics gnome
 
 MAINTAINER=		tsutsui@NetBSD.org
 
-DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
+CONFLICTS+=		ruby-gnome2-cairo-gobject-[0-9]*
+SUPERSEDES+=		ruby-gnome2-cairo-gobject-[0-9]*
+
+DEPENDS+=		${RUBY_PKGPREFIX}-glib2>=${VERSION}:../../devel/ruby-glib2
 DEPENDS+=		${RUBY_PKGPREFIX}-cairo>=1.16.2:../../graphics/ruby-cairo
 
-.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
+.include "../../devel/ruby-glib2/buildlink3.mk"
 .include "../../graphics/ruby-cairo/buildlink3.mk"
 .include "../../graphics/cairo-gobject/buildlink3.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
+.include "../../meta-pkgs/ruby-gnome/Makefile.common"
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ruby-gnome2-cairo-gobject/PLIST b/graphics/ruby-cairo-gobject/PLIST
index 7153390881c..f087b8fe5d3 100644
--- a/graphics/ruby-gnome2-cairo-gobject/PLIST
+++ b/graphics/ruby-cairo-gobject/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2018/06/09 03:36:08 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.1 2019/09/14 18:11:37 tsutsui Exp $
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_EXTSDIR}/cairo_gobject.${RUBY_DLEXT}
 ${GEM_EXTSDIR}/gem.build_complete
diff --git a/graphics/ruby-cairo-gobject/distinfo b/graphics/ruby-cairo-gobject/distinfo
new file mode 100644
index 00000000000..9fba4329962
--- /dev/null
+++ b/graphics/ruby-cairo-gobject/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2019/09/14 18:11:37 tsutsui Exp $
+
+SHA1 (cairo-gobject-3.3.8.gem) = ad5d43f685ee7d561d044457831dc175eb2c9fa8
+RMD160 (cairo-gobject-3.3.8.gem) = bd85d89c1aeb8051eea297204c3683b53c3a6b07
+SHA512 (cairo-gobject-3.3.8.gem) = aa2ff30dc7fc68e4954e773bb78e37c5223ea160da85274d144565c69c4f01081024ba2326ace20497f7f1bf86dde14d142fe3231dacdbd9ca838c280cc6f030
+Size (cairo-gobject-3.3.8.gem) = 19968 bytes
diff --git a/graphics/ruby-gnome2-clutter-gdk/DESCR b/graphics/ruby-clutter-gdk/DESCR
index 060c36829e3..a956f186d85 100644
--- a/graphics/ruby-gnome2-clutter-gdk/DESCR
+++ b/graphics/ruby-clutter-gdk/DESCR
@@ -1,4 +1,4 @@
-Ruby-GNOME 2 is a set of Ruby language bindings for the various
+Ruby-GNOME is a set of Ruby language bindings for the various
 application development libraries included with the GNOME/GTK+
 environment.
 
diff --git a/graphics/ruby-clutter-gdk/Makefile b/graphics/ruby-clutter-gdk/Makefile
new file mode 100644
index 00000000000..564aee19a07
--- /dev/null
+++ b/graphics/ruby-clutter-gdk/Makefile
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2019/09/14 18:11:38 tsutsui Exp $
+#
+
+DISTNAME=		clutter-gdk-${VERSION}
+COMMENT=		Ruby binding of GDK specific API of Clutter
+CATEGORIES=		graphics
+
+MAINTAINER=		pkgsrc-users@NetBSD.org
+
+CONFLICTS+=		ruby-gnome2-clutter-gdk-[0-9]*
+SUPERSEDES+=		ruby-gnome2-clutter-gdk-[0-9]*
+
+DEPENDS+=	${RUBY_PKGPREFIX}-clutter>=${VERSION}:../../graphics/ruby-clutter
+DEPENDS+=	${RUBY_PKGPREFIX}-gdk3>=${VERSION}:../../graphics/ruby-gdk3
+
+.include "../../graphics/clutter-gtk/buildlink3.mk"
+.include "../../meta-pkgs/ruby-gnome/Makefile.common"
+.include "../../lang/ruby/gem.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ruby-gnome2-clutter-gdk/PLIST b/graphics/ruby-clutter-gdk/PLIST
index 8f596f2e63a..2fab99de2b4 100644
--- a/graphics/ruby-gnome2-clutter-gdk/PLIST
+++ b/graphics/ruby-clutter-gdk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2018/06/09 03:36:08 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.1 2019/09/14 18:11:38 tsutsui Exp $
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/COPYING.LIB
 ${GEM_LIBDIR}/README.md
diff --git a/graphics/ruby-clutter-gdk/distinfo b/graphics/ruby-clutter-gdk/distinfo
new file mode 100644
index 00000000000..7b8fddc340f
--- /dev/null
+++ b/graphics/ruby-clutter-gdk/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2019/09/14 18:11:38 tsutsui Exp $
+
+SHA1 (clutter-gdk-3.3.8.gem) = d7c57df8695b61cd4b012c1afa8e90ade4102993
+RMD160 (clutter-gdk-3.3.8.gem) = 302ed2025e66caf1487febc21bdbe45fad201436
+SHA512 (clutter-gdk-3.3.8.gem) = c421369b934031f71068a8edaff1ead0cbd230eef3d2ee08cdd66ea5fe332dbfadcabbb73470a45ef7f2a39fa1b1613b93ec033b86f502ba4c364b85e4cde955
+Size (clutter-gdk-3.3.8.gem) = 14848 bytes
diff --git a/graphics/ruby-gnome2-clutter-gtk/DESCR b/graphics/ruby-clutter-gtk/DESCR
index a5d075bb4dd..6fe1ad2626b 100644
--- a/graphics/ruby-gnome2-clutter-gtk/DESCR
+++ b/graphics/ruby-clutter-gtk/DESCR
@@ -1,4 +1,4 @@
-Ruby-GNOME 2 is a set of Ruby language bindings for the various
+Ruby-GNOME is a set of Ruby language bindings for the various
 application development libraries included with the GNOME/GTK+
 environment.
 
diff --git a/graphics/ruby-clutter-gtk/Makefile b/graphics/ruby-clutter-gtk/Makefile
new file mode 100644
index 00000000000..9a9c41c4ccb
--- /dev/null
+++ b/graphics/ruby-clutter-gtk/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.24 2019/09/14 18:11:38 tsutsui Exp $
+#
+
+DISTNAME=		clutter-gtk-${VERSION}
+COMMENT=		Ruby binding of Clutter-GTK
+CATEGORIES=		graphics
+
+MAINTAINER=		pkgsrc-users@NetBSD.org
+
+CONFLICTS+=		ruby-gnome2-clutter-gtk-[0-9]*
+SUPERSEDES+=		ruby-gnome2-clutter-gtk-[0-9]*
+
+DEPENDS+=	${RUBY_PKGPREFIX}-clutter>=${VERSION}:../../graphics/ruby-clutter
+DEPENDS+=	${RUBY_PKGPREFIX}-clutter-gdk>=${VERSION}:../../graphics/ruby-clutter-gdk
+DEPENDS+=	${RUBY_PKGPREFIX}-gtk3>=${VERSION}:../../x11/ruby-gtk3
+DEPENDS+=	clutter-gtk>=1.0:../../graphics/clutter-gtk
+
+.include "../../graphics/clutter-gtk/buildlink3.mk"
+.include "../../meta-pkgs/ruby-gnome/Makefile.common"
+.include "../../lang/ruby/gem.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ruby-gnome2-clutter-gtk/PLIST b/graphics/ruby-clutter-gtk/PLIST
index ad542d524ec..2313dbec74c 100644
--- a/graphics/ruby-gnome2-clutter-gtk/PLIST
+++ b/graphics/ruby-clutter-gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2018/06/09 03:36:08 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/09/14 18:11:38 tsutsui Exp $
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_EXTSDIR}/gem.build_complete
 ${GEM_LIBDIR}/COPYING.LIB
diff --git a/graphics/ruby-clutter-gtk/distinfo b/graphics/ruby-clutter-gtk/distinfo
new file mode 100644
index 00000000000..d0665e6209f
--- /dev/null
+++ b/graphics/ruby-clutter-gtk/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2019/09/14 18:11:38 tsutsui Exp $
+
+SHA1 (clutter-gtk-3.3.8.gem) = 821c685f5021575393c68ebaed72895aff18d916
+RMD160 (clutter-gtk-3.3.8.gem) = dd3f92af345a870d8db5d2d32e4dcf0dc2c47168
+SHA512 (clutter-gtk-3.3.8.gem) = f87fbfdd10c785cd24b65523720832f05ed561007ff27828519bfe97470c3660e42185557f9a34c7106aa3cc6dc20ba10fa3a87d1e4025753755d523421fa248
+Size (clutter-gtk-3.3.8.gem) = 31232 bytes
diff --git a/graphics/ruby-gnome2-clutter/DESCR b/graphics/ruby-clutter/DESCR
index d8753ebb7d4..0c3330dbbb5 100644
--- a/graphics/ruby-gnome2-clutter/DESCR
+++ b/graphics/ruby-clutter/DESCR
@@ -1,4 +1,4 @@
-Ruby-GNOME 2 is a set of Ruby language bindings for the various
+Ruby-GNOME is a set of Ruby language bindings for the various
 application development libraries included with the GNOME/GTK+
 environment.
 
diff --git a/graphics/ruby-clutter/Makefile b/graphics/ruby-clutter/Makefile
new file mode 100644
index 00000000000..5e751d4600e
--- /dev/null
+++ b/graphics/ruby-clutter/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.4 2019/09/14 18:11:38 tsutsui Exp $
+#
+
+DISTNAME=		clutter-${VERSION}
+COMMENT=		Ruby binding of Clutter
+CATEGORIES=		graphics
+
+MAINTAINER=		pkgsrc-users@NetBSD.org
+
+CONFLICTS+=		ruby-gnome2-clutter-[0-9]*
+SUPERSEDES+=		ruby-gnome2-clutter-[0-9]*
+
+DEPENDS+=	${RUBY_PKGPREFIX}-gobject-introspection>=${VERSION}:../../devel/ruby-gobject-introspection
+DEPENDS+=	${RUBY_PKGPREFIX}-pango>=${VERSION}:../../devel/ruby-pango
+DEPENDS+=	${RUBY_PKGPREFIX}-cairo-gobject>=${VERSION}:../../graphics/ruby-cairo-gobject
+DEPENDS+=	clutter>=1.0:../../graphics/clutter
+
+.include "../../graphics/clutter/buildlink3.mk"
+.include "../../meta-pkgs/ruby-gnome/Makefile.common"
+.include "../../lang/ruby/gem.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ruby-gnome2-clutter/PLIST b/graphics/ruby-clutter/PLIST
index 03d25167083..ddc960a64d0 100644
--- a/graphics/ruby-gnome2-clutter/PLIST
+++ b/graphics/ruby-clutter/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2018/06/09 03:36:08 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.1 2019/09/14 18:11:38 tsutsui Exp $
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_EXTSDIR}/gem.build_complete
 ${GEM_LIBDIR}/COPYING.LIB
diff --git a/graphics/ruby-clutter/distinfo b/graphics/ruby-clutter/distinfo
new file mode 100644
index 00000000000..84d3e54423d
--- /dev/null
+++ b/graphics/ruby-clutter/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.5 2019/09/14 18:11:38 tsutsui Exp $
+
+SHA1 (clutter-3.3.8.gem) = 16790b74b31088a164ae6d590917743424b6f621
+RMD160 (clutter-3.3.8.gem) = beca96b70bad28075946388b2dbfeaef5f844019
+SHA512 (clutter-3.3.8.gem) = 23d90d7be45587e3b16828e13d2437c3d1c6dce003b9f76f976a5216745632b7c8b5a5b8f140a06af2aae02bf556661ae1afc67395fce85b75426ebe3f51dd0a
+Size (clutter-3.3.8.gem) = 43008 bytes
diff --git a/graphics/ruby-gnome2-gdk3/DESCR b/graphics/ruby-gdk3/DESCR
index 4c910fcc275..305498bb285 100644
--- a/graphics/ruby-gnome2-gdk3/DESCR
+++ b/graphics/ruby-gdk3/DESCR
@@ -1,4 +1,4 @@
-Ruby-GNOME 2 is a set of Ruby language bindings for the various
+Ruby-GNOME is a set of Ruby language bindings for the various
 application development libraries included with the GNOME/GTK+
 environment.
 
diff --git a/graphics/ruby-gdk3/Makefile b/graphics/ruby-gdk3/Makefile
new file mode 100644
index 00000000000..ec4cb1ef72d
--- /dev/null
+++ b/graphics/ruby-gdk3/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 2019/09/14 18:11:38 tsutsui Exp $
+#
+
+DISTNAME=		gdk3-${VERSION}
+COMMENT=		Ruby binding of GDK3
+CATEGORIES=		graphics
+
+MAINTAINER=		tsutsui@NetBSD.org
+
+CONFLICTS+=		ruby-gnome2-gdk3-[0-9]*
+SUPERSEDES+=		ruby-gnome2-gdk3-[0-9]*
+
+DEPENDS+=		${RUBY_PKGPREFIX}-cairo-gobject>=${VERSION}:../../graphics/ruby-cairo-gobject
+DEPENDS+=		${RUBY_PKGPREFIX}-pango>=${VERSION}:../../devel/ruby-pango
+DEPENDS+=		${RUBY_PKGPREFIX}-gdk_pixbuf2>=${VERSION}:../../graphics/ruby-gdk_pixbuf2
+DEPENDS+=		gtk3+>=3.4.2:../../x11/gtk3
+
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../meta-pkgs/ruby-gnome/Makefile.common"
+.include "../../lang/ruby/gem.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ruby-gnome2-gdk3/PLIST b/graphics/ruby-gdk3/PLIST
index 9f14aae6340..0becbc3892f 100644
--- a/graphics/ruby-gnome2-gdk3/PLIST
+++ b/graphics/ruby-gdk3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2018/06/09 03:36:08 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.1 2019/09/14 18:11:38 tsutsui Exp $
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_EXTSDIR}/gem.build_complete
 ${GEM_LIBDIR}/COPYING.LIB
diff --git a/graphics/ruby-gdk3/buildlink3.mk b/graphics/ruby-gdk3/buildlink3.mk
new file mode 100644
index 00000000000..0970729325a
--- /dev/null
+++ b/graphics/ruby-gdk3/buildlink3.mk
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.1 2019/09/14 18:11:38 tsutsui Exp $
+
+BUILDLINK_TREE+=	ruby-gdk3
+
+.if !defined(RUBY_GDK3_BUILDLINK3_MK)
+RUBY_GDK3_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.ruby-gdk3+=	${RUBY_PKGPREFIX}-gtk3>=3.3.8
+BUILDLINK_ABI_DEPENDS.ruby-gdk3+=	${RUBY_PKGPREFIX}-gdk3>=3.3.8
+BUILDLINK_PKGSRCDIR.ruby-gdk3?=		../../graphics/ruby-gdk3
+
+.include "../../x11/gtk3/buildlink3.mk"
+.endif # RUBY_GDK3_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-ruby-gdk3
diff --git a/graphics/ruby-gdk3/distinfo b/graphics/ruby-gdk3/distinfo
new file mode 100644
index 00000000000..20a4e1f46e5
--- /dev/null
+++ b/graphics/ruby-gdk3/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2019/09/14 18:11:38 tsutsui Exp $
+
+SHA1 (gdk3-3.3.8.gem) = aebe4d707db2ad1dc883dd3546a323a2f985e5d3
+RMD160 (gdk3-3.3.8.gem) = 9f8b59acc5a9344cdc21bb54957d2e39481b658b
+SHA512 (gdk3-3.3.8.gem) = 0cc090b0dc247cc76f84c87f57115614e34abd9f4568861c5fb2ec12b651fa8ee113a129b467d5c6b89b635b2f218f0b27b785129d8fde4d8cea612863bf0822
+Size (gdk3-3.3.8.gem) = 35840 bytes
diff --git a/graphics/ruby-gnome2-gdkpixbuf/DESCR b/graphics/ruby-gdk_pixbuf2/DESCR
index 2267e9a80c8..cb37e3c2582 100644
--- a/graphics/ruby-gnome2-gdkpixbuf/DESCR
+++ b/graphics/ruby-gdk_pixbuf2/DESCR
@@ -1,4 +1,4 @@
-Ruby-GNOME 2 is a set of Ruby language bindings for the various
+Ruby-GNOME is a set of Ruby language bindings for the various
 application development libraries included with the GNOME/GTK+
 environment.
 
diff --git a/graphics/ruby-gnome2-gdkpixbuf/Makefile b/graphics/ruby-gdk_pixbuf2/Makefile
index db91d1027da..ba47f0bc5e2 100644
--- a/graphics/ruby-gnome2-gdkpixbuf/Makefile
+++ b/graphics/ruby-gdk_pixbuf2/Makefile
@@ -1,20 +1,19 @@
-# $NetBSD: Makefile,v 1.46 2019/08/18 03:13:22 tsutsui Exp $
+# $NetBSD: Makefile,v 1.1 2019/09/14 18:11:38 tsutsui Exp $
 #
 
 DISTNAME=		gdk_pixbuf2-${VERSION}
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gdkpixbuf-${VERSION}
 COMMENT=		Ruby binding of GdkPixbuf-2.x
 CATEGORIES=		graphics devel
 
 MAINTAINER=		tsutsui@NetBSD.org
 
 CONFLICTS+=		ruby-gnome2-gdkpixbuf-[0-9]*
+SUPERSEDES+=		ruby-gnome2-gdkpixbuf-[0-9]*
 
-DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gio>=${VERSION}:../../devel/ruby-gnome2-gio
+DEPENDS+=		${RUBY_PKGPREFIX}-gio2>=${VERSION}:../../devel/ruby-gio2
 DEPENDS+=		gdk-pixbuf2>=2.36.4:../../graphics/gdk-pixbuf2
 
-.include "../../devel/ruby-gnome2-gio/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
+.include "../../meta-pkgs/ruby-gnome/Makefile.common"
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ruby-gnome2-gdkpixbuf/PLIST b/graphics/ruby-gdk_pixbuf2/PLIST
index 78df34633a0..4c6bb20a879 100644
--- a/graphics/ruby-gnome2-gdkpixbuf/PLIST
+++ b/graphics/ruby-gdk_pixbuf2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2018/06/09 03:36:08 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.1 2019/09/14 18:11:38 tsutsui Exp $
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_EXTSDIR}/gem.build_complete
 ${GEM_LIBDIR}/COPYING.LIB
diff --git a/graphics/ruby-gdk_pixbuf2/distinfo b/graphics/ruby-gdk_pixbuf2/distinfo
new file mode 100644
index 00000000000..8ba52ec4589
--- /dev/null
+++ b/graphics/ruby-gdk_pixbuf2/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2019/09/14 18:11:38 tsutsui Exp $
+
+SHA1 (gdk_pixbuf2-3.3.8.gem) = 581e7b3d82003e486a212be379c7da8b85bcd4bc
+RMD160 (gdk_pixbuf2-3.3.8.gem) = 8c2bc40d7373fd9c0f316e041df6cef7e632e13f
+SHA512 (gdk_pixbuf2-3.3.8.gem) = a467da45aa9b91df0c43edfde81bb796018b9a7dec49a7fe95510b96e9d938695a18c908f5d1a69331a8a28d46812fb1c8a2c1d1a0855a757a8f6119d034d622
+Size (gdk_pixbuf2-3.3.8.gem) = 34816 bytes
diff --git a/graphics/ruby-gnome2-cairo-gobject/distinfo b/graphics/ruby-gnome2-cairo-gobject/distinfo
deleted file mode 100644
index 0c961bb7e06..00000000000
--- a/graphics/ruby-gnome2-cairo-gobject/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.21 2019/08/18 03:13:21 tsutsui Exp $
-
-SHA1 (cairo-gobject-3.3.7.gem) = f33ea4a1061428b2017b2cc279c2b5785d1f9d3c
-RMD160 (cairo-gobject-3.3.7.gem) = 1a41b510b16e852a6d50b64639b676361a4771f8
-SHA512 (cairo-gobject-3.3.7.gem) = c403d6f4fc863c23f02b284622bbc065c00c6eec8fd245c8609d6c3422e6157e5f265e1ce94e0d1862da4ffff4edf9d937db0358e263b06ca76f382fd9eaa373
-Size (cairo-gobject-3.3.7.gem) = 19456 bytes
diff --git a/graphics/ruby-gnome2-clutter-gdk/Makefile b/graphics/ruby-gnome2-clutter-gdk/Makefile
deleted file mode 100644
index 9109416a9ee..00000000000
--- a/graphics/ruby-gnome2-clutter-gdk/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2019/08/18 03:13:21 tsutsui Exp $
-#
-
-DISTNAME=		clutter-gdk-${VERSION}
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
-COMMENT=		Ruby binding of GDK specific API of Clutter
-CATEGORIES=		graphics
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-
-DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-clutter>=${VERSION}:../../graphics/ruby-gnome2-clutter
-DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gdk3>=${VERSION}:../../graphics/ruby-gnome2-gdk3
-
-.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-gdk/distinfo b/graphics/ruby-gnome2-clutter-gdk/distinfo
deleted file mode 100644
index 4c964842b7a..00000000000
--- a/graphics/ruby-gnome2-clutter-gdk/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.17 2019/08/18 03:13:21 tsutsui Exp $
-
-SHA1 (clutter-gdk-3.3.7.gem) = f7ccf80e0afc35471a293b9328b625401fb4bca3
-RMD160 (clutter-gdk-3.3.7.gem) = 5f3de6f503b2d8e439f6af2bbee853dc0d77824d
-SHA512 (clutter-gdk-3.3.7.gem) = b03f74c328bb05353858d461fa47a35e68e976a7b12358ddf312641c458ec7dfc9cb0d329e495284d021bde0245351d71a722aaabe2eff3855fdefdd8df78456
-Size (clutter-gdk-3.3.7.gem) = 14848 bytes
diff --git a/graphics/ruby-gnome2-clutter-gtk/Makefile b/graphics/ruby-gnome2-clutter-gtk/Makefile
deleted file mode 100644
index 80c99299909..00000000000
--- a/graphics/ruby-gnome2-clutter-gtk/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2019/08/18 03:13:22 tsutsui Exp $
-#
-
-DISTNAME=		clutter-gtk-${VERSION}
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
-COMMENT=		Ruby binding of Clutter-GTK
-CATEGORIES=		graphics
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-
-DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-clutter>=${VERSION}:../../graphics/ruby-gnome2-clutter
-DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-clutter-gdk>=${VERSION}:../../graphics/ruby-gnome2-clutter-gdk
-DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gtk3>=${VERSION}:../../x11/ruby-gnome2-gtk3
-DEPENDS+=	clutter-gtk>=1.0:../../graphics/clutter-gtk
-
-.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/distinfo b/graphics/ruby-gnome2-clutter-gtk/distinfo
deleted file mode 100644
index 147fe6d43fc..00000000000
--- a/graphics/ruby-gnome2-clutter-gtk/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.21 2019/08/18 03:13:22 tsutsui Exp $
-
-SHA1 (clutter-gtk-3.3.7.gem) = be82641a06503db28bc56c3dfe38aefd1e91a15b
-RMD160 (clutter-gtk-3.3.7.gem) = 39fa944cac47d9d620957875d8c6c222c785e9c1
-SHA512 (clutter-gtk-3.3.7.gem) = 9f7792a0a342e64393a16cabf664d5ff8047e796bed509533df032d0a4388c69de0fd7634ff0d7f4e2b0a2d5d210954f24f466fac2bb18d84f1aac74dd3e408f
-Size (clutter-gtk-3.3.7.gem) = 31232 bytes
diff --git a/graphics/ruby-gnome2-clutter/Makefile b/graphics/ruby-gnome2-clutter/Makefile
deleted file mode 100644
index 49aa42df576..00000000000
--- a/graphics/ruby-gnome2-clutter/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2019/08/18 03:13:21 tsutsui Exp $
-#
-
-DISTNAME=		clutter-${VERSION}
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
-COMMENT=		Ruby binding of Clutter
-CATEGORIES=		graphics
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-
-DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gobject-introspection>=${VERSION}:../../devel/ruby-gnome2-gobject-introspection
-DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-pango>=${VERSION}:../../devel/ruby-gnome2-pango
-DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-cairo-gobject>=${VERSION}:../../graphics/ruby-gnome2-cairo-gobject
-DEPENDS+=	clutter>=1.0:../../graphics/clutter
-
-.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/distinfo b/graphics/ruby-gnome2-clutter/distinfo
deleted file mode 100644
index 8b3409a4dfb..00000000000
--- a/graphics/ruby-gnome2-clutter/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.21 2019/08/18 03:13:21 tsutsui Exp $
-
-SHA1 (clutter-3.3.7.gem) = da03a94d374ce967341405420baed1a308d6efb9
-RMD160 (clutter-3.3.7.gem) = 896c75ebfc2ee74fbab5d2001e968d913ebcea51
-SHA512 (clutter-3.3.7.gem) = 55493607136d4b79835dea0244b2e148eb61ae87aeed1ad817867c89065b45c771fb3c03b113c21c6f0315fb8074a0156fb42a7da638801fde3f9da81643b304
-Size (clutter-3.3.7.gem) = 43008 bytes
diff --git a/graphics/ruby-gnome2-gdk3/Makefile b/graphics/ruby-gnome2-gdk3/Makefile
deleted file mode 100644
index 0a56372ebe9..00000000000
--- a/graphics/ruby-gnome2-gdk3/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.37 2019/08/18 03:13:22 tsutsui Exp $
-#
-
-DISTNAME=		gdk3-${VERSION}
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
-COMMENT=		Ruby binding of GDK3
-CATEGORIES=		graphics
-
-MAINTAINER=		tsutsui@NetBSD.org
-
-DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-cairo-gobject>=${VERSION}:../../graphics/ruby-gnome2-cairo-gobject
-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
-
-.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/buildlink3.mk b/graphics/ruby-gnome2-gdk3/buildlink3.mk
deleted file mode 100644
index 256110f9e94..00000000000
--- a/graphics/ruby-gnome2-gdk3/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.27 2019/08/18 03:13:22 tsutsui Exp $
-
-BUILDLINK_TREE+=	ruby-gnome2-gdk3
-
-.if !defined(RUBY_GNOME2_GDK3_BUILDLINK3_MK)
-RUBY_GNOME2_GDK3_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.ruby-gnome2-gdk3+=	${RUBY_PKGPREFIX}-gnome2-gtk3>=1.2
-BUILDLINK_ABI_DEPENDS.ruby-gnome2-gdk3+=	${RUBY_PKGPREFIX}-gnome2-gdk3>=3.3.7
-BUILDLINK_PKGSRCDIR.ruby-gnome2-gdk3?=		../../graphics/ruby-gnome2-gdk3
-
-.include "../../x11/gtk3/buildlink3.mk"
-.endif # RUBY_GNOME2_GDK3_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-ruby-gnome2-gdk3
diff --git a/graphics/ruby-gnome2-gdk3/distinfo b/graphics/ruby-gnome2-gdk3/distinfo
deleted file mode 100644
index 80f66df8c3a..00000000000
--- a/graphics/ruby-gnome2-gdk3/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.21 2019/08/18 03:13:22 tsutsui Exp $
-
-SHA1 (gdk3-3.3.7.gem) = 54a3f993fe621a0242485a91db1063decacad735
-RMD160 (gdk3-3.3.7.gem) = 2a02e17784d527f3e7c7b0b919f675c070be8c7e
-SHA512 (gdk3-3.3.7.gem) = 89ae1ef1c9d2d0ea842a51f473fa4fdaaadc0d97456ec8becd8ce6ea958caf5176273cbdf71c69f525c6edf97cd541ffa4bd72d8ed690997e27a1d3d837f4184
-Size (gdk3-3.3.7.gem) = 35840 bytes
diff --git a/graphics/ruby-gnome2-gdkpixbuf/distinfo b/graphics/ruby-gnome2-gdkpixbuf/distinfo
deleted file mode 100644
index 57d733eb670..00000000000
--- a/graphics/ruby-gnome2-gdkpixbuf/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.23 2019/08/18 03:13:22 tsutsui Exp $
-
-SHA1 (gdk_pixbuf2-3.3.7.gem) = 3d9141d16c41d8e80ab582a8ca790e6af4128af5
-RMD160 (gdk_pixbuf2-3.3.7.gem) = 2856b8ca5c3c13d3cf29038961582765fa29f89d
-SHA512 (gdk_pixbuf2-3.3.7.gem) = fd0c97e59ab5ad0498224387569f8e68d1455b797d84211524d394c19b8dbb00fd20846242f0f11958b823c38f489192709440b2feb987b54d2a7986d8088fc9
-Size (gdk_pixbuf2-3.3.7.gem) = 34816 bytes
diff --git a/graphics/ruby-gnome2-rsvg/Makefile b/graphics/ruby-gnome2-rsvg/Makefile
deleted file mode 100644
index 5c6113840b1..00000000000
--- a/graphics/ruby-gnome2-rsvg/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.75 2019/08/18 03:13:22 tsutsui Exp $
-#
-
-DISTNAME=		rsvg2-${VERSION}
-PKGNAME=		${RUBY_PKGPREFIX}-gnome2-rsvg-${VERSION}
-COMMENT=		Ruby binding of librsvg
-CATEGORIES=		graphics
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-
-DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gdkpixbuf>=${VERSION}:../../graphics/ruby-gnome2-gdkpixbuf
-DEPENDS+=		${RUBY_PKGPREFIX}-cairo>=1.14.3:../../graphics/ruby-cairo
-DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-cairo-gobject>=${VERSION}:../../graphics/ruby-gnome2-cairo-gobject
-
-.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
-.include "../../graphics/librsvg/buildlink3.mk"
-.include "../../graphics/ruby-cairo/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-rsvg/distinfo b/graphics/ruby-gnome2-rsvg/distinfo
deleted file mode 100644
index edf1f5c22a7..00000000000
--- a/graphics/ruby-gnome2-rsvg/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.22 2019/08/18 03:13:22 tsutsui Exp $
-
-SHA1 (rsvg2-3.3.7.gem) = 362349b1f7b9b584dcdabd40c511b61452e2f1c2
-RMD160 (rsvg2-3.3.7.gem) = d1fd45c1c50960db12923209b1d211396252471c
-SHA512 (rsvg2-3.3.7.gem) = 081e2a5a9f24eb722b0f0010a57370a9895ee59cc7499daa90a2ad5bf0184ad0172f11161987896ec9754e16b5b347e3412de2e7f2e9995778ea6f578c9f4dd0
-Size (rsvg2-3.3.7.gem) = 29696 bytes
diff --git a/graphics/ruby-gnome2-rsvg/DESCR b/graphics/ruby-rsvg2/DESCR
index 894aeb991d5..343fb110331 100644
--- a/graphics/ruby-gnome2-rsvg/DESCR
+++ b/graphics/ruby-rsvg2/DESCR
@@ -1,4 +1,4 @@
-Ruby-GNOME 2 is a set of Ruby language bindings for the various
+Ruby-GNOME is a set of Ruby language bindings for the various
 application development libraries included with the GNOME/GTK+
 environment.
 
diff --git a/graphics/ruby-rsvg2/Makefile b/graphics/ruby-rsvg2/Makefile
new file mode 100644
index 00000000000..4cfec2977b4
--- /dev/null
+++ b/graphics/ruby-rsvg2/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 2019/09/14 18:11:38 tsutsui Exp $
+#
+
+DISTNAME=		rsvg2-${VERSION}
+COMMENT=		Ruby binding of librsvg
+CATEGORIES=		graphics
+
+MAINTAINER=		pkgsrc-users@NetBSD.org
+
+CONFLICTS+=		ruby-gnome2-rsvg-[0-9]*
+SUPERSEDES+=		ruby-gnome2-rsvg-[0-9]*
+
+DEPENDS+=		${RUBY_PKGPREFIX}-gdk_pixbuf2>=${VERSION}:../../graphics/ruby-gdk_pixbuf2
+DEPENDS+=		${RUBY_PKGPREFIX}-cairo>=1.14.3:../../graphics/ruby-cairo
+DEPENDS+=		${RUBY_PKGPREFIX}-cairo-gobject>=${VERSION}:../../graphics/ruby-cairo-gobject
+
+.include "../../graphics/librsvg/buildlink3.mk"
+.include "../../graphics/ruby-cairo/buildlink3.mk"
+.include "../../meta-pkgs/ruby-gnome/Makefile.common"
+.include "../../lang/ruby/gem.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ruby-gnome2-rsvg/PLIST b/graphics/ruby-rsvg2/PLIST
index f628033e02f..b5b2aeecae0 100644
--- a/graphics/ruby-gnome2-rsvg/PLIST
+++ b/graphics/ruby-rsvg2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2018/08/08 12:16:01 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.1 2019/09/14 18:11:38 tsutsui Exp $
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_EXTSDIR}/gem.build_complete
 ${GEM_LIBDIR}/COPYING.LIB
diff --git a/graphics/ruby-rsvg2/distinfo b/graphics/ruby-rsvg2/distinfo
new file mode 100644
index 00000000000..0ff94a61d37
--- /dev/null
+++ b/graphics/ruby-rsvg2/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2019/09/14 18:11:38 tsutsui Exp $
+
+SHA1 (rsvg2-3.3.8.gem) = 5549f5277093165df371ede1162a7c8815a5187f
+RMD160 (rsvg2-3.3.8.gem) = 07173141ce8e40ca6c77d6141106c44d08e0ddab
+SHA512 (rsvg2-3.3.8.gem) = 4d68556aa0fc06a9f58700244d1325f312f4a7b636da5651e8a53e5a16b1d115ae48260f3bb2aafed0596e2c9cca5e4ef365b07527602c2830b3018f9010a3f9
+Size (rsvg2-3.3.8.gem) = 29696 bytes