mikutter: update to 3.6.0.

Upstream change:

mikutter 3.6.0

* World
 * Twitter functions are now implemented as a plugin
 * Service is no longer available, so the World plugin provides an equivalent
   of Service
* Spell
* Form DSL
 * generalized modules for settings etc. so make it possible to use it
   in Dialog etc.
 * photo select
  * select images
 * label
 * link (Model viewer)
* Dialog DSL/dialog method
 * universal interface for plugins to show a dialog box
 * no dependencies on Gtk
* Photo Model
 * preserve image URLs for multiple sizes and use a proper larger size
   one for requested image
* new setting in config for the maxinum number of tweets in timelines
* settings
 * tree structure in side menu by "settings" block
 * improve drawing speed for settings with many items
* appearance settings for PostBox and World Shifter
* requires Ruby 2.3 and later
* gems for mikutter project
 * use Diva gem
  * new gem derived from mikutter
  * replacement of Retriever, mikutter still provides Retriever compatible
    interfaces
 * Delayer Deferred 2
  * async/await

7 files changed, 110 insertions, 172 deletions

diff --git a/net/mikutter/Makefile b/net/mikutter/Makefile
index 9424940de35..776e66386d9 100644
--- a/net/mikutter/Makefile
+++ b/net/mikutter/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.149 2017/11/19 12:57:11 tsutsui Exp $
+# $NetBSD: Makefile,v 1.150 2017/12/30 05:05:14 tsutsui Exp $
 #
 
-DISTNAME=	mikutter.3.5.15
+DISTNAME=	mikutter.3.6.0
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/./-/}
 CATEGORIES=	net
 MASTER_SITES=	http://mikutter.hachune.net/bin/
@@ -14,6 +14,7 @@ LICENSE=	mit AND cc-by-sa-v3.0
 .include "../../lang/ruby/rubyversion.mk"
 
 DEPENDS+=	${RUBY_PKGPREFIX}-pluggaloid>=1.1.1:../../net/ruby-pluggaloid
+DEPENDS+=	${RUBY_PKGPREFIX}-diva>=0.3.0:../../devel/ruby-diva
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gtk>=3.2.0:../../x11/ruby-gnome2-gtk
 DEPENDS+=	${RUBY_PKGPREFIX}-gettext>=3.0.1:../../devel/ruby-gettext
 DEPENDS+=	${RUBY_PKGPREFIX}-oauth>=0.5.1:../../security/ruby-oauth
@@ -26,7 +27,7 @@ DEPENDS+=	${RUBY_PKGPREFIX}-delayer-deferred>=2.0.0:../../devel/ruby-delayer-def
 DEPENDS+=	${RUBY_PKGPREFIX}-nokogiri-[0-9]*:../../textproc/ruby-nokogiri
 DEPENDS+=	${RUBY_PKGPREFIX}-httpclient-[0-9]*:../../www/ruby-httpclient
 DEPENDS+=	${RUBY_PKGPREFIX}-moneta>=0.7:../../databases/ruby-moneta
-DEPENDS+=	${RUBY_PKGPREFIX}-twitter-text>=1.14.6:../../net/ruby-twitter-text
+DEPENDS+=	${RUBY_PKGPREFIX}-twitter-text>=2.1.0:../../net/ruby-twitter-text
 
 WRKSRC=		${WRKDIR}/mikutter
 USE_LANGUAGES=	# none
diff --git a/net/mikutter/PLIST b/net/mikutter/PLIST
index 6f935261d02..1e9a90965cd 100644
--- a/net/mikutter/PLIST
+++ b/net/mikutter/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2017/11/12 16:27:23 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.39 2017/12/30 05:05:14 tsutsui Exp $
 bin/mikutter
 share/applications/mikutter.desktop
 share/doc/mikutter/README
@@ -15,64 +15,25 @@ share/mikutter/core/boot/shell/plugin_depends.rb
 share/mikutter/core/boot/shell/spec.rb
 share/mikutter/core/config.rb
 share/mikutter/core/configloader.rb
-share/mikutter/core/directmessage.rb
 share/mikutter/core/environment.rb
+share/mikutter/core/lib/diva_hacks.rb
+share/mikutter/core/lib/diva_hacks/entity.rb
+share/mikutter/core/lib/diva_hacks/entity/basic_twitter_entity.rb
+share/mikutter/core/lib/diva_hacks/entity/blank_entity.rb
+share/mikutter/core/lib/diva_hacks/entity/extended_twitter_entity.rb
+share/mikutter/core/lib/diva_hacks/entity/regexp_entity.rb
+share/mikutter/core/lib/diva_hacks/entity/segment.rb
+share/mikutter/core/lib/diva_hacks/entity/url_entity.rb
+share/mikutter/core/lib/diva_hacks/mixin.rb
+share/mikutter/core/lib/diva_hacks/mixin/message_mixin.rb
+share/mikutter/core/lib/diva_hacks/mixin/photo_mixin.rb
+share/mikutter/core/lib/diva_hacks/mixin/user_mixin.rb
+share/mikutter/core/lib/diva_hacks/model.rb
+share/mikutter/core/lib/diva_hacks/model/identity.rb
+share/mikutter/core/lib/diva_hacks/model/memory.rb
 share/mikutter/core/lib/lazy.rb
-share/mikutter/core/lib/mikutwitter.rb
-share/mikutter/core/lib/mikutwitter/api_call_support.rb
-share/mikutter/core/lib/mikutwitter/api_shortcuts.rb
-share/mikutter/core/lib/mikutwitter/authentication_failed_action.rb
-share/mikutter/core/lib/mikutwitter/basic.rb
-share/mikutter/core/lib/mikutwitter/cache.rb
-share/mikutter/core/lib/mikutwitter/connect.rb
-share/mikutter/core/lib/mikutwitter/error.rb
-share/mikutter/core/lib/mikutwitter/oauth_hacks.rb
-share/mikutter/core/lib/mikutwitter/query.rb
-share/mikutter/core/lib/mikutwitter/rate_limiting.rb
-share/mikutter/core/lib/mikutwitter/streaming_failed_actions.rb
-share/mikutter/core/lib/mikutwitter/test/154380989328662530.json
-share/mikutter/core/lib/mikutwitter/test/extension.rb
-share/mikutter/core/lib/mikutwitter/test/friendship.json
-share/mikutter/core/lib/mikutwitter/test/list_member.json
-share/mikutter/core/lib/mikutwitter/test/list_member_1380555359495881433.json
-share/mikutter/core/lib/mikutwitter/test/list_member_1380555797979069262.json
-share/mikutter/core/lib/mikutwitter/test/list_member_2.json
-share/mikutter/core/lib/mikutwitter/test/list_memberships.json
-share/mikutter/core/lib/mikutwitter/test/list_subscriptions.json
-share/mikutter/core/lib/mikutwitter/test/lists_all.json
-share/mikutter/core/lib/mikutwitter/test/search.json
-share/mikutter/core/lib/mikutwitter/test/status_show.json
-share/mikutter/core/lib/mikutwitter/test/status_update_duplicate.json
-share/mikutter/core/lib/mikutwitter/test/status_update_success.json
-share/mikutter/core/lib/mikutwitter/test/test_api_call_support.rb
-share/mikutter/core/lib/mikutwitter/test/test_api_shortcuts.rb
-share/mikutter/core/lib/mikutwitter/test/test_cache.rb
-share/mikutter/core/lib/mikutwitter/test/test_query.rb
-share/mikutter/core/lib/mikutwitter/test/test_streaming_failed_actions.rb
-share/mikutter/core/lib/mikutwitter/test/test_utils.rb
-share/mikutter/core/lib/mikutwitter/test/user.json
-share/mikutter/core/lib/mikutwitter/test/user_timeline.json
-share/mikutter/core/lib/mikutwitter/utils.rb
 share/mikutter/core/lib/piapro.rb
 share/mikutter/core/lib/reserver.rb
-share/mikutter/core/lib/retriever.rb
-share/mikutter/core/lib/retriever/cast.rb
-share/mikutter/core/lib/retriever/datasource.rb
-share/mikutter/core/lib/retriever/entity/basic_twitter_entity.rb
-share/mikutter/core/lib/retriever/entity/blank_entity.rb
-share/mikutter/core/lib/retriever/entity/extended_twitter_entity.rb
-share/mikutter/core/lib/retriever/entity/regexp_entity.rb
-share/mikutter/core/lib/retriever/entity/segment.rb
-share/mikutter/core/lib/retriever/entity/url_entity.rb
-share/mikutter/core/lib/retriever/error.rb
-share/mikutter/core/lib/retriever/field_generator.rb
-share/mikutter/core/lib/retriever/mixin/message_mixin.rb
-share/mikutter/core/lib/retriever/mixin/photo_mixin.rb
-share/mikutter/core/lib/retriever/mixin/user_mixin.rb
-share/mikutter/core/lib/retriever/model.rb
-share/mikutter/core/lib/retriever/model/identity.rb
-share/mikutter/core/lib/retriever/model/memory.rb
-share/mikutter/core/lib/retriever/spec.rb
 share/mikutter/core/lib/retriever/uri.rb
 share/mikutter/core/lib/test_unit_extensions.rb
 share/mikutter/core/lib/timelimitedqueue.rb
@@ -80,7 +41,6 @@ share/mikutter/core/lib/timelimitedqueue/test/test_timelimitedqueue.rb
 share/mikutter/core/lib/timelimitedqueue/timelimitedqueue.rb
 share/mikutter/core/lib/uithreadonly.rb
 share/mikutter/core/lib/weakstorage.rb
-share/mikutter/core/message.rb
 share/mikutter/core/miku/array.rb
 share/mikutter/core/miku/atom.rb
 share/mikutter/core/miku/cons.rb
@@ -121,6 +81,9 @@ share/mikutter/core/mui/gtk_contextmenu.rb
 share/mikutter/core/mui/gtk_crud.rb
 share/mikutter/core/mui/gtk_dark_matter_prification.rb
 share/mikutter/core/mui/gtk_extension.rb
+share/mikutter/core/mui/gtk_form_dsl.rb
+share/mikutter/core/mui/gtk_form_dsl_multi_select.rb
+share/mikutter/core/mui/gtk_form_dsl_select.rb
 share/mikutter/core/mui/gtk_hierarchycal_selectbox.rb
 share/mikutter/core/mui/gtk_inneruserlist.rb
 share/mikutter/core/mui/gtk_intelligent_textview.rb
@@ -203,7 +166,6 @@ share/mikutter/core/plugin/bugreport/po/zh_TW/bugreport.po
 share/mikutter/core/plugin/change_account/.mikutter.yml
 share/mikutter/core/plugin/change_account/account_control.rb
 share/mikutter/core/plugin/change_account/change_account.rb
-share/mikutter/core/plugin/change_account/interactive.rb
 share/mikutter/core/plugin/change_account/po/ar/change_account.po
 share/mikutter/core/plugin/change_account/po/de/change_account.po
 share/mikutter/core/plugin/change_account/po/el/change_account.po
@@ -219,6 +181,9 @@ share/mikutter/core/plugin/change_account/po/vi/change_account.po
 share/mikutter/core/plugin/change_account/po/zh/change_account.po
 share/mikutter/core/plugin/change_account/po/zh_CN/change_account.po
 share/mikutter/core/plugin/change_account/po/zh_TW/change_account.po
+share/mikutter/core/plugin/change_account/world_generator.rb
+share/mikutter/core/plugin/change_account/world_generator/controller.rb
+share/mikutter/core/plugin/change_account/world_generator/window.rb
 share/mikutter/core/plugin/command/.mikutter.yml
 share/mikutter/core/plugin/command/command.rb
 share/mikutter/core/plugin/command/conditions.rb
@@ -256,7 +221,6 @@ share/mikutter/core/plugin/console/po/zh/console.po
 share/mikutter/core/plugin/console/po/zh_CN/console.po
 share/mikutter/core/plugin/console/po/zh_TW/console.po
 share/mikutter/core/plugin/core/.mikutter.yml
-share/mikutter/core/plugin/core/configuration.json
 share/mikutter/core/plugin/core/core.rb
 share/mikutter/core/plugin/direct_message/.mikutter.yml
 share/mikutter/core/plugin/direct_message/direct_message.rb
@@ -298,6 +262,8 @@ share/mikutter/core/plugin/extract/.mikutter.yml
 share/mikutter/core/plugin/extract/edit_window.rb
 share/mikutter/core/plugin/extract/extract.rb
 share/mikutter/core/plugin/extract/extract_tab_list.rb
+share/mikutter/core/plugin/extract/model/setting.rb
+share/mikutter/core/plugin/extract/option_widget.rb
 share/mikutter/core/plugin/extract/po/ar/extract.po
 share/mikutter/core/plugin/extract/po/de/extract.po
 share/mikutter/core/plugin/extract/po/el/extract.po
@@ -319,8 +285,8 @@ share/mikutter/core/plugin/followingcontrol/.mikutter.yml
 share/mikutter/core/plugin/followingcontrol/followingcontrol.rb
 share/mikutter/core/plugin/gtk/.mikutter.yml
 share/mikutter/core/plugin/gtk/Gemfile
-share/mikutter/core/plugin/gtk/account_box.rb
 share/mikutter/core/plugin/gtk/delayer.rb
+share/mikutter/core/plugin/gtk/dialog_window.rb
 share/mikutter/core/plugin/gtk/gtk.rb
 share/mikutter/core/plugin/gtk/konami_watcher.rb
 share/mikutter/core/plugin/gtk/mainloop.rb
@@ -345,6 +311,7 @@ share/mikutter/core/plugin/gtk/slug_dictionary.rb
 share/mikutter/core/plugin/gtk/tab_container.rb
 share/mikutter/core/plugin/gtk/tab_toolbar.rb
 share/mikutter/core/plugin/gtk/toolbar_generator.rb
+share/mikutter/core/plugin/gtk/world_shifter.rb
 share/mikutter/core/plugin/gui/.mikutter.yml
 share/mikutter/core/plugin/gui/cluster.rb
 share/mikutter/core/plugin/gui/command.rb
@@ -382,6 +349,9 @@ share/mikutter/core/plugin/gui/test/test_widget.rb
 share/mikutter/core/plugin/gui/timeline.rb
 share/mikutter/core/plugin/gui/widget.rb
 share/mikutter/core/plugin/gui/window.rb
+share/mikutter/core/plugin/guide/.mikutter.yml
+share/mikutter/core/plugin/guide/guide.rb
+share/mikutter/core/plugin/guide/interactive.rb
 share/mikutter/core/plugin/home_timeline/.mikutter.yml
 share/mikutter/core/plugin/home_timeline/home_timeline.rb
 share/mikutter/core/plugin/home_timeline/po/ar/home_timeline.po
@@ -577,6 +547,7 @@ share/mikutter/core/plugin/search/po/vi/search.po
 share/mikutter/core/plugin/search/po/zh/search.po
 share/mikutter/core/plugin/search/po/zh_CN/search.po
 share/mikutter/core/plugin/search/po/zh_TW/search.po
+share/mikutter/core/plugin/search/query_box.rb
 share/mikutter/core/plugin/search/search.rb
 share/mikutter/core/plugin/set_input/.mikutter.yml
 share/mikutter/core/plugin/set_input/po/ar/set_input.po
@@ -614,9 +585,9 @@ share/mikutter/core/plugin/set_view/po/zh_TW/set_view.po
 share/mikutter/core/plugin/set_view/set_view.rb
 share/mikutter/core/plugin/settings/.mikutter.yml
 share/mikutter/core/plugin/settings/basic_settings.rb
-share/mikutter/core/plugin/settings/builder.rb
 share/mikutter/core/plugin/settings/listener.rb
-share/mikutter/core/plugin/settings/multiselect.rb
+share/mikutter/core/plugin/settings/menu.rb
+share/mikutter/core/plugin/settings/phantom.rb
 share/mikutter/core/plugin/settings/po/ar/settings.po
 share/mikutter/core/plugin/settings/po/de/settings.po
 share/mikutter/core/plugin/settings/po/el/settings.po
@@ -632,7 +603,7 @@ share/mikutter/core/plugin/settings/po/vi/settings.po
 share/mikutter/core/plugin/settings/po/zh/settings.po
 share/mikutter/core/plugin/settings/po/zh_CN/settings.po
 share/mikutter/core/plugin/settings/po/zh_TW/settings.po
-share/mikutter/core/plugin/settings/select.rb
+share/mikutter/core/plugin/settings/setting_dsl.rb
 share/mikutter/core/plugin/settings/settings.rb
 share/mikutter/core/plugin/settings/test_listener.rb
 share/mikutter/core/plugin/shortcutkey/.mikutter.yml
@@ -692,6 +663,10 @@ share/mikutter/core/plugin/sound/po/zh/sound.po
 share/mikutter/core/plugin/sound/po/zh_CN/sound.po
 share/mikutter/core/plugin/sound/po/zh_TW/sound.po
 share/mikutter/core/plugin/sound/sound.rb
+share/mikutter/core/plugin/spell/.mikutter.yml
+share/mikutter/core/plugin/spell/error.rb
+share/mikutter/core/plugin/spell/spell.rb
+share/mikutter/core/plugin/spell/struct.rb
 share/mikutter/core/plugin/streaming/.mikutter.yml
 share/mikutter/core/plugin/streaming/filter.rb
 share/mikutter/core/plugin/streaming/perma_streamer.rb
@@ -715,6 +690,54 @@ share/mikutter/core/plugin/streaming_connection_status/streaming_connection_stat
 share/mikutter/core/plugin/tco/.mikutter.yml
 share/mikutter/core/plugin/tco/tco.rb
 share/mikutter/core/plugin/template
+share/mikutter/core/plugin/twitter/.mikutter.yml
+share/mikutter/core/plugin/twitter/builder.rb
+share/mikutter/core/plugin/twitter/configuration.json
+share/mikutter/core/plugin/twitter/mikutwitter.rb
+share/mikutter/core/plugin/twitter/mikutwitter/api_call_support.rb
+share/mikutter/core/plugin/twitter/mikutwitter/api_shortcuts.rb
+share/mikutter/core/plugin/twitter/mikutwitter/authentication_failed_action.rb
+share/mikutter/core/plugin/twitter/mikutwitter/basic.rb
+share/mikutter/core/plugin/twitter/mikutwitter/cache.rb
+share/mikutter/core/plugin/twitter/mikutwitter/connect.rb
+share/mikutter/core/plugin/twitter/mikutwitter/error.rb
+share/mikutter/core/plugin/twitter/mikutwitter/oauth_hacks.rb
+share/mikutter/core/plugin/twitter/mikutwitter/query.rb
+share/mikutter/core/plugin/twitter/mikutwitter/rate_limiting.rb
+share/mikutter/core/plugin/twitter/mikutwitter/streaming_failed_actions.rb
+share/mikutter/core/plugin/twitter/mikutwitter/test/154380989328662530.json
+share/mikutter/core/plugin/twitter/mikutwitter/test/extension.rb
+share/mikutter/core/plugin/twitter/mikutwitter/test/friendship.json
+share/mikutter/core/plugin/twitter/mikutwitter/test/list_member.json
+share/mikutter/core/plugin/twitter/mikutwitter/test/list_member_1380555359495881433.json
+share/mikutter/core/plugin/twitter/mikutwitter/test/list_member_1380555797979069262.json
+share/mikutter/core/plugin/twitter/mikutwitter/test/list_member_2.json
+share/mikutter/core/plugin/twitter/mikutwitter/test/list_memberships.json
+share/mikutter/core/plugin/twitter/mikutwitter/test/list_subscriptions.json
+share/mikutter/core/plugin/twitter/mikutwitter/test/lists_all.json
+share/mikutter/core/plugin/twitter/mikutwitter/test/search.json
+share/mikutter/core/plugin/twitter/mikutwitter/test/status_show.json
+share/mikutter/core/plugin/twitter/mikutwitter/test/status_update_duplicate.json
+share/mikutter/core/plugin/twitter/mikutwitter/test/status_update_success.json
+share/mikutter/core/plugin/twitter/mikutwitter/test/test_api_call_support.rb
+share/mikutter/core/plugin/twitter/mikutwitter/test/test_api_shortcuts.rb
+share/mikutter/core/plugin/twitter/mikutwitter/test/test_cache.rb
+share/mikutter/core/plugin/twitter/mikutwitter/test/test_query.rb
+share/mikutter/core/plugin/twitter/mikutwitter/test/test_streaming_failed_actions.rb
+share/mikutter/core/plugin/twitter/mikutwitter/test/test_utils.rb
+share/mikutter/core/plugin/twitter/mikutwitter/test/user.json
+share/mikutter/core/plugin/twitter/mikutwitter/test/user_timeline.json
+share/mikutter/core/plugin/twitter/mikutwitter/utils.rb
+share/mikutter/core/plugin/twitter/model.rb
+share/mikutter/core/plugin/twitter/model/directmessage.rb
+share/mikutter/core/plugin/twitter/model/message.rb
+share/mikutter/core/plugin/twitter/model/user.rb
+share/mikutter/core/plugin/twitter/model/userlist.rb
+share/mikutter/core/plugin/twitter/model/world.rb
+share/mikutter/core/plugin/twitter/test/test_message.rb
+share/mikutter/core/plugin/twitter/test/test_user.rb
+share/mikutter/core/plugin/twitter/test/test_userlist.rb
+share/mikutter/core/plugin/twitter/twitter.rb
 share/mikutter/core/plugin/uitranslator/.mikutter.yml
 share/mikutter/core/plugin/uitranslator/Gemfile
 share/mikutter/core/plugin/uitranslator/uitranslator.rb
@@ -736,12 +759,16 @@ share/mikutter/core/plugin/user_detail_view/user_detail_view.rb
 share/mikutter/core/plugin/web/.mikutter.yml
 share/mikutter/core/plugin/web/model/web.rb
 share/mikutter/core/plugin/web/web.rb
-share/mikutter/core/retriever.rb
+share/mikutter/core/plugin/world/.mikutter.yml
+share/mikutter/core/plugin/world/error.rb
+share/mikutter/core/plugin/world/keep.rb
+share/mikutter/core/plugin/world/model/zombie.rb
+share/mikutter/core/plugin/world/service.rb
+share/mikutter/core/plugin/world/world.rb
 share/mikutter/core/serialthread.rb
-share/mikutter/core/service.rb
-share/mikutter/core/service_keeper.rb
 share/mikutter/core/skin.rb
 share/mikutter/core/skin/data/activity.png
+share/mikutter/core/skin/data/add.png
 share/mikutter/core/skin/data/arrow_followed.png
 share/mikutter/core/skin/data/arrow_following.png
 share/mikutter/core/skin/data/arrow_notfollowed.png
@@ -803,9 +830,7 @@ share/mikutter/core/skin/data/verified.png
 share/mikutter/core/system/message.rb
 share/mikutter/core/system/system.rb
 share/mikutter/core/system/user.rb
-share/mikutter/core/user.rb
 share/mikutter/core/userconfig.rb
-share/mikutter/core/userlist.rb
 share/mikutter/core/utils.rb
 share/mikutter/devel/ABOUTCHI
 share/mikutter/devel/chiskel/core/config.rb
diff --git a/net/mikutter/distinfo b/net/mikutter/distinfo
index 6e1d8915b3b..57c740833a6 100644
--- a/net/mikutter/distinfo
+++ b/net/mikutter/distinfo
@@ -1,15 +1,13 @@
-$NetBSD: distinfo,v 1.134 2017/11/19 12:57:11 tsutsui Exp $
+$NetBSD: distinfo,v 1.135 2017/12/30 05:05:14 tsutsui Exp $
 
-SHA1 (mikutter.3.5.15.tar.gz) = 611bcaa238244daaeaf9c9da35e5a24b5336abfe
-RMD160 (mikutter.3.5.15.tar.gz) = c32bd99b8e1f047e4452b3b68066417bafe84a98
-SHA512 (mikutter.3.5.15.tar.gz) = 7c2a3cb7d9f1544d56c9543b87b49203aa81b219296b4776b03ef1234751abab2a73c45ec2a2c97eab62c212ec5af815b85f4127f053e06db2d294a48e45e800
-Size (mikutter.3.5.15.tar.gz) = 2859822 bytes
-SHA1 (patch-Gemfile) = 5bd004f83aecd41ca80e08112b1f4212a320c0e4
-SHA1 (patch-core_boot_delayer.rb) = 3070cd4966c509a2bb722d4baabcc1a7e7026b30
-SHA1 (patch-core_lib_mikutwitter_api__shortcuts.rb) = 36c96889e65ff312aa4e854509edfd0e75c59dd0
+SHA1 (mikutter.3.6.0.tar.gz) = 8dd1b52e8fe00bdc7d1ac1c25c3a8fa16d91ff8c
+RMD160 (mikutter.3.6.0.tar.gz) = 40d493d2660ba3e5af92a522fd4cd03d7949dd14
+SHA512 (mikutter.3.6.0.tar.gz) = 99d7f4fe8f3deea1027206664b6e482657df750c0b46219fafe519432e5e571827e2a63a831678db1aa42d8861937e566b9444885d06a56c3fcdf4803ec1c944
+Size (mikutter.3.6.0.tar.gz) = 2899397 bytes
 SHA1 (patch-core_mui_gtk__inneruserlist.rb) = 552338b5029ca6236993b2c75f892a2b9fd64d2d
 SHA1 (patch-core_mui_gtk__userlist.rb) = fc7a2d850e7e9ab4d5716c2534f991afbda88a7e
 SHA1 (patch-core_plugin_libnotify_rnotify.rb) = 0bb5630f4411d11ad188c722fb1d14e2d6748d17
 SHA1 (patch-core_plugin_photo__support_Gemfile) = 754b96024904e2e2f55c83e88fd3c763eecf723c
 SHA1 (patch-core_plugin_photo__support_photo__support.rb) = 182135fc0b46035c343c746ddba091d71cdc81f4
-SHA1 (patch-mikutter.rb) = b82a38101b94d9f00a998965b02f05ee3947fc73
+SHA1 (patch-core_plugin_twitter_mikutwitter_api__shortcuts.rb) = 3742017931e18e4e1c97154b919cf00ddaed474f
+SHA1 (patch-mikutter.rb) = 2d0cd0b9bb168a6b033fcdea1f1b71d57f39f331
diff --git a/net/mikutter/patches/patch-Gemfile b/net/mikutter/patches/patch-Gemfile
deleted file mode 100644
index 0ff1b23496c..00000000000
--- a/net/mikutter/patches/patch-Gemfile
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Gemfile,v 1.3 2017/08/26 11:57:49 tsutsui Exp $
-
-- use delayer-deferred 2.0.x for upstream ticket #995
-  https://dev.mikutter.hachune.net/issues/995
-
---- Gemfile.orig	2017-08-26 09:06:46.000000000 +0000
-+++ Gemfile
-@@ -16,7 +16,7 @@ group :default do
-   gem 'typed-array', '~> 0.1'
-   gem 'delayer', '~> 0.0'
-   gem 'pluggaloid', '>= 1.1.1', '< 2.0'
--  gem 'delayer-deferred', '>= 1.0.4', '< 1.1'
-+  gem 'delayer-deferred', '>= 2.0', '< 3.0'
-   gem 'twitter-text', '>= 1.14.6'
- end
- 
diff --git a/net/mikutter/patches/patch-core_boot_delayer.rb b/net/mikutter/patches/patch-core_boot_delayer.rb
deleted file mode 100644
index 9f7f330ad32..00000000000
--- a/net/mikutter/patches/patch-core_boot_delayer.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-core_boot_delayer.rb,v 1.1 2017/06/10 09:45:33 tsutsui Exp $
-
-- pull fix to use delayer-deferred 2.x for upstream ticket #995
-  https://dev.mikutter.hachune.net/issues/995
-
---- core/boot/delayer.rb.orig	2017-06-10 01:11:51.000000000 +0000
-+++ core/boot/delayer.rb
-@@ -13,7 +13,7 @@ Delayer.default = Delayer.generate_class
- 
- Deferred = Delayer::Deferred::Deferred
- 
--module Delayer::Deferred::Deferredable
-+module Delayer::Deferred::Deferredable::Chainable
-   # エラーをキャッチして、うまい具合にmikutterに表示する。
-   # このあとにdeferredをくっつけることもできるが、基本的にはdeferredチェインの終了の時に使う。
-   # なお、terminateは受け取ったエラーを再度発生させるので、terminateでエラーを処理した後に特別なエラー処理を挟むこともできる
-@@ -23,7 +23,7 @@ module Delayer::Deferred::Deferredable
-   # ==== Return
-   # Deferred
-   def terminate(message = nil, &message_generator)
--    self.trap{|exception|
-+    defer = self.trap{|exception|
-       message = message_generator.call(exception) if message_generator
-       case exception
-       when MikuTwitter::RateLimitError
-@@ -35,6 +35,13 @@ module Delayer::Deferred::Deferredable
-       else
-         begin
-           notice exception
-+          if Mopt.debug
-+            if command_exist?('dot')
-+              notice "[[#{defer.graph_draw}]]"
-+            else
-+              notice defer.graph
-+            end
-+          end
-           if(message)
-             if(exception.is_a?(Net::HTTPResponse))
-               Plugin.activity :error, "#{message} (#{exception.code} #{exception.body})"
diff --git a/net/mikutter/patches/patch-core_lib_mikutwitter_api__shortcuts.rb b/net/mikutter/patches/patch-core_plugin_twitter_mikutwitter_api__shortcuts.rb
index 26088547f55..0cb35a90fdd 100644
--- a/net/mikutter/patches/patch-core_lib_mikutwitter_api__shortcuts.rb
+++ b/net/mikutter/patches/patch-core_plugin_twitter_mikutwitter_api__shortcuts.rb
@@ -1,10 +1,10 @@
-$NetBSD: patch-core_lib_mikutwitter_api__shortcuts.rb,v 1.1 2017/06/10 09:45:33 tsutsui Exp $
+$NetBSD: patch-core_plugin_twitter_mikutwitter_api__shortcuts.rb,v 1.1 2017/12/30 05:05:14 tsutsui Exp $
 
 - pull upstream fixes for ticket #916
   https://dev.mikutter.hachune.net/issues/916
 
---- core/lib/mikutwitter/api_shortcuts.rb.orig	2017-06-10 01:11:51.000000000 +0000
-+++ core/lib/mikutwitter/api_shortcuts.rb
+--- core/plugin/twitter/mikutwitter/api_shortcuts.rb.orig	2017-12-22 15:08:27.000000000 +0000
++++ core/plugin/twitter/mikutwitter/api_shortcuts.rb
 @@ -52,10 +52,10 @@ module MikuTwitter::APIShortcuts
    defcursorpager :followers_id, 'followers/ids', :paged_ids, :ids, id: :user_id
  
@@ -18,7 +18,7 @@ $NetBSD: patch-core_lib_mikutwitter_api__shortcuts.rb,v 1.1 2017/06/10 09:45:33
  
    def direct_messages(args = {})
      (self/:direct_messages).direct_messages({:count => 200}.merge(args)) end
-@@ -258,21 +258,30 @@ module MikuTwitter::APIShortcuts
+@@ -260,21 +260,30 @@ module MikuTwitter::APIShortcuts
          cursor_pager(api, parser, key, args.merge(cursor: res[:next_cursor])).next{ |nex|
            res[key] + nex } end } end
  
@@ -27,7 +27,7 @@ $NetBSD: patch-core_lib_mikutwitter_api__shortcuts.rb,v 1.1 2017/06/10 09:45:33
 -      promise = Deferred.new(true)
 -      Thread.new{
 -        begin
--          promise.call(User.findbyid(ids))
+-          promise.call(Plugin::Twitter::User.findbyid(ids))
 -        rescue Exception => e
 -          promise.fail(e) end }
 -      promise.next{ |users|
@@ -40,7 +40,7 @@ $NetBSD: patch-core_lib_mikutwitter_api__shortcuts.rb,v 1.1 2017/06/10 09:45:33
 +      detected = {}           # {id => User}
 +      lookups = Set.new       # [id]
 +      ids.each do |id|
-+        user = User.findbyid(id, Retriever::DataSource::USE_LOCAL_ONLY)
++        user = Plugin::Twitter::User.findbyid(id, Diva::DataSource::USE_LOCAL_ONLY)
 +        if user.is_a? User
 +          detected[id] = user
          else
diff --git a/net/mikutter/patches/patch-mikutter.rb b/net/mikutter/patches/patch-mikutter.rb
index a8c1925bd97..4350b12942e 100644
--- a/net/mikutter/patches/patch-mikutter.rb
+++ b/net/mikutter/patches/patch-mikutter.rb
@@ -1,9 +1,7 @@
-$NetBSD: patch-mikutter.rb,v 1.4 2017/06/10 09:45:33 tsutsui Exp $
+$NetBSD: patch-mikutter.rb,v 1.5 2017/12/30 05:05:14 tsutsui Exp $
 
 - pkgsrc can handle location of ruby binary
   https://dev.mikutter.hachune.net/issues/889
-- pull fix to use delayer-deferred 2.x for upstream ticket #995
-  https://dev.mikutter.hachune.net/issues/995
 
 --- mikutter.rb.orig	2017-06-10 01:11:51.000000000 +0000
 +++ mikutter.rb
@@ -16,32 +14,3 @@ $NetBSD: patch-mikutter.rb,v 1.4 2017/06/10 09:45:33 tsutsui Exp $
  =begin rdoc
  = mikutter - the moest twitter client
  Copyright (C) 2009-2017 Toshiaki Asai
-@@ -68,12 +66,12 @@ def boot!(profile)
-   rescue => exception
-     into_debug_mode(exception)
-     notice "catch exception `#{exception.class}'"
--    raise exception
-+    raise
-   rescue Exception => exception
-     notice "catch exception `#{exception.class}'"
-     exception = Mainloop.exception_filter(exception)
-     notice "=> `#{exception.class}'"
--    raise exception end
-+    raise end
-   exception = Mainloop.exception_filter(nil)
-   if exception
-     notice "raise mainloop exception `#{exception.class}'"
-@@ -82,6 +80,13 @@ def boot!(profile)
- 
- def error_handling!(exception)
-   notice "catch #{exception.class}"
-+  if Mopt.debug && exception.respond_to?(:deferred) && exception.deferred
-+    if command_exist?('dot')
-+      notice "[[#{exception.deferred.graph_draw}]]"
-+    else
-+      notice exception.deferred.graph
-+    end
-+  end
-   File.open(File.expand_path(File.join(Environment::TMPDIR, 'crashed_exception')), 'w'){ |io| Marshal.dump(exception, io) }
-   raise exception end
-