version bump wrt #223003

Package-Manager: portage-2.1.5.2

4 files changed, 165 insertions, 5 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index cd436b1b093e..1b5727c28fc5 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/passenger
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.1 2008/04/25 10:56:33 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.2 2008/06/01 11:04:27 hollow Exp $
+
+*passenger-1.0.5 (01 Jun 2008)
+
+  01 Jun 2008; Benedikt Böhm <hollow@gentoo.org> +files/1.0.5-gentoo.patch,
+  +passenger-1.0.5.ebuild:
+  version bump wrt #223003
 
 *passenger-1.0.1 (25 Apr 2008)
 
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 4e2f30c82358..b051451e1b49 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -2,15 +2,18 @@
 Hash: SHA1
 
 AUX 1.0.1-gentoo.patch 3258 RMD160 da519d9959dcd132008db8b25d3c81673b461f8a SHA1 fa6568451ea78166856a2cebd2bc56c845bd8519 SHA256 6b3a8f36312367b4b1c77be4ab7b595458f1a439ef9745c303e32c383c25fc82
+AUX 1.0.5-gentoo.patch 3658 RMD160 448b31ea9a8ef8dbf24e64ccbe425c76941e4a4c SHA1 fe875ef07f07127e8d8781b3379b9af895948df9 SHA256 16a96e13f756762eb71e0fa92f11d335620a8ffba8b12bbdbeaf8b0484760e34
 AUX 30_mod_passenger.conf 1602 RMD160 0b50a86b3e79884ab18cd85f398c1fe9bac5d6ff SHA1 3343f8f65edb48e084ff847f8ed7d571fb5e14f4 SHA256 12ba5a6090dd3e660bef69c5c69bac6255d2237fc04f6ec6ecac53dc5dacca26
 DIST passenger-1.0.1.tar.gz 1668684 RMD160 61495ce6eae6c8aa8d2261ec7527598c99c6369f SHA1 68500f5ae5b520cfb482082c90c5863f6e30b2c1 SHA256 0be68fbf99f3c0da5eec812fd14b45263e2719196c1e2588dca8fbe926479c58
+DIST passenger-1.0.5.tar.gz 1689058 RMD160 4a1045804945db04a5a6ea85415082fa26edcebf SHA1 2277729c296b9fe9d83482c528d3b8dbdc714cec SHA256 4b41b1a0a9d59acd310f3730dae0dfe3a96de17825c6bb325e2cc93eb731e510
 EBUILD passenger-1.0.1.ebuild 1564 RMD160 76fda40d17c0da2c1774abf0a986cea8d5b7497d SHA1 06f441a6cda361903fbba54fe320c71a9cc4eafb SHA256 9346405367c14f7064b165006f6ae526466a202a9dd0af918844a9f1c14fc686
-MISC ChangeLog 425 RMD160 ad1530a5ff5623e1f393b5c04448bdde6178f42f SHA1 80826a86a0c2d9ec3d7bdbe178852328c4cef0f7 SHA256 dc77b33ae4fa0367541ff94a8c74c1083c9317280db99374db78d550ee6b558a
+EBUILD passenger-1.0.5.ebuild 1564 RMD160 c5fc2fed451e0848be45ac8c8479ff1daab072cd SHA1 903c01f2625cb7b3d5507c0f1d0d89e8b3f2d6a7 SHA256 acf0cd65649dfdf0ab31b33356b9da90ce3c180f966f2496688ae0e3be598cc9
+MISC ChangeLog 589 RMD160 f135c60d758388318d7daf71e3827ac5a966e11d SHA1 b905c8fed56294d03557b5e2a671b37546900d48 SHA256 29ebe2cdea1b2d290f31977a5bb45f0b008eb3b27122feae91eda82f1ab967d8
 MISC metadata.xml 179 RMD160 046a67d39c9a5784800b120b3da44d67caa1f0af SHA1 31e15b20d55994a9989fff90a20847c1e76db2cb SHA256 d07e5a69f0aaee3b23884e0e414fad4aba70b9f4a115d2649714b8f1bd99d9fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgRuOoACgkQmPFBzbX68WFcbgCgm1zVc0ZJ3AzTOgrr5y8ZVHC+
-WocAn255c5VHwKLUMAG7qTZpzK0RXbp/
-=sU3D
+iEYEARECAAYFAkhCgkQACgkQmPFBzbX68WFXqACfZDc3hBYnCxVBulDcpViOIjJg
+2EQAn2108BIrcGKenGHIk0tHi7J7VtAp
+=OmC7
 -----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/files/1.0.5-gentoo.patch b/www-apache/passenger/files/1.0.5-gentoo.patch
new file mode 100644
index 000000000000..4dc6d751c616
--- /dev/null
+++ b/www-apache/passenger/files/1.0.5-gentoo.patch
@@ -0,0 +1,84 @@
+diff -NurpP passenger-1.0.5.orig/Rakefile passenger-1.0.5/Rakefile
+--- passenger-1.0.5.orig/Rakefile	2008-05-07 18:27:24.000000000 +0000
++++ passenger-1.0.5/Rakefile	2008-06-01 10:57:04.860048239 +0000
+@@ -37,7 +37,7 @@ APR_FLAGS.nil? and raise "Could not find
+ 
+ CXX = "g++"
+ THREADING_FLAGS = "-D_REENTRANT"
+-CXXFLAGS = "#{THREADING_FLAGS} -Wall -g -I/usr/local/include " << MULTI_ARCH_FLAGS
++CXXFLAGS = "#{ENV['CXXFLAGS']} #{THREADING_FLAGS} -Wall" << MULTI_ARCH_FLAGS
+ LDFLAGS = ""
+ 
+ 
+@@ -87,8 +87,7 @@ subdir 'ext/boost/src' do
+ 		# processes, sometimes pthread errors will occur. These errors are harmless
+ 		# and should be ignored. Defining NDEBUG guarantees that boost::thread() will
+ 		# not abort if such an error occured.
+-		flags = "-O2 -fPIC -I../.. #{THREADING_FLAGS} -DNDEBUG #{MULTI_ARCH_FLAGS}"
+-		compile_cxx "*.cpp", flags
++		compile_cxx "*.cpp", "#{CXXFLAGS} -fPIC -I../.. -DNDEBUG"
+ 		create_static_library "libboost_thread.a", "*.o"
+ 	end
+ 	
+@@ -101,7 +100,7 @@ end
+ ##### Apache module
+ 
+ class APACHE2
+-	CXXFLAGS = "-I.. -fPIC -g -DPASSENGER_DEBUG #{APR_FLAGS} #{APXS2_FLAGS} #{CXXFLAGS}"
++	CXXFLAGS = "-I.. -fPIC #{APR_FLAGS} #{APXS2_FLAGS} #{CXXFLAGS}"
+ 	OBJECTS = {
+ 		'Configuration.o' => %w(Configuration.cpp Configuration.h),
+ 		'Hooks.o' => %w(Hooks.cpp Hooks.h
+diff -NurpP passenger-1.0.5.orig/bin/passenger-spawn-server passenger-1.0.5/bin/passenger-spawn-server
+--- passenger-1.0.5.orig/bin/passenger-spawn-server	2008-04-03 15:49:06.000000000 +0000
++++ passenger-1.0.5/bin/passenger-spawn-server	2008-06-01 10:55:57.585311422 +0000
+@@ -16,7 +16,6 @@
+ #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+ require 'pathname'
+-$LOAD_PATH.unshift(File.expand_path("#{File.dirname(__FILE__)}/../lib"))
+ require 'passenger/spawn_manager'
+ require 'passenger/utils'
+ 
+diff -NurpP passenger-1.0.5.orig/lib/passenger/platform_info.rb passenger-1.0.5/lib/passenger/platform_info.rb
+--- passenger-1.0.5.orig/lib/passenger/platform_info.rb	2008-04-28 21:34:04.000000000 +0000
++++ passenger-1.0.5/lib/passenger/platform_info.rb	2008-06-01 10:58:27.772399440 +0000
+@@ -115,7 +115,6 @@ private
+ 		else
+ 			flags = `#{APXS2} -q CFLAGS`.strip << " -I" << `#{APXS2} -q INCLUDEDIR`
+ 			flags.strip!
+-			flags.gsub!(/-O\d? /, '')
+ 			return flags
+ 		end
+ 	end
+@@ -151,7 +150,6 @@ private
+ 		else
+ 			flags = `#{APR_CONFIG} --cppflags --includes`.strip
+ 			libs = `#{APR_CONFIG} --link-ld`.strip
+-			flags.gsub!(/-O\d? /, '')
+ 			return [flags, libs]
+ 		end
+ 	end
+diff -NurpP passenger-1.0.5.orig/lib/passenger/request_handler.rb passenger-1.0.5/lib/passenger/request_handler.rb
+--- passenger-1.0.5.orig/lib/passenger/request_handler.rb	2008-05-07 14:05:55.000000000 +0000
++++ passenger-1.0.5/lib/passenger/request_handler.rb	2008-06-01 10:55:57.585311422 +0000
+@@ -102,7 +102,6 @@ class RequestHandler
+ 	NINJA_PATCHING_LOCK = Mutex.new
+ 	@@ninja_patched_action_controller = false
+ 	
+-	File.read("#{File.dirname(__FILE__)}/../../Rakefile") =~ /^PACKAGE_VERSION = "(.*)"$/
+ 	PASSENGER_VERSION = $1
+ 	PASSENGER_HEADER = "Phusion Passenger (mod_rails) #{PASSENGER_VERSION}"
+ 	if File.exist?("#{File.dirname(__FILE__)}/../../enterprisey.txt")
+diff -NurpP passenger-1.0.5.orig/lib/passenger/utils.rb passenger-1.0.5/lib/passenger/utils.rb
+--- passenger-1.0.5.orig/lib/passenger/utils.rb	2008-05-07 18:26:59.000000000 +0000
++++ passenger-1.0.5/lib/passenger/utils.rb	2008-06-01 10:55:57.586311270 +0000
+@@ -20,7 +20,7 @@ require 'etc'
+ require 'thread'
+ require 'fastthread'
+ require 'timeout'
+-require File.expand_path("#{File.dirname(__FILE__)}/../../ext/passenger/native_support.so")
++require 'native_support'
+ 
+ module Passenger
+ 
diff --git a/www-apache/passenger/passenger-1.0.5.ebuild b/www-apache/passenger/passenger-1.0.5.ebuild
new file mode 100644
index 000000000000..05a45c79d03f
--- /dev/null
+++ b/www-apache/passenger/passenger-1.0.5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-1.0.5.ebuild,v 1.1 2008/06/01 11:04:27 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"
+
+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/rspec-1.1.2
+	>=dev-ruby/rails-1.2.0"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_FILE="${S}/ext/apache2/mod_${PN}.so"
+APACHE2_MOD_CONF="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}"/1.0.1-gentoo.patch
+
+	# set version here to prevent Rakefile parsing
+	sed -i -e "s/\(PASSENGER_VERSION\) = .*/\1 = '${PV}'/" \
+		lib/passenger/request_handler.rb
+}
+
+src_compile() {
+	cd "${S}"/ext/passenger
+	ruby_src_compile
+
+	cd "${S}"
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	rake apache2 || die "rake apache2 failed"
+}
+
+src_install() {
+	( # dont want to pollute calling env
+		insinto $(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitedir"]')
+		doins -r lib/passenger
+	) || die "failed to install passenger lib"
+
+	dobin bin/passenger-spawn-server
+
+	cd "${S}"/ext/passenger
+	ruby_einstall
+
+	apache-module_src_install
+}