- Update to 3.6.0

Submitted by:	Koichiro IWAO <meta+ports_AT_vmeta_DOT_jp>
PR:		224923

5 files changed, 105 insertions, 88 deletions

diff --git a/net-im/mikutter/Makefile b/net-im/mikutter/Makefile
index 81e7b911c1d3..bc3c43494788 100644
--- a/net-im/mikutter/Makefile
+++ b/net-im/mikutter/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mikutter
-PORTVERSION=	3.5.12
+PORTVERSION=	3.6.0
 CATEGORIES=	net-im ruby
 MASTER_SITES=	http://mikutter.hachune.net/bin/ \
 		LOCAL/tota/${PORTNAME}
@@ -18,7 +18,8 @@ RUN_DEPENDS=	rubygem-gtk2>=3.1.8:x11-toolkits/rubygem-gtk2 \
 		rubygem-cairo>=1.12.9:graphics/rubygem-cairo \
 		rubygem-addressable>=2.5.2:www/rubygem-addressable \
 		rubygem-delayer>=0.0.2:devel/rubygem-delayer \
-		rubygem-delayer-deferred>=1.0.4:devel/rubygem-delayer-deferred \
+		rubygem-delayer-deferred>=2.0.0:devel/rubygem-delayer-deferred \
+		rubygem-diva>=0.3.1:devel/rubygem-diva \
 		rubygem-gettext>=3.0.9:devel/rubygem-gettext \
 		rubygem-gio2>=3.1.0:devel/rubygem-gio2 \
 		rubygem-httpclient>=2.7.1:www/rubygem-httpclient \
diff --git a/net-im/mikutter/distinfo b/net-im/mikutter/distinfo
index 48e30da3a8d0..3351d513b061 100644
--- a/net-im/mikutter/distinfo
+++ b/net-im/mikutter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1507544651
-SHA256 (mikutter.3.5.12.tar.gz) = a953a9445d27d2ba869ccf0912489803033cc2b243d7d1c36aef44426ee5ad27
-SIZE (mikutter.3.5.12.tar.gz) = 2859323
+TIMESTAMP = 1515551387
+SHA256 (mikutter.3.6.0.tar.gz) = c9bec16f5b82873a59be079538192c0007359c612c0224b9c579dae18631e8c9
+SIZE (mikutter.3.6.0.tar.gz) = 2899397
diff --git a/net-im/mikutter/files/patch-core_mui_gtk__postbox.rb b/net-im/mikutter/files/patch-core_mui_gtk__postbox.rb
deleted file mode 100644
index 65e97c0859d7..000000000000
--- a/net-im/mikutter/files/patch-core_mui_gtk__postbox.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- core/mui/gtk_postbox.rb.orig	2017-10-08 12:29:16 UTC
-+++ core/mui/gtk_postbox.rb
-@@ -290,7 +290,7 @@ module Gtk
-     def remain_charcount
-       if not widget_post.destroyed?
-         text = trim_hidden_regions(widget_post.buffer.text + UserConfig[:footer])
--        Twitter::Extractor.extract_urls(text).map{|url|
-+        Twitter::TwitterText::Extractor.extract_urls(text).map{|url|
-           if url.length < posted_url_length(url)
-             -(posted_url_length(url) - url.length)
-           else
diff --git a/net-im/mikutter/files/patch-mikutter.rb b/net-im/mikutter/files/patch-mikutter.rb
index 3f09c45704d9..53dfd695b3cc 100644
--- a/net-im/mikutter/files/patch-mikutter.rb
+++ b/net-im/mikutter/files/patch-mikutter.rb
@@ -1,15 +1,15 @@
---- mikutter.rb.orig	2017-10-08 12:29:16 UTC
+--- mikutter.rb.orig	2017-12-24 15:00:56 UTC
 +++ mikutter.rb
-@@ -11,7 +11,7 @@ This software is released under the MIT 
- http://opensource.org/licenses/mit-license.php
- 
+@@ -13,7 +13,7 @@ http://opensource.org/licenses/mit-licen
  =end
+ module Mikutter; end
+ 
 -require_relative 'core/boot/option'
 +require_relative '%%RUBY_SITELIBDIR%%/mikutter/core/boot/option'
  Mopt.parse exec_command: true
  
  if !ENV['DISABLE_BUNDLER_SETUP'] || ['', '0'].include?(ENV['DISABLE_BUNDLER_SETUP'].to_s)
-@@ -31,7 +31,7 @@ require 'webrick'
+@@ -33,7 +33,7 @@ require 'webrick'
  require 'thread'
  require 'fileutils'
  
@@ -17,4 +17,4 @@
 +require_relative '%%RUBY_SITELIBDIR%%/mikutter/core/utils'
  
  miquire :boot, 'check_config_permission', 'mainloop', 'delayer'
- miquire :core, 'service', 'environment'
+ miquire :core, 'environment'
diff --git a/net-im/mikutter/pkg-plist b/net-im/mikutter/pkg-plist
index 8ebb4e4ec5be..5eb27a6fb61d 100644
--- a/net-im/mikutter/pkg-plist
+++ b/net-im/mikutter/pkg-plist
@@ -11,64 +11,25 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/boot/shell/spec.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/config.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/configloader.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/directmessage.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/environment.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/lib/diva_hacks.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/lib/diva_hacks/entity.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/lib/diva_hacks/entity/basic_twitter_entity.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/lib/diva_hacks/entity/blank_entity.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/lib/diva_hacks/entity/extended_twitter_entity.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/lib/diva_hacks/entity/regexp_entity.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/lib/diva_hacks/entity/segment.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/lib/diva_hacks/entity/url_entity.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/lib/diva_hacks/mixin.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/lib/diva_hacks/mixin/message_mixin.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/lib/diva_hacks/mixin/photo_mixin.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/lib/diva_hacks/mixin/user_mixin.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/lib/diva_hacks/model.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/lib/diva_hacks/model/identity.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/lib/diva_hacks/model/memory.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/lib/lazy.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/api_call_support.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/api_shortcuts.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/authentication_failed_action.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/basic.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/cache.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/connect.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/error.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/oauth_hacks.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/query.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/rate_limiting.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/streaming_failed_actions.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/test/154380989328662530.json
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/test/extension.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/test/friendship.json
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/test/list_member.json
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/test/list_member_1380555359495881433.json
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/test/list_member_1380555797979069262.json
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/test/list_member_2.json
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/test/list_memberships.json
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/test/list_subscriptions.json
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/test/lists_all.json
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/test/search.json
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/test/status_show.json
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/test/status_update_duplicate.json
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/test/status_update_success.json
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/test/test_api_call_support.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/test/test_api_shortcuts.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/test/test_cache.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/test/test_query.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/test/test_streaming_failed_actions.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/test/test_utils.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/test/user.json
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/test/user_timeline.json
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/utils.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/lib/piapro.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/lib/reserver.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/retriever.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/retriever/cast.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/retriever/datasource.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/retriever/entity/basic_twitter_entity.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/retriever/entity/blank_entity.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/retriever/entity/extended_twitter_entity.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/retriever/entity/regexp_entity.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/retriever/entity/segment.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/retriever/entity/url_entity.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/retriever/error.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/retriever/field_generator.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/retriever/mixin/message_mixin.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/retriever/mixin/photo_mixin.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/retriever/mixin/user_mixin.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/retriever/model.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/retriever/model/identity.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/retriever/model/memory.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/retriever/spec.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/lib/retriever/uri.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/lib/test_unit_extensions.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/lib/timelimitedqueue.rb
@@ -76,7 +37,6 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/lib/timelimitedqueue/timelimitedqueue.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/lib/uithreadonly.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/lib/weakstorage.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/message.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/miku/array.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/miku/atom.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/miku/cons.rb
@@ -117,6 +77,9 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/mui/gtk_crud.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/mui/gtk_dark_matter_prification.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/mui/gtk_extension.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/mui/gtk_form_dsl.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/mui/gtk_form_dsl_multi_select.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/mui/gtk_form_dsl_select.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/mui/gtk_hierarchycal_selectbox.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/mui/gtk_inneruserlist.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/mui/gtk_intelligent_textview.rb
@@ -199,7 +162,6 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/change_account/.mikutter.yml
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/change_account/account_control.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/change_account/change_account.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/plugin/change_account/interactive.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/change_account/po/ar/change_account.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/change_account/po/de/change_account.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/change_account/po/el/change_account.po
@@ -215,6 +177,9 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/change_account/po/zh/change_account.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/change_account/po/zh_CN/change_account.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/change_account/po/zh_TW/change_account.po
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/change_account/world_generator.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/change_account/world_generator/controller.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/change_account/world_generator/window.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/command/.mikutter.yml
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/command/command.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/command/conditions.rb
@@ -252,7 +217,6 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/console/po/zh_CN/console.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/console/po/zh_TW/console.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/core/.mikutter.yml
-%%RUBY_SITELIBDIR%%/mikutter/core/plugin/core/configuration.json
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/core/core.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/direct_message/.mikutter.yml
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/direct_message/direct_message.rb
@@ -294,6 +258,8 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/extract/edit_window.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/extract/extract.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/extract/extract_tab_list.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/extract/model/setting.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/extract/option_widget.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/extract/po/ar/extract.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/extract/po/de/extract.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/extract/po/el/extract.po
@@ -309,12 +275,14 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/extract/po/zh/extract.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/extract/po/zh_CN/extract.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/extract/po/zh_TW/extract.po
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/file_path/.mikutter.yml
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/file_path/file_path.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/followingcontrol/.mikutter.yml
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/followingcontrol/followingcontrol.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/gtk/.mikutter.yml
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/gtk/Gemfile
-%%RUBY_SITELIBDIR%%/mikutter/core/plugin/gtk/account_box.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/gtk/delayer.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/gtk/dialog_window.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/gtk/gtk.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/gtk/konami_watcher.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/gtk/mainloop.rb
@@ -339,6 +307,7 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/gtk/tab_container.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/gtk/tab_toolbar.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/gtk/toolbar_generator.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/gtk/world_shifter.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/gui/.mikutter.yml
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/gui/cluster.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/gui/command.rb
@@ -376,6 +345,9 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/gui/timeline.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/gui/widget.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/gui/window.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/guide/.mikutter.yml
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/guide/guide.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/guide/interactive.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/home_timeline/.mikutter.yml
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/home_timeline/home_timeline.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/home_timeline/po/ar/home_timeline.po
@@ -571,6 +543,7 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/search/po/zh/search.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/search/po/zh_CN/search.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/search/po/zh_TW/search.po
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/search/query_box.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/search/search.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/set_input/.mikutter.yml
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/set_input/po/ar/set_input.po
@@ -608,9 +581,9 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/set_view/set_view.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/settings/.mikutter.yml
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/settings/basic_settings.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/plugin/settings/builder.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/settings/listener.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/plugin/settings/multiselect.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/settings/menu.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/settings/phantom.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/settings/po/ar/settings.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/settings/po/de/settings.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/settings/po/el/settings.po
@@ -626,7 +599,7 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/settings/po/zh/settings.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/settings/po/zh_CN/settings.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/settings/po/zh_TW/settings.po
-%%RUBY_SITELIBDIR%%/mikutter/core/plugin/settings/select.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/settings/setting_dsl.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/settings/settings.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/settings/test_listener.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/shortcutkey/.mikutter.yml
@@ -686,6 +659,10 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/sound/po/zh_CN/sound.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/sound/po/zh_TW/sound.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/sound/sound.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/spell/.mikutter.yml
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/spell/error.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/spell/spell.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/spell/struct.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/streaming/.mikutter.yml
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/streaming/filter.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/streaming/perma_streamer.rb
@@ -709,6 +686,54 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/tco/.mikutter.yml
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/tco/tco.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/template
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/.mikutter.yml
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/builder.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/configuration.json
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/api_call_support.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/api_shortcuts.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/authentication_failed_action.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/basic.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/cache.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/connect.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/error.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/oauth_hacks.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/query.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/rate_limiting.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/streaming_failed_actions.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/test/154380989328662530.json
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/test/extension.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/test/friendship.json
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/test/list_member.json
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/test/list_member_1380555359495881433.json
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/test/list_member_1380555797979069262.json
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/test/list_member_2.json
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/test/list_memberships.json
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/test/list_subscriptions.json
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/test/lists_all.json
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/test/search.json
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/test/status_show.json
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/test/status_update_duplicate.json
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/test/status_update_success.json
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/test/test_api_call_support.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/test/test_api_shortcuts.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/test/test_cache.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/test/test_query.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/test/test_streaming_failed_actions.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/test/test_utils.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/test/user.json
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/test/user_timeline.json
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/mikutwitter/utils.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/model.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/model/directmessage.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/model/message.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/model/user.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/model/userlist.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/model/world.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/test/test_message.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/test/test_user.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/test/test_userlist.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/twitter/twitter.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/uitranslator/.mikutter.yml
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/uitranslator/Gemfile
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/uitranslator/uitranslator.rb
@@ -730,12 +755,16 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/web/.mikutter.yml
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/web/model/web.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/web/web.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/retriever.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/world/.mikutter.yml
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/world/error.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/world/keep.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/world/model/zombie.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/world/service.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/world/world.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/serialthread.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/service.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/service_keeper.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/skin.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/activity.png
+%%RUBY_SITELIBDIR%%/mikutter/core/skin/data/add.png
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/arrow_followed.png
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/arrow_following.png
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/arrow_notfollowed.png
@@ -797,9 +826,7 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/system/message.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/system/system.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/system/user.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/user.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/userconfig.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/userlist.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/utils.rb
 %%RUBY_SITELIBDIR%%/mikutter/plugin/WHATSTHIS
 share/applications/mikutter.desktop