gentoo auto-resync : 30:06:2023 - 13:42:59

5 files changed, 6 insertions, 125 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 849a9a548f45..614ac7c0e583 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index 2091fc577f82..706858849fce 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -1,12 +1,9 @@
 DIST puma-5.6.5.tar.gz 314953 BLAKE2B 2aca92ff3d32995be8f05b626c2299c07f8665f345a6830f3ec3a3a561dbeb41d68d65851cef9c33a56d1d508c9adf2ebb254ca5c1d4dd8fbc896d6d6d2b440a SHA512 0ad41f3372732bdea6594a20b116ec4fc03a8a1d2ff807b3c315e7769aef4e5361ff775975575125002fbfc83315e6906fa8691ce666161bd8beee8c469289d8
-DIST puma-6.0.2.tar.gz 348269 BLAKE2B b0bf0efe179e78259b7b9f5ed8b2a701829ae4619edff00975a7a7e21eefd6560d051957d47fc2f5a4ba10cc2c8bcc863d4340f640054b8f081a7aa7fdbf8ede SHA512 9202ff3767a5944558a34904e58db3c0c0dd9e68df1ebcc76f31fbccea90edcd0f2d60360bd7bbd517eb965be4b1a99faf31ed0a0c36a41c13e8b0573c40f530
-DIST puma-6.1.0.tar.gz 355394 BLAKE2B 664bd24be4afde93c7fb3c6b407f0fd943bcebd86ec183d6f6d965c194f1b111d460b044eb64bcbaaff743a2d24031f786fb340a9e4ae624f324c2b70273723d SHA512 642755f565d6f1f2baebac041112dad238ca2b815f85c5653cf913c0c007e9971212581036f48fa9bdcfe98b28261843ab80306ed693274c77849bce012125f3
 DIST puma-6.1.1.tar.gz 355892 BLAKE2B 025d8303f01dc09dfc9e15395cbd2a5507b3f578dcd3b22cf0985ca760ed304b2eb1b0f4c442efc542f3261f7300143bf5264bab5543360d1cb07eb0aa3e52d5 SHA512 76988e75110124dcac589fcd01b46ae659e37b7dc2e6901c8d88b3b20ab188c8e6cdefb114f73c9ce829581d5723392d52a8059485ab7c31b77c65204554ac60
 DIST puma-6.2.2.tar.gz 358383 BLAKE2B aeea4410eb6b20f294131aa107d4d19ca19bea5a3447cee59250be151b5b8046feae2e2e096f40fade6ac81a6b630cf72608b1c6c76cf05c18be4e81c6f6e143 SHA512 b9eabec30761873d628acfff259cf4e5c55dbda735ecb871b0c6e3607930a96f55fe1ad4df58954b8d0b11995762b4918f47e930ae48ebc9557fdc0182a3db8d
+DIST puma-6.3.0.tar.gz 365128 BLAKE2B 4db46fd2bcb3a6766582294cdc7f0bd0e2585da12999ec3091d942946f1f6a3e95272834323ab8efe594d7852f78ef9ee0f5f549cd92bbe086fc5ee2d25b914f SHA512 74c4a58cceac016d0ccfef1312e31208b665e1a88d18dabc1018df26466b626fd85666042f1bcb416650dfb4f9779390b2f9b1fcd83c25816221b05eac8f25f8
 EBUILD puma-5.6.5.ebuild 1861 BLAKE2B 9fccd5ac7b24e5de70a7684621895ab5a0033c65d08a0879b831cb527696d3cdc65ffec4b8867b27b85fc3d66813b2e68594d9ef47f7bc90d9d8d447c0c5aa75 SHA512 d8a8f5a37c984531326b907dddca82514790637e9778d4c1c5d0adebf3bb3fbd49b3a17796888c349e1d0fa0e5de336e2b9310f368ea6fd02f0ab70e09badd1d
-EBUILD puma-6.0.2.ebuild 1890 BLAKE2B 157dae5ba217a3d4814b9ef1e3c08e633d04d48970783c3446cef4ac5497d0f0150630c4607ec6479a9d45e3e4e1880793084fc04189c6e258a5f30862265cb8 SHA512 a541171cb753ff342604bef4a460b969d74ba3751c3c57a62a0b5de87ef07acd1821226411bcd6e889ea6ece386ad687ec0e675465eb957e05d2d08001d2e486
-EBUILD puma-6.1.0.ebuild 1932 BLAKE2B 9e29e12283d4b906c4c1876719463f1a1379852bfddb4193a1983dd7376b664fa4bf6965a2cf3984dab011418ae33c33d2a582472b9a583c3d48b3fa3ae11549 SHA512 e9723db022c6a926fd02dba8ac760845d1ab475eb5eb4a999c24f87e92b9baa9b852d8976d14012dc9874bdd1138c225f72e4eef59cdb825efef4658b5d7ef0f
 EBUILD puma-6.1.1-r1.ebuild 2054 BLAKE2B 13795ef5ee9663509e07745737b12a5fb53ada23c5a35bed89e2ef6597f63b6cf0e4d76c51517fe1dea1962499b6fc286da7b6e0bc871d747845245cede3c885 SHA512 207c7be17c589935611b9a13506d31d406ce6126af64e2e45bb8537c820ff140cab1579f044772c34768506f3fbd29e4334086ee306bc472eb3f0dc9172a6e90
-EBUILD puma-6.1.1.ebuild 2047 BLAKE2B 4e3ee978e4dcfca58044b8da76e0071d7244360a126344bf28c8c844219cfa7d6e6a85c1a139a963a550fee803aa56e383a33041a0567c83d109c224affd8ac1 SHA512 5086424da2c1b596008311679127c55e8dff32d1e5c74e2d552efcc6a5b0020f67f169c52db75f995d40022662207c1aedbfcf7014d1403d1cb24b0e7d79f11f
 EBUILD puma-6.2.2.ebuild 1998 BLAKE2B 7e0edccf630c75b4da696d6331707ff0901d710997984bd862413f5b7c8a56ee3f6ec05f6ebd431ae0582a451afc1e7a0c19df4b633b87855418ab903ebc0925 SHA512 cbfb0a8fd27fc16b09b3131988ff65f047377f5c4bc1f2becc073801a215031f14e2931d47646ceee79b4565530f987f57d050bb65691e9a21a01b33325d17db
+EBUILD puma-6.3.0.ebuild 2000 BLAKE2B 8a6fa210435f6ac52efea34f18fac6b820040c649a10934fd338e5af9e2b39d7512909f7328da77043e2a05ee4a5c1e8b58900c7edda6317245256c14948472b SHA512 61c94c011fbbe2d1624fa6fe38f70fbc71bce3b224a5e5de21198740271a2970fa45d42769e5789a94cedfecca2b4ed1e514f9052e1f2984165b240b59a0fb74
 MISC metadata.xml 710 BLAKE2B bf109653812999e453fb414a83bf404786d16df301ba9dff87c123e0f1dbff8e3024109e96b7f36a3d9e1ebe57eb7aecc7acfd923f0de1bc8c4f358a87b32379 SHA512 894c677c61b3c7f8081b1511c64c274497c4ea85171f5b19d9606a19e4dff33df00d169653e3aede3eee07737b1cf9faadb812eebcf67292be68150c026b7f8e
diff --git a/www-servers/puma/puma-6.0.2.ebuild b/www-servers/puma/puma-6.0.2.ebuild
deleted file mode 100644
index 53dc2507d211..000000000000
--- a/www-servers/puma/puma-6.0.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/puma_http11/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/puma
-
-inherit ruby-fakegem
-
-DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
-HOMEPAGE="https://puma.io/"
-SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
-RDEPEND+=" dev-libs/openssl:0="
-
-ruby_add_bdepend "virtual/ruby-ssl
-	test? ( dev-ruby/localhost dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
-
-ruby_add_rdepend "dev-ruby/nio4r:2"
-
-all_ruby_prepare() {
-	sed -e '/bundler/ s:^:#:' \
-		-e '/prove/ s:^:#:' \
-		-e '/stub_const/ s:^:#:' \
-		-i test/helper.rb || die
-
-	# Avoid tests failing inconsistently
-	sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die
-
-	# Avoid launcher tests since they make assumptions about bundler use
-	rm -f test/test_launcher.rb test/test_worker_gem_independence.rb test/test_bundle_pruner.rb || die
-
-	# Skip integration tests since they make a lot of assumptions about
-	# the environment
-	rm -f test/test_integration_* test/test_preserve_bundler_env.rb|| die
-
-	# Avoid test that uses unpackaged stub_const
-	sed -i -e '/test_shutdown_with_grace/,/^  end/ s:^:#:' test/test_thread_pool.rb || die
-
-	sed -e 's/git ls-files --/find/' \
-		-e 's:_relative ": "./:' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	einfo "Running test suite"
-	${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
-}
diff --git a/www-servers/puma/puma-6.1.0.ebuild b/www-servers/puma/puma-6.1.0.ebuild
deleted file mode 100644
index 72c9b91a9b12..000000000000
--- a/www-servers/puma/puma-6.1.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/puma_http11/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/puma
-
-inherit ruby-fakegem
-
-DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
-HOMEPAGE="https://puma.io/"
-SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
-RDEPEND+=" dev-libs/openssl:0="
-
-ruby_add_bdepend "virtual/ruby-ssl
-	test? ( dev-ruby/localhost dev-ruby/rack:2.2 >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
-
-ruby_add_rdepend "dev-ruby/nio4r:2"
-
-all_ruby_prepare() {
-	sed -e '/bundler/ s:^:#:' \
-		-e '/prove/ s:^:#:' \
-		-e '/stub_const/ s:^:#:' \
-		-i test/helper.rb || die
-
-	# Avoid tests failing inconsistently
-	sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die
-
-	# Avoid launcher tests since they make assumptions about bundler use
-	rm -f test/test_launcher.rb test/test_worker_gem_independence.rb test/test_bundle_pruner.rb || die
-
-	# Skip integration tests since they make a lot of assumptions about
-	# the environment
-	rm -f test/test_integration_* test/test_preserve_bundler_env.rb|| die
-
-	# Avoid test that uses unpackaged stub_const
-	sed -i -e '/test_shutdown_with_grace/,/^  end/ s:^:#:' test/test_thread_pool.rb || die
-
-	sed -e 's/git ls-files --/find/' \
-		-e 's:_relative ": "./:' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	einfo "Running test suite"
-	PUMA_CI_RACK_2=true ${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; gem 'rack', '<3'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
-}
diff --git a/www-servers/puma/puma-6.1.1.ebuild b/www-servers/puma/puma-6.3.0.ebuild
index 19520609d0a1..2369f50156fd 100644
--- a/www-servers/puma/puma-6.1.1.ebuild
+++ b/www-servers/puma/puma-6.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
 
@@ -58,5 +58,7 @@ all_ruby_prepare() {
 
 each_ruby_test() {
 	einfo "Running test suite"
-	PUMA_CI_RACK_2=true ${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; gem 'rack', '<3'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
+	PUMA_CI_RACK_2=true \
+	${RUBY} -Ilib:.:test \
+		-e "gem 'rack', '<3'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{require _1}" || die
 }