gentoo resync : 12.05.2022

6 files changed, 14 insertions, 58 deletions

diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index f7b4826b48c6..60318c8ac395 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/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 activemodel-5.2.6.2.ebuild 1097 BLAKE2B 3adeae4652ad5b97d19565207579665364f7cc05f0df8742b5f4d14f21291b3a3d6a2067008281428dce24e04e9cb39a674db71d7a90b13dbf647de1b48f72bb SHA512 05c8e26c50701dafd46fcd4dd3794639b0dec2e878c55e39c0950021babbbe06f3ef3b1e7f3eaf7ce6ac321198ee555e4e46fbfa20e152e5c09d24a2d54f75f8
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 EBUILD activemodel-5.2.6.ebuild 1096 BLAKE2B d5117f14855812a0b7e3788fd89fd0d75e74c765e1ac3a2e6c88aef7e877accc0e40245bb425a5968bcdac1cc7c9de79862b11af69bbf7b60fa002c5ea2e9f11 SHA512 b326348e70498784c1f045cedf47498a57eecaf633c90826cfd7e13f6913e3421b4e0cb6ab159d99c133af61579c0a8689e0cff40c94c70e4c121b06286e0b51
+EBUILD activemodel-5.2.7.1.ebuild 1120 BLAKE2B 958341ffd217e403d2a1bd68e451ef8c25d14ae621695508c165265732d929320060f9f8b0ca25813740d82ab3967f8acf1e7275aed89a6d03de6480cf517b32 SHA512 fc4140dd601b6c184e12b5844ce6a82b46a1a6e8547289f05edd5f0c8b897f40f3f8c5f3453b758b58c15e4e8eea3f9305a010bd173e16f3be608aceaad3d32f
 EBUILD activemodel-5.2.7.ebuild 1120 BLAKE2B 958341ffd217e403d2a1bd68e451ef8c25d14ae621695508c165265732d929320060f9f8b0ca25813740d82ab3967f8acf1e7275aed89a6d03de6480cf517b32 SHA512 fc4140dd601b6c184e12b5844ce6a82b46a1a6e8547289f05edd5f0c8b897f40f3f8c5f3453b758b58c15e4e8eea3f9305a010bd173e16f3be608aceaad3d32f
 EBUILD activemodel-6.0.4.1.ebuild 976 BLAKE2B 06a0c071b03b7986180ce9baf3aa2f7afed66c7f6267305bb870281e2be2dd8020821970344a1591051196be8bbba4d7d286802828dae280b6a9557f58c57fc0 SHA512 9b65a71146f045bebb9e9b8358fa9a4fcc7d5552f0c988580d415909c62a49d0e64a5ecda6d3ac79c0fbec4c57b7a75263f0e8f10f0b4186d3ed7bf3b3c7173b
-EBUILD activemodel-6.0.4.3.ebuild 970 BLAKE2B 08fa58504f28cb889b527391d6ed3a7413f21a901814020f11dd499646960114763ea3ab115563c7171d60be9c79275fe9e54220576beb1229612012391bc8d2 SHA512 fec29ef59ebcbbfc8c7e18db4398bf47dc67762e34b50bae1ccde58324ba031316d9a9c3d56d65be99389d2baee360ecd6328f0731dc09367f90eb1fbe1623ca
 EBUILD activemodel-6.0.4.4.ebuild 969 BLAKE2B f826751220996a0f02a92cdb0ec80f704f49cc280043e1d0fbc895b0c99af04543c33124806230661f4acec7b6252d6d9c00d6f8d73eb4cb55047eaaba57fca1 SHA512 1b0c0b478489e64d100842cbe8ec92330e4c5478202495753f7b13872654461901b362fc172548bba1e697e9ef067e75d073eb804e3adcaa5e882382a70e3a37
-EBUILD activemodel-6.0.4.6.ebuild 970 BLAKE2B 4db8d87371aeba9e7dbb096c43181f817b1844c336c55ad1bc5da7b16c50d13b1a57b4f659782dbaf54f49f22078a1a89fa44443da4349532cad2072e934236f SHA512 5d5169c729313e1bc724468258617815cdc44e38ab4845902e37c86a17ad787b703caafcf9b6a08fe35f54d7a9b1ba7917d6e3202f1eca6c8a393aab54c1e18f
 EBUILD activemodel-6.0.4.7.ebuild 980 BLAKE2B b983f2855d832c4b3e3f352eeead2bf79a0fe860be35569cf36d40a5b03b8048e35d28a59fe164d15de4ad21010a616b9066f9cd12e1ff54294250ef082e7280 SHA512 148928824c4dfac16be2cda888bc9d23f851e2cd165ae4d42247974efdac8030500ef1ad51f284fcf70a7bf22332945b35db9533fe80e755081c8aef0195dbfd
-EBUILD activemodel-6.1.4.4.ebuild 970 BLAKE2B ab42ef6406cc0626148e7e344f600a5c9d9fed228d72b5434513040f5a196f309131733166e747784aa08f47f49a110b4de007266c0dcc94ef0df66b0edaa707 SHA512 580594823e62894d2befb48095ccaa4ebca0d3c90c1c2a9bcbb911f1f8611321dede63a63086aa1d50deca65bafa032d41f63134ea9b87fece94c4fbd7a57581
-EBUILD activemodel-6.1.4.6.ebuild 970 BLAKE2B 8c0e5331d728f3bc538660b0ec13f72f4596b6eabeb7b3cc9d22d4b5bd25eafc10832cc2619015f10dbbafc62d14b053d00feba163266cdc9616003301ad028f SHA512 11b7694097a0d14c66c5eb197c1e7c939283b0316be3493619eef4251008ccf395940c528dbf24db8e04775685dd7275e6bc61b3136a9fad008cb8f15ee607f6
+EBUILD activemodel-6.0.4.8.ebuild 980 BLAKE2B b983f2855d832c4b3e3f352eeead2bf79a0fe860be35569cf36d40a5b03b8048e35d28a59fe164d15de4ad21010a616b9066f9cd12e1ff54294250ef082e7280 SHA512 148928824c4dfac16be2cda888bc9d23f851e2cd165ae4d42247974efdac8030500ef1ad51f284fcf70a7bf22332945b35db9533fe80e755081c8aef0195dbfd
+EBUILD activemodel-6.1.5.1.ebuild 977 BLAKE2B b9b16e6806d9a2492ab8c46e736157bf90eec764d84ae7e4934cee13d9dd57721bdf117cecd5324cdba361eb5ae11a29e7e1f245325c8f15e71fc5608513864e SHA512 0f54d0f2c0e369880989930f0997509dbb061a0b60b6476411ff072620aa9dd45797f962d1a6c78291c5ac106f74a51ca619c44e6ff3748060ddf444a37b7c08
 EBUILD activemodel-6.1.5.ebuild 970 BLAKE2B 8c0e5331d728f3bc538660b0ec13f72f4596b6eabeb7b3cc9d22d4b5bd25eafc10832cc2619015f10dbbafc62d14b053d00feba163266cdc9616003301ad028f SHA512 11b7694097a0d14c66c5eb197c1e7c939283b0316be3493619eef4251008ccf395940c528dbf24db8e04775685dd7275e6bc61b3136a9fad008cb8f15ee607f6
 EBUILD activemodel-7.0.2.2.ebuild 951 BLAKE2B 2331de2fe4e167c16996de3ea09e4ae4541d952eea2d79f631239ed9d799cccce39fd34071adbecf2ad090143356fc83b7c429c9df9d3a9a5dd2ec450abfc52d SHA512 0b347ae77b9bd6096983be1e2b15feb80fb5b594ceaaf31ee41ecffbb16aed9865ba216fa576327dd9ac9beb9d0618bf00f5656e59c2a288b8d04f6d2c08dbb0
 EBUILD activemodel-7.0.2.3.ebuild 958 BLAKE2B bafde4c47abe2504c89cfe2614be69b675895216a848bd2eb0e10fd7f82a32b7a788596e6aef46fc85c4eefdd88f2189013c70ccdad06349694a533146b21c2d SHA512 b93b747160b5174c73aeda170680cabbc3e5ec66691eeba9c7b1198052443bc12b55ab284d65ef280a87d6bdbaa5c18c783d23a420940cb6b1d2dfb598919b0b
+EBUILD activemodel-7.0.2.4.ebuild 958 BLAKE2B bafde4c47abe2504c89cfe2614be69b675895216a848bd2eb0e10fd7f82a32b7a788596e6aef46fc85c4eefdd88f2189013c70ccdad06349694a533146b21c2d SHA512 b93b747160b5174c73aeda170680cabbc3e5ec66691eeba9c7b1198052443bc12b55ab284d65ef280a87d6bdbaa5c18c783d23a420940cb6b1d2dfb598919b0b
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activemodel/activemodel-5.2.6.2.ebuild b/dev-ruby/activemodel/activemodel-5.2.7.1.ebuild
index e31ee2cc02d0..36dfba0c1e2f 100644
--- a/dev-ruby/activemodel/activemodel-5.2.6.2.ebuild
+++ b/dev-ruby/activemodel/activemodel-5.2.7.1.ebuild
@@ -41,5 +41,5 @@ ruby_add_bdepend "
 all_ruby_prepare() {
 	# Set test environment to our hand.
 	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-	sed -i -e '2igem "railties", "~> 5.2.0"' test/cases/helper.rb || die
+	sed -i -e '2igem "railties", "~> 5.2.0"; gem "psych", "~> 3.0"' test/cases/helper.rb || die
 }
diff --git a/dev-ruby/activemodel/activemodel-6.0.4.3.ebuild b/dev-ruby/activemodel/activemodel-6.0.4.3.ebuild
deleted file mode 100644
index 922d14dbfa67..000000000000
--- a/dev-ruby/activemodel/activemodel-6.0.4.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-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=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mocha
-		>=dev-ruby/bcrypt-ruby-3.1.7
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-6.0.4.6.ebuild b/dev-ruby/activemodel/activemodel-6.0.4.8.ebuild
index c8e9826d1f05..4e43fc718e2d 100644
--- a/dev-ruby/activemodel/activemodel-6.0.4.6.ebuild
+++ b/dev-ruby/activemodel/activemodel-6.0.4.8.ebuild
@@ -38,5 +38,5 @@ ruby_add_bdepend "
 
 all_ruby_prepare() {
 	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+	sed -i -e '3igem "psych", "~> 3.0"' test/cases/helper.rb || die "Unable to remove load paths"
 }
diff --git a/dev-ruby/activemodel/activemodel-6.1.4.6.ebuild b/dev-ruby/activemodel/activemodel-6.1.5.1.ebuild
index 621481c37e88..72f40d438434 100644
--- a/dev-ruby/activemodel/activemodel-6.1.4.6.ebuild
+++ b/dev-ruby/activemodel/activemodel-6.1.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 
diff --git a/dev-ruby/activemodel/activemodel-6.1.4.4.ebuild b/dev-ruby/activemodel/activemodel-7.0.2.4.ebuild
index f41ffdd4078a..ffe12032f8e3 100644
--- a/dev-ruby/activemodel/activemodel-6.1.4.4.ebuild
+++ b/dev-ruby/activemodel/activemodel-7.0.2.4.ebuild
@@ -1,9 +1,9 @@
-# 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"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 
@@ -19,7 +19,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 ~hppa ~riscv ~sparc ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"