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

37 files changed, 182 insertions, 180 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