From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B69AF138359 for ; Sat, 15 Aug 2020 05:42:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2280E080E; Sat, 15 Aug 2020 05:42:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B1D9DE080E for ; Sat, 15 Aug 2020 05:42:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3A60134EFB7 for ; Sat, 15 Aug 2020 05:42:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AE6D22EE for ; Sat, 15 Aug 2020 05:42:33 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1597470053.788250b02d441259c712406f79e41caab3d2f71b.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/puma/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/puma/Manifest www-servers/puma/puma-3.12.4.ebuild www-servers/puma/puma-3.12.5.ebuild www-servers/puma/puma-4.3.3.ebuild www-servers/puma/puma-4.3.4.ebuild X-VCS-Directories: www-servers/puma/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 788250b02d441259c712406f79e41caab3d2f71b X-VCS-Branch: master Date: Sat, 15 Aug 2020 05:42:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: abab3b88-59c0-456c-bc73-851618ce612a X-Archives-Hash: 3fe0c6bb284b0e544f79bc64b499daa9 commit: 788250b02d441259c712406f79e41caab3d2f71b Author: Hans de Graaff gentoo org> AuthorDate: Sat Aug 15 05:40:53 2020 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sat Aug 15 05:40:53 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=788250b0 www-servers/puma: cleanup Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Hans de Graaff gentoo.org> www-servers/puma/Manifest | 2 - www-servers/puma/puma-3.12.4.ebuild | 69 ----------------------------------- www-servers/puma/puma-3.12.5.ebuild | 67 ---------------------------------- www-servers/puma/puma-4.3.3.ebuild | 73 ------------------------------------- www-servers/puma/puma-4.3.4.ebuild | 73 ------------------------------------- 5 files changed, 284 deletions(-) diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest index ebda6e9e307..eabbfd911f9 100644 --- a/www-servers/puma/Manifest +++ b/www-servers/puma/Manifest @@ -1,4 +1,2 @@ -DIST puma-3.12.4.tar.gz 219148 BLAKE2B d9fcef62474a1522c29f13fb2572c99bd6d4217bc94febb9c4fe6e699808ad0002fcd88dfd16884a5a9c7296e4d6dd08bc50ce7278f41608678feb18e3a034b4 SHA512 302505512b04c68f9794461b0e7693cd3ff4dfb325b18e50f0f659649c7f504f55765437382557c65bce45d32a1710ab16a875d1fc6d143d4ca297d2b2333108 DIST puma-3.12.5.tar.gz 219175 BLAKE2B 55e80fba8fd84004090cb8d30b6fd01652f1beb1d1216c5d41ce46c616677504fa867f9701ed2631f4edc956c9377d72c6fd4a1b61e99fdbb50ea371b170a0c0 SHA512 1e6721844cbabab0cfb8b1707625723061821dae3ee06a3330075f787ae580e6836d9cbe436e63dc4602253ad1da3b56135316c923c03bbbae454d9457a44aec -DIST puma-4.3.3.tar.gz 241756 BLAKE2B a6ff66a449bf04110b4a6e9bdaa740f1144076290f1733922ecab45b5b7e6115ee1f7431b280401adb866838b539b943a35a5955f6d7cf51075941e05451e655 SHA512 1ee81c8d144466a75d5110fd3545527c36af51d2e191c171a985944206524c10a2b4e35fb535e2a1a0a3af5d460a7071ceb9233fae8dc81784643c6b9dc06e6e DIST puma-4.3.4.tar.gz 241806 BLAKE2B 5450f14112ad45c48794186c7e9f078feed28a4194a917c949f4058b9d3a115273df6d93260de330047fa59730cb3ad45f31eb05e5880569e95a0b2c9de99a42 SHA512 619bf44c17622233b673dbf6c8f34b0463cd32684df81c20f31045d3106a86e110753b4da80e7b51b46fe18d90ee107d9a84a975dc3116840d9a9b5962178873 diff --git a/www-servers/puma/puma-3.12.4.ebuild b/www-servers/puma/puma-3.12.4.ebuild deleted file mode 100644 index e0078c5b689..00000000000 --- a/www-servers/puma/puma-3.12.4.ebuild +++ /dev/null @@ -1,69 +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" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" - -inherit multilib 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 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/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )" - -all_ruby_prepare() { - eapply "${FILESDIR}/${PN}-3.12.1-ruby26-waitpid.patch" - - sed -i -e '/bundler/ s:^:#:' test/helper.rb || die - - # Avoid test failing inconsistently - sed -i -e '/phased_restart_via_pumactl/,/^ end/ s:^:#:' test/test_integration.rb || die - - # Avoid test that trigger a bug in ruby very easily and lead to - # failure. This affects all current puma versions in combination - # with the latest ruby versions, so we add this new version anyway - # while allowing these tests to fail. - # https://github.com/puma/puma/pull/1345 - rm -f test/test_puma_server_ssl.rb || die - - # Use correct ruby version - sed -i -e 's/ruby -rrubygems/#{Gem.ruby} -rrubygems/' test/shell/t{1,3}.rb || die -} - -each_ruby_prepare() { - sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \ - -e 's/localhost/127.0.0.1/' test/shell/* || die - sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die -} - -each_ruby_configure() { - ${RUBY} -Cext/puma_http11 extconf.rb || die -} - -each_ruby_compile() { - emake V=1 -Cext/puma_http11 - cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || 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 - - einfo "Running integration tests" - pushd test/shell - #sh run.sh || die - popd -} diff --git a/www-servers/puma/puma-3.12.5.ebuild b/www-servers/puma/puma-3.12.5.ebuild deleted file mode 100644 index 0fd015b17d8..00000000000 --- a/www-servers/puma/puma-3.12.5.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_RUBY="ruby25 ruby26 ruby27" - -inherit multilib 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 ~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/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )" - -all_ruby_prepare() { - eapply "${FILESDIR}/${PN}-3.12.1-ruby26-waitpid.patch" - - sed -i -e '/bundler/ s:^:#:' test/helper.rb || die - - # Avoid test failing inconsistently - sed -i -e '/phased_restart_via_pumactl/,/^ end/ s:^:#:' test/test_integration.rb || die - - # Avoid test that trigger a bug in ruby very easily and lead to - # failure. This affects all current puma versions in combination - # with the latest ruby versions, so we add this new version anyway - # while allowing these tests to fail. - # https://github.com/puma/puma/pull/1345 - rm -f test/test_puma_server_ssl.rb || die - - # Use correct ruby version - sed -i -e 's/ruby -rrubygems/#{Gem.ruby} -rrubygems/' test/shell/t{1,3}.rb || die -} - -each_ruby_prepare() { - sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \ - -e 's/localhost/127.0.0.1/' test/shell/* || die - sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die -} - -each_ruby_configure() { - ${RUBY} -Cext/puma_http11 extconf.rb || die -} - -each_ruby_compile() { - emake V=1 -Cext/puma_http11 - cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || 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 - - einfo "Running integration tests" - pushd test/shell - #sh run.sh || die - popd -} diff --git a/www-servers/puma/puma-4.3.3.ebuild b/www-servers/puma/puma-4.3.3.ebuild deleted file mode 100644 index 20e753cc834..00000000000 --- a/www-servers/puma/puma-4.3.3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_RUBY="ruby24 ruby25 ruby26 ruby27" - -RUBY_FAKEGEM_GEMSPEC="puma.gemspec" - -inherit multilib 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 ~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/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:^:#:' \ - -i test/helper.rb || die - - # Avoid tests failing inconsistently - sed -i -e '/phased_restart_via_pumactl/,/^ end/ s:^:#:' test/test_integration_pumactl.rb || die - sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die - - # Loosen timing on flakey test - #sed -i -e '390 s/sleep 2/sleep 4/' test/test_integration.rb || die - - # Use correct ruby version - sed -i -e 's/ruby -rrubygems/#{Gem.ruby} -rrubygems/' test/shell/t{1,3}.rb || die - - # Avoid launcher tests since they make assumptions about bundler use - rm -f test/test_launcher.rb || die - - sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die -} - -each_ruby_prepare() { - sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \ - -e 's/localhost/127.0.0.1/' test/shell/* || die - sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die -} - -each_ruby_configure() { - ${RUBY} -Cext/puma_http11 extconf.rb || die -} - -each_ruby_compile() { - emake V=1 -Cext/puma_http11 - cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || 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 - - einfo "Running integration tests" - pushd test/shell - #sh run.sh || die - popd -} diff --git a/www-servers/puma/puma-4.3.4.ebuild b/www-servers/puma/puma-4.3.4.ebuild deleted file mode 100644 index f4678e203a7..00000000000 --- a/www-servers/puma/puma-4.3.4.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_RUBY="ruby25 ruby26 ruby27" - -RUBY_FAKEGEM_GEMSPEC="puma.gemspec" - -inherit multilib 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 ~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/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:^:#:' \ - -i test/helper.rb || die - - # Avoid tests failing inconsistently - sed -i -e '/phased_restart_via_pumactl/,/^ end/ s:^:#:' test/test_integration_pumactl.rb || die - sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die - - # Loosen timing on flakey test - #sed -i -e '390 s/sleep 2/sleep 4/' test/test_integration.rb || die - - # Use correct ruby version - sed -i -e 's/ruby -rrubygems/#{Gem.ruby} -rrubygems/' test/shell/t{1,3}.rb || die - - # Avoid launcher tests since they make assumptions about bundler use - rm -f test/test_launcher.rb || die - - sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die -} - -each_ruby_prepare() { - sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \ - -e 's/localhost/127.0.0.1/' test/shell/* || die - sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die -} - -each_ruby_configure() { - ${RUBY} -Cext/puma_http11 extconf.rb || die -} - -each_ruby_compile() { - emake V=1 -Cext/puma_http11 - cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || 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 - - einfo "Running integration tests" - pushd test/shell - #sh run.sh || die - popd -}