summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortsutsui <tsutsui@pkgsrc.org>2019-09-14 18:11:34 +0000
committertsutsui <tsutsui@pkgsrc.org>2019-09-14 18:11:34 +0000
commit72693dcfbcd13b9cda876fce8d170f1f53f4e762 (patch)
tree67e497d8ccf765968260037a7f98cd764e1a3bd9
parente5932f3c574f4a61fbd3158a9e1d7f8b852402b3 (diff)
downloadpkgsrc-72693dcfbcd13b9cda876fce8d170f1f53f4e762.tar.gz
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
-rw-r--r--devel/Makefile11
-rw-r--r--devel/ruby-atk/DESCR (renamed from devel/ruby-gnome2-atk/DESCR)2
-rw-r--r--devel/ruby-atk/Makefile18
-rw-r--r--devel/ruby-atk/PLIST (renamed from devel/ruby-gnome2-atk/PLIST)2
-rw-r--r--devel/ruby-atk/distinfo6
-rw-r--r--devel/ruby-gio2/DESCR (renamed from devel/ruby-gnome2-gio/DESCR)2
-rw-r--r--devel/ruby-gio2/Makefile18
-rw-r--r--devel/ruby-gio2/PLIST (renamed from devel/ruby-gnome2-gio/PLIST)4
-rw-r--r--devel/ruby-gio2/buildlink3.mk16
-rw-r--r--devel/ruby-gio2/distinfo6
-rw-r--r--devel/ruby-glib2/DESCR (renamed from devel/ruby-gnome2-glib/DESCR)2
-rw-r--r--devel/ruby-glib2/Makefile (renamed from devel/ruby-gnome2-glib/Makefile)6
-rw-r--r--devel/ruby-glib2/PLIST (renamed from devel/ruby-gnome2-glib/PLIST)3
-rw-r--r--devel/ruby-glib2/buildlink3.mk16
-rw-r--r--devel/ruby-glib2/distinfo6
-rw-r--r--devel/ruby-gnome2-atk/Makefile19
-rw-r--r--devel/ruby-gnome2-atk/distinfo6
-rw-r--r--devel/ruby-gnome2-gio/Makefile18
-rw-r--r--devel/ruby-gnome2-gio/buildlink3.mk16
-rw-r--r--devel/ruby-gnome2-gio/distinfo6
-rw-r--r--devel/ruby-gnome2-glib/buildlink3.mk16
-rw-r--r--devel/ruby-gnome2-glib/distinfo6
-rw-r--r--devel/ruby-gnome2-gobject-introspection/buildlink3.mk16
-rw-r--r--devel/ruby-gnome2-gobject-introspection/distinfo6
-rw-r--r--devel/ruby-gnome2-pango/Makefile22
-rw-r--r--devel/ruby-gnome2-pango/buildlink3.mk19
-rw-r--r--devel/ruby-gnome2-pango/distinfo6
-rw-r--r--devel/ruby-gobject-introspection/DESCR (renamed from devel/ruby-gnome2-gobject-introspection/DESCR)2
-rw-r--r--devel/ruby-gobject-introspection/Makefile (renamed from devel/ruby-gnome2-gobject-introspection/Makefile)10
-rw-r--r--devel/ruby-gobject-introspection/PLIST (renamed from devel/ruby-gnome2-gobject-introspection/PLIST)4
-rw-r--r--devel/ruby-gobject-introspection/buildlink3.mk17
-rw-r--r--devel/ruby-gobject-introspection/distinfo6
-rw-r--r--devel/ruby-pango/DESCR (renamed from devel/ruby-gnome2-pango/DESCR)2
-rw-r--r--devel/ruby-pango/Makefile21
-rw-r--r--devel/ruby-pango/PLIST (renamed from devel/ruby-gnome2-pango/PLIST)2
-rw-r--r--devel/ruby-pango/buildlink3.mk18
-rw-r--r--devel/ruby-pango/distinfo6
-rw-r--r--graphics/Makefile16
-rw-r--r--graphics/ruby-cairo-gobject/DESCR (renamed from graphics/ruby-gnome2-cairo-gobject/DESCR)2
-rw-r--r--graphics/ruby-cairo-gobject/Makefile (renamed from graphics/ruby-gnome2-cairo-gobject/Makefile)12
-rw-r--r--graphics/ruby-cairo-gobject/PLIST (renamed from graphics/ruby-gnome2-cairo-gobject/PLIST)2
-rw-r--r--graphics/ruby-cairo-gobject/distinfo6
-rw-r--r--graphics/ruby-clutter-gdk/DESCR (renamed from graphics/ruby-gnome2-clutter-gdk/DESCR)2
-rw-r--r--graphics/ruby-clutter-gdk/Makefile19
-rw-r--r--graphics/ruby-clutter-gdk/PLIST (renamed from graphics/ruby-gnome2-clutter-gdk/PLIST)2
-rw-r--r--graphics/ruby-clutter-gdk/distinfo6
-rw-r--r--graphics/ruby-clutter-gtk/DESCR (renamed from graphics/ruby-gnome2-clutter-gtk/DESCR)2
-rw-r--r--graphics/ruby-clutter-gtk/Makefile21
-rw-r--r--graphics/ruby-clutter-gtk/PLIST (renamed from graphics/ruby-gnome2-clutter-gtk/PLIST)2
-rw-r--r--graphics/ruby-clutter-gtk/distinfo6
-rw-r--r--graphics/ruby-clutter/DESCR (renamed from graphics/ruby-gnome2-clutter/DESCR)2
-rw-r--r--graphics/ruby-clutter/Makefile21
-rw-r--r--graphics/ruby-clutter/PLIST (renamed from graphics/ruby-gnome2-clutter/PLIST)2
-rw-r--r--graphics/ruby-clutter/distinfo6
-rw-r--r--graphics/ruby-gdk3/DESCR (renamed from graphics/ruby-gnome2-gdk3/DESCR)2
-rw-r--r--graphics/ruby-gdk3/Makefile21
-rw-r--r--graphics/ruby-gdk3/PLIST (renamed from graphics/ruby-gnome2-gdk3/PLIST)2
-rw-r--r--graphics/ruby-gdk3/buildlink3.mk15
-rw-r--r--graphics/ruby-gdk3/distinfo6
-rw-r--r--graphics/ruby-gdk_pixbuf2/DESCR (renamed from graphics/ruby-gnome2-gdkpixbuf/DESCR)2
-rw-r--r--graphics/ruby-gdk_pixbuf2/Makefile (renamed from graphics/ruby-gnome2-gdkpixbuf/Makefile)9
-rw-r--r--graphics/ruby-gdk_pixbuf2/PLIST (renamed from graphics/ruby-gnome2-gdkpixbuf/PLIST)2
-rw-r--r--graphics/ruby-gdk_pixbuf2/distinfo6
-rw-r--r--graphics/ruby-gnome2-cairo-gobject/distinfo6
-rw-r--r--graphics/ruby-gnome2-clutter-gdk/Makefile17
-rw-r--r--graphics/ruby-gnome2-clutter-gdk/distinfo6
-rw-r--r--graphics/ruby-gnome2-clutter-gtk/Makefile19
-rw-r--r--graphics/ruby-gnome2-clutter-gtk/distinfo6
-rw-r--r--graphics/ruby-gnome2-clutter/Makefile19
-rw-r--r--graphics/ruby-gnome2-clutter/distinfo6
-rw-r--r--graphics/ruby-gnome2-gdk3/Makefile19
-rw-r--r--graphics/ruby-gnome2-gdk3/buildlink3.mk15
-rw-r--r--graphics/ruby-gnome2-gdk3/distinfo6
-rw-r--r--graphics/ruby-gnome2-gdkpixbuf/distinfo6
-rw-r--r--graphics/ruby-gnome2-rsvg/Makefile20
-rw-r--r--graphics/ruby-gnome2-rsvg/distinfo6
-rw-r--r--graphics/ruby-rsvg2/DESCR (renamed from graphics/ruby-gnome2-rsvg/DESCR)2
-rw-r--r--graphics/ruby-rsvg2/Makefile21
-rw-r--r--graphics/ruby-rsvg2/PLIST (renamed from graphics/ruby-gnome2-rsvg/PLIST)2
-rw-r--r--graphics/ruby-rsvg2/distinfo6
-rw-r--r--meta-pkgs/Makefile4
-rw-r--r--meta-pkgs/ruby-gnome/DESCR (renamed from meta-pkgs/ruby-gnome2/DESCR)2
-rw-r--r--meta-pkgs/ruby-gnome/Makefile41
-rw-r--r--meta-pkgs/ruby-gnome/Makefile.common31
-rw-r--r--meta-pkgs/ruby-gnome2/Makefile37
-rw-r--r--meta-pkgs/ruby-gnome2/Makefile.common31
-rw-r--r--multimedia/Makefile6
-rw-r--r--multimedia/ruby-clutter-gstreamer/DESCR (renamed from multimedia/ruby-gnome2-clutter-gstreamer/DESCR)2
-rw-r--r--multimedia/ruby-clutter-gstreamer/Makefile20
-rw-r--r--multimedia/ruby-clutter-gstreamer/PLIST (renamed from multimedia/ruby-gnome2-clutter-gstreamer/PLIST)2
-rw-r--r--multimedia/ruby-clutter-gstreamer/distinfo7
-rw-r--r--multimedia/ruby-clutter-gstreamer/patches/patch-dependency-check_Rakefile (renamed from multimedia/ruby-gnome2-clutter-gstreamer/patches/patch-dependency-check_Rakefile)2
-rw-r--r--multimedia/ruby-gnome2-clutter-gstreamer/Makefile18
-rw-r--r--multimedia/ruby-gnome2-clutter-gstreamer/distinfo7
-rw-r--r--multimedia/ruby-gnome2-gstreamer/Makefile20
-rw-r--r--multimedia/ruby-gnome2-gstreamer/distinfo6
-rw-r--r--multimedia/ruby-gstreamer/DESCR (renamed from multimedia/ruby-gnome2-gstreamer/DESCR)2
-rw-r--r--multimedia/ruby-gstreamer/Makefile20
-rw-r--r--multimedia/ruby-gstreamer/PLIST (renamed from multimedia/ruby-gnome2-gstreamer/PLIST)3
-rw-r--r--multimedia/ruby-gstreamer/distinfo6
-rw-r--r--print/Makefile4
-rw-r--r--print/ruby-gnome2-poppler/Makefile17
-rw-r--r--print/ruby-gnome2-poppler/distinfo6
-rw-r--r--print/ruby-poppler/DESCR (renamed from print/ruby-gnome2-poppler/DESCR)2
-rw-r--r--print/ruby-poppler/Makefile20
-rw-r--r--print/ruby-poppler/PLIST (renamed from print/ruby-gnome2-poppler/PLIST)2
-rw-r--r--print/ruby-poppler/distinfo6
-rw-r--r--www/Makefile6
-rw-r--r--www/ruby-gnome2-webkit-gtk/Makefile16
-rw-r--r--www/ruby-gnome2-webkit-gtk/distinfo7
-rw-r--r--www/ruby-gnome2-webkit-gtk2/Makefile17
-rw-r--r--www/ruby-gnome2-webkit-gtk2/distinfo6
-rw-r--r--www/ruby-webkit-gtk/DESCR (renamed from www/ruby-gnome2-webkit-gtk/DESCR)2
-rw-r--r--www/ruby-webkit-gtk/Makefile18
-rw-r--r--www/ruby-webkit-gtk/PLIST (renamed from www/ruby-gnome2-webkit-gtk/PLIST)2
-rw-r--r--www/ruby-webkit-gtk/distinfo7
-rw-r--r--www/ruby-webkit-gtk/patches/patch-dependency-check_Rakefile (renamed from www/ruby-gnome2-webkit-gtk/patches/patch-dependency-check_Rakefile)2
-rw-r--r--www/ruby-webkit-gtk2/DESCR (renamed from www/ruby-gnome2-webkit-gtk2/DESCR)2
-rw-r--r--www/ruby-webkit-gtk2/Makefile19
-rw-r--r--www/ruby-webkit-gtk2/PLIST (renamed from www/ruby-gnome2-webkit-gtk2/PLIST)2
-rw-r--r--www/ruby-webkit-gtk2/distinfo6
-rw-r--r--x11/Makefile12
-rw-r--r--x11/ruby-gnome2-gtk/Makefile21
-rw-r--r--x11/ruby-gnome2-gtk/buildlink3.mk16
-rw-r--r--x11/ruby-gnome2-gtk/distinfo6
-rw-r--r--x11/ruby-gnome2-gtk3/Makefile21
-rw-r--r--x11/ruby-gnome2-gtk3/buildlink3.mk16
-rw-r--r--x11/ruby-gnome2-gtk3/distinfo6
-rw-r--r--x11/ruby-gnome2-gtksourceview2/Makefile17
-rw-r--r--x11/ruby-gnome2-gtksourceview2/distinfo6
-rw-r--r--x11/ruby-gnome2-gtksourceview3/Makefile17
-rw-r--r--x11/ruby-gnome2-gtksourceview3/distinfo6
-rw-r--r--x11/ruby-gnome2-vte/Makefile18
-rw-r--r--x11/ruby-gnome2-vte/distinfo6
-rw-r--r--x11/ruby-gtk2/DESCR (renamed from x11/ruby-gnome2-gtk/DESCR)2
-rw-r--r--x11/ruby-gtk2/Makefile21
-rw-r--r--x11/ruby-gtk2/PLIST (renamed from x11/ruby-gnome2-gtk/PLIST)2
-rw-r--r--x11/ruby-gtk2/buildlink3.mk16
-rw-r--r--x11/ruby-gtk2/distinfo6
-rw-r--r--x11/ruby-gtk3/DESCR (renamed from x11/ruby-gnome2-gtk3/DESCR)2
-rw-r--r--x11/ruby-gtk3/Makefile23
-rw-r--r--x11/ruby-gtk3/PLIST (renamed from x11/ruby-gnome2-gtk3/PLIST)2
-rw-r--r--x11/ruby-gtk3/buildlink3.mk16
-rw-r--r--x11/ruby-gtk3/distinfo6
-rw-r--r--x11/ruby-gtksourceview2/DESCR (renamed from x11/ruby-gnome2-gtksourceview2/DESCR)2
-rw-r--r--x11/ruby-gtksourceview2/Makefile19
-rw-r--r--x11/ruby-gtksourceview2/PLIST (renamed from x11/ruby-gnome2-gtksourceview2/PLIST)2
-rw-r--r--x11/ruby-gtksourceview2/distinfo6
-rw-r--r--x11/ruby-gtksourceview3/DESCR (renamed from x11/ruby-gnome2-gtksourceview3/DESCR)2
-rw-r--r--x11/ruby-gtksourceview3/Makefile19
-rw-r--r--x11/ruby-gtksourceview3/PLIST (renamed from x11/ruby-gnome2-gtksourceview3/PLIST)2
-rw-r--r--x11/ruby-gtksourceview3/distinfo6
-rw-r--r--x11/ruby-vte/DESCR (renamed from x11/ruby-gnome2-vte/DESCR)2
-rw-r--r--x11/ruby-vte/Makefile19
-rw-r--r--x11/ruby-vte/PLIST (renamed from x11/ruby-gnome2-vte/PLIST)2
-rw-r--r--x11/ruby-vte/distinfo6
156 files changed, 779 insertions, 746 deletions
diff --git a/devel/Makefile b/devel/Makefile
index 1099557ffa0..34fb91e856a 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2911 2019/09/11 14:28:13 wiz Exp $
+# $NetBSD: Makefile,v 1.2912 2019/09/14 18:11:40 tsutsui Exp $
#
COMMENT= Development utilities
@@ -2523,6 +2523,7 @@ SUBDIR+= ruby-activesupport52
SUBDIR+= ruby-algorithms
SUBDIR+= ruby-amstd
SUBDIR+= ruby-assistance
+SUBDIR+= ruby-atk
SUBDIR+= ruby-backports
SUBDIR+= ruby-bindata
SUBDIR+= ruby-bit-struct
@@ -2573,12 +2574,9 @@ SUBDIR+= ruby-gettext-activerecord
SUBDIR+= ruby-gettext-rails
SUBDIR+= ruby-gettext-setup
SUBDIR+= ruby-gettext_i18n_rails
+SUBDIR+= ruby-gio2
SUBDIR+= ruby-globalid
-SUBDIR+= ruby-gnome2-atk
-SUBDIR+= ruby-gnome2-gio
-SUBDIR+= ruby-gnome2-glib
-SUBDIR+= ruby-gnome2-gobject-introspection
-SUBDIR+= ruby-gnome2-pango
+SUBDIR+= ruby-gobject-introspection
SUBDIR+= ruby-google-protobuf
SUBDIR+= ruby-hashery
SUBDIR+= ruby-heckle
@@ -2630,6 +2628,7 @@ SUBDIR+= ruby-nenv
SUBDIR+= ruby-octokit
SUBDIR+= ruby-ole
SUBDIR+= ruby-open4
+SUBDIR+= ruby-pango
SUBDIR+= ruby-parseconfig
SUBDIR+= ruby-parser
SUBDIR+= ruby-parsetree
diff --git a/devel/ruby-gnome2-atk/DESCR b/devel/ruby-atk/DESCR
index 87a462d8cc1..b62fd17af4d 100644
--- a/devel/ruby-gnome2-atk/DESCR
+++ b/devel/ruby-atk/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/devel/ruby-atk/Makefile b/devel/ruby-atk/Makefile
new file mode 100644
index 00000000000..029484e6416
--- /dev/null
+++ b/devel/ruby-atk/Makefile
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2019/09/14 18:11:37 tsutsui Exp $
+#
+
+DISTNAME= atk-${VERSION}
+COMMENT= Ruby binding of ATK-1.0.x or later
+CATEGORIES= devel
+
+MAINTAINER= tsutsui@NetBSD.org
+
+CONFLICTS+= ruby-gnome2-atk-[0-9]*
+SUPERSEDES+= ruby-gnome2-atk-[0-9]*
+
+DEPENDS+= ${RUBY_PKGPREFIX}-glib2>=${VERSION}:../../devel/ruby-glib2
+
+.include "../../devel/atk/buildlink3.mk"
+.include "../../meta-pkgs/ruby-gnome/Makefile.common"
+.include "../../lang/ruby/gem.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/ruby-gnome2-atk/PLIST b/devel/ruby-atk/PLIST
index 6417d274440..53ac61cdd2e 100644
--- a/devel/ruby-gnome2-atk/PLIST
+++ b/devel/ruby-atk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2018/06/09 03:36:07 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.1 2019/09/14 18:11:37 tsutsui Exp $
${GEM_HOME}/cache/${GEM_NAME}.gem
${GEM_EXTSDIR}/gem.build_complete
${GEM_LIBDIR}/COPYING.LIB
diff --git a/devel/ruby-atk/distinfo b/devel/ruby-atk/distinfo
new file mode 100644
index 00000000000..b2b3054dc69
--- /dev/null
+++ b/devel/ruby-atk/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2019/09/14 18:11:37 tsutsui Exp $
+
+SHA1 (atk-3.3.8.gem) = 82f084f4990310fae5d3173d2b3cfe47f6df8d57
+RMD160 (atk-3.3.8.gem) = e2472d9c4f30ce569b3cbe3a357751a9a2742c07
+SHA512 (atk-3.3.8.gem) = 0ce071819a7128498ec30d5df088f2e8d2ebb796a985c3a85c8b03202b1e1dc3d41d7088e459d773140345e7ecf5b1c787497a03b0435286ef90e2f1121040c7
+Size (atk-3.3.8.gem) = 15872 bytes
diff --git a/devel/ruby-gnome2-gio/DESCR b/devel/ruby-gio2/DESCR
index c43b28f07b1..56dfcc0eb1d 100644
--- a/devel/ruby-gnome2-gio/DESCR
+++ b/devel/ruby-gio2/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/devel/ruby-gio2/Makefile b/devel/ruby-gio2/Makefile
new file mode 100644
index 00000000000..fcb2d7ce8da
--- /dev/null
+++ b/devel/ruby-gio2/Makefile
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2019/09/14 18:11:37 tsutsui Exp $
+#
+
+DISTNAME= gio2-${VERSION}
+COMMENT= Ruby binding of gio-2.0.x
+CATEGORIES= devel
+
+MAINTAINER= tsutsui@NetBSD.org
+
+CONFLICTS+= ruby-gnome2-gio-[0-9]*
+SUPERSEDES+= ruby-gnome2-gio-[0-9]*
+
+DEPENDS+= ${RUBY_PKGPREFIX}-gobject-introspection>=${VERSION}:../../devel/ruby-gobject-introspection
+
+.include "../../devel/ruby-gobject-introspection/buildlink3.mk"
+.include "../../meta-pkgs/ruby-gnome/Makefile.common"
+.include "../../lang/ruby/gem.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/ruby-gnome2-gio/PLIST b/devel/ruby-gio2/PLIST
index 1227e5d05cb..6247f413de7 100644
--- a/devel/ruby-gnome2-gio/PLIST
+++ b/devel/ruby-gio2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2018/06/09 03:36:07 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.1 2019/09/14 18:11:37 tsutsui Exp $
${GEM_HOME}/cache/${GEM_NAME}.gem
${GEM_EXTSDIR}/gem.build_complete
${GEM_EXTSDIR}/gio2.${RUBY_DLEXT}
@@ -21,6 +21,7 @@ ${GEM_LIBDIR}/lib/gio2/application-command-line.rb
${GEM_LIBDIR}/lib/gio2/content-type.rb
${GEM_LIBDIR}/lib/gio2/deprecated.rb
${GEM_LIBDIR}/lib/gio2/file.rb
+${GEM_LIBDIR}/lib/gio2/icon.rb
${GEM_LIBDIR}/lib/gio2/inet-address.rb
${GEM_LIBDIR}/lib/gio2/input-stream.rb
${GEM_LIBDIR}/lib/gio2/loader.rb
@@ -53,6 +54,7 @@ ${GEM_LIBDIR}/test/test-dbus.rb
${GEM_LIBDIR}/test/test-file-enumerator.rb
${GEM_LIBDIR}/test/test-file-monitor.rb
${GEM_LIBDIR}/test/test-file.rb
+${GEM_LIBDIR}/test/test-icon.rb
${GEM_LIBDIR}/test/test-inet-address.rb
${GEM_LIBDIR}/test/test-input-stream.rb
${GEM_LIBDIR}/test/test-memory-input-stream.rb
diff --git a/devel/ruby-gio2/buildlink3.mk b/devel/ruby-gio2/buildlink3.mk
new file mode 100644
index 00000000000..9ad02f6752b
--- /dev/null
+++ b/devel/ruby-gio2/buildlink3.mk
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.1 2019/09/14 18:11:37 tsutsui Exp $
+
+BUILDLINK_TREE+= ruby-gio2
+
+.if !defined(RUBY_GIO2_BUILDLINK3_MK)
+RUBY_GIO2_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.ruby-gio2+= ${RUBY_PKGPREFIX}-gio2>=3.3.8
+BUILDLINK_ABI_DEPENDS.ruby-gio2+= ${RUBY_PKGPREFIX}-gio2>=3.3.8
+BUILDLINK_PKGSRCDIR.ruby-gio2?= ../../devel/ruby-gio2
+
+.include "../../devel/ruby-gobject-introspection/buildlink3.mk"
+.include "../../lang/ruby/buildlink3.mk"
+.endif # RUBY_GIO2_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -ruby-gio2
diff --git a/devel/ruby-gio2/distinfo b/devel/ruby-gio2/distinfo
new file mode 100644
index 00000000000..1a250d87af9
--- /dev/null
+++ b/devel/ruby-gio2/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2019/09/14 18:11:37 tsutsui Exp $
+
+SHA1 (gio2-3.3.8.gem) = ef703a1bdadba19d9f54398127974e732d1a783e
+RMD160 (gio2-3.3.8.gem) = ac6eda97ef4cb55df8a415b0f7640f27a1d8fdcb
+SHA512 (gio2-3.3.8.gem) = 8261eda7e5e84e53f05cad05d06404cb3c3fc921ff26cfb2702f67cf73b0c8f8fcf565975d863f255060986cbc18e37677f39ca987f24ede4fcc835f70190454
+Size (gio2-3.3.8.gem) = 37888 bytes
diff --git a/devel/ruby-gnome2-glib/DESCR b/devel/ruby-glib2/DESCR
index 8b32018feda..a52b431c0f5 100644
--- a/devel/ruby-gnome2-glib/DESCR
+++ b/devel/ruby-glib2/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/devel/ruby-gnome2-glib/Makefile b/devel/ruby-glib2/Makefile
index a9380722a0b..40e4171cccb 100644
--- a/devel/ruby-gnome2-glib/Makefile
+++ b/devel/ruby-glib2/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.35 2019/03/09 14:08:43 tsutsui Exp $
+# $NetBSD: Makefile,v 1.1 2019/09/14 18:11:37 tsutsui Exp $
#
DISTNAME= glib2-${VERSION}
-PKGNAME= ${RUBY_PKGPREFIX}-gnome2-glib-${VERSION}
COMMENT= Ruby binding of GLib-2.x
CATEGORIES= devel
MAINTAINER= tsutsui@NetBSD.org
CONFLICTS+= ruby-gnome2-glib-[0-9]*
+SUPERSEDES+= ruby-gnome2-glib-[0-9]*
DEPENDS+= ${RUBY_PKGPREFIX}-native-package-installer>=1.0.3:../../devel/ruby-native-package-installer
DEPENDS+= ${RUBY_PKGPREFIX}-pkg-config>=1.3.5:../../devel/ruby-pkg-config
.include "../../devel/glib2/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/devel/ruby-gnome2-glib/PLIST b/devel/ruby-glib2/PLIST
index e85a7d19572..644bf3e2788 100644
--- a/devel/ruby-gnome2-glib/PLIST
+++ b/devel/ruby-glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2019/01/27 02:23:39 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.1 2019/09/14 18:11:37 tsutsui Exp $
${GEM_HOME}/cache/${GEM_NAME}.gem
${GEM_EXTSDIR}/gem.build_complete
${GEM_EXTSDIR}/glib-enum-types.h
@@ -154,6 +154,7 @@ ${GEM_LIBDIR}/test/test-spawn.rb
${GEM_LIBDIR}/test/test-time-zone.rb
${GEM_LIBDIR}/test/test-timeout.rb
${GEM_LIBDIR}/test/test-type-interface.rb
+${GEM_LIBDIR}/test/test-type.rb
${GEM_LIBDIR}/test/test-unicode.rb
${GEM_LIBDIR}/test/test-utils.rb
${GEM_LIBDIR}/test/test-value.rb
diff --git a/devel/ruby-glib2/buildlink3.mk b/devel/ruby-glib2/buildlink3.mk
new file mode 100644
index 00000000000..1a18b98d4ec
--- /dev/null
+++ b/devel/ruby-glib2/buildlink3.mk
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.1 2019/09/14 18:11:37 tsutsui Exp $
+
+BUILDLINK_TREE+= ruby-glib2
+
+.if !defined(RUBY_GLIB2_BUILDLINK3_MK)
+RUBY_GLIB2_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.ruby-glib2+= ${RUBY_PKGPREFIX}-glib2>=3.3.8
+BUILDLINK_ABI_DEPENDS.ruby-glib2+= ${RUBY_PKGPREFIX}-glib2>=3.3.8
+BUILDLINK_PKGSRCDIR.ruby-glib2?= ../../devel/ruby-glib2
+
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../lang/ruby/buildlink3.mk"
+.endif # RUBY_GLIB2_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -ruby-glib2
diff --git a/devel/ruby-glib2/distinfo b/devel/ruby-glib2/distinfo
new file mode 100644
index 00000000000..5e614d9e7c5
--- /dev/null
+++ b/devel/ruby-glib2/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2019/09/14 18:11:37 tsutsui Exp $
+
+SHA1 (glib2-3.3.8.gem) = 9e6050dc5fd6cde4198c5f0b4f9a3d9de4777c36
+RMD160 (glib2-3.3.8.gem) = 17d404c552b7720b8fa7cab8a70e85d4536d72ec
+SHA512 (glib2-3.3.8.gem) = dbdf077e74e0732646d3302943c0d5a18ee867d43cf4ce559112fa15175b0eac567af2ce6f28ed2d772208dce4a2485f58acf30c76c071d5ea2013166be61f2d
+Size (glib2-3.3.8.gem) = 147968 bytes
diff --git a/devel/ruby-gnome2-atk/Makefile b/devel/ruby-gnome2-atk/Makefile
deleted file mode 100644
index 8624198d680..00000000000
--- a/devel/ruby-gnome2-atk/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2018/02/21 16:59:59 jperkin Exp $
-#
-
-DISTNAME= atk-${VERSION}
-PKGNAME= ${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
-COMMENT= Ruby binding of ATK-1.0.x or later
-CATEGORIES= devel
-
-MAINTAINER= tsutsui@NetBSD.org
-
-CONFLICTS+= ruby-gnome2-atk-[0-9]*
-
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
-
-.include "../../devel/atk/buildlink3.mk"
-.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
-.include "../../lang/ruby/gem.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/ruby-gnome2-atk/distinfo b/devel/ruby-gnome2-atk/distinfo
deleted file mode 100644
index ed1c325d5a6..00000000000
--- a/devel/ruby-gnome2-atk/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.21 2019/08/18 03:13:21 tsutsui Exp $
-
-SHA1 (atk-3.3.7.gem) = c6e27ed5a5bd4cf20b024a4d8b6785b255e6457b
-RMD160 (atk-3.3.7.gem) = 068561f3401142232feed0ac220dcdfbb4b1d05a
-SHA512 (atk-3.3.7.gem) = 2e87874954cbf5911f0634d3763d290aa56c7f9bce9e162f646cc2b46016a088f097c6f099ed26970509a1488352d2305e5d70795a04a123a37cff59a467b065
-Size (atk-3.3.7.gem) = 15872 bytes
diff --git a/devel/ruby-gnome2-gio/Makefile b/devel/ruby-gnome2-gio/Makefile
deleted file mode 100644
index bc6d1ee430e..00000000000
--- a/devel/ruby-gnome2-gio/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2019/01/27 02:23:39 tsutsui Exp $
-#
-
-DISTNAME= gio2-${VERSION}
-PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gio-${VERSION}
-COMMENT= Ruby binding of gio-2.0.x
-CATEGORIES= devel
-
-MAINTAINER= tsutsui@NetBSD.org
-
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gobject-introspection>=${VERSION}:../../devel/ruby-gnome2-gobject-introspection
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
-.include "../../devel/ruby-gnome2-gobject-introspection/buildlink3.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
-.include "../../lang/ruby/gem.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/ruby-gnome2-gio/buildlink3.mk b/devel/ruby-gnome2-gio/buildlink3.mk
deleted file mode 100644
index 2d484ea125b..00000000000
--- a/devel/ruby-gnome2-gio/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.3 2019/08/18 03:13:21 tsutsui Exp $
-
-BUILDLINK_TREE+= ruby-gnome2-gio
-
-.if !defined(RUBY_GNOME2_GIO_BUILDLINK3_MK)
-RUBY_GNOME2_GIO_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.ruby-gnome2-gio+= ${RUBY_PKGPREFIX}-gnome2-gio>=1.2.0
-BUILDLINK_ABI_DEPENDS.ruby-gnome2-gio+= ${RUBY_PKGPREFIX}-gnome2-gio>=3.3.7
-BUILDLINK_PKGSRCDIR.ruby-gnome2-gio?= ../../devel/ruby-gnome2-gio
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../lang/ruby/buildlink3.mk"
-.endif # RUBY_GNOME2_GIO_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -ruby-gnome2-gio
diff --git a/devel/ruby-gnome2-gio/distinfo b/devel/ruby-gnome2-gio/distinfo
deleted file mode 100644
index 5cf85f1eaeb..00000000000
--- a/devel/ruby-gnome2-gio/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.21 2019/08/18 03:13:21 tsutsui Exp $
-
-SHA1 (gio2-3.3.7.gem) = 157c9fab1788a5fea605192f045279c735126523
-RMD160 (gio2-3.3.7.gem) = c6023cad28d163db8cd576ad0b7960c2bfcb2c80
-SHA512 (gio2-3.3.7.gem) = 53218cb6b4daa866c0f90279d6b1bdbd72d18a848f63e35c399a3f2f94bbbf91e14013236d57d5be2f16f9003093235353f52e735ae6bfd6d6fef3562797e89a
-Size (gio2-3.3.7.gem) = 37888 bytes
diff --git a/devel/ruby-gnome2-glib/buildlink3.mk b/devel/ruby-gnome2-glib/buildlink3.mk
deleted file mode 100644
index c87ca84921b..00000000000
--- a/devel/ruby-gnome2-glib/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.15 2019/08/18 03:13:21 tsutsui Exp $
-
-BUILDLINK_TREE+= ruby-gnome2-glib
-
-.if !defined(RUBY_GNOME2_GLIB_BUILDLINK3_MK)
-RUBY_GNOME2_GLIB_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.ruby-gnome2-glib+= ${RUBY_PKGPREFIX}-gnome2-glib>=0.17.0
-BUILDLINK_ABI_DEPENDS.ruby-gnome2-glib+= ${RUBY_PKGPREFIX}-gnome2-glib>=3.3.7
-BUILDLINK_PKGSRCDIR.ruby-gnome2-glib?= ../../devel/ruby-gnome2-glib
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../lang/ruby/buildlink3.mk"
-.endif # RUBY_GNOME2_GLIB_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -ruby-gnome2-glib
diff --git a/devel/ruby-gnome2-glib/distinfo b/devel/ruby-gnome2-glib/distinfo
deleted file mode 100644
index d212dc7e6b2..00000000000
--- a/devel/ruby-gnome2-glib/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.26 2019/08/18 03:13:21 tsutsui Exp $
-
-SHA1 (glib2-3.3.7.gem) = 41f0d1884f5a576f72d7fdacd6a4b1529bc81867
-RMD160 (glib2-3.3.7.gem) = 3cf7bd6338841d3682e77b897940f18771af6a68
-SHA512 (glib2-3.3.7.gem) = 07acb0f1c6c3f894f9dc5b2cc5189f9d54a9bf2d1a1723b452077445529792e14025ed3ddc7f322b9962d7e4a020b995584f32c7f50b78ce5630e454d589c222
-Size (glib2-3.3.7.gem) = 146944 bytes
diff --git a/devel/ruby-gnome2-gobject-introspection/buildlink3.mk b/devel/ruby-gnome2-gobject-introspection/buildlink3.mk
deleted file mode 100644
index da7486e19b8..00000000000
--- a/devel/ruby-gnome2-gobject-introspection/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.5 2019/08/18 03:13:21 tsutsui Exp $
-
-BUILDLINK_TREE+= ruby-gnome2-gobject-introspection
-
-.if !defined(RUBY_GNOME2_GOBJECT_INTROSPECTION_BUILDLINK3_MK)
-RUBY_GNOME2_GOBJECT_INTROSPECTION_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.ruby-gnome2-gobject-introspection+= ${RUBY_PKGPREFIX}-gnome2-gobject-introspection>=1.2.0
-BUILDLINK_ABI_DEPENDS.ruby-gnome2-gobject-introspection+= ${RUBY_PKGPREFIX}-gnome2-gobject-introspection>=3.3.7
-BUILDLINK_PKGSRCDIR.ruby-gnome2-gobject-introspection?= ../../devel/ruby-gnome2-gobject-introspection
-
-.include "../../devel/gobject-introspection/buildlink3.mk"
-.include "../../lang/ruby/buildlink3.mk"
-.endif # RUBY_GNOME2_GOBJECT_INTROSPECTION_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -ruby-gnome2-gobject-introspection
diff --git a/devel/ruby-gnome2-gobject-introspection/distinfo b/devel/ruby-gnome2-gobject-introspection/distinfo
deleted file mode 100644
index 907f8548a9c..00000000000
--- a/devel/ruby-gnome2-gobject-introspection/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.23 2019/08/18 03:13:21 tsutsui Exp $
-
-SHA1 (gobject-introspection-3.3.7.gem) = 4020609cb5cc4e341bfe06d7e3aa2c81f151d077
-RMD160 (gobject-introspection-3.3.7.gem) = c45db2a5d0b25388d885b738e579e4f0b4e395b1
-SHA512 (gobject-introspection-3.3.7.gem) = 18fda5f62b6ec52160b7a3ea72af6d2a14ffdf997071b4a1d48930b4523b3bacc83a3ae3d7fb3e6d27447900c2c571a63bb478a601ae3bcde30c70c9dc5c0762
-Size (gobject-introspection-3.3.7.gem) = 67584 bytes
diff --git a/devel/ruby-gnome2-pango/Makefile b/devel/ruby-gnome2-pango/Makefile
deleted file mode 100644
index e01209403ac..00000000000
--- a/devel/ruby-gnome2-pango/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.65 2019/08/18 03:13:21 tsutsui Exp $
-#
-
-DISTNAME= pango-${VERSION}
-PKGNAME= ${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
-COMMENT= Ruby binding of pango-1.x
-CATEGORIES= devel fonts
-
-MAINTAINER= tsutsui@NetBSD.org
-
-CONFLICTS+= ruby-gnome2-pango-[0-9]*
-
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-cairo-gobject>=${VERSION}:../../graphics/ruby-gnome2-cairo-gobject
-
-BUILDLINK_API_DEPENDS.pango+= pango>=1.44.0
-.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
-.include "../../devel/ruby-gnome2-gobject-introspection/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/devel/ruby-gnome2-pango/buildlink3.mk b/devel/ruby-gnome2-pango/buildlink3.mk
deleted file mode 100644
index 5c1e74ce142..00000000000
--- a/devel/ruby-gnome2-pango/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.53 2019/08/18 03:13:21 tsutsui Exp $
-
-BUILDLINK_TREE+= ruby-gnome2-pango
-
-.if !defined(RUBY_GNOME2_PANGO_BUILDLINK3_MK)
-RUBY_GNOME2_PANGO_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.ruby-gnome2-pango+= ${RUBY_PKGPREFIX}-gnome2-pango>=3.3.7
-BUILDLINK_ABI_DEPENDS.ruby-gnome2-pango+= ${RUBY_PKGPREFIX}-gnome2-pango>=3.3.7
-BUILDLINK_PKGSRCDIR.ruby-gnome2-pango?= ../../devel/ruby-gnome2-pango
-
-.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
-.include "../../devel/ruby-gnome2-gobject-introspection/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
-.include "../../graphics/ruby-cairo/buildlink3.mk"
-.include "../../lang/ruby/buildlink3.mk"
-.endif # RUBY_GNOME2_PANGO_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -ruby-gnome2-pango
diff --git a/devel/ruby-gnome2-pango/distinfo b/devel/ruby-gnome2-pango/distinfo
deleted file mode 100644
index 5facc90448f..00000000000
--- a/devel/ruby-gnome2-pango/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.23 2019/08/18 03:13:21 tsutsui Exp $
-
-SHA1 (pango-3.3.7.gem) = c3517da4e0c9015ec37cd2f1b3d0886c4869fe8a
-RMD160 (pango-3.3.7.gem) = 4a8f5041b706c7ccebd8bf65022169de5d232c54
-SHA512 (pango-3.3.7.gem) = ac07fb6efaba7ae72dedd9b4a5fb6eae404b463964ef73e71fb72c46c335e9633ded28b9165c57dadb4a656f6d43068c0658d0c4cd0a4651de9b7ec42f9c2501
-Size (pango-3.3.7.gem) = 28160 bytes
diff --git a/devel/ruby-gnome2-gobject-introspection/DESCR b/devel/ruby-gobject-introspection/DESCR
index a70e177edef..518548fd54c 100644
--- a/devel/ruby-gnome2-gobject-introspection/DESCR
+++ b/devel/ruby-gobject-introspection/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/devel/ruby-gnome2-gobject-introspection/Makefile b/devel/ruby-gobject-introspection/Makefile
index edaf05f5ef9..b77b63b476c 100644
--- a/devel/ruby-gnome2-gobject-introspection/Makefile
+++ b/devel/ruby-gobject-introspection/Makefile
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.9 2018/08/08 12:16:00 tsutsui Exp $
+# $NetBSD: Makefile,v 1.1 2019/09/14 18:11:37 tsutsui Exp $
#
DISTNAME= gobject-introspection-${VERSION}
-PKGNAME= ${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
COMMENT= Ruby binding of Gobject Introspection
CATEGORIES= devel
MAINTAINER= tsutsui@NetBSD.org
CONFLICTS+= ruby-gnome2-gobject-introspection-[0-9]*
+SUPERSEDES+= ruby-gnome2-gobject-introspection-[0-9]*
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
+DEPENDS+= ${RUBY_PKGPREFIX}-glib2>=${VERSION}:../../devel/ruby-glib2
BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=1.32.1
.include "../../devel/gobject-introspection/buildlink3.mk"
-.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
+.include "../../devel/ruby-glib2/buildlink3.mk"
+.include "../../meta-pkgs/ruby-gnome/Makefile.common"
.include "../../lang/ruby/gem.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/ruby-gnome2-gobject-introspection/PLIST b/devel/ruby-gobject-introspection/PLIST
index 95cd0989f6a..3ba5d926c42 100644
--- a/devel/ruby-gnome2-gobject-introspection/PLIST
+++ b/devel/ruby-gobject-introspection/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2019/03/09 14:08:43 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.1 2019/09/14 18:11:37 tsutsui Exp $
${GEM_HOME}/cache/${GEM_NAME}.gem
${GEM_EXTSDIR}/gem.build_complete
${GEM_EXTSDIR}/gobject_introspection.${RUBY_DLEXT}
@@ -52,6 +52,7 @@ ${GEM_LIBDIR}/lib/gobject-introspection/arg-info.rb
${GEM_LIBDIR}/lib/gobject-introspection/boxed-info.rb
${GEM_LIBDIR}/lib/gobject-introspection/callable-info.rb
${GEM_LIBDIR}/lib/gobject-introspection/collection-reader.rb
+${GEM_LIBDIR}/lib/gobject-introspection/function-info.rb
${GEM_LIBDIR}/lib/gobject-introspection/interface-info.rb
${GEM_LIBDIR}/lib/gobject-introspection/loader.rb
${GEM_LIBDIR}/lib/gobject-introspection/object-info.rb
@@ -59,6 +60,7 @@ ${GEM_LIBDIR}/lib/gobject-introspection/registered-type-info.rb
${GEM_LIBDIR}/lib/gobject-introspection/repository.rb
${GEM_LIBDIR}/lib/gobject-introspection/struct-info.rb
${GEM_LIBDIR}/lib/gobject-introspection/type-info.rb
+${GEM_LIBDIR}/lib/gobject-introspection/type-tag.rb
${GEM_LIBDIR}/lib/gobject-introspection/union-info.rb
${GEM_LIBDIR}/lib/gobject-introspection/version.rb
${GEM_LIBDIR}/lib/gobject_introspection.${RUBY_DLEXT}
diff --git a/devel/ruby-gobject-introspection/buildlink3.mk b/devel/ruby-gobject-introspection/buildlink3.mk
new file mode 100644
index 00000000000..9bc0d9bd822
--- /dev/null
+++ b/devel/ruby-gobject-introspection/buildlink3.mk
@@ -0,0 +1,17 @@
+# $NetBSD: buildlink3.mk,v 1.1 2019/09/14 18:11:37 tsutsui Exp $
+
+BUILDLINK_TREE+= ruby-gobject-introspection
+
+.if !defined(RUBY_GOBJECT_INTROSPECTION_BUILDLINK3_MK)
+RUBY_GOBJECT_INTROSPECTION_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.ruby-gobject-introspection+= ${RUBY_PKGPREFIX}-gobject-introspection>=3.3.8
+BUILDLINK_ABI_DEPENDS.ruby-gobject-introspection+= ${RUBY_PKGPREFIX}-gobject-introspection>=3.3.8
+BUILDLINK_PKGSRCDIR.ruby-gobject-introspection?= ../../devel/ruby-gobject-introspection
+
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../devel/ruby-glib2/buildlink3.mk"
+.include "../../lang/ruby/buildlink3.mk"
+.endif # RUBY_GOBJECT_INTROSPECTION_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -ruby-gobject-introspection
diff --git a/devel/ruby-gobject-introspection/distinfo b/devel/ruby-gobject-introspection/distinfo
new file mode 100644
index 00000000000..876130f842a
--- /dev/null
+++ b/devel/ruby-gobject-introspection/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2019/09/14 18:11:37 tsutsui Exp $
+
+SHA1 (gobject-introspection-3.3.8.gem) = 93c905a7b12e2b74f4f2372c54a90d510bd4fd7f
+RMD160 (gobject-introspection-3.3.8.gem) = 3cf9debf0347d819ce5b0520ec193527a32db7ab
+SHA512 (gobject-introspection-3.3.8.gem) = 018db65158b5eedec693afd2a6a53747be5ffd00d9b4d3b2fe6d60b416bc82ad9f647591820a37c6762a004f7f3692afae29f1012126d5c704e6daca2fc222c1
+Size (gobject-introspection-3.3.8.gem) = 68608 bytes
diff --git a/devel/ruby-gnome2-pango/DESCR b/devel/ruby-pango/DESCR
index 8246ba47b93..accc784f82f 100644
--- a/devel/ruby-gnome2-pango/DESCR
+++ b/devel/ruby-pango/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/devel/ruby-pango/Makefile b/devel/ruby-pango/Makefile
new file mode 100644
index 00000000000..d3e82cc6e46
--- /dev/null
+++ b/devel/ruby-pango/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 2019/09/14 18:11:37 tsutsui Exp $
+#
+
+DISTNAME= pango-${VERSION}
+COMMENT= Ruby binding of pango-1.x
+CATEGORIES= devel fonts
+
+MAINTAINER= tsutsui@NetBSD.org
+
+CONFLICTS+= ruby-gnome2-pango-[0-9]*
+SUPERSEDES+= ruby-gnome2-pango-[0-9]*
+
+DEPENDS+= ${RUBY_PKGPREFIX}-cairo-gobject>=${VERSION}:../../graphics/ruby-cairo-gobject
+
+BUILDLINK_API_DEPENDS.pango+= pango>=1.44.0
+.include "../../devel/pango/buildlink3.mk"
+.include "../../devel/ruby-gobject-introspection/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/devel/ruby-gnome2-pango/PLIST b/devel/ruby-pango/PLIST
index 99ae5fe853e..4448a1f4cc1 100644
--- a/devel/ruby-gnome2-pango/PLIST
+++ b/devel/ruby-pango/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2019/08/18 03:13:21 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.1 2019/09/14 18:11:37 tsutsui Exp $
${GEM_HOME}/cache/${GEM_NAME}.gem
${GEM_EXTSDIR}/gem.build_complete
${GEM_EXTSDIR}/pango.${RUBY_DLEXT}
diff --git a/devel/ruby-pango/buildlink3.mk b/devel/ruby-pango/buildlink3.mk
new file mode 100644
index 00000000000..f253100907d
--- /dev/null
+++ b/devel/ruby-pango/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2019/09/14 18:11:37 tsutsui Exp $
+
+BUILDLINK_TREE+= ruby-pango
+
+.if !defined(RUBY_PANGO_BUILDLINK3_MK)
+RUBY_PANGO_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.ruby-pango+= ${RUBY_PKGPREFIX}-pango>=3.3.8
+BUILDLINK_ABI_DEPENDS.ruby-pango+= ${RUBY_PKGPREFIX}-pango>=3.3.8
+BUILDLINK_PKGSRCDIR.ruby-pango?= ../../devel/ruby-pango
+
+.include "../../devel/pango/buildlink3.mk"
+.include "../../devel/ruby-gobject-introspection/buildlink3.mk"
+.include "../../graphics/ruby-cairo/buildlink3.mk"
+.include "../../lang/ruby/buildlink3.mk"
+.endif # RUBY_PANGO_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -ruby-pango
diff --git a/devel/ruby-pango/distinfo b/devel/ruby-pango/distinfo
new file mode 100644
index 00000000000..fbe431ab6a2
--- /dev/null
+++ b/devel/ruby-pango/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2019/09/14 18:11:37 tsutsui Exp $
+
+SHA1 (pango-3.3.8.gem) = f7a2c3c1203b60c0aa920c484f521de29d09163c
+RMD160 (pango-3.3.8.gem) = fd44778044bbbc2671109ac94ff18dc0ac4a1acf
+SHA512 (pango-3.3.8.gem) = 60630269a2f53f6ce2a016369aba73462fc8d3b22b0e8535798e8648ad6126ff6b3cb00ee8c7c51cb144b3673b93e939f21ed4069b5ede678415040c756007ab
+Size (pango-3.3.8.gem) = 28160 bytes
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
diff --git a/meta-pkgs/Makefile b/meta-pkgs/Makefile
index 0fefd550037..ef056af2f11 100644
--- a/meta-pkgs/Makefile
+++ b/meta-pkgs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2019/05/18 08:37:10 wiz Exp $
+# $NetBSD: Makefile,v 1.103 2019/09/14 18:11:40 tsutsui Exp $
#
COMMENT= Collections of other packages
@@ -43,7 +43,7 @@ SUBDIR+= pkgsrc-guide-tools
SUBDIR+= pulseaudio-tools
SUBDIR+= py-tryton-platform
SUBDIR+= qmail-server
-SUBDIR+= ruby-gnome2
+SUBDIR+= ruby-gnome
SUBDIR+= ruby-redmine-plugins
SUBDIR+= ruby-redmine-themes
SUBDIR+= ruby-shoulda
diff --git a/meta-pkgs/ruby-gnome2/DESCR b/meta-pkgs/ruby-gnome/DESCR
index 94816f92905..f209e8a2ba6 100644
--- a/meta-pkgs/ruby-gnome2/DESCR
+++ b/meta-pkgs/ruby-gnome/DESCR
@@ -1,3 +1,3 @@
-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/meta-pkgs/ruby-gnome/Makefile b/meta-pkgs/ruby-gnome/Makefile
new file mode 100644
index 00000000000..389646ba76e
--- /dev/null
+++ b/meta-pkgs/ruby-gnome/Makefile
@@ -0,0 +1,41 @@
+# $NetBSD: Makefile,v 1.1 2019/09/14 18:11:38 tsutsui Exp $
+#
+
+PKGNAME= ${RUBY_PKGPREFIX}-gnome-${VERSION}
+COMMENT= Set of Ruby language bindings for GNOME
+CATEGORIES= meta-pkgs gnome
+
+MAINTAINER= pkgsrc-users@NetBSD.org
+
+CONFLICTS+= ruby-gnome2-[0-9]*
+SUPERSEDES+= ruby-gnome2-[0-9]*
+
+DEPENDS+= ${RUBY_PKGPREFIX}-atk>=${VERSION}:../../devel/ruby-atk
+DEPENDS+= ${RUBY_PKGPREFIX}-gio2>=${VERSION}:../../devel/ruby-gio2
+DEPENDS+= ${RUBY_PKGPREFIX}-glib2>=${VERSION}:../../devel/ruby-glib2
+DEPENDS+= ${RUBY_PKGPREFIX}-gobject-introspection>=${VERSION}:../../devel/ruby-gobject-introspection
+DEPENDS+= ${RUBY_PKGPREFIX}-cairo-gobject>=${VERSION}:../../graphics/ruby-cairo-gobject
+DEPENDS+= ${RUBY_PKGPREFIX}-pango>=${VERSION}:../../devel/ruby-pango
+
+DEPENDS+= ${RUBY_PKGPREFIX}-clutter>=${VERSION}:../../graphics/ruby-clutter
+DEPENDS+= ${RUBY_PKGPREFIX}-clutter-gdk>=${VERSION}:../../graphics/ruby-clutter-gdk
+DEPENDS+= ${RUBY_PKGPREFIX}-clutter-gtk>=${VERSION}:../../graphics/ruby-clutter-gtk
+DEPENDS+= ${RUBY_PKGPREFIX}-gdk3>=${VERSION}:../../graphics/ruby-gdk3
+DEPENDS+= ${RUBY_PKGPREFIX}-gdk_pixbuf2>=${VERSION}:../../graphics/ruby-gdk_pixbuf2
+DEPENDS+= ${RUBY_PKGPREFIX}-rsvg2>=${VERSION}:../../graphics/ruby-rsvg2
+DEPENDS+= ${RUBY_PKGPREFIX}-clutter-gstreamer>=${VERSION}:../../multimedia/ruby-clutter-gstreamer
+DEPENDS+= ${RUBY_PKGPREFIX}-gstreamer>=${VERSION}:../../multimedia/ruby-gstreamer
+DEPENDS+= ${RUBY_PKGPREFIX}-poppler>=${VERSION}:../../print/ruby-poppler
+DEPENDS+= ${RUBY_PKGPREFIX}-webkit-gtk>=${VERSION}:../../www/ruby-webkit-gtk
+DEPENDS+= ${RUBY_PKGPREFIX}-webkit-gtk2>=${VERSION}:../../www/ruby-webkit-gtk2
+DEPENDS+= ${RUBY_PKGPREFIX}-gtk2>=${VERSION}:../../x11/ruby-gtk2
+DEPENDS+= ${RUBY_PKGPREFIX}-gtk3>=${VERSION}:../../x11/ruby-gtk3
+DEPENDS+= ${RUBY_PKGPREFIX}-gtksourceview2>=${VERSION}:../../x11/ruby-gtksourceview2
+DEPENDS+= ${RUBY_PKGPREFIX}-gtksourceview3>=${VERSION}:../../x11/ruby-gtksourceview3
+DEPENDS+= ${RUBY_PKGPREFIX}-vte>=${VERSION}:../../x11/ruby-vte
+
+META_PACKAGE= yes
+
+.include "../../lang/ruby/rubyversion.mk"
+.include "Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/ruby-gnome/Makefile.common b/meta-pkgs/ruby-gnome/Makefile.common
new file mode 100644
index 00000000000..553f5493a40
--- /dev/null
+++ b/meta-pkgs/ruby-gnome/Makefile.common
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile.common,v 1.1 2019/09/14 18:11:38 tsutsui Exp $
+#
+# used by devel/ruby-atk/Makefile
+# used by devel/ruby-gio2/Makefile
+# used by devel/ruby-glib2/Makefile
+# used by devel/ruby-gobject-introspection/Makefile
+# used by devel/ruby-pango/Makefile
+# used by graphics/ruby-cairo-gobject/Makefile
+# used by graphics/ruby-clutter/Makefile
+# used by graphics/ruby-clutter-gdk/Makefile
+# used by graphics/ruby-clutter-gtk/Makefile
+# used by graphics/ruby-gdk3/Makefile
+# used by graphics/ruby-gdk_pixbuf2/Makefile
+# used by graphics/ruby-rsvg2/Makefile
+# used by multimedia/ruby-clutter-gstreamer/Makefile
+# used by multimedia/ruby-gstreamer/Makefile
+# used by print/ruby-poppler/Makefile
+# used by www/ruby-webkit-gtk/Makefile
+# used by www/ruby-webkit-gtk2/Makefile
+# used by x11/ruby-gtk2/Makefile
+# used by x11/ruby-gtk3/Makefile
+# used by x11/ruby-gtksourceview2/Makefile
+# used by x11/ruby-gtksourceview3/Makefile
+# used by x11/ruby-vte/Makefile
+
+CATEGORIES+= ruby
+
+HOMEPAGE= http://ruby-gnome2.osdn.jp/
+LICENSE= gnu-lgpl-v2.1
+
+VERSION= 3.3.8
diff --git a/meta-pkgs/ruby-gnome2/Makefile b/meta-pkgs/ruby-gnome2/Makefile
deleted file mode 100644
index 862bdbcdbb6..00000000000
--- a/meta-pkgs/ruby-gnome2/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2017/06/11 05:51:39 tsutsui Exp $
-#
-
-PKGNAME= ${RUBY_PKGPREFIX}-gnome2-${VERSION}
-COMMENT= Set of Ruby language bindings for GNOME2
-CATEGORIES= meta-pkgs gnome
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-atk>=${VERSION}:../../devel/ruby-gnome2-atk
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gio>=${VERSION}:../../devel/ruby-gnome2-gio
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
-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+= ${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-clutter-gtk>=${VERSION}:../../graphics/ruby-gnome2-clutter-gtk
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gdk3>=${VERSION}:../../graphics/ruby-gnome2-gdk3
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gdkpixbuf>=${VERSION}:../../graphics/ruby-gnome2-gdkpixbuf
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-rsvg>=${VERSION}:../../graphics/ruby-gnome2-rsvg
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-clutter-gstreamer>=${VERSION}:../../multimedia/ruby-gnome2-clutter-gstreamer
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gstreamer>=${VERSION}:../../multimedia/ruby-gnome2-gstreamer
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-poppler>=${VERSION}:../../print/ruby-gnome2-poppler
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-webkit-gtk>=${VERSION}:../../www/ruby-gnome2-webkit-gtk
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-webkit-gtk2>=${VERSION}:../../www/ruby-gnome2-webkit-gtk2
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk3>=${VERSION}:../../x11/ruby-gnome2-gtk3
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtksourceview2>=${VERSION}:../../x11/ruby-gnome2-gtksourceview2
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtksourceview3>=${VERSION}:../../x11/ruby-gnome2-gtksourceview3
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-vte>=${VERSION}:../../x11/ruby-gnome2-vte
-
-META_PACKAGE= yes
-
-.include "../../lang/ruby/rubyversion.mk"
-.include "Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/ruby-gnome2/Makefile.common b/meta-pkgs/ruby-gnome2/Makefile.common
deleted file mode 100644
index 024d601b214..00000000000
--- a/meta-pkgs/ruby-gnome2/Makefile.common
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile.common,v 1.70 2019/08/18 03:13:22 tsutsui Exp $
-#
-# used by devel/ruby-gnome2-atk/Makefile
-# used by devel/ruby-gnome2-gio/Makefile
-# used by devel/ruby-gnome2-glib/Makefile
-# used by devel/ruby-gnome2-gobject-introspection/Makefile
-# used by devel/ruby-gnome2-pango/Makefile
-# used by graphics/ruby-gnome2-cairo-gobject/Makefile
-# used by graphics/ruby-gnome2-clutter/Makefile
-# used by graphics/ruby-gnome2-clutter-gdk/Makefile
-# used by graphics/ruby-gnome2-clutter-gtk/Makefile
-# used by graphics/ruby-gnome2-gdk3/Makefile
-# used by graphics/ruby-gnome2-gdkpixbuf/Makefile
-# used by graphics/ruby-gnome2-rsvg/Makefile
-# used by multimedia/ruby-gnome2-clutter-gstreamer/Makefile
-# used by multimedia/ruby-gnome2-gstreamer/Makefile
-# used by print/ruby-gnome2-poppler/Makefile
-# used by www/ruby-gnome2-webkit-gtk/Makefile
-# used by www/ruby-gnome2-webkit-gtk2/Makefile
-# used by x11/ruby-gnome2-gtk/Makefile
-# used by x11/ruby-gnome2-gtk3/Makefile
-# used by x11/ruby-gnome2-gtksourceview2/Makefile
-# used by x11/ruby-gnome2-gtksourceview3/Makefile
-# used by x11/ruby-gnome2-vte/Makefile
-
-CATEGORIES+= ruby
-
-HOMEPAGE= http://ruby-gnome2.osdn.jp/
-LICENSE= gnu-lgpl-v2.1
-
-VERSION= 3.3.7
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 9439860b947..afec440bd53 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.276 2019/09/07 23:51:06 nia Exp $
+# $NetBSD: Makefile,v 1.277 2019/09/14 18:11:40 tsutsui Exp $
#
COMMENT= Multimedia utilities
@@ -190,8 +190,8 @@ SUBDIR+= py-ming
SUBDIR+= py-mpegdash
SUBDIR+= regionset
SUBDIR+= replex
-SUBDIR+= ruby-gnome2-clutter-gstreamer
-SUBDIR+= ruby-gnome2-gstreamer
+SUBDIR+= ruby-clutter-gstreamer
+SUBDIR+= ruby-gstreamer
SUBDIR+= ruby-ming
SUBDIR+= schroedinger
SUBDIR+= smpeg
diff --git a/multimedia/ruby-gnome2-clutter-gstreamer/DESCR b/multimedia/ruby-clutter-gstreamer/DESCR
index 43e28a33c49..9d3f945da1f 100644
--- a/multimedia/ruby-gnome2-clutter-gstreamer/DESCR
+++ b/multimedia/ruby-clutter-gstreamer/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/multimedia/ruby-clutter-gstreamer/Makefile b/multimedia/ruby-clutter-gstreamer/Makefile
new file mode 100644
index 00000000000..8f435551d3c
--- /dev/null
+++ b/multimedia/ruby-clutter-gstreamer/Makefile
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2019/09/14 18:11:38 tsutsui Exp $
+#
+
+DISTNAME= clutter-gstreamer-${VERSION}
+COMMENT= Ruby binding of Clutter-GStreamer
+CATEGORIES= graphics
+
+MAINTAINER= pkgsrc-users@NetBSD.org
+
+CONFLICTS+= ruby-gnome2-clutter-gstreamer-[0-9]*
+SUPERSEDES+= ruby-gnome2-clutter-gstreamer-[0-9]*
+
+DEPENDS+= ${RUBY_PKGPREFIX}-clutter>=${VERSION}:../../graphics/ruby-clutter
+DEPENDS+= ${RUBY_PKGPREFIX}-gdk_pixbuf2>=${VERSION}:../../graphics/ruby-gdk_pixbuf2
+DEPENDS+= ${RUBY_PKGPREFIX}-gstreamer>=${VERSION}:../../multimedia/ruby-gstreamer
+DEPENDS+= clutter-gst>=3.0:../../multimedia/clutter-gst
+
+.include "../../meta-pkgs/ruby-gnome/Makefile.common"
+.include "../../lang/ruby/gem.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ruby-gnome2-clutter-gstreamer/PLIST b/multimedia/ruby-clutter-gstreamer/PLIST
index e5fec5f685f..29404f1d180 100644
--- a/multimedia/ruby-gnome2-clutter-gstreamer/PLIST
+++ b/multimedia/ruby-clutter-gstreamer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2018/06/09 03:36:09 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/multimedia/ruby-clutter-gstreamer/distinfo b/multimedia/ruby-clutter-gstreamer/distinfo
new file mode 100644
index 00000000000..7c4d547b1cb
--- /dev/null
+++ b/multimedia/ruby-clutter-gstreamer/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2019/09/14 18:11:38 tsutsui Exp $
+
+SHA1 (clutter-gstreamer-3.3.8.gem) = a8ea50f2de8a467ab560d7a1c5b4a374b3d51da1
+RMD160 (clutter-gstreamer-3.3.8.gem) = abad573099da792de3b5354e92ffac9f41ee4220
+SHA512 (clutter-gstreamer-3.3.8.gem) = e1e2b17a506cd8a1c63f315d366312b2def6f9df04a3cee3865c896d8efdb86d3e4d41073b9d4b4fc7a6b21d2775389f7307a82714a31e833840543a77f9a84f
+Size (clutter-gstreamer-3.3.8.gem) = 125440 bytes
+SHA1 (patch-dependency-check_Rakefile) = e6763eed8ba21f9e1c50d198b5c5fac1ba965984
diff --git a/multimedia/ruby-gnome2-clutter-gstreamer/patches/patch-dependency-check_Rakefile b/multimedia/ruby-clutter-gstreamer/patches/patch-dependency-check_Rakefile
index 940854ccb91..95bf54f8d3a 100644
--- a/multimedia/ruby-gnome2-clutter-gstreamer/patches/patch-dependency-check_Rakefile
+++ b/multimedia/ruby-clutter-gstreamer/patches/patch-dependency-check_Rakefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-dependency-check_Rakefile,v 1.2 2018/04/13 16:31:10 tsutsui Exp $
+$NetBSD: patch-dependency-check_Rakefile,v 1.1 2019/09/14 18:11:39 tsutsui Exp $
- ignore native-package-installer dependency checks
(pkgsrc will handle dependencies internally)
diff --git a/multimedia/ruby-gnome2-clutter-gstreamer/Makefile b/multimedia/ruby-gnome2-clutter-gstreamer/Makefile
deleted file mode 100644
index 874bb5070ca..00000000000
--- a/multimedia/ruby-gnome2-clutter-gstreamer/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2017/06/11 05:51:41 tsutsui Exp $
-#
-
-DISTNAME= clutter-gstreamer-${VERSION}
-PKGNAME= ${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
-COMMENT= Ruby binding of Clutter-GStreamer
-CATEGORIES= graphics
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-clutter>=${VERSION}:../../graphics/ruby-gnome2-clutter
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gdkpixbuf>=${VERSION}:../../graphics/ruby-gnome2-gdkpixbuf
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gstreamer>=${VERSION}:../../multimedia/ruby-gnome2-gstreamer
-DEPENDS+= clutter-gst>=3.0:../../multimedia/clutter-gst
-
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
-.include "../../lang/ruby/gem.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ruby-gnome2-clutter-gstreamer/distinfo b/multimedia/ruby-gnome2-clutter-gstreamer/distinfo
deleted file mode 100644
index 7d10f9837f3..00000000000
--- a/multimedia/ruby-gnome2-clutter-gstreamer/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.21 2019/08/18 03:13:22 tsutsui Exp $
-
-SHA1 (clutter-gstreamer-3.3.7.gem) = 626c74799d2eb8cf0b20e84514c77b31d08bb849
-RMD160 (clutter-gstreamer-3.3.7.gem) = 3b2e9ce60994e8229e34dfd9d643bf34ca34c947
-SHA512 (clutter-gstreamer-3.3.7.gem) = e3c34632c3128070f82bceffc586e2d730e971f4f031fe70370f65952271ef0b123063e423926bc708148bbfca777d7599c2af37f59f8e4bc26d38ed02038a54
-Size (clutter-gstreamer-3.3.7.gem) = 125440 bytes
-SHA1 (patch-dependency-check_Rakefile) = e6763eed8ba21f9e1c50d198b5c5fac1ba965984
diff --git a/multimedia/ruby-gnome2-gstreamer/Makefile b/multimedia/ruby-gnome2-gstreamer/Makefile
deleted file mode 100644
index 779cdd6342e..00000000000
--- a/multimedia/ruby-gnome2-gstreamer/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2019/01/27 02:23:40 tsutsui Exp $
-#
-
-DISTNAME= gstreamer-${VERSION}
-PKGNAME= ${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
-COMMENT= Ruby binding of GStreamer 1.0.x or later
-CATEGORIES= multimedia
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gobject-introspection>=${VERSION}:../../devel/ruby-gnome2-gobject-introspection
-DEPENDS+= gst-plugins1-base-[0-9]*:../../multimedia/gst-plugins1-base
-
-.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
-.include "../../devel/gobject-introspection/buildlink3.mk"
-.include "../../devel/ruby-gnome2-gobject-introspection/buildlink3.mk"
-.include "../../multimedia/gstreamer1/buildlink3.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
-.include "../../lang/ruby/gem.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ruby-gnome2-gstreamer/distinfo b/multimedia/ruby-gnome2-gstreamer/distinfo
deleted file mode 100644
index 95f13ec40cb..00000000000
--- a/multimedia/ruby-gnome2-gstreamer/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.21 2019/08/18 03:13:22 tsutsui Exp $
-
-SHA1 (gstreamer-3.3.7.gem) = 930e9685b253a3e324078a29d245454f4cad4358
-RMD160 (gstreamer-3.3.7.gem) = 27a80501bbaa253714cc9826485760b288187d51
-SHA512 (gstreamer-3.3.7.gem) = 5fec91117c7979404b9a4ffa37a89dec46b69bd92aa2478bdc73f05522cf5b1850339c9e061a35d8791fd48422bb3e5e3af9af7fb1135fdc4bee4bb895b63ba2
-Size (gstreamer-3.3.7.gem) = 30208 bytes
diff --git a/multimedia/ruby-gnome2-gstreamer/DESCR b/multimedia/ruby-gstreamer/DESCR
index 341c1534e52..411b586ec07 100644
--- a/multimedia/ruby-gnome2-gstreamer/DESCR
+++ b/multimedia/ruby-gstreamer/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/multimedia/ruby-gstreamer/Makefile b/multimedia/ruby-gstreamer/Makefile
new file mode 100644
index 00000000000..7ad8d845198
--- /dev/null
+++ b/multimedia/ruby-gstreamer/Makefile
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2019/09/14 18:11:39 tsutsui Exp $
+#
+
+DISTNAME= gstreamer-${VERSION}
+COMMENT= Ruby binding of GStreamer 1.0.x or later
+CATEGORIES= multimedia
+
+MAINTAINER= pkgsrc-users@NetBSD.org
+
+CONFLICTS+= ruby-gnome2-gstreamer-[0-9]*
+SUPERSEDES+= ruby-gnome2-gstreamer-[0-9]*
+
+DEPENDS+= ${RUBY_PKGPREFIX}-gobject-introspection>=${VERSION}:../../devel/ruby-gobject-introspection
+DEPENDS+= gst-plugins1-base-[0-9]*:../../multimedia/gst-plugins1-base
+
+.include "../../devel/ruby-gobject-introspection/buildlink3.mk"
+.include "../../multimedia/gstreamer1/buildlink3.mk"
+.include "../../meta-pkgs/ruby-gnome/Makefile.common"
+.include "../../lang/ruby/gem.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ruby-gnome2-gstreamer/PLIST b/multimedia/ruby-gstreamer/PLIST
index 02bf292e500..5de5cfab074 100644
--- a/multimedia/ruby-gnome2-gstreamer/PLIST
+++ b/multimedia/ruby-gstreamer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2018/06/09 03:36:09 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.1 2019/09/14 18:11:39 tsutsui Exp $
${GEM_HOME}/cache/${GEM_NAME}.gem
${GEM_EXTSDIR}/gem.build_complete
${GEM_EXTSDIR}/gstreamer.${RUBY_DLEXT}
@@ -31,6 +31,7 @@ ${GEM_LIBDIR}/lib/gstreamer.${RUBY_DLEXT}
${GEM_LIBDIR}/sample/audio-example.rb
${GEM_LIBDIR}/sample/framestep1.rb
${GEM_LIBDIR}/sample/gst-inspect.rb
+${GEM_LIBDIR}/sample/gtk-video.rb
${GEM_LIBDIR}/sample/helloworld.rb
${GEM_LIBDIR}/sample/mp3parselaunch.rb
${GEM_LIBDIR}/sample/queue.rb
diff --git a/multimedia/ruby-gstreamer/distinfo b/multimedia/ruby-gstreamer/distinfo
new file mode 100644
index 00000000000..450bf780a3d
--- /dev/null
+++ b/multimedia/ruby-gstreamer/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2019/09/14 18:11:39 tsutsui Exp $
+
+SHA1 (gstreamer-3.3.8.gem) = a39edb248546a69245fcc1dcecda6c2aa8f1d43f
+RMD160 (gstreamer-3.3.8.gem) = b609e0e5b03f759c6e5a9a837c8993872ab9e2e7
+SHA512 (gstreamer-3.3.8.gem) = 946a080f73d26adc65c5b569ff6d08ab88172cf33f71da816e9b8347fb35460039c2627b37b26fb2480910357532ee3dc520359400f9dd54b09d339fab680700
+Size (gstreamer-3.3.8.gem) = 30208 bytes
diff --git a/print/Makefile b/print/Makefile
index d33ca15a05e..2c235ebc625 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.745 2019/08/26 14:41:52 adam Exp $
+# $NetBSD: Makefile,v 1.746 2019/09/14 18:11:41 tsutsui Exp $
#
COMMENT= Desktop publishing
@@ -143,10 +143,10 @@ SUBDIR+= qpdfview
SUBDIR+= rlpr
SUBDIR+= rtf2latex
SUBDIR+= rtf2latex2e
-SUBDIR+= ruby-gnome2-poppler
SUBDIR+= ruby-pdf-core
SUBDIR+= ruby-pdf-reader
SUBDIR+= ruby-pdf-writer
+SUBDIR+= ruby-poppler
SUBDIR+= ruby-prawn
SUBDIR+= scribus-qt4
SUBDIR+= seetexk
diff --git a/print/ruby-gnome2-poppler/Makefile b/print/ruby-gnome2-poppler/Makefile
deleted file mode 100644
index 8d1f9f93b8a..00000000000
--- a/print/ruby-gnome2-poppler/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.112 2019/08/18 03:13:22 tsutsui Exp $
-
-DISTNAME= poppler-${VERSION}
-PKGNAME= ${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
-COMMENT= Ruby binding of poppler-glib
-CATEGORIES= print
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gio>=${VERSION}:../../devel/ruby-gnome2-gio
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-cairo-gobject>=${VERSION}:../../graphics/ruby-gnome2-cairo-gobject
-
-BUILDLINK_API_DEPENDS.poppler-glib+= poppler-glib>=0.8.0
-.include "../../print/poppler-glib/buildlink3.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
-.include "../../lang/ruby/gem.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/print/ruby-gnome2-poppler/distinfo b/print/ruby-gnome2-poppler/distinfo
deleted file mode 100644
index ec17e61993c..00000000000
--- a/print/ruby-gnome2-poppler/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.24 2019/08/18 03:13:22 tsutsui Exp $
-
-SHA1 (poppler-3.3.7.gem) = 41d2789b5bee2358c1f87767a0066fe92c6a1f62
-RMD160 (poppler-3.3.7.gem) = b9de0d7ffff5fdbe61f08be4eb578e3ba2a12b23
-SHA512 (poppler-3.3.7.gem) = 408160592d61d8a24ffbe44d07d9963218ced990b91d5ca44c66548986bed113770fe07bba3600f1c446a05fd51104ac46ebb63c7d93eb1ac67ba5436de01c54
-Size (poppler-3.3.7.gem) = 95232 bytes
diff --git a/print/ruby-gnome2-poppler/DESCR b/print/ruby-poppler/DESCR
index e765e15e757..d8c725eb6a8 100644
--- a/print/ruby-gnome2-poppler/DESCR
+++ b/print/ruby-poppler/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/print/ruby-poppler/Makefile b/print/ruby-poppler/Makefile
new file mode 100644
index 00000000000..6e77e36f6ff
--- /dev/null
+++ b/print/ruby-poppler/Makefile
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2019/09/14 18:11:39 tsutsui Exp $
+#
+
+DISTNAME= poppler-${VERSION}
+COMMENT= Ruby binding of poppler-glib
+CATEGORIES= print
+
+MAINTAINER= pkgsrc-users@NetBSD.org
+
+CONFLICTS+= ruby-gnome2-poppler-[0-9]*
+SUPERSEDES+= ruby-gnome2-poppler-[0-9]*
+
+DEPENDS+= ${RUBY_PKGPREFIX}-gio2>=${VERSION}:../../devel/ruby-gio2
+DEPENDS+= ${RUBY_PKGPREFIX}-cairo-gobject>=${VERSION}:../../graphics/ruby-cairo-gobject
+
+BUILDLINK_API_DEPENDS.poppler-glib+= poppler-glib>=0.8.0
+.include "../../print/poppler-glib/buildlink3.mk"
+.include "../../meta-pkgs/ruby-gnome/Makefile.common"
+.include "../../lang/ruby/gem.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/print/ruby-gnome2-poppler/PLIST b/print/ruby-poppler/PLIST
index e545284af3e..84e2f32e779 100644
--- a/print/ruby-gnome2-poppler/PLIST
+++ b/print/ruby-poppler/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2018/11/01 14:23:00 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.1 2019/09/14 18:11:39 tsutsui Exp $
${GEM_HOME}/cache/${GEM_NAME}.gem
${GEM_EXTSDIR}/gem.build_complete
${GEM_LIBDIR}/COPYING.LIB
diff --git a/print/ruby-poppler/distinfo b/print/ruby-poppler/distinfo
new file mode 100644
index 00000000000..928bf63594d
--- /dev/null
+++ b/print/ruby-poppler/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2019/09/14 18:11:39 tsutsui Exp $
+
+SHA1 (poppler-3.3.8.gem) = 458f83995494c17d9024bb13254854a73fd51cce
+RMD160 (poppler-3.3.8.gem) = e2ea8a812e3fc08ab4ae4f6a087ca89aa16d7114
+SHA512 (poppler-3.3.8.gem) = 004ab3359798ee1e3fec3071a3dd86390d6d3ec8270ccddf81294c2612853506f9c534826c90f276dc9b837f85ec4a61742fa7ce807f034fcece7a9f1d6d5fb7
+Size (poppler-3.3.8.gem) = 95232 bytes
diff --git a/www/Makefile b/www/Makefile
index d2e3285aca8..ed8aa9f5087 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1404 2019/09/11 12:01:53 tm Exp $
+# $NetBSD: Makefile,v 1.1405 2019/09/14 18:11:41 tsutsui Exp $
#
COMMENT= Packages related to the World Wide Web
@@ -842,8 +842,6 @@ SUBDIR+= ruby-faraday
SUBDIR+= ruby-faraday_middleware
SUBDIR+= ruby-faye-websocket
SUBDIR+= ruby-fcgi
-SUBDIR+= ruby-gnome2-webkit-gtk
-SUBDIR+= ruby-gnome2-webkit-gtk2
SUBDIR+= ruby-htmlsplit
SUBDIR+= ruby-http
SUBDIR+= ruby-http-cookie
@@ -915,6 +913,8 @@ SUBDIR+= ruby-staticmatic
SUBDIR+= ruby-tag
SUBDIR+= ruby-unicorn
SUBDIR+= ruby-url_mount
+SUBDIR+= ruby-webkit-gtk
+SUBDIR+= ruby-webkit-gtk2
SUBDIR+= ruby-webrobots
SUBDIR+= ruby-websocket
SUBDIR+= ruby-websocket-driver
diff --git a/www/ruby-gnome2-webkit-gtk/Makefile b/www/ruby-gnome2-webkit-gtk/Makefile
deleted file mode 100644
index 8cf9eae20f9..00000000000
--- a/www/ruby-gnome2-webkit-gtk/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2018/11/01 14:23:00 tsutsui Exp $
-#
-
-DISTNAME= webkit-gtk-${VERSION}
-PKGNAME= ${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
-COMMENT= Ruby binding of WebKitGTK+
-CATEGORIES= www
-
-MAINTAINER= tsutsui@NetBSD.org
-
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk3>=${VERSION}:../../x11/ruby-gnome2-gtk3
-DEPENDS+= webkit24-gtk3>=1.10.2nb6:../../www/webkit24-gtk3
-
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
-.include "../../lang/ruby/gem.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ruby-gnome2-webkit-gtk/distinfo b/www/ruby-gnome2-webkit-gtk/distinfo
deleted file mode 100644
index ea2d228da4d..00000000000
--- a/www/ruby-gnome2-webkit-gtk/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.21 2019/08/18 03:13:23 tsutsui Exp $
-
-SHA1 (webkit-gtk-3.3.7.gem) = 5a8d99eaeacc0cd7127aeae7b1acb9c302e0f2d9
-RMD160 (webkit-gtk-3.3.7.gem) = c663d21f37a61c1385242e40bf4c1864e9359952
-SHA512 (webkit-gtk-3.3.7.gem) = 45cd9d3a8fa2e3894c480f5dfb938d518e4530292ba30a19d89e9e6485516a81bf796606482dd0fcef44ff037802078396344eb3b5e4d68714b5d8bfd0fcb153
-Size (webkit-gtk-3.3.7.gem) = 16896 bytes
-SHA1 (patch-dependency-check_Rakefile) = 396a5ed9861b460c0c56d785ac30c96efa904f77
diff --git a/www/ruby-gnome2-webkit-gtk2/Makefile b/www/ruby-gnome2-webkit-gtk2/Makefile
deleted file mode 100644
index c6f47f1f25f..00000000000
--- a/www/ruby-gnome2-webkit-gtk2/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2017/06/11 05:51:41 tsutsui Exp $
-#
-
-DISTNAME= webkit-gtk2-${VERSION}
-PKGNAME= ${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
-COMMENT= Ruby binding of WebKitGTK+ for GTK2+
-CATEGORIES= www
-
-MAINTAINER= tsutsui@NetBSD.org
-
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gobject-introspection>=${VERSION}:../../devel/ruby-gnome2-gobject-introspection
-DEPENDS+= webkit24-gtk>=1.10.2nb8:../../www/webkit24-gtk
-
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
-.include "../../lang/ruby/gem.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ruby-gnome2-webkit-gtk2/distinfo b/www/ruby-gnome2-webkit-gtk2/distinfo
deleted file mode 100644
index 69467449dfe..00000000000
--- a/www/ruby-gnome2-webkit-gtk2/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.21 2019/08/18 03:13:23 tsutsui Exp $
-
-SHA1 (webkit-gtk2-3.3.7.gem) = fbccb22aa0681baab91309bbe48feeb3ae2f6520
-RMD160 (webkit-gtk2-3.3.7.gem) = 08502f44118549d00ab2ae133e716f65d94fe329
-SHA512 (webkit-gtk2-3.3.7.gem) = df40575f5feab55e571e041e9156e5e915b42abd53a6ada9a65513a9de4c41f545005d829d64431225549d5e663f27f3f068a6facde3cc93db056b63a385f992
-Size (webkit-gtk2-3.3.7.gem) = 15872 bytes
diff --git a/www/ruby-gnome2-webkit-gtk/DESCR b/www/ruby-webkit-gtk/DESCR
index b5488478a98..7f0f4c0f5c9 100644
--- a/www/ruby-gnome2-webkit-gtk/DESCR
+++ b/www/ruby-webkit-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/www/ruby-webkit-gtk/Makefile b/www/ruby-webkit-gtk/Makefile
new file mode 100644
index 00000000000..e14a83e49a7
--- /dev/null
+++ b/www/ruby-webkit-gtk/Makefile
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2019/09/14 18:11:39 tsutsui Exp $
+#
+
+DISTNAME= webkit-gtk-${VERSION}
+COMMENT= Ruby binding of WebKitGTK+
+CATEGORIES= www
+
+MAINTAINER= tsutsui@NetBSD.org
+
+CONFLICTS+= ruby-gnome2-webkit-gtk-[0-9]*
+SUPERSEDES+= ruby-gnome2-webkit-gtk-[0-9]*
+
+DEPENDS+= ${RUBY_PKGPREFIX}-gtk3>=${VERSION}:../../x11/ruby-gtk3
+DEPENDS+= webkit24-gtk3>=1.10.2nb6:../../www/webkit24-gtk3
+
+.include "../../meta-pkgs/ruby-gnome/Makefile.common"
+.include "../../lang/ruby/gem.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/ruby-gnome2-webkit-gtk/PLIST b/www/ruby-webkit-gtk/PLIST
index 524f5dedc2c..0ba9daec830 100644
--- a/www/ruby-gnome2-webkit-gtk/PLIST
+++ b/www/ruby-webkit-gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2018/08/08 12:16:01 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.1 2019/09/14 18:11:39 tsutsui Exp $
${GEM_HOME}/cache/${GEM_NAME}.gem
${GEM_EXTSDIR}/gem.build_complete
${GEM_LIBDIR}/COPYING.LIB
diff --git a/www/ruby-webkit-gtk/distinfo b/www/ruby-webkit-gtk/distinfo
new file mode 100644
index 00000000000..71d7b4019b1
--- /dev/null
+++ b/www/ruby-webkit-gtk/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2019/09/14 18:11:39 tsutsui Exp $
+
+SHA1 (webkit-gtk-3.3.8.gem) = ffe2a8eb33800d06783c38e5f58565f9f08eb4e9
+RMD160 (webkit-gtk-3.3.8.gem) = f020f46b45751fe2db94d6abca5e9c8655218da8
+SHA512 (webkit-gtk-3.3.8.gem) = b241e1fe8f67e36c4785f0a05f202b4387f91e9128bee21cf48a0db3caed00638d56679dad784bc2078703fb25f342c99f171c754e4a742794ee097bdb3b215d
+Size (webkit-gtk-3.3.8.gem) = 16896 bytes
+SHA1 (patch-dependency-check_Rakefile) = 396a5ed9861b460c0c56d785ac30c96efa904f77
diff --git a/www/ruby-gnome2-webkit-gtk/patches/patch-dependency-check_Rakefile b/www/ruby-webkit-gtk/patches/patch-dependency-check_Rakefile
index ee70b6ece6b..75cf96b89b1 100644
--- a/www/ruby-gnome2-webkit-gtk/patches/patch-dependency-check_Rakefile
+++ b/www/ruby-webkit-gtk/patches/patch-dependency-check_Rakefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-dependency-check_Rakefile,v 1.2 2018/04/13 16:31:11 tsutsui Exp $
+$NetBSD: patch-dependency-check_Rakefile,v 1.1 2019/09/14 18:11:39 tsutsui Exp $
- ignore native-package-installer dependency checks
(pkgsrc will handle dependencies internally)
diff --git a/www/ruby-gnome2-webkit-gtk2/DESCR b/www/ruby-webkit-gtk2/DESCR
index 8c741e345e7..f8658717949 100644
--- a/www/ruby-gnome2-webkit-gtk2/DESCR
+++ b/www/ruby-webkit-gtk2/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/www/ruby-webkit-gtk2/Makefile b/www/ruby-webkit-gtk2/Makefile
new file mode 100644
index 00000000000..a04a76a1292
--- /dev/null
+++ b/www/ruby-webkit-gtk2/Makefile
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2019/09/14 18:11:39 tsutsui Exp $
+#
+
+DISTNAME= webkit-gtk2-${VERSION}
+COMMENT= Ruby binding of WebKitGTK+ for GTK2+
+CATEGORIES= www
+
+MAINTAINER= tsutsui@NetBSD.org
+
+CONFLICTS+= ruby-gnome2-webkit-gtk2-[0-9]*
+SUPERSEDES+= ruby-gnome2-webkit-gtk2-[0-9]*
+
+DEPENDS+= ${RUBY_PKGPREFIX}-gtk2>=${VERSION}:../../x11/ruby-gtk2
+DEPENDS+= ${RUBY_PKGPREFIX}-gobject-introspection>=${VERSION}:../../devel/ruby-gobject-introspection
+DEPENDS+= webkit24-gtk>=1.10.2nb8:../../www/webkit24-gtk
+
+.include "../../meta-pkgs/ruby-gnome/Makefile.common"
+.include "../../lang/ruby/gem.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/ruby-gnome2-webkit-gtk2/PLIST b/www/ruby-webkit-gtk2/PLIST
index d192be1d4ac..c38b50b0d93 100644
--- a/www/ruby-gnome2-webkit-gtk2/PLIST
+++ b/www/ruby-webkit-gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2018/08/08 12:16:01 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.1 2019/09/14 18:11:39 tsutsui Exp $
${GEM_HOME}/cache/${GEM_NAME}.gem
${GEM_LIBDIR}/COPYING.LIB
${GEM_LIBDIR}/README.md
diff --git a/www/ruby-webkit-gtk2/distinfo b/www/ruby-webkit-gtk2/distinfo
new file mode 100644
index 00000000000..44768c5ca5f
--- /dev/null
+++ b/www/ruby-webkit-gtk2/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2019/09/14 18:11:39 tsutsui Exp $
+
+SHA1 (webkit-gtk2-3.3.8.gem) = 15c41c869910cbd35c534bcc7d12273d270f31c2
+RMD160 (webkit-gtk2-3.3.8.gem) = 092ff8a0ef0d2e22e43c7a4e0bdbde2cfaf6fe58
+SHA512 (webkit-gtk2-3.3.8.gem) = c89cf6189490bcb673e32214f979ec89d7960bf03475a5626a5e962951307c373b59e5374b9d94a3297fd578cf035467e2f56c7e390d75c6e42cce7024b700a8
+Size (webkit-gtk2-3.3.8.gem) = 15872 bytes
diff --git a/x11/Makefile b/x11/Makefile
index 6292bdb40b5..e03966488d9 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.844 2019/08/30 06:30:57 markd Exp $
+# $NetBSD: Makefile,v 1.845 2019/09/14 18:11:41 tsutsui Exp $
#
COMMENT= Packages to support the X window system
@@ -400,13 +400,13 @@ SUBDIR+= rgb
SUBDIR+= rofi
SUBDIR+= rox-session
SUBDIR+= rox-wallpaper
-SUBDIR+= ruby-gnome2-gtk
-SUBDIR+= ruby-gnome2-gtk3
-SUBDIR+= ruby-gnome2-gtksourceview2
-SUBDIR+= ruby-gnome2-gtksourceview3
-SUBDIR+= ruby-gnome2-vte
+SUBDIR+= ruby-gtk2
+SUBDIR+= ruby-gtk3
+SUBDIR+= ruby-gtksourceview2
+SUBDIR+= ruby-gtksourceview3
SUBDIR+= ruby-tk
SUBDIR+= ruby-tk-gem
+SUBDIR+= ruby-vte
SUBDIR+= ruby-wxruby
SUBDIR+= rxvt
SUBDIR+= rxvt-unicode
diff --git a/x11/ruby-gnome2-gtk/Makefile b/x11/ruby-gnome2-gtk/Makefile
deleted file mode 100644
index 755749e1e62..00000000000
--- a/x11/ruby-gnome2-gtk/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.74 2019/08/18 03:13:23 tsutsui Exp $
-#
-
-DISTNAME= gtk2-${VERSION}
-PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gtk-${VERSION}
-COMMENT= Ruby binding of GTK+-2.x
-CATEGORIES= x11
-
-MAINTAINER= tsutsui@NetBSD.org
-
-CONFLICTS+= ruby-gnome2-gtk-[0-9]*
-
-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
-
-.include "../../devel/ruby-gnome2-pango/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
-.include "../../lang/ruby/gem.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/ruby-gnome2-gtk/buildlink3.mk b/x11/ruby-gnome2-gtk/buildlink3.mk
deleted file mode 100644
index 605b46cdd8d..00000000000
--- a/x11/ruby-gnome2-gtk/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.49 2019/08/18 03:13:23 tsutsui Exp $
-
-BUILDLINK_TREE+= ruby-gnome2-gtk
-
-.if !defined(RUBY_GNOME2_GTK_BUILDLINK3_MK)
-RUBY_GNOME2_GTK_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.ruby-gnome2-gtk+= ${RUBY_PKGPREFIX}-gnome2-gtk>=0.17.0
-BUILDLINK_ABI_DEPENDS.ruby-gnome2-gtk+= ${RUBY_PKGPREFIX}-gnome2-gtk>=3.3.7
-BUILDLINK_PKGSRCDIR.ruby-gnome2-gtk?= ../../x11/ruby-gnome2-gtk
-
-.include "../../devel/ruby-gnome2-pango/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.endif # RUBY_GNOME2_GTK_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -ruby-gnome2-gtk
diff --git a/x11/ruby-gnome2-gtk/distinfo b/x11/ruby-gnome2-gtk/distinfo
deleted file mode 100644
index 707931766e3..00000000000
--- a/x11/ruby-gnome2-gtk/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.26 2019/08/18 03:13:23 tsutsui Exp $
-
-SHA1 (gtk2-3.3.7.gem) = 6716ec33ee8478a03a4c790cc2fe6992e99cfc1a
-RMD160 (gtk2-3.3.7.gem) = 382214765597a370895f73a9e32bd83627298bb1
-SHA512 (gtk2-3.3.7.gem) = 2100daba7212e9f84ba9cd9b35d186bdefd81dafe5ed0397c4ba4527a9470bb0cc4817bd738bb02f1e0464f8510ab50e2057687a811f075a426b59f3570b1493
-Size (gtk2-3.3.7.gem) = 476160 bytes
diff --git a/x11/ruby-gnome2-gtk3/Makefile b/x11/ruby-gnome2-gtk3/Makefile
deleted file mode 100644
index 2d23b3f3ef7..00000000000
--- a/x11/ruby-gnome2-gtk3/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.39 2019/08/18 03:13:23 tsutsui Exp $
-#
-
-DISTNAME= gtk3-${VERSION}
-PKGNAME= ${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
-COMMENT= Ruby binding of GTK+-3.x
-CATEGORIES= x11
-
-MAINTAINER= tsutsui@NetBSD.org
-
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-atk>=${VERSION}:../../devel/ruby-gnome2-atk
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gio>=${VERSION}:../../devel/ruby-gnome2-gio
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-pango>=${VERSION}:../../devel/ruby-gnome2-pango
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gdk3>=${VERSION}:../../graphics/ruby-gnome2-gdk3
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gdkpixbuf>=${VERSION}:../../graphics/ruby-gnome2-gdkpixbuf
-
-.include "../../devel/ruby-gnome2-pango/buildlink3.mk"
-.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/x11/ruby-gnome2-gtk3/buildlink3.mk b/x11/ruby-gnome2-gtk3/buildlink3.mk
deleted file mode 100644
index ecc8a30e3ed..00000000000
--- a/x11/ruby-gnome2-gtk3/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.28 2019/08/18 03:13:23 tsutsui Exp $
-
-BUILDLINK_TREE+= ruby-gnome2-gtk3
-
-.if !defined(RUBY_GNOME2_GTK3_BUILDLINK3_MK)
-RUBY_GNOME2_GTK3_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.ruby-gnome2-gtk3+= ${RUBY_PKGPREFIX}-gnome2-gtk3>=1.2.0
-BUILDLINK_ABI_DEPENDS.ruby-gnome2-gtk3+= ${RUBY_PKGPREFIX}-gnome2-gtk3>=3.3.7
-BUILDLINK_PKGSRCDIR.ruby-gnome2-gtk3?= ../../x11/ruby-gnome2-gtk3
-
-.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
-.endif # RUBY_GNOME2_GTK3_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -ruby-gnome2-gtk3
diff --git a/x11/ruby-gnome2-gtk3/distinfo b/x11/ruby-gnome2-gtk3/distinfo
deleted file mode 100644
index bc770cb74ef..00000000000
--- a/x11/ruby-gnome2-gtk3/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.21 2019/08/18 03:13:23 tsutsui Exp $
-
-SHA1 (gtk3-3.3.7.gem) = 86dadfc02ed3b02902a8c8a45fb1257e79c2ac8d
-RMD160 (gtk3-3.3.7.gem) = b80d6a4f9c9b1bb48183e3710cc90c02302a10a4
-SHA512 (gtk3-3.3.7.gem) = faa3e169189704d05b0d4707afe097ca389358897a801724fea3f142c184ea16824e39457361e574091ad865a9f680fbf51258c6819bd104720696a2c2f61df7
-Size (gtk3-3.3.7.gem) = 865792 bytes
diff --git a/x11/ruby-gnome2-gtksourceview2/Makefile b/x11/ruby-gnome2-gtksourceview2/Makefile
deleted file mode 100644
index 88693e7fc28..00000000000
--- a/x11/ruby-gnome2-gtksourceview2/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.62 2019/08/18 03:13:23 tsutsui Exp $
-#
-
-DISTNAME= gtksourceview2-${VERSION}
-PKGNAME= ${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
-COMMENT= Ruby binding of gtksourceview2
-CATEGORIES= x11
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
-
-.include "../../x11/gtksourceview2/buildlink3.mk"
-.include "../../x11/ruby-gnome2-gtk/buildlink3.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
-.include "../../lang/ruby/gem.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/ruby-gnome2-gtksourceview2/distinfo b/x11/ruby-gnome2-gtksourceview2/distinfo
deleted file mode 100644
index a0245339354..00000000000
--- a/x11/ruby-gnome2-gtksourceview2/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.21 2019/08/18 03:13:23 tsutsui Exp $
-
-SHA1 (gtksourceview2-3.3.7.gem) = 46f764e7705eceaaba78b81a64b8eb9dbf6d217f
-RMD160 (gtksourceview2-3.3.7.gem) = c7db1126b5852fc63b8e80444c4857239f142152
-SHA512 (gtksourceview2-3.3.7.gem) = 4e35be7fdb2d856b4e2fb63a3f439a4e1ec37d7064f0c4b233a54f66316bb7d7aff2a235b7ea727f10bd0e9fdd5541566414d0162ba186cda36b081bc4f7bea5
-Size (gtksourceview2-3.3.7.gem) = 25088 bytes
diff --git a/x11/ruby-gnome2-gtksourceview3/Makefile b/x11/ruby-gnome2-gtksourceview3/Makefile
deleted file mode 100644
index b59ae17c4bc..00000000000
--- a/x11/ruby-gnome2-gtksourceview3/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.39 2019/08/18 03:13:23 tsutsui Exp $
-#
-
-DISTNAME= gtksourceview3-${VERSION}
-PKGNAME= ${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
-COMMENT= Ruby binding of gtksourceview3
-CATEGORIES= x11
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gobject-introspection>=${VERSION}:../../devel/ruby-gnome2-gobject-introspection
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk3>=${VERSION}:../../x11/ruby-gnome2-gtk3
-
-.include "../../x11/gtksourceview3/buildlink3.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
-.include "../../lang/ruby/gem.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/ruby-gnome2-gtksourceview3/distinfo b/x11/ruby-gnome2-gtksourceview3/distinfo
deleted file mode 100644
index 0484ed005f0..00000000000
--- a/x11/ruby-gnome2-gtksourceview3/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.21 2019/08/18 03:13:23 tsutsui Exp $
-
-SHA1 (gtksourceview3-3.3.7.gem) = f7e5f808c6c56df48db7ba1d2421fff8d4f1f6e6
-RMD160 (gtksourceview3-3.3.7.gem) = 9ff4c5dbba97067fa3cd5af3bfe9f6791916272b
-SHA512 (gtksourceview3-3.3.7.gem) = d22292f2f22d84cce80cbb95a816e3a75f71df2a67be8f28b97d112f5b151347c7b1522f292c2a765523cfdc1c09fde78177157d8574938c4a656c7b212dfe36
-Size (gtksourceview3-3.3.7.gem) = 17408 bytes
diff --git a/x11/ruby-gnome2-vte/Makefile b/x11/ruby-gnome2-vte/Makefile
deleted file mode 100644
index 2f413e24d46..00000000000
--- a/x11/ruby-gnome2-vte/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.64 2019/08/18 03:13:23 tsutsui Exp $
-#
-
-DISTNAME= vte-${VERSION}
-PKGNAME= ${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
-COMMENT= Ruby binding of vte
-CATEGORIES= x11
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
-
-.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
-.include "../../x11/ruby-gnome2-gtk/buildlink3.mk"
-.include "../../x11/vte/buildlink3.mk"
-.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
-.include "../../lang/ruby/gem.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/ruby-gnome2-vte/distinfo b/x11/ruby-gnome2-vte/distinfo
deleted file mode 100644
index a8a9639473d..00000000000
--- a/x11/ruby-gnome2-vte/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.21 2019/08/18 03:13:23 tsutsui Exp $
-
-SHA1 (vte-3.3.7.gem) = f3733cdcd6f7aa1f3d531c786be8a0ccb73ec700
-RMD160 (vte-3.3.7.gem) = 9081a51b6a449fbe202da8dcf19afbfa13112a4c
-SHA512 (vte-3.3.7.gem) = cd068527bf0e9422e9c07ec7bb9cad14eab1d2e5f30d5ac6b0d830b75c332ae65a44855ec758377fd8261d005c3e9744f9ace46c58a9aa8ef6b78fffe1ff72c4
-Size (vte-3.3.7.gem) = 24064 bytes
diff --git a/x11/ruby-gnome2-gtk/DESCR b/x11/ruby-gtk2/DESCR
index d5ca994f1c1..b8327b798be 100644
--- a/x11/ruby-gnome2-gtk/DESCR
+++ b/x11/ruby-gtk2/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/x11/ruby-gtk2/Makefile b/x11/ruby-gtk2/Makefile
new file mode 100644
index 00000000000..aa8461af592
--- /dev/null
+++ b/x11/ruby-gtk2/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 2019/09/14 18:11:39 tsutsui Exp $
+#
+
+DISTNAME= gtk2-${VERSION}
+COMMENT= Ruby binding of GTK+-2.x
+CATEGORIES= x11
+
+MAINTAINER= tsutsui@NetBSD.org
+
+CONFLICTS+= ruby-gnome2-gtk-[0-9]*
+SUPERSEDES+= ruby-gnome2-gtk-[0-9]*
+
+DEPENDS+= ${RUBY_PKGPREFIX}-atk>=${VERSION}:../../devel/ruby-atk
+DEPENDS+= ${RUBY_PKGPREFIX}-pango>=${VERSION}:../../devel/ruby-pango
+DEPENDS+= ${RUBY_PKGPREFIX}-gdk_pixbuf2>=${VERSION}:../../graphics/ruby-gdk_pixbuf2
+
+.include "../../devel/ruby-pango/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../meta-pkgs/ruby-gnome/Makefile.common"
+.include "../../lang/ruby/gem.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/ruby-gnome2-gtk/PLIST b/x11/ruby-gtk2/PLIST
index 53cadd96545..17d9134e0fa 100644
--- a/x11/ruby-gnome2-gtk/PLIST
+++ b/x11/ruby-gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2018/06/09 03:36:09 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.1 2019/09/14 18:11:39 tsutsui Exp $
${GEM_HOME}/cache/${GEM_NAME}.gem
${GEM_EXTSDIR}/gem.build_complete
${GEM_EXTSDIR}/gtk2.${RUBY_DLEXT}
diff --git a/x11/ruby-gtk2/buildlink3.mk b/x11/ruby-gtk2/buildlink3.mk
new file mode 100644
index 00000000000..55a5dc22d46
--- /dev/null
+++ b/x11/ruby-gtk2/buildlink3.mk
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.1 2019/09/14 18:11:39 tsutsui Exp $
+
+BUILDLINK_TREE+= ruby-gtk2
+
+.if !defined(RUBY_GTK2_BUILDLINK3_MK)
+RUBY_GTK2_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.ruby-gtk2+= ${RUBY_PKGPREFIX}-gtk2>=3.3.8
+BUILDLINK_ABI_DEPENDS.ruby-gtk2+= ${RUBY_PKGPREFIX}-gtk2>=3.3.8
+BUILDLINK_PKGSRCDIR.ruby-gtk2?= ../../x11/ruby-gtk2
+
+.include "../../devel/ruby-pango/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.endif # RUBY_GNOME2_GTK_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -ruby-gtk2
diff --git a/x11/ruby-gtk2/distinfo b/x11/ruby-gtk2/distinfo
new file mode 100644
index 00000000000..11881c7fb9b
--- /dev/null
+++ b/x11/ruby-gtk2/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2019/09/14 18:11:39 tsutsui Exp $
+
+SHA1 (gtk2-3.3.8.gem) = d7ac57e3c68cdaeb5a81188aecbed98f1c5d7e0a
+RMD160 (gtk2-3.3.8.gem) = d2e7b6b5d78bb5b27b2dd73e6f149598ed6928e1
+SHA512 (gtk2-3.3.8.gem) = 12351b6c9e904a2c61f90fa17aa1fd3f74c06cf853a808af9bafde8cbf731db9bfbbea8dd714883daab70e5edde373eff698f1b281050bc1cb8d73426c7063d5
+Size (gtk2-3.3.8.gem) = 476160 bytes
diff --git a/x11/ruby-gnome2-gtk3/DESCR b/x11/ruby-gtk3/DESCR
index 1c997909c1d..7321e2d5a14 100644
--- a/x11/ruby-gnome2-gtk3/DESCR
+++ b/x11/ruby-gtk3/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/x11/ruby-gtk3/Makefile b/x11/ruby-gtk3/Makefile
new file mode 100644
index 00000000000..daaad09151a
--- /dev/null
+++ b/x11/ruby-gtk3/Makefile
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile,v 1.1 2019/09/14 18:11:40 tsutsui Exp $
+#
+
+DISTNAME= gtk3-${VERSION}
+COMMENT= Ruby binding of GTK+-3.x
+CATEGORIES= x11
+
+MAINTAINER= tsutsui@NetBSD.org
+
+CONFLICTS+= ruby-gnome2-gtk3-[0-9]*
+SUPERSEDES+= ruby-gnome2-gtk3-[0-9]*
+
+DEPENDS+= ${RUBY_PKGPREFIX}-atk>=${VERSION}:../../devel/ruby-atk
+DEPENDS+= ${RUBY_PKGPREFIX}-gio2>=${VERSION}:../../devel/ruby-gio2
+DEPENDS+= ${RUBY_PKGPREFIX}-pango>=${VERSION}:../../devel/ruby-pango
+DEPENDS+= ${RUBY_PKGPREFIX}-gdk3>=${VERSION}:../../graphics/ruby-gdk3
+DEPENDS+= ${RUBY_PKGPREFIX}-gdk_pixbuf2>=${VERSION}:../../graphics/ruby-gdk_pixbuf2
+
+.include "../../devel/ruby-pango/buildlink3.mk"
+.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/x11/ruby-gnome2-gtk3/PLIST b/x11/ruby-gtk3/PLIST
index de77b0d8f2c..ada11481cdc 100644
--- a/x11/ruby-gnome2-gtk3/PLIST
+++ b/x11/ruby-gtk3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2019/02/03 07:18:50 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.1 2019/09/14 18:11:40 tsutsui Exp $
${GEM_HOME}/cache/${GEM_NAME}.gem
${GEM_EXTSDIR}/gem.build_complete
${GEM_EXTSDIR}/gtk3.${RUBY_DLEXT}
diff --git a/x11/ruby-gtk3/buildlink3.mk b/x11/ruby-gtk3/buildlink3.mk
new file mode 100644
index 00000000000..e4b242807d6
--- /dev/null
+++ b/x11/ruby-gtk3/buildlink3.mk
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.1 2019/09/14 18:11:40 tsutsui Exp $
+
+BUILDLINK_TREE+= ruby-gtk3
+
+.if !defined(RUBY_GTK3_BUILDLINK3_MK)
+RUBY_GTK3_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.ruby-gtk3+= ${RUBY_PKGPREFIX}-gtk3>=3.3.8
+BUILDLINK_ABI_DEPENDS.ruby-gtk3+= ${RUBY_PKGPREFIX}-gtk3>=3.3.8
+BUILDLINK_PKGSRCDIR.ruby-gtk3?= ../../x11/ruby-gtk3
+
+.include "../../devel/ruby-pango/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.endif # RUBY_GTK3_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -ruby-gtk3
diff --git a/x11/ruby-gtk3/distinfo b/x11/ruby-gtk3/distinfo
new file mode 100644
index 00000000000..d121d9df291
--- /dev/null
+++ b/x11/ruby-gtk3/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2019/09/14 18:11:40 tsutsui Exp $
+
+SHA1 (gtk3-3.3.8.gem) = decac274d82d942896fe02f028a5f4f611b54008
+RMD160 (gtk3-3.3.8.gem) = 92fe1502a99ab621001b0cd779a0e4a9576b0c24
+SHA512 (gtk3-3.3.8.gem) = 8660709954b1bb7981320fd8ccba9a3fb50fadbd5613e06aa0a6d0248b174b40b4b644f1a8b1b1ceae48cb2aba9a54ccd22297634ce800c5c53af84a86b28b08
+Size (gtk3-3.3.8.gem) = 865792 bytes
diff --git a/x11/ruby-gnome2-gtksourceview2/DESCR b/x11/ruby-gtksourceview2/DESCR
index 1715e3c999b..aa7c1ca8765 100644
--- a/x11/ruby-gnome2-gtksourceview2/DESCR
+++ b/x11/ruby-gtksourceview2/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/x11/ruby-gtksourceview2/Makefile b/x11/ruby-gtksourceview2/Makefile
new file mode 100644
index 00000000000..a3709085806
--- /dev/null
+++ b/x11/ruby-gtksourceview2/Makefile
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2019/09/14 18:11:40 tsutsui Exp $
+#
+
+DISTNAME= gtksourceview2-${VERSION}
+COMMENT= Ruby binding of gtksourceview2
+CATEGORIES= x11
+
+MAINTAINER= pkgsrc-users@NetBSD.org
+
+CONFLICTS+= ruby-gnome2-gtksourceview2-[0-9]*
+SUPERSEDES+= ruby-gnome2-gtksourceview2-[0-9]*
+
+DEPENDS+= ${RUBY_PKGPREFIX}-gtk2>=${VERSION}:../../x11/ruby-gtk2
+
+.include "../../x11/gtksourceview2/buildlink3.mk"
+.include "../../x11/ruby-gtk2/buildlink3.mk"
+.include "../../meta-pkgs/ruby-gnome/Makefile.common"
+.include "../../lang/ruby/gem.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/ruby-gnome2-gtksourceview2/PLIST b/x11/ruby-gtksourceview2/PLIST
index 45adf7ef1f4..24aa28531b4 100644
--- a/x11/ruby-gnome2-gtksourceview2/PLIST
+++ b/x11/ruby-gtksourceview2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2018/06/09 03:36:09 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.1 2019/09/14 18:11:40 tsutsui Exp $
${GEM_HOME}/cache/${GEM_NAME}.gem
${GEM_EXTSDIR}/gem.build_complete
${GEM_EXTSDIR}/gtksourceview2.${RUBY_DLEXT}
diff --git a/x11/ruby-gtksourceview2/distinfo b/x11/ruby-gtksourceview2/distinfo
new file mode 100644
index 00000000000..94f263a2a6f
--- /dev/null
+++ b/x11/ruby-gtksourceview2/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2019/09/14 18:11:40 tsutsui Exp $
+
+SHA1 (gtksourceview2-3.3.8.gem) = c3bcb92ee7266cb79f71d5400c2d9eb105dfd70d
+RMD160 (gtksourceview2-3.3.8.gem) = 8f6e5086d1af89b6c4cdcedf5b53bbd98a202e41
+SHA512 (gtksourceview2-3.3.8.gem) = fa09d4747b8ad35685587e4f4c4d81d3c737d51f0c551a8828b2a7847df64539f235e763ec3923247536466e822a7658ab9016ab17ada0008a691da0eb9f58bf
+Size (gtksourceview2-3.3.8.gem) = 25088 bytes
diff --git a/x11/ruby-gnome2-gtksourceview3/DESCR b/x11/ruby-gtksourceview3/DESCR
index 91d62b85a20..377670d7972 100644
--- a/x11/ruby-gnome2-gtksourceview3/DESCR
+++ b/x11/ruby-gtksourceview3/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/x11/ruby-gtksourceview3/Makefile b/x11/ruby-gtksourceview3/Makefile
new file mode 100644
index 00000000000..b17cc1a4add
--- /dev/null
+++ b/x11/ruby-gtksourceview3/Makefile
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2019/09/14 18:11:40 tsutsui Exp $
+#
+
+DISTNAME= gtksourceview3-${VERSION}
+COMMENT= Ruby binding of gtksourceview3
+CATEGORIES= x11
+
+MAINTAINER= pkgsrc-users@NetBSD.org
+
+CONFLICTS+= ruby-gnome2-gtksourceview3-[0-9]*
+SUPERSEDES+= ruby-gnome2-gtksourceview3-[0-9]*
+
+DEPENDS+= ${RUBY_PKGPREFIX}-gobject-introspection>=${VERSION}:../../devel/ruby-gobject-introspection
+DEPENDS+= ${RUBY_PKGPREFIX}-gtk3>=${VERSION}:../../x11/ruby-gtk3
+
+.include "../../x11/gtksourceview3/buildlink3.mk"
+.include "../../meta-pkgs/ruby-gnome/Makefile.common"
+.include "../../lang/ruby/gem.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/ruby-gnome2-gtksourceview3/PLIST b/x11/ruby-gtksourceview3/PLIST
index f7119f6d8b8..063fc6fe440 100644
--- a/x11/ruby-gnome2-gtksourceview3/PLIST
+++ b/x11/ruby-gtksourceview3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2018/06/09 03:36:09 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.1 2019/09/14 18:11:40 tsutsui Exp $
${GEM_HOME}/cache/${GEM_NAME}.gem
${GEM_EXTSDIR}/gem.build_complete
${GEM_LIBDIR}/COPYING.LIB
diff --git a/x11/ruby-gtksourceview3/distinfo b/x11/ruby-gtksourceview3/distinfo
new file mode 100644
index 00000000000..b535ad16538
--- /dev/null
+++ b/x11/ruby-gtksourceview3/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2019/09/14 18:11:40 tsutsui Exp $
+
+SHA1 (gtksourceview3-3.3.8.gem) = c9d79d8848e8499fe16168973874a6ea6438dbd4
+RMD160 (gtksourceview3-3.3.8.gem) = 5704a3aa7a1f5b692e126065ddaa532af2f6600a
+SHA512 (gtksourceview3-3.3.8.gem) = 507f61e2860e29ffb8e19ca7e79aa69a6c13a86d56b73ef8ad9f05ab48e1f97c969f3370beff5afb9235fb2489c49ed29a30177e770a443d3306adb918d7cbe5
+Size (gtksourceview3-3.3.8.gem) = 17408 bytes
diff --git a/x11/ruby-gnome2-vte/DESCR b/x11/ruby-vte/DESCR
index 3bf2660c61a..39b32483cac 100644
--- a/x11/ruby-gnome2-vte/DESCR
+++ b/x11/ruby-vte/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/x11/ruby-vte/Makefile b/x11/ruby-vte/Makefile
new file mode 100644
index 00000000000..32cda637099
--- /dev/null
+++ b/x11/ruby-vte/Makefile
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2019/09/14 18:11:40 tsutsui Exp $
+#
+
+DISTNAME= vte-${VERSION}
+COMMENT= Ruby binding of vte
+CATEGORIES= x11
+
+MAINTAINER= pkgsrc-users@NetBSD.org
+
+CONFLICTS+= ruby-gnome2-vte-[0-9]*
+SUPERSEDES+= ruby-gnome2-vte-[0-9]*
+
+DEPENDS+= ${RUBY_PKGPREFIX}-gtk2>=${VERSION}:../../x11/ruby-gtk2
+
+.include "../../x11/ruby-gtk2/buildlink3.mk"
+.include "../../x11/vte/buildlink3.mk"
+.include "../../meta-pkgs/ruby-gnome/Makefile.common"
+.include "../../lang/ruby/gem.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/ruby-gnome2-vte/PLIST b/x11/ruby-vte/PLIST
index e1a75f8ed89..7918fab7749 100644
--- a/x11/ruby-gnome2-vte/PLIST
+++ b/x11/ruby-vte/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2018/06/09 03:36:09 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.1 2019/09/14 18:11:40 tsutsui Exp $
${GEM_HOME}/cache/${GEM_NAME}.gem
${GEM_EXTSDIR}/gem.build_complete
${GEM_EXTSDIR}/vte.${RUBY_DLEXT}
diff --git a/x11/ruby-vte/distinfo b/x11/ruby-vte/distinfo
new file mode 100644
index 00000000000..754f5599273
--- /dev/null
+++ b/x11/ruby-vte/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2019/09/14 18:11:40 tsutsui Exp $
+
+SHA1 (vte-3.3.8.gem) = bcc63cb79c76daacffacca5d30d80ec145b55b29
+RMD160 (vte-3.3.8.gem) = 0a016c77eacc1e2d6a2e3b135086d9f365d746aa
+SHA512 (vte-3.3.8.gem) = 407aa35a372bac7ffc27902b07ef17af845fb5c91e09beb51706fa6bb3ff9de1714dd60f75fdb53c92d00bfcf81b52bc7d656aacd78a1b039a14e5c670b35f91
+Size (vte-3.3.8.gem) = 24064 bytes