gentoo auto-resync : 16:12:2022 - 15:36:37

8 files changed, 39 insertions, 71 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 5ffabccc7720..a866ee423fe7 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/diva/Manifest b/dev-ruby/diva/Manifest
index 0f3835fd26fb..f9232f1a4b01 100644
--- a/dev-ruby/diva/Manifest
+++ b/dev-ruby/diva/Manifest
@@ -3,5 +3,6 @@ DIST diva-1.1.0.tar.gz 15859 BLAKE2B 58e9ca4d9f1b8f4fb3a75cb16437d565fc99a358ce2
 DIST diva-1.1.1.tar.gz 15974 BLAKE2B 2a3b497181a931eb6cf6c43b9d43ff9e0e7a34a753864bec422b69c6d01aa39b5f9dcc6abd54b85ca27b34d38a647c3e80450c2d7dd9cea1c62859eb3366d28d SHA512 36c7048cba2774567191b40ff88fa7804b61cb9334992dadd43a62f18be6635aa48753593ccba93a7c0438adfb7d75266b26b7a62e102aaf99afff7401c4e99a
 EBUILD diva-1.0.2-r2.ebuild 749 BLAKE2B c5a03821dd00693a807a5650e221deeac6dd85a91120347dee5a2d76b75f843554922eb598afefc77f4702953c6bbb25243ff2dc992bf01f22f5fcb0d6b31b4a SHA512 d1b3035916d9848ebed62100568ad31bc141349824ae0248c5ecaed5a3a4b4c238a8ac755f791e281c37a76b6085875080d339c4d690497ffabddd54414eb3ed
 EBUILD diva-1.1.0.ebuild 806 BLAKE2B 045fda2c1cf24d83574e6005ef8c0d406dd9cbe26bb78ec364c234657aa99a51ec143065c9b42d7c74e62db0bbe465dd783db5e3b230dffb6ac0f99c029b2bd3 SHA512 2863b07d39c99712d0a50a221ca7eb00bcd072638bd3c2c7a78ccfebd439206c629142937ae28837944a0c99e2b7d96d209c97d50209c4391aedb7ec85422cdc
-EBUILD diva-1.1.1.ebuild 799 BLAKE2B ebb004f74d54988519596b495ed6be670fc27d5d95d440eca21b7a9baacb08c6d53137a3c762fc5c05bafd5469652455658cd5e97b18e73b0a957bd0c08d316d SHA512 c50af92e7d8f927fdb60254e4f10fa422ec74aa79c514546ba4bcfe22b1816884eb734f08872594587506ecfa59ad1eb8750c783d7bca223e5a5d382c40c9dd2
+EBUILD diva-1.1.1-r1.ebuild 890 BLAKE2B 71e332dcb484baccaa6b2db223886eac37e4d660094c6c3e5c51584a321cdfaca330ee63597284b900390933ad63bdde037d9ba75339358ea04d33e3595d13b7 SHA512 d59ac3a8df27c9dc8c0cd57a9426783ae59cca12a57879031e5f9816d880c4d9eba4849ea2e64fda0fe2bf510bb540077f0be2691920a279f0804e9366a842ea
+EBUILD diva-1.1.1.ebuild 806 BLAKE2B 722dc2f8f69ed25d8fa5d9906efa01f5ee536042e481c576a0b572f7929212db9458e305c45d397a700f7069a50ea89f66a658f2ab635538a5fd0153ae7c6cae SHA512 7e501388c0a3b9f6af73dabaad82afb5783a961861173b247cefb9c82211b1a555901e0e8f3a5e9def1351b88ce7569e5b61650f4f6f3f9217b3d9f9d4da5360
 MISC metadata.xml 428 BLAKE2B 60e3e72fabb06df16796be60dd22f9a54b960a6bf8cf36eeac02893246694df282ebb1f95bfd7b434065737cb0c0cb5a1c97975342e20959abf790082e594c9a SHA512 cd07530fc72aa675ecec8f88c4b8a5f93583f7bc6f2b08a80b4e472ca6542cfa2560643222d0b7a9dede5c01a860efaacd9bde3fa32f4854b4e7f30ef61d63ba
diff --git a/dev-ruby/diva/diva-1.1.1-r1.ebuild b/dev-ruby/diva/diva-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..bf880d963c22
--- /dev/null
+++ b/dev-ruby/diva/diva-1.1.1-r1.ebuild
@@ -0,0 +1,33 @@
+# 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"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="diva.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implementation of expression for handling things"
+HOMEPAGE="https://github.com/toshia/diva https://rubygems.org/gems/diva"
+SRC_URI="https://github.com/toshia/diva/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+ruby_add_rdepend "<dev-ruby/addressable-2.9"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/addressable/ s/2.8/2.9/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid unneeded dependency on simplecov
+	sed -i -e '/simplecov/I s:^:#:' -e '1irequire "json"' test/test_helper.rb || die
+}
diff --git a/dev-ruby/diva/diva-1.1.1.ebuild b/dev-ruby/diva/diva-1.1.1.ebuild
index d17232e2a269..5b294900e814 100644
--- a/dev-ruby/diva/diva-1.1.1.ebuild
+++ b/dev-ruby/diva/diva-1.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/faraday_middleware-multi_json/Manifest b/dev-ruby/faraday_middleware-multi_json/Manifest
index 634c36df3663..86bfdbc3773a 100644
--- a/dev-ruby/faraday_middleware-multi_json/Manifest
+++ b/dev-ruby/faraday_middleware-multi_json/Manifest
@@ -1,3 +1,3 @@
 DIST faraday_middleware-multi_json-0.0.6.tar.gz 3455 BLAKE2B 3fcdf69d90fe2da5cfe16851b5a5050429593c39c3d56eeab3e687ee89d036822197273fda44370878fb4087c29d6e2357b3220526c9adb8566a83f8d50bbac4 SHA512 4abc794a06725d4a584af08a58874162f1bea6424569f0fa6683ac0df7882708d3872e6a42024d7fa764d08688ceccbdf61d9870f23b71ea3c842440b495cc61
-EBUILD faraday_middleware-multi_json-0.0.6-r2.ebuild 844 BLAKE2B d2e23997e306c0833703fb7abef250f7c500374a71010509cdc7ca32f2c80532ddd140ae2e836d1aa7678d8499144b66b58fab255692be0d998b6eca095c51c3 SHA512 7cfafeaa666a7f2a0acf158dd3a94ea42d94eea41058fcd4c23c2b20471240e4ce659c0a8152e03eba5743eb2405844cfe36cf4f498ca0d3ec202ce5c25ea034
+EBUILD faraday_middleware-multi_json-0.0.6-r2.ebuild 844 BLAKE2B 08e1fdcbc66f1753dd0db888102768bc19ccf688a2c56cc277ccfe0c26a843754dc3993948fb27e2b880b1e05c07c3fdc0966ea35b5f4c0e87dd0cf562e6a6cc SHA512 79c05ad2c99eff832d54e1e4fc7f85940ff8fab5841d381ec97e09b67f018529464082ab224d2ff3e57f5cd3ac947a4dadd930679ae3374416d81ee2a1cb4e80
 MISC metadata.xml 624 BLAKE2B c9f41eea651a2f9bae1cce62426ee93a03f95d8314e70ec8e4b9f63ec905bf4a035b275b8f847c0f9b53865a2aac863690c1bc522294bcb2f88ad779108b6c26 SHA512 cee53cdfaea552192caa36773500e6636d432e10473358a0f6a4d4c974f9816aff0bb9e039f2be3fe3d60884c36d053e7658e8942f4e66abc49666bf3ef278ff
diff --git a/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r2.ebuild b/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r2.ebuild
index e32a1e15b425..ae75903d36ea 100644
--- a/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r2.ebuild
+++ b/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r2.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=7
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/faraday_middleware/Manifest b/dev-ruby/faraday_middleware/Manifest
index 43bec03f02d5..d4b9a044256d 100644
--- a/dev-ruby/faraday_middleware/Manifest
+++ b/dev-ruby/faraday_middleware/Manifest
@@ -1,5 +1,3 @@
-DIST faraday_middleware-1.1.0.tar.gz 28104 BLAKE2B be490abc57a11c64331c45f1529e55b38df699fe20e81f3783ca92ba7c5c573c1ba2494086f40bdcc7080581ffb2df89093bbabadf8c46721dcca2cb6a0310c1 SHA512 e9c3ada418e47c397272b52706bbcbfa1c98b7b467c148c0094b1dfe47d28fc57e397461e6e7446c5bb8d71ed968e74e1b7e67e793e30d3f47e9fb1aae549912
 DIST faraday_middleware-1.2.0.tar.gz 28332 BLAKE2B 09aefce13f0145e4098d68d2b8887fff5b535b3eda520335fdcaeea05256d1a256501fe9fee4273636fb0bb9d806d38ff7588a489840d2e425ce6666c496a4d1 SHA512 abfc6faf725c4646d0c1c59d2bde23db13dd78f81e74d313368bd0ec4945c33f24c8e8f3f252c6fa499fa845bdda19544876ea93bb9118b3fa4d3c7615366283
-EBUILD faraday_middleware-1.1.0.ebuild 1694 BLAKE2B 5c72148f44baf0c9bf4cddaddb806be325a2b1a24e9dede08bf47e93c73db7db3b7196dbed80ff24e7a189498c803b77c41efe32f83777ddf3d1c5c16e191b33 SHA512 710546f9fe4655299ad0c5d390a7f9dd942bbe4179abbd3eeebde94571d84b3a824a373c1b297d0c482b84a981c0e35cb8ff8cca22bb239ff56649c02ab6c961
 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.1.0.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-1.1.0.ebuild
deleted file mode 100644
index a522ef25f01e..000000000000
--- a/dev-ruby/faraday_middleware/faraday_middleware-1.1.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Various middleware for Faraday"
-HOMEPAGE="https://github.com/lostisland/faraday_middleware"
-SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE="+parsexml +oauth +mashify +rashify"
-
-ruby_add_rdepend "
-	dev-ruby/faraday:1
-	parsexml? ( >=dev-ruby/multi_xml-0.5.3 )
-	oauth? ( >=dev-ruby/simple_oauth-0.1 )
-	mashify? ( >=dev-ruby/hashie-1.2:* )
-	rashify? ( >=dev-ruby/rash_alt-0.4.3 )"
-
-# Bundler must be used because the optional dependencies have different
-# version requirements that must be resolved.
-ruby_add_bdepend "test? (
-	>=dev-ruby/brotli-0.1.8
-	dev-ruby/bundler
-	dev-ruby/addressable
-	>=dev-ruby/rake-12.3.3
-	dev-ruby/webmock:3
-	dev-ruby/json
-	>=dev-ruby/multi_xml-0.5.3
-	>=dev-ruby/rack-cache-1.1
-	>=dev-ruby/simple_oauth-0.1
-	>=dev-ruby/hashie-1.2
-	>=dev-ruby/rash_alt-0.4.3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(cane\|parallel\|rubocop\|simplecov\)/ s:^:#:' \
-		-e '/rspec/ s/>=/~>/' \
-		-e "/addressable/ s/, '< 2.4'//" \
-		-e "/rack/ s/< 2/< 2.1/" \
-		-e "/rack-cache/ s/, '< 1.3'//" \
-		-e "/simple_oauth/ s/, '< 0.3'//" \
-		-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
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rspec-3 spec || die
-}