gentoo resync : 25.03.2022

3 files changed, 6 insertions, 72 deletions

diff --git a/dev-ruby/parallel/Manifest b/dev-ruby/parallel/Manifest
index d893203dec60..9610c7a59532 100644
--- a/dev-ruby/parallel/Manifest
+++ b/dev-ruby/parallel/Manifest
@@ -1,9 +1,7 @@
-DIST parallel-1.19.2.tar.gz 21752 BLAKE2B aac6564ad95d8e366ad079854f22e7dcb149643db5792ee81c84c8c765185e367dedd0e635d2373aeefcd84997da89f9f9f4f6c398e753af4a1ddbf90e428dd0 SHA512 192ce4dc18ecb47522360d0d7022a9e20d72e90ad09889f1b7f29c20c74c980319956f316a35aad0fc7efcd8aac5a635da69eebcf78ba34659365df20e402c3c
-DIST parallel-1.20.0.tar.gz 20598 BLAKE2B f9e8626bf6430fffecd9aafb54e0c8c4b61f70dd58f7a2faee0e4c83c10c19d8eac419ab3e22fb75942a5c63f729d47d5e64683caa7f24bc304a1cb16862e18c SHA512 dc472a4792bea7b22b6613942a9c640437cb332d879406af2fad3de0f0529983ba92e6ee2e6f2d424e57695f238d44bf6987c6edc3ce5afca4b024b7501d9508
 DIST parallel-1.20.1.tar.gz 20807 BLAKE2B 71f0894126837d71cdc3bf1ca7d4040d53dd88e0c917f29d3ebc940c1ff16bde42631aff50df455729a2a33df3e96de5dda5c9913d9ff4b1cde90ef1702883fa SHA512 cd0f6ad673fe432d48de77adc177181d48bcbf43e4c2a9f86b579bc1f7a9f520730ce68be010e6645b87c8ff755c83ccaf53ffd73631b0f239beb9e124b4d527
 DIST parallel-1.21.0.tar.gz 21772 BLAKE2B 307d097629faf5c1967c0f189dc9703df481c763736242856c594dd99975193d81331654580ecce97b675591f8d9c543a2ccc769966d91ceb1ded7c3ec949ac9 SHA512 cd0bce1abe2cd53015fee7f8080e05bbcd80798fe0a6fa0e120776018a382260bd070d1a14085ef3e6d7fb16a79c6a05f438d4f8b228cce7461efe5a1395b530
-EBUILD parallel-1.19.2.ebuild 1794 BLAKE2B 067f3cc745aabd55870f23b88d8da5d144b9747f60f249ba7cce83486765f6c65cb23aa1aeab6fc3a75d98c87d56cd22945b40f0bbc742b78f0d575e55ce42ec SHA512 67a8e66d385bd9fa7b3b91fcc3920a71385ad555652a9b43d16b9d7dacf05b0ef123ab1303dc45e35dfc7edceef395a5980cb7cedb9231006cecb719a26d68c3
-EBUILD parallel-1.20.0.ebuild 1794 BLAKE2B 067f3cc745aabd55870f23b88d8da5d144b9747f60f249ba7cce83486765f6c65cb23aa1aeab6fc3a75d98c87d56cd22945b40f0bbc742b78f0d575e55ce42ec SHA512 67a8e66d385bd9fa7b3b91fcc3920a71385ad555652a9b43d16b9d7dacf05b0ef123ab1303dc45e35dfc7edceef395a5980cb7cedb9231006cecb719a26d68c3
+DIST parallel-1.22.0.tar.gz 23294 BLAKE2B 99bc41f132083402fe6ba9666d89941ce7672463c80676b8b558ce8a6915e996a1ec1d86476ab645796db79a63160677405c525c0696306dda270a54db1c8010 SHA512 2b993890234337e8eb1b22882423c8b2d73bfe7be386a7d2c9cf4f45620f3295f7c70b630b1607995e913d2307c043db658edb41b5c95f334f64bbd178cccf20
 EBUILD parallel-1.20.1.ebuild 1794 BLAKE2B 067f3cc745aabd55870f23b88d8da5d144b9747f60f249ba7cce83486765f6c65cb23aa1aeab6fc3a75d98c87d56cd22945b40f0bbc742b78f0d575e55ce42ec SHA512 67a8e66d385bd9fa7b3b91fcc3920a71385ad555652a9b43d16b9d7dacf05b0ef123ab1303dc45e35dfc7edceef395a5980cb7cedb9231006cecb719a26d68c3
 EBUILD parallel-1.21.0.ebuild 1405 BLAKE2B f7837e83d15252c435ae4af6ff6d74b075dd42654d98db9869e77e91a6ecaf5e750436e564bf0c6d392e50cf9d70a1cf1d2a84c0ac33a893979a4aa783060622 SHA512 b89444ecab86650657fc3d927a9e3ef41f0fef09e4be6f57507c48181a9a0e6cbeca2faf44b4d1964f12c1e2e8f122dd4a13c2992ade66b03cb9ea7f2490e310
+EBUILD parallel-1.22.0.ebuild 1405 BLAKE2B f7837e83d15252c435ae4af6ff6d74b075dd42654d98db9869e77e91a6ecaf5e750436e564bf0c6d392e50cf9d70a1cf1d2a84c0ac33a893979a4aa783060622 SHA512 b89444ecab86650657fc3d927a9e3ef41f0fef09e4be6f57507c48181a9a0e6cbeca2faf44b4d1964f12c1e2e8f122dd4a13c2992ade66b03cb9ea7f2490e310
 MISC metadata.xml 343 BLAKE2B 319ce92e2b405a76468f653192288669596fdf31ecea733f88de907cb5fc184bdbc197bae14c3cec97a5f25c47cd6fe3e201ae60ab19e5dc06a2f8b612e2b719 SHA512 7fbc85907d9d51e90d0bbf2cd1431557afb9dae6b15b6d9b9d283e1957606381fad7fa7a0aa05d01ce0921c3ecc33d304b61c567069ee439e7ad2f25d3c86924
diff --git a/dev-ruby/parallel/parallel-1.20.0.ebuild b/dev-ruby/parallel/parallel-1.20.0.ebuild
deleted file mode 100644
index e49b4e4213b2..000000000000
--- a/dev-ruby/parallel/parallel-1.20.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRAINSTALL="Readme.md"
-
-RUBY_FAKEGEM_GEMSPEC="parallel.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Run any code in parallel Processes or Threads"
-HOMEPAGE="https://github.com/grosser/parallel"
-LICENSE="MIT"
-SRC_URI="https://github.com/grosser/parallel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-SLOT="1"
-IUSE="test"
-
-DEPEND+="test? ( sys-process/lsof sys-process/procps )"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/ruby-progressbar dev-ruby/activerecord:6.0 dev-ruby/sqlite3 )"
-
-each_ruby_prepare() {
-	# Make sure the correct ruby is used for testing
-	sed -e 's:ruby :'${RUBY}' :' -i spec/parallel_spec.rb || die
-}
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/ s:^:#:' \
-		-e '1i require "tempfile"; gem "activerecord", "~>6.0.0"' spec/cases/helper.rb || die
-	sed -i -e '3irequire "timeout"' spec/spec_helper.rb || die
-
-	# Avoid a failing spec regarding to pipes. The spec seems like it
-	# should always fail.
-	sed -e '/does not open unnecessary pipes/,/end/ s:^:#:' \
-		-i spec/parallel_spec.rb || die
-
-	# Avoid fragile ar sqlite tests. They throw ReadOnly errors every now and then.
-	sed -i -e '/works with SQLite in/,/end/ s:^:#:' spec/parallel_spec.rb || die
-
-	# Avoid spec broken on Ruby 2.1 that clearly doesn't match code and doesn't really test anything
-	sed -i -e '/doesnt use Etc.nprocessors in Ruby 2.1 and below/,/end/ s:^:#:' spec/parallel_spec.rb || die
-}
-
-each_ruby_test() {
-	# Set RUBYLIB explicitly for the ruby's that get started from the specs.
-	TRAVIS=true RUBYLIB="lib" ${RUBY} -S rspec-3 spec || die
-}
diff --git a/dev-ruby/parallel/parallel-1.19.2.ebuild b/dev-ruby/parallel/parallel-1.22.0.ebuild
index e49b4e4213b2..7a798626bec6 100644
--- a/dev-ruby/parallel/parallel-1.19.2.ebuild
+++ b/dev-ruby/parallel/parallel-1.22.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/grosser/parallel"
 LICENSE="MIT"
 SRC_URI="https://github.com/grosser/parallel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 SLOT="1"
 IUSE="test"
 
@@ -38,16 +38,8 @@ all_ruby_prepare() {
 		-e '1i require "tempfile"; gem "activerecord", "~>6.0.0"' spec/cases/helper.rb || die
 	sed -i -e '3irequire "timeout"' spec/spec_helper.rb || die
 
-	# Avoid a failing spec regarding to pipes. The spec seems like it
-	# should always fail.
-	sed -e '/does not open unnecessary pipes/,/end/ s:^:#:' \
-		-i spec/parallel_spec.rb || die
-
 	# Avoid fragile ar sqlite tests. They throw ReadOnly errors every now and then.
 	sed -i -e '/works with SQLite in/,/end/ s:^:#:' spec/parallel_spec.rb || die
-
-	# Avoid spec broken on Ruby 2.1 that clearly doesn't match code and doesn't really test anything
-	sed -i -e '/doesnt use Etc.nprocessors in Ruby 2.1 and below/,/end/ s:^:#:' spec/parallel_spec.rb || die
 }
 
 each_ruby_test() {