1 |
commit: e5e69c418f491240c0e892b2231394c9cca33f40 |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 2 06:17:16 2021 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 2 11:15:57 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5e69c41 |
7 |
|
8 |
www-apache/passenger: cleanup |
9 |
|
10 |
Package-Manager: Portage-3.0.17, Repoman-3.0.2 |
11 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
12 |
|
13 |
www-apache/passenger/Manifest | 2 - |
14 |
www-apache/passenger/passenger-6.0.4.ebuild | 127 --------------------------- |
15 |
www-apache/passenger/passenger-6.0.5.ebuild | 130 ---------------------------- |
16 |
3 files changed, 259 deletions(-) |
17 |
|
18 |
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest |
19 |
index acaabe48395..3663b63f595 100644 |
20 |
--- a/www-apache/passenger/Manifest |
21 |
+++ b/www-apache/passenger/Manifest |
22 |
@@ -1,4 +1,2 @@ |
23 |
-DIST passenger-6.0.4.tar.gz 7347803 BLAKE2B 2e367b8dd0ace6a2773de92b3237821625190f2ae52fd11a1a3c47230d24affe1f9d161ef0346210cc91a21ae3a58f40f796063796399da0d133d6b0a261f52c SHA512 dd3398bece50c9da6029a5a9d98de2bed2e33a92f49fc776fe2b8f80f4a47e36d8a716c12f2f74d9611de5aa04981ddf680fc29a37f5b1860731a6f6e8390c81 |
24 |
-DIST passenger-6.0.5.tar.gz 7347149 BLAKE2B c2a1cb74a0c5d9ea7ea245b1c55413b8d212dc091bc7ad8727ca4cc4249cbc60e92c5313a5a1f8daf5dcea64485b27fbeeae9fada18727aed20dc38779d112ea SHA512 a6c174a52947f3985a0bbed20996e8386efdac6100a6c7ce9994bb6be7617bf810ac04821fae122e569e1883e8a8b1350cdccfa2b02053e5a4fbd13f891716e4 |
25 |
DIST passenger-6.0.6.tar.gz 7347506 BLAKE2B 16332ca5c299c366c891eef0267889d024417bacafafb9b6faed94434f16a3823fd21e9251eeefe190a682e8530b49cde4af22008b1537466ee3d685554dcbac SHA512 57a013dbbddab13862c2d5445d048aafdc5a56297c56d3d642a39fe7757d3bcbd7e9e21aca36ebeb0f54a03d26e0886031a947cb098026a516900cc5bff42f0c |
26 |
DIST passenger-6.0.7.tar.gz 7352163 BLAKE2B e002f03f761cfd1b2a79f3d518fe25fb1ead4f0431042b6bfe2ecf1b9900e6405abb4d67f9750302149f1d99990d2b42bc0fb1c855168b7003ac37eec3297b8f SHA512 6019a93ac500333098cee772b5240f6cbf3a75a8d7cdd2bccac58c28369dddca574dc7e1c239a8f21b863df4825e758bb5eae84b316842168dc875116a07bfca |
27 |
|
28 |
diff --git a/www-apache/passenger/passenger-6.0.4.ebuild b/www-apache/passenger/passenger-6.0.4.ebuild |
29 |
deleted file mode 100644 |
30 |
index 3ec3b0b2167..00000000000 |
31 |
--- a/www-apache/passenger/passenger-6.0.4.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,127 +0,0 @@ |
34 |
-# Copyright 1999-2020 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
-USE_RUBY="ruby24 ruby25 ruby26" |
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="apache2 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 |
- apache2? ( 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 |
-want_apache2 |
71 |
- |
72 |
-pkg_setup() { |
73 |
- use debug && append-flags -DPASSENGER_DEBUG |
74 |
- depend.apache_pkg_setup |
75 |
-} |
76 |
- |
77 |
-all_ruby_prepare() { |
78 |
- eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch |
79 |
- eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch |
80 |
- |
81 |
- # Change these with sed instead of a patch so that we can easily use |
82 |
- # the toolchain-funcs methods. |
83 |
- sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \ |
84 |
- -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \ |
85 |
- -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die |
86 |
- |
87 |
- # Avoid fixed debugging CFLAGs. |
88 |
- sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die |
89 |
- |
90 |
- # Use sed here so that we can dynamically set the documentation directory. |
91 |
- sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \ |
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 |
- # Make sure apache support is not attempted with -apache2 |
111 |
- if ! use apache2 ; then |
112 |
- sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die |
113 |
- fi |
114 |
-} |
115 |
- |
116 |
-all_ruby_compile() { |
117 |
- if use apache2 ; then |
118 |
- V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ |
119 |
- APXS2="${APXS}" \ |
120 |
- HTTPD="${APACHE_BIN}" \ |
121 |
- FS_LIBDIR='/usr/'$(get_libdir) \ |
122 |
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ |
123 |
- ruby -S rake apache2 || die "rake failed" |
124 |
- fi |
125 |
-} |
126 |
- |
127 |
-each_ruby_compile() { |
128 |
- append-flags -fno-strict-aliasing |
129 |
- |
130 |
- V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ |
131 |
- APXS2="${APXS}" \ |
132 |
- HTTPD="${APACHE_BIN}" \ |
133 |
- FS_LIBDIR='/usr/'$(get_libdir) \ |
134 |
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ |
135 |
- ${RUBY} -S rake native_support || die "rake failed" |
136 |
-} |
137 |
- |
138 |
-all_ruby_install() { |
139 |
- if use apache2 ; then |
140 |
- APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so" |
141 |
- apache-module_src_install |
142 |
- |
143 |
- # Patch in the correct libdir |
144 |
- sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die |
145 |
- fi |
146 |
- |
147 |
- dodoc CHANGELOG README.md |
148 |
-} |
149 |
- |
150 |
-each_ruby_install() { |
151 |
- DISTDIR="${D}" \ |
152 |
- RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \ |
153 |
- RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \ |
154 |
- APXS2="${APXS}" \ |
155 |
- HTTPD="${APACHE_BIN}" \ |
156 |
- FS_LIBDIR='/usr/'$(get_libdir) \ |
157 |
- EXTRA_LDFLAGS="${LDFLAGS}" \ |
158 |
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ |
159 |
- ${RUBY} -S rake fakeroot || die "rake failed" |
160 |
-} |
161 |
|
162 |
diff --git a/www-apache/passenger/passenger-6.0.5.ebuild b/www-apache/passenger/passenger-6.0.5.ebuild |
163 |
deleted file mode 100644 |
164 |
index 39e9be599ea..00000000000 |
165 |
--- a/www-apache/passenger/passenger-6.0.5.ebuild |
166 |
+++ /dev/null |
167 |
@@ -1,130 +0,0 @@ |
168 |
-# Copyright 1999-2020 Gentoo Authors |
169 |
-# Distributed under the terms of the GNU General Public License v2 |
170 |
- |
171 |
-EAPI=6 |
172 |
-USE_RUBY="ruby24 ruby25 ruby26 ruby27" |
173 |
- |
174 |
-inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs |
175 |
- |
176 |
-DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze" |
177 |
-HOMEPAGE="https://www.phusionpassenger.com/" |
178 |
-SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz" |
179 |
- |
180 |
-LICENSE="GPL-2" |
181 |
-SLOT="0" |
182 |
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
183 |
-IUSE="apache2 debug" |
184 |
- |
185 |
-ruby_add_bdepend "dev-ruby/rake" |
186 |
- |
187 |
-ruby_add_rdepend " |
188 |
- >=dev-ruby/rack-1.0.0:* |
189 |
- >=dev-ruby/rake-0.8.1" |
190 |
- |
191 |
-# libev is bundled but with adapations that do not seem to be accepted |
192 |
-# upstream, so we must use the bundled version :-( |
193 |
-CDEPEND=" |
194 |
- >=dev-libs/libuv-1.8.0 |
195 |
- net-misc/curl[ssl] |
196 |
- apache2? ( www-servers/apache[apache2_modules_unixd(+)] )" |
197 |
- |
198 |
-RDEPEND="${RDEPEND} ${CDEPEND}" |
199 |
-DEPEND="${DEPEND} ${CDEPEND}" |
200 |
- |
201 |
-APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}" |
202 |
-APACHE2_MOD_DEFINE="PASSENGER" |
203 |
- |
204 |
-want_apache2 |
205 |
- |
206 |
-pkg_setup() { |
207 |
- use debug && append-flags -DPASSENGER_DEBUG |
208 |
- depend.apache_pkg_setup |
209 |
-} |
210 |
- |
211 |
-all_ruby_prepare() { |
212 |
- eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch |
213 |
- eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch |
214 |
- |
215 |
- # Change these with sed instead of a patch so that we can easily use |
216 |
- # the toolchain-funcs methods. |
217 |
- sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \ |
218 |
- -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \ |
219 |
- -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die |
220 |
- |
221 |
- # Avoid fixed debugging CFLAGs. |
222 |
- sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die |
223 |
- |
224 |
- # Use sed here so that we can dynamically set the documentation directory. |
225 |
- sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \ |
226 |
- -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \ |
227 |
- src/ruby_supportlib/phusion_passenger.rb || die |
228 |
- sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die |
229 |
- |
230 |
- # Don't install a tool that won't work in our setup. |
231 |
- sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die |
232 |
- rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script." |
233 |
- |
234 |
- # Make sure we use the system-provided version where possible |
235 |
- rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code." |
236 |
- |
237 |
- # Avoid building documentation to avoid a dependency on mizuho. |
238 |
- #sed -i -e 's/, :doc//' build/packaging.rb || die |
239 |
- touch doc/*.html || die |
240 |
- |
241 |
- # Fix hard-coded use of AR |
242 |
- sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die |
243 |
- |
244 |
- # Make sure apache support is not attempted with -apache2 |
245 |
- if ! use apache2 ; then |
246 |
- sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die |
247 |
- fi |
248 |
-} |
249 |
- |
250 |
-all_ruby_compile() { |
251 |
- if use apache2 ; then |
252 |
- V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ |
253 |
- APXS2="${APXS}" \ |
254 |
- HTTPD="${APACHE_BIN}" \ |
255 |
- FS_LIBDIR='/usr/'$(get_libdir) \ |
256 |
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ |
257 |
- RANLIB=$(tc-getRANLIB) \ |
258 |
- ruby -S rake apache2 || die "rake failed" |
259 |
- fi |
260 |
-} |
261 |
- |
262 |
-each_ruby_compile() { |
263 |
- append-flags -fno-strict-aliasing |
264 |
- |
265 |
- V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ |
266 |
- APXS2="${APXS}" \ |
267 |
- HTTPD="${APACHE_BIN}" \ |
268 |
- FS_LIBDIR='/usr/'$(get_libdir) \ |
269 |
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ |
270 |
- RANLIB=$(tc-getRANLIB) \ |
271 |
- ${RUBY} -S rake native_support || die "rake failed" |
272 |
-} |
273 |
- |
274 |
-all_ruby_install() { |
275 |
- if use apache2 ; then |
276 |
- APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so" |
277 |
- apache-module_src_install |
278 |
- |
279 |
- # Patch in the correct libdir |
280 |
- sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die |
281 |
- fi |
282 |
- |
283 |
- dodoc CHANGELOG README.md |
284 |
-} |
285 |
- |
286 |
-each_ruby_install() { |
287 |
- DISTDIR="${D}" \ |
288 |
- RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \ |
289 |
- RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \ |
290 |
- APXS2="${APXS}" \ |
291 |
- HTTPD="${APACHE_BIN}" \ |
292 |
- FS_LIBDIR='/usr/'$(get_libdir) \ |
293 |
- EXTRA_LDFLAGS="${LDFLAGS}" \ |
294 |
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ |
295 |
- RANLIB=$(tc-getRANLIB) \ |
296 |
- ${RUBY} -S rake fakeroot || die "rake failed" |
297 |
-} |