Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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