gentoo resync : 24.06.2021

10 files changed, 111 insertions, 6 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 7a18971fe93a..56d68bb9cf62 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/crack/Manifest b/dev-ruby/crack/Manifest
index 91c7690397bf..8154a81291bd 100644
--- a/dev-ruby/crack/Manifest
+++ b/dev-ruby/crack/Manifest
@@ -1,5 +1,5 @@
 DIST crack-0.4.3.gem 574976 BLAKE2B 4b6f23277ec17a516d06e6e6785889996172b3ec077f022d1a52ab4b8e938b2735abbaecc71288b55654ff09a428c33eb944b627cfdc827ea1f4ddc6289461d9 SHA512 c6577bd86fe2e36b2a37693729da9fc35c5d4deb860ac1873265ccb6fb38056fd76d8c17bb4f779b39f4bc13b9db37c1768433f518c17090ccbb0872a103b386
 DIST crack-0.4.4.tar.gz 586633 BLAKE2B 26e2cda6e9447fb3c9fe02092a6e9d6a8097c7bca6a483a3af42aa8ba491b737bc0dc3ae1936ef8ffb5c5d5cbbed3fde69c9641f05b9e3eb3beab87c375f68fd SHA512 3f86c76718a3c2a65ee11b15434035396c2355a8562bdb642432a659b52c3e811e930318e0dc2df3ff06bd53ac14d0694471e425420ae3b7971f5d4f818bba87
 EBUILD crack-0.4.3-r2.ebuild 1050 BLAKE2B 8406da2d2e30471bce4caf53d77c34b9154cd935b2a3ce23d6ef9bded067fc03e7e11404843ff7b216c06fa2cfca801f311eaede86ec5c7604bdb46156bd93d7 SHA512 e97ebfbf3557a6f51af09bd026a77cddef73322622c258798ddd791eacb9e670ac768b0245c507b989e2436246045879eec1b0ebf6dfbd6f94ed3e7a565fbd6d
-EBUILD crack-0.4.4.ebuild 1086 BLAKE2B 0b20706353d62a3504e85731a109daae684c674b740f9d7755855ff2bbe29ee2b6a9c8fb799f9b5de7d1db7326a96e40dbdaa599f13a362827862b5ba6d81480 SHA512 5a506e1beb829a4f2effe3437fc5c678c4f0c1e4e452d24fa42b939d7be784767d687b25603645ac2cf8d9a439a69a62ede88b4f98487d59c844ecccceb77dfe
+EBUILD crack-0.4.4.ebuild 1093 BLAKE2B c4fbec74380944fb04f623bbe30ca97ccc5f78c3db9dd7efa59522d55d54d1c4a3605ccb1098f2394715c89d42038f9890c6bbddc0537727f5b37092a72aec2a SHA512 a19392409607ff63b6c6c537164b84a559a5f6d2a12d1a78ffab8d026c961143699768615d4808a28cd609576b398a76d294dcf343d0a36609c4b0a0acd62621
 MISC metadata.xml 342 BLAKE2B bf1bf4fa826a68ba0c2344619bd3a18ea9f3944f41ee9edda5b0cdebb46d8790a39dd6ef738f996a3c15672a1fe7242c55132eefaf719f21725d9b4372eb4f07 SHA512 2f890aec4b5c1bf8a31bd079d8e0b8e17242e262b7ba2619e5f791da25e2e7510a52086b4103ed257726d0a47e999dd22d0b3c60f8dc77c515f5fc61b122f2a8
diff --git a/dev-ruby/crack/crack-0.4.4.ebuild b/dev-ruby/crack/crack-0.4.4.ebuild
index 2dc0b364ec52..d88629af7d51 100644
--- a/dev-ruby/crack/crack-0.4.4.ebuild
+++ b/dev-ruby/crack/crack-0.4.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="README.md History"
 
diff --git a/dev-ruby/eventmachine/Manifest b/dev-ruby/eventmachine/Manifest
index ec8f3940a3d8..93d987c7a5df 100644
--- a/dev-ruby/eventmachine/Manifest
+++ b/dev-ruby/eventmachine/Manifest
@@ -1,3 +1,3 @@
 DIST eventmachine-1.2.7.tar.gz 246402 BLAKE2B 3eee1e5fbb367c03e3d801cb705a0f95b7bbb461885f04820f57421019a3d61eecabe71309981eec35168395eb6d98a8c675bd0fb225497de511f2ce09a5df92 SHA512 768ec084903dce4c737cf564fce7886a3e7e5b7d4a89c2baea3e998130c53dc00488eaa2d8e9b0133d9e4d8fffbde80c3025403881486a7968c2d84425cc1f50
-EBUILD eventmachine-1.2.7.ebuild 2754 BLAKE2B a8ef570a87eabdbad6e6e37fe8c3e0cfb02d62160ea63a34a58f4946541d21ed3f8e2f17d7edb82606fbaa061c94ee1b84001ac32d7202badb266bdf179fff0c SHA512 677e9af923a52d249430b99e3076c410864a6d9ccf13fab329ca6c5a046d9218f92dac9b8725dc34c84145d8b697e8521c8bef77e6cfb407dbec1acd467ddb7e
+EBUILD eventmachine-1.2.7-r1.ebuild 2755 BLAKE2B 6006a88f33b374d9f3f42058936aff9fa35e9f361d657be07bea276cf56bd21100b38f0c0b58400e648fb401c0f3730099f9a7d5281a51b657539098ea297f0a SHA512 c0bdba172d5027f228235649cab1ccf59f4562f88bf846697e1ece2dfa7688607ab62a40265b307946cfcf5625147d6d5daf950b0f73cb8746bfa2165d291116
 MISC metadata.xml 523 BLAKE2B c8c4dc99c1560b2dc7233a194f0892bf86397594daf3896408d080632dda52cae3fef16654e2a35340bc0746befab669071ff9de7707fcbd92583472aa52f73d SHA512 622ac8cdd832ad49db828fefc3c9ab089e1d7e3795e369778591b4f572a647a99d4625fb9a3624189d0521a8daa9d2360bfe01fd905e8d106b83e244d900e509
diff --git a/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.7-r1.ebuild
index 4a7c7d6f2927..7128a0f86c49 100644
--- a/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild
+++ b/dev-ruby/eventmachine/eventmachine-1.2.7-r1.ebuild
@@ -23,7 +23,7 @@ IUSE=""
 DEPEND="${DEPEND}
 	dev-libs/openssl:0"
 RDEPEND="${RDEPEND}
-	dev-libs/openssl:0"
+	dev-libs/openssl:0="
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
 
diff --git a/dev-ruby/shoulda-matchers/Manifest b/dev-ruby/shoulda-matchers/Manifest
index 203997669e0a..1fee75097c0e 100644
--- a/dev-ruby/shoulda-matchers/Manifest
+++ b/dev-ruby/shoulda-matchers/Manifest
@@ -1,9 +1,11 @@
 DIST shoulda-matchers-3.1.3.gem 208384 BLAKE2B 0ce7cb91ec8a311ecd4872ca45b178686fedb126fd5a05d55cc8654f5a40d1ed7e0a1da2b2c47c34ce3e5ed13a302a1d309f4afa67bafb37d5ed8a724945e97f SHA512 c61397d20724f3048172a8a20ef8abaeafdba3a1d5d4b923b1b11480b25c70820fd372eb2851c6eb307894bc0b7e1aae515e23a3581a83db1b65a2c778b22d67
 DIST shoulda-matchers-4.3.0.tar.gz 235212 BLAKE2B 03d634a851d5b79baac7fb3c5017be2ba8ce5b36905597eb759ea6ed22d543af5ce02c0c2af0f560d913d17713a8b3c417770adb7f247a6548d0666164e0866f SHA512 ffc90760ec47502d0820decfb8ab0620fa65fd9f45f3435c1d905ce0fe96010a3e059c690e9dbab7b30146b09a9e511ed4687a220d7cdf000f2fe1060e0b5ada
 DIST shoulda-matchers-4.4.1.tar.gz 240423 BLAKE2B 5fca9389601f35c536fa8a37adc6a14282fdb4aba21453223d739e503fc226c74473791880d2fc0b4f308bf9deccc1bd640c320e86f586f075b5d1add69e33f2 SHA512 3103bbad862848d00f9ab8c71c20fef1fdc131c6ed13a5d6ae9e11c3da8ecd2aa09e5996f8b28ad08a5588b02ab5783dcc37d04357d13357ea3fa8ca28a02e3d
+DIST shoulda-matchers-4.5.1.tar.gz 243634 BLAKE2B 32d846d0dc3c8725a9bd0d60e858eb9fe4106a20222503ac908d1a9c9c310d8e1477aa6264f06961812151b9bd1a1a33488707d9c96524cd3431ed7b3246e534 SHA512 8c240fe7699094a63db824145ca28c245526e95d489fac82e1a28a2418ae40524ba0a184a7f9b269b7c31ad7ae2cbc24b453547cab0845639fdea442bada483a
 EBUILD shoulda-matchers-3.1.3-r1.ebuild 535 BLAKE2B 1d70372e32dffd151239cf5b9b6b4b9baa93a24710efaaf00dac928702d33d64e9f19933a839a5d532fc37c6f2d11b3bd4daba08e377692c642876b42f250797 SHA512 a57717479260da7b69335404c7100b9c36929815b8c1e18ac9a3dff332a856b91de4b350450f74388886701af03af5843e66e00ff333ddad660b9bda5d73b131
 EBUILD shoulda-matchers-3.1.3.ebuild 529 BLAKE2B 8e86c34cb17d6cee8e2a6f139eb4337671ce57f38c0132568874c7f79d0784f4609d30684df3e4a0bed5eba750684f6de31f86be44f9369769c9a9d515cf01ed SHA512 2bac2b7f6d1bbc17aa01a98bb244212af4b90905b7a1516ae5f0e4a3a6b33f67cceb17de2064675e4711565ed6b24e1f7fca5679402723d8f795c72000c58a33
 EBUILD shoulda-matchers-4.3.0-r1.ebuild 816 BLAKE2B e1d68caae2340c23b4abaf0691a3aedbae59bb29357417616d998e724d83f07fff075a2aee58954924d3c7449b096cf499290dd00d1e6e5ba87815e4f415545b SHA512 d1e6b7955f15d523c19a135d5de795b384cf5f81de2045354936a86506aca541017fcad00cb28fb1e825275d3deb3ae3f6be4a4fd81769767edba61eea6aeaf3
 EBUILD shoulda-matchers-4.3.0.ebuild 815 BLAKE2B b0659e19572024e2db6db9a4620756f856c110526c5d1e2d8a398322b71fb38cd43453ab40214279ba5cd0d55007b73e8fe195656911515c17ea1fde2e1768d1 SHA512 3eede673c7b40c5f0a245e8c3d5d45bff86c050e430d4df0ae36c0aac252f49fd69939542406d4d6a1212832e58da315fc270a8f0369858e740aeb22946105d1
 EBUILD shoulda-matchers-4.4.1.ebuild 827 BLAKE2B 11bee72906fd00ea2d2a27ceb0de995f0da58525a1d05d7a11a3207974d4c69c4d4ef99e051f2b789756900975a4ba97a986d0ad1b5103507e6a351966be62b5 SHA512 393f70eed0992172d26da975fa7eb06c47552d3bdff86af1cecdf29a714cd58106c9d17f456332469c3d09af0d4e4cee0f88b035f77d0ed0b8c1486858ff0fd4
+EBUILD shoulda-matchers-4.5.1.ebuild 828 BLAKE2B 5534da966d45c768a72aa432c0c2d52fb732334b307ca1f420a7d37d556233d237d2eeb4f2c60123ae2b907750c18d52c8ba6553a0c9f2d13eec29f181cd9cb9 SHA512 7489212005c817def938f140d3360d60ad12be148370c3944a492ebea73bcc062a22b8859e58ba0c5c748dda20d5ec6a009591a8f16642d64593d9c26ea8ace2
 MISC metadata.xml 467 BLAKE2B b4a8138623dc83ab8a5fa10d6242f3d04d20ce4e15b0abb00f678600212063ce8653f3644c3a98d0186d4bdf53d042ba7f7bc1d1bdb699501d8a7e1aa7fb36b7 SHA512 d3ba695c8bfd835a472f35442b16057a73219d9b320276823843b65f00f18d8cfd7fe7f814abf458bdaa945751883a5f490d0f7a02a1c200d99fcfb51a57a400
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-4.5.1.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-4.5.1.ebuild
new file mode 100644
index 000000000000..3664014594e7
--- /dev/null
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-4.5.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Making tests easy on the fingers and eyes"
+HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
+SRC_URI="https://github.com/thoughtbot/shoulda-matchers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
+
+all_ruby_prepare() {
+	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
+	#sed -i -e '/s.files/,/^  end/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index 3cf2bb8193a7..7c6fa5ab62b3 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,7 +1,9 @@
 DIST webmock-3.11.3.gem 125952 BLAKE2B 664253079457cdf400be869b9e61092b12872282057540e42e6fb73a5fbaa38666757f7f8bd336e4f5c45ea1ec52f9af4b444ba67ae24db62a75b5c18636ae08 SHA512 80fd2139126e1e9d6907dfe93021d77179ae6c31cc2a63eb3ee47c011c2a48f18bb84ac08322da8def014f2293564f5669eb41037edbe72ffccfefb7ea281739
+DIST webmock-3.13.0.gem 127488 BLAKE2B d92deda505469fc7fc5adbf0f7a90a462b03999c0affb79bf67523667af30f582b44b10f554c93a1c98e224edf1f8a5a700fc17c3624a962a68d8e61df84127f SHA512 de7c3d8e079f409db53b316238ce37a80db8eeb257e00c8b3f162e5b4f98c4a383108e6cb21be8b71db34295fdb2354502e9b7457741a935572d9afcb75b30c3
 DIST webmock-3.7.6.gem 122368 BLAKE2B 9bc40971f1eec96d88217544acc67b7abfe6c0815a0696119e12fc5629b4f51e1164ecc982525d2c02fa50c7b1b09548c4831c1d597f06acde04a83227ba0dc9 SHA512 85455495476b22d94b23e34a92db3f0f8cf1aa5bb52ea6a8eb71f5f0bcbdad1edc13dff778c62806ec27850320e9f4e17f12525bbac552e5e105ee1ecd771efd
 DIST webmock-3.8.3.gem 122880 BLAKE2B 66371028294f3b15172d718e0fa9402ad6ed1bf7beedb0c62621ad31758d25e401af9cd982a6f29cd1161a7e4d7954f6f9df22ab2e0c44c970a0edca3c0f1304 SHA512 6c845c4ed0c82ba4bb1f32d0d87a87eb945c54e159317aa14e2238b497d38282b7e81542e78c0d68d4b8d4a08e46137de84503829b7381e6d945e45474ebb507
-EBUILD webmock-3.11.3.ebuild 2221 BLAKE2B b5426673d3d7a104adaa980026361e59a43befc5a89ce4c09eff1b6f9415789952b50e625543db2015d7321fca570804911924fee5e00fbc714bd6741f748a4c SHA512 43b599a71cc5b1286031a69e81ed6f3f8c07b8fd22d93c81df9e32b068fde91f525c9305365e7c89a8e0c890e1e60edbde9d5e4d70d507ea6359fb95994533bd
+EBUILD webmock-3.11.3.ebuild 2220 BLAKE2B 4fa059c167e4fe9f53faae3c12ca5bda38d2b91b77409ea3606527ecd7ab49e34d10f0ea81f7b59fac23d7e0e5bb9fa42f93b12676c4578809290330093a72c3 SHA512 90cd3d70911853b5759b3d681090d979a3dc5c8a9a377569134c2a9ee58e0b6d1537b3b3766afef320745fbe8fb9f00d98691aa6275a9193de0d783d8a0a4e72
+EBUILD webmock-3.13.0.ebuild 2221 BLAKE2B b5426673d3d7a104adaa980026361e59a43befc5a89ce4c09eff1b6f9415789952b50e625543db2015d7321fca570804911924fee5e00fbc714bd6741f748a4c SHA512 43b599a71cc5b1286031a69e81ed6f3f8c07b8fd22d93c81df9e32b068fde91f525c9305365e7c89a8e0c890e1e60edbde9d5e4d70d507ea6359fb95994533bd
 EBUILD webmock-3.7.6.ebuild 2059 BLAKE2B 21417ac451a0b70df72a05a8848c8ddf7a2f0f939eb498a5d71f91dd3f2bcd065f15d3ea8ed047c64b70c421562b337054a5388d96d497f52a1b684b58417ca9 SHA512 6b94a52934ada134df94b263fd8fdc9a3ea1388c742a11c2eee24e011fce9f99e86436745d56a646a0e3fb925006f7048a889e2cf82b47ebe39b2d505763b897
 EBUILD webmock-3.8.3.ebuild 2066 BLAKE2B 032b384a4dafd98a1925c0a1582b4698f51f3ed15c0480ac3f6e683492571f869896cdddb8f4f536f84f5cb2b6f0cea89bdcdf1602d9bd40044c60c69a8629ca SHA512 b4f4055fc24416151b55fdd9ee07701ee3562ff03c6dc4f49080417a66539db1b66386721ca7601bc2eae0a30a666a3e52167a3f8d093f9c24a255a94d0c7199
 MISC metadata.xml 341 BLAKE2B 75a7b957f0aa060ff3c632620c1b8eac9344b37566c9205bdfaff70fdcbc8cd391dc7296317bde0e8ce1e1ea3cb7540446267112eac00571beda686f5a592130 SHA512 66c55ee845168bbdd2b792d90cfbe116a09ff3bc00861164e82b68355ed585e87b58b7c0ab21da37dd984b680ea4841e7a2cd0c8bea1a081b1adb4c5b9885b73
diff --git a/dev-ruby/webmock/webmock-3.11.3.ebuild b/dev-ruby/webmock/webmock-3.11.3.ebuild
index 0b2512f21dfb..66f1095e9dca 100644
--- a/dev-ruby/webmock/webmock-3.11.3.ebuild
+++ b/dev-ruby/webmock/webmock-3.11.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/bblimke/webmock"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/webmock/webmock-3.13.0.ebuild b/dev-ruby/webmock/webmock-3.13.0.ebuild
new file mode 100644
index 000000000000..0b2512f21dfb
--- /dev/null
+++ b/dev-ruby/webmock/webmock-3.13.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
+HOMEPAGE="https://github.com/bblimke/webmock"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.3.6
+	>=dev-ruby/crack-0.3.2
+	>=dev-ruby/hashdiff-0.4.0:0
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/rspec:3
+	>=dev-ruby/test-unit-3.0.0
+	dev-ruby/rack
+	>=dev-ruby/httpclient-2.8.0
+)"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '1igem "test-unit"' test/test_helper.rb || die
+
+	# There is now optional support for curb and typhoeus which we don't
+	# have in Gentoo yet. em_http_request is available in Gentoo but its
+	# version is too old. patron's latest version is not compatible.
+	sed -i -e '/\(curb\|typhoeus\|em-http\|patron\)/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client}/* || die
+
+	# Drop tests for dev-ruby/http for now since this package only works with ruby26
+	sed -i -e '/http_rb/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/acceptance/http_rb/* || die
+
+	# Avoid httpclient specs that require network access, most likely
+	# because mocking does not fully work.
+	sed -i -e '/httpclient streams response/,/^  end/ s:^:#:' \
+		-e '/are detected when manually specifying Authorization header/,/^    end/ s:^:#:' \
+		spec/acceptance/httpclient/httpclient_spec.rb
+
+	# Avoid specs that require network access
+	sed -i -e '/when request is not stubbed/,/^      end/ s:^:#:' spec/acceptance/shared/callbacks.rb
+}
+
+each_ruby_test() {
+	${RUBY} -S rake test NO_CONNECTION=true || die
+	${RUBY} -S rspec-3 spec || die
+
+	einfo "Delay to allow the test server to stop"
+	sleep 10
+}