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.37.ebuild
Date: Wed, 29 Jan 2014 07:13:01
Message-Id: 20140129071258.65A802004C@flycatcher.gentoo.org
1 graaff 14/01/29 07:12:58
2
3 Modified: ChangeLog
4 Added: passenger-4.0.37.ebuild
5 Log:
6 Version bump.
7
8 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
9
10 Revision Changes Path
11 1.85 www-apache/passenger/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?rev=1.85&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?rev=1.85&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?r1=1.84&r2=1.85
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v
20 retrieving revision 1.84
21 retrieving revision 1.85
22 diff -u -r1.84 -r1.85
23 --- ChangeLog 29 Jan 2014 06:57:38 -0000 1.84
24 +++ ChangeLog 29 Jan 2014 07:12:58 -0000 1.85
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.84 2014/01/29 06:57:38 graaff Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.85 2014/01/29 07:12:58 graaff Exp $
30 +
31 +*passenger-4.0.37 (29 Jan 2014)
32 +
33 + 29 Jan 2014; Hans de Graaff <graaff@g.o> +passenger-4.0.37.ebuild:
34 + Version bump.
35
36 29 Jan 2014; Hans de Graaff <graaff@g.o> -passenger-4.0.23.ebuild,
37 -passenger-4.0.27.ebuild, -passenger-4.0.29.ebuild:
38
39
40
41 1.1 www-apache/passenger/passenger-4.0.37.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/passenger-4.0.37.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/passenger-4.0.37.ebuild?rev=1.1&content-type=text/plain
45
46 Index: passenger-4.0.37.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.37.ebuild,v 1.1 2014/01/29 07:12:58 graaff Exp $
51
52 EAPI=5
53 USE_RUBY="ruby18 ruby19 ruby20"
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.1.0
70 >=dev-ruby/rack-1.0.0"
71
72 CDEPEND=">=dev-libs/libev-4.11 net-misc/curl[ssl]"
73
74 RDEPEND="${RDEPEND} ${CDEPEND}"
75 DEPEND="${DEPEND} ${CDEPEND}"
76
77 APACHE2_MOD_CONF="30_mod_${PN}-4.0.0 30_mod_${PN}"
78 APACHE2_MOD_DEFINE="PASSENGER"
79
80 need_apache2
81
82 pkg_setup() {
83 use debug && append-flags -DPASSENGER_DEBUG
84 }
85
86 all_ruby_prepare() {
87 epatch "${FILESDIR}"/${PN}-4.0.33-gentoo.patch
88
89 # Change these with sed instead of a patch so that we can easily use
90 # the toolchain-funcs methods.
91 sed -i -e "s/gcc/$(tc-getCC)/" \
92 -e "s/g++/$(tc-getCXX)/" \
93 -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
94
95 # Use sed here so that we can dynamically set the documentation directory.
96 sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
97 -e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \
98 -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
99 lib/phusion_passenger.rb || die
100 sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" ext/common/ResourceLocator.h || die
101
102 # Don't install a tool that won't work in our setup.
103 sed -i -e '/passenger-install-apache2-module/d' lib/phusion_passenger/packaging.rb || die
104 rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
105
106 # Make sure we use the system-provided version.
107 rm -rf ext/libev || die "Unable to remove vendored libev."
108
109 # Avoid building documentation to avoid a dependency on mizuho.
110 #sed -i -e 's/, :doc//' build/packaging.rb || die
111 touch doc/*.html || die
112
113 # Use the correct arch-specific lib directory
114 sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' build/packaging.rb || die
115
116 # Fix hard-coded use of AR
117 sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/cplusplus_support.rb || die
118 }
119
120 all_ruby_compile() {
121 V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
122 APXS2="${APXS}" \
123 HTTPD="${APACHE_BIN}" \
124 USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
125 ruby -S rake apache2 || die "rake failed"
126 }
127
128 each_ruby_compile() {
129 append-flags -fno-strict-aliasing
130
131 V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
132 APXS2="${APXS}" \
133 HTTPD="${APACHE_BIN}" \
134 USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
135 ${RUBY} -S rake native_support || die "rake failed"
136 }
137
138 all_ruby_install() {
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 }
145
146 each_ruby_install() {
147 DISTDIR="${D}" \
148 RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
149 RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
150 APXS2="${APXS}" \
151 HTTPD="${APACHE_BIN}" \
152 EXTRA_LDFLAGS="${LDFLAGS}" \
153 USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
154 ${RUBY} -S rake fakeroot || die "rake failed"
155 }
156
157 pkg_postint() {
158 einfo "The apache module is compiled for the currently eselected ruby."
159 einfo" If you eselect another ruby you must recompile passenger as well."
160 }