Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apache/passenger/
Date: Sun, 31 May 2020 08:09:30
Message-Id: 1590912531.d6bffc559d509eba4328ac52c1affd7cd345e603.graaff@gentoo
1 commit: d6bffc559d509eba4328ac52c1affd7cd345e603
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 31 06:47:06 2020 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Sun May 31 08:08:51 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6bffc55
7
8 www-apache/passenger: add 6.0.5
9
10 Explicitly pass RANLIB.
11
12 Closes: https://bugs.gentoo.org/726070
13 Package-Manager: Portage-2.3.99, Repoman-2.3.22
14 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
15
16 www-apache/passenger/Manifest | 1 +
17 www-apache/passenger/passenger-6.0.5.ebuild | 130 ++++++++++++++++++++++++++++
18 2 files changed, 131 insertions(+)
19
20 diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
21 index d1af92c0346..ec0e8dd7a65 100644
22 --- a/www-apache/passenger/Manifest
23 +++ b/www-apache/passenger/Manifest
24 @@ -1,2 +1,3 @@
25 DIST passenger-6.0.2.tar.gz 7204982 BLAKE2B 056f85f88e49ca7dcfe37d1d1003beaa5325259a130b44aa60a319d36987c901b0a8a188998d38b68f3d396a71df0db8b8fc9562e58327b61a712dc39fb7ce1e SHA512 05a1c598588ad96864ef81ff8bc45535b3cb35c0f4840f16b93d39c0ece94378e806d967190a3d69b28b37d463624955bb45970459cf8febb258d8fd135e97f2
26 DIST passenger-6.0.4.tar.gz 7347803 BLAKE2B 2e367b8dd0ace6a2773de92b3237821625190f2ae52fd11a1a3c47230d24affe1f9d161ef0346210cc91a21ae3a58f40f796063796399da0d133d6b0a261f52c SHA512 dd3398bece50c9da6029a5a9d98de2bed2e33a92f49fc776fe2b8f80f4a47e36d8a716c12f2f74d9611de5aa04981ddf680fc29a37f5b1860731a6f6e8390c81
27 +DIST passenger-6.0.5.tar.gz 7347149 BLAKE2B c2a1cb74a0c5d9ea7ea245b1c55413b8d212dc091bc7ad8727ca4cc4249cbc60e92c5313a5a1f8daf5dcea64485b27fbeeae9fada18727aed20dc38779d112ea SHA512 a6c174a52947f3985a0bbed20996e8386efdac6100a6c7ce9994bb6be7617bf810ac04821fae122e569e1883e8a8b1350cdccfa2b02053e5a4fbd13f891716e4
28
29 diff --git a/www-apache/passenger/passenger-6.0.5.ebuild b/www-apache/passenger/passenger-6.0.5.ebuild
30 new file mode 100644
31 index 00000000000..62621a5f00d
32 --- /dev/null
33 +++ b/www-apache/passenger/passenger-6.0.5.ebuild
34 @@ -0,0 +1,130 @@
35 +# Copyright 1999-2020 Gentoo Authors
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=6
39 +USE_RUBY="ruby24 ruby25 ruby26 ruby27"
40 +
41 +inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
42 +
43 +DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
44 +HOMEPAGE="https://www.phusionpassenger.com/"
45 +SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
46 +
47 +LICENSE="GPL-2"
48 +SLOT="0"
49 +KEYWORDS="~amd64 ~x86"
50 +IUSE="apache2 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.8.0
62 + net-misc/curl[ssl]
63 + apache2? ( 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 +want_apache2
72 +
73 +pkg_setup() {
74 + use debug && append-flags -DPASSENGER_DEBUG
75 + depend.apache_pkg_setup
76 +}
77 +
78 +all_ruby_prepare() {
79 + eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
80 + eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch
81 +
82 + # Change these with sed instead of a patch so that we can easily use
83 + # the toolchain-funcs methods.
84 + sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
85 + -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
86 + -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
87 +
88 + # Avoid fixed debugging CFLAGs.
89 + sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
90 +
91 + # Use sed here so that we can dynamically set the documentation directory.
92 + sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
93 + -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
94 + src/ruby_supportlib/phusion_passenger.rb || die
95 + sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
96 +
97 + # Don't install a tool that won't work in our setup.
98 + sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
99 + rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
100 +
101 + # Make sure we use the system-provided version where possible
102 + rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
103 +
104 + # Avoid building documentation to avoid a dependency on mizuho.
105 + #sed -i -e 's/, :doc//' build/packaging.rb || die
106 + touch doc/*.html || die
107 +
108 + # Fix hard-coded use of AR
109 + sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
110 +
111 + # Make sure apache support is not attempted with -apache2
112 + if ! use apache2 ; then
113 + sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
114 + fi
115 +}
116 +
117 +all_ruby_compile() {
118 + if use apache2 ; then
119 + V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
120 + APXS2="${APXS}" \
121 + HTTPD="${APACHE_BIN}" \
122 + FS_LIBDIR='/usr/'$(get_libdir) \
123 + USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
124 + RANLIB=$(tc-getRANLIB) \
125 + ruby -S rake apache2 || die "rake failed"
126 + fi
127 +}
128 +
129 +each_ruby_compile() {
130 + append-flags -fno-strict-aliasing
131 +
132 + V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
133 + APXS2="${APXS}" \
134 + HTTPD="${APACHE_BIN}" \
135 + FS_LIBDIR='/usr/'$(get_libdir) \
136 + USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
137 + RANLIB=$(tc-getRANLIB) \
138 + ${RUBY} -S rake native_support || die "rake failed"
139 +}
140 +
141 +all_ruby_install() {
142 + if use apache2 ; then
143 + APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
144 + apache-module_src_install
145 +
146 + # Patch in the correct libdir
147 + sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
148 + fi
149 +
150 + dodoc CHANGELOG README.md
151 +}
152 +
153 +each_ruby_install() {
154 + DISTDIR="${D}" \
155 + RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
156 + RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
157 + APXS2="${APXS}" \
158 + HTTPD="${APACHE_BIN}" \
159 + FS_LIBDIR='/usr/'$(get_libdir) \
160 + EXTRA_LDFLAGS="${LDFLAGS}" \
161 + USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
162 + RANLIB=$(tc-getRANLIB) \
163 + ${RUBY} -S rake fakeroot || die "rake failed"
164 +}