3 files changed, 96 insertions, 7 deletions
diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index b2bc68519e72..ccddc38ae460 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/passenger
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.30 2010/11/09 20:07:57 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.31 2011/01/08 09:54:02 graaff Exp $
+
+*passenger-3.0.2 (08 Jan 2011)
+
+  08 Jan 2011; Hans de Graaff <graaff@gentoo.org> +passenger-3.0.2.ebuild:
+  Version bump. Fixes bug 345593.
 
   09 Nov 2010; Markus Meier <maekke@gentoo.org> passenger-2.2.15.ebuild:
   amd64/x86 stable, bug #344239
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 326cdd600e56..3abce09ef873 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 2.2.15-gentoo-multilib-strict.patch 1278 RMD160 bf8c07afd51c60c744b0b362a52236b1c22c6d29 SHA1 5d9fb5b88379b5e634285c739606beebc620ee87 SHA256 dced348f25d2bb41dff59f51c1dd7a8b6771c81dd699a54170e3627bef12ddea
 AUX 2.2.4-gentoo.patch 1617 RMD160 bb019e88f04a8f04c9c0dfa6ef1d3f908fc5ffcc SHA1 b4bc124dcd2c537f65a39b9879ac35a0ec310d34 SHA256 d90394f0742131f32dc42a9619305b2712bed3967b78d56480447500d190b8ea
@@ -8,16 +8,18 @@ AUX passenger-3.0.0-gentoo.patch 1689 RMD160 3a510af572f07a947748c4024251a957fab
 AUX passenger-3.0.0-ldflags.patch 572 RMD160 dbbe8839ad0318ad2730350aa47a622577288ae6 SHA1 6ff3da382026b6fe0c7ff9b179fc21d6c4c5552b SHA256 22b7c85b2c3e0fb2c0275e0a63308cf65aa0ab2a1398c64b95ab149b8cb58392
 DIST passenger-2.2.15.tar.gz 2128473 RMD160 52d0eb505d6c19e45ccc0dac8d1e675aed505c14 SHA1 dbb2f3346061872a43efc554990d8993172c8ff9 SHA256 95a9f61070d268ecaa311539d8e28b348765ca0e1528665ef928fc4b4bcc1436
 DIST passenger-3.0.0.tar.gz 3048705 RMD160 c379346b625d6e6938f8e81c31d7f7524972a878 SHA1 c076de4d739345fa705f35024f51af0f71f408f7 SHA256 6e769fb3c294ad437057438e38982b14aff023c1f914ab281bfd23fcd8681a59
+DIST passenger-3.0.2.tar.gz 2969570 RMD160 a1ba4b78df9a653dd63bf7c4750f5fa1dd364444 SHA1 784e43eaff861b63e9a4fc09f65f0450142d537e SHA256 a1a665280a6559fe0fa6c92b74ae7e145ee23c30606967919faddb292cf00da8
 EBUILD passenger-2.2.15-r1.ebuild 1372 RMD160 7b31bf101d0914063e790a710f4945f3ae7794eb SHA1 7b755ee72a6a46fe38ed33c5b3262e64030d1fc7 SHA256 5de33fbcfc3ab8c09f885fa7a15669cc37b942f4df58b55fc831818ad6206a22
 EBUILD passenger-2.2.15.ebuild 1310 RMD160 de65bb9d8c9de2565db681ec0366d6e36189142d SHA1 f3271497fd03e28efbf56640fc7127004fa9e937 SHA256 adfb99efd637dd1f9f6b7d87c751f86de68048349cb602b6a137aecb7794f016
 EBUILD passenger-3.0.0-r1.ebuild 2491 RMD160 325d59515325d1ced40649b183b932e6ebbf0685 SHA1 e1e4e4c60a68b5a7dc3a1a7b2d38e3adfc5b1750 SHA256 f4e69aa7ef24cd58dbf682713a4dbbf3dc9f38aba0cc1d826b0a4fa078d53eaa
 EBUILD passenger-3.0.0.ebuild 2059 RMD160 5d958eaa6003315d1dc028fe5579b1d4b02b5878 SHA1 1a6e5aa3db1672a7907963f79be87d842ef0f670 SHA256 37819f89e32481a0153dcb39b218f87634c66c58f892eb22bfa9945930151941
-MISC ChangeLog 5777 RMD160 004484af0479ed9ff72a4f78d7a074dbd1bb2f03 SHA1 8a6d1ee09775a7eec41ea601b7adfe354c2482c2 SHA256 957d4872e153764522b5affaf84176e48d878d274b422a86a90ca0701f823cc4
+EBUILD passenger-3.0.2.ebuild 2502 RMD160 3021abaa27b066ca74fc74548ffa09600c533213 SHA1 2665b5640a6c6e62e6ba9399a08d502f191c9c43 SHA256 c8dc2c8d4df053ac262ce96efbcf0a47e64e6a68dcf9d76334a9a153f50bc630
+MISC ChangeLog 5919 RMD160 66d4f8aebd11202d965a48019d08b50fafc301ed SHA1 7a5cf1aa246d218512799b0a45866bbdabdb4167 SHA256 2f36702297940a5f4a14395be01564fa8588bf7d5e2c717ea2890093b133ceaf
 MISC metadata.xml 179 RMD160 046a67d39c9a5784800b120b3da44d67caa1f0af SHA1 31e15b20d55994a9989fff90a20847c1e76db2cb SHA256 d07e5a69f0aaee3b23884e0e414fad4aba70b9f4a115d2649714b8f1bd99d9fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzZqeQACgkQkKaRLQcq0GLiKACfaWZiOiGKeDsQuftwM6aIx6U5
-g8sAn0yJtXDFzCfFvXgnbWbIqB8yPbwK
-=b1BV
+iF4EAREIAAYFAk0oNEUACgkQrnu0mw69Jkr8wgD+KVU78t9I7JcFd/aEdj9uzNu1
+PafS8PfYoJPLG2az/+YA/jXsZ0CBnHhRLwswwVAQmdjUC/dFzwv41EmdrHrYluVV
+=HueI
 -----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/passenger-3.0.2.ebuild b/www-apache/passenger/passenger-3.0.2.ebuild
new file mode 100644
index 000000000000..67fefb32c03a
--- /dev/null
+++ b/www-apache/passenger/passenger-3.0.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-3.0.2.ebuild,v 1.1 2011/01/08 09:54:02 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18"
+
+inherit apache-module flag-o-matic ruby-ng
+
+DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze"
+HOMEPAGE="http://modrails.com/"
+SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc"
+
+ruby_add_rdepend "
+	>=dev-ruby/fastthread-1.0.1
+	>=dev-ruby/rack-1.0.0"
+
+RDEPEND="${RDEPEND} >=dev-libs/libev-3.90"
+DEPEND="${DEPEND}
+	>=dev-libs/libev-3.90
+	doc? ( app-text/asciidoc )"
+
+ruby_add_rdepend ">=dev-ruby/daemon_controller-0.2.5 dev-ruby/file-tail"
+
+APACHE2_MOD_CONF="30_mod_${PN}-2.0.1 30_mod_${PN}"
+APACHE2_MOD_DEFINE="PASSENGER"
+
+need_apache2_2
+
+pkg_setup() {
+	use debug && append-flags -DPASSENGER_DEBUG
+}
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0.0-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-3.0.0-ldflags.patch
+
+	# Use sed here so that we can dynamically set the documentation directory.
+	sed -i -e "s:/usr/share/doc/phusion-passenger:/usr/share/doc/${P}:" \
+		-e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \
+		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
+		lib/phusion_passenger.rb || die
+	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" ext/common/ResourceLocator.h || die
+
+	# Don't install a tool that won't work in our setup.
+	sed -i -e '/passenger-install-apache2-module/d' lib/phusion_passenger/packaging.rb || die
+	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
+
+	# Make sure we use the system-provided version.
+	rm -rf ext/libev || die "Unable to remove vendored libev."
+}
+
+each_ruby_compile() {
+	append-flags -fno-strict-aliasing
+
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
+	rake apache2 native_support || die "rake failed"
+
+	if use doc; then
+		rake doc || die "rake doc failed"
+	fi
+}
+
+each_ruby_install() {
+	DISTDIR="${D}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
+	rake fakeroot || die "rake failed"
+
+	# TODO: this will create a mess when multiple RUBY_TARGETS have been
+	# selected.
+	APACHE2_MOD_FILE="${S}/ext/apache2/mod_${PN}.so"
+	apache-module_src_install
+}