gentoo resync : 15.11.2017

2 files changed, 6 insertions, 11 deletions

diff --git a/dev-ruby/arel/Manifest b/dev-ruby/arel/Manifest
index 9e0afd73897d..fa04200c0785 100644
--- a/dev-ruby/arel/Manifest
+++ b/dev-ruby/arel/Manifest
@@ -1,13 +1,13 @@
 DIST arel-5.0.1.20140414130214.gem 52224 SHA256 c941f07bad89af26e8837c73d8a399b7777c721609f759eda015ed0081601636 SHA512 9f4c768712492ef8f7a938d89ce9c54c4e7c7ec2ff53ee52d5d12f0cefd7960895049f112b772864d034a4419acab91511173ddaab70a9f3d4027899af150011 WHIRLPOOL ebfae83108a1049dff2cdeb697c1c0514baa2ebdfbc0d885e586240397b33af8be8181268017a759fab9b7655992abceed844d80b91f8d85f8e9dfca98c3bc32
-DIST arel-6.0.3.tar.gz 52003 SHA256 476a51333ec8588213bbd91174af239d4910a68cd14a99de29d44ca5c24ec37a SHA512 8e04daacae0b07fd02c5623e86b87940e0d712e0ab7d85354d2ba8a9e0cc30d1549f128a39732d8dac5b83f3f77c1bfadb650b5726d1faf2bfeb64e0d51a8f04 WHIRLPOOL cae263da4bf2f3f869b3d658b0ced3f57349172f95ec05952ae6b2896704bc06c552814485ffcdc85d36f19ed68c386097e4b16c5317b05144b8176193896938
 DIST arel-6.0.4.tar.gz 52401 SHA256 916c534bc795aa775fbe6f659d54d37698dc9f8af7f71e12b0eb592ae41f864f SHA512 65833d68b8adf032ef461ac4b81307e59220a3c7b2c2aa33ed4eaeb830c6d6c379e33ddbcfa53edd5f398fa6a2aef293a4daac7c2c93ed86710bd0cf2b5ff7ee WHIRLPOOL 60450aff82f9f48f5c0173c52d0743b7768fe594491c748cbdc8a1f8907c68e9e52e84e2742c67f8e89afcdcb0f8bf781f05dc2e0b691810ded918696f74cb72
 DIST arel-7.1.4.tar.gz 58716 SHA256 ec4674cac0819f9baf406037b9f4a772126584083094786aeafb9bc6242c6bfd SHA512 5e67b582e4fef0c69db3f3364f322409b1041617e37d6ca806e242f5da65e140cca478e30cf5f99142f96fb3329ee070fdf0b4dd45b237a98883badbb97929a2 WHIRLPOOL 4554490780f136a50d523ffaaa3316aae08b48fb3def65f5401a6d913adc6f7fcac105d64e79175459dbc1f3e037e05a3656fa1c41117e1c5d65f5245b6a1978
 DIST arel-8.0.0.tar.gz 57781 SHA256 6d3f2167afb33243a45b705a9e3980f2eeee569605d7b017dea52f231cd3cbc5 SHA512 15b99910555a6b4641573f90a126ac3c7fa04e71885eefcafdc6d075ff2c7e733c08a880bfb523e99604f912e2850a607edb757501b46695fd5366e94d8057a6 WHIRLPOOL d53eafd07f21805d4633efa3b8888ce2dc91ae6531ed3d24ee3a4e951ca58cd5370f9574ba444f22e3d20875032608458566bd2d92c626c40f533ba6d9cde6e2
+DIST arel-9.0.0.tar.gz 59065 SHA256 6ed0de23a5abe0f57cd4382ab8478beb471bc83544831f68cea953057ffcad4c SHA512 9d2958765058fa8a4f6a8d7d4c9671d92054748eabe5b94796ff5611cdcd6bb24906cc5e813fb21396aaa681e5703d2d4bce8cc9884f2d057042d1b06bf6f0f5 WHIRLPOOL 9311bd489cef40827ecefbc0ca76931b9403999a90dfb6c53c91ddfd7bb44f8c50eb8e9690fd9c4c8dca0b4b7db5c364232fef8b7671fa88b861b1bc27ef99b7
 EBUILD arel-5.0.1.20140414130214.ebuild 809 SHA256 740f3febe3388eb333d8760dfa1804d81454f49bb365fe39cac5ab42cf013097 SHA512 56f2965ff6bfcd728aeb22bad53137867ccbf3db0e3367c85c4284e80c1f39c069b90ab88669b16679918d1a70579cf087a288357329642681efacc97b2f4424 WHIRLPOOL b84ea6179b8103a9f5dd82560337e89e8ece82c1e79e9552c6f4d7aa1aa16f574a37e6f2d4b57546c6cd18425388871a89522d583cb9ef5c4296779732a98e29
-EBUILD arel-6.0.3.ebuild 1067 SHA256 cbcc9537582082062e008adfa95d333c0350471de71c974aa356ed8a1de299b5 SHA512 9d1045cd64f37ea34b342f504f11c0b6111e596a94dc66dec44c9a97401c18f851550e199ce6eaf03385e21f0e185e67a526a9c68ae26a1702a5b36f8ce6f787 WHIRLPOOL ea0fc0018ca0f6fa994bb4c78bfd978e9d38598586351b3653e4ea07ae45ac77a1062f071b34b052db7cbe9cae7d14f9c207ae399254bb60c4285110ccfe7c0b
 EBUILD arel-6.0.4.ebuild 912 SHA256 74d4e838604d654ce07cbfe40dea1ca24e169f5c3ae5f243695aa0e5db6a5872 SHA512 61d1cb21ef724966acc7887146ce9156ccef8977ea8129b77784e3a9484bd705ba692f5261dd9417cef4b24ff40f708f27b7110499332543926b80b496c95a46 WHIRLPOOL 5535d42617144e8a896065ff046bbb0ca4a71cf748fd762b66e0b36a0f07e681132d6dd5242243cd1ecce77048e3875e4dd341d3ced22474d2cae989a402f75d
 EBUILD arel-7.1.4.ebuild 899 SHA256 25b4eddde879b4508a559da2cd8589e37d588d42fbf09f10a2e90db6774ace0f SHA512 9127d620300a80ac8f3337c585a976ba43894949e460337be9d9baf9b8db75851bb4207f6239eb5165d9005b13ff5f7f70929ddfabe543998063e387d178d293 WHIRLPOOL 67e3aa26ae14fe5ddf275ca56a014e3d399af14e43c8b03048fd09a966ceb405a3babae1f7c5b59ab004df76a24cb89b0a9c16df941aec232d76f466e90cf5c7
 EBUILD arel-8.0.0.ebuild 906 SHA256 9eeb6357cddbe11e47b8f9a8d9fbc5f6ff4333818f279a6516c0b6c04de33653 SHA512 7a36db0030db6a7376e02aceb7bf75499b47024245c7c383616c087a63d689382d23136ba1bdf3f749c2b8e68b1e21e87610e86785a43f40750c58632f4e9775 WHIRLPOOL 762f9f991cbdada62c95022908bc43014f1e6d27d3cf720635ced657c7418ab3aaa0fbc9d9f6eb414209fbcc30c802fa4ed4505ea83e5abc006434940c78c14f
+EBUILD arel-9.0.0.ebuild 899 SHA256 afbf110cf3f90b823d46a31699727c19ec76cf0094549ecee51fa7ff2da0c36d SHA512 0fe8cdfdd9dc23c6ad3573d63aa4d1508487c62157ebfc3eeb70e569c1bfbf66a92b219b7da7d1dcb7cdc18abe9fbc5d4a5e86bedf7f2a76e6231b6dd0a44b00 WHIRLPOOL 034b72b939471f621e8e936a278c26acc50d0c43745f612443030112bf3d0f6c4c8f386dafedd89a7db6a6f8cbfd6df42f6208a36d07ffffe935bdd905333a30
 MISC ChangeLog 5059 SHA256 7c0f092141cdb5728467bc5198c20d9f3fe8779936df99805119a9b1fa70a785 SHA512 21387a38db954e9f7c4b00559c0894563fea92db02c1172c114d738f90e47b0f6eb230e8b5e85bd2616aaf3a545c07ce3292930ea823d09507f625536a032ee2 WHIRLPOOL 0654d4bae1c7136c46ae5e27df8209cef97f782c92cdf7d486bf1d49e710ef9dda5e9104835a4c1eddce37dfc87c046057c80c6ca1ee5857c5aa8a9352408eb5
 MISC ChangeLog-2015 6949 SHA256 e8c519414cf702e1f1fb85122b7b4e728183b04297e5ffbe8be88ac7cfc89efe SHA512 454ada77cf458b098493cda7027ff7695b4f94991b998c6ee01fdbdd05021f069500799d0fae1c74c23daf5fa5899312742fd6c2d7e3411538cb4ed6871c56fc WHIRLPOOL e180dede37196d9caf853ed8bdedeee907e2b08d6e56aa565008e2c96c2954101b74b225bfb2a5c5b2872e2121b26b99b53b706e7740d33112cc52e0d4c3d389
 MISC metadata.xml 336 SHA256 6c991c03a188977b2ae4f7feae7ec63cf9df46329efffc00db812b49b14f5aa9 SHA512 f1a6feaa1759411e75d8d11887d411e1e99d2c758b8d8eafb13015a710682b525b4c8b2ca196d2d6de0d7335842a74d28657ff578db015710eacbf4450137639 WHIRLPOOL 2ca7915b0081f008e585226bc9214c853c67ae4f3426c478c832be98fd6f5bfe7020a3844c693f24a64541b6db06031455da81b3934a980831a4f5fcd18b8f8d
diff --git a/dev-ruby/arel/arel-6.0.3.ebuild b/dev-ruby/arel/arel-9.0.0.ebuild
index f735d8728b4d..401dd33dbeee 100644
--- a/dev-ruby/arel/arel-6.0.3.ebuild
+++ b/dev-ruby/arel/arel-9.0.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.txt README.markdown"
+RUBY_FAKEGEM_EXTRADOC="History.txt README.md"
 
 RUBY_FAKEGEM_GEMSPEC="arel.gemspec"
 
@@ -16,7 +16,7 @@ DESCRIPTION="Arel is a Relational Algebra for Ruby"
 HOMEPAGE="https://github.com/rails/arel"
 SRC_URI="https://github.com/rails/arel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(get_version_component_range 1).0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
@@ -29,9 +29,4 @@ ruby_add_bdepend "
 all_ruby_prepare() {
 	sed -i -e "/[Bb]undler/d" \
 		-e '/specname/,$ s:^:#:' Rakefile || die
-
-	# Fix tests by providing an engine.
-	sed -i -e '591 s/new/new Table.engine/' \
-		-e '606 s/new/new Table.engine/' \
-		test/test_select_manager.rb || die
 }