1 |
commit: 2e3876468a1f58d2856f684c811881e2177e8582 |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Nov 24 06:17:23 2017 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 24 06:21:05 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e387646 |
7 |
|
8 |
www-apache/passenger: cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
11 |
|
12 |
www-apache/passenger/Manifest | 2 - |
13 |
www-apache/passenger/passenger-5.1.2.ebuild | 118 --------------------------- |
14 |
www-apache/passenger/passenger-5.1.8.ebuild | 122 ---------------------------- |
15 |
3 files changed, 242 deletions(-) |
16 |
|
17 |
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest |
18 |
index ba1c65e256d..90343abdd23 100644 |
19 |
--- a/www-apache/passenger/Manifest |
20 |
+++ b/www-apache/passenger/Manifest |
21 |
@@ -1,5 +1,3 @@ |
22 |
DIST passenger-5.1.11.tar.gz 4243340 BLAKE2B 25c6cc0016c4078962466716f16a2d084d4e59528153bbe09dae70c4935941cabc456062e0004f7640074f163e53aa6f95e44fc7b99136292db5e3c9bb9fe554 SHA512 7dce496916533f2fcd5cb5931d79308da8adda300a8b8603ce90b92645e69a1283d147976b5aa3408f86ccb71f9e5849bfb68e58a806a8a58529cadda557bccb |
23 |
DIST passenger-5.1.12.tar.gz 4245993 BLAKE2B 4f5808bcb373a85fbe2e160d9bd993fdff32a78f5083f5b5ff38112a4d3ca906a18a241cef6744350c0f33ef357dfda7a2cd5af875223a082a19b4e99cba4aeb SHA512 7ecdf0be306a3c4b842c8497861dbc072fc87f5601840678fe1125b77d50e683003b49616397d39b34705c967f604f5193be173c52a9c5ab235ef4e6e43f2f4a |
24 |
-DIST passenger-5.1.2.tar.gz 5646103 BLAKE2B 0ba891b91f80944d62b7d9a76ba88884a095ac491b36e93ead8c52d1883944f835f49d26934acd40b61cdb4abd5b53826193e2cf58c8e8a53b9ede16e05bea42 SHA512 88a77c749857a8538ea268f793d2708fa29b8891d2c3197577155f81cb66aa04919c25e713d4f00692051ad385eebaa94729cd30baa68edcf3d17c23bae0acdd |
25 |
DIST passenger-5.1.6.tar.gz 5215694 BLAKE2B 6a7408b5a2ec877a8689c5f3e7fe8b1b037446ac6bb7a3a4a4831bf2cb00d2fa3206e1acb52fda99d0383afa75354feaf0ff91c8ca210382c39f482ba86ba642 SHA512 71d301d2501863951157f55df30ac89f6f9d98e79b554a5ca05ca9a306041ecd8cdc92056220cf6dc9ad02972a102bfc990e3b06f887d27496a8ecbd58e109fa |
26 |
-DIST passenger-5.1.8.tar.gz 5234529 BLAKE2B 07c68bd224e58c56c94937b3aca6442b9b41964cdae7d28da2d4b801f9a8320b6adfa5f0b3a28489e4bb1e2f8304af1313fb6e0c587d8b0ee3b97cb7d20122b1 SHA512 5baf287e1f2a751409bba99671de2c41656033dc29132b2d964457405284105343fde4c2233c921d7e35794a47eedbf33e3840119a908741b1ed9e6fdc99ec2c |
27 |
|
28 |
diff --git a/www-apache/passenger/passenger-5.1.2.ebuild b/www-apache/passenger/passenger-5.1.2.ebuild |
29 |
deleted file mode 100644 |
30 |
index 6ea838a5241..00000000000 |
31 |
--- a/www-apache/passenger/passenger-5.1.2.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,118 +0,0 @@ |
34 |
-# Copyright 1999-2017 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=5 |
38 |
-USE_RUBY="ruby21 ruby22 ruby23" |
39 |
- |
40 |
-inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs |
41 |
- |
42 |
-DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze" |
43 |
-HOMEPAGE="https://www.phusionpassenger.com/" |
44 |
-SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz" |
45 |
- |
46 |
-LICENSE="GPL-2" |
47 |
-SLOT="0" |
48 |
-KEYWORDS="amd64 x86" |
49 |
-IUSE="debug" |
50 |
- |
51 |
-ruby_add_bdepend "dev-ruby/rake" |
52 |
- |
53 |
-ruby_add_rdepend " |
54 |
- >=dev-ruby/rack-1.0.0:* |
55 |
- >=dev-ruby/rake-0.8.1" |
56 |
- |
57 |
-# libev is bundled but with adapations that do not seem to be accepted |
58 |
-# upstream, so we must use the bundled version :-( |
59 |
-CDEPEND=" |
60 |
- >=dev-libs/libuv-1.8.0 |
61 |
- net-misc/curl[ssl] |
62 |
- www-servers/apache[apache2_modules_unixd(+)]" |
63 |
- |
64 |
-RDEPEND="${RDEPEND} ${CDEPEND}" |
65 |
-DEPEND="${DEPEND} ${CDEPEND}" |
66 |
- |
67 |
-APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}" |
68 |
-APACHE2_MOD_DEFINE="PASSENGER" |
69 |
- |
70 |
-need_apache2 |
71 |
- |
72 |
-pkg_setup() { |
73 |
- use debug && append-flags -DPASSENGER_DEBUG |
74 |
-} |
75 |
- |
76 |
-all_ruby_prepare() { |
77 |
- epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch |
78 |
- epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch |
79 |
- |
80 |
- # Change these with sed instead of a patch so that we can easily use |
81 |
- # the toolchain-funcs methods. |
82 |
- sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \ |
83 |
- -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \ |
84 |
- -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die |
85 |
- |
86 |
- # Avoid fixed debugging CFLAGs. |
87 |
- sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die |
88 |
- |
89 |
- # Use sed here so that we can dynamically set the documentation directory. |
90 |
- sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \ |
91 |
- -e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \ |
92 |
- -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \ |
93 |
- src/ruby_supportlib/phusion_passenger.rb || die |
94 |
- sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die |
95 |
- |
96 |
- # Don't install a tool that won't work in our setup. |
97 |
- sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die |
98 |
- rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script." |
99 |
- |
100 |
- # Make sure we use the system-provided version where possible |
101 |
- rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code." |
102 |
- |
103 |
- # Avoid building documentation to avoid a dependency on mizuho. |
104 |
- #sed -i -e 's/, :doc//' build/packaging.rb || die |
105 |
- touch doc/*.html || die |
106 |
- |
107 |
- # Fix hard-coded use of AR |
108 |
- sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die |
109 |
-} |
110 |
- |
111 |
-all_ruby_compile() { |
112 |
- V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ |
113 |
- APXS2="${APXS}" \ |
114 |
- HTTPD="${APACHE_BIN}" \ |
115 |
- FS_LIBDIR='/usr/'$(get_libdir) \ |
116 |
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ |
117 |
- ruby -S rake apache2 || die "rake failed" |
118 |
-} |
119 |
- |
120 |
-each_ruby_compile() { |
121 |
- append-flags -fno-strict-aliasing |
122 |
- |
123 |
- V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ |
124 |
- APXS2="${APXS}" \ |
125 |
- HTTPD="${APACHE_BIN}" \ |
126 |
- FS_LIBDIR='/usr/'$(get_libdir) \ |
127 |
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ |
128 |
- ${RUBY} -S rake native_support || die "rake failed" |
129 |
-} |
130 |
- |
131 |
-all_ruby_install() { |
132 |
- APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so" |
133 |
- apache-module_src_install |
134 |
- |
135 |
- # Patch in the correct libdir |
136 |
- sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die |
137 |
- |
138 |
- dodoc CHANGELOG README.md |
139 |
-} |
140 |
- |
141 |
-each_ruby_install() { |
142 |
- DISTDIR="${D}" \ |
143 |
- RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \ |
144 |
- RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \ |
145 |
- APXS2="${APXS}" \ |
146 |
- HTTPD="${APACHE_BIN}" \ |
147 |
- FS_LIBDIR='/usr/'$(get_libdir) \ |
148 |
- EXTRA_LDFLAGS="${LDFLAGS}" \ |
149 |
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ |
150 |
- ${RUBY} -S rake fakeroot || die "rake failed" |
151 |
-} |
152 |
|
153 |
diff --git a/www-apache/passenger/passenger-5.1.8.ebuild b/www-apache/passenger/passenger-5.1.8.ebuild |
154 |
deleted file mode 100644 |
155 |
index 2649ae2a9ba..00000000000 |
156 |
--- a/www-apache/passenger/passenger-5.1.8.ebuild |
157 |
+++ /dev/null |
158 |
@@ -1,122 +0,0 @@ |
159 |
-# Copyright 1999-2017 Gentoo Foundation |
160 |
-# Distributed under the terms of the GNU General Public License v2 |
161 |
- |
162 |
-EAPI=6 |
163 |
-USE_RUBY="ruby22 ruby23 ruby24" |
164 |
- |
165 |
-inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs |
166 |
- |
167 |
-DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze" |
168 |
-HOMEPAGE="https://www.phusionpassenger.com/" |
169 |
-SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz" |
170 |
- |
171 |
-LICENSE="GPL-2" |
172 |
-SLOT="0" |
173 |
-KEYWORDS="~amd64 ~x86" |
174 |
-IUSE="apache2 debug" |
175 |
- |
176 |
-ruby_add_bdepend "dev-ruby/rake" |
177 |
- |
178 |
-ruby_add_rdepend " |
179 |
- >=dev-ruby/rack-1.0.0:* |
180 |
- >=dev-ruby/rake-0.8.1" |
181 |
- |
182 |
-# libev is bundled but with adapations that do not seem to be accepted |
183 |
-# upstream, so we must use the bundled version :-( |
184 |
-CDEPEND=" |
185 |
- >=dev-libs/libuv-1.8.0 |
186 |
- net-misc/curl[ssl] |
187 |
- apache2? ( www-servers/apache[apache2_modules_unixd(+)] )" |
188 |
- |
189 |
-RDEPEND="${RDEPEND} ${CDEPEND}" |
190 |
-DEPEND="${DEPEND} ${CDEPEND}" |
191 |
- |
192 |
-APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}" |
193 |
-APACHE2_MOD_DEFINE="PASSENGER" |
194 |
- |
195 |
-want_apache2 |
196 |
- |
197 |
-pkg_setup() { |
198 |
- use debug && append-flags -DPASSENGER_DEBUG |
199 |
- depend.apache_pkg_setup |
200 |
-} |
201 |
- |
202 |
-all_ruby_prepare() { |
203 |
- epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch |
204 |
- epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch |
205 |
- |
206 |
- # Change these with sed instead of a patch so that we can easily use |
207 |
- # the toolchain-funcs methods. |
208 |
- sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \ |
209 |
- -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \ |
210 |
- -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die |
211 |
- |
212 |
- # Avoid fixed debugging CFLAGs. |
213 |
- sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die |
214 |
- |
215 |
- # Use sed here so that we can dynamically set the documentation directory. |
216 |
- sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \ |
217 |
- -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \ |
218 |
- src/ruby_supportlib/phusion_passenger.rb || die |
219 |
- sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die |
220 |
- |
221 |
- # Don't install a tool that won't work in our setup. |
222 |
- sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die |
223 |
- rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script." |
224 |
- |
225 |
- # Make sure we use the system-provided version where possible |
226 |
- rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code." |
227 |
- |
228 |
- # Avoid building documentation to avoid a dependency on mizuho. |
229 |
- #sed -i -e 's/, :doc//' build/packaging.rb || die |
230 |
- touch doc/*.html || die |
231 |
- |
232 |
- # Fix hard-coded use of AR |
233 |
- sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die |
234 |
-} |
235 |
- |
236 |
-all_ruby_compile() { |
237 |
- if use apache2 ; then |
238 |
- V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ |
239 |
- APXS2="${APXS}" \ |
240 |
- HTTPD="${APACHE_BIN}" \ |
241 |
- FS_LIBDIR='/usr/'$(get_libdir) \ |
242 |
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ |
243 |
- ruby -S rake apache2 || die "rake failed" |
244 |
- fi |
245 |
-} |
246 |
- |
247 |
-each_ruby_compile() { |
248 |
- append-flags -fno-strict-aliasing |
249 |
- |
250 |
- V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ |
251 |
- APXS2="${APXS}" \ |
252 |
- HTTPD="${APACHE_BIN}" \ |
253 |
- FS_LIBDIR='/usr/'$(get_libdir) \ |
254 |
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ |
255 |
- ${RUBY} -S rake native_support || die "rake failed" |
256 |
-} |
257 |
- |
258 |
-all_ruby_install() { |
259 |
- if use apache2 ; then |
260 |
- APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so" |
261 |
- apache-module_src_install |
262 |
- |
263 |
- # Patch in the correct libdir |
264 |
- sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die |
265 |
- fi |
266 |
- |
267 |
- dodoc CHANGELOG README.md |
268 |
-} |
269 |
- |
270 |
-each_ruby_install() { |
271 |
- DISTDIR="${D}" \ |
272 |
- RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \ |
273 |
- RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \ |
274 |
- APXS2="${APXS}" \ |
275 |
- HTTPD="${APACHE_BIN}" \ |
276 |
- FS_LIBDIR='/usr/'$(get_libdir) \ |
277 |
- EXTRA_LDFLAGS="${LDFLAGS}" \ |
278 |
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ |
279 |
- ${RUBY} -S rake fakeroot || die "rake failed" |
280 |
-} |