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.0-r1.ebuild
Date: Sun, 07 Nov 2010 13:28:09
Message-Id: 20101107132804.7053920051@flycatcher.gentoo.org
1 graaff 10/11/07 13:28:04
2
3 Modified: ChangeLog
4 Added: passenger-3.0.0-r1.ebuild
5 Log:
6 Respect LDFLAGS. Install executables in /usr/lib/exec, not /usr/lib.
7 (Portage version: 2.1.8.3/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.29 www-apache/passenger/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?rev=1.29&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?rev=1.29&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?r1=1.28&r2=1.29
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v
19 retrieving revision 1.28
20 retrieving revision 1.29
21 diff -u -r1.28 -r1.29
22 --- ChangeLog 6 Nov 2010 11:08:26 -0000 1.28
23 +++ ChangeLog 7 Nov 2010 13:28:04 -0000 1.29
24 @@ -1,6 +1,12 @@
25 # ChangeLog for www-apache/passenger
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.28 2010/11/06 11:08:26 graaff Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.29 2010/11/07 13:28:04 graaff Exp $
29 +
30 +*passenger-3.0.0-r1 (07 Nov 2010)
31 +
32 + 07 Nov 2010; Hans de Graaff <graaff@g.o>
33 + +passenger-3.0.0-r1.ebuild, +files/passenger-3.0.0-ldflags.patch:
34 + Respect LDFLAGS. Install executables in /usr/lib/exec, not /usr/lib.
35
36 *passenger-2.2.15-r1 (06 Nov 2010)
37
38
39
40
41 1.1 www-apache/passenger/passenger-3.0.0-r1.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/passenger-3.0.0-r1.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/passenger-3.0.0-r1.ebuild?rev=1.1&content-type=text/plain
45
46 Index: passenger-3.0.0-r1.ebuild
47 ===================================================================
48 # Copyright 1999-2010 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.0-r1.ebuild,v 1.1 2010/11/07 13:28:04 graaff Exp $
51
52 EAPI=2
53 USE_RUBY="ruby18"
54
55 inherit apache-module flag-o-matic ruby-ng
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/fastthread-1.0.1
68 >=dev-ruby/rack-1.0.0"
69
70 RDEPEND="${RDEPEND} >=dev-libs/libev-3.90"
71 DEPEND="${DEPEND}
72 >=dev-libs/libev-3.90
73 doc? ( app-text/asciidoc )"
74
75 ruby_add_rdepend ">=dev-ruby/daemon_controller-0.2.5 dev-ruby/file-tail"
76
77 APACHE2_MOD_CONF="30_mod_${PN}-2.0.1 30_mod_${PN}"
78 APACHE2_MOD_DEFINE="PASSENGER"
79
80 need_apache2_2
81
82 pkg_setup() {
83 use debug && append-flags -DPASSENGER_DEBUG
84 }
85
86 all_ruby_prepare() {
87 epatch "${FILESDIR}"/${P}-gentoo.patch
88 epatch "${FILESDIR}"/${P}-ldflags.patch
89
90 # Use sed here so that we can dynamically set the documentation directory.
91 sed -i -e "s:/usr/share/doc/phusion-passenger:/usr/share/doc/${P}:" \
92 -e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \
93 -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
94 lib/phusion_passenger.rb || die
95 sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" ext/common/ResourceLocator.h || die
96
97 # Don't install a tool that won't work in our setup.
98 sed -i -e '/passenger-install-apache2-module/d' lib/phusion_passenger/packaging.rb || die
99 rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
100
101 # Make sure we use the system-provided version.
102 rm -rf ext/libev || die "Unable to remove vendored libev."
103 }
104
105 each_ruby_compile() {
106 append-flags -fno-strict-aliasing
107
108 APXS2="${APXS}" \
109 HTTPD="${APACHE_BIN}" \
110 USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
111 rake apache2 native_support || die "rake failed"
112
113 if use doc; then
114 rake doc || die "rake doc failed"
115 fi
116 }
117
118 each_ruby_install() {
119 DISTDIR="${D}" \
120 APXS2="${APXS}" \
121 HTTPD="${APACHE_BIN}" \
122 USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
123 rake fakeroot || die "rake failed"
124
125 # TODO: this will create a mess when multiple RUBY_TARGETS have been
126 # selected.
127 APACHE2_MOD_FILE="${S}/ext/apache2/mod_${PN}.so"
128 apache-module_src_install
129 }