gentoo resync : 12.03.2021

3 files changed, 9 insertions, 16 deletions

diff --git a/net-irc/rbot/Manifest b/net-irc/rbot/Manifest
index f8596ebb0dde..2546fa892fec 100644
--- a/net-irc/rbot/Manifest
+++ b/net-irc/rbot/Manifest
@@ -4,5 +4,5 @@ AUX rbot.conf2 1111 BLAKE2B 22cfbcb92f8d0df664a03b26db6027837463c5f8f543829b772d
 AUX rbot.init 1459 BLAKE2B 3b58ca09d2073ef01f94ae1980ed9203d4cadc1a9512842e1ce53709ddb1cfab15228b41656aca5e69999ca933bfe45c94ac18af214b0e890f04912a56830ba8 SHA512 57f5504829ed7524b70102833a5de168f7ea08e594a92ece6d7c0f2eab7de8c9dd14a6d199c5e63b6298209bdf5de4adcb06aded0c23d05c35f7e9774742ecea
 AUX rbot.init2 1345 BLAKE2B 137df6384fde1e3ee9501ce38b31470605bf308827213924033b291f8aa567e90cb8421be6865f4df269aa9b8cc3b20c4b729f3cc4aaaa90959dec39382752ea SHA512 b3d8b83eea4d429a47657f4f9b6cb0aed6c283aa4e7535307305f33bc84c53c0c82e2b76a7cf45ec192c7db68c71e70ee5b000ffbd6f0ff59039de8f69f88dff
 DIST rbot-0.9.15_p20160325.tar.gz 762685 BLAKE2B 68146d241bd57198e0a7a9e5ae033827116bbe31d3bdc05bf42aa644c5dd900254bbe7317461aa553ad92daac299439721a85cd8dd41033cf38b9e97b268e1ee SHA512 b0bc90ee2c6ddb3cdd92cdd5f3a45520d20bc97327b3d694235f7ba94f13ef3c884d4658b083f71bfee2cbeff3cbc7a57c251c4d28bfee293e2556f64e7b4160
-EBUILD rbot-0.9.15_p20160325-r1.ebuild 5291 BLAKE2B 0dbbb3716bf4006e695205307fbbb7575150e39af3c307cead9e6e1703ea373632e1098fe2d4ecffb6e17563fe13e88545d2d64fcf65980b3ddc33d180bb650d SHA512 a2578990be0dbc2c18a9fb10f7f0c346236c818fca69ceec2c4deed3c4950083093402f651974aad0c256cf60ba30b3a34a7709c4cf5eac929ea199df89aabff
-MISC metadata.xml 2656 BLAKE2B 47090f64bb983dfca142443a0f35ae99fa57927781177255e375e414c61a7555507d0110259f3a9ace86e42fadb237bbb5aecc251371bee9ff8ddaf1d414ea36 SHA512 03c3fc8b4f700eb1039feb5f656f772a55c3b928658e494c542cf69d3325d08b2723e23cfb753afe5ea3bad240011e642a4923e9a84673cba1e06b24cfc60918
+EBUILD rbot-0.9.15_p20160325-r2.ebuild 5218 BLAKE2B e6cf5c29ef591bf25665364673b11793b36df4b73f68965fcbc56d0e484886406242ccb4deb39b68586864591c555029e6ab878d95db3e653ce4db4292f346e9 SHA512 fea97215f7a921cf9cbd55c5223c5ecfdacd79d2abc508341bbb4ab69a65d6430f0af4d3608d0528077267426539ccdda784aefa06c83cc548f5f2e748e616a6
+MISC metadata.xml 2429 BLAKE2B 194f36624f9ae791b43994d7b1779b3e74b29aab2e9cedd57f6d2e33c6acc3b06e364cd2071f085d35fa8836c26940a9f8ab6be42a9f2a3bf9081f7279c606d2 SHA512 ddaf26be4e591045bf3ecb8151111cc140a9fded5ce2b3e425f445ffdddfa42d267e3cf38236fe2d43ecf6261492f51b9f2249785b0f7ec371c3f314e8124591
diff --git a/net-irc/rbot/metadata.xml b/net-irc/rbot/metadata.xml
index 9be5ac250eb4..c24f8a726305 100644
--- a/net-irc/rbot/metadata.xml
+++ b/net-irc/rbot/metadata.xml
@@ -21,11 +21,6 @@
     to enable the "translator" plugin for rbot. If the USE flag is
     disabled the plugin is also disabled by default.
   </flag>
-    <flag name="shorturl">
-    Add dependency over <pkg>dev-ruby/shorturl</pkg>, which is needed
-    to enable the "shortenurl" plugin for rbot. If the USE flag is
-    disabled the plugin is also disabled by default.
-  </flag>
     <flag name="nls">
     Build and install translation for the messages coming from the bot
     and its plugins (through <pkg>dev-ruby/ruby-gettext</pkg>).
diff --git a/net-irc/rbot/rbot-0.9.15_p20160325-r1.ebuild b/net-irc/rbot/rbot-0.9.15_p20160325-r2.ebuild
index 495f009bcfe2..d4bbfeb5e719 100644
--- a/net-irc/rbot/rbot-0.9.15_p20160325-r1.ebuild
+++ b/net-irc/rbot/rbot-0.9.15_p20160325-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25"
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
 
 GITHUB_COMMIT="e358601cc521d8aced941eb928fae2d8c53cf0c2"
-inherit ruby-ng eutils user
+inherit ruby-ng l10n user
 
 DESCRIPTION="A ruby IRC bot"
 HOMEPAGE="https://ruby-rbot.org/"
@@ -14,13 +14,11 @@ SRC_URI="https://github.com/ruby-rbot/rbot/archive/${GITHUB_COMMIT}.tar.gz -> ${
 LICENSE="|| ( feh GPL-2 )"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="spell aspell timezone translator shorturl nls figlet
+IUSE="spell aspell timezone translator nls figlet
 	fortune cal host sqlite toilet"
 ILINGUAS="zh_CN zh_TW ru nl de fi fr it ja"
 RUBY_S="${PN}-${GITHUB_COMMIT}"
 
-RUBY_PATCHES=( rbot-rakefile-gettext.patch )
-
 RDEPEND+="
 	spell? (
 		aspell? ( app-text/aspell )
@@ -46,7 +44,6 @@ ruby_add_rdepend "
 	dev-ruby/tokyocabinet
 	timezone? ( dev-ruby/tzinfo:* )
 	translator? ( dev-ruby/mechanize )
-	shorturl? ( dev-ruby/shorturl )
 	nls? ( dev-ruby/ruby-gettext >=dev-ruby/locale-2.0.5-r2 )
 "
 
@@ -55,6 +52,8 @@ pkg_setup() {
 }
 
 all_ruby_prepare() {
+	eapply -p0 "${FILESDIR}"/rbot-rakefile-gettext.patch
+
 	# Avoid tests that are only compatible with ruby22
 	rm -f test/test_journal.rb || die
 
@@ -104,7 +103,6 @@ all_ruby_compile() {
 
 	use_rbot_plugin timezone time
 	use_rbot_plugin translator translator
-	use_rbot_plugin shorturl shortenurls
 
 	use_rbot_plugin fortune fortune
 	use_rbot_conf_path fortune fortune.path /usr/bin/fortune