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, 16 Jul 2021 06:43:43
Message-Id: 1626417816.7c035d50e2cb3465edb48d94c129d0390fe01ded.graaff@gentoo
1 commit: 7c035d50e2cb3465edb48d94c129d0390fe01ded
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 16 06:23:08 2021 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 16 06:43:36 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c035d50
7
8 www-apache/passenger: cleanup
9
10 Package-Manager: Portage-3.0.20, 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.6.ebuild | 130 ----------------------------
15 2 files changed, 131 deletions(-)
16
17 diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
18 index 5f9086aee16..d873677eade 100644
19 --- a/www-apache/passenger/Manifest
20 +++ b/www-apache/passenger/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST passenger-6.0.6.tar.gz 7347506 BLAKE2B 16332ca5c299c366c891eef0267889d024417bacafafb9b6faed94434f16a3823fd21e9251eeefe190a682e8530b49cde4af22008b1537466ee3d685554dcbac SHA512 57a013dbbddab13862c2d5445d048aafdc5a56297c56d3d642a39fe7757d3bcbd7e9e21aca36ebeb0f54a03d26e0886031a947cb098026a516900cc5bff42f0c
23 DIST passenger-6.0.8.tar.gz 7567855 BLAKE2B ea8577c07a57eaea4e3b2b236808c9e54badb35368e948132af04220026b2676a71d066625a64cd98ce35118ae613bcbca8a0a1f8e0bc2a8d321c1165dec72f5 SHA512 ad35bee4a1c855b8f5401ab44e2a9b0cf3281e7fb1d8e09c8b12c54a465545d43285301c7d0fe16914e3c0fd5407d0d5cef31bb296f850d787903e6e006b368f
24 DIST passenger-6.0.9.tar.gz 8180342 BLAKE2B 41bdfe06fe3dd94cbcbe44b8a9e2945447662a00b082c94d84196c13ec597c8aa6f5b34ff7855d06a983a27673c6e5c65426dfee20bcd601cea03cc2035a9da0 SHA512 fbb7a5a9e222672ea2db13f92de0710b84cde530d67633ad31265a1e34bf8a79f006a9db35eec45200d61c1084f0846275a06b55c717cf35ccdc7a8e878d37b4
25
26 diff --git a/www-apache/passenger/passenger-6.0.6.ebuild b/www-apache/passenger/passenger-6.0.6.ebuild
27 deleted file mode 100644
28 index 66e88d82455..00000000000
29 --- a/www-apache/passenger/passenger-6.0.6.ebuild
30 +++ /dev/null
31 @@ -1,130 +0,0 @@
32 -# Copyright 1999-2020 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -USE_RUBY="ruby25 ruby26 ruby27"
37 -
38 -inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
39 -
40 -DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
41 -HOMEPAGE="https://www.phusionpassenger.com/"
42 -SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
43 -
44 -LICENSE="GPL-2"
45 -SLOT="0"
46 -KEYWORDS="amd64 ~ppc ~ppc64 x86"
47 -IUSE="apache2 debug"
48 -
49 -ruby_add_bdepend "dev-ruby/rake"
50 -
51 -ruby_add_rdepend "
52 - >=dev-ruby/rack-1.0.0:*
53 - >=dev-ruby/rake-0.8.1"
54 -
55 -# libev is bundled but with adapations that do not seem to be accepted
56 -# upstream, so we must use the bundled version :-(
57 -CDEPEND="
58 - >=dev-libs/libuv-1.8.0
59 - net-misc/curl[ssl]
60 - apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
61 -
62 -RDEPEND="${RDEPEND} ${CDEPEND}"
63 -DEPEND="${DEPEND} ${CDEPEND}"
64 -
65 -APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
66 -APACHE2_MOD_DEFINE="PASSENGER"
67 -
68 -want_apache2
69 -
70 -pkg_setup() {
71 - use debug && append-flags -DPASSENGER_DEBUG
72 - depend.apache_pkg_setup
73 -}
74 -
75 -all_ruby_prepare() {
76 - eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
77 - eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch
78 -
79 - # Change these with sed instead of a patch so that we can easily use
80 - # the toolchain-funcs methods.
81 - sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
82 - -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
83 - -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
84 -
85 - # Avoid fixed debugging CFLAGs.
86 - sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
87 -
88 - # Use sed here so that we can dynamically set the documentation directory.
89 - sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
90 - -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
91 - src/ruby_supportlib/phusion_passenger.rb || die
92 - sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
93 -
94 - # Don't install a tool that won't work in our setup.
95 - sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
96 - rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
97 -
98 - # Make sure we use the system-provided version where possible
99 - rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
100 -
101 - # Avoid building documentation to avoid a dependency on mizuho.
102 - #sed -i -e 's/, :doc//' build/packaging.rb || die
103 - touch doc/*.html || die
104 -
105 - # Fix hard-coded use of AR
106 - sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
107 -
108 - # Make sure apache support is not attempted with -apache2
109 - if ! use apache2 ; then
110 - sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
111 - fi
112 -}
113 -
114 -all_ruby_compile() {
115 - if use apache2 ; then
116 - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
117 - APXS2="${APXS}" \
118 - HTTPD="${APACHE_BIN}" \
119 - FS_LIBDIR='/usr/'$(get_libdir) \
120 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
121 - RANLIB=$(tc-getRANLIB) \
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 - RANLIB=$(tc-getRANLIB) \
135 - ${RUBY} -S rake native_support || die "rake failed"
136 -}
137 -
138 -all_ruby_install() {
139 - if use apache2 ; then
140 - APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
141 - apache-module_src_install
142 -
143 - # Patch in the correct libdir
144 - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
145 - fi
146 -
147 - dodoc CHANGELOG README.md
148 -}
149 -
150 -each_ruby_install() {
151 - DISTDIR="${D}" \
152 - RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
153 - RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
154 - APXS2="${APXS}" \
155 - HTTPD="${APACHE_BIN}" \
156 - FS_LIBDIR='/usr/'$(get_libdir) \
157 - EXTRA_LDFLAGS="${LDFLAGS}" \
158 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
159 - RANLIB=$(tc-getRANLIB) \
160 - ${RUBY} -S rake fakeroot || die "rake failed"
161 -}