--- mikutter-9999.ebuild.dist
+++ mikutter-9999.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/mikutter-9999.ebuild,v 1.3 2011/12/18 01:03:30 naota Exp $
+# $Header: $
 
-EAPI=3
+EAPI=5
 
 USE_RUBY="ruby19"
 
-inherit ruby-ng
+inherit eutils ruby-ng
 
 if [ "${PV}" = "9999" ]; then
-	ESVN_REPO_URI="svn://toshia.dip.jp/mikutter/trunk"
-	inherit subversion
+	EGIT_REPO_URI="git://toshia.dip.jp/mikutter.git"
+	inherit git-2
 	KEYWORDS=""
+	EGIT_SOURCEDIR="${WORKDIR}/all"
 else
 	MY_P="${PN}.${PV}"
 	SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
+	RUBY_S="${PN}"
 fi
 
 DESCRIPTION="mikutter is simple, powerful and moeful twitter client"
@@ -30,15 +32,20 @@
 	sound? ( media-sound/alsa-utils )"
 
 ruby_add_rdepend "dev-ruby/ruby-gtk2
-	dev-ruby/rcairo
-	dev-ruby/httpclient
+	dev-ruby/addressable
+	>=dev-ruby/bsearch-1.5.0
+	dev-ruby/json
+	dev-ruby/memoize
+	>=dev-ruby/oauth-0.4.7
+	dev-ruby/typed-array
 	virtual/ruby-ssl"
 
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	cd "${WORKDIR}"
-	mv mikutter all
+all_ruby_unpack() {
+	if [ "${PV}" = "9999" ]; then
+		git-2_src_unpack
+	else
+		default
+	fi
 }
 
 all_ruby_install() {
@@ -49,4 +56,5 @@
 	exeinto /usr/bin
 	doexe "${FILESDIR}"/mikutter
 	dodoc README
+	make_desktop_entry mikutter Mikutter /usr/share/mikutter/core/skin/data/icon.png
 }