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: Fri, 24 Nov 2017 06:21:30
Message-Id: 1511504463.42901a327664643487fdf466ab0eba7e2fe325a9.graaff@gentoo
1 commit: 42901a327664643487fdf466ab0eba7e2fe325a9
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 24 06:16:51 2017 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 24 06:21:03 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42901a32
7
8 www-apache/passenger: add 5.1.12
9
10 Package-Manager: Portage-2.3.13, Repoman-2.3.3
11
12 www-apache/passenger/Manifest | 9 +-
13 www-apache/passenger/passenger-5.1.12.ebuild | 127 +++++++++++++++++++++++++++
14 2 files changed, 132 insertions(+), 4 deletions(-)
15
16 diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
17 index 43d2eb2e672..ba1c65e256d 100644
18 --- a/www-apache/passenger/Manifest
19 +++ b/www-apache/passenger/Manifest
20 @@ -1,4 +1,5 @@
21 -DIST passenger-5.1.11.tar.gz 4243340 SHA256 26fc56b2f6d27ed58b948d9601a17a4f61e98fd16349bcb46f3ecebcac3177dd SHA512 7dce496916533f2fcd5cb5931d79308da8adda300a8b8603ce90b92645e69a1283d147976b5aa3408f86ccb71f9e5849bfb68e58a806a8a58529cadda557bccb WHIRLPOOL 071e3a0d1c23f1ac58f0ff93e48357f51aa538e9a76ae4fb115a3cb9ddb0a3eeb5dd6b2a8430bb76acc7cd4158be1d0fe4d640a2402d42a06a632fa87d84fa85
22 -DIST passenger-5.1.2.tar.gz 5646103 SHA256 7fb03a54650ef5e508895c9e45bc2d8151f6c4811ea6797e81f017fedddfdbab SHA512 88a77c749857a8538ea268f793d2708fa29b8891d2c3197577155f81cb66aa04919c25e713d4f00692051ad385eebaa94729cd30baa68edcf3d17c23bae0acdd WHIRLPOOL 8f115162e2a7c43af20cef1d689290c8a523cce10f617500eeb50ab6a226c203a404fc7ce53fd0e21e63276aa359c5d64b685318be36f79ce165ff598bac8766
23 -DIST passenger-5.1.6.tar.gz 5215694 SHA256 e897cc5f0ec6446bfdc226404dca4bd29f7418ae92010c389661b9f024a3cf24 SHA512 71d301d2501863951157f55df30ac89f6f9d98e79b554a5ca05ca9a306041ecd8cdc92056220cf6dc9ad02972a102bfc990e3b06f887d27496a8ecbd58e109fa WHIRLPOOL fe6872d0c11803fd0d8875002f37425edc54327709daaa56518ace0ef9f5046836592298ca80ce4929a29e6c0a0adcb237b57a19cd0d73ac096992e742e2a8b5
24 -DIST passenger-5.1.8.tar.gz 5234529 SHA256 fef10e4a34c3faa48306c21c0789ee4d4d56fc0e30205cc470a91b486b7a4a7d SHA512 5baf287e1f2a751409bba99671de2c41656033dc29132b2d964457405284105343fde4c2233c921d7e35794a47eedbf33e3840119a908741b1ed9e6fdc99ec2c WHIRLPOOL 6513b71aadddc9ec5ff4b4c617256a62f1c977b7d0f098982808851afc7703bd4ceed843cf309d07b239dbae97ed4beacaa2130a5dd325b17714df59f3b1f9ee
25 +DIST passenger-5.1.11.tar.gz 4243340 BLAKE2B 25c6cc0016c4078962466716f16a2d084d4e59528153bbe09dae70c4935941cabc456062e0004f7640074f163e53aa6f95e44fc7b99136292db5e3c9bb9fe554 SHA512 7dce496916533f2fcd5cb5931d79308da8adda300a8b8603ce90b92645e69a1283d147976b5aa3408f86ccb71f9e5849bfb68e58a806a8a58529cadda557bccb
26 +DIST passenger-5.1.12.tar.gz 4245993 BLAKE2B 4f5808bcb373a85fbe2e160d9bd993fdff32a78f5083f5b5ff38112a4d3ca906a18a241cef6744350c0f33ef357dfda7a2cd5af875223a082a19b4e99cba4aeb SHA512 7ecdf0be306a3c4b842c8497861dbc072fc87f5601840678fe1125b77d50e683003b49616397d39b34705c967f604f5193be173c52a9c5ab235ef4e6e43f2f4a
27 +DIST passenger-5.1.2.tar.gz 5646103 BLAKE2B 0ba891b91f80944d62b7d9a76ba88884a095ac491b36e93ead8c52d1883944f835f49d26934acd40b61cdb4abd5b53826193e2cf58c8e8a53b9ede16e05bea42 SHA512 88a77c749857a8538ea268f793d2708fa29b8891d2c3197577155f81cb66aa04919c25e713d4f00692051ad385eebaa94729cd30baa68edcf3d17c23bae0acdd
28 +DIST passenger-5.1.6.tar.gz 5215694 BLAKE2B 6a7408b5a2ec877a8689c5f3e7fe8b1b037446ac6bb7a3a4a4831bf2cb00d2fa3206e1acb52fda99d0383afa75354feaf0ff91c8ca210382c39f482ba86ba642 SHA512 71d301d2501863951157f55df30ac89f6f9d98e79b554a5ca05ca9a306041ecd8cdc92056220cf6dc9ad02972a102bfc990e3b06f887d27496a8ecbd58e109fa
29 +DIST passenger-5.1.8.tar.gz 5234529 BLAKE2B 07c68bd224e58c56c94937b3aca6442b9b41964cdae7d28da2d4b801f9a8320b6adfa5f0b3a28489e4bb1e2f8304af1313fb6e0c587d8b0ee3b97cb7d20122b1 SHA512 5baf287e1f2a751409bba99671de2c41656033dc29132b2d964457405284105343fde4c2233c921d7e35794a47eedbf33e3840119a908741b1ed9e6fdc99ec2c
30
31 diff --git a/www-apache/passenger/passenger-5.1.12.ebuild b/www-apache/passenger/passenger-5.1.12.ebuild
32 new file mode 100644
33 index 00000000000..8e51ddcea35
34 --- /dev/null
35 +++ b/www-apache/passenger/passenger-5.1.12.ebuild
36 @@ -0,0 +1,127 @@
37 +# Copyright 1999-2017 Gentoo Foundation
38 +# Distributed under the terms of the GNU General Public License v2
39 +
40 +EAPI=6
41 +USE_RUBY="ruby22 ruby23 ruby24"
42 +
43 +inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
44 +
45 +DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
46 +HOMEPAGE="https://www.phusionpassenger.com/"
47 +SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
48 +
49 +LICENSE="GPL-2"
50 +SLOT="0"
51 +KEYWORDS="~amd64 ~x86"
52 +IUSE="apache2 debug"
53 +
54 +ruby_add_bdepend "dev-ruby/rake"
55 +
56 +ruby_add_rdepend "
57 + >=dev-ruby/rack-1.0.0:*
58 + >=dev-ruby/rake-0.8.1"
59 +
60 +# libev is bundled but with adapations that do not seem to be accepted
61 +# upstream, so we must use the bundled version :-(
62 +CDEPEND="
63 + >=dev-libs/libuv-1.8.0
64 + net-misc/curl[ssl]
65 + apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
66 +
67 +RDEPEND="${RDEPEND} ${CDEPEND}"
68 +DEPEND="${DEPEND} ${CDEPEND}"
69 +
70 +APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
71 +APACHE2_MOD_DEFINE="PASSENGER"
72 +
73 +want_apache2
74 +
75 +pkg_setup() {
76 + use debug && append-flags -DPASSENGER_DEBUG
77 + depend.apache_pkg_setup
78 +}
79 +
80 +all_ruby_prepare() {
81 + epatch "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
82 + epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch
83 +
84 + # Change these with sed instead of a patch so that we can easily use
85 + # the toolchain-funcs methods.
86 + sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
87 + -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
88 + -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
89 +
90 + # Avoid fixed debugging CFLAGs.
91 + sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
92 +
93 + # Use sed here so that we can dynamically set the documentation directory.
94 + sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
95 + -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
96 + src/ruby_supportlib/phusion_passenger.rb || die
97 + sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
98 +
99 + # Don't install a tool that won't work in our setup.
100 + sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
101 + rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
102 +
103 + # Make sure we use the system-provided version where possible
104 + rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
105 +
106 + # Avoid building documentation to avoid a dependency on mizuho.
107 + #sed -i -e 's/, :doc//' build/packaging.rb || die
108 + touch doc/*.html || die
109 +
110 + # Fix hard-coded use of AR
111 + sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
112 +
113 + # Make sure apache support is not attempted with -apache2
114 + if ! use apache2 ; then
115 + sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
116 + fi
117 +}
118 +
119 +all_ruby_compile() {
120 + if use apache2 ; then
121 + V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
122 + APXS2="${APXS}" \
123 + HTTPD="${APACHE_BIN}" \
124 + FS_LIBDIR='/usr/'$(get_libdir) \
125 + USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
126 + ruby -S rake apache2 || die "rake failed"
127 + fi
128 +}
129 +
130 +each_ruby_compile() {
131 + append-flags -fno-strict-aliasing
132 +
133 + V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
134 + APXS2="${APXS}" \
135 + HTTPD="${APACHE_BIN}" \
136 + FS_LIBDIR='/usr/'$(get_libdir) \
137 + USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
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 + ${RUBY} -S rake fakeroot || die "rake failed"
163 +}