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

7 files changed, 30 insertions, 27 deletions

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