Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/puma/
Date: Sat, 29 Feb 2020 06:57:32
Message-Id: 1582959445.52346b20d9ea792fc1b3e92e940a507565a0faa5.graaff@gentoo
1 commit: 52346b20d9ea792fc1b3e92e940a507565a0faa5
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 29 06:57:12 2020 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 29 06:57:25 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52346b20
7
8 www-servers/puma: remove broken versions
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
12
13 www-servers/puma/Manifest | 2 -
14 www-servers/puma/puma-3.12.3.ebuild | 69 -----------------------------------
15 www-servers/puma/puma-4.3.2.ebuild | 73 -------------------------------------
16 3 files changed, 144 deletions(-)
17
18 diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
19 index 0fe0041d370..535dd0e9be0 100644
20 --- a/www-servers/puma/Manifest
21 +++ b/www-servers/puma/Manifest
22 @@ -1,6 +1,4 @@
23 DIST puma-3.12.2.tar.gz 218109 BLAKE2B 82224c3a9c1b2c8e903e5f02a8b43effab820581abbaea5bea9c537eb36e39deb34d6f7d62d9fc42e1e5a6f3c153583d8e009c73864a9e57c39e2d31387b2813 SHA512 b0721dc9b380f1932a60a8ac2e1f0ef3869c735359e9a9e1e37bb118ebc3f550a24bd3e544142513ebeb1ee37ae01a41ec67e71e1d182faec0bb6ed4a60bafcf
24 -DIST puma-3.12.3.tar.gz 218918 BLAKE2B 41bf89c63ddf6f3e1975f45db049150c6f362e028113fd1790cad30a512468e63785f892d9db7bc2bbf4232c87bb3ebf48f8f9f8d777faab93f8f5219c320508 SHA512 f3d1aac689f42f520feea39de0d56f68d58dc5dccacd412b110afc74edfc29aeefe2b06b22dc97f287accc89e55f8488b5bd9cc6e787e945d85a8e61ae1f0118
25 DIST puma-3.12.4.tar.gz 219148 BLAKE2B d9fcef62474a1522c29f13fb2572c99bd6d4217bc94febb9c4fe6e699808ad0002fcd88dfd16884a5a9c7296e4d6dd08bc50ce7278f41608678feb18e3a034b4 SHA512 302505512b04c68f9794461b0e7693cd3ff4dfb325b18e50f0f659649c7f504f55765437382557c65bce45d32a1710ab16a875d1fc6d143d4ca297d2b2333108
26 DIST puma-4.3.1.tar.gz 239800 BLAKE2B 123dcb71dd310a960555fe801530586a39ef6876d9019549eb66590195ab1f450999d5365cf9ebbf2f057f2c641739f3fcdf743f5de076d7e637b0b17210410c SHA512 cbb5fc187d3aebfa255d3d0f2d897e109f50e18feadedbf02b73a350555dcbcfbfd91c0a810c11d6d3ac2ec26103479a53eed3fae77c96f1ae6cc2814960de46
27 -DIST puma-4.3.2.tar.gz 240942 BLAKE2B d02a6b5894199607905fb0d1364719f61ea189ba5c04a06863ad5c448dd6dd3ba96e8557a9ae9f3562322b9c8cbdf1189d89b7a4f344da0245ba4abfbdacaeee SHA512 a295a8fbfd03519cd87c44737783cd893d486dd8e8b63c1b07d4ea4aa706b12c36d210d9e56daf5490d0205ea7ddd2a77dc28159c90d2edafbbf3ce1ae8c24e0
28 DIST puma-4.3.3.tar.gz 241756 BLAKE2B a6ff66a449bf04110b4a6e9bdaa740f1144076290f1733922ecab45b5b7e6115ee1f7431b280401adb866838b539b943a35a5955f6d7cf51075941e05451e655 SHA512 1ee81c8d144466a75d5110fd3545527c36af51d2e191c171a985944206524c10a2b4e35fb535e2a1a0a3af5d460a7071ceb9233fae8dc81784643c6b9dc06e6e
29
30 diff --git a/www-servers/puma/puma-3.12.3.ebuild b/www-servers/puma/puma-3.12.3.ebuild
31 deleted file mode 100644
32 index 6d43e6fb3a0..00000000000
33 --- a/www-servers/puma/puma-3.12.3.ebuild
34 +++ /dev/null
35 @@ -1,69 +0,0 @@
36 -# Copyright 1999-2020 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=6
40 -
41 -USE_RUBY="ruby24 ruby25 ruby26"
42 -
43 -RUBY_FAKEGEM_RECIPE_DOC="rdoc"
44 -
45 -inherit multilib ruby-fakegem
46 -
47 -DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
48 -HOMEPAGE="https://puma.io/"
49 -SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
50 -
51 -LICENSE="BSD"
52 -SLOT="3"
53 -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
54 -IUSE=""
55 -
56 -DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
57 -RDEPEND+=" dev-libs/openssl:0"
58 -
59 -ruby_add_bdepend "virtual/ruby-ssl
60 - test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
61 -
62 -all_ruby_prepare() {
63 - eapply "${FILESDIR}/${PN}-3.12.1-ruby26-waitpid.patch"
64 -
65 - sed -i -e '/bundler/ s:^:#:' test/helper.rb || die
66 -
67 - # Avoid test failing inconsistently
68 - sed -i -e '/phased_restart_via_pumactl/,/^ end/ s:^:#:' test/test_integration.rb || die
69 -
70 - # Avoid test that trigger a bug in ruby very easily and lead to
71 - # failure. This affects all current puma versions in combination
72 - # with the latest ruby versions, so we add this new version anyway
73 - # while allowing these tests to fail.
74 - # https://github.com/puma/puma/pull/1345
75 - rm -f test/test_puma_server_ssl.rb || die
76 -
77 - # Use correct ruby version
78 - sed -i -e 's/ruby -rrubygems/#{Gem.ruby} -rrubygems/' test/shell/t{1,3}.rb || die
79 -}
80 -
81 -each_ruby_prepare() {
82 - sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \
83 - -e 's/localhost/127.0.0.1/' test/shell/* || die
84 - sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die
85 -}
86 -
87 -each_ruby_configure() {
88 - ${RUBY} -Cext/puma_http11 extconf.rb || die
89 -}
90 -
91 -each_ruby_compile() {
92 - emake V=1 -Cext/puma_http11
93 - cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die
94 -}
95 -
96 -each_ruby_test() {
97 - einfo "Running test suite"
98 - ${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
99 -
100 - einfo "Running integration tests"
101 - pushd test/shell
102 - #sh run.sh || die
103 - popd
104 -}
105
106 diff --git a/www-servers/puma/puma-4.3.2.ebuild b/www-servers/puma/puma-4.3.2.ebuild
107 deleted file mode 100644
108 index 184d12b0c48..00000000000
109 --- a/www-servers/puma/puma-4.3.2.ebuild
110 +++ /dev/null
111 @@ -1,73 +0,0 @@
112 -# Copyright 1999-2020 Gentoo Authors
113 -# Distributed under the terms of the GNU General Public License v2
114 -
115 -EAPI=7
116 -
117 -USE_RUBY="ruby24 ruby25 ruby26 ruby27"
118 -
119 -RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
120 -
121 -inherit multilib ruby-fakegem
122 -
123 -DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
124 -HOMEPAGE="https://puma.io/"
125 -SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
126 -
127 -LICENSE="BSD"
128 -SLOT="3"
129 -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
130 -IUSE=""
131 -
132 -DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
133 -RDEPEND+=" dev-libs/openssl:0"
134 -
135 -ruby_add_bdepend "virtual/ruby-ssl
136 - test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
137 -
138 -ruby_add_rdepend "dev-ruby/nio4r:2"
139 -
140 -all_ruby_prepare() {
141 - sed -e '/bundler/ s:^:#:' \
142 - -e '/prove/ s:^:#:' \
143 - -i test/helper.rb || die
144 -
145 - # Avoid tests failing inconsistently
146 - sed -i -e '/phased_restart_via_pumactl/,/^ end/ s:^:#:' test/test_integration_pumactl.rb || die
147 - sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die
148 -
149 - # Loosen timing on flakey test
150 - #sed -i -e '390 s/sleep 2/sleep 4/' test/test_integration.rb || die
151 -
152 - # Use correct ruby version
153 - sed -i -e 's/ruby -rrubygems/#{Gem.ruby} -rrubygems/' test/shell/t{1,3}.rb || die
154 -
155 - # Avoid launcher tests since they make assumptions about bundler use
156 - rm -f test/test_launcher.rb || die
157 -
158 - sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
159 -}
160 -
161 -each_ruby_prepare() {
162 - sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \
163 - -e 's/localhost/127.0.0.1/' test/shell/* || die
164 - sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die
165 -}
166 -
167 -each_ruby_configure() {
168 - ${RUBY} -Cext/puma_http11 extconf.rb || die
169 -}
170 -
171 -each_ruby_compile() {
172 - emake V=1 -Cext/puma_http11
173 - cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die
174 -}
175 -
176 -each_ruby_test() {
177 - einfo "Running test suite"
178 - ${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
179 -
180 - einfo "Running integration tests"
181 - pushd test/shell
182 - #sh run.sh || die
183 - popd
184 -}