gentoo auto-resync : 14:08:2022 - 08:25:25

8 files changed, 44 insertions, 73 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 114263043f58..b5c00a1f1953 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/childlabor/Manifest b/dev-ruby/childlabor/Manifest
index c0b6c772e2b3..244cce2a075d 100644
--- a/dev-ruby/childlabor/Manifest
+++ b/dev-ruby/childlabor/Manifest
@@ -1,3 +1,3 @@
 DIST childlabor-0.0.3.tar.gz 3120 BLAKE2B 555310e2b6b70292b580451b3627973a2cfc33ae0a8ceb5507fcc92ee70f388802644b1586c18736b34339418a9aaa6450f07e5353f3925a7238f02d397a640a SHA512 d18f3f90204b12e3b4a21be1439fcf44a4eb9f905402633966e6ab2a3cc9412a28c502a8c78487834a82e1de24f0f905691f33f443de930f670c70b17288fb6e
-EBUILD childlabor-0.0.3-r2.ebuild 1031 BLAKE2B 9b045ec20ba5c012d060d546c7d4139900e8b799f559e4bbdb1e5c7d366455478d05458ba91a7bec356f266d63c1fff4969aafcf5fb331aff3b65957c37fbe79 SHA512 7b256e2e7d5802373affc7c44729da2269ac53d9cc71a53816d48035a7761f0afe73ab2b64ea7508136a62ff8f71b11b027600781789bc17e4eb64c4db27ba1d
+EBUILD childlabor-0.0.3-r2.ebuild 1230 BLAKE2B 0d629e6780417d688536cbde6ad782ae22e95f0dff962e1548a7f924f1dc09154d27d8e06b87eb3eb5e671c264c73ab6601624d3bb28fb3274ee0e5f0571ef58 SHA512 16dc2b9ceb76637707f9ec5f8c7ac6cdfb6e21e9c727e4dfbd795307dea2a6a42a850e03878a47758f1db1e0cefff3d47a5cf82df4f5019a53c3c5fcc9ade32c
 MISC metadata.xml 348 BLAKE2B c762375aacc3e71a19cca6bc56921bc95af9118d414b9c4ea107ca14d0d03a48139aac70b3bffa97ef8a79bc304c77d19ec886cc6afceaf507978045df5580ed SHA512 7fc536d6c210376169edeb9141883a08a163193c2551f7a6f55d9b896ca455fd4933cc8bb2c311ad6eaf448a56acb161f6dec9d8f6f426d23620ad3d38f0e392
diff --git a/dev-ruby/childlabor/childlabor-0.0.3-r2.ebuild b/dev-ruby/childlabor/childlabor-0.0.3-r2.ebuild
index 4763c3f12caf..fbb289f86b30 100644
--- a/dev-ruby/childlabor/childlabor-0.0.3-r2.ebuild
+++ b/dev-ruby/childlabor/childlabor-0.0.3-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
@@ -24,14 +24,18 @@ IUSE="test"
 
 RUBY_S="${PN}-${COMMIT_ID}"
 
-ruby_add_bdepend "test? ( dev-ruby/rspec:2 )"
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
 
 all_ruby_prepare() {
 	# Avoid failing spec. The signals work, but the stdout handling
 	# doesn't seem to play nice with portage.
 	sed -i -e '/can send signals/,/^  end/ s:^:#:' spec/task_spec.rb || die
+
+	# Rspec 3 compatibility
+	sed -i -e 's/Spec::Runner/RSpec/' spec/spec_helper.rb || die
+	sed -i -e 's/be_false/be_falsey/ ; s/be_true/be true/' spec/task_spec.rb || die
 }
 
 each_ruby_test() {
-	ruby-ng_rspec -I. spec/task_spec.rb || die
+	RSPEC_VERSION=3 ruby-ng_rspec -I. spec/task_spec.rb || die
 }
diff --git a/dev-ruby/rack-test/Manifest b/dev-ruby/rack-test/Manifest
index 87963f4d51b2..80ed426a7756 100644
--- a/dev-ruby/rack-test/Manifest
+++ b/dev-ruby/rack-test/Manifest
@@ -1,4 +1,5 @@
 DIST rack-test-1.1.0.tar.gz 27035 BLAKE2B 640de2303850662c3b6a8fc17f2344223c9928b48abde6d1b251a634689793158f35498c4736e4e2d069efa921d37bc32da92a7e17c0761a6f6111b345b54c1a SHA512 36d947d9b13d33ee8322e5b9d18fe8266787ccb7703f1fafadc040123e34dd44e98e7faf8b6dd816e51ed167065b2ffe79e9bcee74564dc324ba2b7dba76f82a
+DIST rack-test-2.0.2.tar.gz 30651 BLAKE2B 82ffa59cca24cbb42a885bf05792cb603c44881886b716698a1ebd6857231bfdfafd9a8e68f2fd2e1d795c167886db44db5a620eac35e3824c8fe7fa1148718a SHA512 de91787563546a3f12da15f665975bf3d68f7633e277c86a529a728cb8ba9d78bac5c30c2ec1ece9aab5341571ceb23d8089d0da542409bdba23ebe93d75e2a5
 EBUILD rack-test-1.1.0-r1.ebuild 1069 BLAKE2B 07c2f65bd1508d1452f2452fc1f5a4fd42473521b44067d20635954fae76dab4fceb83b225b3105e84d82e65fb26bd87a23ab1a6d3dc43657a5e158d9b70d0b4 SHA512 7e6d15f29a800ce10d9c8233171b1ea68e0263d2688fd4f897740a123928a1ab38cbb94bd1b2e054bce12aa66faf47fe99633a79283f2a5d0a7fa647ea71a966
-EBUILD rack-test-1.1.0.ebuild 1108 BLAKE2B 1534d576f8d11d3cb0a968d203c6858939206c5c24f0d923a38a350dedd7dd8d1ccc6f0fe999982bfb0e89ff2297ec41e828d342eb82d7b3fd006a860965dc6b SHA512 37e6bc3b2d4bca5d16f1d924a7a99fddcb19f19a1490bbc47dee4843c5a47c30ff334f544e810c93883dab387c04dd7608c17862fe2104c72b88a50e15bc9085
+EBUILD rack-test-2.0.2.ebuild 866 BLAKE2B ecfe081f652fca3617fac0665f5133ea403eda022a2f4ddd549deb77117bb78abaa41b26b0cd3a15fa1a0502856661fd6b5989d353636f6f8437d6b4912e1117 SHA512 c9063dcc27d2fccc232fa758eb5c80ac0f1c9888d2fcf6f2e0a1c6742523c45263fae6e2ec1b54c22c3a3baa771fa0d3744944339fa7185c0202cbae8bc0929c
 MISC metadata.xml 344 BLAKE2B e30c148bc0cfee01a015a9f33b641e93cafb8791f46ea7c1ec56942da88eec469d0259780c697b3bae0cbaf806dc47f919b78f2aca4d7565effd47a630f6485b SHA512 93102d50461492b9a866f74783d9d6c3d04698a8766535064d1b3c2600c11f1002b3a8bba79c81b4294e19a33cb06f8b407442c73d24fd2efcf361e39623ad9e
diff --git a/dev-ruby/rack-test/rack-test-1.1.0.ebuild b/dev-ruby/rack-test/rack-test-1.1.0.ebuild
deleted file mode 100644
index 0f5bff84d58f..000000000000
--- a/dev-ruby/rack-test/rack-test-1.1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rack::Test is a small, simple testing API for Rack apps"
-HOMEPAGE="https://github.com/rack-test/rack-test"
-SRC_URI="https://github.com/rack-test/rack-test/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rack-1.0:* <dev-ruby/rack-3:*"
-ruby_add_bdepend "
-	test? ( dev-ruby/sinatra:2 )"
-
-all_ruby_prepare() {
-	rm Gemfile* || die
-	sed -e '/bundler/d' \
-		-e '/[Cc]ode[Cc]limate/d' \
-		-e '/simplecov/,/^end/ s:^:#:' \
-		-i spec/spec_helper.rb || die
-	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid test broken with rack 2.2
-	sed -i -e '/closes response.s body/askip "rack 2.2 compatibility"' spec/rack/test_spec.rb || die
-}
diff --git a/dev-ruby/rack-test/rack-test-2.0.2.ebuild b/dev-ruby/rack-test/rack-test-2.0.2.ebuild
new file mode 100644
index 000000000000..d4c143fc00ca
--- /dev/null
+++ b/dev-ruby/rack-test/rack-test-2.0.2.ebuild
@@ -0,0 +1,34 @@
+# 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="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rack::Test is a small, simple testing API for Rack apps"
+HOMEPAGE="https://github.com/rack-test/rack-test"
+SRC_URI="https://github.com/rack-test/rack-test/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/rack-1.3:*"
+ruby_add_bdepend "
+	test? ( dev-ruby/minitest:5 dev-ruby/minitest-global_expectations )"
+
+all_ruby_prepare() {
+	sed -e 's/git ls-files --/find/' \
+		-e "s:_relative ': './:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -w spec/all.rb || die
+}
diff --git a/dev-ruby/temple/Manifest b/dev-ruby/temple/Manifest
index 9ba96932ff01..05aaf292a3fb 100644
--- a/dev-ruby/temple/Manifest
+++ b/dev-ruby/temple/Manifest
@@ -1,4 +1,3 @@
 DIST temple-0.8.2.gem 39424 BLAKE2B a56db910d1d4d52495806e907c74052c04e6b4843d040adc33a7f6dc28a25a02231c4c9bd41723c8e1abe6624d4d55375c2a429514a87fa4f7a7a8dcb6377796 SHA512 51923b3bf9d4c05255131be62f567ca21305ba023ea5395a08d6970236b2a2833b058f7b3906046b8a57a224b368de12a6d5e426effca39324670fb632f33b67
 EBUILD temple-0.8.2-r1.ebuild 639 BLAKE2B caeb9de5f6c80b02538814d707379b5f4c626a65b7244e47aea2295a2823aa87a4efea4e76ed7b4bea31c70167dc59901d6d2f3ff27b39b42daee228d94e21ff SHA512 d2aff5073dee1825b439fcb52a9a25a8550057130939bcc01798dee1fdc5b2560b0ae5f7ab7c7c7bf071609c4586c1a2ebdbefde7abb1c294aa034caa1bfe690
-EBUILD temple-0.8.2.ebuild 639 BLAKE2B e7f3fd372a9caab116d0a8a7048e0f7686d55606443e375e5b3804b9a9d1e56cd68f8f30b004395ea37c7943e3ebff338d6326c25cf82f811ea7e5b0b91816a6 SHA512 dba16e5bcd31a8084cc7e5fa450ba868f46cd5be3e3b9babe0a196d30d92b1db2a809f4d6f685090f6a17c8f87705e782e6c930bbbf0c1e461b5fe7c85dee34e
 MISC metadata.xml 341 BLAKE2B bb4b05f83022291b67e3d322192b7deaa8f2c7ef07990014ff3c1cbe82295beb599d649b90971b9ddbf972c1296211e2d829f14efc1d48b2bde6f1164e1ae290 SHA512 a9ab79fa9ff13f53b6634cd86efcf57df5810946275dd12a34fdf8eadac12153743cca92e98dd8ff4bc792f912cb9c72a08abf33a68b5849fe67776937e933c5
diff --git a/dev-ruby/temple/temple-0.8.2.ebuild b/dev-ruby/temple/temple-0.8.2.ebuild
deleted file mode 100644
index cf80c44399be..000000000000
--- a/dev-ruby/temple/temple-0.8.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES EXPRESSIONS.md README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="An abstraction and a framework for compiling templates to pure Ruby"
-HOMEPAGE="https://github.com/judofyr/temple"
-
-LICENSE="MIT"
-SLOT="0.7"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bacon
-	dev-ruby/erubis
-	>=dev-ruby/tilt-2.0.1 )"
-
-each_ruby_test() {
-	${RUBY} -S bacon -Ilib -Itest --automatic --quiet || die
-}