net-misc/mikutter: version bump and drop old

This bump also added ruby26 support and moved to newer dev-ruby/json
slot.

Closes: https://bugs.gentoo.org/575186
Closes: https://bugs.gentoo.org/699228
Closes: https://bugs.gentoo.org/713480
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Naohiro Aota <naota@gentoo.org>

4 files changed, 50 insertions, 52 deletions

diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest
index 08817da67aa3..6a90520bd16c 100644
--- a/net-misc/mikutter/Manifest
+++ b/net-misc/mikutter/Manifest
@@ -1,2 +1,2 @@
-DIST mikutter.3.8.6.tar.gz 3174454 BLAKE2B 3fc3802ae840fc310f1b9abd51c560fb804b57aad6bf78bd1e3b8046a42dc785c8a454de722a5e57d499bda15884a255da50d3919a1c5bbcd9e5753948d45f46 SHA512 102c25263df804fd005928ac8605ca4d115040c0e3bd13a09e73bac5b1a4ddedff92b45ac38c54692bf388b5ac8ea422a0b5c42851bb3616c74991943f1cd98f
+DIST mikutter-4.0.6.tar.gz 2322108 BLAKE2B 46d0cda2bc173ee971e516f017f66e26e9f7a4abd7330111ef66cd40bd0c6dd407b3d6988fa5955ca33a2c375cb77b4c234c8439dc27b6baf43dfcc9a34f4052 SHA512 16dca21bf7f989d2af71a8acc26816dbd7ebff7866b65d4c376b87cf2ba7757d8978a25483cb548448e3341c51d7767b638775e2696f64484b4f5ec8cdce050e
 DIST twitter_api_keys.rb 336 BLAKE2B 9b134fb9169f96c99582d1ceffe39cfa1675b6e747a8a46f6123cbff73b7e255e59aba3f6cf247decc9824244947d260658011b5aa72a915d50565e797e31703 SHA512 39efeed878f763101329c781fb501c5b5df848e4ae3c1f6bcdf3e6b151c5d647c68127f906eccf7861466d2ff88e7f1bdc27065205ed91a80e9cdc89fa5152e4
diff --git a/net-misc/mikutter/files/mikutter b/net-misc/mikutter/files/mikutter
index 129b8cd6f106..169fbc76db89 100644
--- a/net-misc/mikutter/files/mikutter
+++ b/net-misc/mikutter/files/mikutter
@@ -2,5 +2,5 @@
 
 EPREFIX=${0%/usr/bin/mikutter}
 
-DISABLE_BUNDLER_SETUP= $EPREFIX/usr/bin/ruby19 $EPREFIX/usr/share/mikutter/mikutter.rb $*
+DISABLE_BUNDLER_SETUP=1 $EPREFIX/usr/bin/ruby19 $EPREFIX/usr/share/mikutter/mikutter.rb $*
 
diff --git a/net-misc/mikutter/mikutter-3.8.6.ebuild b/net-misc/mikutter/mikutter-4.0.6.ebuild
index 54fc8e5670f4..2eefb272d4e6 100644
--- a/net-misc/mikutter/mikutter-3.8.6.ebuild
+++ b/net-misc/mikutter/mikutter-4.0.6.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby24 ruby25"
+USE_RUBY="ruby25 ruby26"
 
-inherit eutils ruby-ng
+inherit eutils desktop ruby-ng
 
 PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09"
 
@@ -17,17 +17,15 @@ if [ "${PV}" = "9999" ]; then
 	KEYWORDS=""
 	EGIT_CHECKOUT_DIR="${WORKDIR}/all"
 else
-	MY_P="${PN}.${PV}"
-	SRC_URI="https://mikutter.hachune.net/bin/${MY_P}.tar.gz
+	SRC_URI="http://mikutter.hachune.net/bin/${P}.tar.gz
 		https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
 	KEYWORDS="~amd64"
-	RUBY_S="${PN}"
 fi
 
 DESCRIPTION="Simple, powerful and moeful twitter client"
 HOMEPAGE="https://mikutter.hachune.net/"
 
-LICENSE="GPL-3"
+LICENSE="MIT"
 SLOT="0"
 IUSE="+libnotify"
 
@@ -36,25 +34,26 @@ RDEPEND="
 	libnotify? ( x11-libs/libnotify )
 	media-sound/alsa-utils"
 
-ruby_add_rdepend "<dev-ruby/addressable-2.6
-	dev-ruby/delayer
-	>=dev-ruby/delayer-deferred-2.0
-	>=dev-ruby/diva-0.3.2
+ruby_add_rdepend "=dev-ruby/addressable-2.7*
+	=dev-ruby/delayer-1.1*:1
+	=dev-ruby/delayer-deferred-2.1*
+	!<dev-ruby/delayer-deferred-2.1.3
+	=dev-ruby/diva-1.0*
+	!<dev-ruby/diva-1.0.2
 	dev-ruby/httpclient
-	dev-ruby/json:0
-	dev-ruby/instance_storage
-	dev-ruby/memoist
+	dev-ruby/json:2
+	=dev-ruby/memoist-0.16*
+	!<dev-ruby/memoist-0.16.2
 	dev-ruby/moneta
 	dev-ruby/nokogiri
-	>=dev-ruby/oauth-0.5.1
-	>=dev-ruby/pluggaloid-1.1.1
+	>=dev-ruby/oauth-0.5.4
+	=dev-ruby/pluggaloid-1.2*
 	dev-ruby/rcairo
-	>=dev-ruby/ruby-gettext-3.2.9
-	>=dev-ruby/ruby-gtk2-3.3.0
-	>dev-ruby/ruby-hmac-0.4
-	dev-ruby/totoridipjp
-	dev-ruby/twitter-text:=
-	>dev-ruby/typed-array-0.1
+	=dev-ruby/ruby-gettext-3.3*
+	!<dev-ruby/ruby-gettext-3.3.5
+	=dev-ruby/ruby-gtk2-3.4*
+	=dev-ruby/typed-array-0.1*
+	!<dev-ruby/typed-array-0.1.2
 	virtual/ruby-ssl"
 
 all_ruby_unpack() {
@@ -68,10 +67,10 @@ all_ruby_unpack() {
 all_ruby_install() {
 	local rubyversion
 
-	if use ruby_targets_ruby25; then
+	if use ruby_targets_ruby26; then
+		rubyversion=ruby26
+	elif use ruby_targets_ruby25; then
 		rubyversion=ruby25
-	elif use ruby_targets_ruby24; then
-		rubyversion=ruby24
 	fi
 
 	exeinto /usr/share/mikutter
diff --git a/net-misc/mikutter/mikutter-9999.ebuild b/net-misc/mikutter/mikutter-9999.ebuild
index 54fc8e5670f4..2eefb272d4e6 100644
--- a/net-misc/mikutter/mikutter-9999.ebuild
+++ b/net-misc/mikutter/mikutter-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby24 ruby25"
+USE_RUBY="ruby25 ruby26"
 
-inherit eutils ruby-ng
+inherit eutils desktop ruby-ng
 
 PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09"
 
@@ -17,17 +17,15 @@ if [ "${PV}" = "9999" ]; then
 	KEYWORDS=""
 	EGIT_CHECKOUT_DIR="${WORKDIR}/all"
 else
-	MY_P="${PN}.${PV}"
-	SRC_URI="https://mikutter.hachune.net/bin/${MY_P}.tar.gz
+	SRC_URI="http://mikutter.hachune.net/bin/${P}.tar.gz
 		https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
 	KEYWORDS="~amd64"
-	RUBY_S="${PN}"
 fi
 
 DESCRIPTION="Simple, powerful and moeful twitter client"
 HOMEPAGE="https://mikutter.hachune.net/"
 
-LICENSE="GPL-3"
+LICENSE="MIT"
 SLOT="0"
 IUSE="+libnotify"
 
@@ -36,25 +34,26 @@ RDEPEND="
 	libnotify? ( x11-libs/libnotify )
 	media-sound/alsa-utils"
 
-ruby_add_rdepend "<dev-ruby/addressable-2.6
-	dev-ruby/delayer
-	>=dev-ruby/delayer-deferred-2.0
-	>=dev-ruby/diva-0.3.2
+ruby_add_rdepend "=dev-ruby/addressable-2.7*
+	=dev-ruby/delayer-1.1*:1
+	=dev-ruby/delayer-deferred-2.1*
+	!<dev-ruby/delayer-deferred-2.1.3
+	=dev-ruby/diva-1.0*
+	!<dev-ruby/diva-1.0.2
 	dev-ruby/httpclient
-	dev-ruby/json:0
-	dev-ruby/instance_storage
-	dev-ruby/memoist
+	dev-ruby/json:2
+	=dev-ruby/memoist-0.16*
+	!<dev-ruby/memoist-0.16.2
 	dev-ruby/moneta
 	dev-ruby/nokogiri
-	>=dev-ruby/oauth-0.5.1
-	>=dev-ruby/pluggaloid-1.1.1
+	>=dev-ruby/oauth-0.5.4
+	=dev-ruby/pluggaloid-1.2*
 	dev-ruby/rcairo
-	>=dev-ruby/ruby-gettext-3.2.9
-	>=dev-ruby/ruby-gtk2-3.3.0
-	>dev-ruby/ruby-hmac-0.4
-	dev-ruby/totoridipjp
-	dev-ruby/twitter-text:=
-	>dev-ruby/typed-array-0.1
+	=dev-ruby/ruby-gettext-3.3*
+	!<dev-ruby/ruby-gettext-3.3.5
+	=dev-ruby/ruby-gtk2-3.4*
+	=dev-ruby/typed-array-0.1*
+	!<dev-ruby/typed-array-0.1.2
 	virtual/ruby-ssl"
 
 all_ruby_unpack() {
@@ -68,10 +67,10 @@ all_ruby_unpack() {
 all_ruby_install() {
 	local rubyversion
 
-	if use ruby_targets_ruby25; then
+	if use ruby_targets_ruby26; then
+		rubyversion=ruby26
+	elif use ruby_targets_ruby25; then
 		rubyversion=ruby25
-	elif use ruby_targets_ruby24; then
-		rubyversion=ruby24
 	fi
 
 	exeinto /usr/share/mikutter