gentoo resync : 12.05.2022

6 files changed, 16 insertions, 103 deletions

diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 85341dca6767..b099d5ab8222 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,27 +1,25 @@
-DIST rails-5.2.6.2.tgz 8840302 BLAKE2B 54c62924252bdbc7df4b07309dc1f96973660db71c68a9b25f8f9e44fb901982cf38242c613a349220ca043ca82984ee740052fc51521a6e1f088d8b77d4f53b SHA512 f639508300258c210253be875066842553487b0ddee2b56c625b7ed99ae5b9d59d62a69181c0910ebc85786d0a5fc1001385f3700fc198d192eccbe753d2e48c
 DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
+DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
 DIST rails-5.2.7.tgz 8843727 BLAKE2B f721f7d67c80e6070d827aa2209aa302a41bb004c370978d9523905cec13402fb3c9c960dd0e7504ad29d8ea987526a21a4c7e3c9ac44e475be9141a0a57ccb0 SHA512 9d871a08721d2a613dab06d7c3043816768d355c0aa022e8a2a17e7bd894e3a6116d0eb5b205cfdaf9b0192400b461cf8d3ed6145663bf1104251d5f05d2e30d
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
 DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
 DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
 DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
 DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-EBUILD activerecord-5.2.6.2.ebuild 3058 BLAKE2B 6677eb01bb77cea8080e6ce6fb30b65114488cf171b7166ffb7fe9cc335070a804d9707de0a09d1cc96b23a5cf3ccecf0bc6af29babee4dc2721804467391838 SHA512 688b4bf4c5317389ae7a80c7c35ddc1c511c5723968f8c75257b1b910e13e30675558eb238bd7822d4df4d9edf8b1a26a0ed4245bb34e24a9b88a0147e85f614
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 EBUILD activerecord-5.2.6.ebuild 2946 BLAKE2B 81d5b3915867571e063987354da77067a07e7d6fd2e28b6a58031679948fccca12b6629f159188a3f87d3ddcd28baa0512e502cfd59dee60db2783482a66d4d5 SHA512 6d42fd304dc3a052f74d7dd1e978db0bb6130136ed9449de503bf2202b8de3e46aecb09ebdd4a21797bae455c8d4f149f3665e9c2e96ba10fb7337804c5abb67
+EBUILD activerecord-5.2.7.1.ebuild 3092 BLAKE2B afce126a087c592c016e7a2cef7bc367db343e45a8b72f5e8d61575ecaa5cc5f12b161f0f8ff2fb2a17578e12efa50a6f170ed723895a406ffa6b25dcfb741cf SHA512 c456d0741cfc8b886de94f28289e1cc8a468698e261c713424f3467865969debd104224957ece76b5aee75e6d7a31f22dfc3817a893f982659dd51b58235fbd1
 EBUILD activerecord-5.2.7.ebuild 3092 BLAKE2B afce126a087c592c016e7a2cef7bc367db343e45a8b72f5e8d61575ecaa5cc5f12b161f0f8ff2fb2a17578e12efa50a6f170ed723895a406ffa6b25dcfb741cf SHA512 c456d0741cfc8b886de94f28289e1cc8a468698e261c713424f3467865969debd104224957ece76b5aee75e6d7a31f22dfc3817a893f982659dd51b58235fbd1
 EBUILD activerecord-6.0.4.1.ebuild 3152 BLAKE2B 21c8878136747d8ff16e154c26ac7361c09a5d36fffbb00d757db64a9125e9d64e805e59aab60c214727ed0f89f2d781d4f99b32b4298378e4f94cfa45c99623 SHA512 22f53a47fa85ff5898c62d52d85ca3024b620a21f7cd834bd3c79853dc039eff89e4b279b007a37710941ae02bf133d1b24ec34e3f3367c55e8d411a52cd45ec
-EBUILD activerecord-6.0.4.3.ebuild 3146 BLAKE2B 88e93b97a99b1c883a424e40e5f04556ead03606fa3af976eedfa8459ab540ad28942f5f7e8ba3078f36b1a3cdc898e84ac1fdb5f2964b60404a62826830026e SHA512 4af2a86977b8be6885b488cfa368a1b1129d119101ab3eef2789d7125ad9ffa241c6d62326af9f2287a7d2031eeac4d6f1464765b4eef8cc6a5f70209db82c25
 EBUILD activerecord-6.0.4.4.ebuild 3145 BLAKE2B f24ea20902a8800bd20e65274cdc72347949eb1cc530a53cfd5e30c2bd0cfdbd88559cf272e3956c27e37a6abbb2927cc86d5f120cf9657e7808ec7f4035b98f SHA512 9c846fc1a2acd78a1b607b8645574d54a828087f8ff751adae1b9ef94dbb50e24a120c0e1c3a8c357c3a036261d7c7d314ef2aed5c60e36ccaf75e6e21302dab
-EBUILD activerecord-6.0.4.6.ebuild 3256 BLAKE2B 7ff97f04ebd4ce54bc27c2882bbc1a747b6b3fe7c2aced8655fece54736d92cbedec4575cf44fabeaca924c8e8e886197aff0003a944e78d2d435876b3aa2f2a SHA512 5327ba8e27c8980231c2862b7d5b0516c6e04252201942f00fab715ac3f7aef197e1bf644e80676dbb99e8dfb9ed12f0b2e67a393a1d98640dd5bb824de5521e
 EBUILD activerecord-6.0.4.7.ebuild 3279 BLAKE2B 7b8a25923c1e052c4dc1ac54d9d7e6bdbfb389219562d526a6f680cc3f6eb1aca245cf3d836f04ad6f964f4ba06ef4233da78659eb515730587c06800f9166e2 SHA512 68b9f350a473142b9eedb41e5b036f5f6c1621a88c0e34c79cc91090f93cfb47db733615faaa50b105fbed9c7fddb77ab491d96750554d5c3c44ebbfb0263bfc
-EBUILD activerecord-6.1.4.4.ebuild 2950 BLAKE2B 05f5b4f4719827673f46d39acac1724b4fbeba4d1f9993a804656c8573ff0f0affd56479ee0c48134604162a1be31558f1c3175c7355ba5918886e16a21a511b SHA512 2498e205e97457f7b7406268206f196c1ddeda020b62f3fdf3603b221850b98fdd4e65a1eece840f2ddb57eeaf077a2d3bcdd4e03452dfa1ac8dc8e16270ecff
-EBUILD activerecord-6.1.4.6.ebuild 3232 BLAKE2B 79f15950605fbfb9f95ce9f9ff1b4721a5d3760b1ff61c7c2d88d31d257c586e9f0134228642e1efdf11722a96ec3811de9e1c5a3045f8dc13d5ec184ea6365e SHA512 582dc935aea21282cd53d7359966ccb806ba8835ffede43ee0bedb8e56ebfce7699a2bf9a18d79153d5c1c3f976d41535b0b041cb7f625ea5eb135584df3ae4e
+EBUILD activerecord-6.0.4.8.ebuild 3279 BLAKE2B 7b8a25923c1e052c4dc1ac54d9d7e6bdbfb389219562d526a6f680cc3f6eb1aca245cf3d836f04ad6f964f4ba06ef4233da78659eb515730587c06800f9166e2 SHA512 68b9f350a473142b9eedb41e5b036f5f6c1621a88c0e34c79cc91090f93cfb47db733615faaa50b105fbed9c7fddb77ab491d96750554d5c3c44ebbfb0263bfc
+EBUILD activerecord-6.1.5.1.ebuild 3376 BLAKE2B 16091f6b4a2ee090cc13c59ba4c5d198f7815ea0f6b45f7d719f28e561ca81829900d8f5e158045ac1027475a90001fb0551848613d0110ebd09c575a62bdd2c SHA512 7afc3d49f9025fd6a87e67a9df55aefc16a4a55bd2bb05eecc71a92a6dacf6933fb2522a91e78d7941ba6fd57767e7e8d263169166d91c94afc311ec32c340c8
 EBUILD activerecord-6.1.5.ebuild 3369 BLAKE2B 1d41bddab16daa366449d72eee3b6fc38d5bea1b3fb372e22c05b478b2c4b9dff388fa310263ad6b9d0f1d852491eefa22ec67a1a3809a0b5409df42630fca5b SHA512 6a87b5f796c70d3fb9e9cf4df1624bad7a86ca559bd88e893e9404025976d053f65de77436a8a9f62add5ac65555674e10aa29384aad040fd447aff6cccd7f6b
 EBUILD activerecord-7.0.2.2.ebuild 2950 BLAKE2B a17059c97353ae55ae0f23c63877db11620eaecffa66a2036069ee9d74097653b9f422456f396bb4a6a11be914266b9d03d94303bbac75bc39b69ee697446bac SHA512 87795ddc0914007934db30499c2cf43bae23391c2ab37db8e655c43194b2c24c30bdedd823cf813c2bf49e4bd16fce8c98fef771a622bba0a1fa2b3a80625a00
 EBUILD activerecord-7.0.2.3.ebuild 2957 BLAKE2B 50dcc61f8e2ef461da91dad821341f8c6612d37040435c1f9c3b8a87ef791b29b14a2c7e9087b175a7ef8b64389526c6780e270f15797c0a38ec73fb29db3fec SHA512 7a4a86a3457a8945e788f76579bcbc4f04c1743646860199cbcdd723e6a062c9684a7cf7458be141711762ff3f85b355d48c25e6f0a315e44a4f57e5e0e09c52
+EBUILD activerecord-7.0.2.4.ebuild 2957 BLAKE2B 50dcc61f8e2ef461da91dad821341f8c6612d37040435c1f9c3b8a87ef791b29b14a2c7e9087b175a7ef8b64389526c6780e270f15797c0a38ec73fb29db3fec SHA512 7a4a86a3457a8945e788f76579bcbc4f04c1743646860199cbcdd723e6a062c9684a7cf7458be141711762ff3f85b355d48c25e6f0a315e44a4f57e5e0e09c52
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activerecord/activerecord-5.2.6.2.ebuild b/dev-ruby/activerecord/activerecord-5.2.7.1.ebuild
index 413d3876552b..42a1a3c55ec4 100644
--- a/dev-ruby/activerecord/activerecord-5.2.6.2.ebuild
+++ b/dev-ruby/activerecord/activerecord-5.2.7.1.ebuild
@@ -65,6 +65,7 @@ all_ruby_prepare() {
 	sed -e '3i gem "activesupport", "~> 5.2.0"' \
 		-e '3i gem "activerecord", "~> 5.2.0"' \
 		-e '3i gem "activemodel", "~> 5.2.0"' \
+		-e '3i gem "psych", "~> 3.0"' \
 		-i test/cases/helper.rb || die
 
 	# Avoid test depending on mysql adapter which we don't support for
diff --git a/dev-ruby/activerecord/activerecord-6.0.4.3.ebuild b/dev-ruby/activerecord/activerecord-6.0.4.3.ebuild
deleted file mode 100644
index 8c20ff15ef51..000000000000
--- a/dev-ruby/activerecord/activerecord-6.0.4.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="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 ~riscv ~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 )"
-
-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
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activemodel", "~> 6.0.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 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
-
-	# 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
-}
diff --git a/dev-ruby/activerecord/activerecord-6.0.4.6.ebuild b/dev-ruby/activerecord/activerecord-6.0.4.8.ebuild
index 80126b2ba24a..dea3e73927bc 100644
--- a/dev-ruby/activerecord/activerecord-6.0.4.6.ebuild
+++ b/dev-ruby/activerecord/activerecord-6.0.4.8.ebuild
@@ -59,7 +59,7 @@ all_ruby_prepare() {
 	# earlier that implicitly required it.
 	sed -i -e '$agem "json"' ../Gemfile || die
 
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activemodel", "~> 6.0.0"' test/cases/helper.rb || die
+	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activemodel", "~> 6.0.0"; gem "psych", "~> 3.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.
diff --git a/dev-ruby/activerecord/activerecord-6.1.4.6.ebuild b/dev-ruby/activerecord/activerecord-6.1.5.1.ebuild
index 0f50c140b541..e6bb299bcd8d 100644
--- a/dev-ruby/activerecord/activerecord-6.1.4.6.ebuild
+++ b/dev-ruby/activerecord/activerecord-6.1.5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 # this is not null so that the dependencies will actually be filled
 RUBY_FAKEGEM_TASK_TEST="test"
@@ -74,6 +74,7 @@ all_ruby_prepare() {
 
 	# Avoid tests that no longer work with newer sqlite versions
 	rm -f test/cases/adapters/sqlite3/explain_test.rb || die
+	sed -i -e '/test_references_stays_as_integer_column/askip "Fails on case difference"' test/cases/migration/compatibility_test.rb || die
 
 	# 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
diff --git a/dev-ruby/activerecord/activerecord-6.1.4.4.ebuild b/dev-ruby/activerecord/activerecord-7.0.2.4.ebuild
index ba0d4e0cb302..f59c119d4b8c 100644
--- a/dev-ruby/activerecord/activerecord-6.1.4.4.ebuild
+++ b/dev-ruby/activerecord/activerecord-7.0.2.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 # this is not null so that the dependencies will actually be filled
 RUBY_FAKEGEM_TASK_TEST="test"
@@ -22,7 +22,7 @@ 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 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
 IUSE="mysql postgres sqlite"
 
 RUBY_S="rails-${PV}/${PN}"
@@ -35,6 +35,7 @@ ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 
 ruby_add_bdepend "
 	test? (
+		dev-ruby/benchmark-ips
 		dev-ruby/bundler
 		~dev-ruby/actionpack-${PV}
 		>=dev-ruby/sqlite3-1.4.0