Update mikutter to 0.1.0.697, switch to new unstable release.

5 files changed, 77 insertions, 23 deletions

diff --git a/net/mikutter/Makefile b/net/mikutter/Makefile
index b53f161c941..7dc4ac13351 100644
--- a/net/mikutter/Makefile
+++ b/net/mikutter/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2012/02/29 07:53:29 obache Exp $
+# $NetBSD: Makefile,v 1.38 2012/03/02 06:34:35 obache Exp $
 #
 
-DISTNAME=	mikutter.0.0.4.690
+DISTNAME=	mikutter.0.1.0.697
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/./-/}
 CATEGORIES=	net
 MASTER_SITES=	http://mikutter.hachune.net/bin/
@@ -13,6 +13,8 @@ LICENSE=	gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+RUBY_VERSION_SUPPORTED=	19
+
 .include "../../lang/ruby/rubyversion.mk"
 
 DEPENDS+=	xdg-utils-[0-9]*:../../misc/xdg-utils
diff --git a/net/mikutter/PLIST b/net/mikutter/PLIST
index 1e7e227038c..bcb156d94c6 100644
--- a/net/mikutter/PLIST
+++ b/net/mikutter/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.11 2011/11/06 07:49:38 obache Exp $
+@comment $NetBSD: PLIST,v 1.12 2012/03/02 06:34:35 obache Exp $
 bin/mikutter
 share/applications/mikutter.desktop
 share/doc/mikutter/README
 share/mikutter/core/addon/addon.rb
 share/mikutter/core/addon/alsa/alsa.rb
+share/mikutter/core/addon/api_request_file_cache.rb
+share/mikutter/core/addon/aspectframe/aspectframe.rb
 share/mikutter/core/addon/bitly/bitly.rb
 share/mikutter/core/addon/bitly/test.bitly.rb
 share/mikutter/core/addon/bugreport.rb
@@ -16,7 +18,10 @@ share/mikutter/core/addon/directmessage/userlist.rb
 share/mikutter/core/addon/extract.rb
 share/mikutter/core/addon/followingcontrol.rb
 share/mikutter/core/addon/friend_timeline.rb
+share/mikutter/core/addon/image_file_cache/image_file_cache.rb
 share/mikutter/core/addon/libnotify/libnotify.rb
+share/mikutter/core/addon/libnotify/notify-send.rb
+share/mikutter/core/addon/libnotify/rnotify.rb
 share/mikutter/core/addon/list/list.rb
 share/mikutter/core/addon/list/liststream.rb
 share/mikutter/core/addon/mentions.rb
@@ -25,6 +30,7 @@ share/mikutter/core/addon/openimg/openimg.rb
 share/mikutter/core/addon/openimg/pattern_file.json
 share/mikutter/core/addon/profile.rb
 share/mikutter/core/addon/proxy/proxy.rb
+share/mikutter/core/addon/rest/rest.rb
 share/mikutter/core/addon/search.rb
 share/mikutter/core/addon/set_input.rb
 share/mikutter/core/addon/set_view.rb
@@ -40,6 +46,9 @@ share/mikutter/core/addon/streaming.rb
 share/mikutter/core/addon/tco/tco.rb
 share/mikutter/core/addon/tco/test_tco.rb
 share/mikutter/core/autotag.rb
+share/mikutter/core/boot/check_config_permission.rb
+share/mikutter/core/boot/load_plugin.rb
+share/mikutter/core/boot/option.rb
 share/mikutter/core/chi.rb
 share/mikutter/core/config.rb
 share/mikutter/core/configloader.rb
@@ -48,8 +57,46 @@ share/mikutter/core/entity.rb
 share/mikutter/core/environment.rb
 share/mikutter/core/image.rb
 share/mikutter/core/initialize.rb
+share/mikutter/core/lib/deferred.rb
+share/mikutter/core/lib/deferred/deferred.rb
+share/mikutter/core/lib/deferred/deferredable.rb
+share/mikutter/core/lib/deferred/test.deferred.rb
 share/mikutter/core/lib/lazy.rb
 share/mikutter/core/lib/miku/escape.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/test/154380989328662530.json
+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_unauthorized.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/unauthorized.rb
+share/mikutter/core/lib/mikutwitter/utils.rb
 share/mikutter/core/lib/piapro.rb
 share/mikutter/core/lib/reserver.rb
 share/mikutter/core/lib/test_unit_extensions.rb
@@ -105,14 +152,19 @@ share/mikutter/core/mui/gtk_selectbox.rb
 share/mikutter/core/mui/gtk_skin.rb
 share/mikutter/core/mui/gtk_timeline_utils.rb
 share/mikutter/core/mui/gtk_userlist.rb
+share/mikutter/core/mui/gtk_web_image_loader.rb
+share/mikutter/core/mui/gtk_web_image_loader_image_cache.rb
+share/mikutter/core/mui/gtk_web_image_loader_image_cache_pixbuf.rb
+share/mikutter/core/mui/gtk_web_image_loader_image_cache_raw.rb
 share/mikutter/core/mui/gtk_webicon.rb
 share/mikutter/core/plugin.rb
 share/mikutter/core/plugin/ChangeLog
+share/mikutter/core/plugin/core.rb
 share/mikutter/core/plugin/gui.rb
 share/mikutter/core/plugin/template
-share/mikutter/core/post.rb
 share/mikutter/core/retriever.rb
 share/mikutter/core/serialthread.rb
+share/mikutter/core/service.rb
 share/mikutter/core/skin/data/close.png
 share/mikutter/core/skin/data/etc.png
 share/mikutter/core/skin/data/fav.png
@@ -154,22 +206,22 @@ share/mikutter/core/skin/data/tab-bg.png
 share/mikutter/core/skin/data/timeline.png
 share/mikutter/core/skin/data/underconstruction.png
 share/mikutter/core/skin/data/unfav.png
+share/mikutter/core/test/icon_test.png
+share/mikutter/core/test/test_cairo_markup_generator.rb
 share/mikutter/core/test/test_cairo_textselector.rb
 share/mikutter/core/test/test_entity.rb
+share/mikutter/core/test/test_gtk_webicon.rb
 share/mikutter/core/test/test_message.rb
 share/mikutter/core/test/test_messageconverters.rb
 share/mikutter/core/test/test_miquire.rb
 share/mikutter/core/test/test_plugin.rb
-share/mikutter/core/test/test_post.rb
 share/mikutter/core/test/test_retriever.rb
 share/mikutter/core/test/test_user.rb
 share/mikutter/core/test/test_utils.rb
-share/mikutter/core/twitter.rb
-share/mikutter/core/twitter_api.rb
+share/mikutter/core/test/test_web_image_loader.rb
 share/mikutter/core/user.rb
 share/mikutter/core/userconfig.rb
 share/mikutter/core/userlist.rb
 share/mikutter/core/utils.rb
-share/mikutter/core/watch.rb
 share/mikutter/mikutter.rb
 share/mikutter/plugin/WHATSTHIS
diff --git a/net/mikutter/distinfo b/net/mikutter/distinfo
index baca4aede9d..8a09b8cbda9 100644
--- a/net/mikutter/distinfo
+++ b/net/mikutter/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.34 2012/02/19 05:25:04 obache Exp $
+$NetBSD: distinfo,v 1.35 2012/03/02 06:34:35 obache Exp $
 
-SHA1 (mikutter.0.0.4.690.tar.gz) = 333ca9924f29adc352742fb46de3847d7e553042
-RMD160 (mikutter.0.0.4.690.tar.gz) = ea658fbdc6db85a9933b16a86fa62bd041751472
-Size (mikutter.0.0.4.690.tar.gz) = 2117444 bytes
-SHA1 (patch-core_mui_cairo__inner__tl.rb) = 58a55b857e35db0da3b5e72ede7dc9b1829efb6b
-SHA1 (patch-core_utils.rb) = f993f18a7e0f0cc8c4eb8e1ce380a94f78bc2e81
+SHA1 (mikutter.0.1.0.697.tar.gz) = 969fc45fe6bbe8bffe926a4ff84acbfac8ef5350
+RMD160 (mikutter.0.1.0.697.tar.gz) = d5a4eda55da4ac9a5d786361a7e61af2e5bae1ce
+Size (mikutter.0.1.0.697.tar.gz) = 2216193 bytes
+SHA1 (patch-core_mui_cairo__inner__tl.rb) = a91ddfc1c2ba0a86d4b05d4e18acc9034c800f57
+SHA1 (patch-core_utils.rb) = 62a4bdc0621b544dded13d952d0c95954b2c901b
diff --git a/net/mikutter/patches/patch-core_mui_cairo__inner__tl.rb b/net/mikutter/patches/patch-core_mui_cairo__inner__tl.rb
index c387cabc556..291a70ad8f9 100644
--- a/net/mikutter/patches/patch-core_mui_cairo__inner__tl.rb
+++ b/net/mikutter/patches/patch-core_mui_cairo__inner__tl.rb
@@ -1,8 +1,8 @@
-$NetBSD: patch-core_mui_cairo__inner__tl.rb,v 1.3 2011/11/06 07:49:38 obache Exp $
+$NetBSD: patch-core_mui_cairo__inner__tl.rb,v 1.4 2012/03/02 06:34:35 obache Exp $
 
 * use system bseach library instead of included one.
 
---- core/mui/cairo_inner_tl.rb.orig	2011-09-03 16:58:10.000000000 +0000
+--- core/mui/cairo_inner_tl.rb.orig	2012-02-13 14:45:50.000000000 +0000
 +++ core/mui/cairo_inner_tl.rb
 @@ -1,7 +1,7 @@
  # -*- coding: utf-8 -*-
@@ -11,5 +11,5 @@ $NetBSD: patch-core_mui_cairo__inner__tl.rb,v 1.3 2011/11/06 07:49:38 obache Exp
 -miquire :lib, 'ruby-bsearch-1.5/bsearch'
 +miquire :lib, 'bsearch'
  miquire :lib, 'uithreadonly'
+ require 'gtk2'
  
- class Gtk::TimeLine::InnerTL < Gtk::CRUD
diff --git a/net/mikutter/patches/patch-core_utils.rb b/net/mikutter/patches/patch-core_utils.rb
index be43e1c0c3c..0e94d724acd 100644
--- a/net/mikutter/patches/patch-core_utils.rb
+++ b/net/mikutter/patches/patch-core_utils.rb
@@ -1,13 +1,13 @@
-$NetBSD: patch-core_utils.rb,v 1.2 2011/11/06 07:49:38 obache Exp $
+$NetBSD: patch-core_utils.rb,v 1.3 2012/03/02 06:34:35 obache Exp $
 
 * use included escape library instead of system one.
 
---- core/utils.rb.orig	2011-10-02 11:08:04.000000000 +0000
+--- core/utils.rb.orig	2012-02-14 15:07:52.000000000 +0000
 +++ core/utils.rb
-@@ -35,7 +35,7 @@ if RUBY_VERSION >= '1.9.2'
-     $LOAD_PATH.push(File.expand_path(File.join(Dir.pwd, path)))
-   }
- end
+@@ -32,7 +32,7 @@ Dir::chdir(File::dirname(__FILE__))
+ ['.', 'lib', 'miku'].each{|path|
+   $LOAD_PATH.push(File.expand_path(File.join(Dir.pwd, path)))
+ }
 -miquire :lib, 'escape'
 +miquire :lib, 'miku/escape'
  miquire :lib, 'lazy'