gentoo resync : 20.10.2021

3 files changed, 2 insertions, 123 deletions

diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest
index 1bf09bf868bd..dcf69856c236 100644
--- a/net-misc/mikutter/Manifest
+++ b/net-misc/mikutter/Manifest
@@ -1,8 +1,6 @@
 AUX mikutter 137 BLAKE2B f76eb22d6492f8737ce7de92068f551ece304a7d983a922555db1d6bd36ad895376c7812840afe579959a122c7619ef02c209cb7dc06da1011bc95b9b8d9fe74 SHA512 bbf70ab03b994f9593ea3854d1911f23d1a78d155e6aa755b2456f138ef6f7f2ca5ad7aea477beca487dac43a2e5472ca7f2e7d1503a57aaa93f41f06cafccba
-DIST mikutter-4.0.6.tar.gz 2322108 BLAKE2B 46d0cda2bc173ee971e516f017f66e26e9f7a4abd7330111ef66cd40bd0c6dd407b3d6988fa5955ca33a2c375cb77b4c234c8439dc27b6baf43dfcc9a34f4052 SHA512 16dca21bf7f989d2af71a8acc26816dbd7ebff7866b65d4c376b87cf2ba7757d8978a25483cb548448e3341c51d7767b638775e2696f64484b4f5ec8cdce050e
-DIST mikutter-4.1.5.tar.gz 2331485 BLAKE2B 25113ed59cad43094b77bacdf2e42079d9fb5a641a0b2e7ac9529e66183b6f7f953182350cf1d7f8703c10dda0a973edddd54b6c092fc3bf4c3ffe1cc243c2bf SHA512 a8d4be8fb4bf73a9b383ee0d18a6a6c91b6a4ad4ff5837c483da6274b70e4390600d729e303e00a3d4068791e80e0c83619760a3b885cbc4e3717eefb48b3c7c
+DIST mikutter-4.1.7.tar.gz 2331574 BLAKE2B a60918f2bfe3a56087536c0b3313f454cdee61fd4c988008581f8a9e3373a76d78e8c93d051ff21b45874e9d4944522c2feafc4ec06fd669e7568b8f9864911c SHA512 bb7fa2ebb22484e6244c2ac6747b811d0ebc1eadca9997c9b272c6378149f63f01b9f1b5c30b36150b38997c973233b8f7b9c3f310c5e36e3ee23edec67eddc5
 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 36e99d05b7da8ad19460a0c079406228125a17363609c4887e5053b8ffb058e09c01c3780dc75b1eb43eadf6d66287c3d95d36985593b9b6133291a233088e0c SHA512 595a6d4cb91b9358574002382b1dc26afc46e4d6bef44c824a078aafe5248916f8ae8fc78062c312aabb85a55cf40ebf02feecb1e261543cabb2b2e4cff32938
+EBUILD mikutter-4.1.7.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.0.6-r1.ebuild b/net-misc/mikutter/mikutter-4.0.6-r1.ebuild
deleted file mode 100644
index 0a87e3d4a471..000000000000
--- a/net-misc/mikutter/mikutter-4.0.6-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-inherit desktop ruby-ng
-
-PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09"
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="git://toshia.dip.jp/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"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/all"
-else
-	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"
-fi
-
-DESCRIPTION="Simple, powerful and moeful twitter client"
-HOMEPAGE="https://mikutter.hachune.net/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+libnotify"
-
-DEPEND=""
-RDEPEND="
-	libnotify? ( x11-libs/libnotify )
-	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/httpclient
-	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.4
-	=dev-ruby/pluggaloid-1.2*
-	dev-ruby/rcairo
-	=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() {
-	if [ "${PV}" = "9999" ];then
-		git-3_src_unpack
-	else
-		default
-	fi
-}
-
-all_ruby_install() {
-	local rubyversion
-
-	if use ruby_targets_ruby26; then
-		rubyversion=ruby26
-	elif use ruby_targets_ruby25; then
-		rubyversion=ruby25
-	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
-
-	insinto /usr/share/mikutter/plugin/twitter_api_keys
-	newins "${DISTDIR}"/twitter_api_keys.rb twitter_api_keys.rb.in
-}
-
-pkg_postinst() {
-	echo
-	elog "To use Twitter, you need to setup your Consumer Key/Consumer Secret by running"
-	elog "  emerge --config =${PF}"
-}
-
-pkg_config() {
-	local PLUGIN_DIR="${EROOT}"/usr/share/mikutter/plugin
-	local CK CS
-
-	echo
-	einfon "Please input your Consumer Key for Twitter: "
-	read -r CK
-
-	echo
-	einfon "Please input your Consumer Secret for Twitter: "
-	read -r CS
-
-	if [ -z "${CK}" -o -z "${CS}" ]; then
-		eerror "Consumer Key or Consumer Secret is missing."
-		return
-	fi
-
-	sed -e "/consumer_key = /s!''!'${CK}'!" \
-		-e "/consumer_secret = /s!''!'${CS}'!" \
-		${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb.in > \
-			${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb
-
-	echo
-	einfo "Consuker Key/Consumer secret is set."
-}
diff --git a/net-misc/mikutter/mikutter-4.1.5-r1.ebuild b/net-misc/mikutter/mikutter-4.1.7.ebuild
index e6080f7b5c7a..e6080f7b5c7a 100644
--- a/net-misc/mikutter/mikutter-4.1.5-r1.ebuild
+++ b/net-misc/mikutter/mikutter-4.1.7.ebuild