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-apache/passenger/
Date: Mon, 28 Sep 2015 06:12:57
Message-Id: 1443420762.bc151330f4c1c4ef9fadf8323500b8cca0e0e684.graaff@gentoo
1 commit: bc151330f4c1c4ef9fadf8323500b8cca0e0e684
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 28 05:38:07 2015 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 28 06:12:42 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc151330
7
8 www-apache/passenger: cleanup
9
10 Package-Manager: portage-2.2.20.1
11
12 www-apache/passenger/Manifest | 4 -
13 www-apache/passenger/passenger-5.0.13.ebuild | 118 ---------------------------
14 www-apache/passenger/passenger-5.0.14.ebuild | 118 ---------------------------
15 www-apache/passenger/passenger-5.0.16.ebuild | 118 ---------------------------
16 www-apache/passenger/passenger-5.0.4.ebuild | 114 --------------------------
17 5 files changed, 472 deletions(-)
18
19 diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
20 index 8024663..bc960b5 100644
21 --- a/www-apache/passenger/Manifest
22 +++ b/www-apache/passenger/Manifest
23 @@ -1,7 +1,3 @@
24 DIST passenger-4.0.53.tar.gz 4447609 SHA256 0b8d256cd930f93cfe723392aaa12fa3f9d5ddfddc82bbb7ab287673d029e101 SHA512 45919317c42da898783a22095fe75ed26f9142d227a25f5546f16861ce8c3ecfe2d804a845d389a00019df914cafd7625dc4e8fb31bc2f4ede5ecf41ce69c2a7 WHIRLPOOL fd205aefdec95eee82165d5a65e3dcf112544784549aa51d8a52703b51242120583e64837604ba31957e2cc98fb85a164f9ee19c367980869e0ff0159759c492
25 DIST passenger-4.0.59.tar.gz 4521206 SHA256 8b4756564a5133dc97425883d15d1ba1c9f6566c79e92794dc3e1f5b749238ae SHA512 d29400c71cf9530b41ce8b8d4cf94007e4d77fb4ceff290786506d6b9dfbab790f18423dc5dcd71aef07147ba2610c2982f7ca733a8e491de6a0cb3704c54bfb WHIRLPOOL 4683d19813ecbb284ec3eb9681c6c1a1b84f256f0262e6c2b1941df5872031a30da1396cb22fa1cfbad2f53f8971131ed0418c2ef4c20160a3d67f151d54208a
26 -DIST passenger-5.0.13.tar.gz 5556161 SHA256 9fef27b97e883e6bc55d817c52b927f2d5cd8bbc2ce79686a3de794d7e0c40e1 SHA512 68ff1e6701e431b1e26ffce8dd46198fffdddaa14bfa2f3917a20d32a7d54b3acac46d1ce797b551d9f988e7e0129d8372158f2e096342e08cb1a614d9fbf716 WHIRLPOOL 85282b61b675a0459a33208dd267d9e3b2284134bd5931df619041b5e4a2265542f9355e7f1feae2c98ffc27128504ecd46dc6493e8cbb8d55e7f9dfbf5deeac
27 -DIST passenger-5.0.14.tar.gz 5557110 SHA256 dbc994a9d8a0f28f2abeec25191471bbfec6e51d3e0748d7e16947bc8713f6d5 SHA512 39540136547db1b21c61174a4e86a4b5255c1f59036abbfc571eaee6fb03c48d4ec262d7fb1f1a27bf08b093112d8aaeb09c294304b597d0fdcd1fc278167b79 WHIRLPOOL 8cc983685142abbde9e85b12ee7283246fa7ebd627d56516328d6fc2ad5362439da9fcab37fffc129c2b4e992834c5efd09cfa9ee570d2c577dfd27ec8c56f95
28 -DIST passenger-5.0.16.tar.gz 4925041 SHA256 39799fdfa4873f67764747de1eddbe1fae759b1cd459c1c592ec71eecb462be5 SHA512 98e3c15113429bef4f01c35178c41b63fa9cd52b9fc3fc37e5e2d1a1a8d167057f73f03448b7989899d9fcce65a1a69488ae1f998dbf28368e2ee13aec909550 WHIRLPOOL 9e792dede7beaf6ee86950615cef2d4e81d8353f9077d5a9d50127eb669fe9708e8a61c597b3b5b1ad7645df8c4299060ed918ffcccdb7901db61967cfd61d98
29 DIST passenger-5.0.18.tar.gz 4927106 SHA256 8a92393f5413bb20686295f62a586e3af3b68e631b679413c990b5f0b58ba767 SHA512 dbe3bcdcdf1fae77b822bd157a61e28471e8139ee7165cccd819aedca7d5a0fc4204be8da9cb628fa2180807bb8c46143c98d7e9d1f84afeb6cc99695a7754af WHIRLPOOL 02686489207001383bdbad7661ce3d6303b94403e7795a16b9d7fae388d412f699342fce911d3e8038830387a76e846c213bb6cc80e9d55992ea4e511e7f6ed7
30 -DIST passenger-5.0.4.tar.gz 5289792 SHA256 5c29f2c1407db515ddccd540443cb34bff7ca180b3e269c2e28a34ad795f99f6 SHA512 a04bcf579a8148b34c34743a87f4f3b180218e871ed6309d7b83e9b4ab88334f01a566896c7406e3ddaf11ba0322128557cf5cfb2bcf5da7e4ea81f0539784ec WHIRLPOOL f2d523266a616d2b893963d5139be0d781a2bf76b122b4c76bb5cb6af7a655e5492b8c58d2f38f97858616108d0c3122278598fcfa7a262bab252e079e888536
31
32 diff --git a/www-apache/passenger/passenger-5.0.13.ebuild b/www-apache/passenger/passenger-5.0.13.ebuild
33 deleted file mode 100644
34 index 79dd68d..0000000
35 --- a/www-apache/passenger/passenger-5.0.13.ebuild
36 +++ /dev/null
37 @@ -1,118 +0,0 @@
38 -# Copyright 1999-2015 Gentoo Foundation
39 -# Distributed under the terms of the GNU General Public License v2
40 -# $Id$
41 -
42 -EAPI=5
43 -USE_RUBY="ruby19 ruby20 ruby21 ruby22"
44 -
45 -inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
46 -
47 -DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze"
48 -HOMEPAGE="http://modrails.com/"
49 -SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
50 -
51 -LICENSE="GPL-2"
52 -SLOT="0"
53 -KEYWORDS="~amd64 ~x86"
54 -IUSE="debug"
55 -
56 -ruby_add_bdepend "dev-ruby/rake"
57 -
58 -ruby_add_rdepend "
59 - >=dev-ruby/rack-1.0.0:*
60 - >=dev-ruby/rake-0.8.1"
61 -
62 -# libev is bundled but with adapations that do not seem to be accepted
63 -# upstream, so we must use the bundled version :-(
64 -CDEPEND="
65 - >=dev-libs/libuv-1.5.0
66 - net-misc/curl[ssl]
67 - www-servers/apache[apache2_modules_unixd(+)]"
68 -
69 -RDEPEND="${RDEPEND} ${CDEPEND}"
70 -DEPEND="${DEPEND} ${CDEPEND}"
71 -
72 -APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
73 -APACHE2_MOD_DEFINE="PASSENGER"
74 -
75 -need_apache2
76 -
77 -pkg_setup() {
78 - use debug && append-flags -DPASSENGER_DEBUG
79 -}
80 -
81 -all_ruby_prepare() {
82 - epatch "${FILESDIR}"/${PN}-5.0.4-gentoo.patch
83 -
84 - # Change these with sed instead of a patch so that we can easily use
85 - # the toolchain-funcs methods.
86 - sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
87 - -e "/^CXX/ s/=.*$/= '$(tc-getCXX)'/" \
88 - -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
89 -
90 - # Avoid fixed debugging CFLAGs.
91 - sed -e '/debugging_cflags/areturn ""' -i lib/phusion_passenger/platform_info/compiler.rb || die
92 -
93 - # Use sed here so that we can dynamically set the documentation directory.
94 - sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
95 - -e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \
96 - -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
97 - lib/phusion_passenger.rb || die
98 - sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" ext/common/ResourceLocator.h || die
99 -
100 - # Don't install a tool that won't work in our setup.
101 - sed -i -e '/passenger-install-apache2-module/d' lib/phusion_passenger/packaging.rb || die
102 - rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
103 -
104 - # Make sure we use the system-provided version where possible
105 - rm -rf ext/libuv || die "Unable to remove vendored code."
106 -
107 - # Avoid building documentation to avoid a dependency on mizuho.
108 - #sed -i -e 's/, :doc//' build/packaging.rb || die
109 - touch doc/*.html || die
110 -
111 - # Use the correct arch-specific lib directory
112 - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' build/packaging.rb || die
113 -
114 - # Fix hard-coded use of AR
115 - sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/cplusplus_support.rb || die
116 -}
117 -
118 -all_ruby_compile() {
119 - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
120 - APXS2="${APXS}" \
121 - HTTPD="${APACHE_BIN}" \
122 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
123 - ruby -S rake apache2 || die "rake failed"
124 -}
125 -
126 -each_ruby_compile() {
127 - append-flags -fno-strict-aliasing
128 -
129 - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
130 - APXS2="${APXS}" \
131 - HTTPD="${APACHE_BIN}" \
132 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
133 - ${RUBY} -S rake native_support || die "rake failed"
134 -}
135 -
136 -all_ruby_install() {
137 - APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
138 - apache-module_src_install
139 -
140 - # Patch in the correct libdir
141 - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
142 -
143 - dodoc CHANGELOG README.md
144 -}
145 -
146 -each_ruby_install() {
147 - DISTDIR="${D}" \
148 - RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
149 - RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
150 - APXS2="${APXS}" \
151 - HTTPD="${APACHE_BIN}" \
152 - EXTRA_LDFLAGS="${LDFLAGS}" \
153 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
154 - ${RUBY} -S rake fakeroot || die "rake failed"
155 -}
156
157 diff --git a/www-apache/passenger/passenger-5.0.14.ebuild b/www-apache/passenger/passenger-5.0.14.ebuild
158 deleted file mode 100644
159 index 79dd68d..0000000
160 --- a/www-apache/passenger/passenger-5.0.14.ebuild
161 +++ /dev/null
162 @@ -1,118 +0,0 @@
163 -# Copyright 1999-2015 Gentoo Foundation
164 -# Distributed under the terms of the GNU General Public License v2
165 -# $Id$
166 -
167 -EAPI=5
168 -USE_RUBY="ruby19 ruby20 ruby21 ruby22"
169 -
170 -inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
171 -
172 -DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze"
173 -HOMEPAGE="http://modrails.com/"
174 -SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
175 -
176 -LICENSE="GPL-2"
177 -SLOT="0"
178 -KEYWORDS="~amd64 ~x86"
179 -IUSE="debug"
180 -
181 -ruby_add_bdepend "dev-ruby/rake"
182 -
183 -ruby_add_rdepend "
184 - >=dev-ruby/rack-1.0.0:*
185 - >=dev-ruby/rake-0.8.1"
186 -
187 -# libev is bundled but with adapations that do not seem to be accepted
188 -# upstream, so we must use the bundled version :-(
189 -CDEPEND="
190 - >=dev-libs/libuv-1.5.0
191 - net-misc/curl[ssl]
192 - www-servers/apache[apache2_modules_unixd(+)]"
193 -
194 -RDEPEND="${RDEPEND} ${CDEPEND}"
195 -DEPEND="${DEPEND} ${CDEPEND}"
196 -
197 -APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
198 -APACHE2_MOD_DEFINE="PASSENGER"
199 -
200 -need_apache2
201 -
202 -pkg_setup() {
203 - use debug && append-flags -DPASSENGER_DEBUG
204 -}
205 -
206 -all_ruby_prepare() {
207 - epatch "${FILESDIR}"/${PN}-5.0.4-gentoo.patch
208 -
209 - # Change these with sed instead of a patch so that we can easily use
210 - # the toolchain-funcs methods.
211 - sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
212 - -e "/^CXX/ s/=.*$/= '$(tc-getCXX)'/" \
213 - -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
214 -
215 - # Avoid fixed debugging CFLAGs.
216 - sed -e '/debugging_cflags/areturn ""' -i lib/phusion_passenger/platform_info/compiler.rb || die
217 -
218 - # Use sed here so that we can dynamically set the documentation directory.
219 - sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
220 - -e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \
221 - -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
222 - lib/phusion_passenger.rb || die
223 - sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" ext/common/ResourceLocator.h || die
224 -
225 - # Don't install a tool that won't work in our setup.
226 - sed -i -e '/passenger-install-apache2-module/d' lib/phusion_passenger/packaging.rb || die
227 - rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
228 -
229 - # Make sure we use the system-provided version where possible
230 - rm -rf ext/libuv || die "Unable to remove vendored code."
231 -
232 - # Avoid building documentation to avoid a dependency on mizuho.
233 - #sed -i -e 's/, :doc//' build/packaging.rb || die
234 - touch doc/*.html || die
235 -
236 - # Use the correct arch-specific lib directory
237 - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' build/packaging.rb || die
238 -
239 - # Fix hard-coded use of AR
240 - sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/cplusplus_support.rb || die
241 -}
242 -
243 -all_ruby_compile() {
244 - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
245 - APXS2="${APXS}" \
246 - HTTPD="${APACHE_BIN}" \
247 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
248 - ruby -S rake apache2 || die "rake failed"
249 -}
250 -
251 -each_ruby_compile() {
252 - append-flags -fno-strict-aliasing
253 -
254 - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
255 - APXS2="${APXS}" \
256 - HTTPD="${APACHE_BIN}" \
257 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
258 - ${RUBY} -S rake native_support || die "rake failed"
259 -}
260 -
261 -all_ruby_install() {
262 - APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
263 - apache-module_src_install
264 -
265 - # Patch in the correct libdir
266 - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
267 -
268 - dodoc CHANGELOG README.md
269 -}
270 -
271 -each_ruby_install() {
272 - DISTDIR="${D}" \
273 - RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
274 - RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
275 - APXS2="${APXS}" \
276 - HTTPD="${APACHE_BIN}" \
277 - EXTRA_LDFLAGS="${LDFLAGS}" \
278 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
279 - ${RUBY} -S rake fakeroot || die "rake failed"
280 -}
281
282 diff --git a/www-apache/passenger/passenger-5.0.16.ebuild b/www-apache/passenger/passenger-5.0.16.ebuild
283 deleted file mode 100644
284 index 79dd68d..0000000
285 --- a/www-apache/passenger/passenger-5.0.16.ebuild
286 +++ /dev/null
287 @@ -1,118 +0,0 @@
288 -# Copyright 1999-2015 Gentoo Foundation
289 -# Distributed under the terms of the GNU General Public License v2
290 -# $Id$
291 -
292 -EAPI=5
293 -USE_RUBY="ruby19 ruby20 ruby21 ruby22"
294 -
295 -inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
296 -
297 -DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze"
298 -HOMEPAGE="http://modrails.com/"
299 -SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
300 -
301 -LICENSE="GPL-2"
302 -SLOT="0"
303 -KEYWORDS="~amd64 ~x86"
304 -IUSE="debug"
305 -
306 -ruby_add_bdepend "dev-ruby/rake"
307 -
308 -ruby_add_rdepend "
309 - >=dev-ruby/rack-1.0.0:*
310 - >=dev-ruby/rake-0.8.1"
311 -
312 -# libev is bundled but with adapations that do not seem to be accepted
313 -# upstream, so we must use the bundled version :-(
314 -CDEPEND="
315 - >=dev-libs/libuv-1.5.0
316 - net-misc/curl[ssl]
317 - www-servers/apache[apache2_modules_unixd(+)]"
318 -
319 -RDEPEND="${RDEPEND} ${CDEPEND}"
320 -DEPEND="${DEPEND} ${CDEPEND}"
321 -
322 -APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
323 -APACHE2_MOD_DEFINE="PASSENGER"
324 -
325 -need_apache2
326 -
327 -pkg_setup() {
328 - use debug && append-flags -DPASSENGER_DEBUG
329 -}
330 -
331 -all_ruby_prepare() {
332 - epatch "${FILESDIR}"/${PN}-5.0.4-gentoo.patch
333 -
334 - # Change these with sed instead of a patch so that we can easily use
335 - # the toolchain-funcs methods.
336 - sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
337 - -e "/^CXX/ s/=.*$/= '$(tc-getCXX)'/" \
338 - -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
339 -
340 - # Avoid fixed debugging CFLAGs.
341 - sed -e '/debugging_cflags/areturn ""' -i lib/phusion_passenger/platform_info/compiler.rb || die
342 -
343 - # Use sed here so that we can dynamically set the documentation directory.
344 - sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
345 - -e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \
346 - -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
347 - lib/phusion_passenger.rb || die
348 - sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" ext/common/ResourceLocator.h || die
349 -
350 - # Don't install a tool that won't work in our setup.
351 - sed -i -e '/passenger-install-apache2-module/d' lib/phusion_passenger/packaging.rb || die
352 - rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
353 -
354 - # Make sure we use the system-provided version where possible
355 - rm -rf ext/libuv || die "Unable to remove vendored code."
356 -
357 - # Avoid building documentation to avoid a dependency on mizuho.
358 - #sed -i -e 's/, :doc//' build/packaging.rb || die
359 - touch doc/*.html || die
360 -
361 - # Use the correct arch-specific lib directory
362 - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' build/packaging.rb || die
363 -
364 - # Fix hard-coded use of AR
365 - sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/cplusplus_support.rb || die
366 -}
367 -
368 -all_ruby_compile() {
369 - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
370 - APXS2="${APXS}" \
371 - HTTPD="${APACHE_BIN}" \
372 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
373 - ruby -S rake apache2 || die "rake failed"
374 -}
375 -
376 -each_ruby_compile() {
377 - append-flags -fno-strict-aliasing
378 -
379 - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
380 - APXS2="${APXS}" \
381 - HTTPD="${APACHE_BIN}" \
382 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
383 - ${RUBY} -S rake native_support || die "rake failed"
384 -}
385 -
386 -all_ruby_install() {
387 - APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
388 - apache-module_src_install
389 -
390 - # Patch in the correct libdir
391 - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
392 -
393 - dodoc CHANGELOG README.md
394 -}
395 -
396 -each_ruby_install() {
397 - DISTDIR="${D}" \
398 - RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
399 - RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
400 - APXS2="${APXS}" \
401 - HTTPD="${APACHE_BIN}" \
402 - EXTRA_LDFLAGS="${LDFLAGS}" \
403 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
404 - ${RUBY} -S rake fakeroot || die "rake failed"
405 -}
406
407 diff --git a/www-apache/passenger/passenger-5.0.4.ebuild b/www-apache/passenger/passenger-5.0.4.ebuild
408 deleted file mode 100644
409 index 4d751ed..0000000
410 --- a/www-apache/passenger/passenger-5.0.4.ebuild
411 +++ /dev/null
412 @@ -1,114 +0,0 @@
413 -# Copyright 1999-2015 Gentoo Foundation
414 -# Distributed under the terms of the GNU General Public License v2
415 -# $Id$
416 -
417 -EAPI=5
418 -USE_RUBY="ruby19 ruby20 ruby21 ruby22"
419 -
420 -inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
421 -
422 -DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze"
423 -HOMEPAGE="http://modrails.com/"
424 -SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
425 -
426 -LICENSE="GPL-2"
427 -SLOT="0"
428 -KEYWORDS="~amd64 ~x86"
429 -IUSE="debug"
430 -
431 -ruby_add_bdepend "dev-ruby/rake"
432 -
433 -ruby_add_rdepend "
434 - >=dev-ruby/rack-1.0.0
435 - >=dev-ruby/rake-0.8.1"
436 -
437 -CDEPEND=">=dev-libs/libev-4.15 net-misc/curl[ssl]
438 - www-servers/apache[apache2_modules_unixd(+)]"
439 -
440 -RDEPEND="${RDEPEND} ${CDEPEND}"
441 -DEPEND="${DEPEND} ${CDEPEND}"
442 -
443 -APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
444 -APACHE2_MOD_DEFINE="PASSENGER"
445 -
446 -need_apache2
447 -
448 -pkg_setup() {
449 - use debug && append-flags -DPASSENGER_DEBUG
450 -}
451 -
452 -all_ruby_prepare() {
453 - epatch "${FILESDIR}"/${PN}-5.0.4-gentoo.patch
454 -
455 - # Change these with sed instead of a patch so that we can easily use
456 - # the toolchain-funcs methods.
457 - sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
458 - -e "/^CXX/ s/=.*$/= '$(tc-getCXX)'/" \
459 - -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
460 -
461 - # Avoid fixed debugging CFLAGs.
462 - sed -e '/debugging_cflags/areturn ""' -i lib/phusion_passenger/platform_info/compiler.rb || die
463 -
464 - # Use sed here so that we can dynamically set the documentation directory.
465 - sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
466 - -e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \
467 - -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
468 - lib/phusion_passenger.rb || die
469 - sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" ext/common/ResourceLocator.h || die
470 -
471 - # Don't install a tool that won't work in our setup.
472 - sed -i -e '/passenger-install-apache2-module/d' lib/phusion_passenger/packaging.rb || die
473 - rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
474 -
475 - # Make sure we use the system-provided version.
476 - rm -rf ext/libev || die "Unable to remove vendored libev."
477 -
478 - # Avoid building documentation to avoid a dependency on mizuho.
479 - #sed -i -e 's/, :doc//' build/packaging.rb || die
480 - touch doc/*.html || die
481 -
482 - # Use the correct arch-specific lib directory
483 - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' build/packaging.rb || die
484 -
485 - # Fix hard-coded use of AR
486 - sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/cplusplus_support.rb || die
487 -}
488 -
489 -all_ruby_compile() {
490 - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
491 - APXS2="${APXS}" \
492 - HTTPD="${APACHE_BIN}" \
493 - USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
494 - ruby -S rake apache2 || die "rake failed"
495 -}
496 -
497 -each_ruby_compile() {
498 - append-flags -fno-strict-aliasing
499 -
500 - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
501 - APXS2="${APXS}" \
502 - HTTPD="${APACHE_BIN}" \
503 - USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
504 - ${RUBY} -S rake native_support || die "rake failed"
505 -}
506 -
507 -all_ruby_install() {
508 - APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
509 - apache-module_src_install
510 -
511 - # Patch in the correct libdir
512 - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
513 -
514 - dodoc CHANGELOG README.md
515 -}
516 -
517 -each_ruby_install() {
518 - DISTDIR="${D}" \
519 - RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
520 - RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
521 - APXS2="${APXS}" \
522 - HTTPD="${APACHE_BIN}" \
523 - EXTRA_LDFLAGS="${LDFLAGS}" \
524 - USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
525 - ${RUBY} -S rake fakeroot || die "rake failed"
526 -}