gentoo resync : 08.10.2021

3 files changed, 27 insertions, 23 deletions

diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest
index 3b176c7c28ca..1bf09bf868bd 100644
--- a/net-misc/mikutter/Manifest
+++ b/net-misc/mikutter/Manifest
@@ -3,6 +3,6 @@ DIST mikutter-4.0.6.tar.gz 2322108 BLAKE2B 46d0cda2bc173ee971e516f017f66e26e9f7a
 DIST mikutter-4.1.5.tar.gz 2331485 BLAKE2B 25113ed59cad43094b77bacdf2e42079d9fb5a641a0b2e7ac9529e66183b6f7f953182350cf1d7f8703c10dda0a973edddd54b6c092fc3bf4c3ffe1cc243c2bf SHA512 a8d4be8fb4bf73a9b383ee0d18a6a6c91b6a4ad4ff5837c483da6274b70e4390600d729e303e00a3d4068791e80e0c83619760a3b885cbc4e3717eefb48b3c7c
 DIST twitter_api_keys.rb 336 BLAKE2B 9b134fb9169f96c99582d1ceffe39cfa1675b6e747a8a46f6123cbff73b7e255e59aba3f6cf247decc9824244947d260658011b5aa72a915d50565e797e31703 SHA512 39efeed878f763101329c781fb501c5b5df848e4ae3c1f6bcdf3e6b151c5d647c68127f906eccf7861466d2ff88e7f1bdc27065205ed91a80e9cdc89fa5152e4
 EBUILD mikutter-4.0.6-r1.ebuild 2842 BLAKE2B 368b17c9ada5dd40769217aa855a0d0a15effe69e57079dce86a0367a9b260ab0af3b554a755e052767978056bbf796de8fd222cfc487b99ba962b693596ae79 SHA512 ce83f8171810471109b22af7b28361af1bb787e4827431028e1b8f13dc0b3b2a079e8f28269c408c0726388515108f584cf45fc371c08eb6a5eb174ad1f161c0
-EBUILD mikutter-4.1.5-r1.ebuild 2913 BLAKE2B 83da434712c11500321e94f2ca68b8fe9ff64007762475ebc254d3d5c34028a38ace04cb0a87d25f7d8480cb3152605f0041afc7b0a7d384f4c6673a40a62aef SHA512 8721c6633be245ad1fcb2a0a1b06462fb0acf5081b693a75c5838614352042ef54d6dfc68bc8b0d2c509dd571ae2964a2572cedc3a2051c472bfcfa78b4ae089
-EBUILD mikutter-9999.ebuild 2842 BLAKE2B 368b17c9ada5dd40769217aa855a0d0a15effe69e57079dce86a0367a9b260ab0af3b554a755e052767978056bbf796de8fd222cfc487b99ba962b693596ae79 SHA512 ce83f8171810471109b22af7b28361af1bb787e4827431028e1b8f13dc0b3b2a079e8f28269c408c0726388515108f584cf45fc371c08eb6a5eb174ad1f161c0
+EBUILD mikutter-4.1.5-r1.ebuild 2913 BLAKE2B 36e99d05b7da8ad19460a0c079406228125a17363609c4887e5053b8ffb058e09c01c3780dc75b1eb43eadf6d66287c3d95d36985593b9b6133291a233088e0c SHA512 595a6d4cb91b9358574002382b1dc26afc46e4d6bef44c824a078aafe5248916f8ae8fc78062c312aabb85a55cf40ebf02feecb1e261543cabb2b2e4cff32938
+EBUILD mikutter-9999.ebuild 2913 BLAKE2B 36e99d05b7da8ad19460a0c079406228125a17363609c4887e5053b8ffb058e09c01c3780dc75b1eb43eadf6d66287c3d95d36985593b9b6133291a233088e0c SHA512 595a6d4cb91b9358574002382b1dc26afc46e4d6bef44c824a078aafe5248916f8ae8fc78062c312aabb85a55cf40ebf02feecb1e261543cabb2b2e4cff32938
 MISC metadata.xml 215 BLAKE2B b8deb40f472148c0470ad5a4a39aba042d968cd059c2e8e1adf9cc530ff5c3fe45435fdd71034e2fbaf2f725fdb65367e1179e09019bacdd886f917bebfb2302 SHA512 973c3da0775f8f2ed293f7c3e548804d4ff19e04da7e6a03a30265b7365f704acaf1cd4534fb4513d81b85e6c79aa31b01c42bf716903beccf53b715331c8965
diff --git a/net-misc/mikutter/mikutter-4.1.5-r1.ebuild b/net-misc/mikutter/mikutter-4.1.5-r1.ebuild
index 25c639c91cdf..e6080f7b5c7a 100644
--- a/net-misc/mikutter/mikutter-4.1.5-r1.ebuild
+++ b/net-misc/mikutter/mikutter-4.1.5-r1.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27"
 
 inherit desktop ruby-ng
 
 PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09"
 
 if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="git://toshia.dip.jp/mikutter.git
+	EGIT_REPO_URI="git://mikutter.hachune.net/mikutter.git
 		https://github.com/toshia/twitter_api_keys.git"
 	inherit git-r3
 	SRC_URI="https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
diff --git a/net-misc/mikutter/mikutter-9999.ebuild b/net-misc/mikutter/mikutter-9999.ebuild
index 0a87e3d4a471..e6080f7b5c7a 100644
--- a/net-misc/mikutter/mikutter-9999.ebuild
+++ b/net-misc/mikutter/mikutter-9999.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby26 ruby27"
 
 inherit desktop ruby-ng
 
 PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09"
 
 if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="git://toshia.dip.jp/mikutter.git
+	EGIT_REPO_URI="git://mikutter.hachune.net/mikutter.git
 		https://github.com/toshia/twitter_api_keys.git"
 	inherit git-r3
 	SRC_URI="https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
@@ -34,25 +34,28 @@ RDEPEND="
 	media-sound/alsa-utils"
 
 ruby_add_rdepend "=dev-ruby/addressable-2.8*
-	=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/delayer-1.1.2
+	!>=dev-ruby/delayer-2.0
+	>=dev-ruby/delayer-deferred-2.2.0
+	!>=dev-ruby/delayer-deferred-3.0
+	>=dev-ruby/diva-1.0.2
+	!>=dev-ruby/diva-2.0
 	dev-ruby/httpclient
 	dev-ruby/json:2
-	=dev-ruby/memoist-0.16*
-	!<dev-ruby/memoist-0.16.2
+	>=dev-ruby/memoist-0.16.2
+	!>=dev-ruby/memoist-0.17
 	dev-ruby/moneta
 	dev-ruby/nokogiri
 	>=dev-ruby/oauth-0.5.4
-	=dev-ruby/pluggaloid-1.2*
+	>=dev-ruby/pluggaloid-1.5.0
+	!>=dev-ruby/pluggaloid-2.0
 	dev-ruby/rcairo
-	=dev-ruby/ruby-gettext-3.3*
-	!<dev-ruby/ruby-gettext-3.3.5
+	>=dev-ruby/ruby-gettext-3.3.5
+	!>=dev-ruby/ruby-gettext-3.4
 	=dev-ruby/ruby-gtk2-3.4*
-	=dev-ruby/typed-array-0.1*
-	!<dev-ruby/typed-array-0.1.2
+	>=dev-ruby/typed-array-0.1.2
+	!>=dev-ruby/typed-array-0.2
+	dev-ruby/twitter-text
 	virtual/ruby-ssl"
 
 all_ruby_unpack() {
@@ -65,12 +68,13 @@ all_ruby_unpack() {
 
 all_ruby_install() {
 	local rubyversion
+	local r
 
-	if use ruby_targets_ruby26; then
-		rubyversion=ruby26
-	elif use ruby_targets_ruby25; then
-		rubyversion=ruby25
-	fi
+	for r in $USE_RUBY; do
+		if use ruby_targets_${r}; then
+			rubyversion=${r}
+		fi
+	done
 
 	exeinto /usr/share/mikutter
 	doexe mikutter.rb