Gentoo Archives: gentoo-commits

From: "Hans de Graaff (graaff)" <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-apache/passenger: ChangeLog passenger-4.0.52.ebuild
Date: Tue, 30 Sep 2014 04:46:41
Message-Id: 20140930044638.306D568D0@oystercatcher.gentoo.org
1 graaff 14/09/30 04:46:38
2
3 Modified: ChangeLog
4 Added: passenger-4.0.52.ebuild
5 Log:
6 Version bump.
7
8 (Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
9
10 Revision Changes Path
11 1.101 www-apache/passenger/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?rev=1.101&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?rev=1.101&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?r1=1.100&r2=1.101
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v
20 retrieving revision 1.100
21 retrieving revision 1.101
22 diff -u -r1.100 -r1.101
23 --- ChangeLog 30 Sep 2014 04:30:00 -0000 1.100
24 +++ ChangeLog 30 Sep 2014 04:46:38 -0000 1.101
25 @@ -1,6 +1,11 @@
26 # ChangeLog for www-apache/passenger
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.100 2014/09/30 04:30:00 graaff Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.101 2014/09/30 04:46:38 graaff Exp $
30 +
31 +*passenger-4.0.52 (30 Sep 2014)
32 +
33 + 30 Sep 2014; Hans de Graaff <graaff@g.o> +passenger-4.0.52.ebuild:
34 + Version bump.
35
36 30 Sep 2014; Hans de Graaff <graaff@g.o> -passenger-4.0.42.ebuild,
37 -passenger-4.0.44.ebuild, -passenger-4.0.45.ebuild, -passenger-4.0.46.ebuild:
38
39
40
41 1.1 www-apache/passenger/passenger-4.0.52.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/passenger-4.0.52.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/passenger-4.0.52.ebuild?rev=1.1&content-type=text/plain
45
46 Index: passenger-4.0.52.ebuild
47 ===================================================================
48 # Copyright 1999-2014 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-4.0.52.ebuild,v 1.1 2014/09/30 04:46:38 graaff Exp $
51
52 EAPI=5
53 USE_RUBY="ruby19 ruby20 ruby21"
54
55 inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
56
57 DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze"
58 HOMEPAGE="http://modrails.com/"
59 SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
60
61 LICENSE="GPL-2"
62 SLOT="0"
63 KEYWORDS="~amd64 ~x86"
64 IUSE="debug"
65
66 ruby_add_bdepend "dev-ruby/rake"
67
68 ruby_add_rdepend "
69 >=dev-ruby/daemon_controller-1.2.0
70 >=dev-ruby/rack-1.0.0
71 >=dev-ruby/rake-0.8.1"
72
73 CDEPEND=">=dev-libs/libev-4.15 net-misc/curl[ssl]
74 www-servers/apache[apache2_modules_unixd(+)]"
75
76 RDEPEND="${RDEPEND} ${CDEPEND}"
77 DEPEND="${DEPEND} ${CDEPEND}"
78
79 APACHE2_MOD_CONF="30_mod_${PN}-4.0.0 30_mod_${PN}"
80 APACHE2_MOD_DEFINE="PASSENGER"
81
82 need_apache2
83
84 pkg_setup() {
85 use debug && append-flags -DPASSENGER_DEBUG
86 }
87
88 all_ruby_prepare() {
89 epatch "${FILESDIR}"/${PN}-4.0.49-gentoo.patch
90
91 # Change these with sed instead of a patch so that we can easily use
92 # the toolchain-funcs methods.
93 sed -i -e "s/gcc/$(tc-getCC)/" \
94 -e "s/g++/$(tc-getCXX)/" \
95 -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
96
97 # Avoid fixed debugging CFLAGs.
98 sed -e '/debugging_cflags/areturn ""' -i lib/phusion_passenger/platform_info/compiler.rb || die
99
100 # Use sed here so that we can dynamically set the documentation directory.
101 sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
102 -e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \
103 -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
104 lib/phusion_passenger.rb || die
105 sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" ext/common/ResourceLocator.h || die
106
107 # Don't install a tool that won't work in our setup.
108 sed -i -e '/passenger-install-apache2-module/d' lib/phusion_passenger/packaging.rb || die
109 rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
110
111 # Make sure we use the system-provided version.
112 rm -rf ext/libev || die "Unable to remove vendored libev."
113
114 # Avoid building documentation to avoid a dependency on mizuho.
115 #sed -i -e 's/, :doc//' build/packaging.rb || die
116 touch doc/*.html || die
117
118 # Use the correct arch-specific lib directory
119 sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' build/packaging.rb || die
120
121 # Fix hard-coded use of AR
122 sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/cplusplus_support.rb || die
123 }
124
125 all_ruby_compile() {
126 V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
127 APXS2="${APXS}" \
128 HTTPD="${APACHE_BIN}" \
129 USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
130 ruby -S rake apache2 || die "rake failed"
131 }
132
133 each_ruby_compile() {
134 append-flags -fno-strict-aliasing
135
136 V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
137 APXS2="${APXS}" \
138 HTTPD="${APACHE_BIN}" \
139 USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
140 ${RUBY} -S rake native_support || die "rake failed"
141 }
142
143 all_ruby_install() {
144 APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
145 apache-module_src_install
146
147 # Patch in the correct libdir
148 sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
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 EXTRA_LDFLAGS="${LDFLAGS}" \
158 USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
159 ${RUBY} -S rake fakeroot || die "rake failed"
160 }
161
162 pkg_postint() {
163 einfo "The apache module is compiled for the currently eselected ruby."
164 einfo" If you eselect another ruby you must recompile passenger as well."
165 }