1 |
commit: c7bc93d7eeb3fafcda15a0df768dd0dac73c577a |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 4 08:23:43 2021 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 4 08:23:43 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7bc93d7 |
7 |
|
8 |
www-apache/passenger: cleanup |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
11 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
12 |
|
13 |
www-apache/passenger/Manifest | 1 - |
14 |
www-apache/passenger/passenger-6.0.7.ebuild | 130 ---------------------------- |
15 |
2 files changed, 131 deletions(-) |
16 |
|
17 |
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest |
18 |
index ef48a7a6a76..5f9086aee16 100644 |
19 |
--- a/www-apache/passenger/Manifest |
20 |
+++ b/www-apache/passenger/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
DIST passenger-6.0.6.tar.gz 7347506 BLAKE2B 16332ca5c299c366c891eef0267889d024417bacafafb9b6faed94434f16a3823fd21e9251eeefe190a682e8530b49cde4af22008b1537466ee3d685554dcbac SHA512 57a013dbbddab13862c2d5445d048aafdc5a56297c56d3d642a39fe7757d3bcbd7e9e21aca36ebeb0f54a03d26e0886031a947cb098026a516900cc5bff42f0c |
23 |
-DIST passenger-6.0.7.tar.gz 7352163 BLAKE2B e002f03f761cfd1b2a79f3d518fe25fb1ead4f0431042b6bfe2ecf1b9900e6405abb4d67f9750302149f1d99990d2b42bc0fb1c855168b7003ac37eec3297b8f SHA512 6019a93ac500333098cee772b5240f6cbf3a75a8d7cdd2bccac58c28369dddca574dc7e1c239a8f21b863df4825e758bb5eae84b316842168dc875116a07bfca |
24 |
DIST passenger-6.0.8.tar.gz 7567855 BLAKE2B ea8577c07a57eaea4e3b2b236808c9e54badb35368e948132af04220026b2676a71d066625a64cd98ce35118ae613bcbca8a0a1f8e0bc2a8d321c1165dec72f5 SHA512 ad35bee4a1c855b8f5401ab44e2a9b0cf3281e7fb1d8e09c8b12c54a465545d43285301c7d0fe16914e3c0fd5407d0d5cef31bb296f850d787903e6e006b368f |
25 |
DIST passenger-6.0.9.tar.gz 8180342 BLAKE2B 41bdfe06fe3dd94cbcbe44b8a9e2945447662a00b082c94d84196c13ec597c8aa6f5b34ff7855d06a983a27673c6e5c65426dfee20bcd601cea03cc2035a9da0 SHA512 fbb7a5a9e222672ea2db13f92de0710b84cde530d67633ad31265a1e34bf8a79f006a9db35eec45200d61c1084f0846275a06b55c717cf35ccdc7a8e878d37b4 |
26 |
|
27 |
diff --git a/www-apache/passenger/passenger-6.0.7.ebuild b/www-apache/passenger/passenger-6.0.7.ebuild |
28 |
deleted file mode 100644 |
29 |
index 70b99758160..00000000000 |
30 |
--- a/www-apache/passenger/passenger-6.0.7.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,130 +0,0 @@ |
33 |
-# Copyright 1999-2020 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=6 |
37 |
-USE_RUBY="ruby25 ruby26 ruby27" |
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 ~ppc ~ppc64 ~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 |
- eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch |
78 |
- eapply "${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 |
- RANLIB=$(tc-getRANLIB) \ |
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 |
- RANLIB=$(tc-getRANLIB) \ |
136 |
- ${RUBY} -S rake native_support || die "rake failed" |
137 |
-} |
138 |
- |
139 |
-all_ruby_install() { |
140 |
- if use apache2 ; then |
141 |
- APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so" |
142 |
- apache-module_src_install |
143 |
- |
144 |
- # Patch in the correct libdir |
145 |
- sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die |
146 |
- fi |
147 |
- |
148 |
- dodoc CHANGELOG README.md |
149 |
-} |
150 |
- |
151 |
-each_ruby_install() { |
152 |
- DISTDIR="${D}" \ |
153 |
- RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \ |
154 |
- RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \ |
155 |
- APXS2="${APXS}" \ |
156 |
- HTTPD="${APACHE_BIN}" \ |
157 |
- FS_LIBDIR='/usr/'$(get_libdir) \ |
158 |
- EXTRA_LDFLAGS="${LDFLAGS}" \ |
159 |
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ |
160 |
- RANLIB=$(tc-getRANLIB) \ |
161 |
- ${RUBY} -S rake fakeroot || die "rake failed" |
162 |
-} |