gentoo resync : 14.12.2020

6 files changed, 133 insertions, 104 deletions

diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 117230046a1c..c74334606ae8 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -6,19 +6,19 @@ AUX gentoo-defaults-4.rb 1907 BLAKE2B 6e41d5534d47ef7bad5ae798fff81dd8ab928ef97f
 AUX gentoo-defaults.rb 972 BLAKE2B 4353b782296ad04f400fbdbd67dcc2f26b23a9bc4a716d107a8f98c5058676c675eb42e1d5e0a7214cd74df9148d54220c0202189938c45f4000301e52a3a73f SHA512 fd5a33c433041efeefba4bb8d550b8db66f31d4c0966188f07943f4f575ee9e13da6ef6fd66f89a4b3b979c5b310d96e2876407b79aee6ed404ca3027859160c
 AUX init.d-gem_server2 505 BLAKE2B ea5807a1c8ffdaa61bf37315c71d910bbf2bf4b0b4c62e3cef3b76176e9cc1fc39272f59bd46e55e17427f730315e2c691fa3f471c1cbf697073c45c0c7589a2 SHA512 fc2c57f4deebf479a36e69c3507f109abeda9f73b22bb2e617f56e6be0069af075fa6d66708d7324922f3d8bfaa96bd8c71292d9e388e27217cc7687ab4004e1
 DIST rubygems-2.7.10.tgz 863618 BLAKE2B 26a453d2808cbf03caa6f2ef4a829418de58f4ed0c7584935a0ad5fc722d7fbdf9f442261f96fdca4b6975b62608965d2f0053d3046da59771be373bed21154a SHA512 48a18c0f202f463c38cf5dafecfbc7cc39245e63c7a059ef2cefadda478483794a929ea6b7e0ef062dd4423230746f1f09d7bec06a97fe3ceccc3325397a3e71
+DIST rubygems-2.7.11.tgz 861642 BLAKE2B 6632296d8bcd47d52d92db3c09a0d95118c72877c712a9bfa01f4d4c8aff1bc62ee7e663f763a73b2c2e3dfd2d261ea965ff932a77b84f70e63fab1445d19d8a SHA512 83592f4089a768f6d58be975995855ad3aa6b481de5e2d31789d1c8d96a33f5347a914e5d7450819bb2e8e434ee65c4d3f5c978965ccaefad6c167a29801b7bd
 DIST rubygems-3.0.3.tgz 904175 BLAKE2B d99de4bdd51779ab214bc4a81f55483341a2c193d4304b8eeb6105cb95877e0a33fe03d93c47433ad3c6bdc8d3e453e33ffb799fd36164feac31616f95eeced4 SHA512 1dd585243341901c7b4cc60a4902000c10ce57fe2cc9c28e27e274a2e6029f936cde1c99d7097c93c2c5b2c8bcee5d692c8fe5cc00c996a040e4954b674e330e
-DIST rubygems-3.0.4.tgz 883664 BLAKE2B d5ec493657c055561aa9c0c09719529857706db197bf266ef4c51e48e6f97c08d85a8923b0c6fd72b3fd6ecb584533ff8ca56515c555e9c5b786b0d99ad2a16e SHA512 887c64226ec0b32d33f2ea331936683406d54dc74d19e658a23521e25ab50aa23534fe9eecaf696154247ad1df1d24c233d8900b9aabc79096eebd6afef3f775
-DIST rubygems-3.0.6.tgz 887156 BLAKE2B 685cfb108cc684ecbbcee6fe341baa429ac28f331b3db444c5ed3557bc169147dddc8d226780a85842bf1de2e24f6a60b0464820afa2a6838221c22543a36daa SHA512 1ef1822a2b19790a36a6d242b7d4584222617baa27787ec58961a9cfeb2733f19f9085490ffc72ee375d3153c7114e050c42e68fc8039e727fe5961b09365ee5
 DIST rubygems-3.0.8.tgz 888058 BLAKE2B e5cf7985fb67f2d4647fffa7679241a8722d5b7c3262432cfb06ba36716d8acaca6df3704a85e24d2f14c56f260f507067f31c3ccdd9321b922e8f13d085398c SHA512 ac8906360bea6e089c987308b1ee661d2f1c68e1ed66dcb7c5afd7ebfe5bef81c5a01ab6113c5eb5b0738129105f3176e0c595a0883a952082a048b7f20a5dbf
-DIST rubygems-3.1.2.tgz 995386 BLAKE2B bddf5dfc3568402257a2218642e6a15fe904b837114b9ce3a1aad155b235e42d96b1b0d4c6be1ee2e71712b8f1876902c343afdcb6d191ae0a6560f582cb282c SHA512 707525a98d14d46e69922e1deecd3b6c4caa090ee8113ba43b3912dc615cd2b1e0a083ecd0876a08b69c209bc05bba67d179f70d65aca45a92ac543170f13d39
-DIST rubygems-3.1.3.tgz 996881 BLAKE2B 0dd3bad8420de742f5ce76db977bee800f1abf2beb48b9d8f32332c4d06814d5febb8df0a2e70f6c4f26a1aa6adbf802e041019ff1d15e2c1f8f9d2ab65974d0 SHA512 8ca0c869a53c4b99072f220bca3455edee6126effb2bc5abb9265758083688b523303e8d2ca0e6d612fbc40140c06570f990fff50cce104f443d86458b190c3b
+DIST rubygems-3.0.9.tgz 886153 BLAKE2B 942f641c7dec30d3dd2f0756d04b1b6b071f5d3b5a9481c406e51ab125fa9da0e4e1ebde79c6a663e8847125c1ed8657f6af69000cf0d7191360e7aab99ba508 SHA512 1a6d7b3b08024d95988e033c772bfb6b5ed8f94ff4ddb194280bd3a7530cc384cb90fd56d44b6d56760cffbb23c5a6ab5917737ca46ec85fe61e1ae79d7ba4ca
 DIST rubygems-3.1.4.tgz 997835 BLAKE2B 21b8060f28e2228b7400533fa1d9fa1ae8bcaff3ebf9354e64f7d70ae35366147805a6f169986c956766bf41f34ce458d30c326c2b6f996620b14761fdf224b3 SHA512 86bb42736ccf320929eb12c83b3ce55fe95053ce5b38434902604d8d61d78c3f3cd8f20858d0fed66c473ef9fd70d7cb596c077cd06506caeac3e62ee6812ad2
+DIST rubygems-3.1.5.tgz 995812 BLAKE2B 43471515e4da8a6fe47a419f67f26efc9855334d44338eff9008cc0bc62e1477498f3e04044fa41d5f45ec0f132ca55dccb420f031b9e4945f3299c8618e2b94 SHA512 0eb2c4d18dc9304142d7d06badfd6bc1a72ba67c3b8a70f608dd127d0f7b016bc004af8dae67897685d43ddf87e468668bc89cec00b969da2f2dd67bee61a261
+DIST rubygems-3.2.0.tgz 982282 BLAKE2B 2895cee1d2bc4e59073cc1e3e96a7958d079da5d7a7d2eed392e6bd2fac457a738518f30365d5601511998997f578b3ce9ed65c5e41cdc80138d0ebb07df3548 SHA512 a3d0b9a577a88d8fa27d3bbdfd4bb78e419549c579dc1add4f80e4abd017cc64c441eb7ad260705cbae672937c07fdc0c76f8751bd942fea5a97953f01052f28
 EBUILD rubygems-2.7.10.ebuild 4523 BLAKE2B a93a70350e32efe702f346e26416eb7043700e5f2ba437889463f1a2af0218c2eb3fdf2687fd10b834f9413ce2e8b9588eb94042ee33d18b577c680d410796ed SHA512 2ebbe7993a7492c54e85eda668bf9349270ec4fa57a7ec8e90597a8e2a3ea955ad925e21b01352c386e29f95e77df015fac9258a16b9d7823b7629bf2e4410ed
+EBUILD rubygems-2.7.11.ebuild 4532 BLAKE2B 0eb44d4e5c10c6942096ecd224fc49dead8b525f2c7c3eaa83c498e89609063fb70135dea822b4e4d6995f9a53ba736b41f68a7c5980c2a4bf6720b311a05313 SHA512 44792bf7cace9cefda52aba5381164d9fdeb8b750dd30629d3f679b124188b8da7ace3f151d3c8b0aa38fc75919a73c9b2d18579ddd5ade7a15ebef6128292c2
 EBUILD rubygems-3.0.3.ebuild 4657 BLAKE2B d9e420f4f03dc09d68fefebbfd535624e11a8c123f95fea95fbf5466ad6738977582eed9fd581ad3a5541ac74c9bfe2479a247d57410b8fb273f67fa92e9a218 SHA512 9f533aa3433562bc45acdffc01aff82dd017a76be8c2fe32e377f2dcb65276cf97212eeedc3f99d6c16a6fc15471adaad7c6e599524505b7a6e0f7df0f6203ff
-EBUILD rubygems-3.0.4-r1.ebuild 2519 BLAKE2B 7a76a3c3d984445c0c2908547246bc69f74f67cd1876ba573f8af95675a6083a1d89a534bbf17b8641565deeae14474f10b83a68c56291f8f7d2733c6c7ccde8 SHA512 cabe1a62f9deceb944afaa9f7290f536b5edd1f452a556995c0c9524d793c1032327748e9820018ff6048c975af7d90f50981ab57322d717882ab5b9b4b5902d
-EBUILD rubygems-3.0.6.ebuild 2520 BLAKE2B 2c647d1d469e7861046b1d45b5084e2d2187b8611021f349287a34bc15270d15adc394029e2140ce94e9a4d2d71b413ab115ae09b280a590204b04e5184692ee SHA512 ecaf23ec49cadb371f4474b5cf2b9321a2a40efc20f92ff2afb7ad0d282915d70a24acacc4b53bee85d98e0b0aeb6e20c58e082d7d05123caca7f029ee487cf8
 EBUILD rubygems-3.0.8.ebuild 2654 BLAKE2B b60639ca7ebc7f1f2523c59c6431be637599376e3a52798316dfb539f8f2bf53a7077d92e48d82bbb2190c73dc2d24f6113c9aa418e9e9768c00ba108c090c8f SHA512 e44d8b97cfc1d75ebd77f2628649aad2f333e8237ed428b6956e0c6194bd8e8a5549f1767dab1e9193c526f6688c22f25fe00e427a77d325192ce52b7a822244
-EBUILD rubygems-3.1.2.ebuild 2865 BLAKE2B ec864cc48f38323c1048178edaf3a79efa5f21ff83e52a2cb60e5514531abee9587d1c06ef27748e3e9bafc9fc78deaf827c9eabefa54b99fc1c34aa26a86aa2 SHA512 49bbfb43fdbc9162ad98c8469113d43756f1494b1d259d8bda189f49dc4995650e05283f3126caee5b67deef562f54b343987557959f065344e6a9367a23d777
-EBUILD rubygems-3.1.3.ebuild 2865 BLAKE2B ec864cc48f38323c1048178edaf3a79efa5f21ff83e52a2cb60e5514531abee9587d1c06ef27748e3e9bafc9fc78deaf827c9eabefa54b99fc1c34aa26a86aa2 SHA512 49bbfb43fdbc9162ad98c8469113d43756f1494b1d259d8bda189f49dc4995650e05283f3126caee5b67deef562f54b343987557959f065344e6a9367a23d777
+EBUILD rubygems-3.0.9.ebuild 2654 BLAKE2B b60639ca7ebc7f1f2523c59c6431be637599376e3a52798316dfb539f8f2bf53a7077d92e48d82bbb2190c73dc2d24f6113c9aa418e9e9768c00ba108c090c8f SHA512 e44d8b97cfc1d75ebd77f2628649aad2f333e8237ed428b6956e0c6194bd8e8a5549f1767dab1e9193c526f6688c22f25fe00e427a77d325192ce52b7a822244
 EBUILD rubygems-3.1.4.ebuild 2858 BLAKE2B 13ff4a3b1e75550a6592acef079f20b8ab8a4e764a5b94240b45efe602066b5ce6fddcd491047f3630bbea7bf4274e7c4b1aeb181c0c92d5a7fa18b9cb76a804 SHA512 d128c1ad94f51d509afc98a1ce74d65106c4bf0eeeb7209f684c8a584123d24cf07de52022c54debba9bb456057b448c628216f049313bb448460bdf9f9fc31a
+EBUILD rubygems-3.1.5.ebuild 2858 BLAKE2B 13ff4a3b1e75550a6592acef079f20b8ab8a4e764a5b94240b45efe602066b5ce6fddcd491047f3630bbea7bf4274e7c4b1aeb181c0c92d5a7fa18b9cb76a804 SHA512 d128c1ad94f51d509afc98a1ce74d65106c4bf0eeeb7209f684c8a584123d24cf07de52022c54debba9bb456057b448c628216f049313bb448460bdf9f9fc31a
+EBUILD rubygems-3.2.0.ebuild 2873 BLAKE2B 3b406923e67e760e76c23fe66d1849707203e61240af7e2043f8e0b4edbd6e8a777f13c196f3f343994af4cf87368d8e49fd0a43cfb00530c535dcfcb7038917 SHA512 15acb161fee9423e2dcb4a109d9125aa461e157ab2aed4225d16b1116b9f8e5fac21c022e08567e7a69dc36f49a422cbb852fbf2070736ab5489414b42dc2b5d
 MISC metadata.xml 335 BLAKE2B c86eaf3d37fad025b8f6ca0b03e65b1b472716b4fda4ca4d08b415b29a63405d8e7b2684d309091c90411c5fe809e5129c6e0c0c4e7a982b4aa062ffdd0ca7fb SHA512 fd7bf880ad68fe5f1fe8eb79f9662af87831ed499517d5a97e22f18a4ddafc69d53118f020e15c3b8b171fe144bf6cb0ce799beaa6e4e4bdc01c984ab582388e
diff --git a/dev-ruby/rubygems/rubygems-2.7.11.ebuild b/dev-ruby/rubygems/rubygems-2.7.11.ebuild
new file mode 100644
index 000000000000..76142cd3b513
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-2.7.11.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="GPL-2 || ( Ruby MIT )"
+
+SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( >=dev-ruby/builder-2.1 )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/json
+		>=dev-ruby/minitest-4:0
+		dev-ruby/rdoc
+	)"
+
+all_ruby_prepare() {
+
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+
+	# Skip tests for default gems that all fail
+	sed -i -e '/test_default_gems_use_full_paths/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -i -e '/test_execute_ignore_default_gem_verbose/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die
+	sed -i -e '/test_execute_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die
+	sed -i -e '/test_execute_\(default_details\|show_default_gems\)/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die
+	sed -i -e '/test_execute_all/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die
+	sed -i -e '/\(test_default_gem\|test_check_executable_overwrite\|test_require_works_after_cleanup\)/,/^  end/ s:^:#:' \
+		test/rubygems/test_{gem_installer,require}.rb || die
+	sed -i -e '/test_\(load_default_gem\|default_spec_stub\)/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
+	sed -i -e '/test_uninstall_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die
+	rm -f test/rubygems/test_gem_indexer.rb || die
+	sed -i -e '/test_\(require_when_gem_defined\|realworld_default_gem\)/,/^  end/ s:^:#:' test/rubygems/test_require.rb || die
+	rm -f test/rubygems/test_gem_commands_setup_command.rb || die
+
+	# Avoid tests playing tricks with ruby engine that don't seem to
+	# work for us.
+	rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die
+
+	# Avoid test requiring network access
+	sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die
+	# Avoid test requiring obsolete TLS versions
+	sed -i -e '/test_do_not_allow_invalid_client_cert_auth_connection/askip "requires obsolete TLSv1"' test/rubygems/test_gem_remote_fetcher.rb || die
+
+	# Avoid test requiring file system permission changes
+	sed -i -e '/test_traverse_parents_does_not_crash_on_permissions_error/,/^  end/ s:^:#:' test/rubygems/test_gem_util.rb || die
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+			-e 'require "rubygems"; gem "minitest", "~>4.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:' || die)
+}
+
+all_ruby_install() {
+	dodoc History.txt README.md
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(23|24|...)"
+	ewarn
+}
diff --git a/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild b/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild
deleted file mode 100644
index 35ab109bb28d..000000000000
--- a/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit ruby-ng prefix
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="https://rubygems.org/"
-LICENSE="GPL-2 || ( Ruby MIT )"
-
-SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="server test"
-RESTRICT="!test? ( test )"
-
-PDEPEND="server? ( =dev-ruby/builder-3* )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/json
-		dev-ruby/minitest:5
-		dev-ruby/rdoc
-	)"
-
-all_ruby_prepare() {
-
-	mkdir -p lib/rubygems/defaults || die
-	cp "${FILESDIR}/gentoo-defaults-3.rb" lib/rubygems/defaults/operating_system.rb || die
-
-	eprefixify lib/rubygems/defaults/operating_system.rb
-
-	# Disable broken tests when changing default values:
-	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-}
-
-each_ruby_compile() {
-	# Not really a build but...
-	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
-}
-
-each_ruby_test() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	#unset RUBYOPT
-
-	if [[ "${EUID}" -ne "0" ]]; then
-		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
-			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
-	else
-		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
-		eerror "Testsuite will not be run."
-	fi
-}
-
-each_ruby_install() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	unset RUBYOPT
-	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
-
-	pushd lib &>/dev/null
-	doruby -r *
-	popd &>/dev/null
-
-	local sld=$(ruby_rbconfig_value 'sitelibdir')
-	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
-
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
-}
-
-all_ruby_install() {
-	dodoc History.txt README.md
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-
-	ewarn
-	ewarn "To switch between available Ruby profiles, execute as root:"
-	ewarn "\teselect ruby set ruby(23|24|...)"
-	ewarn
-}
diff --git a/dev-ruby/rubygems/rubygems-3.0.6.ebuild b/dev-ruby/rubygems/rubygems-3.0.9.ebuild
index bbd9d9d9b186..239ef3fa3eff 100644
--- a/dev-ruby/rubygems/rubygems-3.0.6.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.0.9.ebuild
@@ -20,6 +20,8 @@ RESTRICT="!test? ( test )"
 
 PDEPEND="server? ( =dev-ruby/builder-3* )"
 
+ruby_add_depend "virtual/ruby-ssl"
+
 ruby_add_bdepend "
 	test? (
 		dev-ruby/json
@@ -36,6 +38,7 @@ all_ruby_prepare() {
 
 	# Disable broken tests when changing default values:
 	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -i -e '/test_env_shebang_flag/askip' test/rubygems/test_gem_commands_setup_command.rb || die
 }
 
 each_ruby_compile() {
diff --git a/dev-ruby/rubygems/rubygems-3.1.2.ebuild b/dev-ruby/rubygems/rubygems-3.1.5.ebuild
index 54e32ae28236..83d91f198951 100644
--- a/dev-ruby/rubygems/rubygems-3.1.2.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 inherit ruby-ng prefix
 
diff --git a/dev-ruby/rubygems/rubygems-3.1.3.ebuild b/dev-ruby/rubygems/rubygems-3.2.0.ebuild
index 54e32ae28236..000adfc00ba2 100644
--- a/dev-ruby/rubygems/rubygems-3.1.3.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 inherit ruby-ng prefix
 
@@ -40,7 +40,7 @@ all_ruby_prepare() {
 	# Disable broken tests when changing default values:
 	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
 	# Avoid test that won't work as json is also installed as plain ruby code
-	sed -i -e '/test_realworld_default_gem/askip "gentoo"' test/rubygems/test_require.rb || die
+	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/askip "gentoo"' test/rubygems/test_require.rb || die
 
 	# Update manifest after changing files to avoid a test failure
 	if use test; then