gentoo auto-resync : 02:08:2022 - 09:17:58

11 files changed, 122 insertions, 7 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index c9511a36208b..8beb337671a9 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/colored/Manifest b/dev-ruby/colored/Manifest
index e4f2625648ef..eabccc701330 100644
--- a/dev-ruby/colored/Manifest
+++ b/dev-ruby/colored/Manifest
@@ -1,3 +1,3 @@
 DIST colored-1.2.gem 5632 BLAKE2B cb384fe13692d453f86e403a8684604d07543e3ea3270ad15b6d6d8be2c0d3610911a23b82f23c40e0472f40174a290948804eeb8cf5c496f36ab49d56ee4413 SHA512 92a50ba1c434b6a0b409e546812ae6f4331be00a68725cd207504bdd65c9512f4fc3bf83057dd4fad09b8a3e5869595a6bb572c4303f0bef1f241ce63d4fc90b
-EBUILD colored-1.2-r1.ebuild 379 BLAKE2B 5426c980bd1776b4ae8f52460d77b1cd5a497f8953ad4e1f69929d9ecca9f603783a20509bc07c6130679fb462ef40dbf8a398c6da9b21b7e4ed5e45de566956 SHA512 6df9dd31d706ca4876bcc226ba37d5fff2e3bfde4119c573cce6a8f4149e1d20dfe0538671f6712b305a99c6faed6ca4784b25532cc46ea6d114f177c11081e9
+EBUILD colored-1.2-r1.ebuild 378 BLAKE2B 2a7856e2f92679d077b260a2c0502fabc374d1333b4db1abeed93b9eddea9de1ccb8bbb2699712330e26581a78841eca8bd568d9acb7fe6f08df8730de5d32ba SHA512 0e5b1a0a1ff80dc070475ae8d9e3c08037baa550de4438ff22a859041791bc404ef7e07cf63d4c6eff9e03b20dacc3275bd25abd06971c08c70f170f450af523
 MISC metadata.xml 342 BLAKE2B dc673388fe81a59c0811d8456c7618e3fbf72639c050e33204279ddce9cf00da4df0d59857c594f8dd005d951c43e9c46ca62339dfff2ab5c52dcc50c1714256 SHA512 7374591f0a9a2b225fad85944ba903bcebcc0824074678fda64be5d1358a772a3891665a17cb54568ccee4a25ae2df842b2d4f27e8323d294e00c203a00cd2c2
diff --git a/dev-ruby/colored/colored-1.2-r1.ebuild b/dev-ruby/colored/colored-1.2-r1.ebuild
index 0c0e2d8559a2..6b81809044f5 100644
--- a/dev-ruby/colored/colored-1.2-r1.ebuild
+++ b/dev-ruby/colored/colored-1.2-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Console coloring"
 HOMEPAGE="https://github.com/defunkt/colored"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~riscv x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/crack/Manifest b/dev-ruby/crack/Manifest
index 19b52fc5b5e3..50e4ac89764f 100644
--- a/dev-ruby/crack/Manifest
+++ b/dev-ruby/crack/Manifest
@@ -2,5 +2,6 @@ AUX crack-0.4.4-psych4.patch 1053 BLAKE2B 280da92d42ad5c4138b7f4293cbd9efafb0033
 DIST crack-0.4.4.tar.gz 586633 BLAKE2B 26e2cda6e9447fb3c9fe02092a6e9d6a8097c7bca6a483a3af42aa8ba491b737bc0dc3ae1936ef8ffb5c5d5cbbed3fde69c9641f05b9e3eb3beab87c375f68fd SHA512 3f86c76718a3c2a65ee11b15434035396c2355a8562bdb642432a659b52c3e811e930318e0dc2df3ff06bd53ac14d0694471e425420ae3b7971f5d4f818bba87
 EBUILD crack-0.4.4-r1.ebuild 1249 BLAKE2B b57c7a0e4a8d6c540d959f5a0ca86fec9e8295fe1cdfb494a82e1f63df3348027ca3677076e7b7d3cd4e82afd9e66f062cc4e950cda1a81be61ace746d8a6ae7 SHA512 d29fc1362fb146cbebdf87e24ead8cc581a8a14b21ef5cc033aea50f4326323dfb1ee6bb493aeb3eda0cbb2d1e7b621fdcba94001938f5177f15a182ab9d2453
 EBUILD crack-0.4.4-r2.ebuild 1278 BLAKE2B 86ac1450d72aead82dbaeac8e12b8e666d19bf280db1e7a01f1e2a6f30db146191b0c03b3e65b16179253c5bdd2c8f117fb35d336d1cb5c99e2d08b60b8b344c SHA512 9eb75d02a75cfd67f4628c5059ee571e90755f17ee5922e6c3e455d5ca0cfbee8c79604365e231042faa38749ab4c10e2149ee83d45a69d8e2c27660da5b0840
+EBUILD crack-0.4.4-r3.ebuild 1461 BLAKE2B 538ffa8a9a47048e773aee8d150195fcc25854996991fbf94a815e4a44ab6c7f7a224121ffc9544a27c7bc18fbfa2f1f984a3519208b14a59bdc9b6d5fcf784c SHA512 3017c3280440f7a60a6105b5b6c6e2a7cc264c335a43ba504c72f9f1542b55936fba34203fcd81c9a4d996ac0c3dd6a1669e44fb9cd6e30550268234944e9aa4
 EBUILD crack-0.4.4.ebuild 1107 BLAKE2B f6d10256b74eb122f990f3e458836edafd5099ea60173b606437743dffe46cf7156a674f172de403aafb509a41b681d05306afe5fd36a9a8fbcf4bcb65f2439c SHA512 ee73b8ef85924d2a1c0cd210f2b6ce9ff3f8c773220fa561982b29a6accf4b2e22535dc2f6905c206a1b4b554326dafd974b8a0ca8323ae49b70cba3bd6a8245
 MISC metadata.xml 343 BLAKE2B e98d01493c40195b22fa423e30e512b5f4b5ef08676138f4c5c3b7d18aae166fdc5fbb11ea465370de681fc85ded672dabefe34546f2b3140379984a187399f0 SHA512 44de19ae2a745da9ef90d7300e56efc80f892f0a7173ea6967c1bd079a24d0b50fa5de6eb1565254d7db84b5875679c9e70d2f3a87a60c31c9aa33f7bb4d6616
diff --git a/dev-ruby/crack/crack-0.4.4-r3.ebuild b/dev-ruby/crack/crack-0.4.4-r3.ebuild
new file mode 100644
index 000000000000..7f44edcffee6
--- /dev/null
+++ b/dev-ruby/crack/crack-0.4.4-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTRADOC="README.md History"
+
+RUBY_FAKEGEM_GEMSPEC="crack.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Really simple JSON and XML parsing, ripped from Merb and Rails"
+HOMEPAGE="https://github.com/jnunemaker/crack"
+SRC_URI="https://github.com/jnunemaker/crack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-psych4.patch" )
+
+ruby_add_rdepend "dev-ruby/rexml"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Also list rexml in the gemspec. This is fixed upstream in 0.4.5 but that version is not tagged.
+	sed -i -e '17igem.add_runtime_dependency("rexml")' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+	# Remove tests which fail when run by portage but pass when run by hand
+	sed -i -e '/{"regex": \/foo.*\/}/d' test/json_test.rb || die
+	sed -i -e '/{"regex": \/foo.*\/i}/d' test/json_test.rb || die
+	sed -i -e '/{"regex": \/foo.*\/mix}/d' test/json_test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Itest -Ilib -e 'Dir["test/*_test.rb"].each { |f| load f }' || die
+}
diff --git a/dev-ruby/faraday_middleware/Manifest b/dev-ruby/faraday_middleware/Manifest
index d5cfd011eaf8..36e08fe42c48 100644
--- a/dev-ruby/faraday_middleware/Manifest
+++ b/dev-ruby/faraday_middleware/Manifest
@@ -5,5 +5,5 @@ DIST faraday_middleware-1.2.0.tar.gz 28332 BLAKE2B 09aefce13f0145e4098d68d2b8887
 EBUILD faraday_middleware-0.14.0.ebuild 1759 BLAKE2B aa619b492a17e2b4361d0e4f28a2d10c5c18b9f5628620e74639f5cf77ab53ac222dbe4cc3633577770f29bff53ce851aa4953572d4118e001ecdfc4bb915d9d SHA512 b0059c01e7f72f5910664fe1d826e87b80c741a876ac3ab23e0f5247a0f3028f5b4bb38bf6f33fc3adf4908a342a5463f45ef953d97ce04a1876868da0aa58ae
 EBUILD faraday_middleware-1.0.0.ebuild 1695 BLAKE2B 494f0688de5319c53547112c920575b87c6a24bce6e61698f6c8aea0890359e6dddd04d1a5cbaf749497a4896231836472ed9323b49dc75895aec5c2f9427dc8 SHA512 344daac4c69f0f2afd180744e4d229b6294670802995fd6c8c08d124350b3c9bb752b88638e436d0678ea5e37e783575de930a7113973cc9b913c315ce703a8f
 EBUILD faraday_middleware-1.1.0.ebuild 1694 BLAKE2B 5c72148f44baf0c9bf4cddaddb806be325a2b1a24e9dede08bf47e93c73db7db3b7196dbed80ff24e7a189498c803b77c41efe32f83777ddf3d1c5c16e191b33 SHA512 710546f9fe4655299ad0c5d390a7f9dd942bbe4179abbd3eeebde94571d84b3a824a373c1b297d0c482b84a981c0e35cb8ff8cca22bb239ff56649c02ab6c961
-EBUILD faraday_middleware-1.2.0.ebuild 1694 BLAKE2B 67660f363cf4d87ba50011c2418f0d216a3863344ef02ca78a59f0394657b97ddc7c2189688cc18cd6d8977a6053ce94352347ba5c5302d87385a9d45dbf547e SHA512 e8aca88eae945db80a25de106f47ef96795d12d92ffc82d52748589982431961a44bf4261fce980ea261a17786505a9b0a3f1eb0a48fad5ec85ae1badc54e36c
+EBUILD faraday_middleware-1.2.0.ebuild 1883 BLAKE2B f9aec81deb45462a79ab1a641f796b5a6994ec202cd8215f2bcffc0d83f2059f76e00d2821a3831b5f58e4a7fce0fe24c87dff59f8e43ff4b8ff7406d4bb4490 SHA512 d0fb4b53fa54ec84cc70ed821cd8b9d4e92aade09b140cf1eb38dc3a23470a2836d85afceb4889725fc850fa6a7c59d24e9fdf51c41e32435b139c60fbe75bc2
 MISC metadata.xml 730 BLAKE2B 64f366662ab812afd769d94c56eb3829c55803a968afc445cf2e43f16f3c02b6c25541459fa10a93adfacf7064c0fe136321d64e546e8a570365ad002ccc5397 SHA512 9ea2039688d9139404e6d0bd1322f399ce4019e5e36e6d4941296559ce64bc9ca99807d7e0f10c776c4b597e0839a49698d6240c432be4102bfbdaac09b46e2a
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-1.2.0.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-1.2.0.ebuild
index b08b6146db7d..ed5fc68e6050 100644
--- a/dev-ruby/faraday_middleware/faraday_middleware-1.2.0.ebuild
+++ b/dev-ruby/faraday_middleware/faraday_middleware-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -46,17 +46,21 @@ ruby_add_bdepend "test? (
 
 all_ruby_prepare() {
 	sed -i -e '/\(cane\|parallel\|rubocop\|simplecov\)/ s:^:#:' \
-		-e '/rspec/ s/>=/~>/' \
 		-e "/addressable/ s/, '< 2.4'//" \
 		-e "/rack/ s/< 2/< 2.3/" \
 		-e "/rack-cache/ s/, '< 1.3'//" \
 		-e "/simple_oauth/ s/, '< 0.3'//" \
+		-e "/safe_yaml/ s:^:#:" \
 		-e "/webmock/ s/2.3/3.0/" Gemfile || die
 
 	# Avoid unneeded dependency on git
 	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
 
 	sed -i -e '1irequire "fileutils"' spec/spec_helper.rb || die
+
+	# Avoid safe_yaml specs since they are broken with newer ruby versions
+	# and safe_yaml is not mandatory for using faraday_middleware.
+	rm -f spec/unit/parse_yaml_spec.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index e6a5c3c5a497..b27aa31c76c1 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,4 +1,6 @@
 DIST webmock-3.14.0.gem 126976 BLAKE2B 20dd463c8b784869d4379aeabf892a6b4602091a4cc01a4002161d88f24781bb2bae1e50bd0ce8077c40aab73a2243835d99551bd04d808ffdf019df071c2b01 SHA512 0c9ea5b29446de7619c45d0fb72ab305bf68150c9d657ddc223d0d258a400dc730e3fe401b46c994a5c8eb450db5ee8f7021fe8d2d6c85bc4723c657799c5ccc
+DIST webmock-3.15.0.gem 128000 BLAKE2B 10587fd127fe61076d34a36f71e6e61f43d6019a01d1906e1fa501697791deeb89a8a2cdc5fa92dee1b001cdd22055db913ae20414342faf0ae11cc301bf0e6e SHA512 9f2e6404b617cc1aa67dcaef941046f82e4602eaeef77084714a451be513fdbd6e6c54c090842c5519009d2ca0533b30ad17d225d3738cde526d037d3fe3335b
 EBUILD webmock-3.14.0-r1.ebuild 2208 BLAKE2B 844a2c2e80e49ac585198d4c9f367f9c33c75ea8b57d8d9b795a57c0226a0cc2d1914f6d94f5d7519f9a62cdac21013b23b5093e4fb13a958270fae23fa3ac9c SHA512 d1075b29f3d7f24c1d0c84401bd52606f1e2cb8e52af9a71f9618d61e2ac8c7aa5f6129c956b26f4e73b91acc249527d48c08183da5345c38210a652ca98c82b
 EBUILD webmock-3.14.0.ebuild 1993 BLAKE2B 3859ccfeb43a7a4a895b2a3c3b49cf1a8c5f0fd5f9dd2374d90393e8c8828a0206e2da676046069560ee6c9526c33e351e7e1271dcdbc4b46ea9f57d21294eac SHA512 03186e23bee7308be8291d9f673f8ab1ba5f1db7f8feceb11a59b1fd7aa60aa3f32052106e946e7b569629c343cd8fef7d0d0ca44eb4299e717ee0000127dad1
+EBUILD webmock-3.15.0.ebuild 1999 BLAKE2B 62a8abc749c77b2afed5a742295419fe1a6fb96d8c7f587c8057ce71b8ee7ec088e47d59e3631ea2ff5a5770a5adbf1b3efc6b367e5b503e3d9837778b02f897 SHA512 0a2d98ae3ad282b4c18855acd8e5c16e9cf60687cabb79c3ce605f25e4804e5f3e9ba4379241b6aa3240889b1bb2f3f0eab9d1bd3d13bac6ac55017ef27c927f
 MISC metadata.xml 342 BLAKE2B 0f0b9d59bb3519e6da06fe5d57cc9ce3cc1f3a1f516006a3d43a6cd3c416b3b5d9d2955a7800a588010b9672f3a03fb6a74bc62c3ead8b2e0f0b3ce0f5af5456 SHA512 0c4f9ce8deb018a77c7ec77417a22d3b95d0701263acc1ff07081e4e7ef995051ad2eba387962ee06b4bd810db5da7e2294e1ca7bb9a50704f7d7265b8462997
diff --git a/dev-ruby/webmock/webmock-3.15.0.ebuild b/dev-ruby/webmock/webmock-3.15.0.ebuild
new file mode 100644
index 000000000000..ff18bc5ed6e0
--- /dev/null
+++ b/dev-ruby/webmock/webmock-3.15.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+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 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.8.0
+	>=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
+)"
+
+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.
+	# httpclient is no longer maintained and has various test failures.
+	sed -i -e '/\(curb\|typhoeus\|em-http\|patron\|httpclient\)/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client,httpclient}/* || 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 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
+}
diff --git a/dev-ruby/xml-simple/Manifest b/dev-ruby/xml-simple/Manifest
index 518d6cbc82be..8d8c315aed03 100644
--- a/dev-ruby/xml-simple/Manifest
+++ b/dev-ruby/xml-simple/Manifest
@@ -1,3 +1,3 @@
 DIST xml-simple-1.1.9.tar.gz 119573 BLAKE2B fd23d75f45265093f7d7a6a1a96a5872bc12d918f775a88339f82bd3a5f710c3db23390769b3d88832b145aee04863734061b27210f129dc23b62ce8c6b02824 SHA512 3bc53558adb65b0d9c4c1e7f2980b5d3cd2fa7f2b0ec1969c1631bd95960be504eacc459830ce83f08d11c080250346e6059c8c463faf372c1e61bbc1fc86804
-EBUILD xml-simple-1.1.9.ebuild 712 BLAKE2B 8be76b8c3b89021089268735c69600093db42c60faf2e5501cf2e3d5fcaeed6b7ad5bcd5bc4ea316c59bf4d5129fb398c0d4143e3caa3b2c2f3c8a27f7a6e960 SHA512 52440420e59592d3ea77dbc195c311254eb3387bc32686517c3af4cb4db8ff8274357e0b8344d453a0d69aa7931ecd6a5792f848b0a0a8bf691af181eb0efb27
+EBUILD xml-simple-1.1.9.ebuild 711 BLAKE2B 3386f2f8615fa0e2391a89cd2d752461dc513a27335848693b074913d5a25ba73bb0049768b4dbd23cdd3c1bf51b534760a2b03fa7be462043e353111bc14cab SHA512 0c690fcec89b23887afab2eec8bbd9a2adf8bd32c097c11caea8523d94c11e03b89c43d245861f446cd6f524ab04601b53e3586191a32c5309ed37caf23bf9ba
 MISC metadata.xml 342 BLAKE2B 09b84530611bce4e3deb7b205a6d1c293283b4947cd2d25761cf93828d5c3339dc21e536b3e38bcdf516ee22e6e101ecd57a5ecd24c0695441b84e68fa61ce6e SHA512 0237ff135ab962bfc2deaf4c3b0512e33e050e56e1c7464aeab9d20c94b6f3aa1c45ee4be1cbb7e464afcdd379666191812f10f716df26769137484ac8395b94
diff --git a/dev-ruby/xml-simple/xml-simple-1.1.9.ebuild b/dev-ruby/xml-simple/xml-simple-1.1.9.ebuild
index befb8df84a45..665c0addf5d9 100644
--- a/dev-ruby/xml-simple/xml-simple-1.1.9.ebuild
+++ b/dev-ruby/xml-simple/xml-simple-1.1.9.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/maik/xml-simple"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc x86"
 IUSE=""
 
 RUBY_S="${PN}-${COMMIT}"