gentoo resync : 18.05.2019

6 files changed, 6 insertions, 170 deletions

diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 7b55073d875a..945034e94f19 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,11 +1,7 @@
 DIST rails-4.2.11.1.tgz 4081006 BLAKE2B 7db84961963f529a9b6c06011bb6e32b56f4beb064de31c811a092d27e93156669ade4dcceb7d8abcdba4845d42258d904f8ecaf79198af1c0e2afcb33fe3fe3 SHA512 198fa072f3f09a9893377439ddd1803effdf04a33ae7b609234464e7de9ad960439d1b80ae62e1f9b223b3173839be7233c314a72057933b43672f390d96a8df
-DIST rails-5.1.6.2.tgz 6144050 BLAKE2B b204a66f97514eab94ebcfee89d55482577bf1c355b813e3e596c1d8c1a9f4167871fda75fc605c6b5801a3a247050b53b075abcf3a28bb30ec45e166d7cd8f8 SHA512 4e2e4739a276e66ace4a330b65c05c8c8465d71438b6d6d8c30051f9ff9ba6d2669c0379b2478d9a94e9535e7c079b39d6fa1b388619e7d29a3fd8d6127588fd
 DIST rails-5.1.7.tgz 6146668 BLAKE2B 494a12d79037010333c06d14573474f0d0c1e62ce5252e8fbe4eb4c6935dc660614c2ff29fd168bbc66d74bfa64b92abb84d02645cb3b2950db5c166111b7b19 SHA512 6595eb19f174c9e46a937d6028d9bb2bfdcda06f35ec2a0499bc5deff05d8cfc8f8fc725e664496d3b431c8724141a1410201b57945b98ca211aea15c990d621
-DIST rails-5.2.2.1.tgz 8795399 BLAKE2B cb07c555b4124b67c12d7b913209112730a2aa4d957b3711c6b1f41918bfbce792426d75bd2e4443043a701f74bb2a286d59b140248f6a74f1c4547f00dc0b7d SHA512 c976e3b4f0f2350cd611309c89a9c3ad16871f115577788694519482afa10420a272f2cc560bd823f05d6d616e3cde1e121d6f530e3d29df12a55bd2aa76ed0e
 DIST rails-5.2.3.tgz 8802794 BLAKE2B 786f94bcd9528ffc664c39caef0e7d2d3c15da95497044504082999a435c2a877d73d40b68b5237dc07ae6cf9b8f6f99f12ae68527c5f4005b1a648038e507c0 SHA512 6a41f7564679263b4a16a245d13271b12e97a55cdd77b5ebe63bd86c3a80e4f447b4c0567a4a40ed8e97a2307522f6dad368b1beeb362136bdf1856f6dffeb60
-EBUILD activerecord-4.2.11.1.ebuild 2478 BLAKE2B 1bb8fa1100b5d5bcbed9d0c3e50a781c4d2e01c611140f2f24262d8d7432743c9694404e6a5e3ef782147236a540c55bb0c65e8868c4eba81b5864222af8877a SHA512 9ba03a953359d164f4d4ca9c299c43d79e9aa95cee96a09ffa6052b4a60d9d5e315b9cdba0f086d945645057a5397bb29aba044f61adaf20d0e5863f9161cd73
-EBUILD activerecord-5.1.6.2.ebuild 2611 BLAKE2B 3ac06a588255ea3396ba875ef77efee2d14d76f95cc42cae342fd95e91e03c5d92d5c5f1dc4cff151f8f31d83974d702b36827ee54b614875a3f1fca536d400b SHA512 b5ff7b994c22f747b4a36e3fb1a50f3fe35cf4643e916544495fed5a244acbc6f700b2663e8566525b3b27e93ce7c86094ede10e39a32cd1aca5a6b331721afd
-EBUILD activerecord-5.1.7.ebuild 2611 BLAKE2B 3ac06a588255ea3396ba875ef77efee2d14d76f95cc42cae342fd95e91e03c5d92d5c5f1dc4cff151f8f31d83974d702b36827ee54b614875a3f1fca536d400b SHA512 b5ff7b994c22f747b4a36e3fb1a50f3fe35cf4643e916544495fed5a244acbc6f700b2663e8566525b3b27e93ce7c86094ede10e39a32cd1aca5a6b331721afd
-EBUILD activerecord-5.2.2.1.ebuild 2800 BLAKE2B eba7ee769ae30072c14a754d7b106bc724152d4af0a2b2616ac265bfeb7f1c2bb1cc43a8989dfa3c9e17b9a0ac61f9821bfb7b11041eef53695469bcb9e0de76 SHA512 b4eb2063dafe928c0a57406b05b4d7b162eb01905de508ce197a239f3e13072a84a0088021b937deade45c53dd9368e6b4874e0c67cd319bbbee11c78b957894
-EBUILD activerecord-5.2.3.ebuild 2807 BLAKE2B 8e7a799606ede5eac47fea9d13cbdc83371683a5de8090f141c7029d6f89f1c88a924ec2dfb9b739a9d4813195f7b1a6db51eb55c3f486d528673a4bf8721c25 SHA512 65683a1435aed33fafc3ee01453bcc85570ab231333732721aa7c8d3acad052fb0bd229d76a1c42f376efaccb3e544d4c7e71736435dafc5c6536b3eb2850a3d
+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
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activerecord/activerecord-4.2.11.1.ebuild b/dev-ruby/activerecord/activerecord-4.2.11.1.ebuild
index 58e91eddf6bb..d5f0d2ccea03 100644
--- a/dev-ruby/activerecord/activerecord-4.2.11.1.ebuild
+++ b/dev-ruby/activerecord/activerecord-4.2.11.1.ebuild
@@ -29,7 +29,7 @@ ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
 	>=dev-ruby/arel-6.0:6.0
 	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
-	mysql? ( || ( dev-ruby/mysql2:0.4 >=dev-ruby/mysql2-0.3.13:0.3 ) )
+	mysql? ( || ( dev-ruby/mysql2:0.4 ) )
 	postgres? ( >=dev-ruby/pg-0.15.0 )"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/activerecord/activerecord-5.1.6.2.ebuild b/dev-ruby/activerecord/activerecord-5.1.6.2.ebuild
deleted file mode 100644
index 8e8ffc1df325..000000000000
--- a/dev-ruby/activerecord/activerecord-5.1.6.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-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)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	dev-ruby/arel:8.0
-	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
-	mysql? ( || ( dev-ruby/mysql2:0.4 >=dev-ruby/mysql2-0.3.18:0.3 ) )
-	postgres? ( >=dev-ruby/pg-0.18.0 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/actionmailer-${PV}
-		>=dev-ruby/sqlite3-1.3.6
-		dev-ruby/mocha:0.14
-		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 -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
-
-	sed -i -e '1agem "activemodel", "~>5.1.0" ; gem "railties", "~>5.1.0" ; gem "arel", "~>8.0"' test/cases/helper.rb || 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 test using mysql dependencies.
-	rm test/cases/invalid_connection_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
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-5.1.7.ebuild b/dev-ruby/activerecord/activerecord-5.1.7.ebuild
index 8e8ffc1df325..46c181edcd5f 100644
--- a/dev-ruby/activerecord/activerecord-5.1.7.ebuild
+++ b/dev-ruby/activerecord/activerecord-5.1.7.ebuild
@@ -31,7 +31,7 @@ ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
 	dev-ruby/arel:8.0
 	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
-	mysql? ( || ( dev-ruby/mysql2:0.4 >=dev-ruby/mysql2-0.3.18:0.3 ) )
+	mysql? ( || ( dev-ruby/mysql2:0.5 dev-ruby/mysql2:0.4 ) )
 	postgres? ( >=dev-ruby/pg-0.18.0 )"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/activerecord/activerecord-5.2.2.1.ebuild b/dev-ruby/activerecord/activerecord-5.2.2.1.ebuild
deleted file mode 100644
index 479ee02c394a..000000000000
--- a/dev-ruby/activerecord/activerecord-5.2.2.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-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="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-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.3.6 )
-	mysql? ( || ( dev-ruby/mysql2:0.4 >=dev-ruby/mysql2-0.3.18:0.3 ) )
-	postgres? ( >=dev-ruby/pg-0.18.0:* )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/actionmailer-${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 test using mysql dependencies.
-	rm test/cases/invalid_connection_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
-}
diff --git a/dev-ruby/activerecord/activerecord-5.2.3.ebuild b/dev-ruby/activerecord/activerecord-5.2.3.ebuild
index 9c54bc91ff6a..033190770d83 100644
--- a/dev-ruby/activerecord/activerecord-5.2.3.ebuild
+++ b/dev-ruby/activerecord/activerecord-5.2.3.ebuild
@@ -31,7 +31,7 @@ ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
 	dev-ruby/arel:9.0
 	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
-	mysql? ( || ( dev-ruby/mysql2:0.4 >=dev-ruby/mysql2-0.3.18:0.3 ) )
+	mysql? ( || ( dev-ruby/mysql2:0.5 dev-ruby/mysql2:0.4 ) )
 	postgres? ( >=dev-ruby/pg-0.18.0:* )"
 
 ruby_add_bdepend "