From 4aefeecf6692a8fe79b3220a0ea004c788fd0568 Mon Sep 17 00:00:00 2001
From: Naohiro Aota <naota@gentoo.org>
Date: Fri, 12 Aug 2016 00:39:32 +0900
Subject: net-misc/mikutter: version bump

Package-Manager: portage-2.2.28
---
 net-misc/mikutter/Manifest              |  2 +-
 net-misc/mikutter/mikutter-3.2.7.ebuild | 79 --------------------------------
 net-misc/mikutter/mikutter-3.3.5.ebuild |  4 +-
 net-misc/mikutter/mikutter-3.4.2.ebuild | 81 +++++++++++++++++++++++++++++++++
 net-misc/mikutter/mikutter-9999.ebuild  | 16 +++----
 5 files changed, 90 insertions(+), 92 deletions(-)
 delete mode 100644 net-misc/mikutter/mikutter-3.2.7.ebuild
 create mode 100644 net-misc/mikutter/mikutter-3.4.2.ebuild

(limited to 'net-misc/mikutter')

diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest
index adb700e2c6c3..92df399b2483 100644
--- a/net-misc/mikutter/Manifest
+++ b/net-misc/mikutter/Manifest
@@ -1,2 +1,2 @@
-DIST mikutter.3.2.7.tar.gz 2576878 SHA256 61108ff4c39073c5fb797cde072c48bc45f89fdb90c269815695fd31b1da89b6 SHA512 b54b4896e0321fcac7ec08dd2e5dc567631c803501cc4798c7062de31185306bb5e69603c32ecb64cdbcd5772fc2d92ea41949c4e79abebd252fc491a47056ad WHIRLPOOL 4168961d2d3235f3ae6c6294b64febf73ef8f40b9982c6bba44b1950f601a98ceada6fd3a8897e6f9b5e68d5874be5e99469f4679a2fc9aa1116886ebc17eca0
 DIST mikutter.3.3.5.tar.gz 2789919 SHA256 464a3adc2a75020d2cdc6ed52bea8e9445e8fe0f8cfb0e0d8acc914f78e0bf1a SHA512 8848be0c0af52959270f773c40506a4d94a0e062c587572b58b1f1622dac4c16d87b42d100c553c4f6e1fd70f4934bd1341a497466450e0476c0b24470b8d08d WHIRLPOOL 7b4f89107786a17d1fb771f03ca6853eb1a1d3710cae377c25307d7dc9f45ecdf454984b28e99808d163acf04d24b9183ddf39e7144bd7873164a0bfdbfae446
+DIST mikutter.3.4.2.tar.gz 3684733 SHA256 4531a284946763ca7c57dbfec1e26e029415519977414e381496bbb3ac84ea8f SHA512 bbdde61324825e9c7d4ffa6b6dc004f74c512391c1b1a538d7c72672f6aa68c3b68c579d1a2a3db13d25b909dc497195fcd7f0d66c88c8d1b2856508e965418d WHIRLPOOL 67a4fb086d1d50e3177f6ae31f5b2503bd10fac9ce9cd5cb264b1e5f2772a917ac054ce7fed050a167b5f604f969d5a4fce7db66369c93dd74d35b9a970e6425
diff --git a/net-misc/mikutter/mikutter-3.2.7.ebuild b/net-misc/mikutter/mikutter-3.2.7.ebuild
deleted file mode 100644
index 3d295005a5d4..000000000000
--- a/net-misc/mikutter/mikutter-3.2.7.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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 sound"
-
-DEPEND=""
-RDEPEND="
-	libnotify? ( x11-libs/libnotify )
-	sound? ( media-sound/alsa-utils )"
-
-ruby_add_rdepend "dev-ruby/addressable
-	dev-ruby/bsearch
-	dev-ruby/delayer
-	dev-ruby/json
-	dev-ruby/memoize
-	>=dev-ruby/moneta-0.7
-	>=dev-ruby/oauth-0.4.7
-	dev-ruby/rcairo
-	>=dev-ruby/ruby-gettext-3.0.1
-	>=dev-ruby/ruby-gtk2-2.2.0
-	dev-ruby/ruby-hmac
-	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-3.3.5.ebuild b/net-misc/mikutter/mikutter-3.3.5.ebuild
index d68d7552aef7..7f632ddbefa8 100644
--- a/net-misc/mikutter/mikutter-3.3.5.ebuild
+++ b/net-misc/mikutter/mikutter-3.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -36,7 +36,7 @@ ruby_add_rdepend "dev-ruby/addressable
 	dev-ruby/delayer
 	dev-ruby/delayer-deferred
 	dev-ruby/httpclient
-	dev-ruby/json
+	dev-ruby/json:0
 	dev-ruby/instance_storage
 	dev-ruby/memoist
 	>=dev-ruby/moneta-0.7
diff --git a/net-misc/mikutter/mikutter-3.4.2.ebuild b/net-misc/mikutter/mikutter-3.4.2.ebuild
new file mode 100644
index 000000000000..7ad7bb2a4292
--- /dev/null
+++ b/net-misc/mikutter/mikutter-3.4.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby21 ruby22"
+
+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:0
+	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
+	elif use ruby_targets_ruby21; then
+		rubyversion=ruby21
+	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 d68d7552aef7..7ad7bb2a4292 100644
--- a/net-misc/mikutter/mikutter-9999.ebuild
+++ b/net-misc/mikutter/mikutter-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21"
+USE_RUBY="ruby21 ruby22"
 
 inherit eutils ruby-ng
 
@@ -36,7 +36,7 @@ ruby_add_rdepend "dev-ruby/addressable
 	dev-ruby/delayer
 	dev-ruby/delayer-deferred
 	dev-ruby/httpclient
-	dev-ruby/json
+	dev-ruby/json:0
 	dev-ruby/instance_storage
 	dev-ruby/memoist
 	>=dev-ruby/moneta-0.7
@@ -63,14 +63,10 @@ all_ruby_unpack() {
 each_ruby_install() {
 	local rubyversion
 
-	#if use ruby_targets_ruby22; then
-	#	rubyversion=ruby22
-	if use ruby_targets_ruby21; then
+	if use ruby_targets_ruby22; then
+		rubyversion=ruby22
+	elif 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
-- 
cgit v1.2.3-65-gdbad