gentoo resync : 28.04.2021

4 files changed, 89 insertions, 4 deletions

diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 8c2c74f54588..191c5f633b25 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,9 +1,11 @@
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
+DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
 EBUILD activerecord-5.2.4.5.ebuild 2953 BLAKE2B 90b3f2cb10f6332b1db43996cb9ccbc3ad7050be55d961de413bbda68f88573fd6cdb65e547804e441af2bf13d0856037d9e2821e4ca34f030a2c22b2d1cab5e SHA512 cf94e6be6c7b2bb5056078c0bb751376ab55555f704897bbb08086a1f6276707eae85221d426637f8d72ee6df712fac0485cddb67f526badafbd020377dc6389
-EBUILD activerecord-6.0.3.5.ebuild 3074 BLAKE2B f4ab35e48d0d1362ad6dcd7371634e5b08195e19f238de2ae932124f740bfda1e5cc2a4cb1246672caf00e01616eae708fbc66118179420eb55e7cbd908cbb4c SHA512 25bf9e55dc3b7ce0621af4cd123aca8afd5b52baec2df047c97de9a36c5a6ab9d89b12ad39b1fda46b68fddbfd194a93c116cd685f7437300fad03bc2a49261f
-EBUILD activerecord-6.1.2.1.ebuild 2974 BLAKE2B b8f7f362e585a37d3ed785a79e8a0838c8db28e6880535d4f3abcd52631177a6af47f112aa663a7e52abcc903cb36654cb8d722192e66b1fc96e35b90c35d8e8 SHA512 4c1506931d706e3fc7e64631d7306ea2a5fc69ea0e3ff3c1125b15edab4364af71cd43f57432c0ff51294f5c6da037546a4b2e9147ad76cca93c26845e81d24c
+EBUILD activerecord-6.0.3.5.ebuild 3044 BLAKE2B f07649a429dabcce15f3ebb409b071d57dd324aad6ece5d8d2e0a66b7914a1df60f4aef2c015cb714bab01b600362aa0f7a84565321863587706cc0533397b5b SHA512 05ecf7f3697fa388c48e26b44f2384c1175a8a37fe3e3403c9096ba6cc641ae0e65bc9d54d4e9454ae85c18dffd24c205950623682e060092e6cf0e30c92a5c9
+EBUILD activerecord-6.1.2.1.ebuild 2944 BLAKE2B 742767c3c07c72901bebf25508402c08ada14d1ad75fe3ac942f6db85d97dc0f36146f60e233dea308387899060386e76ae122b0dd90e3b53b93cd3c96c5a5bd SHA512 47daae8d655c1605dadfca19cab84fdc5edf8c7bc51a11f6c43ec2c70f775e31a08f377bdfa505db277166ea7174642fc7238ab4463cb869933b96b6cdae6b40
+EBUILD activerecord-6.1.3.1.ebuild 2950 BLAKE2B 5bf49a2079c6a4d9ae0f2e01ef1510f06c4f5a5858e472474b86ece32e8416528a85251258ff836c249f39da5e71628e06fcdecf640a7fbbdece8a559769c53b SHA512 377cd5c883eae10e66e127bc61697bb1f2216cb8f707b2086c6439883e426649445c4ebd389f1f6ec76a0c3844d11042dbce1202db9d51364c8edcc5e884dbc3
 EBUILD activerecord-6.1.3.ebuild 2950 BLAKE2B 5bf49a2079c6a4d9ae0f2e01ef1510f06c4f5a5858e472474b86ece32e8416528a85251258ff836c249f39da5e71628e06fcdecf640a7fbbdece8a559769c53b SHA512 377cd5c883eae10e66e127bc61697bb1f2216cb8f707b2086c6439883e426649445c4ebd389f1f6ec76a0c3844d11042dbce1202db9d51364c8edcc5e884dbc3
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activerecord/activerecord-6.0.3.5.ebuild b/dev-ruby/activerecord/activerecord-6.0.3.5.ebuild
index a80aa2c8e758..58c3bf61a999 100644
--- a/dev-ruby/activerecord/activerecord-6.0.3.5.ebuild
+++ b/dev-ruby/activerecord/activerecord-6.0.3.5.ebuild
@@ -31,7 +31,7 @@ ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
 	sqlite? ( >=dev-ruby/sqlite3-1.4 )
 	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( || ( dev-ruby/pg:1 >=dev-ruby/pg-0.18.0:0 ) )"
+	postgres? ( dev-ruby/pg:1 )"
 
 ruby_add_bdepend "
 	test? (
diff --git a/dev-ruby/activerecord/activerecord-6.1.2.1.ebuild b/dev-ruby/activerecord/activerecord-6.1.2.1.ebuild
index 6112916c72e3..3ae472c4221e 100644
--- a/dev-ruby/activerecord/activerecord-6.1.2.1.ebuild
+++ b/dev-ruby/activerecord/activerecord-6.1.2.1.ebuild
@@ -31,7 +31,7 @@ ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
 	sqlite? ( >=dev-ruby/sqlite3-1.4 )
 	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( || ( dev-ruby/pg:1 >=dev-ruby/pg-0.18.0:0 ) )"
+	postgres? ( dev-ruby/pg:1 )"
 
 ruby_add_bdepend "
 	test? (
diff --git a/dev-ruby/activerecord/activerecord-6.1.3.1.ebuild b/dev-ruby/activerecord/activerecord-6.1.3.1.ebuild
new file mode 100644
index 000000000000..a1ef44206920
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-6.1.3.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+# 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 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	sqlite? ( >=dev-ruby/sqlite3-1.4 )
+	mysql? ( dev-ruby/mysql2:0.5 )
+	postgres? ( >=dev-ruby/pg-1.1:1 )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		>=dev-ruby/sqlite3-1.4.0
+		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
+	sed -i -e '/byebug/ s:^:#:' test/cases/base_prevent_writes_test.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
+
+	# 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/{,legacy_}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
+
+	# Avoid test failing related to rubygems
+	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
+}
+
+each_ruby_test() {
+	if use sqlite; then
+		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+	fi
+}