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