Version bump.

(Portage version: 2.1.6.11/cvs/Linux x86_64)

3 files changed, 107 insertions, 1 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index 5f8e55d6494f..d9467d8964da 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,12 @@
 # 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.7 2009/03/15 14:36:08 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.8 2009/05/19 10:04:40 graaff Exp $
+
+*passenger-2.2.2 (19 May 2009)
+
+  19 May 2009; Hans de Graaff <graaff@gentoo.org> +files/2.2.2-gentoo.patch,
+  +passenger-2.2.2.ebuild:
+  Version bump.
 
 *passenger-2.1.2 (15 Mar 2009)
 
diff --git a/www-apache/passenger/files/2.2.2-gentoo.patch b/www-apache/passenger/files/2.2.2-gentoo.patch
new file mode 100644
index 000000000000..cd51913b9099
--- /dev/null
+++ b/www-apache/passenger/files/2.2.2-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.2.ebuild b/www-apache/passenger/passenger-2.2.2.ebuild
new file mode 100644
index 000000000000..dd98bf7ff361
--- /dev/null
+++ b/www-apache/passenger/passenger-2.2.2.ebuild
@@ -0,0 +1,58 @@
+# 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.2.ebuild,v 1.1 2009/05/19 10:04:40 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"
+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
+}