version bump; update dependency

2 files changed, 98 insertions, 7 deletions

diff --git a/net-misc/mikutter/mikutter-3.3.5.ebuild b/net-misc/mikutter/mikutter-3.3.5.ebuild
new file mode 100644
index 000000000000..d68d7552aef7
--- /dev/null
+++ b/net-misc/mikutter/mikutter-3.3.5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+inherit eutils ruby-ng
+
+if [ "${PV}" = "9999" ]; then
+	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"
+	RUBY_S="${PN}"
+fi
+
+DESCRIPTION="Simple, powerful and moeful twitter client"
+HOMEPAGE="http://mikutter.hachune.net/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+libnotify"
+
+DEPEND=""
+RDEPEND="
+	libnotify? ( x11-libs/libnotify )
+	media-sound/alsa-utils"
+
+ruby_add_rdepend "dev-ruby/addressable
+	dev-ruby/delayer
+	dev-ruby/delayer-deferred
+	dev-ruby/httpclient
+	dev-ruby/json
+	dev-ruby/instance_storage
+	dev-ruby/memoist
+	>=dev-ruby/moneta-0.7
+	dev-ruby/nokogiri
+	>=dev-ruby/oauth-0.4.7
+	dev-ruby/pluggaloid
+	dev-ruby/rcairo
+	>=dev-ruby/ruby-gettext-3.0.1
+	>=dev-ruby/ruby-gtk2-2.2.0
+	dev-ruby/ruby-hmac
+	dev-ruby/totoridipjp
+	dev-ruby/twitter-text
+	dev-ruby/typed-array
+	virtual/ruby-ssl"
+
+all_ruby_unpack() {
+	if [ "${PV}" = "9999" ];then
+		git-2_src_unpack
+	else
+		default
+	fi
+}
+
+each_ruby_install() {
+	local rubyversion
+
+	#if use ruby_targets_ruby22; then
+	#	rubyversion=ruby22
+	if use ruby_targets_ruby21; then
+		rubyversion=ruby21
+	elif use ruby_targets_ruby20; then
+		rubyversion=ruby20
+	else
+		die "Select Ruby verion 2.x"
+	fi
+
+	exeinto /usr/share/mikutter
+	doexe mikutter.rb
+	insinto /usr/share/mikutter
+	doins -r core plugin
+	sed -e "s/ruby19/${rubyversion}/" "${FILESDIR}"/mikutter \
+		| newbin - mikutter
+	dodoc README
+	make_desktop_entry mikutter Mikutter \
+		/usr/share/mikutter/core/skin/data/icon.png
+}
diff --git a/net-misc/mikutter/mikutter-9999.ebuild b/net-misc/mikutter/mikutter-9999.ebuild
index cbb4ceb37009..d68d7552aef7 100644
--- a/net-misc/mikutter/mikutter-9999.ebuild
+++ b/net-misc/mikutter/mikutter-9999.ebuild
@@ -25,24 +25,30 @@ HOMEPAGE="http://mikutter.hachune.net/"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="+libnotify sound"
+IUSE="+libnotify"
 
 DEPEND=""
 RDEPEND="
 	libnotify? ( x11-libs/libnotify )
-	sound? ( media-sound/alsa-utils )"
+	media-sound/alsa-utils"
 
 ruby_add_rdepend "dev-ruby/addressable
-	dev-ruby/bsearch
 	dev-ruby/delayer
+	dev-ruby/delayer-deferred
+	dev-ruby/httpclient
 	dev-ruby/json
-	dev-ruby/memoize
+	dev-ruby/instance_storage
+	dev-ruby/memoist
 	>=dev-ruby/moneta-0.7
+	dev-ruby/nokogiri
 	>=dev-ruby/oauth-0.4.7
+	dev-ruby/pluggaloid
 	dev-ruby/rcairo
 	>=dev-ruby/ruby-gettext-3.0.1
 	>=dev-ruby/ruby-gtk2-2.2.0
 	dev-ruby/ruby-hmac
+	dev-ruby/totoridipjp
+	dev-ruby/twitter-text
 	dev-ruby/typed-array
 	virtual/ruby-ssl"
 
@@ -57,9 +63,9 @@ all_ruby_unpack() {
 each_ruby_install() {
 	local rubyversion
 
-	if use ruby_targets_ruby22; then
-		rubyversion=ruby22
-	elif use ruby_targets_ruby21; then
+	#if use ruby_targets_ruby22; then
+	#	rubyversion=ruby22
+	if use ruby_targets_ruby21; then
 		rubyversion=ruby21
 	elif use ruby_targets_ruby20; then
 		rubyversion=ruby20