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/thin/
Date: Sun, 29 Apr 2018 05:58:26
Message-Id: 1524981489.ec1005895c016ecfe2c79605c9732095a4887992.graaff@gentoo
1 commit: ec1005895c016ecfe2c79605c9732095a4887992
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 29 05:46:36 2018 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 29 05:58:09 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec100589
7
8 www-servers/thin: cleanup
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 www-servers/thin/Manifest | 2 -
13 www-servers/thin/thin-1.7.0-r1.ebuild | 88 -----------------------------------
14 www-servers/thin/thin-1.7.1.ebuild | 88 -----------------------------------
15 3 files changed, 178 deletions(-)
16
17 diff --git a/www-servers/thin/Manifest b/www-servers/thin/Manifest
18 index 9398e73fe3b..9ffd8cf5886 100644
19 --- a/www-servers/thin/Manifest
20 +++ b/www-servers/thin/Manifest
21 @@ -1,3 +1 @@
22 -DIST thin-1.7.0.tar.gz 180791 BLAKE2B 60b703abae0c359e11f2ed3689f24a99aa5e636dcf308ed56fc9f72cbe2acefca16c456efe1ff80338020c6543a1c1647b1b7c5d5f21f173595d7caea5ebfdee SHA512 a41ffb8792f5dbc732696af4914e5121e83f21d18e5aae64676dc5d035f84c0e13d352565c5004ba7ac2e42c701522a6aa6a9250303877c3ac566c30336df2c3
23 -DIST thin-1.7.1.tar.gz 179998 BLAKE2B 9d046df2264c139823f8bbbff08387b95295a3a9521746103c85cbd69fdbc5de8830b9546e948dd87e742f67521d1adac7f56eaa8e151f1ec8f4de39242921e4 SHA512 7a5e3ccef263e5ba15cf53f38d7a8ae6ff974a4cfee2844cc15f9e6afb155b73b43e8c2ba49e177cad20eb9a728f4ddbe0d88417ad7f1c11ca2a535745da73ef
24 DIST thin-1.7.2.tar.gz 180169 BLAKE2B fe902b76cbffbad739327754c14dcc46372d412c607f852a4f52554ec8e41e38a07f211c28751b3528fd53c7eb30eb0f8130e3bc0877996187a3d755ccfbc17f SHA512 2c3c831eed4444d42fc88fc2c46e557284748b6b6bf331d6fd827073918cc3a869e5a60bf7db19ba82add28e07c8a8c92dac609a56cda82b41b37ddfb247e7bf
25
26 diff --git a/www-servers/thin/thin-1.7.0-r1.ebuild b/www-servers/thin/thin-1.7.0-r1.ebuild
27 deleted file mode 100644
28 index 48f44ec1c59..00000000000
29 --- a/www-servers/thin/thin-1.7.0-r1.ebuild
30 +++ /dev/null
31 @@ -1,88 +0,0 @@
32 -# Copyright 1999-2016 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=5
36 -
37 -USE_RUBY="ruby21 ruby22 ruby23"
38 -
39 -RUBY_FAKEGEM_RECIPE_TEST="rspec"
40 -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
41 -
42 -inherit ruby-fakegem
43 -
44 -DESCRIPTION="A fast and very simple Ruby web server"
45 -HOMEPAGE="http://code.macournoyer.com/thin/"
46 -SRC_URI="https://github.com/macournoyer/thin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
47 -
48 -LICENSE="Ruby"
49 -SLOT="0"
50 -KEYWORDS="~amd64 ~ppc64 ~x86"
51 -IUSE="doc test"
52 -
53 -DEPEND="${DEPEND}
54 - dev-util/ragel"
55 -RDEPEND="${RDEPEND}"
56 -
57 -# The runtime dependencies are used at build-time as well since the
58 -# Rakefile loads thin!
59 -mydeps=">=dev-ruby/daemons-1.0.9
60 - >=dev-ruby/rack-1.0.0:* <dev-ruby/rack-3:*
61 - >=dev-ruby/eventmachine-1.0.4:0
62 - virtual/ruby-ssl"
63 -
64 -ruby_add_rdepend "${mydeps}"
65 -ruby_add_bdepend "${mydeps}
66 - dev-ruby/rake-compiler"
67 -
68 -all_ruby_prepare() {
69 - # Fix Ragel-based parser generation (uses a *very* old syntax that
70 - # is not supported in Gentoo)
71 - sed -i -e 's: | rlgen-cd::' Rakefile || die
72 -
73 - # Fix specs' dependencies so that the extension is not rebuilt
74 - # when running tests
75 - rm tasks/spec.rake || die
76 -
77 - # Fix rspec version to allow newer 2.x versions
78 - sed -i -e '/gem "rspec"/ s/1.2.9/2.0/' spec/spec_helper.rb || die
79 -
80 - # Avoid CLEAN since it may not be available and we don't need it.
81 - sed -i -e '/CLEAN/ s:^:#:' tasks/*.rake || die
82 -
83 - # Disable a test that is known for freezing the testsuite,
84 - # reported upstream. In thin 1.5.1 this just fails.
85 - sed -i \
86 - -e '/should force kill process in pid file/,/^ end/ s:^:#:' \
87 - spec/daemonizing_spec.rb || die
88 -
89 - sed -i \
90 - -e '/tracing routines (with NO custom logger)/,/^ end/ s:^:#:'\
91 - spec/logging_spec.rb || die
92 -
93 - find spec/perf -name "*_spec.rb" -exec \
94 - sed -i '/be_faster_then/ i \ pending' {} \;
95 -
96 - sed -i -e "s/Spec::Runner/Rspec/" spec/spec_helper.rb || die
97 - # nasty but too complex to fix up for now :(
98 - use doc || rm tasks/rdoc.rake
99 -}
100 -
101 -each_ruby_compile() {
102 - ${RUBY} -S rake compile || die "rake compile failed"
103 -}
104 -
105 -all_ruby_install() {
106 - all_fakegem_install
107 -
108 - keepdir /etc/thin
109 - newinitd "${FILESDIR}"/${PN}.initd-r4 ${PN}
110 - newconfd "${FILESDIR}"/${PN}.confd-2 ${PN}
111 -
112 - einfo
113 - elog "Thin is now shipped with init scripts."
114 - elog "The default script (/etc/init.d/thin) will start all servers that have"
115 - elog "configuration files in /etc/thin/. You can symlink the init script to"
116 - elog "files of the format 'thin.SERVER' to be able to start individual servers."
117 - elog "See /etc/conf.d/thin for more configuration options."
118 - einfo
119 -}
120
121 diff --git a/www-servers/thin/thin-1.7.1.ebuild b/www-servers/thin/thin-1.7.1.ebuild
122 deleted file mode 100644
123 index b57be6e1536..00000000000
124 --- a/www-servers/thin/thin-1.7.1.ebuild
125 +++ /dev/null
126 @@ -1,88 +0,0 @@
127 -# Copyright 1999-2017 Gentoo Foundation
128 -# Distributed under the terms of the GNU General Public License v2
129 -
130 -EAPI=6
131 -
132 -USE_RUBY="ruby21 ruby22 ruby23"
133 -
134 -RUBY_FAKEGEM_RECIPE_TEST="rspec"
135 -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
136 -
137 -inherit ruby-fakegem
138 -
139 -DESCRIPTION="A fast and very simple Ruby web server"
140 -HOMEPAGE="http://code.macournoyer.com/thin/"
141 -SRC_URI="https://github.com/macournoyer/thin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
142 -
143 -LICENSE="Ruby"
144 -SLOT="0"
145 -KEYWORDS="~amd64 ~ppc64 ~x86"
146 -IUSE="doc test"
147 -
148 -DEPEND="${DEPEND}
149 - dev-util/ragel"
150 -RDEPEND="${RDEPEND}"
151 -
152 -# The runtime dependencies are used at build-time as well since the
153 -# Rakefile loads thin!
154 -mydeps=">=dev-ruby/daemons-1.0.9
155 - >=dev-ruby/rack-1.0.0:* <dev-ruby/rack-3:*
156 - >=dev-ruby/eventmachine-1.0.4:0
157 - virtual/ruby-ssl"
158 -
159 -ruby_add_rdepend "${mydeps}"
160 -ruby_add_bdepend "${mydeps}
161 - dev-ruby/rake-compiler"
162 -
163 -all_ruby_prepare() {
164 - # Fix Ragel-based parser generation (uses a *very* old syntax that
165 - # is not supported in Gentoo)
166 - sed -i -e 's: | rlgen-cd::' Rakefile || die
167 -
168 - # Fix specs' dependencies so that the extension is not rebuilt
169 - # when running tests
170 - rm tasks/spec.rake || die
171 -
172 - # Fix rspec version to allow newer 2.x versions
173 - sed -i -e '/gem "rspec"/ s/1.2.9/2.0/' spec/spec_helper.rb || die
174 -
175 - # Avoid CLEAN since it may not be available and we don't need it.
176 - sed -i -e '/CLEAN/ s:^:#:' tasks/*.rake || die
177 -
178 - # Disable a test that is known for freezing the testsuite,
179 - # reported upstream. In thin 1.5.1 this just fails.
180 - sed -i \
181 - -e '/should force kill process in pid file/,/^ end/ s:^:#:' \
182 - spec/daemonizing_spec.rb || die
183 -
184 - sed -i \
185 - -e '/tracing routines (with NO custom logger)/,/^ end/ s:^:#:'\
186 - spec/logging_spec.rb || die
187 -
188 - find spec/perf -name "*_spec.rb" -exec \
189 - sed -i '/be_faster_then/ i \ pending' {} \;
190 -
191 - sed -i -e "s/Spec::Runner/Rspec/" spec/spec_helper.rb || die
192 - # nasty but too complex to fix up for now :(
193 - use doc || rm tasks/rdoc.rake
194 -}
195 -
196 -each_ruby_compile() {
197 - ${RUBY} -S rake compile || die "rake compile failed"
198 -}
199 -
200 -all_ruby_install() {
201 - all_fakegem_install
202 -
203 - keepdir /etc/thin
204 - newinitd "${FILESDIR}"/${PN}.initd-r4 ${PN}
205 - newconfd "${FILESDIR}"/${PN}.confd-2 ${PN}
206 -
207 - einfo
208 - elog "Thin is now shipped with init scripts."
209 - elog "The default script (/etc/init.d/thin) will start all servers that have"
210 - elog "configuration files in /etc/thin/. You can symlink the init script to"
211 - elog "files of the format 'thin.SERVER' to be able to start individual servers."
212 - elog "See /etc/conf.d/thin for more configuration options."
213 - einfo
214 -}