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.17.ebuild
Date: Wed, 29 Aug 2012 05:47:30
Message-Id: 20120829054714.8F04820AED@flycatcher.gentoo.org
1 graaff 12/08/29 05:47:14
2
3 Modified: ChangeLog
4 Added: passenger-3.0.17.ebuild
5 Log:
6 Version bump.
7
8 (Portage version: 2.1.11.9/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.53 www-apache/passenger/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?rev=1.53&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?rev=1.53&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?r1=1.52&r2=1.53
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v
20 retrieving revision 1.52
21 retrieving revision 1.53
22 diff -u -r1.52 -r1.53
23 --- ChangeLog 7 Aug 2012 17:11:50 -0000 1.52
24 +++ ChangeLog 29 Aug 2012 05:47:14 -0000 1.53
25 @@ -1,6 +1,11 @@
26 # ChangeLog for www-apache/passenger
27 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.52 2012/08/07 17:11:50 graaff Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.53 2012/08/29 05:47:14 graaff Exp $
30 +
31 +*passenger-3.0.17 (29 Aug 2012)
32 +
33 + 29 Aug 2012; Hans de Graaff <graaff@g.o> +passenger-3.0.17.ebuild:
34 + Version bump.
35
36 07 Aug 2012; Hans de Graaff <graaff@g.o> passenger-3.0.14.ebuild:
37 Loosen apache depend to include apache 2.4 based on report in IRC from
38
39
40
41 1.1 www-apache/passenger/passenger-3.0.17.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/passenger-3.0.17.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/passenger-3.0.17.ebuild?rev=1.1&content-type=text/plain
45
46 Index: passenger-3.0.17.ebuild
47 ===================================================================
48 # Copyright 1999-2012 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.17.ebuild,v 1.1 2012/08/29 05:47:14 graaff Exp $
51
52 EAPI=4
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_rdepend "
67 >=dev-ruby/daemon_controller-1.0.0
68 >=dev-ruby/rack-1.0.0"
69
70 USE_RUBY="ruby18" ruby_add_rdepend ">=dev-ruby/fastthread-1.0.1"
71
72 CDEPEND=">=dev-libs/libev-3.90 net-misc/curl[ssl]"
73
74 RDEPEND="${RDEPEND} ${CDEPEND}"
75 DEPEND="${DEPEND} ${CDEPEND}
76 doc? ( >=app-text/asciidoc-8.6.5[highlight] )"
77
78 APACHE2_MOD_CONF="30_mod_${PN}-2.0.1 30_mod_${PN}"
79 APACHE2_MOD_DEFINE="PASSENGER"
80
81 REQUIRED_USE+=" ruby_targets_ruby18? ( !ruby_targets_ruby19 )
82 ruby_targets_ruby19? ( !ruby_targets_ruby18 )"
83
84 need_apache2
85
86 pkg_setup() {
87 use debug && append-flags -DPASSENGER_DEBUG
88 }
89
90 all_ruby_prepare() {
91 epatch "${FILESDIR}"/${PN}-3.0.8-gentoo.patch
92 epatch "${FILESDIR}"/${PN}-3.0.12-ldflags.patch
93
94 # Change these with sed instead of a patch so that we can easily use
95 # the toolchain-funcs methods.
96 sed -i -e "s/gcc/$(tc-getCC)/" -e "s/g++/$(tc-getCXX)/" build/config.rb || die
97
98 # Use sed here so that we can dynamically set the documentation directory.
99 sed -i -e "s:/usr/share/doc/phusion-passenger:/usr/share/doc/${P}:" \
100 -e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \
101 -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
102 lib/phusion_passenger.rb || die
103 sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" ext/common/ResourceLocator.h || die
104
105 # Don't install a tool that won't work in our setup.
106 sed -i -e '/passenger-install-apache2-module/d' lib/phusion_passenger/packaging.rb || die
107 rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
108
109 # Make sure we use the system-provided version.
110 rm -rf ext/libev || die "Unable to remove vendored libev."
111
112 # fix automagic use of asciidoc, bug 413469
113 sed -i -e '/fakeroot/ s/+ Packaging::ASCII_DOCS//' build/packaging.rb || die
114 }
115
116 each_ruby_compile() {
117 append-flags -fno-strict-aliasing
118
119 APXS2="${APXS}" \
120 HTTPD="${APACHE_BIN}" \
121 USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
122 rake apache2 native_support || die "rake failed"
123
124 if use doc; then
125 rake doc || die "rake doc failed"
126 fi
127 }
128
129 each_ruby_install() {
130 DISTDIR="${D}" \
131 APXS2="${APXS}" \
132 HTTPD="${APACHE_BIN}" \
133 USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
134 rake fakeroot || die "rake failed"
135
136 # TODO: this will create a mess when multiple RUBY_TARGETS have been
137 # selected.
138 APACHE2_MOD_FILE="${S}/ext/apache2/mod_${PN}.so"
139 apache-module_src_install
140 }