gentoo auto-resync : 25:07:2022 - 14:56:29

15 files changed, 16 insertions, 220 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index bbb6b55379da..ba47ac2a0d35 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/asciidoctor-diagram/Manifest b/dev-ruby/asciidoctor-diagram/Manifest
index b54bc829ede4..624cc768e006 100644
--- a/dev-ruby/asciidoctor-diagram/Manifest
+++ b/dev-ruby/asciidoctor-diagram/Manifest
@@ -1,3 +1,3 @@
 DIST asciidoctor-diagram-2.0.5.tar.gz 12482984 BLAKE2B b0ef8596d2f2dfcf11fcbba876141aee38e8615195159f76e07b45c00b46bd85824dd6e8e9f571b396bbd9d082c5d60d4e05cdeac27719bfca53216c0d1b1816 SHA512 7e3bfbfb08d7389a039b1727bc173fca82e05134bebd89f3ca65d5e7860555034ff5e785c32e55ea2cc9826343456c6ecdfa15fc76f4d94858461356ab3ced71
-EBUILD asciidoctor-diagram-2.0.5-r1.ebuild 1164 BLAKE2B adb21009c7520cce9292fefdcf08ca7f6aec75ffebb5d13519c663524ccd0b8481dcd71a509ec21c2653943545c58027907d0b3377f11fdbc84461cef5816afe SHA512 138403bbfcaac082ebc5c7b7e0ab4e2ca2379b42e41d5bb965e837b34ec90d171d78e7e9e8a634221732f59412af7fad4f57ad7f993190f085e6240212b4b2ae
+EBUILD asciidoctor-diagram-2.0.5-r1.ebuild 1212 BLAKE2B dda6c30d4bc71ca1eae8d859a88abf888bafa563ff806434f21edc3ac20bd44937fd09045093b12e0ea7210dab6dbde014a9516b689b810668adc1cba94ecf32 SHA512 d559d6501b8345ba30a3b9d6fdc94c7f7e2f5b83cd06b564ae45a1e028c59c9994533e8b088fbc64489f45dbbc22d4958cdfbc4234e53b3164dfed98eb927539
 MISC metadata.xml 358 BLAKE2B 0a7ccfa951823c5c42d8ce280483f15e73abaf453c24b79b68bce29717bb3ae4e4656f40d7bc320479e65d8942bf43cb4abca9b9d916d2c27275880ef2034367 SHA512 4cb3cea3081700e1eb920452d2408fbf7ef730232e2979edc057c10b1ff879d14d97914765c644fc8d055c5705b8bb16b2a9651001733b102b8a05a1e72e1cdb
diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5-r1.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5-r1.ebuild
index 48a2fdb58f89..4bb70f45918d 100644
--- a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5-r1.ebuild
+++ b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5-r1.ebuild
@@ -25,7 +25,8 @@ IUSE=""
 RDEPEND+=" virtual/jre"
 DEPEND+=" test? (
 	dev-texlive/texlive-latex
-	media-gfx/imagemagick
+	dev-texlive/texlive-latexextra
+	media-gfx/imagemagick[png,postscript]
 	media-gfx/graphviz
 	media-sound/lilypond
 	sci-visualization/gnuplot
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index 804a804355a3..34f15ac66863 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -3,5 +3,5 @@ DIST autoprefixer-rails-10.4.2.0.tar.gz 1368753 BLAKE2B b5c9374f6161f9f13f784047
 DIST autoprefixer-rails-10.4.7.0.tar.gz 1372138 BLAKE2B 5d4ad1cb82fc0e82557232fc1a050f87fc2758967c21e2e566049686efec41b599e3cf7e2b432d164c6a29c2463ab3c695703878c23188ee97a46e5aff6a26a2 SHA512 c1d3a1200c05a3b1219716058eb28babef4bc26eaca1ebdc09a901709435f25f097d3c39398a07283a75ed37b30a45398fbe31095e649f6d94fdc6de2346aad6
 EBUILD autoprefixer-rails-10.3.1.0.ebuild 956 BLAKE2B ab61a2cd608d5d8f64bfbd4e52903556ee80d5b83277b717e5fd853ea0a163cf46a83934b022dfd5394dae296076019d2b6ba1156711220dd027bf01955ac04d SHA512 b4541812a6e97072489608f041e54e992b65476a44f56e9a9eb71340214ff891bea9c6e4f45a9ae694fdd0221f85311d4797c1c8d9bf89432923e0e79d29ffbe
 EBUILD autoprefixer-rails-10.4.2.0.ebuild 956 BLAKE2B 58e52b57a45c6ccc4d61fc04c5a7403f1e71c6262e53081ccd454dcd3eb2e425eadd34d2def345ac9163db48379286945c149f7a07dab7a54fff7ea032de150a SHA512 adaf394e4e391b9f718a4b2e0f571ead27a72a2bebb957af309adf15c5d96aa85686d9dbe623770a1e0df2f759aa839f1a39154f3d4f0f46698c4859059d0481
-EBUILD autoprefixer-rails-10.4.7.0.ebuild 989 BLAKE2B 98853d93dcf7becb5c16d53a31a51d4fad5978ead98c65ab614743b017fa28355229d198eaa125a022f5774010a8d61996d9439154b728610b0f1b2c21448dc9 SHA512 d7c63f534d1a3f6b8f99359c5c81abe183178ab180cce305c9e41b6f51e4700c24c4f160cb9ae13c845c154a14fbf8ba0f8eb3aae63b46ebdaec5e6cf09dd2fd
+EBUILD autoprefixer-rails-10.4.7.0.ebuild 1026 BLAKE2B 99a8f87c0f21b1b49e16c5eb549f1d9d41120ddf560173e14d738fd726a12fa91bdca509a0ede02d895203bee5f03e9efce0655f787942ad6f81459b05d57395 SHA512 ca8009be6ac6f55130340b88d8da1c811ec5d4c65771f6291b9da7f471bd224f7322f26fa97f66e5eb622a6e8617fb4904137d3c5305745965b7804ac46be8fe
 MISC metadata.xml 348 BLAKE2B 12e9c7a355924818b5a7325556728b401a1f54ebc3482f9087ed959976038fcc946d976b2a664440cee124fe0962c476c0c1fb34946b040fbe5cbabcd9d63f78 SHA512 cf6112194ed7aa00fbda32165cc0829d338d86cbba4d099147b5b21531a1f6a5acec58647a0960ac9c5540086c1c2ea14a4e8aadb4eb5482431f68b3116ef6e6
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.7.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.7.0.ebuild
index 85041f8e1934..eda88a78ea79 100644
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.7.0.ebuild
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.7.0.ebuild
@@ -23,6 +23,8 @@ KEYWORDS="~amd64"
 SLOT="$(ver_cut 1)"
 IUSE=""
 
+DEPEND+="test? ( net-libs/nodejs )"
+
 ruby_add_rdepend "dev-ruby/execjs"
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index 13958eb1085c..eca3e8da886a 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -1,15 +1,9 @@
-DIST i18n-1.10.0.tar.gz 72745 BLAKE2B 0675af73a52eba29ead397623d602f9eec60ff21953e5f23ee986fa5506a3296d7f54e88ea8d30cd6ccf9eefdcb589bfd798e2ac2a76f5d93d44c47b9dbe0f49 SHA512 efbe3c0c21d84c0ad69bda4a6f46a2106b3d20470b7d06fb2e62a063ac9d4047e38098b69ed30a5d892331d63aaf75e0bc29ffa5ae1d14ab066d47cccfe342fc
 DIST i18n-1.11.0.tar.gz 73729 BLAKE2B ec2eb21b6c67139b8aa2ceac635b0d84cad0cd462821db87d359e616d2bc1ff93a3b267a3c4d9fe6f223fa1118a59be872097f18514811de407c43230a3e61c8 SHA512 ae7b9d7a87ba87dbb192ad3c3453b088d63a29e796117656f1ca01847d5633e1b27f1679605c313f50219299a3663d84ecb4790bfd849c491dab00eb1d948f6b
 DIST i18n-1.12.0.tar.gz 72883 BLAKE2B 6818e5bdea156e9b6f7b33e319e5b5a5c3c9e7a799b56ded87ab2e27efa4effe730e23a8736b7374b8072c7ba4237a92619aeaad3a16c0bfe10fe73bf9c588d6 SHA512 616db5b15febc7a8716ceafef6c51a24e2d050f8e27e389ef96d94cdc95f9704942079d1e6b502666a015a99deee169342482c9a808164700401c47f96da8f0d
-DIST i18n-1.8.10.tar.gz 67943 BLAKE2B 58e8041f8cf652627a305e3d987ff2450913d3dc919ea7aae641cb484524d17312ebd3e0ee68cde1c01091e42713ea229ccb41ed3998c6bbf772d32f855ca107 SHA512 e8b10bf380241d1e6b19250cd63e727366215b4ad7e63479a02cb81a5b46a48e06db827d9df9969c2052895646ee30c237fd17c3352a2bbfed97615bb9b6cfca
 DIST i18n-1.8.11.tar.gz 67964 BLAKE2B e603077c6eb02f6fd89bafd6c06f85c72528d5eb4388854f060f05a4b49a3782a3830366a1f11bd95b191048f29fae251002a34d55cb185ecefb3afc06bb2f36 SHA512 af8fcc307de9959b5a01a79ac3c99d3a3573630f8cdf91c21208e07d35d1a0db60f4995f1b77921c5374a1a19ad66770a107cc41fb29cf480d02be00bf90634a
 DIST i18n-1.8.9.tar.gz 67899 BLAKE2B 56113d0879cb644a49ef79aea892e4452b65df0769a9532af44083852ed85c5afc8ac68cd6ae4f42d4b68a5aa548f7d92cf69371685c65e4cb5e3b3a0e29445a SHA512 0dfe43bcb341c63b10ace733246c2005f1261bbed23f8f38298b0712aab5047a3ddd61aa8f42c9e0cf3dee6564b67c04595234a6dfcf95db30d9a0d044483505
-DIST i18n-1.9.1.tar.gz 68971 BLAKE2B 00fadafb96dca76f7ed180fe5af5e8b44db96262fd98868b2fad5f57a461c3abd61e17d3c8e143603108cf05a58f8a74ed8e2c8cb062d63ec4edc8081b5580c4 SHA512 661f3f62a0933188b8b09f91d816605dbd50f6afc45c54e38ae70e76f03fb428dde33070e1dde48459d0b385521535ebfff1b18323abc2a1a104c5a6097970a4
-EBUILD i18n-1.10.0.ebuild 1573 BLAKE2B 64f582227c3a54ec01deecb7778f852625323c5048a2826ddecd6655b2d5ea758b1edac90ca916f2491daecd4d98f1ea8ff54aed48442345d9dfae2b832941e6 SHA512 e3eecb557ee0efde0e686dbfffaef961272c5380f6f3aebfd83470f2d0a54ac466733cc7c1275067383572f2490cc30bdf6ef28fb7007e8615e4b662543bae14
-EBUILD i18n-1.11.0.ebuild 1573 BLAKE2B 64f582227c3a54ec01deecb7778f852625323c5048a2826ddecd6655b2d5ea758b1edac90ca916f2491daecd4d98f1ea8ff54aed48442345d9dfae2b832941e6 SHA512 e3eecb557ee0efde0e686dbfffaef961272c5380f6f3aebfd83470f2d0a54ac466733cc7c1275067383572f2490cc30bdf6ef28fb7007e8615e4b662543bae14
-EBUILD i18n-1.12.0.ebuild 1574 BLAKE2B 02487d31667874d2c9604364efa48e112e7d4848fae1f290ef4b17f7bbd14eef90a9e7a319b3719138581c283eb546108f39e42de0b440bed8e30f7f9aa60441 SHA512 06b873523ed997c3ecfcfae98b797c5d43a2e967609b7185db98f3c667456b5a1a96bff19386f04829f9cc3e2c5d9620fa3c731a1a6b18c1572bdc5b36279fb2
-EBUILD i18n-1.8.10.ebuild 1580 BLAKE2B d282f7c3fe160de710586e1bf454807e4c9c5c80b25ced3c31d41b863164e917a753b2a7cbcf02621126d749f9832e92fab00323792af7bd46b1c2b199999e2f SHA512 1f90a5e3587a6da2b16679f14608d1b39d62403bd2fd1bf819e6ba07fd6e47214b17805ae557f77884a9fec67a3a4c0e01a3f0e68330e05d9768be69a53cdfb3
+EBUILD i18n-1.11.0.ebuild 1601 BLAKE2B 44db7ccc33bc7f9cbc4f30c3ad4885433f67f182203d2a1bd3d23a529c08b29dcc07e70f7fc69830bb99128a2f36af5a88ac91248fadbd04eaf31361dcc64b66 SHA512 822a94f5d4c750ecf01e8e6d54757b9a349c78d5aed7eb7feb0a456ee19ad8540745e23089630f8f3a0bc7bb799770dcf7cab95e4d05d1d53fde36be0ec09d93
+EBUILD i18n-1.12.0.ebuild 1602 BLAKE2B 262896e601d62888eab4499838bd66295f16c9ff23e950e8b7ee7f03f09ec1321f502e35835d578728a7537b8708ece64cf0a81e640c9ba76f21536eb74290d5 SHA512 b7e645b57f597c2270375c4e30d016b034674854cc436d60584d01ebf662cd462a9bb09e994a793b1c27dc14802fe30eab12e3051fe99687d68e0ee1db441228
 EBUILD i18n-1.8.11.ebuild 1505 BLAKE2B 4eabe14818127f8d172fe27f4e1252ac600e9f28cd57cca7407b5d2394a1cd930293b6b13c1270943492b97848e27154e3b50b821c5a309f8e1b797ee220d012 SHA512 7220fa5307976cf6bf4bf15ff9fcc92137e93499bfeb92b57a0788c555afac137a71520ae31ba6bd91ff3361b5fda143ed10ec68a5c2ccf7df3b8d980560061a
 EBUILD i18n-1.8.9.ebuild 1571 BLAKE2B a12efebaa78afc758b65b6bd82dd0a3a9909ae9f7f11bee834f5a22bb4691ce69f671b597a9abbfc439e785a89d966be38b6f4c901d3f98c5f89af8085f5b161 SHA512 a4ae786b0b6b2bda3585285f4209044a2a8584b9ee55279fb36cb5f108988f172c81de57bb066ddf8d497e7ef489b51cf6166cc190b427bd5a7856cd3a5da4f7
-EBUILD i18n-1.9.1.ebuild 1507 BLAKE2B 9cb726fd1976501017203d8a09a9e56937b577e97a39d621651c1b6b2f222bca353ac59ee6b40c72d285c39114cc1c31fe3523834f777bc29531a2686cf729bd SHA512 0d305247896976cc31ec44cb087f594c48d680e96445dbb5421ffe4c421eae0d592f3fab258adc436c1cd812ce86491f77a3f10686b6787d4142c0bc8465514c
 MISC metadata.xml 341 BLAKE2B 88504d4f80239252fd3d4d82c5636bd4656f1063e337fbdf37baf23bd109abe7aa74090b07f90e27d9350c8eee2c342b4d1bdd38feb438ce2236c9c9b094d606 SHA512 86b7231bcadd93247b82ef706ad9ba12f77306d7c6f08065ed3f95bc46c2662a8e1535364fa25419612359d11cd84d26da818e2d9be5e931fa6203b6e63f2f73
diff --git a/dev-ruby/i18n/i18n-1.10.0.ebuild b/dev-ruby/i18n/i18n-1.10.0.ebuild
deleted file mode 100644
index dd6a097b4229..000000000000
--- a/dev-ruby/i18n/i18n-1.10.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-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=""
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-5.1
-	dev-ruby/bundler
-	>=dev-ruby/mocha-1.7.0
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-
-	# Update old test dependencies
-	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' -e '3igem "json"' gemfiles/* || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby30)
-			versions="7.0"
-			;;
-		*ruby27)
-			versions="6.0 6.1 7.0"
-			;;
-		*ruby26)
-			versions="5.2 6.0 6.1"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-1.11.0.ebuild b/dev-ruby/i18n/i18n-1.11.0.ebuild
index dd6a097b4229..436673bde45e 100644
--- a/dev-ruby/i18n/i18n-1.11.0.ebuild
+++ b/dev-ruby/i18n/i18n-1.11.0.ebuild
@@ -26,6 +26,7 @@ ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
 ruby_add_bdepend "test? (
 	>=dev-ruby/activesupport-5.1
 	dev-ruby/bundler
+	>=dev-ruby/minitest-5.14:5
 	>=dev-ruby/mocha-1.7.0
 	dev-ruby/test_declarative )"
 
diff --git a/dev-ruby/i18n/i18n-1.12.0.ebuild b/dev-ruby/i18n/i18n-1.12.0.ebuild
index 886e0fd77fdc..69fd5389739d 100644
--- a/dev-ruby/i18n/i18n-1.12.0.ebuild
+++ b/dev-ruby/i18n/i18n-1.12.0.ebuild
@@ -26,6 +26,7 @@ ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
 ruby_add_bdepend "test? (
 	>=dev-ruby/activesupport-5.1
 	dev-ruby/bundler
+	>=dev-ruby/minitest-5.14:5
 	>=dev-ruby/mocha-1.7.0
 	dev-ruby/test_declarative )"
 
diff --git a/dev-ruby/i18n/i18n-1.8.10.ebuild b/dev-ruby/i18n/i18n-1.8.10.ebuild
deleted file mode 100644
index dd7b897de703..000000000000
--- a/dev-ruby/i18n/i18n-1.8.10.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-5.1
-	dev-ruby/bundler
-	>=dev-ruby/mocha-1.7.0
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-
-	# Update old test dependencies
-	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' -e '3igem "json"' gemfiles/* || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby27)
-			versions="6.0"
-			;;
-		*ruby26)
-			versions="5.2 6.0"
-			;;
-		*ruby25)
-			versions="5.2 6.0"
-			;;
-		*ruby24)
-			versions="5.2"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-1.9.1.ebuild b/dev-ruby/i18n/i18n-1.9.1.ebuild
deleted file mode 100644
index 8e6fa2638e2a..000000000000
--- a/dev-ruby/i18n/i18n-1.9.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-5.1
-	dev-ruby/bundler
-	>=dev-ruby/mocha-1.7.0
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-
-	# Update old test dependencies
-	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' -e '3igem "json"' gemfiles/* || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby27)
-			versions="6.0 6.1"
-			;;
-		*ruby26)
-			versions="5.2 6.0 6.1"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index bfaef2fbf49f..9feb01d9e048 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -1,10 +1,8 @@
 DIST minitest-5.13.0.gem 83968 BLAKE2B 90f2bc20328a5522a51bcfee94d69e6fd03189190a04ee77499d574531e95b8f8b6652cc51a5917e51920f58c0f95465c27c5d69bab7aba01e02502ccf72ae38 SHA512 bdd0d665cfd6f6e36dcb1f2f069f5154a468f68eb4c41f5c39e3a3397644141d5e05024023b20fafbceb983b019b00a0ec6da98432f505cc8fd1cebc11cc1fca
-DIST minitest-5.14.3.gem 84992 BLAKE2B baad3e8198bcee1b2748f81a7ea822785423c2bfb07130397b2c21993c686aa6edf58811cd58c4c9685b63b8a7373948a0aa2eacb6b02383399847edbad5deaa SHA512 2aadb99c5eac8d29c78865f8ce3fae51f11c2e1dd17157b6d0c6684733a3b870146df16fd26626c6f9c56806422e1e2457208afa1c69238a2bdaa4a859c23645
 DIST minitest-5.14.4.gem 86016 BLAKE2B 1f7b8c72b41e1f4e47852021dd99df411a427ac8bbe564a2b86edbb727a4976030176331442a3a44f734347cc42f80444f8d3937e561f0063ec6bb3132d4c402 SHA512 f967a11cfce82e167879905082859273b270e8d8e663a0c1c553964a345fb8564547627b8cf97418ac5bda544bb76c1385438ad74ec8e846666dc2952d55c9e9
 DIST minitest-5.15.0.gem 87040 BLAKE2B 71e7a7952c25fd37067a449867d74a2f18a8a42d1fbd72f24d6db226c54a18e9a21958654d4176176804bedd09ef9d1d3be68f79e29312c3f85d0930d3d68d7b SHA512 5e97a7aa616966ffc60e10cdc0ba123a7e793f10283ec3b6bf36066177036788cb950ad566fbac49e613b93f08b9846534f463017cde966b4890c3a34a2286be
 DIST minitest-5.16.2.gem 93184 BLAKE2B 005af875bf38e3744bf9de90ec6e964487908a817c19094dcee658963ab2c8882bb1cc4e0b19124b83af9f5da019a8d9e611ba21856f50deca8d9eb1757640cb SHA512 714dc201e9a8a45eefa080ee1a45fa66acb2de0cf624e7c6233e7e1745c35ef9e1a8d24236ecf33f440c05c03f09e017c6ff1e077473b22e3abe5d1ff3126989
 EBUILD minitest-5.13.0.ebuild 720 BLAKE2B c0dfaa029354a66dde23b3cb3fb1655e88cbd2d1fd8bf97bda8573e003aef8980e95ca1b38da252687c465dcc8309d62f5ac5ca7a5656971a559c9208dfa8ef8 SHA512 09c38e025fe40616270f14f05a7716b3a1c703d2d504dc3ff612f38403874f54e927835fb769b8c80c01c27c03f2f4ca7e6bf72f72feffbd585cdd6009ea257f
-EBUILD minitest-5.14.3.ebuild 728 BLAKE2B 1005d9c83954d6cbd0d61c9a86130a84326df283dc31a369ccc2ca77c4dcd0fb871a3ffa31b53eb97d2e8450c342ec5614c3d65315acf1ce7abd7fb3051ba569 SHA512 5c2735d7dedc124a3532bb28241a4ff8eaa00f7813980c1ceda8277566c70f654e7b8672e9b4d286423f2c0390d30eab69ee9f3758ef0cb164752e3c2ac8bfa9
 EBUILD minitest-5.14.4.ebuild 735 BLAKE2B 22766653091e002fa662a279753ed8ebe22283ccab1156c7ddb503864f41251e1e83270f00dc5efb0496ffe0165b37add6318ae65cc04b2fb0ae2746aa8ebef2 SHA512 9fc9d5bcc391cdf6995995bfec88f39e91e23838edc4c041f17ff1accf667dd5a34ce91c36b0fed0a05f98713612fcfb4a600a45c3d857e981013d4dba43d74b
 EBUILD minitest-5.15.0.ebuild 761 BLAKE2B 3b8b86a9826aaa1a2439ff70a0762175321236d94201699fda644878bd4186b149d929762010938233aec8f35d75ccba0948a0ae563bbdfb8d88f6be8cf0d971 SHA512 3e7c7244504052f7235801ff5b8be1843385bc536656d9d4756c3888d0d5a6883f944295942d9c61a7ca6bc562583c8419b689f05bb62278f4928c0939963039
 EBUILD minitest-5.16.2.ebuild 774 BLAKE2B f89999b511cf70efe1d9629d0dae15a71d2444a6d102821aad142ff148d50ace0eb1fa9418ef26ee123f39aaf869ab1f781182f3438a4306939f78279a51c973 SHA512 dc971935e750e17880ac8b0edbded90db194904be0fcf0f65592ad20a04c6623488c6c2cbfd6c22c27f8821b8f57bf08896f87b672f0b12c7ad54078ae9fdde3
diff --git a/dev-ruby/minitest/minitest-5.14.3.ebuild b/dev-ruby/minitest/minitest-5.14.3.ebuild
deleted file mode 100644
index 414bf91afda4..000000000000
--- a/dev-ruby/minitest/minitest-5.14.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
-HOMEPAGE="https://github.com/seattlerb/minitest"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
-}
diff --git a/dev-ruby/simplecov/Manifest b/dev-ruby/simplecov/Manifest
index fd74bf3c0372..6ba5cdf05ec6 100644
--- a/dev-ruby/simplecov/Manifest
+++ b/dev-ruby/simplecov/Manifest
@@ -1,5 +1,5 @@
 DIST simplecov-0.19.1.tar.gz 107430 BLAKE2B 0f18cd4c8ddfd324f4e3326ad8503530862f0ae67658865183984b81a59ad9aa5fcf650fa9f64fa6841ea23afa07d25e38443a79ad0be26b966fa99b6805a090 SHA512 2d781008769abd79020be96f7c1f91cfb9f27d51d00436f737c408a9b9d57a82955cbe5ba5ee5a628b9a7e8835d9b3e1542b67499355373c4f9b2638bee83235
 DIST simplecov-0.21.2.tar.gz 114080 BLAKE2B b1bdfd45a39f97072d871a6d4ba4a2d9f2b94642cbbe329fba91b53b1d6a9b024e224e822ca49c28c4849b7bc3ade19027c6aab739d3acf28c09cd3c773ce4eb SHA512 68e9a901b2ecef07aebad214ea86a092871b0ebf5b62881ca97ca0033c1ee5b9ba395116f9960e69cd88b90f569a3b573a3879178e9ccfa06d28c94de8b4f918
 EBUILD simplecov-0.19.1.ebuild 1210 BLAKE2B f8e14f56877213b223cdfa25d8434be88f9caa108e5c1e18ceb4c716b4fc96ac8b046771eb8c1bae7b97bbbbc190efaec43185b702582b86d22a1c01951631f7 SHA512 40e3195c466478136a62cb8e8c380cc6cca67a137465809ae3eba6c83892d7203028b76e01d0a3586f605ab8c7d85730d6ad68d8aa2929e500a7808d81dcfc6c
-EBUILD simplecov-0.21.2.ebuild 1246 BLAKE2B 2617bc6182a9e8baa4f2d10462fc932fcb8b3f37c272c5d9df70f04895a1b407172731276514aef96bcda2e68708feab6a7adcaf08be65271dd44cf0a79666a4 SHA512 0f2f880b2a7ffd5214f7b24b155d424e8d14afce49a3eb339ddc48e4e2e747545a19c10c49369b6de84b37c4b16a59dafd600aaf939057a9707cee4f9bc289b1
+EBUILD simplecov-0.21.2.ebuild 1507 BLAKE2B f1f14844ddcadbb1d70929b66ef826131cf7b66d82464eac5cc1d2eed7161c9fd4a9deac77a915e38eada3e8b0669893ffbdf17232f68f8964314bcc76462416 SHA512 be39f2cb8069dec199a2df6b6593cbd31bd96acceeefd0cac7102efd28149d640348d282c4de37acee9566456ecedd48bc51aaad6b49d3f5cce759b6385286e8
 MISC metadata.xml 351 BLAKE2B deddbf1938c6ddb07d6e018eea6972ef42c29cbd593f830363da799cf521f90dbb286fdccd0b01ec0d50392589f7ee40275ee67b871c827b24c4ccfa46b0889c SHA512 2cb0486e6184c2e1f27275c09434035a88209adba52b677dd436d422b4efc838b430dc436a67507b85ddfa4c98e1fde1f0475f6b0d1d42aae22bd984f7934c55
diff --git a/dev-ruby/simplecov/simplecov-0.21.2.ebuild b/dev-ruby/simplecov/simplecov-0.21.2.ebuild
index 8dfe63648ed6..dead7a284607 100644
--- a/dev-ruby/simplecov/simplecov-0.21.2.ebuild
+++ b/dev-ruby/simplecov/simplecov-0.21.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
@@ -41,6 +41,10 @@ all_ruby_prepare() {
 	sed -i -e '/blocks other processes/askip "gentoo"' spec/result_merger_spec.rb || die
 
 	sed -i -e '5i require "bundler"' spec/helper.rb || die
+
+	sed -e '/start_coverage_measurement/,/^  end/ s|with(lines: true)|with({lines: true})|' \
+		-e '/start_coverage_measurement/,/^  end/ s|with(lines: true, branches: true)|with({lines: true, branches: true})|' \
+		-i spec/simplecov_spec.rb || die
 }
 
 each_ruby_test() {