version bump

Package-Manager: portage-2.2_rc40/cvs/Linux i686

6 files changed, 70 insertions, 101 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index 5a7232343fdb..eb100bbe43f5 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,13 @@
 # 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.15 2009/08/30 06:55:56 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.16 2009/09/17 07:15:53 hollow Exp $
+
+*passenger-2.2.5 (17 Sep 2009)
+
+  17 Sep 2009; Benedikt Böhm <hollow@gentoo.org> -files/2.2.2-gentoo.patch,
+  passenger-2.2.4.ebuild, -files/30_mod_passenger.conf,
+  +passenger-2.2.5.ebuild:
+  version bump
 
   30 Aug 2009; Hans de Graaff <graaff@gentoo.org> -passenger-2.2.2.ebuild:
   Remove old version.
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 5a73a497c4b0..6bcdd93bba99 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 2.2.2-gentoo.patch 1617 RMD160 bb019e88f04a8f04c9c0dfa6ef1d3f908fc5ffcc SHA1 b4bc124dcd2c537f65a39b9879ac35a0ec310d34 SHA256 d90394f0742131f32dc42a9619305b2712bed3967b78d56480447500d190b8ea
 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
-AUX 30_mod_passenger.conf 1602 RMD160 0b50a86b3e79884ab18cd85f398c1fe9bac5d6ff SHA1 3343f8f65edb48e084ff847f8ed7d571fb5e14f4 SHA256 12ba5a6090dd3e660bef69c5c69bac6255d2237fc04f6ec6ecac53dc5dacca26
 DIST passenger-2.2.4.tar.gz 1789131 RMD160 c44ee941b5086ba4c1b846a28381ea29b2c1b732 SHA1 e78879e35c30ab4641f35655146b94aeeee513ba SHA256 13486cf4ef25ea76d0621ddccb2d30dc380d7c1661849b8649f25a7af5fa9afa
-EBUILD passenger-2.2.4.ebuild 1333 RMD160 4934501452365a273e99d9ac7bf58384ebeaca7d SHA1 4a3ae374fb6e64c8bec95e9a2b6dc795d71783ac SHA256 08d4e3ee71a54ef743f9f41fe533a60bd94018a178d9d99bd05263c577f4569c
-MISC ChangeLog 3047 RMD160 9b641cb8aa4b367018774f82f7e6ce2620f93a02 SHA1 d1b701b1538b1a2edaa89d4dd77d9d1ad0189ae8 SHA256 61370d252b08919123ae50e525056157f13ff1356651ca5a97cfab72d06a2093
+DIST passenger-2.2.5.tar.gz 1799698 RMD160 a9816d696ad940868525f6cfb02e9003d69ffb54 SHA1 aa6e45fa023d62ce2f5f78efba3a2ff742d007ac SHA256 b090817e840c7b7e0d39c5eea292c87d428b1e56f29ef4a178705db42c9ec326
+EBUILD passenger-2.2.4.ebuild 1275 RMD160 26d7a6cc20c180e63d99fb0ba6a822fae779d16a SHA1 97bc6ebcbffa452056996caf68d9246f56b43f64 SHA256 1af04ccc78c8fc5b79018a8848d08a3758ff737feb9aedeebe9d7930bdb169c8
+EBUILD passenger-2.2.5.ebuild 1275 RMD160 0d9d9d7d8b93fc464f09de67b57eddfda3185813 SHA1 32a150d4695b0d6d19ed665e1e564e8932599ae9 SHA256 ba3acb6f2e8582d54b0ee32a39f4336fcf76958dbd83992d0570e1befc66bda4
+MISC ChangeLog 3255 RMD160 876c7f6272c4cf28beffd39d7cddcbfa10426122 SHA1 044115e9f60607803f36aa51f1a25b50e93f007b SHA256 9b4015d2cd469de1ecce88d44f95b81ee3a280e3a2604a716e0ec478fd16fd1d
 MISC metadata.xml 179 RMD160 046a67d39c9a5784800b120b3da44d67caa1f0af SHA1 31e15b20d55994a9989fff90a20847c1e76db2cb SHA256 d07e5a69f0aaee3b23884e0e414fad4aba70b9f4a115d2649714b8f1bd99d9fe
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqaIoIACgkQVYU2Ai8K93c6bQCaArckJgdJvcOLaX8OwhvB2bO8
-SSYAoIsrIGoVtxCkfzaYc6L9Kmctj3Ed
-=82Ez
------END PGP SIGNATURE-----
diff --git a/www-apache/passenger/files/2.2.2-gentoo.patch b/www-apache/passenger/files/2.2.2-gentoo.patch
deleted file mode 100644
index cd51913b9099..000000000000
--- a/www-apache/passenger/files/2.2.2-gentoo.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- 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/files/30_mod_passenger.conf b/www-apache/passenger/files/30_mod_passenger.conf
deleted file mode 100644
index 4cf0a29f75c6..000000000000
--- a/www-apache/passenger/files/30_mod_passenger.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-<IfDefine PASSENGER>
-LoadModule passenger_module modules/mod_passenger.so
-
-# The location to the Passenger spawn server. This configuration option is
-# essential to Passenger. The correct value is given by the ebuild, and should
-# usually not be changed manually.
-RailsSpawnServer /usr/bin/passenger-spawn-server
-
-# This option allows one to specify the Ruby interpreter to use.
-RailsRuby /usr/bin/ruby18
-
-# Whether Passenger should automatically detect whether a virtual host's
-# document root is a Ruby on Rails application.
-RailsAutoDetect On
-
-# The maximum number of Ruby on Rails application instances that may be
-# simultaneously active. A larger number results in higher memory usage, but
-# improved ability to handle concurrent HTTP clients.
-RailsMaxPoolSize 20
-
-# The maximum number of seconds that a Ruby on Rails application instance may
-# be idle. That is, if an application instance hasn't done anything after the
-# given number of seconds, then it will be shutdown in order to conserve
-# memory.
-RailsPoolIdleTime 120
-
-# When the RailsUserSwitching option is enabled a Rails application is started
-# as the owner of the file config/environment.rb. So if
-# /home/webapps/foo/config/environment.rb is owned by joe, then Passenger will
-# launch the corresponding Rails application as joe as well.
-RailsUserSwitching On
-
-# Under no circumstances will Rails applications be run as root. If
-# environment.rb is owned by root or by an unknown user, then the Rails
-# application will run as the user specified by RailsDefaultUser.
-RailsDefaultUser apache
-</IfDefine>
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/passenger/passenger-2.2.4.ebuild b/www-apache/passenger/passenger-2.2.4.ebuild
index f391ff088bba..42896ca82083 100644
--- a/www-apache/passenger/passenger-2.2.4.ebuild
+++ b/www-apache/passenger/passenger-2.2.4.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.2 2009/07/04 08:00:54 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-2.2.4.ebuild,v 1.3 2009/09/17 07:15:53 hollow Exp $
 
 inherit apache-module flag-o-matic ruby
 
@@ -13,13 +13,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc"
 
-CDEPEND=">=dev-lang/ruby-1.8.5
+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"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}"
+RDEPEND="${DEPEND}"
 
 APACHE2_MOD_FILE="${S}/ext/apache2/mod_${PN}.so"
 APACHE2_MOD_CONF="30_mod_${PN}-2.0.1 30_mod_${PN}"
@@ -36,7 +35,6 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${PV}-gentoo.patch
 	rm -f bin/passenger-install-apache2-module
-	sed -i -e '473s/, :doc//' Rakefile
 }
 
 src_compile() {
diff --git a/www-apache/passenger/passenger-2.2.5.ebuild b/www-apache/passenger/passenger-2.2.5.ebuild
new file mode 100644
index 000000000000..afc47aa21281
--- /dev/null
+++ b/www-apache/passenger/passenger-2.2.5.ebuild
@@ -0,0 +1,55 @@
+# 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.5.ebuild,v 1.1 2009/09/17 07:15:53 hollow 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() {
+	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
+}