gentoo resync : 15.12.2019

3 files changed, 109 insertions, 11 deletions

diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 9085fadc4227..3fe4ac175731 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,11 +1,13 @@
 DIST rails-4.2.11.1.tgz 4081006 BLAKE2B 7db84961963f529a9b6c06011bb6e32b56f4beb064de31c811a092d27e93156669ade4dcceb7d8abcdba4845d42258d904f8ecaf79198af1c0e2afcb33fe3fe3 SHA512 198fa072f3f09a9893377439ddd1803effdf04a33ae7b609234464e7de9ad960439d1b80ae62e1f9b223b3173839be7233c314a72057933b43672f390d96a8df
-DIST rails-5.1.7.tgz 6146668 BLAKE2B 494a12d79037010333c06d14573474f0d0c1e62ce5252e8fbe4eb4c6935dc660614c2ff29fd168bbc66d74bfa64b92abb84d02645cb3b2950db5c166111b7b19 SHA512 6595eb19f174c9e46a937d6028d9bb2bfdcda06f35ec2a0499bc5deff05d8cfc8f8fc725e664496d3b431c8724141a1410201b57945b98ca211aea15c990d621
 DIST rails-5.2.3.tgz 8802794 BLAKE2B 786f94bcd9528ffc664c39caef0e7d2d3c15da95497044504082999a435c2a877d73d40b68b5237dc07ae6cf9b8f6f99f12ae68527c5f4005b1a648038e507c0 SHA512 6a41f7564679263b4a16a245d13271b12e97a55cdd77b5ebe63bd86c3a80e4f447b4c0567a4a40ed8e97a2307522f6dad368b1beeb362136bdf1856f6dffeb60
+DIST rails-5.2.4.tgz 8822605 BLAKE2B 541332dab5acd358ba3c3ad660b25cec77050b44fba00f46bb3a6e0846ebede36cf4dc7d13f9269ba14ce4174bb81a342f0407672dc6f9372b7cc0ddd0eb66bd SHA512 bee783a0c8e24441f0fbe011392774684fa1390df837c6f85a17975ae72b8c60bea90998f36742c413eecffe125b6a606b0d920855231f910e8073fe28d44a13
 DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d46a736ccb747614d6c1fd56d4aaba2f2f32d48d81772cfd4db671d94a67cd3ffa395f29bf2de1f148fa57ed SHA512 3a2259fe2b3ffd0ddc9128e1aa58af57006b8410120a3629926b95fbe60b8658edab77929e26d9323c61a1855a4379e73f1ddbe875324b068a9e8bdde6ca55e6
 DIST rails-6.0.1.tgz 18551750 BLAKE2B 03349639ae114b82573e5e4063600b07b24274a0f5a81021bf347c650214e0f59fbb1676b9ad580de5a2d6e4dc85cc2702511c32d11a088ef663f26d8d55041e SHA512 ad6667a958663a8d260896c6b7fd589b657383f0d4f217c9bc0e993d6eac67c32fa41d54a9edf9b1f4e01ae78826f49a862b0069d59b3c1de2b950522b3ecf10
+DIST rails-6.0.2.tgz 18555652 BLAKE2B 27b775a8e9285d9d8501fd2115b5a4a68ef0df1afe0f237c32158fc3c4fa950916b725ececda2e9cabd199a2cef4f7c0421b4fdd27e5b28952f738ab99d48097 SHA512 f394d272771ae8eeba2878c7d8eace93a7eefae95f12b34704939f3f91201633da8cb8721999eec0c9729dd72841ef026fbdb7d814d5a0f31cd1f0fd6310a872
 EBUILD activerecord-4.2.11.1.ebuild 2449 BLAKE2B a26059816f637e8138298795592fcaf8d839509fa62248ac010f065e7211bd63bad58183364dcf7aa9e2f7f1614c4a85fcde33f96f57ab314515c175e437256e SHA512 726fba126d24ab9f3a90c7c76cc3c6b032285bd3898e9b987f5621557e0a316eadff74cda94b553216f96ab1a858b874d120a5cd22ec5c279667a6d1bd9f08e7
-EBUILD activerecord-5.1.7.ebuild 2602 BLAKE2B 545f8aac2391b194d3642f80a0d7ba71a31dfda1cf0e46d4867e40f9420cb03697e915b54ba28a7e0cf8ebe2323632588b1de3730c02449dad7b09e10dd110b6 SHA512 dc51bf26da43cf2a2716723574215dc808ab4ce54c063f47619b452b21f9b3e8491895820b17921c0b4cf18bd8f84de734c0f6ee7b33850f958da69d4db04293
 EBUILD activerecord-5.2.3.ebuild 2798 BLAKE2B 71356359949bfbbf8035d6f12f2a4b7d112ca6a7284c09aef49468ce612a2ba0b3c000c864584443d6a019aacd63078f88246a6341e719111438e5e0ca9252cb SHA512 faef79a976c17c093dbc2aec38e801b15a33c412e28e773a932af18f7239f5023c69f690fe2f7b613dd58e3cac404266c4cd21c591d384fad3aaf9c490ce3f37
+EBUILD activerecord-5.2.4.ebuild 2980 BLAKE2B e8d608c62bde38f68bd5fc450897a519ddd82b3492a4a96b50a7eaa47a39f03cea865fa0533bbcb55aff94e6a2a99c7d039d5d53de7a720504df883fa8f61117 SHA512 79ab42a6b4e3c735da79a8efe9e8274edb7efdd9c294fbfcf1d62b6633f9bea65d49fd899992b7a62474ed0e968c2cc8a8f8207ea68414878d6f8df5a83a9896
 EBUILD activerecord-6.0.0.ebuild 2913 BLAKE2B 78749093163110210b192694d825ecb9351e8c34e21ab53fd56fd02057ed7e2caba5aa39c70de1313f3d98bd19e58042ca5e1d153526673974c59712686c73f8 SHA512 e4bbd350d80fdb9011ec2f340d54951eec0dee308bb605fc88a07b6714e913e1ccb5c51d7ad96a271dfa96584396574e2b0ef89cc59cc97e6ea943ac3f80d053
 EBUILD activerecord-6.0.1.ebuild 2913 BLAKE2B 78749093163110210b192694d825ecb9351e8c34e21ab53fd56fd02057ed7e2caba5aa39c70de1313f3d98bd19e58042ca5e1d153526673974c59712686c73f8 SHA512 e4bbd350d80fdb9011ec2f340d54951eec0dee308bb605fc88a07b6714e913e1ccb5c51d7ad96a271dfa96584396574e2b0ef89cc59cc97e6ea943ac3f80d053
+EBUILD activerecord-6.0.2.ebuild 2913 BLAKE2B 78749093163110210b192694d825ecb9351e8c34e21ab53fd56fd02057ed7e2caba5aa39c70de1313f3d98bd19e58042ca5e1d153526673974c59712686c73f8 SHA512 e4bbd350d80fdb9011ec2f340d54951eec0dee308bb605fc88a07b6714e913e1ccb5c51d7ad96a271dfa96584396574e2b0ef89cc59cc97e6ea943ac3f80d053
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activerecord/activerecord-5.1.7.ebuild b/dev-ruby/activerecord/activerecord-5.2.4.ebuild
index 46c181edcd5f..959c3c030739 100644
--- a/dev-ruby/activerecord/activerecord-5.1.7.ebuild
+++ b/dev-ruby/activerecord/activerecord-5.2.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 # this is not null so that the dependencies will actually be filled
 RUBY_FAKEGEM_TASK_TEST="test"
@@ -14,14 +14,14 @@ RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
 
 RUBY_FAKEGEM_BINWRAP=""
 
-inherit ruby-fakegem versionator
+inherit ruby-fakegem eapi7-ver
 
 DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
 HOMEPAGE="https://github.com/rails/rails/"
 SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
 
 LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="mysql postgres sqlite"
 
@@ -29,10 +29,10 @@ RUBY_S="rails-${PV}/${PN}"
 
 ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
-	dev-ruby/arel:8.0
+	dev-ruby/arel:9.0
 	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
 	mysql? ( || ( dev-ruby/mysql2:0.5 dev-ruby/mysql2:0.4 ) )
-	postgres? ( >=dev-ruby/pg-0.18.0 )"
+	postgres? ( >=dev-ruby/pg-0.18.0:* )"
 
 ruby_add_bdepend "
 	test? (
@@ -40,7 +40,7 @@ ruby_add_bdepend "
 		~dev-ruby/actionpack-${PV}
 		~dev-ruby/actionmailer-${PV}
 		>=dev-ruby/sqlite3-1.3.6
-		dev-ruby/mocha:0.14
+		dev-ruby/mocha
 		dev-ruby/minitest:5
 	)"
 
@@ -54,9 +54,18 @@ all_ruby_prepare() {
 		-e '/:job/,/end/ s:^:#:' \
 		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
 	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
+	sed -e '/bcrypt/ s/3.0.0/3.0/' \
+		-i ../Gemfile || die
 
-	sed -i -e '1agem "activemodel", "~>5.1.0" ; gem "railties", "~>5.1.0" ; gem "arel", "~>8.0"' test/cases/helper.rb || die
+	# Add back json in the Gemfile because we dropped some dependencies
+	# earlier that implicitly required it.
+	sed -i -e '$agem "json"' \
+		../Gemfile || die
+
+	sed -e '3i gem "activesupport", "~> 5.2.0"' \
+		-e '3i gem "activerecord", "~> 5.2.0"' \
+		-e '3i gem "activemodel", "~> 5.2.0"' \
+		-i test/cases/helper.rb || die
 
 	# Avoid test depending on mysql adapter which we don't support for
 	# this Rails version to simplify our dependencies.
@@ -68,10 +77,13 @@ all_ruby_prepare() {
 	# Avoid failing test that makes bad assumptions on database state.
 	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
 		test/cases/associations/has_many_associations_test.rb
+
+	# Avoid test failing to bind limit length in favor of security release
+	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
 }
 
 each_ruby_test() {
 	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+		MT_NO_PLUGINS=true ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
 	fi
 }
diff --git a/dev-ruby/activerecord/activerecord-6.0.2.ebuild b/dev-ruby/activerecord/activerecord-6.0.2.ebuild
new file mode 100644
index 000000000000..f20b5f1cb913
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-6.0.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	dev-ruby/arel:9.0
+	sqlite? ( >=dev-ruby/sqlite3-1.4 )
+	mysql? ( || ( dev-ruby/mysql2:0.5 >=dev-ruby/mysql2-0.4.4:0.4 ) )
+	postgres? ( || ( dev-ruby/pg:1 >=dev-ruby/pg-0.18.0:0 ) )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		>=dev-ruby/sqlite3-1.3.6
+		dev-ruby/mocha
+		dev-ruby/minitest:5
+	)"
+
+DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	rm ../Gemfile.lock || die
+	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+	sed -e '/bcrypt/ s/3.0.0/3.0/' \
+		-i ../Gemfile || die
+
+	# Add back json in the Gemfile because we dropped some dependencies
+	# earlier that implicitly required it.
+	sed -i -e '$agem "json"' ../Gemfile || die
+
+	# Avoid test depending on mysql adapter which we don't support for
+	# this Rails version to simplify our dependencies.
+	rm test/cases/connection_specification/resolver_test.rb || die
+
+	# Avoid single tests using mysql or postgres dependencies.
+	rm test/cases/invalid_connection_test.rb || die
+	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
+		-i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
+
+	# Avoid failing test that makes bad assumptions on database state.
+	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
+		test/cases/associations/has_many_associations_test.rb
+
+	# Avoid test failing to bind limit length in favor of security release
+	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
+}
+
+each_ruby_test() {
+	if use sqlite; then
+		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+	fi
+}