Update mikutter to 0.2.2.1230.

New features in 0.2.2:
* add `achivement'
* improve shortcut key setting UI
* add experimental daemon mode
* get fav/retweet with API

5 files changed, 36 insertions, 54 deletions

diff --git a/net/mikutter/DESCR b/net/mikutter/DESCR
index 2c2f56a5759..71e2ec04587 100644
--- a/net/mikutter/DESCR
+++ b/net/mikutter/DESCR
@@ -1 +1,2 @@
-Mikutter is kichigai user's too teokure revolution.
+Mikutter is a Twitter client aim for endsville Twitter client For all of
+Miku-aholics and Twitter-holics.
diff --git a/net/mikutter/Makefile b/net/mikutter/Makefile
index 81329f3c3d7..444b86356cb 100644
--- a/net/mikutter/Makefile
+++ b/net/mikutter/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.65 2013/05/03 12:49:15 obache Exp $
+# $NetBSD: Makefile,v 1.66 2013/05/15 11:24:14 obache Exp $
 #
 
-DISTNAME=	mikutter.0.2.1.1142
+DISTNAME=	mikutter.0.2.2.1230
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/./-/}
 CATEGORIES=	net
 MASTER_SITES=	http://mikutter.hachune.net/bin/
 
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://mikutter.hachune.net/
-COMMENT=	Simply, powerfully, and moefully twitter client
+COMMENT=	Simple, powerful, and moeful twitter client
 LICENSE=	gnu-gpl-v3 AND cc-by-sa-v3.0
 
 RUBY_VERSION_SUPPORTED=	193
@@ -17,17 +17,17 @@ RUBY_VERSION_SUPPORTED=	193
 
 DEPENDS+=	xdg-utils-[0-9]*:../../misc/xdg-utils
 DEPENDS+=	${RUBY_PKGPREFIX}-hmac>=0.4.0:../../security/ruby-hmac
-DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gtk>=1.0.0:../../x11/ruby-gnome2-gtk
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gtk>=1.2.5:../../x11/ruby-gnome2-gtk
+DEPENDS+=	${RUBY_PKGPREFIX}-rcairo>=1.10.0:../../graphics/ruby-rcairo
 DEPENDS+=	${RUBY_PKGPREFIX}-oauth>=0.4.7:../../security/ruby-oauth
 DEPENDS+=	${RUBY_PKGPREFIX}-memoize>=1.3.1:../../devel/ruby-memoize
 DEPENDS+=	${RUBY_PKGPREFIX}-bsearch>=1.5:../../devel/ruby-bsearch
-DEPENDS+=	${RUBY_PKGPREFIX}-httpclient-[0-9]*:../../www/ruby-httpclient
-DEPENDS+=	${RUBY_PKGPREFIX}-addressable>=2.2.6nb1:../../net/ruby-addressable
+DEPENDS+=	${RUBY_PKGPREFIX}-addressable-[0-9]*:../../net/ruby-addressable
 DEPENDS+=	${RUBY_PKGPREFIX}-typed-array-[0-9]*:../../misc/ruby-typed-array
+#DEPENDS+=	${RUBY_PKGPREFIX}-test-unmit-[0-9]*:../../devel/ruby-test-unit
 # notify-send
-DEPENDS+=	libnotify-[0-9]*:../../sysutils/libnotify
+DEPENDS+=	{libnotify-[0-9]*,libnotify07-[0-9]*}:../../sysutils/libnotify
 
-RUBY_JSON_REQD=	1.5.1
 WRKSRC=		${WRKDIR}/mikutter
 USE_LANGUAGES=	# none
 USE_TOOLS+=	pax
@@ -41,16 +41,13 @@ INSTALLATION_DIRS+=	bin share/doc/mikutter share/applications share/mikutter
 do-build:
 	cd ${WRKSRC}/devel && \
 		${RM} -rf debian
-	cd ${WRKSRC}/core/lib && \
-		${RM} -rf addressable json oauth ruby-bsearch-1.5 typed-array
-	cd ${WRKSRC}/vendor && \
-		${RM} -rf addressable bsearch* hmac*.rb json* memoize.rb oauth* ruby-bsearch-1.5 typed-array*
+	${RM} -rf ${WRKSRC}/vendor
 	${SED} -e 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/desktop.in > ${WRKDIR}/desktop
 	${SED} -e 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/mikutter.sh.in > ${WRKDIR}/mikutter.sh
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/mikutter.rb ${DESTDIR}${PREFIX}/share/mikutter
-	cd ${WRKSRC} && pax -rwpp -s '/.*\.orig//' core devel plugin vendor ${DESTDIR}${PREFIX}/share/mikutter
+	cd ${WRKSRC} && pax -rwpp -s '/.*\.orig//' core devel plugin ${DESTDIR}${PREFIX}/share/mikutter
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/mikutter
 	${INSTALL_SCRIPT} ${WRKDIR}/mikutter.sh ${DESTDIR}${PREFIX}/bin/mikutter
 	${INSTALL_DATA} ${WRKDIR}/desktop ${DESTDIR}${PREFIX}/share/applications/mikutter.desktop
diff --git a/net/mikutter/PLIST b/net/mikutter/PLIST
index fd32b027d2f..3722461fa46 100644
--- a/net/mikutter/PLIST
+++ b/net/mikutter/PLIST
@@ -1,25 +1,26 @@
-@comment $NetBSD: PLIST,v 1.22 2013/02/05 11:57:03 obache Exp $
+@comment $NetBSD: PLIST,v 1.23 2013/05/15 11:24:14 obache Exp $
 bin/mikutter
 share/applications/mikutter.desktop
 share/doc/mikutter/README
-share/mikutter/core/autotag.rb
 share/mikutter/core/boot/check_config_permission.rb
 share/mikutter/core/boot/load_plugin.rb
+share/mikutter/core/boot/mainloop.rb
 share/mikutter/core/boot/option.rb
 share/mikutter/core/boot/shell/generate.rb
 share/mikutter/core/boot/shell/spec.rb
-share/mikutter/core/chi.rb
 share/mikutter/core/config.rb
 share/mikutter/core/configloader.rb
 share/mikutter/core/delayer.rb
 share/mikutter/core/entity.rb
 share/mikutter/core/environment.rb
-share/mikutter/core/image.rb
-share/mikutter/core/initialize.rb
+share/mikutter/core/event.rb
+share/mikutter/core/event_filter.rb
+share/mikutter/core/event_listener.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/instance_storage.rb
 share/mikutter/core/lib/lazy.rb
 share/mikutter/core/lib/mikutwitter.rb
 share/mikutter/core/lib/mikutwitter/api_call_support.rb
@@ -83,6 +84,7 @@ share/mikutter/core/miku/symbol.rb
 share/mikutter/core/miku/symboltable.rb
 share/mikutter/core/miku/yamlisp.rb
 share/mikutter/core/miquire.rb
+share/mikutter/core/miquire_plugin.rb
 share/mikutter/core/mui/cairo_cell_renderer_message.rb
 share/mikutter/core/mui/cairo_coordinate_module.rb
 share/mikutter/core/mui/cairo_icon_over_button.rb
@@ -101,6 +103,7 @@ 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_inneruserlist.rb
 share/mikutter/core/mui/gtk_intelligent_textview.rb
 share/mikutter/core/mui/gtk_keyconfig.rb
 share/mikutter/core/mui/gtk_listlist.rb
@@ -109,7 +112,6 @@ share/mikutter/core/mui/gtk_mtk.rb
 share/mikutter/core/mui/gtk_postbox.rb
 share/mikutter/core/mui/gtk_pseudo_signal_handler.rb
 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_tree_view_pretty_scroll.rb
 share/mikutter/core/mui/gtk_userlist.rb
@@ -120,6 +122,8 @@ 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/achievement/achievement.rb
+share/mikutter/core/plugin/achievement/spec
 share/mikutter/core/plugin/activity/activity.rb
 share/mikutter/core/plugin/activity/spec
 share/mikutter/core/plugin/alsa/alsa.rb
@@ -150,13 +154,16 @@ share/mikutter/core/plugin/extract/extract.rb
 share/mikutter/core/plugin/extract/spec
 share/mikutter/core/plugin/followingcontrol/followingcontrol.rb
 share/mikutter/core/plugin/followingcontrol/spec
+share/mikutter/core/plugin/gtk/Gemfile
 share/mikutter/core/plugin/gtk/delayer.rb
 share/mikutter/core/plugin/gtk/gtk.rb
+share/mikutter/core/plugin/gtk/mainloop.rb
 share/mikutter/core/plugin/gtk/mikutter_window.rb
 share/mikutter/core/plugin/gtk/slug_dictionary.rb
 share/mikutter/core/plugin/gtk/spec
 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/gui/command.rb
 share/mikutter/core/plugin/gui/cuscadable.rb
 share/mikutter/core/plugin/gui/dsl.rb
@@ -218,9 +225,12 @@ share/mikutter/core/plugin/settings/settings.rb
 share/mikutter/core/plugin/settings/spec
 share/mikutter/core/plugin/settings/test_listener.rb
 share/mikutter/core/plugin/shortcutkey/shortcutkey.rb
+share/mikutter/core/plugin/shortcutkey/shortcutkey_listview.rb
 share/mikutter/core/plugin/shortcutkey/spec
 share/mikutter/core/plugin/smartthread/smartthread.rb
 share/mikutter/core/plugin/smartthread/spec
+share/mikutter/core/plugin/sound/sound.rb
+share/mikutter/core/plugin/sound/spec
 share/mikutter/core/plugin/streaming/filter.rb
 share/mikutter/core/plugin/streaming/parma_streamer.rb
 share/mikutter/core/plugin/streaming/spec
@@ -234,6 +244,7 @@ share/mikutter/core/plugin/template
 share/mikutter/core/retriever.rb
 share/mikutter/core/serialthread.rb
 share/mikutter/core/service.rb
+share/mikutter/core/skin.rb
 share/mikutter/core/skin/data/arrow_followed.png
 share/mikutter/core/skin/data/arrow_following.png
 share/mikutter/core/skin/data/arrow_notfollowed.png
@@ -248,6 +259,7 @@ share/mikutter/core/skin/data/fav.png
 share/mikutter/core/skin/data/followers.png
 share/mikutter/core/skin/data/followings.png
 share/mikutter/core/skin/data/icon.png
+share/mikutter/core/skin/data/icon_alternative.png
 share/mikutter/core/skin/data/list.png
 share/mikutter/core/skin/data/loading.png
 share/mikutter/core/skin/data/notfound.png
@@ -284,18 +296,6 @@ 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_retriever.rb
-share/mikutter/core/test/test_userlist.rb
-share/mikutter/core/test/test_utils.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
@@ -320,19 +320,3 @@ share/mikutter/devel/chiskel/core/plugin/uptime.rb
 share/mikutter/devel/makechi.rb
 share/mikutter/mikutter.rb
 share/mikutter/plugin/WHATSTHIS
-@pkgdir share/mikutter/vendor
-@pkgdir share/mikutter/core/plugin/directmessage
-@pkgdir share/mikutter/core/addon/tco
-@pkgdir share/mikutter/core/addon/streaming
-@pkgdir share/mikutter/core/addon/settings
-@pkgdir share/mikutter/core/addon/rest
-@pkgdir share/mikutter/core/addon/proxy
-@pkgdir share/mikutter/core/addon/openimg
-@pkgdir share/mikutter/core/addon/list
-@pkgdir share/mikutter/core/addon/libnotify
-@pkgdir share/mikutter/core/addon/image_file_cache
-@pkgdir share/mikutter/core/addon/directmessage
-@pkgdir share/mikutter/core/addon/bitly
-@pkgdir share/mikutter/core/addon/aspectframe
-@pkgdir share/mikutter/core/addon/alsa
-@pkgdir share/mikutter/core/addon/activity
diff --git a/net/mikutter/distinfo b/net/mikutter/distinfo
index 42def9370ce..6134ac77c20 100644
--- a/net/mikutter/distinfo
+++ b/net/mikutter/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.58 2013/05/03 12:49:15 obache Exp $
+$NetBSD: distinfo,v 1.59 2013/05/15 11:24:14 obache Exp $
 
-SHA1 (mikutter.0.2.1.1142.tar.gz) = 2b57db06349a28566b6072c8ffb54574957e6d68
-RMD160 (mikutter.0.2.1.1142.tar.gz) = ca65e96b01cf819d2a5da209a34eb9b170c2b719
-Size (mikutter.0.2.1.1142.tar.gz) = 2294859 bytes
+SHA1 (mikutter.0.2.2.1230.tar.gz) = 122d3f769d38cf4d8254ac37b3fd0ad6e101894c
+RMD160 (mikutter.0.2.2.1230.tar.gz) = 6e5605a9acdb12c1c28afd7a850f2d91b0eb421e
+Size (mikutter.0.2.2.1230.tar.gz) = 2318325 bytes
diff --git a/net/mikutter/files/desktop.in b/net/mikutter/files/desktop.in
index db6e1e9245b..9a348d280a9 100644
--- a/net/mikutter/files/desktop.in
+++ b/net/mikutter/files/desktop.in
@@ -3,8 +3,8 @@ Encoding=UTF-8
 Name=Mikutter
 GenericName=Twitter Client
 GenericName[ja]=ツイッター・クライアント
-Comment=Simply, powerfully, and moefully twitter client
-Comment[ja]=全てのついったー中毒クラスタに贈る 至高のクライアント
+Comment=Simple, powerful, and moeful twitter client
+Comment[ja]=全てのミク廃、そしてツイッター中毒に贈る 至高のTwitterクライアント
 Exec=@PREFIX@/share/mikutter/mikutter.rb %u
 Icon=@PREFIX@/share/mikutter/core/skin/data/icon.png
 StartupNotify=false