8 files changed, 129 insertions, 31 deletions
diff --git a/dev-ruby/faker/Manifest b/dev-ruby/faker/Manifest
index 963136ea814d..9adc0890b035 100644
--- a/dev-ruby/faker/Manifest
+++ b/dev-ruby/faker/Manifest
@@ -1 +1,2 @@
 DIST faker-2.19.0.tar.gz 1674687 BLAKE2B d96f30e1ab1febc4f31f4a0709b838978aa2e6ff2e218be25075cb93a19cfef40182ba71a4f7e8bcf1793ff7737a1fa9178d2b847928e40249fb546791841740 SHA512 28d0bfafafb7a2679cd0ec476d14ef79e60f85f6dad2c8ce78002a530474106b0b29191f483a7c4a8f9c1262811fbb6488badae1a400bd520c8c863902e078b6
+DIST faker-2.22.0.tar.gz 1703265 BLAKE2B 931fa442d647186e7124c38afe4e6953f8dfea595140e2765ad86e9c98fc1ca02e6780cd01a49391614798a5862b4b69725bc5f5bbd1c6559f0831782dfe312b SHA512 9447b74d2403714de2bcbf4f3cfae8fc85c42a8a7dda413a06d6cdc8afa0acee620609af8a6ff8962db3b3bdaef27af7c08ab7ba71a23e939ce49638326e9807
diff --git a/dev-ruby/faker/faker-2.22.0.ebuild b/dev-ruby/faker/faker-2.22.0.ebuild
new file mode 100644
index 000000000000..5332cb86e976
--- /dev/null
+++ b/dev-ruby/faker/faker-2.22.0.ebuild
@@ -0,0 +1,30 @@
+# 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_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for generating fake data such as names, addresses, and phone numbers"
+HOMEPAGE="https://github.com/stympy/faker"
+SRC_URI="https://github.com/stympy/faker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/i18n-1.8.11:1"
+
+ruby_add_bdepend "test? ( dev-ruby/timecop )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|rubocop\|yard\)/I s:^:#:' Rakefile || die
+	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/faraday-net_http/Manifest b/dev-ruby/faraday-net_http/Manifest
index 0f51cd229323..a6c7c428cd11 100644
--- a/dev-ruby/faraday-net_http/Manifest
+++ b/dev-ruby/faraday-net_http/Manifest
@@ -1,2 +1,3 @@
 DIST faraday-net_http-1.0.1.tar.gz 8436 BLAKE2B 16feb3c79af7db3b69373826a2fc55a8373620c7c6bb229ec27ada2e07a75e862e4211a13a991c9d280b9dfd9643d1eec400fb0b925a846d966cc609c562aefe SHA512 57a7ea2f452844200119cb9e99ae4bfee5e01b0630b38b4ef4e615dfcc05e1476e3da8511698bf199c62b816b5253fb364ed6cffdc59dcd4e9d706c7f1e6e56b
 DIST faraday-net_http-2.0.3.tar.gz 8919 BLAKE2B 7bccadd63685acaf92e0192094a084d5b287fe7153273a4b5eb99f1e2a01a38051893fd96951ea48f456bd3a791c08dbcaf97f8479bbf302cfc713ce1e23bd36 SHA512 8a1a4bebd8ad565bc2eafd71eb5b7acda2f0830bb85894bf056412794d836cac6f57448edc60d5685d1876153b8c7c38c9b005b797167319dd088e0a6271e71e
+DIST faraday-net_http-2.1.0.tar.gz 9061 BLAKE2B 00e461718f4a92ff424e28074aa62d79c4ebfc9ca3a22036eef28c57fe90199b6fb49f5f9a02ff89cfc701b07c5fbb798446f1cc7ebf860dfeab9208e61b92d8 SHA512 797aa930d33a372fccb6fc497fe504f15b63a2fd87aa2301b84098a23de321fe60b6af43f35d9ed670705e90284096a21e9e83c80abe800c81240dec937a27d8
diff --git a/dev-ruby/faraday-net_http/faraday-net_http-2.1.0.ebuild b/dev-ruby/faraday-net_http/faraday-net_http-2.1.0.ebuild
new file mode 100644
index 000000000000..40aed55086f7
--- /dev/null
+++ b/dev-ruby/faraday-net_http/faraday-net_http-2.1.0.ebuild
@@ -0,0 +1,30 @@
+# 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_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Faraday adapter for Net::HTTP"
+HOMEPAGE="https://github.com/lostisland/faraday-net_http"
+SRC_URI="https://github.com/lostisland/faraday-net_http/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( || ( dev-ruby/faraday:2 >=dev-ruby/faraday-1.3.1:1 ) )"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ':'./:" ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest
index cc365aed070b..c18d064b43b9 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -2,3 +2,4 @@ DIST faraday-0.17.3.tar.gz 76786 BLAKE2B 0706f4386233861564aa1ba5fb8da9ad374a0b5
 DIST faraday-1.2.0.tar.gz 840216 BLAKE2B a52d2ddc2a57ba87b28e9143123985df12e118d6a8062b5272e77aa7807d7b2fd770408090c7e406631173eb276efcb973f96efdb17ab0f3ea684acda41b8d34 SHA512 7198e8954ec71bdbdfb58df52c6962ebe05599bf871fcb669f32ee2a5fb094b6934492396a92033e0fa858390f454f0d2daa41616f9e212f260080be016e1ea9
 DIST faraday-1.3.1.tar.gz 840638 BLAKE2B 284f7f612d3ab791a00ceab823be0246685fa38356bfeb6e01c12e81c7369c500719a6023dd929160ca598b41401b82cda0d8e9e363d0e7bdd91791742f8e68f SHA512 b89839e5d602911904ce009f52d011c124f84811e0676a3a524d22ea7084d99a971b6573dcde6d512bf933909cc461ef01cd82a8eeb9df581c56f17f31966b1b
 DIST faraday-2.3.0.tar.gz 828503 BLAKE2B 51ab43910d05a5ab44f6a6acc792858c1c3c2d0d74e226d63dd1f623eba6a8f02558c09b99c53e6f6df3b313fa822035d2d12e6f00bb81e31f9f8c6237498e41 SHA512 5236e96cb203c2ef9ce882d081e5916f7f59e28e4b593dcb5bb70dd2581fad50ed6d6f2364b64966184155575df1732d136e81146e0ab5e4647f0cc40d76d018
+DIST faraday-2.4.0.tar.gz 829464 BLAKE2B f06322150a53c2de153d4373d51f440179fed9eeb95e290af371b09474ac663cfb561bb11f8557946259c02aaaa192ae7a2a01066b037da7e2a1b798c14cbe58 SHA512 1b51c6d24ed74ab5b1b6ed54f5e51d969fd53968adff798db0d31e0def4736e7bfd37b3313b1006989482659a04e71f0c5eefaaf9dc54221809cf25201a1d2b5
diff --git a/dev-ruby/faraday/faraday-2.4.0.ebuild b/dev-ruby/faraday/faraday-2.4.0.ebuild
new file mode 100644
index 000000000000..5494bc269e40
--- /dev/null
+++ b/dev-ruby/faraday/faraday-2.4.0.ebuild
@@ -0,0 +1,66 @@
+# 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_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="spec"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTTP/REST API client library with pluggable components"
+HOMEPAGE="https://github.com/lostisland/faraday"
+SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND+=" test? ( sys-process/lsof )"
+
+ruby_add_rdepend "
+	dev-ruby/faraday-net_http:2
+	>=dev-ruby/ruby2_keywords-0.0.4
+"
+ruby_add_bdepend "test? (
+		>=dev-ruby/test-unit-2.4
+		>=dev-ruby/connection_pool-2.2.2
+		dev-ruby/rack
+		dev-ruby/webmock
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler support.
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
+	# Avoid loading all lib files since some of them require unpackaged dependencies.
+	sed -e '/[Cc]overall/ s:^:#:' \
+		-e '/lib\/\*\*/ s:^:#:' \
+		-e '/simplecov/ s:^:#:' \
+		-e '/SimpleCov/,/end/ s:^:#:' \
+		-e '/pry/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	sed -e '/git ls-files/ s:^:#:' \
+		-e "s:_relative ': './:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid multipart tests that require an unpackaged dependency
+	# that appears to be no longer maintained.
+	#rm -f spec/faraday/request/multipart_spec.rb || die
+	#sed -e '/multipart_parser/ s:^:#:' \
+	#	-i spec/support/helper_methods.rb || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true each_fakegem_test
+}
diff --git a/dev-ruby/rash_alt/Manifest b/dev-ruby/rash_alt/Manifest
index f0ba357170b2..89e0bd54daba 100644
--- a/dev-ruby/rash_alt/Manifest
+++ b/dev-ruby/rash_alt/Manifest
@@ -1,2 +1 @@
 DIST rash_alt-0.4.12.gem 9216 BLAKE2B 2785eee275672beeb04bdf42126c889185a0400e2d2838a2bc7d2212c617fac97b6d11319b4f45022bf87119cb55dd9ad9579731541c650bd26114cb3bfd68c9 SHA512 a337521ef6522f2a2bcb30bbeecd9c3a45f8f2915299080ad13f3f544950ab482980e106b217f146034a15af93fc4efc013edb5a73f831ac053d09f536df337d
-DIST rash_alt-0.4.9.gem 8704 BLAKE2B 8b0fdbc5934a50e161ae1732b915dff6c8264ec6e3b2e2905ab3c5bb23174681bb12a738a8b43f1fffee9c1b39ca0dd0102b1a703ee769a8bfa1e4ed469d291f SHA512 a00cd979386b98e520bb09e9f866f0865b0213d67647c52acf0eb007aad0607d47fd8017c809d1613b6c9e94317dfafee0da7892301212209b27245de472116e
diff --git a/dev-ruby/rash_alt/rash_alt-0.4.9.ebuild b/dev-ruby/rash_alt/rash_alt-0.4.9.ebuild
deleted file mode 100644
index 8cf80b0f35c4..000000000000
--- a/dev-ruby/rash_alt/rash_alt-0.4.9.ebuild
+++ /dev/null
@@ -1,30 +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_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="rash.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rash alt version for Hashie's own Rash"
-HOMEPAGE="https://github.com/shishi/rash_alt"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/hashie-4.1:4"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}