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-3.0.21.ebuild
Date: Thu, 30 May 2013 06:07:52
Message-Id: 20130530060745.D96592171D@flycatcher.gentoo.org
1 graaff 13/05/30 06:07:45
2
3 Modified: ChangeLog
4 Added: passenger-3.0.21.ebuild
5 Log:
6 Version bump.
7
8 (Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
9
10 Revision Changes Path
11 1.64 www-apache/passenger/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?rev=1.64&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?rev=1.64&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?r1=1.63&r2=1.64
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v
20 retrieving revision 1.63
21 retrieving revision 1.64
22 diff -u -r1.63 -r1.64
23 --- ChangeLog 6 May 2013 17:04:07 -0000 1.63
24 +++ ChangeLog 30 May 2013 06:07:45 -0000 1.64
25 @@ -1,6 +1,11 @@
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.63 2013/05/06 17:04:07 graaff Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.64 2013/05/30 06:07:45 graaff Exp $
30 +
31 +*passenger-3.0.21 (30 May 2013)
32 +
33 + 30 May 2013; Hans de Graaff <graaff@g.o> +passenger-3.0.21.ebuild:
34 + Version bump.
35
36 06 May 2013; Hans de Graaff <graaff@g.o> -passenger-3.0.7.ebuild,
37 -passenger-3.0.18.ebuild:
38
39
40
41 1.1 www-apache/passenger/passenger-3.0.21.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/passenger-3.0.21.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/passenger-3.0.21.ebuild?rev=1.1&content-type=text/plain
45
46 Index: passenger-3.0.21.ebuild
47 ===================================================================
48 # Copyright 1999-2013 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-3.0.21.ebuild,v 1.1 2013/05/30 06:07:45 graaff Exp $
51
52 EAPI=5
53 USE_RUBY="ruby18 ruby19"
54
55 inherit apache-module flag-o-matic 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="mirror://rubyforge/${PN}/${P}.tar.gz"
60
61 LICENSE="GPL-2"
62 SLOT="0"
63 KEYWORDS="~amd64 ~x86"
64 IUSE="debug doc"
65
66 ruby_add_bdepend "dev-ruby/rake"
67
68 ruby_add_rdepend "
69 >=dev-ruby/daemon_controller-1.0.0
70 >=dev-ruby/rack-1.0.0"
71
72 USE_RUBY="ruby18" ruby_add_rdepend ">=dev-ruby/fastthread-1.0.1"
73
74 CDEPEND=">=dev-libs/libev-3.90 net-misc/curl[ssl]"
75
76 RDEPEND="${RDEPEND} ${CDEPEND}"
77 DEPEND="${DEPEND} ${CDEPEND}
78 doc? ( >=app-text/asciidoc-8.6.5[highlight] )"
79
80 APACHE2_MOD_CONF="30_mod_${PN}-2.0.1 30_mod_${PN}"
81 APACHE2_MOD_DEFINE="PASSENGER"
82
83 REQUIRED_USE+=" ruby_targets_ruby18? ( !ruby_targets_ruby19 )
84 ruby_targets_ruby19? ( !ruby_targets_ruby18 )"
85
86 need_apache2
87
88 pkg_setup() {
89 use debug && append-flags -DPASSENGER_DEBUG
90 }
91
92 all_ruby_prepare() {
93 epatch "${FILESDIR}"/${PN}-3.0.8-gentoo.patch
94 epatch "${FILESDIR}"/${PN}-3.0.12-ldflags.patch
95
96 # Change these with sed instead of a patch so that we can easily use
97 # the toolchain-funcs methods.
98 sed -i -e "s/gcc/$(tc-getCC)/" -e "s/g++/$(tc-getCXX)/" build/config.rb || die
99
100 # Use sed here so that we can dynamically set the documentation directory.
101 sed -i -e "s:/usr/share/doc/phusion-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 # fix automagic use of asciidoc, bug 413469
115 sed -i -e '/fakeroot/ s/+ Packaging::ASCII_DOCS//' build/packaging.rb || die
116 }
117
118 each_ruby_compile() {
119 append-flags -fno-strict-aliasing
120
121 APXS2="${APXS}" \
122 HTTPD="${APACHE_BIN}" \
123 USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
124 rake apache2 native_support || die "rake failed"
125
126 if use doc; then
127 rake doc || die "rake doc failed"
128 fi
129 }
130
131 each_ruby_install() {
132 DISTDIR="${D}" \
133 APXS2="${APXS}" \
134 HTTPD="${APACHE_BIN}" \
135 USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
136 rake fakeroot || die "rake failed"
137
138 # TODO: this will create a mess when multiple RUBY_TARGETS have been
139 # selected.
140 APACHE2_MOD_FILE="${S}/ext/apache2/mod_${PN}.so"
141 apache-module_src_install
142 }