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

35 files changed, 179 insertions, 172 deletions

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