gentoo resync : 24.12.2018

3 files changed, 72 insertions, 11 deletions

diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index a7b4a354fcd8..221539d2ee62 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -2,20 +2,22 @@ AUX i18n-0.7.0-frozen-classes.patch 1126 BLAKE2B 4cfaca964ed676d4b35b7e2aadeec36
 DIST i18n-0.6.11.gem 61440 BLAKE2B 3cfee519dd006578a328ec80d216ddae56433e1cb633e773826a2425df5ba6c518290438180af7c11c8eee4a69d1f38cd6666819d5d4b401efd026038492d853 SHA512 f3c26c13b333daed69dc044985816d79a27a489c860caaa03cd64b3ff31e3ea65aa850dd581162a264d0b0bb6bc383b12cb96c1a97d5d1d04bee45517a48b721
 DIST i18n-0.7.0.tar.gz 57647 BLAKE2B 50ea36ec616b90a261151cce47c98250e85b25ae75f90eb52ea01e8bb7e0c6288abb9055a4f80a199deb93c9ca66efd1ad568950d3f505206e0ba9ee9cdb8bc6 SHA512 8824feb3fb99bba759963d2ae34555f27b85dbac3d3001168471a27e47fc805e5ffe5c3b4e10d6ca4b2e2524ec16c98260b981ef504f274aab93f912a57d2e14
 DIST i18n-0.8.6.tar.gz 59657 BLAKE2B f0ddbee202daa4ac75f00113aa8bcac44797e782072a9626125497c9eca0545dccb2228c2d634bf0b9daab0339196c9d0cdd2df07285bd3792c9300353a60e53 SHA512 fe55729b5d9d2af7112d030c020257a98e7504aa554f691a759f5abe48058949442296ec154060d4a3243cefe0d6d420417f3aa8c857e3616de9bc996decc8cb
-DIST i18n-0.9.1.tar.gz 60359 BLAKE2B 98201124b557dd7e77ea56c491a99274f90853eabbdfd8217cd3a27888ddaf976f76c14fc2236609283546117b0c9837e272fc44aae0ff498ab7c557d6f036f3 SHA512 9726dea0b5aff12e6ddf499ddd5dea0853d345241b1ff19d6f97106a3f5f592b3336d2afddcd0717d15ed04c8098a8f9ea2870f1388353e073f78add2f0a77a5
 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
 EBUILD i18n-0.6.11-r1.ebuild 1325 BLAKE2B 6f0fdfe1af9f5c11e36f6f4d5090854f9b61752059053b143f58f63dde4eb160d79b36c71900b83cde941ae69bb2d777af999fedbe1d48b39846c11681aca5ce SHA512 0497dbca374d5afd9e7064335457fca6fdc8daf2d20bc550bc04603748f3818e9d44799ac510004afc304ecfc1774053d8928d9352da62e5d4197081791010fc
 EBUILD i18n-0.7.0-r2.ebuild 1514 BLAKE2B a027548d166ca6bd176d3cf2c7728fb0b6a22445ac22cf9e6e628a1d77f65d6c5f7262149cfdf6f22b83aa2c7a0fdfbc30d948466adc5885a2eeb58c1cce7360 SHA512 fe0eaaeda79550bd120e08fc6adf0a17d6e437e2682578dbd7dad08145e4188b37ea7f0a590d27a3548fc6b2e2989210957e39b94fe2f570234f5d7c06bfeff8
 EBUILD i18n-0.7.0-r3.ebuild 1625 BLAKE2B 047cb266a12b698343260e0ff2d2448a95005493672a1e2bad7423c8c69b08c02b596d633864db0fe301c8afb1e82031feee602765bf1c97ee7472e60c72c0f1 SHA512 6427eac2d7f85ebd7d1060d565899a976da63229cf3567b01fdf0357e22b5cc185c6e200b0d2fe219589b031c5377706136dbec7d64c1ba8f5559014f687c91a
 EBUILD i18n-0.8.6.ebuild 1350 BLAKE2B ccc38b18a766f850c3dbc7bc092b805ac15d9b7505e8443d5e39269d4f6e800d75dc09921ecd8123644b43f377573431e87aa58f5ba3624a177efddbefd6a2ba SHA512 6466ad5af282db56c980b065378ce87ad3a6495079d2f0436cdfaf1e77bfb3fc8ed120bc0eefec55d27dbeced6ac1ccb687b53fd02aebe107cb131e8a9f1ae37
-EBUILD i18n-0.9.1.ebuild 1393 BLAKE2B bfd42402e4c243c86285c6ee40019454595a17b38a338b1f7bf5794e23aa275c3b6ce7a5109f878490b6ac9690852a58977644f9b2f14b81f368df3d381495d5 SHA512 ed277f52680d78f7f790c2008bdd1a65c7c326c2d3ca265348c492f89275c1e90880605af61c641aef02e12cb50d971bd8bf3694bedd395929405115675a559b
 EBUILD i18n-0.9.5-r1.ebuild 1465 BLAKE2B 4a0c8c91473c3ff64da3d1adabac1c6d7d07bdf1e5b4fd9ae4a38b0e69e06f6c0518ac1af41159e511d7391269665187623f08d80ded2fe541774c3c2fee2eb1 SHA512 5ec9410d7f944caae29a0ffd24da13f277a6a08a6dc2d2d8fbdb390dfd3b612bfad94fb62edae952b57348ddfff2ad2f1167aa6e6e1197f530509bfd13d975b8
 EBUILD i18n-0.9.5.ebuild 1475 BLAKE2B 177aa41b3e8af750c7eaa59f3c1f8bbf0b8cbcff0b2797ba68ad11d0153339faea0e6fc70f6883d4ad084a3d68f3d07814701b303aa0b56126d9819b3621d9ad SHA512 ea69750d22d11bd6acf125dce3677bf5550d1ec5b421e449f8dcbdc3c16a883e54abf09ecd62f952fdc695744318fe7214ed502094b7d9ff3ce102a8ff31687e
 EBUILD i18n-1.0.1-r1.ebuild 1500 BLAKE2B ae1e7006df7e28a816aea7265deb8df0789832a216ef0ae9250ecad4820b77ec6d9a3685973365661373c4dd62d37a0e6a8c2e74b3c92918e97441ff60dfc0ea SHA512 3940e1b90a6f389655942b982857371bfa63d32fd8aeef999b7b83dd90e76ad65b1aee86924d678522957dfa17ebf820f71633e883171b6e2beb74c044cb2d35
 EBUILD i18n-1.0.1.ebuild 1473 BLAKE2B db2fdf21648ff851b12ce06b91a49dc23bbc1b9c2030a0cab4eefc14dcfbdf81e94c13b8155cb0b4e1e924753f5834e2786d68550961aa74d64d9602880cb2bd SHA512 663274fcf31d82f478ddcd5e4eadf84f3cb9b59b891ad42d851d493b673e06a919a638db2abe16688688fab986c921e3f75deddd74a7a01677ae793933c894c4
 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
 MISC metadata.xml 340 BLAKE2B fd50e1569f22c70ba423cfd181cdfbad5348aed4ffc751ff04d38db0e3c64ec0e3d7501fd134401337337549509f7501a23e36b8a9bdd99a18a374885f8c8596 SHA512 09bf74eefe2371ac635fe302efe1b928e37cf0e1da0979f629085f357bc3e93ea87407781ad172139166f21cb979dbbc7e1bec013f8fe0a760cbbe94ab23ac64
diff --git a/dev-ruby/i18n/i18n-0.9.1.ebuild b/dev-ruby/i18n/i18n-1.2.0.ebuild
index 97946c9477ba..f09177361007 100644
--- a/dev-ruby/i18n/i18n-0.9.1.ebuild
+++ b/dev-ruby/i18n/i18n-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="test"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -11,15 +11,15 @@ RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
-inherit ruby-fakegem versionator
+inherit ruby-fakegem eapi7-ver
 
 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="~alpha 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"
+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"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
@@ -32,15 +32,18 @@ ruby_add_bdepend "test? (
 
 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"
+		*ruby25)
+			versions="5.1 5.2"
 			;;
-		*)
-			versions="4.2"
+		*ruby23|*ruby24)
+			versions="4.2 5.1 5.2"
 			;;
 	esac
 
diff --git a/dev-ruby/i18n/i18n-1.3.0.ebuild b/dev-ruby/i18n/i18n-1.3.0.ebuild
new file mode 100644
index 000000000000..f09177361007
--- /dev/null
+++ b/dev-ruby/i18n/i18n-1.3.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 eapi7-ver
+
+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 ~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 5.2"
+			;;
+		*ruby23|*ruby24)
+			versions="4.2 5.1 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
+}