6 files changed, 3 insertions, 143 deletions
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index e309503c24fc..b0ad99be5bf1 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/moonbridge/Manifest b/www-servers/moonbridge/Manifest
index 1aec4b5a20d0..279142af9689 100644
--- a/www-servers/moonbridge/Manifest
+++ b/www-servers/moonbridge/Manifest
@@ -1,5 +1,5 @@
 AUX moonbridge-1.0.1-fcntl.patch 376 BLAKE2B 80297bacc916893d089d8c656e3786770572b3983cb1e4531cf141deb7b79c2fd19fb0152468304fa6f2b080f37bf2b9055b8ef0739abd9fc20fb06d180f400a SHA512 d8dad8a24918d37e02b5129cd179e06e665d7a8ee469c07896cfb5c759646220f43feddf9dcd729d79eec5b102cdbdb9f039bb45aaa54b279b5d700f2a1b1374
 AUX moonbridge-1.1.2-gentoo.patch 1071 BLAKE2B 999f45f582b6f962ab107a6fa3f7b4413d047dbc07d7010f36143b3cf3e003eb604e7dfcf391a59e6470e5563a1f88ca1ffd8118929ff4adfd5d0cc3f5e1f4d7 SHA512 6d4b837610fa950ff2c363c1730fca3bce04b287ee02f616a9984b333f5f49ba115fda819929b2d6f4b1acb0d4947c9d30ddcc2006449735be72770deccb6045
 DIST moonbridge-v1.1.3.tar.gz 53146 BLAKE2B 5996fa05b16d96b17fc00c4aaefdadeaf82904008ab851b4dc755eaea8ad5fa0f5cf220e84fcb1294eadb151529816d837f6550cbd5b0ba50f9d800176acaf79 SHA512 25bedaa8b2eadea6936c237f295cb6bf28b911c2f280f6e755dbdfc38a5f379aabfce30b05aab58defe104aeda7031280eb68deed2cd89767d9760cbff494cfd
-EBUILD moonbridge-1.1.3.ebuild 1206 BLAKE2B ee31664a9be51f759345638e18048cacb53476a162c5a13d7ca5881724452a6759326d59bbdafcbc7e99e849b513f7c27776d9e6dac990875e401022c69e639d SHA512 a8826e3b22308e11009651775d96fe9f5b231e3795731c681365496f05f8361e3572b2ef6c83908b9d617f09e3a787e32af1aa33dd570bd47bdbffd64f417ef6
+EBUILD moonbridge-1.1.3-r1.ebuild 1205 BLAKE2B aa7b59d3deeb6ac37cad6d17e5593e50c414b149b0e18133e85f186419a5e084e0f9e6979a16eec3d53bd975a1985e3f316c2c652c68426bc804f698f73afc0e SHA512 51a56af4d54861f7601b0bea8ddd257409b0dd014241cc4abe487787c7323412bf004184fb42263f299cfdc8bc8e1de1a2f6206a806a3f39f5b8beac2cfa13a7
 MISC metadata.xml 248 BLAKE2B 6cf7555626f83d30e661b4284812eeb1b1f2fe0c0a2c78e68382cf21165eee45a4027020d509af5b87814913ea7f16a555b7f0b7da174f49dbb0200bcb2511e2 SHA512 4680f3a309b5836b23c44b1578f14ad49f6ebc52413f42e1d1d4b91d7000081df3be0ca1054ed47cd9df06a1a6bb7cf54d184619efff7dedb82ec7b528ea2dd2
diff --git a/www-servers/moonbridge/moonbridge-1.1.3.ebuild b/www-servers/moonbridge/moonbridge-1.1.3-r1.ebuild
index 99c141eedf3f..201a80f48490 100644
--- a/www-servers/moonbridge/moonbridge-1.1.3.ebuild
+++ b/www-servers/moonbridge/moonbridge-1.1.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-{2,3} )
 
@@ -13,6 +13,7 @@ DESCRIPTION="Network Server for Lua Applications"
 HOMEPAGE="https://www.public-software-group.org/moonbridge"
 SRC_URI="https://www.public-software-group.org/pub/projects/${PN}/v${PV}/${MYP}.tar.gz
 	https://dev.gentoo.org/~tupone/distfiles/${MYP}.tar.gz"
+S="${WORKDIR}"/${MYP}
 
 LICENSE="MIT"
 SLOT="0"
@@ -27,8 +28,6 @@ BDEPEND="dev-build/pmake
 	sys-apps/lsb-release
 	virtual/pkgconfig"
 
-S="${WORKDIR}"/${MYP}
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.2-gentoo.patch
 	"${FILESDIR}"/${PN}-1.0.1-fcntl.patch
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index b567f69830ef..4fa1c1c576d9 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -1,7 +1,3 @@
-DIST puma-6.3.1.tar.gz 365566 BLAKE2B 4112406abb05569d8dcaf60826e66ef96ea3cae0639f00b750080fecab6bb86d9fcd1533f15aeae4ffe69a15a103c875e5c73b987cc638e895ff719c6699f310 SHA512 9b7521fa85e50503dcb5b425c7f73909162c6634ae0ada963f93eb82804300637125f159a94166b2446283d092c9dcfa10ccf79a0deabca16a1b27c0d3a37a2f
-DIST puma-6.4.2.tar.gz 387259 BLAKE2B 5d5ee194c2247eb5cf49b81bc2d32c37a52e82eefe94520a952c217663f111ca5dacc54362c522772127882a7c39da8b9ebc6851604cc719db4e170c59559784 SHA512 95f1aa43b019f14160c638ac04bc7648a9f49b5ad418319bcbab90fae7da0e94f122701ce71da864d27c7cc3fe5a2ff5a2ac6b88b8582ea5ce2201d54784af67
 DIST puma-6.4.3.tar.gz 388095 BLAKE2B 010009c5c87f4e5f28b6f2b12c65ba447e3d2e1444718df7631a191546096167676b1dab2611fc3aacd4b89a2ec873c0da6a58681b4884acc2dca0e3ec825268 SHA512 20e5800dd978dd681ed4e8dd10c2558d7d4c0cadf79ad25b7974997884cbc8797211761fb5db5303bf7a8e04907634ce9e82ad3e362ae1fff24cc7d770eb5e44
-EBUILD puma-6.3.1.ebuild 2163 BLAKE2B ffd3421456bfefc1fc820ea8e4118498de010d1711651b7c96d12cb4d63450768d41b22ef8d3fbf1d57027db8fc862157eca132b78e1baa75299a63896e6fbb2 SHA512 61e59384e83f5358c017c5feaa7b7431c83e533633d5a77081a9a77d49859d0abfc3fe707633cc2d59bcd65f5f5b6e888c25c5cc4b448628df288e491b5378c0
-EBUILD puma-6.4.2.ebuild 2315 BLAKE2B 952c008f409bc1b905eb616cd5322eefbe27c08c6fcd90296f158bd6a132211876bd1e0d517c364fa193ab73cfee659c563d0987d5b4b50d3038a51c357eff44 SHA512 a24fa41764ba28d77141e616174b4aadc5a3b5f3dd27366e1abfaa7ac5b971f9705008bb5762daaaab7f9b9a6dbe5d33860e1bca15b870f84181b402d90eb4df
 EBUILD puma-6.4.3.ebuild 3078 BLAKE2B 56c94d6608c7503f7b96d9ea0799f0beeef2f42bf6aa511135d43e70c7590ae7e89166809e0d3eaef72a0630181c834ab61775d3faca22afcd0715170cd73d3d SHA512 f52d36d298644a209513ecbf2ced3254ddcd02e46bdcd67137abbcbba12c60af064d02abd1d27a2255a9ca206b82cec52118c71063c706e278d81cb2fb5e3350
 MISC metadata.xml 710 BLAKE2B bf109653812999e453fb414a83bf404786d16df301ba9dff87c123e0f1dbff8e3024109e96b7f36a3d9e1ebe57eb7aecc7acfd923f0de1bc8c4f358a87b32379 SHA512 894c677c61b3c7f8081b1511c64c274497c4ea85171f5b19d9606a19e4dff33df00d169653e3aede3eee07737b1cf9faadb812eebcf67292be68150c026b7f8e
diff --git a/www-servers/puma/puma-6.3.1.ebuild b/www-servers/puma/puma-6.3.1.ebuild
deleted file mode 100644
index d90d242152c6..000000000000
--- a/www-servers/puma/puma-6.3.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby30 ruby31 ruby32"
-
-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 tests depending on specific encoding
-	sed -i -e '/test_lowlevel_error_handler_response/askip "specific encoding required"' test/test_puma_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
-
-	# Tries to call 'rackup' directly
-	sed -i -e '/def test_bin/,/^    end/ s:^:#:' test/test_rack_handler.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 'rack', '<3'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{require _1}" || die
-}
diff --git a/www-servers/puma/puma-6.4.2.ebuild b/www-servers/puma/puma-6.4.2.ebuild
deleted file mode 100644
index 5084cdc3b4ec..000000000000
--- a/www-servers/puma/puma-6.4.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-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"
-
-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:3.0 dev-ruby/rackup >=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 '/\(pride\|prove\|stub_const\)/ s:^:#:' \
-		-e '/require_relative.*verbose/ s:^:#:' \
-		-e '/securerandom/arequire "rack/handler"' \
-		-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 tests depending on specific encoding
-	sed -i -e '/test_lowlevel_error_handler_response/askip "specific encoding required"' test/test_puma_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
-
-	# Avoid test that fails, most likely due to how we run the test suite
-	rm -f test/test_url_map.rb || die
-
-	# Tries to call 'rackup' directly
-	sed -i -e '/def test_bin/,/^    end/ s:^:#:' test/test_rack_handler.rb || die
-
-	sed -e 's/git ls-files --/find/' \
-		-e 's:_relative ": "./:' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	einfo "Running test suite"
-	MT_NO_PLUGINS=true ${RUBY} -Ilib:.:test \
-		-e "require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{require _1}" || die
-}