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: Sun, 02 Dec 2018 10:39:36
Message-Id: 1543747156.399325cf0579342f7a8625907303ecc8317ea6ce.graaff@gentoo
1 commit: 399325cf0579342f7a8625907303ecc8317ea6ce
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 2 07:16:10 2018 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 2 10:39:16 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=399325cf
7
8 www-apache/passenger: cleanup
9
10 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 www-apache/passenger/Manifest | 4 -
14 www-apache/passenger/passenger-5.3.3.ebuild | 127 ----------------------------
15 www-apache/passenger/passenger-5.3.4.ebuild | 127 ----------------------------
16 www-apache/passenger/passenger-5.3.5.ebuild | 127 ----------------------------
17 www-apache/passenger/passenger-5.3.6.ebuild | 127 ----------------------------
18 5 files changed, 512 deletions(-)
19
20 diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
21 index dc3d7fd1a88..9a7daa087d3 100644
22 --- a/www-apache/passenger/Manifest
23 +++ b/www-apache/passenger/Manifest
24 @@ -1,6 +1,2 @@
25 DIST passenger-5.3.2.tar.gz 7039759 BLAKE2B be10b368530b8560d7d93664bbf91711ace0cadb0d1e15a978c0a52311a626ea2e1c6d05e507ef488b384e4a7ccc4b02da35bd5bd5878788b036401e06a33b5f SHA512 97900a0e0de67cc3c3770c291c85c6fe937fceab5632c9832bc5c461d3b4e586a47c9733a1a50a805834f591e5af90651789ed74bf74e0eed4d6ce8084c51967
26 -DIST passenger-5.3.3.tar.gz 7040055 BLAKE2B 1a9caa34dd809f96da84e9e3c00f365fd5a5e80c5134c25be810ad2bd9e1f01d0f64c6323211f28121590ac4d4593572c5f4392e1be2bc87d78741a0fdd73885 SHA512 ae0b4a2681e7877c7a57d236139033f17782f3d0d891ac58bbfec211e77e3ada9d36c250c9c9234d853c666d1501ccc0e2d5997c247f10985cad936ad97a741e
27 -DIST passenger-5.3.4.tar.gz 7201951 BLAKE2B bc67fc5a0a1a8a38918d5c36470cc9df888eb7b85304b06f283199692b18922a9077db11db374fded091f851d5af67e7852d662f0e22a7ac4d49381eae35cbf9 SHA512 08fa0b06ae85cd48c748739be77713752c989ef031910441c243b5beacef398d544c41c87faa05a4d3f088da048b20ff5923d368ca12e0e2fd815726e9ce8c1a
28 -DIST passenger-5.3.5.tar.gz 7217952 BLAKE2B 80fca5713590c73b7d6afa73b5d3e323188ba6496082d0203dd09ee7d52d9751c6780ef1f68cb646722973743dfecf3aa810019c68a3f3ff0220a42de84d4081 SHA512 3b892f5d86247913572eb28541625f62fc22efba907541f5d3ef8a2d3a7bc81b7d90d5789650353bb4f2e11184e9ac272ea3d954db20ad5c6f9c9bdc52d2d035
29 -DIST passenger-5.3.6.tar.gz 7198910 BLAKE2B 2044e76e3aa582a684954fcc773e17f2b395376e0f8a163b5e736c65e3d62ba90a96929b8d4a6a0244e628f43b7fcf02bb81e0279026d12da4c9cec7bced06bd SHA512 d5e8462b94dacdcb1b0381321b2edae2983c8d659bde3d50683759005cacc4f7c406ff6ca61bac5196463d066a948518834e535fe8943e974f20e1d0c3b429bd
30 DIST passenger-5.3.7.tar.gz 7195477 BLAKE2B 43a2384574316f6c8472f326389e8c1feed769e78d66c20e63f6d2679b1ac1b20a9122612c98e3006520e6f24c5883addd93ef11e8f0385759ee0c9e9299b7ad SHA512 bbef4881e0e0c698b29b10ff8a7afbc001c31d14fb80ffa27ed6867a92ad23712319733e6162be1f7720ebda421630af2f258f8167fa73c7b5ea594bc8247158
31
32 diff --git a/www-apache/passenger/passenger-5.3.3.ebuild b/www-apache/passenger/passenger-5.3.3.ebuild
33 deleted file mode 100644
34 index 7a2b4ba6996..00000000000
35 --- a/www-apache/passenger/passenger-5.3.3.ebuild
36 +++ /dev/null
37 @@ -1,127 +0,0 @@
38 -# Copyright 1999-2018 Gentoo Foundation
39 -# Distributed under the terms of the GNU General Public License v2
40 -
41 -EAPI=6
42 -USE_RUBY="ruby23 ruby24 ruby25"
43 -
44 -inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
45 -
46 -DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
47 -HOMEPAGE="https://www.phusionpassenger.com/"
48 -SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
49 -
50 -LICENSE="GPL-2"
51 -SLOT="0"
52 -KEYWORDS="~amd64 ~x86"
53 -IUSE="apache2 debug"
54 -
55 -ruby_add_bdepend "dev-ruby/rake"
56 -
57 -ruby_add_rdepend "
58 - >=dev-ruby/rack-1.0.0:*
59 - >=dev-ruby/rake-0.8.1"
60 -
61 -# libev is bundled but with adapations that do not seem to be accepted
62 -# upstream, so we must use the bundled version :-(
63 -CDEPEND="
64 - >=dev-libs/libuv-1.8.0
65 - net-misc/curl[ssl]
66 - apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
67 -
68 -RDEPEND="${RDEPEND} ${CDEPEND}"
69 -DEPEND="${DEPEND} ${CDEPEND}"
70 -
71 -APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
72 -APACHE2_MOD_DEFINE="PASSENGER"
73 -
74 -want_apache2
75 -
76 -pkg_setup() {
77 - use debug && append-flags -DPASSENGER_DEBUG
78 - depend.apache_pkg_setup
79 -}
80 -
81 -all_ruby_prepare() {
82 - epatch "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
83 - eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch
84 -
85 - # Change these with sed instead of a patch so that we can easily use
86 - # the toolchain-funcs methods.
87 - sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
88 - -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
89 - -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
90 -
91 - # Avoid fixed debugging CFLAGs.
92 - sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
93 -
94 - # Use sed here so that we can dynamically set the documentation directory.
95 - sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
96 - -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
97 - src/ruby_supportlib/phusion_passenger.rb || die
98 - sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/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' src/ruby_supportlib/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 src/cxx_supportlib/vendor-copy/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 - # Fix hard-coded use of AR
112 - sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
113 -
114 - # Make sure apache support is not attempted with -apache2
115 - if ! use apache2 ; then
116 - sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
117 - fi
118 -}
119 -
120 -all_ruby_compile() {
121 - if use apache2 ; then
122 - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
123 - APXS2="${APXS}" \
124 - HTTPD="${APACHE_BIN}" \
125 - FS_LIBDIR='/usr/'$(get_libdir) \
126 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
127 - ruby -S rake apache2 || die "rake failed"
128 - fi
129 -}
130 -
131 -each_ruby_compile() {
132 - append-flags -fno-strict-aliasing
133 -
134 - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
135 - APXS2="${APXS}" \
136 - HTTPD="${APACHE_BIN}" \
137 - FS_LIBDIR='/usr/'$(get_libdir) \
138 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
139 - ${RUBY} -S rake native_support || die "rake failed"
140 -}
141 -
142 -all_ruby_install() {
143 - if use apache2 ; then
144 - APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
145 - apache-module_src_install
146 -
147 - # Patch in the correct libdir
148 - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
149 - fi
150 -
151 - dodoc CHANGELOG README.md
152 -}
153 -
154 -each_ruby_install() {
155 - DISTDIR="${D}" \
156 - RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
157 - RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
158 - APXS2="${APXS}" \
159 - HTTPD="${APACHE_BIN}" \
160 - FS_LIBDIR='/usr/'$(get_libdir) \
161 - EXTRA_LDFLAGS="${LDFLAGS}" \
162 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
163 - ${RUBY} -S rake fakeroot || die "rake failed"
164 -}
165
166 diff --git a/www-apache/passenger/passenger-5.3.4.ebuild b/www-apache/passenger/passenger-5.3.4.ebuild
167 deleted file mode 100644
168 index 7a2b4ba6996..00000000000
169 --- a/www-apache/passenger/passenger-5.3.4.ebuild
170 +++ /dev/null
171 @@ -1,127 +0,0 @@
172 -# Copyright 1999-2018 Gentoo Foundation
173 -# Distributed under the terms of the GNU General Public License v2
174 -
175 -EAPI=6
176 -USE_RUBY="ruby23 ruby24 ruby25"
177 -
178 -inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
179 -
180 -DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
181 -HOMEPAGE="https://www.phusionpassenger.com/"
182 -SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
183 -
184 -LICENSE="GPL-2"
185 -SLOT="0"
186 -KEYWORDS="~amd64 ~x86"
187 -IUSE="apache2 debug"
188 -
189 -ruby_add_bdepend "dev-ruby/rake"
190 -
191 -ruby_add_rdepend "
192 - >=dev-ruby/rack-1.0.0:*
193 - >=dev-ruby/rake-0.8.1"
194 -
195 -# libev is bundled but with adapations that do not seem to be accepted
196 -# upstream, so we must use the bundled version :-(
197 -CDEPEND="
198 - >=dev-libs/libuv-1.8.0
199 - net-misc/curl[ssl]
200 - apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
201 -
202 -RDEPEND="${RDEPEND} ${CDEPEND}"
203 -DEPEND="${DEPEND} ${CDEPEND}"
204 -
205 -APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
206 -APACHE2_MOD_DEFINE="PASSENGER"
207 -
208 -want_apache2
209 -
210 -pkg_setup() {
211 - use debug && append-flags -DPASSENGER_DEBUG
212 - depend.apache_pkg_setup
213 -}
214 -
215 -all_ruby_prepare() {
216 - epatch "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
217 - eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch
218 -
219 - # Change these with sed instead of a patch so that we can easily use
220 - # the toolchain-funcs methods.
221 - sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
222 - -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
223 - -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
224 -
225 - # Avoid fixed debugging CFLAGs.
226 - sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
227 -
228 - # Use sed here so that we can dynamically set the documentation directory.
229 - sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
230 - -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
231 - src/ruby_supportlib/phusion_passenger.rb || die
232 - sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
233 -
234 - # Don't install a tool that won't work in our setup.
235 - sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
236 - rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
237 -
238 - # Make sure we use the system-provided version where possible
239 - rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
240 -
241 - # Avoid building documentation to avoid a dependency on mizuho.
242 - #sed -i -e 's/, :doc//' build/packaging.rb || die
243 - touch doc/*.html || die
244 -
245 - # Fix hard-coded use of AR
246 - sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
247 -
248 - # Make sure apache support is not attempted with -apache2
249 - if ! use apache2 ; then
250 - sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
251 - fi
252 -}
253 -
254 -all_ruby_compile() {
255 - if use apache2 ; then
256 - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
257 - APXS2="${APXS}" \
258 - HTTPD="${APACHE_BIN}" \
259 - FS_LIBDIR='/usr/'$(get_libdir) \
260 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
261 - ruby -S rake apache2 || die "rake failed"
262 - fi
263 -}
264 -
265 -each_ruby_compile() {
266 - append-flags -fno-strict-aliasing
267 -
268 - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
269 - APXS2="${APXS}" \
270 - HTTPD="${APACHE_BIN}" \
271 - FS_LIBDIR='/usr/'$(get_libdir) \
272 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
273 - ${RUBY} -S rake native_support || die "rake failed"
274 -}
275 -
276 -all_ruby_install() {
277 - if use apache2 ; then
278 - APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
279 - apache-module_src_install
280 -
281 - # Patch in the correct libdir
282 - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
283 - fi
284 -
285 - dodoc CHANGELOG README.md
286 -}
287 -
288 -each_ruby_install() {
289 - DISTDIR="${D}" \
290 - RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
291 - RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
292 - APXS2="${APXS}" \
293 - HTTPD="${APACHE_BIN}" \
294 - FS_LIBDIR='/usr/'$(get_libdir) \
295 - EXTRA_LDFLAGS="${LDFLAGS}" \
296 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
297 - ${RUBY} -S rake fakeroot || die "rake failed"
298 -}
299
300 diff --git a/www-apache/passenger/passenger-5.3.5.ebuild b/www-apache/passenger/passenger-5.3.5.ebuild
301 deleted file mode 100644
302 index 3e6bbbe2025..00000000000
303 --- a/www-apache/passenger/passenger-5.3.5.ebuild
304 +++ /dev/null
305 @@ -1,127 +0,0 @@
306 -# Copyright 1999-2018 Gentoo Authors
307 -# Distributed under the terms of the GNU General Public License v2
308 -
309 -EAPI=6
310 -USE_RUBY="ruby23 ruby24 ruby25"
311 -
312 -inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
313 -
314 -DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
315 -HOMEPAGE="https://www.phusionpassenger.com/"
316 -SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
317 -
318 -LICENSE="GPL-2"
319 -SLOT="0"
320 -KEYWORDS="~amd64 ~x86"
321 -IUSE="apache2 debug"
322 -
323 -ruby_add_bdepend "dev-ruby/rake"
324 -
325 -ruby_add_rdepend "
326 - >=dev-ruby/rack-1.0.0:*
327 - >=dev-ruby/rake-0.8.1"
328 -
329 -# libev is bundled but with adapations that do not seem to be accepted
330 -# upstream, so we must use the bundled version :-(
331 -CDEPEND="
332 - >=dev-libs/libuv-1.8.0
333 - net-misc/curl[ssl]
334 - apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
335 -
336 -RDEPEND="${RDEPEND} ${CDEPEND}"
337 -DEPEND="${DEPEND} ${CDEPEND}"
338 -
339 -APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
340 -APACHE2_MOD_DEFINE="PASSENGER"
341 -
342 -want_apache2
343 -
344 -pkg_setup() {
345 - use debug && append-flags -DPASSENGER_DEBUG
346 - depend.apache_pkg_setup
347 -}
348 -
349 -all_ruby_prepare() {
350 - eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
351 - eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch
352 -
353 - # Change these with sed instead of a patch so that we can easily use
354 - # the toolchain-funcs methods.
355 - sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
356 - -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
357 - -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
358 -
359 - # Avoid fixed debugging CFLAGs.
360 - sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
361 -
362 - # Use sed here so that we can dynamically set the documentation directory.
363 - sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
364 - -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
365 - src/ruby_supportlib/phusion_passenger.rb || die
366 - sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
367 -
368 - # Don't install a tool that won't work in our setup.
369 - sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
370 - rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
371 -
372 - # Make sure we use the system-provided version where possible
373 - rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
374 -
375 - # Avoid building documentation to avoid a dependency on mizuho.
376 - #sed -i -e 's/, :doc//' build/packaging.rb || die
377 - touch doc/*.html || die
378 -
379 - # Fix hard-coded use of AR
380 - sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
381 -
382 - # Make sure apache support is not attempted with -apache2
383 - if ! use apache2 ; then
384 - sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
385 - fi
386 -}
387 -
388 -all_ruby_compile() {
389 - if use apache2 ; then
390 - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
391 - APXS2="${APXS}" \
392 - HTTPD="${APACHE_BIN}" \
393 - FS_LIBDIR='/usr/'$(get_libdir) \
394 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
395 - ruby -S rake apache2 || die "rake failed"
396 - fi
397 -}
398 -
399 -each_ruby_compile() {
400 - append-flags -fno-strict-aliasing
401 -
402 - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
403 - APXS2="${APXS}" \
404 - HTTPD="${APACHE_BIN}" \
405 - FS_LIBDIR='/usr/'$(get_libdir) \
406 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
407 - ${RUBY} -S rake native_support || die "rake failed"
408 -}
409 -
410 -all_ruby_install() {
411 - if use apache2 ; then
412 - APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
413 - apache-module_src_install
414 -
415 - # Patch in the correct libdir
416 - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
417 - fi
418 -
419 - dodoc CHANGELOG README.md
420 -}
421 -
422 -each_ruby_install() {
423 - DISTDIR="${D}" \
424 - RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
425 - RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
426 - APXS2="${APXS}" \
427 - HTTPD="${APACHE_BIN}" \
428 - FS_LIBDIR='/usr/'$(get_libdir) \
429 - EXTRA_LDFLAGS="${LDFLAGS}" \
430 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
431 - ${RUBY} -S rake fakeroot || die "rake failed"
432 -}
433
434 diff --git a/www-apache/passenger/passenger-5.3.6.ebuild b/www-apache/passenger/passenger-5.3.6.ebuild
435 deleted file mode 100644
436 index 3e6bbbe2025..00000000000
437 --- a/www-apache/passenger/passenger-5.3.6.ebuild
438 +++ /dev/null
439 @@ -1,127 +0,0 @@
440 -# Copyright 1999-2018 Gentoo Authors
441 -# Distributed under the terms of the GNU General Public License v2
442 -
443 -EAPI=6
444 -USE_RUBY="ruby23 ruby24 ruby25"
445 -
446 -inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
447 -
448 -DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
449 -HOMEPAGE="https://www.phusionpassenger.com/"
450 -SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
451 -
452 -LICENSE="GPL-2"
453 -SLOT="0"
454 -KEYWORDS="~amd64 ~x86"
455 -IUSE="apache2 debug"
456 -
457 -ruby_add_bdepend "dev-ruby/rake"
458 -
459 -ruby_add_rdepend "
460 - >=dev-ruby/rack-1.0.0:*
461 - >=dev-ruby/rake-0.8.1"
462 -
463 -# libev is bundled but with adapations that do not seem to be accepted
464 -# upstream, so we must use the bundled version :-(
465 -CDEPEND="
466 - >=dev-libs/libuv-1.8.0
467 - net-misc/curl[ssl]
468 - apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
469 -
470 -RDEPEND="${RDEPEND} ${CDEPEND}"
471 -DEPEND="${DEPEND} ${CDEPEND}"
472 -
473 -APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
474 -APACHE2_MOD_DEFINE="PASSENGER"
475 -
476 -want_apache2
477 -
478 -pkg_setup() {
479 - use debug && append-flags -DPASSENGER_DEBUG
480 - depend.apache_pkg_setup
481 -}
482 -
483 -all_ruby_prepare() {
484 - eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
485 - eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch
486 -
487 - # Change these with sed instead of a patch so that we can easily use
488 - # the toolchain-funcs methods.
489 - sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
490 - -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
491 - -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
492 -
493 - # Avoid fixed debugging CFLAGs.
494 - sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
495 -
496 - # Use sed here so that we can dynamically set the documentation directory.
497 - sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
498 - -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
499 - src/ruby_supportlib/phusion_passenger.rb || die
500 - sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
501 -
502 - # Don't install a tool that won't work in our setup.
503 - sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
504 - rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
505 -
506 - # Make sure we use the system-provided version where possible
507 - rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
508 -
509 - # Avoid building documentation to avoid a dependency on mizuho.
510 - #sed -i -e 's/, :doc//' build/packaging.rb || die
511 - touch doc/*.html || die
512 -
513 - # Fix hard-coded use of AR
514 - sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
515 -
516 - # Make sure apache support is not attempted with -apache2
517 - if ! use apache2 ; then
518 - sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
519 - fi
520 -}
521 -
522 -all_ruby_compile() {
523 - if use apache2 ; then
524 - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
525 - APXS2="${APXS}" \
526 - HTTPD="${APACHE_BIN}" \
527 - FS_LIBDIR='/usr/'$(get_libdir) \
528 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
529 - ruby -S rake apache2 || die "rake failed"
530 - fi
531 -}
532 -
533 -each_ruby_compile() {
534 - append-flags -fno-strict-aliasing
535 -
536 - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
537 - APXS2="${APXS}" \
538 - HTTPD="${APACHE_BIN}" \
539 - FS_LIBDIR='/usr/'$(get_libdir) \
540 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
541 - ${RUBY} -S rake native_support || die "rake failed"
542 -}
543 -
544 -all_ruby_install() {
545 - if use apache2 ; then
546 - APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
547 - apache-module_src_install
548 -
549 - # Patch in the correct libdir
550 - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
551 - fi
552 -
553 - dodoc CHANGELOG README.md
554 -}
555 -
556 -each_ruby_install() {
557 - DISTDIR="${D}" \
558 - RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
559 - RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
560 - APXS2="${APXS}" \
561 - HTTPD="${APACHE_BIN}" \
562 - FS_LIBDIR='/usr/'$(get_libdir) \
563 - EXTRA_LDFLAGS="${LDFLAGS}" \
564 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
565 - ${RUBY} -S rake fakeroot || die "rake failed"
566 -}