gentoo resync : 02.04.2018

3 files changed, 22 insertions, 10 deletions

diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 5ca51f61b32e..ba4a1344ae10 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/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 activesupport-4.2.10.ebuild 2168 BLAKE2B 4bfe8e4d4d585733bbe6a0ab9618e5e79a04799eb699a11479b3036a123c030d1d2a99176ad5a463b6b218262f7df575506122fb36ccae504c890504374f97de SHA512 873c00a1090978e422509043f4f067c2478179db2c0bfb96d2afd9053754a89f015c4340785ed1efca3ff5e83992aeab6e72dface39c256e5b449238afe152a1
 EBUILD activesupport-5.0.6.ebuild 2566 BLAKE2B e86c5bcc677978762bbc2e8cf988582525abe765878ff1f41f2ddb80d1cc5c7fe664caf9d7ea048dfd069e20778abb09c9a642656783c2e12e126934c538f96c SHA512 f9294fe58b9a9a2a6edb0962004016b0f4bfe8aaebeb2f45bf7c67b6acb3a3b6286605069fd8ad2f4da260e2d4805b138f829326df5ccfeaf67131cce19add6a
+EBUILD activesupport-5.0.7.ebuild 2647 BLAKE2B 44a801239a05899172555f3968624684fe6c0dd210d9c73f280b2cfff7fbabbcbca0f9d40f1002a357336673bc14be4c61317f783fe2df80bd12e67a05247724 SHA512 d53aaeb613e82e4563a78b114e8f3cb8dda86e9b563a1696024f6e320251133174972fe9da3ab1fcde2922a27c5f6b9edb0519b2cf3a543b2172ee7f3d974ff7
 EBUILD activesupport-5.1.1.ebuild 2202 BLAKE2B 77ef796d8afc9ca3d94f10a55dbaa74a55b20976b566396a4b5f91cdb09b898569b36bd9f8520c625254e5c9a12c27f53e2d3a586ec5bf0adc134dc4d40c0a35 SHA512 cf29ff2bc2ca3328e0c94c5ab6569b6effc4a17ce3e7f82e6455bdd1b605a8915a66f9e0c737cc00a1e0f86ac0676d300f580a5b6ddc73c492c21d8d22604c5e
-EBUILD activesupport-5.1.2.ebuild 2197 BLAKE2B 12708195a41fc95dd921d8c08dbce1307ebec15e771011ccd47fd61ad919b9e57f7148dc9a3e70c48155df9c69863d942759dcea4a40a1db52bca880e8c877ae SHA512 e548c5d968fc502b520e895c7e7bd44a404c670ca8e71f7acf806ff2da1d95eabc88ebb98aa34e648f64ab5014c45150a1e1c8c72ac11e7d38187458bf459573
-EBUILD activesupport-5.1.3.ebuild 2202 BLAKE2B 64704a3185d4a67b261afe7be1e3dadce281b67e0748a0f561e093d6187949adc0a675ccb527ab34f0aec884f95bc99257e5fd58fec56a115df13d56a9f3004d SHA512 2daf9e6d7280ddc6b8d0dedfd510efbe390d75caeb2de19b095d28befe1307c21435caaf052ebe2511912e095e78895a761c31f8e4147f604c571c08dffc2b99
 EBUILD activesupport-5.1.4.ebuild 2208 BLAKE2B 4234dd53400445c24d8f3cfa90871f7ca0948292d2a2199bca3fb20d5e1d04fb297d740b2d618f6656b1782b0748216e51477db2f0e02248e98e1e63f6b22eb5 SHA512 c193e61019894836c20ff9999b6576b4d72d6f85e6f7ccc53ccf3319f41138e2caf0b66a2ff5fe4bc058efc29c4547aac6dc63bc3c95233827158a66b31b9747
 EBUILD activesupport-5.1.5.ebuild 2209 BLAKE2B 1d361b7f696c164de120a4fb20627f2061a1eb2c9b60060f535daea82629340bae081c2d55e3ecee42e57278ddc01f74c69f74f4f04a1250278095ffe35c04f6 SHA512 4936aec39921e2fba86d91d4382efb94a9687ea72423fb6eddec9115e3addca308acd07cf21fa4d852555c5d08f080a2f04c191669bf5ededa68cc4709a9007f
+EBUILD activesupport-5.1.6.ebuild 2345 BLAKE2B fd73d15b52fad59d05a42c66c1f59c8e495985715f06f6b32395ff669b4964cd8da98b9283d81626352c4fc7d183e4fbae8eb984823149957237fdcc03a21008 SHA512 7592505b5ede2ac22a2b7bda5951b71dc7bd560097ed483cb053aa4fc5f947603bb7bdea00f7d3b37a28f030268a5b0851776680090d69d3f55bc69b7796bbbf
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activesupport/activesupport-5.1.3.ebuild b/dev-ruby/activesupport/activesupport-5.0.7.ebuild
index b808fd131e8f..23d02efa9e08 100644
--- a/dev-ruby/activesupport/activesupport-5.1.3.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.0.7.ebuild
@@ -21,14 +21,14 @@ 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 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
 
 ruby_add_rdepend "
 	>=dev-ruby/concurrent-ruby-1.0.2:1
-	>=dev-ruby/i18n-0.7:* =dev-ruby/i18n-0*:*
+	>=dev-ruby/i18n-0.7:* <dev-ruby/i18n-1:*
 	>=dev-ruby/tzinfo-1.1:1
 	>=dev-ruby/minitest-5.1:5"
 
@@ -57,9 +57,18 @@ all_ruby_prepare() {
 		-e '5igem "builder"; gem "rack"' ../Gemfile || die
 	rm ../Gemfile.lock || die
 
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
+	# Avoid test not working within portage
+	sed -i -e '/test_messing_with_either_encrypted_values_causes_failure/askip "gentoo"' test/message_encryptor_test.rb || die
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/caching_test.rb || die
 
-	# Avoid tests that seem to trigger race conditions.
+	# Avoid tests failing since test_order cattr is also seen as a test
+	# method
+	rm -f test/xml_mini/libxml{,sax}_engine_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions. This might be
+	# fixed upstream in 7bd41994480c17db71fdc07e3447ade929eaa386
 	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid tests which make network connections
+	rm -f test/multibyte_{grapheme_break,normalization}_conformance_test.rb || die
 }
diff --git a/dev-ruby/activesupport/activesupport-5.1.2.ebuild b/dev-ruby/activesupport/activesupport-5.1.6.ebuild
index f164d4cb88cd..61edd3151418 100644
--- a/dev-ruby/activesupport/activesupport-5.1.2.ebuild
+++ b/dev-ruby/activesupport/activesupport-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -62,4 +62,7 @@ all_ruby_prepare() {
 
 	# Avoid tests that seem to trigger race conditions.
 	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/caching_test.rb || die
 }