1 |
commit: 506b617c07e97e3c693beee77a82846f683a6cf2 |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Mar 4 06:12:30 2016 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 4 07:24:59 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=506b617c |
7 |
|
8 |
www-apache/passenger: cleanup |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
|
12 |
www-apache/passenger/Manifest | 2 - |
13 |
www-apache/passenger/passenger-5.0.22.ebuild | 118 --------------------------- |
14 |
www-apache/passenger/passenger-5.0.23.ebuild | 118 --------------------------- |
15 |
3 files changed, 238 deletions(-) |
16 |
|
17 |
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest |
18 |
index cb9f2f6..4f17b52 100644 |
19 |
--- a/www-apache/passenger/Manifest |
20 |
+++ b/www-apache/passenger/Manifest |
21 |
@@ -1,5 +1,3 @@ |
22 |
DIST passenger-4.0.60.tar.gz 5271049 SHA256 bbb8c18cc371441ce4ee9a4de4d124b6ec5e6af6e95a472b93a72d0357dc88fe SHA512 144df1e5e3dfbf9f9fa13d959c0324760b01c5e86b3f8e52c3d7d9c32eec916a35cc5c52a8c7a5ab9ed1ccee4d7efc9f77fc9940ad1515937a7bfe964753b219 WHIRLPOOL c8f3993b2745eb577c2eddbca2fd280e7db56adbeb4f72ba4b29770d95b991a8012243d1a9bd19aa59a28cfb9326117d649f70cf6d406a4e53acd1e40deb5b57 |
23 |
-DIST passenger-5.0.22.tar.gz 5412739 SHA256 0dfefb780ff134e6dd9352886f1086b980777adf27a98507ebfed648938b628f SHA512 9fe709d7d83d65e3f610cd0aacfa07122790d2b0797a5e807be129012254ded63d20b8e6cbe194e47bc7761af8fec67e884ed7f370d18baf06778e3035b0708b WHIRLPOOL 6348af6c8e434d1b64de024ddaf769000d9b6a7d33dc23c5d83d3bdb835f9ee78ca73ead764442f5e481949a28814fe6d2a77891240ebb7a0252c201695e50cb |
24 |
-DIST passenger-5.0.23.tar.gz 5413416 SHA256 c659fe84ce95635a8561dd5580455f94a431411a61493ab9aa447b881e23dacf SHA512 6d4b3a28c9b277285fa3dbde0ec99c159de5173873204c76a422b0e99e4035a36efe3e729c42d1b0c2198cc3cd8690d7098991af37cf1b0698f3a0ff7e1e288e WHIRLPOOL 322ef7f90df3d0ec6dca0e752539823aebbb9fdc1854322839bde8ebc436a82f652d24aabca4f7dad298879e943926052641f55e83da8fe0bb93aea71c2e1f53 |
25 |
DIST passenger-5.0.24.tar.gz 5415880 SHA256 06b9cdd18c1ef283628b753815ae1c6eaf764f212fd8d439d7035c9257288f79 SHA512 6b405881b7f9127f4bb093d7113e8ef6b4640ad33c27e1b1c5b860f2e2a5ec8bd4257c1d765a8a765712635c67e2e122cd6230b64186915facd98e14af5a3bce WHIRLPOOL 76382d058b8364d67821ab5839623a96587e4e07eb19452a2163c3c0402e64410f6b08797bd8177cbf826e59b41360383520aeed98a7baf003db715c0d7d2eca |
26 |
DIST passenger-5.0.25.tar.gz 5302902 SHA256 2a5531cd714a997a09a6105fbea8fb7dd27d168f7076a4db093842e2402c65ca SHA512 6bc7b34f08c4928c566a49d98289041c1663387556fe1e38b50dcad2fdd762fa12fd9afe48b9042942e5694cdd41e3d54f00d692d8eebd2948a406a9019c174d WHIRLPOOL 63ec49320d527f910ec410b3f47ef91e428d07d3c12cf5588445bc4b583992ad0bcf4e4d55a79dedea3711142d110d9c5c4f9b8ba1a7af4050418d6692200c30 |
27 |
|
28 |
diff --git a/www-apache/passenger/passenger-5.0.22.ebuild b/www-apache/passenger/passenger-5.0.22.ebuild |
29 |
deleted file mode 100644 |
30 |
index ea9cc4a..0000000 |
31 |
--- a/www-apache/passenger/passenger-5.0.22.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,118 +0,0 @@ |
34 |
-# Copyright 1999-2015 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
-# $Id$ |
37 |
- |
38 |
-EAPI=5 |
39 |
-USE_RUBY="ruby20 ruby21 ruby22" |
40 |
- |
41 |
-inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs |
42 |
- |
43 |
-DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze" |
44 |
-HOMEPAGE="http://modrails.com/" |
45 |
-SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz" |
46 |
- |
47 |
-LICENSE="GPL-2" |
48 |
-SLOT="0" |
49 |
-KEYWORDS="~amd64 ~x86" |
50 |
-IUSE="debug" |
51 |
- |
52 |
-ruby_add_bdepend "dev-ruby/rake" |
53 |
- |
54 |
-ruby_add_rdepend " |
55 |
- >=dev-ruby/rack-1.0.0:* |
56 |
- >=dev-ruby/rake-0.8.1" |
57 |
- |
58 |
-# libev is bundled but with adapations that do not seem to be accepted |
59 |
-# upstream, so we must use the bundled version :-( |
60 |
-CDEPEND=" |
61 |
- >=dev-libs/libuv-1.5.0 |
62 |
- net-misc/curl[ssl] |
63 |
- www-servers/apache[apache2_modules_unixd(+)]" |
64 |
- |
65 |
-RDEPEND="${RDEPEND} ${CDEPEND}" |
66 |
-DEPEND="${DEPEND} ${CDEPEND}" |
67 |
- |
68 |
-APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}" |
69 |
-APACHE2_MOD_DEFINE="PASSENGER" |
70 |
- |
71 |
-need_apache2 |
72 |
- |
73 |
-pkg_setup() { |
74 |
- use debug && append-flags -DPASSENGER_DEBUG |
75 |
-} |
76 |
- |
77 |
-all_ruby_prepare() { |
78 |
- epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.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/cplusplus_support.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.0.23.ebuild b/www-apache/passenger/passenger-5.0.23.ebuild |
154 |
deleted file mode 100644 |
155 |
index 709ed18..0000000 |
156 |
--- a/www-apache/passenger/passenger-5.0.23.ebuild |
157 |
+++ /dev/null |
158 |
@@ -1,118 +0,0 @@ |
159 |
-# Copyright 1999-2015 Gentoo Foundation |
160 |
-# Distributed under the terms of the GNU General Public License v2 |
161 |
-# $Id$ |
162 |
- |
163 |
-EAPI=5 |
164 |
-USE_RUBY="ruby20 ruby21 ruby22" |
165 |
- |
166 |
-inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs |
167 |
- |
168 |
-DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze" |
169 |
-HOMEPAGE="https://www.phusionpassenger.com/" |
170 |
-SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz" |
171 |
- |
172 |
-LICENSE="GPL-2" |
173 |
-SLOT="0" |
174 |
-KEYWORDS="~amd64 ~x86" |
175 |
-IUSE="debug" |
176 |
- |
177 |
-ruby_add_bdepend "dev-ruby/rake" |
178 |
- |
179 |
-ruby_add_rdepend " |
180 |
- >=dev-ruby/rack-1.0.0:* |
181 |
- >=dev-ruby/rake-0.8.1" |
182 |
- |
183 |
-# libev is bundled but with adapations that do not seem to be accepted |
184 |
-# upstream, so we must use the bundled version :-( |
185 |
-CDEPEND=" |
186 |
- >=dev-libs/libuv-1.5.0 |
187 |
- net-misc/curl[ssl] |
188 |
- www-servers/apache[apache2_modules_unixd(+)]" |
189 |
- |
190 |
-RDEPEND="${RDEPEND} ${CDEPEND}" |
191 |
-DEPEND="${DEPEND} ${CDEPEND}" |
192 |
- |
193 |
-APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}" |
194 |
-APACHE2_MOD_DEFINE="PASSENGER" |
195 |
- |
196 |
-need_apache2 |
197 |
- |
198 |
-pkg_setup() { |
199 |
- use debug && append-flags -DPASSENGER_DEBUG |
200 |
-} |
201 |
- |
202 |
-all_ruby_prepare() { |
203 |
- epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch |
204 |
- |
205 |
- # Change these with sed instead of a patch so that we can easily use |
206 |
- # the toolchain-funcs methods. |
207 |
- sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \ |
208 |
- -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \ |
209 |
- -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die |
210 |
- |
211 |
- # Avoid fixed debugging CFLAGs. |
212 |
- sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die |
213 |
- |
214 |
- # Use sed here so that we can dynamically set the documentation directory. |
215 |
- sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \ |
216 |
- -e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \ |
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/cplusplus_support.rb || die |
234 |
-} |
235 |
- |
236 |
-all_ruby_compile() { |
237 |
- V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ |
238 |
- APXS2="${APXS}" \ |
239 |
- HTTPD="${APACHE_BIN}" \ |
240 |
- FS_LIBDIR='/usr/'$(get_libdir) \ |
241 |
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ |
242 |
- ruby -S rake apache2 || die "rake failed" |
243 |
-} |
244 |
- |
245 |
-each_ruby_compile() { |
246 |
- append-flags -fno-strict-aliasing |
247 |
- |
248 |
- V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ |
249 |
- APXS2="${APXS}" \ |
250 |
- HTTPD="${APACHE_BIN}" \ |
251 |
- FS_LIBDIR='/usr/'$(get_libdir) \ |
252 |
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ |
253 |
- ${RUBY} -S rake native_support || die "rake failed" |
254 |
-} |
255 |
- |
256 |
-all_ruby_install() { |
257 |
- APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so" |
258 |
- apache-module_src_install |
259 |
- |
260 |
- # Patch in the correct libdir |
261 |
- sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die |
262 |
- |
263 |
- dodoc CHANGELOG README.md |
264 |
-} |
265 |
- |
266 |
-each_ruby_install() { |
267 |
- DISTDIR="${D}" \ |
268 |
- RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \ |
269 |
- RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \ |
270 |
- APXS2="${APXS}" \ |
271 |
- HTTPD="${APACHE_BIN}" \ |
272 |
- FS_LIBDIR='/usr/'$(get_libdir) \ |
273 |
- EXTRA_LDFLAGS="${LDFLAGS}" \ |
274 |
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ |
275 |
- ${RUBY} -S rake fakeroot || die "rake failed" |
276 |
-} |