11 files changed, 39 insertions, 96 deletions
diff --git a/graphics/ruby-gnome2-cairo-gobject/distinfo b/graphics/ruby-gnome2-cairo-gobject/distinfo
index da82c9634f0..7bed9e920e2 100644
--- a/graphics/ruby-gnome2-cairo-gobject/distinfo
+++ b/graphics/ruby-gnome2-cairo-gobject/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2017/06/10 08:27:19 tsutsui Exp $
+$NetBSD: distinfo,v 1.7 2017/08/18 14:58:50 tsutsui Exp $
 
-SHA1 (cairo-gobject-3.1.6.gem) = 9ea1d07563d424c1a2cfe93ce7a99abff66ede6f
-RMD160 (cairo-gobject-3.1.6.gem) = c782ada671cc4621fa5a6744bf12ed380e1f910f
-SHA512 (cairo-gobject-3.1.6.gem) = ece9e1f16c8327b1b90e98e1f31a657b7c9e962ba5c369a04c617c6c4996e6371eca42310c48756f2e79af2c933e35de0ec39392e90cd36f2884919b112a0027
-Size (cairo-gobject-3.1.6.gem) = 10240 bytes
+SHA1 (cairo-gobject-3.1.8.gem) = 72b2411625555e65a8c63b79f3cf829f2abda96c
+RMD160 (cairo-gobject-3.1.8.gem) = e959856f3f74819a074e8fd84ee876d0c0c490bb
+SHA512 (cairo-gobject-3.1.8.gem) = 01815bab9de16e327731c131dec5c303922b79177000bd129fe6a1c4a79167a5693055de6af0e869441c01a87ac272e60f5c1f480438c9744a321ccfbd6c41b7
+Size (cairo-gobject-3.1.8.gem) = 10240 bytes
diff --git a/graphics/ruby-gnome2-clutter-gdk/distinfo b/graphics/ruby-gnome2-clutter-gdk/distinfo
index 512ed347d06..d872e381b45 100644
--- a/graphics/ruby-gnome2-clutter-gdk/distinfo
+++ b/graphics/ruby-gnome2-clutter-gdk/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2017/06/10 08:27:20 tsutsui Exp $
+$NetBSD: distinfo,v 1.3 2017/08/18 14:58:50 tsutsui Exp $
 
-SHA1 (clutter-gdk-3.1.6.gem) = 3cc1ae20f80ab35137ce9d566f63b42963c154de
-RMD160 (clutter-gdk-3.1.6.gem) = 98055180ab209ef00e8ef7169177d4e4c166c732
-SHA512 (clutter-gdk-3.1.6.gem) = 31642b4a54e06b7bdb28ddca3c5c0fb0ce7484b1f1fe2437508e2a98ec2ad26ecd1504354b97ac763813501ac15d25e240bc5d7033ff5c7c5b553f5268ad3b72
-Size (clutter-gdk-3.1.6.gem) = 5632 bytes
+SHA1 (clutter-gdk-3.1.8.gem) = d8e203c5d083531b915b4b07937cb09ce8e92371
+RMD160 (clutter-gdk-3.1.8.gem) = 85234cacb3f609e0217f12b15dab6aa10b830aed
+SHA512 (clutter-gdk-3.1.8.gem) = 64bc48aabfed988acac2cabe7f3e7e06ce1674fe54b93d25e38956e13fe3ec1d54f70b9c54c863a7df6839bc5004aa8c69780aa6d4c4291ba22cc711bdc4daaf
+Size (clutter-gdk-3.1.8.gem) = 5632 bytes
diff --git a/graphics/ruby-gnome2-clutter-gtk/distinfo b/graphics/ruby-gnome2-clutter-gtk/distinfo
index d88b250744f..49ffe4d46df 100644
--- a/graphics/ruby-gnome2-clutter-gtk/distinfo
+++ b/graphics/ruby-gnome2-clutter-gtk/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2017/06/10 08:27:20 tsutsui Exp $
+$NetBSD: distinfo,v 1.7 2017/08/18 14:58:50 tsutsui Exp $
 
-SHA1 (clutter-gtk-3.1.6.gem) = ce4420b77fcdda87229061dee0ee5e6d0322cf27
-RMD160 (clutter-gtk-3.1.6.gem) = 3dfc5df83a49f64695c34fe05cb63a9d7a7ad66e
-SHA512 (clutter-gtk-3.1.6.gem) = 1d91a1019f34ada27c661b100f63410e65f9f354ab830a3fdc03cbe03cabcce61fedb6aaa150d5ded1a10b856335a5a7ebf808cf69b7344bfa4fb7276f4fae1f
-Size (clutter-gtk-3.1.6.gem) = 21504 bytes
+SHA1 (clutter-gtk-3.1.8.gem) = f4eb582710b8f23090e8a09fcf435cb27be39d38
+RMD160 (clutter-gtk-3.1.8.gem) = 7b2f3db7d6edd8aac224160a6440bf7badca451d
+SHA512 (clutter-gtk-3.1.8.gem) = 152473e160cb6c90e697d9def03c671a9b809d80680e6786f66fe803294bef05c97a943ac75a256394d366bf56b567d1dd33c90796e34e7237f5d16637cd2ba6
+Size (clutter-gtk-3.1.8.gem) = 21504 bytes
diff --git a/graphics/ruby-gnome2-clutter/distinfo b/graphics/ruby-gnome2-clutter/distinfo
index db222c8e3aa..178fad84e92 100644
--- a/graphics/ruby-gnome2-clutter/distinfo
+++ b/graphics/ruby-gnome2-clutter/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2017/06/10 08:27:20 tsutsui Exp $
+$NetBSD: distinfo,v 1.7 2017/08/18 14:58:50 tsutsui Exp $
 
-SHA1 (clutter-3.1.6.gem) = b58aa1e113df6fab479e09d7a701bcfa8fb320f9
-RMD160 (clutter-3.1.6.gem) = 97eac89b28a236b8e06ddf5037d64727bc817499
-SHA512 (clutter-3.1.6.gem) = 53ac04ee4c3b5500a777138bdd9c50d2ecf7df2e15624e06775dd056ed8086989441aa1ca23d82cbf21a48c3bb60df7e5c1a452e8f8159b761fa91df0928c4fe
-Size (clutter-3.1.6.gem) = 33792 bytes
+SHA1 (clutter-3.1.8.gem) = a586f065db6d3e8f1b1830a0ef3a5f43c87169f4
+RMD160 (clutter-3.1.8.gem) = ce75df50de7ba41315d08351aefadef1e34af48b
+SHA512 (clutter-3.1.8.gem) = 8c8b5aaa87c52ea7da1b7c1aba560c629cec9054db340114bf754af497752bfdb780b8b68da39555ae926351554bc1f0478db258113e85fc1e503de7394e77b9
+Size (clutter-3.1.8.gem) = 33792 bytes
diff --git a/graphics/ruby-gnome2-gdk3/distinfo b/graphics/ruby-gnome2-gdk3/distinfo
index 2c0f0c873e5..d1508f968cc 100644
--- a/graphics/ruby-gnome2-gdk3/distinfo
+++ b/graphics/ruby-gnome2-gdk3/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2017/06/10 08:27:20 tsutsui Exp $
+$NetBSD: distinfo,v 1.7 2017/08/18 14:58:50 tsutsui Exp $
 
-SHA1 (gdk3-3.1.6.gem) = 6c5b3d2840ab6c0064afecd4fb33fe5f45fc69bb
-RMD160 (gdk3-3.1.6.gem) = 4037c58ee51978dd88d6a39a7afd31cb178ab3a9
-SHA512 (gdk3-3.1.6.gem) = e6b5b2e9ea1dd7beaaede8d5861652a9b9c1978e0e3c8e5769ca6f87f7236f17d78f8d43611535116064d1fd16005f53a8b8636dee72c4a65ffccfbd9543704e
-Size (gdk3-3.1.6.gem) = 26112 bytes
+SHA1 (gdk3-3.1.8.gem) = f42a6d657454bb97f81c0cf6bd00259d825f25ec
+RMD160 (gdk3-3.1.8.gem) = b9c032f157ac237889fdd7b090fc5d4cb0fcd0cc
+SHA512 (gdk3-3.1.8.gem) = ede0c85a4095946525601ff781d2c8b66cdf17292eca3a5c3398cefa4273d6ac4a02f6aff2c6ea0f0e8399232ebd47b3eb90868c7e6fe3a523574502b5c779d8
+Size (gdk3-3.1.8.gem) = 26112 bytes
diff --git a/graphics/ruby-gnome2-gdkpixbuf/distinfo b/graphics/ruby-gnome2-gdkpixbuf/distinfo
index 1d9f42eb7c5..4fac8dcc7de 100644
--- a/graphics/ruby-gnome2-gdkpixbuf/distinfo
+++ b/graphics/ruby-gnome2-gdkpixbuf/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2017/06/10 08:27:20 tsutsui Exp $
+$NetBSD: distinfo,v 1.9 2017/08/18 14:58:50 tsutsui Exp $
 
-SHA1 (gdk_pixbuf2-3.1.6.gem) = e1aceb1c9b0702a4f857f400e3723fcc81e11fc8
-RMD160 (gdk_pixbuf2-3.1.6.gem) = e7dcfeb66b35b2c1549f17086ef9591c9f403c6c
-SHA512 (gdk_pixbuf2-3.1.6.gem) = 634cb721850cb49976bcfbbc009b40d4c5a674135720ec4f8bead73fabc48ac04d7b6c0f273925e9fe61cc294794061bbab94b7c6e53122a97000223ae1077cd
-Size (gdk_pixbuf2-3.1.6.gem) = 25088 bytes
+SHA1 (gdk_pixbuf2-3.1.8.gem) = b772f85b60184dcac9eca066888947f03a8fc301
+RMD160 (gdk_pixbuf2-3.1.8.gem) = c00e0bef5c5d5230cc4c03c34904eebbff106187
+SHA512 (gdk_pixbuf2-3.1.8.gem) = 3e26cd44fbbe0f01b91cb70b46e59f23676aa07c300c3343ffee9f1ba26a06fc5efec02d6094cf910096a5cbaef8f890611e12c19bf20a224d10866d5988ae75
+Size (gdk_pixbuf2-3.1.8.gem) = 25088 bytes
diff --git a/graphics/ruby-gnome2-rsvg/Makefile b/graphics/ruby-gnome2-rsvg/Makefile
index ad1c8123faf..6f94dfcee30 100644
--- a/graphics/ruby-gnome2-rsvg/Makefile
+++ b/graphics/ruby-gnome2-rsvg/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2017/06/11 05:51:40 tsutsui Exp $
+# $NetBSD: Makefile,v 1.65 2017/08/18 14:58:50 tsutsui Exp $
 #
 
 DISTNAME=		rsvg2-${VERSION}
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-rsvg-${VERSION}
-PKGREVISION=		1
 COMMENT=		Ruby binding of librsvg
 CATEGORIES=		graphics
 
diff --git a/graphics/ruby-gnome2-rsvg/PLIST b/graphics/ruby-gnome2-rsvg/PLIST
index 37d8e16902f..11aaa4308b0 100644
--- a/graphics/ruby-gnome2-rsvg/PLIST
+++ b/graphics/ruby-gnome2-rsvg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2017/06/10 08:27:20 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.7 2017/08/18 14:58:50 tsutsui Exp $
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_EXTSDIR}/gem.build_complete
 ${GEM_LIBDIR}/Rakefile
@@ -9,6 +9,8 @@ ${GEM_LIBDIR}/lib/rsvg2/dimension-data.rb
 ${GEM_LIBDIR}/lib/rsvg2/handle.rb
 ${GEM_LIBDIR}/lib/rsvg2/loader.rb
 ${GEM_LIBDIR}/lib/rsvg2/version.rb
+${GEM_LIBDIR}/sample/svg-viewer.rb
+${GEM_LIBDIR}/sample/svg2.rb
 ${GEM_LIBDIR}/test/rsvg2-test-utils.rb
 ${GEM_LIBDIR}/test/run-test.rb
 ${GEM_LIBDIR}/test/test-handle.rb
diff --git a/graphics/ruby-gnome2-rsvg/distinfo b/graphics/ruby-gnome2-rsvg/distinfo
index 9993718eef4..14bf30a6bf8 100644
--- a/graphics/ruby-gnome2-rsvg/distinfo
+++ b/graphics/ruby-gnome2-rsvg/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.7 2017/06/10 11:10:42 tsutsui Exp $
+$NetBSD: distinfo,v 1.8 2017/08/18 14:58:50 tsutsui Exp $
 
-SHA1 (rsvg2-3.1.6.gem) = 85a41ef78594b2e66667fe60c5f9eda2939441d4
-RMD160 (rsvg2-3.1.6.gem) = 1aaf58bdfddd492a2f0c483415f469b6c3566721
-SHA512 (rsvg2-3.1.6.gem) = a6e2fa8b4d6ca723e4e08855627a0827cddc895a558113dd8c43887cb3072724181eb49deebea36d701a8ca24a3617c5d84078e65fc01c8df596b15703b85e44
-Size (rsvg2-3.1.6.gem) = 18944 bytes
-SHA1 (patch-Rakefile) = 9af0355c66136992b9da816c17736675262ef122
-SHA1 (patch-lib_rsvg2.rb) = d4ebbec68638791c4256fd2ee64408a3de8fa9f6
+SHA1 (rsvg2-3.1.8.gem) = 55ef594527167009657ad2587c83218b35786607
+RMD160 (rsvg2-3.1.8.gem) = a3c3994aeb0176414b65f381ddab240b2c6d8464
+SHA512 (rsvg2-3.1.8.gem) = d53126289469491833a1929e7cee69e72c70956127e3df93b697cc5a28be95282fb9674dd8e9f26b5e89a50ed86d7844facf21e4dac88e7e01a6cdb72c27461f
+Size (rsvg2-3.1.8.gem) = 19968 bytes
diff --git a/graphics/ruby-gnome2-rsvg/patches/patch-Rakefile b/graphics/ruby-gnome2-rsvg/patches/patch-Rakefile
deleted file mode 100644
index 2863dd921dd..00000000000
--- a/graphics/ruby-gnome2-rsvg/patches/patch-Rakefile
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-Rakefile,v 1.1 2017/06/10 11:10:42 tsutsui Exp $
-
-- pull dependency fix from upstream
-  https://github.com/ruby-gnome2/ruby-gnome2/commit/9ddac28ccf948a4db7d49ea87fda034f9411e3e5
-
---- Rakefile.orig	2017-06-10 11:04:23.000000000 +0000
-+++ Rakefile
-@@ -1,6 +1,6 @@
- # -*- ruby -*-
- #
--# Copyright (C) 2010-2015  Ruby-GNOME2 Project Team
-+# Copyright (C) 2010-2017  Ruby-GNOME2 Project Team
- #
- # This library is free software; you can redistribute it and/or
- # modify it under the terms of the GNU Lesser General Public
-@@ -22,7 +22,11 @@ require 'gnome2-raketask'
- package_task = GNOME2::Rake::PackageTask.new do |package|
-   package.summary = "Ruby/Rsvg is a Ruby binding of librsvg-2.x."
-   package.description = "Ruby/Rsvg is a Ruby binding of librsvg-2.x."
--  package.dependency.gem.runtime = [["cairo", ">= 1.12.8"], "gdk_pixbuf2"]
-+  package.dependency.gem.runtime = [
-+    ["cairo", ">= 1.12.8"],
-+    "gdk_pixbuf2",
-+    "cairo-gobject",
-+  ]
-   package.windows.packages = []
-   package.windows.dependencies = []
-   package.windows.build_dependencies = [
-@@ -30,9 +34,12 @@ package_task = GNOME2::Rake::PackageTask
-     "gobject-introspection",
-     "pango",
-     "gdk_pixbuf2",
-+    "cairo-gobject",
-   ]
-   package.windows.gobject_introspection_dependencies = [
-+    "pango",
-     "gdk_pixbuf2",
-+    "cairo-gobject",
-   ]
-   package.cross_compiling do |spec|
-     if /mingw|mswin/ =~ spec.platform.to_s
diff --git a/graphics/ruby-gnome2-rsvg/patches/patch-lib_rsvg2.rb b/graphics/ruby-gnome2-rsvg/patches/patch-lib_rsvg2.rb
deleted file mode 100644
index e034615555d..00000000000
--- a/graphics/ruby-gnome2-rsvg/patches/patch-lib_rsvg2.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_rsvg2.rb,v 1.1 2017/06/10 11:10:42 tsutsui Exp $
-
-- pull dependency fix from upstream
-  https://github.com/ruby-gnome2/ruby-gnome2/commit/9ddac28ccf948a4db7d49ea87fda034f9411e3e5
-
---- lib/rsvg2.rb.orig	2017-06-10 11:04:23.000000000 +0000
-+++ lib/rsvg2.rb
-@@ -18,6 +18,7 @@ require "gobject-introspection"
- require "glib2"
- require "gio2"
- require "gdk_pixbuf2"
-+require "cairo-gobject"
- require "cairo"
- 
- base_dir = Pathname.new(__FILE__).dirname.dirname.expand_path