Version bump.

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

4 files changed, 119 insertions, 5 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index d65664333177..f41f72455c64 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-apache/passenger
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.10 2009/06/19 06:17:27 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.11 2009/06/19 06:29:33 graaff Exp $
+
+*passenger-2.2.3 (19 Jun 2009)
+
+  19 Jun 2009; Hans de Graaff <graaff@gentoo.org> +files/2.2.3-gentoo.patch,
+  +passenger-2.2.3.ebuild:
+  Version bump with many bug fixes. See
+  http://blog.phusion.nl/2009/06/17/phusion-passenger-223-released-bug-fix-e
+  dition/
+
+  Thanks to Bjunix for reporting in bug 274656
 
   19 Jun 2009; Hans de Graaff <graaff@gentoo.org> -passenger-1.0.5.ebuild,
   -passenger-2.0.1.ebuild, -passenger-2.0.3.ebuild, -passenger-2.0.6.ebuild,
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 9a6c27188a0f..f134c6f25bdf 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -5,16 +5,19 @@ AUX 1.0.5-gentoo.patch 3658 RMD160 448b31ea9a8ef8dbf24e64ccbe425c76941e4a4c SHA1
 AUX 2.0.1-gentoo.patch 2152 RMD160 ecb1691c26d50ed2a7ff2877003db9b2d8b0f9c2 SHA1 42873c6c22471e5614d658b2c99be7679ff929e7 SHA256 9863ceedfdd30feb74429aa844637e14a46c1d7700719a30af82316f15e163fd
 AUX 2.1.2-gentoo.patch 1678 RMD160 24e42c01a88c83e6c6d5d914d18f9904d7366d3c SHA1 715ea4ba8c506e7b82843777175fc85e92112fd7 SHA256 08cbbefaf16f4418e364d5381b9de37d71809655747b4bc98634568c4e668b60
 AUX 2.2.2-gentoo.patch 1617 RMD160 bb019e88f04a8f04c9c0dfa6ef1d3f908fc5ffcc SHA1 b4bc124dcd2c537f65a39b9879ac35a0ec310d34 SHA256 d90394f0742131f32dc42a9619305b2712bed3967b78d56480447500d190b8ea
+AUX 2.2.3-gentoo.patch 1617 RMD160 bb019e88f04a8f04c9c0dfa6ef1d3f908fc5ffcc SHA1 b4bc124dcd2c537f65a39b9879ac35a0ec310d34 SHA256 d90394f0742131f32dc42a9619305b2712bed3967b78d56480447500d190b8ea
 AUX 30_mod_passenger-2.0.1.conf 2697 RMD160 2a04e5087b97e07360d59812c6571d8123ad9c64 SHA1 4bb2c583782de3c1ed9f46c5ec5e20244b242ea1 SHA256 f39b8349cd0f9a80bf15182d562e56071ed95f22272cfa0c7fd37045d6e2ded9
 AUX 30_mod_passenger.conf 1602 RMD160 0b50a86b3e79884ab18cd85f398c1fe9bac5d6ff SHA1 3343f8f65edb48e084ff847f8ed7d571fb5e14f4 SHA256 12ba5a6090dd3e660bef69c5c69bac6255d2237fc04f6ec6ecac53dc5dacca26
 DIST passenger-2.2.2.tar.gz 1693895 RMD160 e83f9c82454cfdcf1e7a1d6e6bfdfdf9317ce0e6 SHA1 e3f17bceeacd5c943b4ed719eaabb0107e82441f SHA256 8eb7e36898787dce4e49c4b6550d42522b79193849b420fa333869318f8fb57e
+DIST passenger-2.2.3.tar.gz 1789111 RMD160 71fc90e98a36d2ff5fdb2aac8fe497dbebf14cf8 SHA1 a51aae8f72fba408d511ee09f05a26db04951fd3 SHA256 fcdbe49f1c34de150bdd5ccca99fa154cd2c545179fd1d988f491f759357b57d
 EBUILD passenger-2.2.2.ebuild 1386 RMD160 49b0e197a9849fff08acfd71f97ce7012febcb30 SHA1 194b041cadc09a6dae33612558656ba97795d485 SHA256 ee094ce4fb1b209fea47ffd688ef4ac66baf00d28bb59ab4e110b791b8a32013
-MISC ChangeLog 1907 RMD160 80aee2b0037174e8a34db75b5e8473a725d12ce3 SHA1 27949326e4808d52c981153fb1b17306462e7d5b SHA256 0235acc9ecfe957f2e49ce88cb02604102e5912daad4a5557579abf8d2d9e0f3
+EBUILD passenger-2.2.3.ebuild 1383 RMD160 9f0450b78c37a440b518240adf75248bb49f5c0f SHA1 a86f98f02be631cc9a916f1aa6690bc78a00f2ef SHA256 3dd4217b36e9e8011f5626bcb4ec267704770f8139d3622e09ab412745d8626e
+MISC ChangeLog 2219 RMD160 e9c27069ac1cc6829137ab00de3a19bc783519cd SHA1 9c183fd69a6b44b08bcd6b280ffc73db948cd263 SHA256 79e9bd9d0b6dda143ac3d1229e64e5f7616b5b20a46783532795c759c5250a59
 MISC metadata.xml 179 RMD160 046a67d39c9a5784800b120b3da44d67caa1f0af SHA1 31e15b20d55994a9989fff90a20847c1e76db2cb SHA256 d07e5a69f0aaee3b23884e0e414fad4aba70b9f4a115d2649714b8f1bd99d9fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAko7LYQACgkQVYU2Ai8K93esRgCgxLo8/38gQlwQ+RAjfsCc5x0q
-AR8AoIKtyxSC+X0W9NtC91jM5LVQoFcT
-=/Utn
+iEYEARECAAYFAko7MFMACgkQVYU2Ai8K93fh9gCfSB9vYK88vCKlOUv18l5JCBbc
+pb0AoMkgVks8rNU4tZ+GTCzm6QKlVQ7g
+=o86P
 -----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/files/2.2.3-gentoo.patch b/www-apache/passenger/files/2.2.3-gentoo.patch
new file mode 100644
index 000000000000..cd51913b9099
--- /dev/null
+++ b/www-apache/passenger/files/2.2.3-gentoo.patch
@@ -0,0 +1,42 @@
+--- Rakefile.~1~	2009-05-19 11:48:28.236986307 +0200
++++ Rakefile	2009-05-19 11:50:53.000000000 +0200
+@@ -38,11 +38,7 @@
+ 
+ CXX = "g++"
+ LIBEXT = PlatformInfo.library_extension
+-if OPTIMIZE
+-	OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS"
+-else
+-	OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS"
+-end
++OPTIMIZATION_FLAGS = "#{ENV['CXXFLAGS']} -DNDEBUG"
+ 
+ # Extra compiler flags that should always be passed to the C/C++ compiler.
+ # Should be included last in the command string.
+@@ -733,15 +729,15 @@
+ task :fakeroot => [:apache2, :native_support, :doc] do
+ 	require 'rbconfig'
+ 	include Config
+-	fakeroot = "pkg/fakeroot"
++	fakeroot = ENV['DISTDIR']
+ 
+ 	# We don't use CONFIG['archdir'] and the like because we want
+ 	# the files to be installed to /usr, and the Ruby interpreter
+ 	# on the packaging machine might be in /usr/local.
+-	libdir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}"
++  libdir = "#{fakeroot}/#{CONFIG['sitedir']}/#{CONFIG['ruby_version']}"
+ 	extdir = "#{libdir}/#{CONFIG['arch']}"
+ 	bindir = "#{fakeroot}/usr/bin"
+-	docdir = "#{fakeroot}/usr/share/doc/phusion_passenger"
++  docdir = "#{fakeroot}/usr/share/doc/passenger-#{PACKAGE_VERSION}"
+ 	libexecdir = "#{fakeroot}/usr/lib/phusion_passenger"
+ 	
+ 	sh "rm -rf #{fakeroot}"
+@@ -757,7 +753,6 @@
+ 	sh "cp bin/* #{bindir}/"
+ 	
+ 	sh "mkdir -p #{libexecdir}"
+-	sh "cp ext/apache2/mod_passenger.so #{libexecdir}/"
+ 	sh "mv #{fakeroot}/usr/bin/passenger-spawn-server #{libexecdir}/"
+ 	sh "cp ext/apache2/ApplicationPoolServerExecutable #{libexecdir}/"
+ 	
diff --git a/www-apache/passenger/passenger-2.2.3.ebuild b/www-apache/passenger/passenger-2.2.3.ebuild
new file mode 100644
index 000000000000..7338d1a72eee
--- /dev/null
+++ b/www-apache/passenger/passenger-2.2.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-2.2.3.ebuild,v 1.1 2009/06/19 06:29:33 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"
+
+CDEPEND=">=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/rails-1.2.0
+	>=dev-ruby/rack-1.0.0"
+DEPEND="${CDEPEND}
+	doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}"
+
+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}"/${PV}-gentoo.patch
+	rm -f bin/passenger-install-apache2-module
+	sed -i -e '473s/, :doc//' Rakefile
+}
+
+src_compile() {
+	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
+}