gentoo resync : 22.01.2019

5 files changed, 12 insertions, 179 deletions

diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index 00f22a48de97..9ac610a58ed6 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -4,20 +4,17 @@ DIST i18n-0.7.0.tar.gz 57647 BLAKE2B 50ea36ec616b90a261151cce47c98250e85b25ae75f
 DIST i18n-0.8.6.tar.gz 59657 BLAKE2B f0ddbee202daa4ac75f00113aa8bcac44797e782072a9626125497c9eca0545dccb2228c2d634bf0b9daab0339196c9d0cdd2df07285bd3792c9300353a60e53 SHA512 fe55729b5d9d2af7112d030c020257a98e7504aa554f691a759f5abe48058949442296ec154060d4a3243cefe0d6d420417f3aa8c857e3616de9bc996decc8cb
 DIST i18n-0.9.5.tar.gz 61494 BLAKE2B 2a7bb401d5e75022ba6c40c6ee08809bc8728fe9aa22f308c4d532e6c042df57970b7fbfa574494072d8e5d0e125a01498c1964780d2ad9588b0a57da299a520 SHA512 356ce1290b207ce1b3dbed4d0ae542d027e74c43f453359ebf401755a5a55fd1fd815a2f046a634246e41f54c5360174dac1076be9cb7bf82f893f0dafdbd4bb
 DIST i18n-1.0.1.tar.gz 61536 BLAKE2B d439410004511f90e010beb7ab90029367e9ddb876c2215e101fa9a3385c0420a774586ec626136957dedd66c8c7b3b9ddcc6570e3a7075bbd5a90e3508ddea3 SHA512 1d0e05e04318e31d35d19c1af3b6d3aaef3d45df9b2868b65fef9aa3628c9502c6f8fca4beb52aa8c7c914c46ff159da489bc2ccac69013808459e709358b4ca
-DIST i18n-1.1.0.tar.gz 61628 BLAKE2B bed8a93362659919194de09f5963fcd0129cfdacb7ebe9e08d8a5f8efc46748c02ad39197daa7ac68d8202ea8c81dcbe65d94a3ea1b675e74f93595dbb474235 SHA512 528e3c32d68aefe1ac4b0470249af2aec9a16b76f57f703182b6540d8e18625bf7e50aeda7782b6c64853f1be5561fe49fcb4d641d388371f8066b92d5a27161
 DIST i18n-1.1.1.tar.gz 61797 BLAKE2B 3ba842d195075f02fd46be4e9b69250c93007da0528d88446b662006682130ac31a7d00aaabe6081f2cb1df0b415f1610ae26a3bbeb446029165549f59d87697 SHA512 7fff47ab8aeab3e03546af4c4b7738ccaca2fb3fb7b16e3cb0addd3ec57091c469a95bf4848dd01dbc5f831bee280c4ec15e6d334ce1578e4b3ed27f98077111
 DIST i18n-1.2.0.tar.gz 64271 BLAKE2B 9d8dc9a8187fb69317af6835ac2ee98219f662f6542be5bb96d678ebc63d5a57b33988d1cd435213c9d79cb6886be491c54e8624c481d56a2de91e8ac094a082 SHA512 9952fba2f923ecb76c736356599c9f205ed754283d07ac371ee2016633621187124a102b84d3f9431d8b074e9042377237846c512df431a02e86bd9c50c09c57
 DIST i18n-1.3.0.tar.gz 64414 BLAKE2B 8ef3da9b2513ec7c0c10e04e3096361fac4b874f2591ba6354be09999fe3fe924867a1741eacaf967fbfa263588abbe4bf2daece1635797f3dd8bc489e19e2b5 SHA512 08884f4e415e71794969a87f326edc1bce5d7cba9a43413f8c24a375fd7378dd40e15a7d161021ea4af8d5c6e692595b86da9793e910f99dbe51e166d404491e
+DIST i18n-1.5.2.tar.gz 64086 BLAKE2B 8c50fd40a5d8f103e218bc47d15b1c6a51336c1b9340f474a35c178d84e9d0198151c5643cd6416b4e007c33c02de4d011acb40b1b02d6a238563a0a669c1044 SHA512 438145abed34b27af26dc513d0dc30e32412ace3a057cf14a8bc8cb64734ac531bb0a8b7512372faed995fff8bce7a8dd4e44ee29560704646ab35d46d58db3c
 EBUILD i18n-0.6.11-r1.ebuild 1318 BLAKE2B 9605562c9b7fb27b4ff15735bd96eef555caa62127010a0e1862e5a9d1831945e0dd42b3ccc410e067a2fbe1c33a8d8d8128696a26401505f27a8c91712b6417 SHA512 335e3acd5278556bad1b0b2a0f6da24a13588b5b54fe27323220d2ae3472791e00fc91e003cea2dfe1548c21c0912ea771a722fac8efb21ec682628d3b2f3815
-EBUILD i18n-0.7.0-r2.ebuild 1507 BLAKE2B aa324ea7ec057cdb4258a2550d72d5712dd5ac00be98a882723ef994639556dcce9379860969153e38541e4c9a905a2cefc0a205ee72f7608ebbf591c5bcffcd SHA512 b12b8d993b24add67141638ae9c33b8d6a7098ba714f69c201bafe6bc1e1ef2476fb2a4e50e94bc880f7bebbc5bac3b3ecee91b812136849a219a2dffd3c4bd2
 EBUILD i18n-0.7.0-r3.ebuild 1625 BLAKE2B 047cb266a12b698343260e0ff2d2448a95005493672a1e2bad7423c8c69b08c02b596d633864db0fe301c8afb1e82031feee602765bf1c97ee7472e60c72c0f1 SHA512 6427eac2d7f85ebd7d1060d565899a976da63229cf3567b01fdf0357e22b5cc185c6e200b0d2fe219589b031c5377706136dbec7d64c1ba8f5559014f687c91a
 EBUILD i18n-0.8.6.ebuild 1343 BLAKE2B bda6c25dd4c968b7cee743e661beaf23e09b11ac07733e612bb605e90f12ab15e997293757772b9c501977544b65641820a93d6f5696b1be21c440a20fc72b51 SHA512 0e698ab7581aa26cc12c1701c8bade99c61c49301a22d2430a2f259c9c0e2253efd0c0d12ae47985bf3caf09dbe997f74cb518b03dc4586cb72c96c6dd9f7261
 EBUILD i18n-0.9.5-r1.ebuild 1465 BLAKE2B 4a0c8c91473c3ff64da3d1adabac1c6d7d07bdf1e5b4fd9ae4a38b0e69e06f6c0518ac1af41159e511d7391269665187623f08d80ded2fe541774c3c2fee2eb1 SHA512 5ec9410d7f944caae29a0ffd24da13f277a6a08a6dc2d2d8fbdb390dfd3b612bfad94fb62edae952b57348ddfff2ad2f1167aa6e6e1197f530509bfd13d975b8
-EBUILD i18n-0.9.5.ebuild 1468 BLAKE2B f9baa739e95d750bc504091fee0cc3f603c564174b3101f7c0f770f0297f767e851c71a0ee0c15d7e7db612dcca61f7562414f44dc11031ed1a7ee86f27c7844 SHA512 ec1241f989c7e69a6fa4532d9de350853cf64162a3eb972a78a602c2bdeaabf129d4f53fda29905b592705284a18bb465bb29415dbc845d15c81c84105957587
 EBUILD i18n-1.0.1-r1.ebuild 1500 BLAKE2B ae1e7006df7e28a816aea7265deb8df0789832a216ef0ae9250ecad4820b77ec6d9a3685973365661373c4dd62d37a0e6a8c2e74b3c92918e97441ff60dfc0ea SHA512 3940e1b90a6f389655942b982857371bfa63d32fd8aeef999b7b83dd90e76ad65b1aee86924d678522957dfa17ebf820f71633e883171b6e2beb74c044cb2d35
-EBUILD i18n-1.0.1.ebuild 1466 BLAKE2B e5c2ef2894235c0b64cfc053ce7cb4884821de7b3ccbc3e38f52f87b9fed0769d1943980212393f8ab18718e056f8f1cad14bdce799f7d3f85c4312f7fc5efe2 SHA512 65030088c9a6dcaa275774757d0cd4d60e7a30080866c3e51014b06f6f41e617f4e0cf81e4a6e37d29e04d9d685376ac1ebc43f3e0cdf82ca72f3aa4f07bcbb3
-EBUILD i18n-1.1.0.ebuild 1442 BLAKE2B 0ceec4a90238824aa7fa6cf47d15d3a01ea754ab80a82e054f93a068ac285f62dacdaf4b30617620a1d6db671f5fef328204707494cede8903dd7db04942d5b9 SHA512 6e0175b2ad2e2d693f79c176d336fbba21b8d11fcbd4bea6f1ad9e6fe8730d2d527352bfcbe52960a9371719eab018c2bf1fed665614795827408b03cec41be9
 EBUILD i18n-1.1.1.ebuild 1439 BLAKE2B 4d045839b7f25f38878b3b5c98d45f8c1e37b2b2fb046ca152378e8b5b622ee0a764e0576ba6cbeb8bf6a35f64760770528fb420f5187effdbc7648e6047aa47 SHA512 4451f13217a20a737191bbd72ef5cb469e749629b66eef875334b8a133d4b6c91f67f4c36b037cbe2529b2ab3032bec04b68e178d6d49388440c29589128aa78
 EBUILD i18n-1.2.0.ebuild 1443 BLAKE2B e6aa3a95957deedb623e02be35b0d4904cef29561472602f1b0f85a7e7b383319889c7f387100b0eca19b7556da86fe2c8d071960a7b5e2fe45d6a437c20d13a SHA512 b05679b5da8b8a2bdd08a6b75c432cd5b6fb9be0b4d63f091b1368133e5cd615cb9025c0a81f21736b91614849e31c3ce8ba3fa2b43ffb4b20fa99fdeb596c76
 EBUILD i18n-1.3.0.ebuild 1443 BLAKE2B e6aa3a95957deedb623e02be35b0d4904cef29561472602f1b0f85a7e7b383319889c7f387100b0eca19b7556da86fe2c8d071960a7b5e2fe45d6a437c20d13a SHA512 b05679b5da8b8a2bdd08a6b75c432cd5b6fb9be0b4d63f091b1368133e5cd615cb9025c0a81f21736b91614849e31c3ce8ba3fa2b43ffb4b20fa99fdeb596c76
+EBUILD i18n-1.5.2.ebuild 1539 BLAKE2B 207a9bec8f7a74103a01350c43a359d5f5127b74723e74466bb35a2682b8aeaac2b0e9cf0d86013a98dbb1639e949c1471daa92f7a4f3e63e2802ff7ebd3aade SHA512 17a25261a24841589c83f1dab871816ef9b572fd50ab923dcebfced55295817b235ab6bf592264c002b19e2794cca4b973d4a3afb9c489a006d3c0ee9783a847
 MISC metadata.xml 340 BLAKE2B fd50e1569f22c70ba423cfd181cdfbad5348aed4ffc751ff04d38db0e3c64ec0e3d7501fd134401337337549509f7501a23e36b8a9bdd99a18a374885f8c8596 SHA512 09bf74eefe2371ac635fe302efe1b928e37cf0e1da0979f629085f357bc3e93ea87407781ad172139166f21cb979dbbc7e1bec013f8fe0a760cbbe94ab23ac64
diff --git a/dev-ruby/i18n/i18n-0.7.0-r2.ebuild b/dev-ruby/i18n/i18n-0.7.0-r2.ebuild
deleted file mode 100644
index 5bd69cc41909..000000000000
--- a/dev-ruby/i18n/i18n-0.7.0-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-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_PATCHES=( ${P}-frozen-classes.patch )
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-3.2 <dev-ruby/activesupport-4.3
-	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
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby22|*ruby23|*ruby24)
-			versions="4.2"
-			;;
-		*)
-			versions="3.2 4.0 4.1 4.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-0.9.5.ebuild b/dev-ruby/i18n/i18n-0.9.5.ebuild
deleted file mode 100644
index 6a6103351deb..000000000000
--- a/dev-ruby/i18n/i18n-0.9.5.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="ruby22 ruby23 ruby24"
-
-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
-		*ruby22|*ruby23|*ruby24)
-			versions="4.2 5.0 5.1"
-			;;
-		*)
-			versions="4.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.0.1.ebuild b/dev-ruby/i18n/i18n-1.0.1.ebuild
deleted file mode 100644
index 6ef701abf1fe..000000000000
--- a/dev-ruby/i18n/i18n-1.0.1.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="ruby22 ruby23 ruby24"
-
-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)"
-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
-		*ruby22|*ruby23|*ruby24)
-			versions="4.2 5.0 5.1"
-			;;
-		*)
-			versions="4.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.1.0.ebuild b/dev-ruby/i18n/i18n-1.5.2.ebuild
index c97771c806f9..c6aacbabf2a5 100644
--- a/dev-ruby/i18n/i18n-1.1.0.ebuild
+++ b/dev-ruby/i18n/i18n-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,9 +25,9 @@ IUSE=""
 ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
 
 ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-4.2
+	>=dev-ruby/activesupport-5.1
 	dev-ruby/bundler
-	>=dev-ruby/mocha-0.13
+	>=dev-ruby/mocha-1.7.0
 	dev-ruby/test_declarative )"
 
 all_ruby_prepare() {
@@ -35,15 +35,18 @@ all_ruby_prepare() {
 
 	# Remove optional unpackaged oj gem
 	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
 }
 
 each_ruby_test() {
 	case ${RUBY} in
-		*ruby25)
-			versions="5.1"
+		*ruby26)
+			versions="5.2"
 			;;
-		*ruby23|*ruby24)
-			versions="4.2 5.0 5.1"
+		*ruby23|*ruby24|*ruby25)
+			versions="5.1 5.2"
 			;;
 	esac