gentoo resync : 28.04.2021

7 files changed, 6 insertions, 233 deletions

diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index 398d7c49638b..6e06bc2fe23e 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -1,14 +1,7 @@
-AUX i18n-0.7.0-frozen-classes.patch 1126 BLAKE2B 4cfaca964ed676d4b35b7e2aadeec36160541843a48f8e71866ca3b79467bb057502dd102944540045a156c55c97ff7c455d75de8484e2b5f3bb2173696931c6 SHA512 11e1777e991f6273c47a860bc0f4b390052231c9d14fa0f6c51e06b70b09d223e4fdb1e7e76df51abbfe0a957858d086ef58be0e14b09744eb9642697c2caa56
-DIST i18n-0.7.0.tar.gz 57647 BLAKE2B 50ea36ec616b90a261151cce47c98250e85b25ae75f90eb52ea01e8bb7e0c6288abb9055a4f80a199deb93c9ca66efd1ad568950d3f505206e0ba9ee9cdb8bc6 SHA512 8824feb3fb99bba759963d2ae34555f27b85dbac3d3001168471a27e47fc805e5ffe5c3b4e10d6ca4b2e2524ec16c98260b981ef504f274aab93f912a57d2e14
+DIST i18n-1.8.10.tar.gz 67943 BLAKE2B 58e8041f8cf652627a305e3d987ff2450913d3dc919ea7aae641cb484524d17312ebd3e0ee68cde1c01091e42713ea229ccb41ed3998c6bbf772d32f855ca107 SHA512 e8b10bf380241d1e6b19250cd63e727366215b4ad7e63479a02cb81a5b46a48e06db827d9df9969c2052895646ee30c237fd17c3352a2bbfed97615bb9b6cfca
 DIST i18n-1.8.5.tar.gz 67840 BLAKE2B 977bfd086c83f86a47413a5d332f09ee521fc269f4e333721ee8bf71334cff001975fe3a31fc84e600b34d0037050e00afd5f59db5a51b566d8648fec50de016 SHA512 0fd51cdc059c17b1581d187f39149bec1de4bcb06e6c9867f084fce26a8d6a6570b0058689cc30ff7ae14ea562b64ecdaf10ab3d4d2fbe246717583ca20100be
-DIST i18n-1.8.6.tar.gz 67932 BLAKE2B 779bbfb042777abd44d157c2bc8d716afbd3b1a20da3252007eae1c455cf38b1480f6e7e0d3a8407d239139d22cc50b9a6c472943f00fddacc8e48e4800ed10c SHA512 74088250e84390267dfe1eef84235e1dfc8546fa64bd49ddb76a46b363ebc260d4c18354cee6cdefc1ef79360a1e9186096e900dabba19f61cdb948f1ec6287f
-DIST i18n-1.8.7.tar.gz 67999 BLAKE2B eb0ec1bc8ae1fca99756b197f8a91b9fd7b72ea9b781b1958085ea4caaf93f0e1af0c6b70508669958b74859093d941a8e58a10be40a4ca3530db2e18a43da4d SHA512 bfb12cb1565e3eff597639199d807cc3a468cc29d1afe48a4448ea7e100fe9684c6bb1ddfc9cd258c64efb809f7bebd077fca390e16058f468511f430ace7468
-DIST i18n-1.8.8.tar.gz 67915 BLAKE2B 2f169a5c04218f4aa9e2ad3e702ba5c178619126c52aa3b436d1026c15265e98b3bc59ba65cc1db715601d06e982b89f24452f2e27a00f310cf757ec34fbe3aa SHA512 0068764336f81e704d18f9c920d10279a21145f6a22780b7678e2dbdf31bb00739b30b2e5c99a57da3caa6e9f38e77bc6d0a0624f3b2d61c367733a8373261e3
 DIST i18n-1.8.9.tar.gz 67899 BLAKE2B 56113d0879cb644a49ef79aea892e4452b65df0769a9532af44083852ed85c5afc8ac68cd6ae4f42d4b68a5aa548f7d92cf69371685c65e4cb5e3b3a0e29445a SHA512 0dfe43bcb341c63b10ace733246c2005f1261bbed23f8f38298b0712aab5047a3ddd61aa8f42c9e0cf3dee6564b67c04595234a6dfcf95db30d9a0d044483505
-EBUILD i18n-0.7.0-r3.ebuild 1611 BLAKE2B 1484a92ad9f46fd5ce3c2a98370ce8b66c8752b0482d1a67f411240a0fe1adf9a12af121ac7a5fef1792f791929525c504ce377b8bca89993da4d68a1c26603f SHA512 991a21901760e6c88503b8f144a6cb14af57de2d2ef90856177ea3b0535635c2a6c7573def25cab1c56283e28b0bc8a4706822ff727e4dc1d876eb2eb5fa62e1
+EBUILD i18n-1.8.10.ebuild 1573 BLAKE2B c245da7197985b38668aaefcbadf93c3efbc1e880a618ed46700a2039f49fb49a3f65aee5d542777e2ab887d4b00f0f98cb380d7edeb4f7abc8389fad5c7f89b SHA512 7c4f9c9b595c09791896e121062b53b194569ed27b4ba07b4aa65dffa11bd08a9ef95c72c5075e3ec76fd5c479dc3ab6fb3a0bd7b75c05b67db074a1abaf800d
 EBUILD i18n-1.8.5.ebuild 1554 BLAKE2B 01ea2c6fd2cec8c6e34a81e377138445eeff6fd3c658dea1f48f1fdc101fe5dc0c0064496753da5a918af47fb626eb8006f1d1120261303a65ce38ddbc34d00c SHA512 d0ca2c9fef218f5a97e065b66789fac5d8da8a8b4fb6e30e68b0c7dd30971e8dab3c03d6170b2af1756591ca1eaa3e454c79c9c1493f37d2066e43d7ff21f467
-EBUILD i18n-1.8.6.ebuild 1555 BLAKE2B 59a324fa7eb34034b4439797c6c65446eb2e25f095fe70727bbc9c00535f7afc1fc6412b2afa77b212f1f9ac385aa16c1f715543441dc68d3a8577ba0487ddd2 SHA512 08172d79e8bb9f1f87dfa46bc19835677ee5c02a0fbd14660bd9e7fd0687081fe200444fcbda2b6f006cacc2627c982ef7c8f2bc01bf271f5f1e808005550d72
-EBUILD i18n-1.8.7.ebuild 1555 BLAKE2B 59a324fa7eb34034b4439797c6c65446eb2e25f095fe70727bbc9c00535f7afc1fc6412b2afa77b212f1f9ac385aa16c1f715543441dc68d3a8577ba0487ddd2 SHA512 08172d79e8bb9f1f87dfa46bc19835677ee5c02a0fbd14660bd9e7fd0687081fe200444fcbda2b6f006cacc2627c982ef7c8f2bc01bf271f5f1e808005550d72
-EBUILD i18n-1.8.8.ebuild 1555 BLAKE2B 59a324fa7eb34034b4439797c6c65446eb2e25f095fe70727bbc9c00535f7afc1fc6412b2afa77b212f1f9ac385aa16c1f715543441dc68d3a8577ba0487ddd2 SHA512 08172d79e8bb9f1f87dfa46bc19835677ee5c02a0fbd14660bd9e7fd0687081fe200444fcbda2b6f006cacc2627c982ef7c8f2bc01bf271f5f1e808005550d72
-EBUILD i18n-1.8.9.ebuild 1555 BLAKE2B 59a324fa7eb34034b4439797c6c65446eb2e25f095fe70727bbc9c00535f7afc1fc6412b2afa77b212f1f9ac385aa16c1f715543441dc68d3a8577ba0487ddd2 SHA512 08172d79e8bb9f1f87dfa46bc19835677ee5c02a0fbd14660bd9e7fd0687081fe200444fcbda2b6f006cacc2627c982ef7c8f2bc01bf271f5f1e808005550d72
+EBUILD i18n-1.8.9.ebuild 1572 BLAKE2B 0495e43acd4b892882f955aa9f7393cdf5763d7deca7566ad7ea770372df8425ca8211f6c00aea2e29bcd3b58ca16c71b42e8c8c17ec6673e69085fe1f87df30 SHA512 a4bb852026ec4366eae9185c9db9a94589488e644d41c16e9e36493e755b5d8ef537ee84750584e6a3ef329f4b633b12f5fdd3aaad54968af3139bfae9a5decd
 MISC metadata.xml 340 BLAKE2B fd50e1569f22c70ba423cfd181cdfbad5348aed4ffc751ff04d38db0e3c64ec0e3d7501fd134401337337549509f7501a23e36b8a9bdd99a18a374885f8c8596 SHA512 09bf74eefe2371ac635fe302efe1b928e37cf0e1da0979f629085f357bc3e93ea87407781ad172139166f21cb979dbbc7e1bec013f8fe0a760cbbe94ab23ac64
diff --git a/dev-ruby/i18n/files/i18n-0.7.0-frozen-classes.patch b/dev-ruby/i18n/files/i18n-0.7.0-frozen-classes.patch
deleted file mode 100644
index ff6019498fc5..000000000000
--- a/dev-ruby/i18n/files/i18n-0.7.0-frozen-classes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From bbbdedc0c78ec941a84d161d5c610a358310cf99 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
-Date: Tue, 20 Jan 2015 14:34:44 +0100
-Subject: [PATCH] Ignore metadata for frozen classes.
-
----
- lib/i18n/backend/metadata.rb | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/lib/i18n/backend/metadata.rb b/lib/i18n/backend/metadata.rb
-index 52c0a29..a8d922a 100644
---- a/lib/i18n/backend/metadata.rb
-+++ b/lib/i18n/backend/metadata.rb
-@@ -21,11 +21,15 @@ class << self
-         def included(base)
-           Object.class_eval do
-             def translation_metadata
--              @translation_metadata ||= {}
-+              unless self.frozen?
-+                @translation_metadata ||= {}
-+              else
-+                {}
-+              end
-             end
- 
-             def translation_metadata=(translation_metadata)
--              @translation_metadata = translation_metadata
-+              @translation_metadata = translation_metadata unless self.frozen?
-             end
-           end unless Object.method_defined?(:translation_metadata)
-         end
diff --git a/dev-ruby/i18n/i18n-0.7.0-r3.ebuild b/dev-ruby/i18n/i18n-0.7.0-r3.ebuild
deleted file mode 100644
index b595e4109ce2..000000000000
--- a/dev-ruby/i18n/i18n-0.7.0-r3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_PATCHES=( ${P}-frozen-classes.patch )
-
-ruby_add_bdepend "test? (
-	dev-ruby/activesupport
-	dev-ruby/bundler
-	>=dev-ruby/mocha-0.13
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	# Remove bundler lock files since we cannot depend on specific
-	# versions in Gentoo.
-	rm gemfiles/*.lock || die
-
-	# Also test activesupport 5.2.
-	sed -e 's/4.2.0/5.2.0/' < gemfiles/Gemfile.rails-4.2.x > gemfiles/Gemfile.rails-5.2.x || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby25)
-			versions="5.2"
-			;;
-		*ruby23|*ruby24)
-			versions="4.2 5.2"
-			;;
-		*)
-			die "Unexpected ruby target"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-1.8.8.ebuild b/dev-ruby/i18n/i18n-1.8.10.ebuild
index b4f94ae7c427..2a5c304cdfb5 100644
--- a/dev-ruby/i18n/i18n-1.8.8.ebuild
+++ b/dev-ruby/i18n/i18n-1.8.10.ebuild
@@ -36,7 +36,7 @@ all_ruby_prepare() {
 	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
 
 	# Update old test dependencies
-	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' gemfiles/* || die
+	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' -e '3igem "json"' gemfiles/* || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/i18n/i18n-1.8.6.ebuild b/dev-ruby/i18n/i18n-1.8.6.ebuild
deleted file mode 100644
index b4f94ae7c427..000000000000
--- a/dev-ruby/i18n/i18n-1.8.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-5.1
-	dev-ruby/bundler
-	>=dev-ruby/mocha-1.7.0
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-
-	# Update old test dependencies
-	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' gemfiles/* || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby27)
-			versions="6.0"
-			;;
-		*ruby26)
-			versions="5.2 6.0"
-			;;
-		*ruby25)
-			versions="5.2 6.0"
-			;;
-		*ruby24)
-			versions="5.2"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-1.8.7.ebuild b/dev-ruby/i18n/i18n-1.8.7.ebuild
deleted file mode 100644
index b4f94ae7c427..000000000000
--- a/dev-ruby/i18n/i18n-1.8.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-5.1
-	dev-ruby/bundler
-	>=dev-ruby/mocha-1.7.0
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-
-	# Update old test dependencies
-	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' gemfiles/* || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby27)
-			versions="6.0"
-			;;
-		*ruby26)
-			versions="5.2 6.0"
-			;;
-		*ruby25)
-			versions="5.2 6.0"
-			;;
-		*ruby24)
-			versions="5.2"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-1.8.9.ebuild b/dev-ruby/i18n/i18n-1.8.9.ebuild
index b4f94ae7c427..3e97a23cc862 100644
--- a/dev-ruby/i18n/i18n-1.8.9.ebuild
+++ b/dev-ruby/i18n/i18n-1.8.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
@@ -36,7 +36,7 @@ all_ruby_prepare() {
 	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
 
 	# Update old test dependencies
-	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' gemfiles/* || die
+	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' -e '3igem "json"' gemfiles/* || die
 }
 
 each_ruby_test() {