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, 03 Nov 2019 09:28:17
Message-Id: 1572773285.bad0f1baf198307e9628aa3a6752acad812fb951.graaff@gentoo
1 commit: bad0f1baf198307e9628aa3a6752acad812fb951
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 3 08:43:55 2019 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 3 09:28:05 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bad0f1ba
7
8 www-apache/passenger: cleanup
9
10 Package-Manager: Portage-2.3.76, Repoman-2.3.16
11 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
12
13 www-apache/passenger/Manifest | 1 -
14 www-apache/passenger/passenger-5.3.7.ebuild | 127 ----------------------------
15 2 files changed, 128 deletions(-)
16
17 diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
18 index 9bf2dd08888..61156b724b5 100644
19 --- a/www-apache/passenger/Manifest
20 +++ b/www-apache/passenger/Manifest
21 @@ -1,4 +1,3 @@
22 -DIST passenger-5.3.7.tar.gz 7195477 BLAKE2B 43a2384574316f6c8472f326389e8c1feed769e78d66c20e63f6d2679b1ac1b20a9122612c98e3006520e6f24c5883addd93ef11e8f0385759ee0c9e9299b7ad SHA512 bbef4881e0e0c698b29b10ff8a7afbc001c31d14fb80ffa27ed6867a92ad23712319733e6162be1f7720ebda421630af2f258f8167fa73c7b5ea594bc8247158
23 DIST passenger-6.0.2.tar.gz 7204982 BLAKE2B 056f85f88e49ca7dcfe37d1d1003beaa5325259a130b44aa60a319d36987c901b0a8a188998d38b68f3d396a71df0db8b8fc9562e58327b61a712dc39fb7ce1e SHA512 05a1c598588ad96864ef81ff8bc45535b3cb35c0f4840f16b93d39c0ece94378e806d967190a3d69b28b37d463624955bb45970459cf8febb258d8fd135e97f2
24 DIST passenger-6.0.3.tar.gz 7347651 BLAKE2B 8f4b95d5f80cae2be05a57a5f125cc37241c9c4e0308ee09ec5b830a7ab5a3055408f043934f21723ac0d247f4d6d11c0f001b964c673efa791d1571aad75357 SHA512 0421255dbaa3992dea9d965ceec9fc9ffb3cf7d1a15f3f9837638e94bc3145e2e8eadeef94069cb8d9d759adeda308d92031f88cfc475b3b13c10b5088087a56
25 DIST passenger-6.0.4.tar.gz 7347803 BLAKE2B 2e367b8dd0ace6a2773de92b3237821625190f2ae52fd11a1a3c47230d24affe1f9d161ef0346210cc91a21ae3a58f40f796063796399da0d133d6b0a261f52c SHA512 dd3398bece50c9da6029a5a9d98de2bed2e33a92f49fc776fe2b8f80f4a47e36d8a716c12f2f74d9611de5aa04981ddf680fc29a37f5b1860731a6f6e8390c81
26
27 diff --git a/www-apache/passenger/passenger-5.3.7.ebuild b/www-apache/passenger/passenger-5.3.7.ebuild
28 deleted file mode 100644
29 index a73ad98d905..00000000000
30 --- a/www-apache/passenger/passenger-5.3.7.ebuild
31 +++ /dev/null
32 @@ -1,127 +0,0 @@
33 -# Copyright 1999-2019 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -USE_RUBY="ruby23 ruby24 ruby25"
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 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 - 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 - ${RUBY} -S rake native_support || die "rake failed"
135 -}
136 -
137 -all_ruby_install() {
138 - if use apache2 ; then
139 - APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
140 - apache-module_src_install
141 -
142 - # Patch in the correct libdir
143 - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
144 - fi
145 -
146 - dodoc CHANGELOG README.md
147 -}
148 -
149 -each_ruby_install() {
150 - DISTDIR="${D}" \
151 - RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
152 - RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
153 - APXS2="${APXS}" \
154 - HTTPD="${APACHE_BIN}" \
155 - FS_LIBDIR='/usr/'$(get_libdir) \
156 - EXTRA_LDFLAGS="${LDFLAGS}" \
157 - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
158 - ${RUBY} -S rake fakeroot || die "rake failed"
159 -}