8 files changed, 121 insertions, 15 deletions
diff --git a/dev-ruby/eventmachine/Manifest b/dev-ruby/eventmachine/Manifest
index bcec3e811ea8..81c0d1ad05ae 100644
--- a/dev-ruby/eventmachine/Manifest
+++ b/dev-ruby/eventmachine/Manifest
@@ -1 +1,2 @@
+DIST eventmachine-1.2.7-openssl-patches.tar.bz2 14837 BLAKE2B 5f3280c053bd67c97db53814db3bbfd9bb3047d0fdae3972494a88bc9062e0f20b5684da8ba4264299a4fd5b0c159ad0d006fe78f6f1e8c0e9cdb531d98e3017 SHA512 9294ae918a51c2e7db098add3e793a2a57e40b223b7ee7113664245b5584af7b7bb180cf1dd83d0c30a316b6598a0a4507b953603c95482c42738099d33419d0
 DIST eventmachine-1.2.7.tar.gz 246402 BLAKE2B 3eee1e5fbb367c03e3d801cb705a0f95b7bbb461885f04820f57421019a3d61eecabe71309981eec35168395eb6d98a8c675bd0fb225497de511f2ce09a5df92 SHA512 768ec084903dce4c737cf564fce7886a3e7e5b7d4a89c2baea3e998130c53dc00488eaa2d8e9b0133d9e4d8fffbde80c3025403881486a7968c2d84425cc1f50
diff --git a/dev-ruby/eventmachine/eventmachine-1.2.7-r2.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.7-r3.ebuild
index d3b2c9b344d9..ce7cdf3ce6ad 100644
--- a/dev-ruby/eventmachine/eventmachine-1.2.7-r2.ebuild
+++ b/dev-ruby/eventmachine/eventmachine-1.2.7-r3.ebuild
@@ -19,6 +19,8 @@ inherit ruby-fakegem
 DESCRIPTION="EventMachine is a fast, simple event-processing library for Ruby programs"
 HOMEPAGE="https://github.com/eventmachine/eventmachine"
 SRC_URI="https://github.com/eventmachine/eventmachine/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+# Collection of upstream patches to fix compatibility with newer OpenSSL
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-openssl-patches.tar.bz2"
 
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="0"
@@ -27,12 +29,18 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="${DEPEND}
-	dev-libs/openssl:0"
+	dev-libs/openssl:0="
 RDEPEND="${RDEPEND}
 	dev-libs/openssl:0="
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
 
+PATCHES=(
+	# Collection of upstream patches (rebased by Fedora, thanks!) to
+	# fix (mostly test) compatibility with >= OpenSSL 1.1.1.
+	"${WORKDIR}"/all/patches/
+)
+
 all_ruby_prepare() {
 	# Remove package tasks to avoid dependency on rake-compiler.
 	rm rakelib/package.rake || die
@@ -50,20 +58,18 @@ all_ruby_prepare() {
 		-e '/test_invalid_address_bind_connect_src/,/^  end/ s:^:#:' \
 		-e '/test_invalid_address_bind_connect_dst/,/^  end/ s:^:#:' \
 		-i tests/test_basic.rb || die
-	# Avoid tests for insecure SSL versions that may not be available
-	sed -e '/test_any_to_v3/,/^    end/ s:^:#:' \
-		-e '/test_v3_/,/^    end/ s:^:#:' \
-		-e '/test_tlsv1_required_with_external_client/aomit "sslv3"' \
-		-e '/test_any_to_any/,/^    end/ s:^:#:' \
-		-e '/test_case_insensitivity/,/^    end/ s:^:#:' \
-		-e '/test_default_to_default/,/^    end/ s:^:#:' \
-		-i tests/test_ssl_protocols.rb || die
-	# Those also want network
 	sed -e '/test_ipv6_udp_local_server/,/^    end/ s:^:#:' \
 		-e '/test_ipv6_tcp_local_server/,/^    end/ s:^:#:' \
 		-i tests/test_ipv6.rb || die
-
-	rm tests/test_{sock_opt,ssl_verify,ssl_methods,ssl_dhparam,ssl_ecdh_curve,idle_connection}.rb || die
+	sed -e '/test_for_real/,/^    end/ s:^:#:' -i tests/test_pending_connect_timeout.rb || die
+	sed -e '/test_connect_timeout/,/^  end/ s:^:#:' -i tests/test_unbind_reason.rb || die
+	sed -e '/test_cookie/,/^  end/ s:^:#:' \
+		-e '/test_http_client/,/^  end/ s:^:#:' \
+		-e '/test_version_1_0/,/^  end/ s:^:#:' \
+		-i tests/test_httpclient.rb || die
+	sed -e '/test_get/,/^  end/ s:^:#:' \
+		-e '/test_https_get/,/^  end/ s:^:#:' \
+		-i tests/test_httpclient2.rb || die
 
 	# Avoid test that deliberately triggers a C++ exception which causes
 	# a SEGFAULT. This does not appear to happen upstream (on travis).
diff --git a/dev-ruby/roadie-rails/roadie-rails-2.2.0.ebuild b/dev-ruby/roadie-rails/roadie-rails-2.2.0.ebuild
index d939b3c7c113..fe6ad76611c9 100644
--- a/dev-ruby/roadie-rails/roadie-rails-2.2.0.ebuild
+++ b/dev-ruby/roadie-rails/roadie-rails-2.2.0.ebuild
@@ -19,9 +19,6 @@ SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64"
-IUSE=""
-
-#RESTRICT="test"
 
 ruby_add_rdepend ">=dev-ruby/roadie-3.1
 	|| ( dev-ruby/railties:6.1 dev-ruby/railties:6.0 dev-ruby/railties:5.2 )"
@@ -38,6 +35,12 @@ all_ruby_prepare() {
 
 	# Avoid already removed rails version
 	sed -i -e '/rails_51/ s:^:#:' spec/integration_spec.rb || die
+
+	# Revert https://github.com/Mange/roadie-rails/commit/03acd8fddf651d43919e92db35d541ec4281c5fc for now
+	# Fragile test which is affected by dependency versions (unclear which)
+	sed -e 's/cd95a25e70dfe61add5a96e11d3fee0f29e9ba2b05099723d57bba7dfa725c8a/322506f9917889126e81df2833a6eecdf2e394658d53dad347e9882dd4dbf28e/' \
+		-i spec/integration_spec.rb || die
+
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/rotp/Manifest b/dev-ruby/rotp/Manifest
new file mode 100644
index 000000000000..69bab31e7f7f
--- /dev/null
+++ b/dev-ruby/rotp/Manifest
@@ -0,0 +1 @@
+DIST rotp-6.2.0.tar.gz 60000 BLAKE2B dba270201593425c9282aca71efb33ecacda916996ebfffc703dd865a6c6ee3b3da4098497ce036a95157089d8d736e9413d0aa9fd0dc582d4b278ce811e05d0 SHA512 938cf9feffbe7e86f542c6dde4cd87b57e2ddd2696303e69cb76bc9fb04ffb40c9a5ef45288f23cb096d9f6706e0b48ad89907dc9322594df10c8c0521feffa1
diff --git a/dev-ruby/rotp/metadata.xml b/dev-ruby/rotp/metadata.xml
new file mode 100644
index 000000000000..fce24f8048c3
--- /dev/null
+++ b/dev-ruby/rotp/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>azamat.hackimov@gmail.com</email>
+  <name>Azamat H. Hackimov</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="rubygems">rotp</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ruby/rotp/rotp-6.2.0.ebuild b/dev-ruby/rotp/rotp-6.2.0.ebuild
new file mode 100644
index 000000000000..cf584132bc38
--- /dev/null
+++ b/dev-ruby/rotp/rotp-6.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The Ruby One Time Password Library"
+HOMEPAGE="https://github.com/mdp/rotp"
+SRC_URI="https://github.com/mdp/rotp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/openssl"
+
+ruby_add_bdepend "
+	test? (	>=dev-ruby/timecop-0.8 )
+"
+
+all_ruby_prepare() {
+	# Remove simplecov
+	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+	# Don't require git
+	sed -i \
+		-e 's/git ls-files/find/' \
+		-e 's/{test,spec,features}/spec/' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/vagrant_cloud/Manifest b/dev-ruby/vagrant_cloud/Manifest
index 5e0e4a36067e..c9f4b4c5846d 100644
--- a/dev-ruby/vagrant_cloud/Manifest
+++ b/dev-ruby/vagrant_cloud/Manifest
@@ -1,2 +1,3 @@
 DIST vagrant_cloud-2.0.3.tar.gz 14854 BLAKE2B 823b9ffbdb6896422e32e697075c7e9ab16ae7a299d6672eb497f17034737d2d017bdd416b56191149044afe97ee06533213311bb5e9da603e9eefcf824c8df7 SHA512 4431aa446d9bce2e67b121159a8345562b41c86937b2b1677f0397494521137fa66c997009632011caceeee9565a5a2b54d4ef6ef1ea9d4ac74ee35f8c149f5d
 DIST vagrant_cloud-3.0.2.tar.gz 34177 BLAKE2B 299014b569deac667429d90b8952f77a835669e17cf724ee7f5b6fd135c1a3f16b9292e203a75baf50cf117022d0ab4d31f797c432a07386097c6bcc338ae2da SHA512 c7e5050a0f3cefe95ad38e0734317a93939de0b54251163be1a52dfc413cdb08a4bf44e1c73215f81a0126552242a1d9f2cefe8fa43d9e60acf41ccdbed0ae80
+DIST vagrant_cloud-3.0.5.tar.gz 34844 BLAKE2B 2624219c470ed62e60056c825dc40611bf1bd2d1e822cc40e1592f8473517df53d814934f4426ef61d9adabbf89112bc1c44b61ee7129c4270e67b468fcf87cb SHA512 e3b138584baa956de30be5b307b7a05a728a9c84e5c4c831d9a703f0367886b82905057c8d6dda5e337b7b4256704d22a60869710e98493da8eea2074df70995
diff --git a/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5.ebuild b/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5.ebuild
new file mode 100644
index 000000000000..2a3a347153c3
--- /dev/null
+++ b/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_GEMSPEC="vagrant_cloud.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Vagrant Cloud API Library"
+HOMEPAGE="https://github.com/hashicorp/vagrant_cloud"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/excon-0.73
+	>=dev-ruby/log4r-1.1.10
+"
+ruby_add_bdepend ">=dev-ruby/rake-12.3
+	test? (
+		>=dev-ruby/webmock-3.0
+	)
+"
+
+all_ruby_prepare() {
+	# # loosen dependencies
+	sed -e 's:require_relative ":require "./:' \
+		-e '/excon/s/~>/>=/' \
+		-e '/log4r/s/~>/>=/' \
+		-e '/rake/s/~>/>=/' \
+		-e '/rspec/s/~>/>=/' \
+		-e '/webmock/s/~>/>=/' \
+		-i ${PN}.gemspec || die
+}