gentoo resync : 25.08.2020

4 files changed, 32 insertions, 79 deletions

diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index ccafd6c6d238..ff007d358976 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -1,21 +1,19 @@
 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-0.9.5.tar.gz 61494 BLAKE2B 2a7bb401d5e75022ba6c40c6ee08809bc8728fe9aa22f308c4d532e6c042df57970b7fbfa574494072d8e5d0e125a01498c1964780d2ad9588b0a57da299a520 SHA512 356ce1290b207ce1b3dbed4d0ae542d027e74c43f453359ebf401755a5a55fd1fd815a2f046a634246e41f54c5360174dac1076be9cb7bf82f893f0dafdbd4bb
-DIST i18n-1.6.0.tar.gz 64957 BLAKE2B c74bc8f712939ecf4a8850b047180dd6390494da778567de73a225c40a28dce7a12e63041ca90b3ac0ade9bb88be36e26a00404afe74abb8e0ca686084ac4952 SHA512 653a5368618fb938f5663edb79178ddff24fce1549d5085d5302a40ff82124ce64ffdef6c5626f07731c7cd617665906a741e2581d79c5cc161301b69cf66b0e
-DIST i18n-1.7.0.tar.gz 65125 BLAKE2B 0ead0a8208f89b778d5273e231b79e024417f211531ed25367086dd74483667a7b229ed4e023fe5cd09371977d42f5fe5e3af88c636283e373ad5ddf7cefa3b8 SHA512 f25eb48904a7c51d6e81b1959176a06397354fadd84e8da9a1704165d96b7b3eba16823186deb29eb1254332fa88f0c44529e389d7085fdc5e3adf96562db4ee
 DIST i18n-1.7.1.tar.gz 66346 BLAKE2B 4fc0ba1130e2a1c5c9c603ff06ab076ef2d9ee57e968bce8dca4f2c5ee70079af5e38e69700f4df65101c141ef3b38e2cabd478dbeb274b17504f4f818fae161 SHA512 bc6c3587f084bb582a22647eb27ac53ccfbedbf8fe16f2a5605221f8033cbb920a557b5c7fe8247d407630ae5d245db55484a4da9396f519b705878371672e99
 DIST i18n-1.8.0.tar.gz 66404 BLAKE2B 2712ccb3d08edd9058b12bbb1e7ae665f752e76a89a65a2ca67f02ae7af0ce16203941722247c9df6ae078749132f46cd52eadc686d5237534ffb67ad99f74d8 SHA512 a83f19d66532772bdbebcfdfbfa43d13cf333c1f26eb347c14dabc6325765d20222a989f32cdc3063ff138c68c7b19727c7ebb0684f120f7e5ce53c14b21316c
 DIST i18n-1.8.1.tar.gz 66350 BLAKE2B f5e44810f31b00c0b6dfdd8c56d76011eaaafc8504ba252250eb45aa3e25c181333af12c13c401ea531dfbf72174bd8e3fa98f9e2575a87be6b2b243e014dc58 SHA512 8bdf4864f649b33d6f71a4bfeeabcaaa4f7baaea7765831c72c1d5c3a139af5be478786997e7829e4dce09152ca885a01ac78938dc8da93f2fac86f0635ca3f4
 DIST i18n-1.8.2.tar.gz 66623 BLAKE2B 2bc2a6174ae9b6a3342d925d29501e9cf959bf78f683a446330ab40064f39bbba5a715acf6b3baa2a1250308823880f9f91ec09aed03686f3d5bcbc314ef5807 SHA512 20cc06ab63c1e4343a49e2d979399dd599dc14e9a0faed260874d2c44419ca9b7262eb95b9949ed5cf0439b79854f5d810fe1731823b625449065666102340d3
 DIST i18n-1.8.3.tar.gz 67360 BLAKE2B 8122904d2d4167c4502ce01c4d7c72949a5f7af0f0efb73bd98341cd8ebe35649acdda53e04f376fbc4efaecbe1a984a7efd13e2dce5953aacc1d66a84b8f2e9 SHA512 d122eba8af72b7b6fc737775a188862c7dcea280e783323a6cc624dbfb87618db45b01a93fcb8cdf08973e012d0e2089f5debec68be75c64deee0136436cf0ec
+DIST i18n-1.8.4.tar.gz 67620 BLAKE2B c2f00d1cf723fb7fa12a867ab98f954674727454710bee005c6ade31b53fffbe6914ed3bd888e7153a29713c09b7a1572b519c20b0d1eeb54ce3f618d4c509cb SHA512 3c782d2e1f5cd8ea6aebc80fb469182216e8d0f87126aed1bc432aa41ab190514985f185278d5349ad35e4a13c4a56dbd750c89a83899fb2ac700f40a48385c0
+DIST i18n-1.8.5.tar.gz 67840 BLAKE2B 977bfd086c83f86a47413a5d332f09ee521fc269f4e333721ee8bf71334cff001975fe3a31fc84e600b34d0037050e00afd5f59db5a51b566d8648fec50de016 SHA512 0fd51cdc059c17b1581d187f39149bec1de4bcb06e6c9867f084fce26a8d6a6570b0058689cc30ff7ae14ea562b64ecdaf10ab3d4d2fbe246717583ca20100be
 EBUILD i18n-0.7.0-r3.ebuild 1625 BLAKE2B 047cb266a12b698343260e0ff2d2448a95005493672a1e2bad7423c8c69b08c02b596d633864db0fe301c8afb1e82031feee602765bf1c97ee7472e60c72c0f1 SHA512 6427eac2d7f85ebd7d1060d565899a976da63229cf3567b01fdf0357e22b5cc185c6e200b0d2fe219589b031c5377706136dbec7d64c1ba8f5559014f687c91a
-EBUILD i18n-0.9.5-r1.ebuild 1465 BLAKE2B 4a0c8c91473c3ff64da3d1adabac1c6d7d07bdf1e5b4fd9ae4a38b0e69e06f6c0518ac1af41159e511d7391269665187623f08d80ded2fe541774c3c2fee2eb1 SHA512 5ec9410d7f944caae29a0ffd24da13f277a6a08a6dc2d2d8fbdb390dfd3b612bfad94fb62edae952b57348ddfff2ad2f1167aa6e6e1197f530509bfd13d975b8
-EBUILD i18n-1.6.0.ebuild 1545 BLAKE2B 67ef60ced1658c425b0ee9db6f80e5aef5e0ed84294b4f286235c793abd78f552276b636fb3dabc2f81142226729f8930d307b22957873e07f0c78ddd30cc8cd SHA512 de1abcc30c0ced6fd174d80ff62084b0b5e3ec943e3b92b65e6a0b932e6d86b417c507e2bc3ceea7d75ff65a1fa8792e55405883a597bc3d304f2d3376de3821
-EBUILD i18n-1.7.0.ebuild 1490 BLAKE2B 8710a7f0d15169feede283cbc30cf5f96ecf0816056be29c4e1d1bded089e66f0d5dce3cc8b6990f29f51574d73d2520a8944cd7b3af1b288d73378835a4eadb SHA512 c1b2815ca1e983d2e9d073c1e61a2c7fc36665f20eaa87217e33ff32efabda05644d697687bfe31947d61797e361417f878160a06eaea02ad9289aa6949a8770
 EBUILD i18n-1.7.1.ebuild 1523 BLAKE2B 7b24be876aedd1d5dfeb970f4a407c8aac2099bf521c4ba648e86d6bf1b3adb69405c0d22c34cde7cced16923938d65c0e1f724e98ec56332a6469a2d2c37306 SHA512 61ea946437e2a930ed644be7c84417420e2334819244295deda685440cb5c3dee02becc3f43e5bdef82c29531b8458f7a0baa210e7d4f0051a99795f19c7304e
 EBUILD i18n-1.8.0.ebuild 1524 BLAKE2B 2609711dedf31dff84450a9e28ef7e6a341b4880d96a6320245a7375d340ae33cb126f55c3b0ed9472eb279fd8c24e96774e3d7e69af9d9352559825e1994721 SHA512 0c24dcd977f4344202e53ebd991ab9de6d00247b85d8d56c2a72959bba8a22ebe3c313ed93627dabd6dd8c6de0eb078bcf02b24f71892b5664593c3e17d63d8b
 EBUILD i18n-1.8.1.ebuild 1524 BLAKE2B 2609711dedf31dff84450a9e28ef7e6a341b4880d96a6320245a7375d340ae33cb126f55c3b0ed9472eb279fd8c24e96774e3d7e69af9d9352559825e1994721 SHA512 0c24dcd977f4344202e53ebd991ab9de6d00247b85d8d56c2a72959bba8a22ebe3c313ed93627dabd6dd8c6de0eb078bcf02b24f71892b5664593c3e17d63d8b
 EBUILD i18n-1.8.2-r1.ebuild 1561 BLAKE2B dc61531c8c7e0cb17e10846b735873eb8bba11b2ce59356bc1f424572ffdc4c3c42d802d35e9a86ca13e3d2b1b3901167d9eccb0fbfd1f966afbc0739b224a08 SHA512 265b87816e9bf33b3cca9156e43601056be8befa9d7721fcbfb7a2fbc87d31798c4b92c1c4a357b3e51a79a4973bb7088670dfe9253e1d785ede46e21705f4f2
 EBUILD i18n-1.8.2.ebuild 1524 BLAKE2B 2609711dedf31dff84450a9e28ef7e6a341b4880d96a6320245a7375d340ae33cb126f55c3b0ed9472eb279fd8c24e96774e3d7e69af9d9352559825e1994721 SHA512 0c24dcd977f4344202e53ebd991ab9de6d00247b85d8d56c2a72959bba8a22ebe3c313ed93627dabd6dd8c6de0eb078bcf02b24f71892b5664593c3e17d63d8b
 EBUILD i18n-1.8.3.ebuild 1561 BLAKE2B dc61531c8c7e0cb17e10846b735873eb8bba11b2ce59356bc1f424572ffdc4c3c42d802d35e9a86ca13e3d2b1b3901167d9eccb0fbfd1f966afbc0739b224a08 SHA512 265b87816e9bf33b3cca9156e43601056be8befa9d7721fcbfb7a2fbc87d31798c4b92c1c4a357b3e51a79a4973bb7088670dfe9253e1d785ede46e21705f4f2
+EBUILD i18n-1.8.4.ebuild 1554 BLAKE2B 814c7e0a899ca240cf8c13e402c184f70ee5b96df89a9198553db20148754f5a3561a1fd19c7d987115dccb9843592fdb071f15fcaa462ac8920dc9464282bda SHA512 fa72fa5a8588760967eb8039b7caedcd4279b320f0a1e885c6350c46ceaebb134984800385015951d11d2df6fa035bcd77e4985af9c46475b7732c9d41dcedbe
+EBUILD i18n-1.8.5.ebuild 1554 BLAKE2B 814c7e0a899ca240cf8c13e402c184f70ee5b96df89a9198553db20148754f5a3561a1fd19c7d987115dccb9843592fdb071f15fcaa462ac8920dc9464282bda SHA512 fa72fa5a8588760967eb8039b7caedcd4279b320f0a1e885c6350c46ceaebb134984800385015951d11d2df6fa035bcd77e4985af9c46475b7732c9d41dcedbe
 MISC metadata.xml 340 BLAKE2B fd50e1569f22c70ba423cfd181cdfbad5348aed4ffc751ff04d38db0e3c64ec0e3d7501fd134401337337549509f7501a23e36b8a9bdd99a18a374885f8c8596 SHA512 09bf74eefe2371ac635fe302efe1b928e37cf0e1da0979f629085f357bc3e93ea87407781ad172139166f21cb979dbbc7e1bec013f8fe0a760cbbe94ab23ac64
diff --git a/dev-ruby/i18n/i18n-0.9.5-r1.ebuild b/dev-ruby/i18n/i18n-0.9.5-r1.ebuild
deleted file mode 100644
index 92ea56215747..000000000000
--- a/dev-ruby/i18n/i18n-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~x86-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-4.2
-	dev-ruby/bundler
-	>=dev-ruby/mocha-0.13
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby25)
-			versions="5.1"
-			;;
-		*ruby23|*ruby24)
-			versions="4.2 5.0 5.1"
-			;;
-	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.7.0.ebuild b/dev-ruby/i18n/i18n-1.8.4.ebuild
index a6ca426bc748..e0716b086e27 100644
--- a/dev-ruby/i18n/i18n-1.7.0.ebuild
+++ b/dev-ruby/i18n/i18n-1.8.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="test"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -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 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
@@ -36,16 +36,22 @@ all_ruby_prepare() {
 	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
 
 	# Update old test dependencies
-	sed -i -e 's/12.2.1/12/' -e 's/1.7.0/1.7/' gemfiles/* || die
+	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"
+			versions="5.2 6.0"
 			;;
-		*ruby24|*ruby25)
-			versions="5.1 5.2"
+		*ruby25)
+			versions="5.2 6.0"
+			;;
+		*ruby24)
+			versions="5.2"
 			;;
 	esac
 
diff --git a/dev-ruby/i18n/i18n-1.6.0.ebuild b/dev-ruby/i18n/i18n-1.8.5.ebuild
index 865fb025f66c..e0716b086e27 100644
--- a/dev-ruby/i18n/i18n-1.6.0.ebuild
+++ b/dev-ruby/i18n/i18n-1.8.5.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 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 eapi7-ver
+inherit ruby-fakegem
 
 DESCRIPTION="Add Internationalization support to your Ruby application"
 HOMEPAGE="http://rails-i18n.org/"
@@ -19,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 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
@@ -37,16 +36,22 @@ all_ruby_prepare() {
 	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
 
 	# Update old test dependencies
-	sed -i -e 's/12.2.1/12/' -e 's/1.7.0/1.7/' gemfiles/* || die
+	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"
+			versions="5.2 6.0"
 			;;
-		*ruby23|*ruby24|*ruby25)
-			versions="5.1 5.2"
+		*ruby25)
+			versions="5.2 6.0"
+			;;
+		*ruby24)
+			versions="5.2"
 			;;
 	esac