Version bump. Fixes regression in 2.2.10.

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

3 files changed, 69 insertions, 5 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index 76b9502657b8..ae14dad32c2c 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.21 2010/02/26 06:33:50 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.22 2010/04/03 08:48:17 graaff Exp $
+
+*passenger-2.2.11 (03 Apr 2010)
+
+  03 Apr 2010; Hans de Graaff <graaff@gentoo.org> +passenger-2.2.11.ebuild:
+  Version bump. Fixes regression in 2.2.10.
 
   26 Feb 2010; Hans de Graaff <graaff@gentoo.org> -passenger-2.2.5.ebuild,
   -passenger-2.2.7.ebuild, -passenger-2.2.8.ebuild:
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index e3c02b312a7c..3026e1c25e84 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -4,17 +4,19 @@ Hash: SHA1
 AUX 2.2.4-gentoo.patch 1617 RMD160 bb019e88f04a8f04c9c0dfa6ef1d3f908fc5ffcc SHA1 b4bc124dcd2c537f65a39b9879ac35a0ec310d34 SHA256 d90394f0742131f32dc42a9619305b2712bed3967b78d56480447500d190b8ea
 AUX 30_mod_passenger-2.0.1.conf 2697 RMD160 2a04e5087b97e07360d59812c6571d8123ad9c64 SHA1 4bb2c583782de3c1ed9f46c5ec5e20244b242ea1 SHA256 f39b8349cd0f9a80bf15182d562e56071ed95f22272cfa0c7fd37045d6e2ded9
 DIST passenger-2.2.10.tar.gz 2057930 RMD160 67c8c1e4f23d22f664b70af1a69dd3d24fd3fcc4 SHA1 46a622bbbe4c1413fc0769bc52e7a7aac760d525 SHA256 2cedcc508b9c9912091ee71d57ef7370cf570d9fe744e9d9f640bb21640deba9
+DIST passenger-2.2.11.tar.gz 2058085 RMD160 54ee5ab25155adaf4b6be9dc0aee190a323254e5 SHA1 9c38d364f59cb72c14a2f4c22445252468f08c4e SHA256 9d4aa14a4dfe9daa713aa19a787e1a5bee0db9f3625e17ffebe1e5325aa20a88
 DIST passenger-2.2.4.tar.gz 1789131 RMD160 c44ee941b5086ba4c1b846a28381ea29b2c1b732 SHA1 e78879e35c30ab4641f35655146b94aeeee513ba SHA256 13486cf4ef25ea76d0621ddccb2d30dc380d7c1661849b8649f25a7af5fa9afa
 DIST passenger-2.2.9.tar.gz 1995266 RMD160 3970e9b7ea7cbf931eb3cb6eb037062cbbe28380 SHA1 1a9a9893c46a51fe2498beb003b944a586203e57 SHA256 bcef11c0b587c415f40e674fbddc34b61fb95ef93a770d2e418dd04252ac6224
 EBUILD passenger-2.2.10.ebuild 1312 RMD160 08f95b2bab47b8cdfc8a3219d3cffe9c468f0435 SHA1 115a69ea46de065308ee69b0428b22eade3128fa SHA256 8fb8f3049c768eda3cceaa4c0eebf35d36dfa02f944d7a4a7c692297d9155040
+EBUILD passenger-2.2.11.ebuild 1312 RMD160 ea7f1c7d19299ed29a85764ed786dbd8975d7606 SHA1 644f10e1a4232c3f5adae05313297403457228a8 SHA256 9846142bf01c747479b3c68c12877ef5c8325d39b04b36b39492fa802539b9d9
 EBUILD passenger-2.2.4.ebuild 1275 RMD160 26d7a6cc20c180e63d99fb0ba6a822fae779d16a SHA1 97bc6ebcbffa452056996caf68d9246f56b43f64 SHA256 1af04ccc78c8fc5b79018a8848d08a3758ff737feb9aedeebe9d7930bdb169c8
 EBUILD passenger-2.2.9.ebuild 1311 RMD160 14b0bb6d7b0fb62c40f46c9e252fe41f3faa92ac SHA1 359957155f8049135554d6c1d48bb15705f9f778 SHA256 2f48569f1ba157be40d39b7d7c75a6483057a83fba7c81495d5d04b345ba3d4b
-MISC ChangeLog 4315 RMD160 5471d6f726859d047732810f990bad5cbd17826c SHA1 463d69538626e8e6b3e8691a622fadbece4b52fd SHA256 b553a1f4840d22cd4047df3896f507ff3eff3b3ea7e8aff896855cc0844ffd42
+MISC ChangeLog 4469 RMD160 16f30b1b68357d755ce1e07e89db0105ad4797c3 SHA1 d9070c7f0214fb8f06e2a7027389bd36fea94d64 SHA256 a060f3682078747015b10a337f5d6540a1460da034308c3447b0c461ec9fc77a
 MISC metadata.xml 179 RMD160 046a67d39c9a5784800b120b3da44d67caa1f0af SHA1 31e15b20d55994a9989fff90a20847c1e76db2cb SHA256 d07e5a69f0aaee3b23884e0e414fad4aba70b9f4a115d2649714b8f1bd99d9fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuHa1MACgkQeM7EJeUH71NoIQCeM9xb8k6/RPo9CmQ4rrWmoQmA
-sjcAn3Nuu9quUQejz7Appz744F772nLm
-=MB9f
+iEYEARECAAYFAku3ANcACgkQeM7EJeUH71PvDQCcCmwEGys6do8AQQ310vkJL8s7
+yZQAoIsWWRv2tuJaa0ijMvtckaP/7/Me
+=arbY
 -----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/passenger-2.2.11.ebuild b/www-apache/passenger/passenger-2.2.11.ebuild
new file mode 100644
index 000000000000..e5f4200348e4
--- /dev/null
+++ b/www-apache/passenger/passenger-2.2.11.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-2.2.11.ebuild,v 1.1 2010/04/03 08:48:17 graaff Exp $
+
+inherit apache-module flag-o-matic ruby
+
+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"
+
+DEPEND=">=dev-lang/ruby-1.8.5
+	>=dev-ruby/rubygems-0.9.0
+	>=dev-ruby/rake-0.8.1
+	>=dev-ruby/fastthread-1.0.1
+	>=dev-ruby/rack-1.0.0"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_FILE="${S}/ext/apache2/mod_${PN}.so"
+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
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/2.2.4-gentoo.patch
+	rm -f bin/passenger-install-apache2-module
+}
+
+src_compile() {
+	append-flags -fno-strict-aliasing
+
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	rake apache2 native_support || die "rake failed"
+
+	if use doc; then
+		rake doc || die "rake doc failed"
+	fi
+}
+
+src_install() {
+	DISTDIR="${D}" \
+	rake fakeroot || die "rake failed"
+
+	apache-module_src_install
+}