| 1 |
flameeyes 12/02/27 20:36:03 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: passenger-3.0.11-r1.ebuild |
| 5 |
Log: |
| 6 |
Revision bump to try supporting Ruby 1.9 _or_ Ruby 1.8. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.40 www-apache/passenger/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?rev=1.40&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?rev=1.40&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?r1=1.39&r2=1.40 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v |
| 20 |
retrieving revision 1.39 |
| 21 |
retrieving revision 1.40 |
| 22 |
diff -u -r1.39 -r1.40 |
| 23 |
--- ChangeLog 26 Dec 2011 11:51:00 -0000 1.39 |
| 24 |
+++ ChangeLog 27 Feb 2012 20:36:03 -0000 1.40 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for www-apache/passenger |
| 27 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.39 2011/12/26 11:51:00 graaff Exp $ |
| 29 |
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.40 2012/02/27 20:36:03 flameeyes Exp $ |
| 31 |
+ |
| 32 |
+*passenger-3.0.11-r1 (27 Feb 2012) |
| 33 |
+ |
| 34 |
+ 27 Feb 2012; Diego E. Pettenò <flameeyes@g.o> |
| 35 |
+ +passenger-3.0.11-r1.ebuild: |
| 36 |
+ Revision bump to try supporting Ruby 1.9 _or_ Ruby 1.8. |
| 37 |
|
| 38 |
*passenger-3.0.11 (26 Dec 2011) |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 www-apache/passenger/passenger-3.0.11-r1.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/passenger-3.0.11-r1.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/passenger-3.0.11-r1.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: passenger-3.0.11-r1.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2012 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-3.0.11-r1.ebuild,v 1.1 2012/02/27 20:36:03 flameeyes Exp $ |
| 53 |
|
| 54 |
EAPI=4 |
| 55 |
USE_RUBY="ruby18 ruby19" |
| 56 |
|
| 57 |
inherit apache-module flag-o-matic ruby-ng toolchain-funcs |
| 58 |
|
| 59 |
DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze" |
| 60 |
HOMEPAGE="http://modrails.com/" |
| 61 |
SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz" |
| 62 |
|
| 63 |
LICENSE="GPL-2" |
| 64 |
SLOT="0" |
| 65 |
KEYWORDS="~amd64 ~x86" |
| 66 |
IUSE="debug doc" |
| 67 |
|
| 68 |
ruby_add_rdepend " |
| 69 |
>=dev-ruby/daemon_controller-0.2.5 |
| 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_2 |
| 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.0-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 |
|
| 115 |
each_ruby_compile() { |
| 116 |
append-flags -fno-strict-aliasing |
| 117 |
|
| 118 |
APXS2="${APXS}" \ |
| 119 |
HTTPD="${APACHE_BIN}" \ |
| 120 |
USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \ |
| 121 |
rake apache2 native_support || die "rake failed" |
| 122 |
|
| 123 |
if use doc; then |
| 124 |
rake doc || die "rake doc failed" |
| 125 |
fi |
| 126 |
} |
| 127 |
|
| 128 |
each_ruby_install() { |
| 129 |
DISTDIR="${D}" \ |
| 130 |
APXS2="${APXS}" \ |
| 131 |
HTTPD="${APACHE_BIN}" \ |
| 132 |
USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \ |
| 133 |
rake fakeroot || die "rake failed" |
| 134 |
|
| 135 |
# TODO: this will create a mess when multiple RUBY_TARGETS have been |
| 136 |
# selected. |
| 137 |
APACHE2_MOD_FILE="${S}/ext/apache2/mod_${PN}.so" |
| 138 |
apache-module_src_install |
| 139 |
} |
Archives