gentoo resync : 02.04.2018

3 files changed, 9 insertions, 9 deletions

diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 3cf10d733614..0ac34b1a81a4 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,15 +1,15 @@
 DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
 DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
+DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651df49be3866e2df989d464a23ac5865081d243e6c6525837fb33099c46b6009cc667d0e03444cbcf9631588 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f
-DIST rails-5.1.2.tgz 6124489 BLAKE2B a7d71b99f1b9eb33e76c7941909407be0a3b086581bf3ddb4fe811a6b91bb129edb504c6fe3593a3b347ab035f7325e8e497b926a24b699a56725f89161e942e SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872
-DIST rails-5.1.3.tgz 6130089 BLAKE2B f61c016af6f5336726127372c1dd3d85088e11c0b58998ce40155b09087dcdb341a15d3ff57692d744538b571337a2e1e278542590d82077a35dc1e336539f85 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236
 DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
+DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 EBUILD actionpack-4.2.10.ebuild 1813 BLAKE2B ea7e07d54d35fd6754cf574aa2f98ded244d8df6f8e86e4e639295b6651353c71461a6cdddde94062d820fca03746e49573e9ea4e134d0e37d254f99345db838 SHA512 41f1e17fd3f40e72d6c5ed659dae4281a7a94b5b2528f2931f0203f4ab778ad2eea16e4110aaa7c5e320073608667b5fc41c31d12d37c39eedd5f4b0c771bec8
 EBUILD actionpack-5.0.6.ebuild 2095 BLAKE2B 90e1cc87ff932dcb868e0c75479adce4137e9d6472ad1520e00d324242cbff1a2462ff8579fb5a435525ea94586f8458899b382ad4ed0bcce2452ec68ff4145a SHA512 b1be51877b60e2b359d6bdfe7e37cf84af47dff1024f96fee9e8bb71f09e403a9d7eefba007de52d535c8726739160f6416b72dc740853438fdcc07e891b4948
+EBUILD actionpack-5.0.7.ebuild 2095 BLAKE2B 90e1cc87ff932dcb868e0c75479adce4137e9d6472ad1520e00d324242cbff1a2462ff8579fb5a435525ea94586f8458899b382ad4ed0bcce2452ec68ff4145a SHA512 b1be51877b60e2b359d6bdfe7e37cf84af47dff1024f96fee9e8bb71f09e403a9d7eefba007de52d535c8726739160f6416b72dc740853438fdcc07e891b4948
 EBUILD actionpack-5.1.1.ebuild 1971 BLAKE2B 03c27bf7d7c685639cd1fa15a1f9810d66f1f9a6caa188f24be94317fe9e48c2da3d8ad7e07caa1c20f9eec3fb7ac3ed68e00e222f101193568e8b2eac52dff0 SHA512 eaf9aaa533ac9697a2664a3c88c84646afdb3eec2846526bacff9e08b699d92199d4ac03f53307ac30fd03af666eed173e6f34b5269c315a4e39352f292c55f6
-EBUILD actionpack-5.1.2.ebuild 2021 BLAKE2B efbe5e27ee6b7ad0fb9b6bcce11f0d420db95e83853b252c363a52118f4619d70180f581b694518fbbd887f3e850ac3f8cf6397f9c03de5e50da2d0691a9e22a SHA512 56d85e4644c3ed1749ae4b9a3b7135dc9e9641afa90f2c23d01a427c9714ca0b8e3881622f4eb829ae4c4de74a0380ceab95f2ed22a7935e9d7bb9af2269e311
-EBUILD actionpack-5.1.3.ebuild 1659 BLAKE2B c4897ef9daf0b7bd4730e80bb4533343a993d63c81e8bc79929041f8def6930128f4c00595f3a58405b2176d026dcb512733cdf395a354689dfd0ef7f5be0f51 SHA512 263ebcd5d8993e29b3d2be7a5040ba7d5a1ff02012f0d0bdd25181faf4255877a7b4b9ee067de51128c42ed88198ad64568d20daf69679a4f6622ca449fe1d55
 EBUILD actionpack-5.1.4.ebuild 1670 BLAKE2B b2b115ec16dbee477649e0068b6407f5097fda63bc746e6451a5eb8d8a0cc3ac6e58a5d3ab761789b3acda4708e1bc0e822b8ba9334f26e29cabd0d3c53c40f9 SHA512 d757de769ecae219fc268fbcb98b046117a3d880116ac7a309278e778fff575d3d34f53d8bba98c306a678c94e6d7518fbae2aa00046701ea48921055891abe2
 EBUILD actionpack-5.1.5.ebuild 1671 BLAKE2B 4f9741a6208682c3c3dc86b92e23cf1578950f64f7991e9ac69faa3d3ca375691a40c717e475bf3d4d92c77c164dc33ce15b8b904487fc4520cdb5e34ada2217 SHA512 7bc54a749625c4ed9b8e8d2cc54f9a9f0ac0338c647138a9e8187578e5583dec1e023c7d5fa1b4d1009ebe9d1fdf6d21c679cdb3d359fbc23650f7fe2d013f1d
+EBUILD actionpack-5.1.6.ebuild 1671 BLAKE2B 4f9741a6208682c3c3dc86b92e23cf1578950f64f7991e9ac69faa3d3ca375691a40c717e475bf3d4d92c77c164dc33ce15b8b904487fc4520cdb5e34ada2217 SHA512 7bc54a749625c4ed9b8e8d2cc54f9a9f0ac0338c647138a9e8187578e5583dec1e023c7d5fa1b4d1009ebe9d1fdf6d21c679cdb3d359fbc23650f7fe2d013f1d
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionpack/actionpack-5.1.2.ebuild b/dev-ruby/actionpack/actionpack-5.0.7.ebuild
index 125ccbd91556..1bf769932432 100644
--- a/dev-ruby/actionpack/actionpack-5.1.2.ebuild
+++ b/dev-ruby/actionpack/actionpack-5.0.7.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -39,15 +39,15 @@ ruby_add_bdepend "
 	test? (
 		dev-ruby/mocha:0.14
 		dev-ruby/bundler
-		>=dev-ruby/capybara-2.13:2
-		~dev-ruby/activemodel-${PV}
+		~dev-ruby/railties-${PV}
+		~dev-ruby/activerecord-${PV}
 		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
 	)"
 
 all_ruby_prepare() {
 	# Remove items from the common Gemfile that we don't need for this
 	# test run. This also requires handling some gemspecs.
+	sed -i -e '1igem "railties", "~>5.0.0"; gem "activerecord", "~>5.0.0"' test/abstract_unit.rb || die
 	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
 		-e '/:job/,/end/ s:^:#:' \
 		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
diff --git a/dev-ruby/actionpack/actionpack-5.1.3.ebuild b/dev-ruby/actionpack/actionpack-5.1.6.ebuild
index 3dc78fdeefe6..a6ccce8788de 100644
--- a/dev-ruby/actionpack/actionpack-5.1.3.ebuild
+++ b/dev-ruby/actionpack/actionpack-5.1.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"