gentoo resync : 17.07.2021

3 files changed, 5 insertions, 35 deletions

diff --git a/dev-ruby/diva/Manifest b/dev-ruby/diva/Manifest
index 51c516d8f7e9..5e04ae74355c 100644
--- a/dev-ruby/diva/Manifest
+++ b/dev-ruby/diva/Manifest
@@ -1,5 +1,3 @@
-DIST diva-1.0.2.gem 13824 BLAKE2B c292e11d9975691d85cb0500ec42b10422665abb9b236d44629d0a9518e318cf91891d4ad265aab81d13762d121910a8be92c602225d44bfa66e31e77082fa95 SHA512 b5d2df59e4144930ee18c7b738e8b93646057935364c2710d349761e68053f1c342b382de76dc1669076db7394ff906384a8952e1e7c44c71f208dc3604d67f4
 DIST diva-1.0.2.tar.gz 13638 BLAKE2B 461e8487e06749d0482b86fd30945dc83d53daea06750628839c899b6f8d419599c9cc322b62f58d3eb956a2a99a3674dd591c4bb2fc5483bd1853bc40154634 SHA512 b60d80ca55c98a2f6fcf269aa4a2188f2239b871b0e77f328490d5924a6d0e6801c67d0eef4de28b584303f38bed3752a3ceb2c1e4f2c7d17be13dad03c643b5
-EBUILD diva-1.0.2-r1.ebuild 734 BLAKE2B 2248bf4396bc284852f7cb900d87923d62f3ebc92b304d18499fa2c0152a9dce50884dc33ffd10ce7752b598d7b70dc7bd4eb3c96545d9bc36433aedcd8e9881 SHA512 a1d0a1bb5ccce158b9429c747763993cbc9a8f57c223d588254bb11989df6f31584e1a54f1ec5bbe65211331407b0a909af9d7887f71eb44903723b0e7082dc3
-EBUILD diva-1.0.2.ebuild 610 BLAKE2B 6bdb64d5897c04ba9010fe82d539cdce989c1adceccac317fcb340f3bd31db25fece406a3912a7fd13417f8771bbbe297473bfe572d8609c4004f33404e6df4c SHA512 951075f3cb56a0d98924f5b0cf2cf71bc398693a3a216522ae10de0e5e90539c8e56733122146a95ffe46e26eedec228ed8e2429d9101fa003709b796671281f
+EBUILD diva-1.0.2-r2.ebuild 750 BLAKE2B e1deda7cfbf138cc7c0b327b9e3bf0c658643cb215acf707cae29748a5f298925fc6ae626222f3dc2cd89f2ec5b2c0cfccbbf0e790ee496f266a455d3b05d066 SHA512 15a00e0f5c345774e5104f4c1e2e3712abe1b39ce96c90de7e5352583fb732750caf6127b8d581f0b6c13e2f77df7b134e855fade714caca277f5d85cb5da93b
 MISC metadata.xml 399 BLAKE2B 26a2baccac7448af4f7e749c1e8a69821a25864ca8f3672f137e73ae7a257ec87398239cd94479a06691ee3ddcfc0e4ead1b71f58ba2fe5541577099592466f2 SHA512 a95f31401006f69283159dbc1524b53e79454609c6bda896af06f472c84ff828162fea80594028fd8c02110cd190beacdfdee47dc27d69d5b01b10e29a4ce0b2
diff --git a/dev-ruby/diva/diva-1.0.2-r1.ebuild b/dev-ruby/diva/diva-1.0.2-r2.ebuild
index cd07c32b70cd..70749dfdb14b 100644
--- a/dev-ruby/diva/diva-1.0.2-r1.ebuild
+++ b/dev-ruby/diva/diva-1.0.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -22,9 +22,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-ruby_add_rdepend "<dev-ruby/addressable-2.8"
+ruby_add_rdepend "<dev-ruby/addressable-2.9"
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/addressable/ s/2.8/2.9/' -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
 }
diff --git a/dev-ruby/diva/diva-1.0.2.ebuild b/dev-ruby/diva/diva-1.0.2.ebuild
deleted file mode 100644
index f026d01e2f5a..000000000000
--- a/dev-ruby/diva/diva-1.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="diva.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implementation of expression for handling things."
-HOMEPAGE="https://github.com/toshia/diva https://rubygems.org/gems/diva"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/addressable-2.8"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}