Fix installation on multlib-strict systems, thanks to robbat2 for the patch in bug 344225.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 99 insertions, 1 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index c1af3ed74814..c2007f26a2e6 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,13 @@
 # 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.27 2010/11/04 17:33:04 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.28 2010/11/06 11:08:26 graaff Exp $
+
+*passenger-2.2.15-r1 (06 Nov 2010)
+
+  06 Nov 2010; Hans de Graaff <graaff@gentoo.org>
+  +files/2.2.15-gentoo-multilib-strict.patch, +passenger-2.2.15-r1.ebuild:
+  Fix installation on multlib-strict systems, thanks to robbat2 for the
+  patch in bug 344225.
 
   04 Nov 2010; Christian Faulhammer <fauli@gentoo.org>
   passenger-3.0.0.ebuild:
diff --git a/www-apache/passenger/files/2.2.15-gentoo-multilib-strict.patch b/www-apache/passenger/files/2.2.15-gentoo-multilib-strict.patch
new file mode 100644
index 000000000000..ff6cefc7dfdd
--- /dev/null
+++ b/www-apache/passenger/files/2.2.15-gentoo-multilib-strict.patch
@@ -0,0 +1,33 @@
+diff -Nuar passenger-2.2.15.orig/Rakefile passenger-2.2.15/Rakefile
+--- passenger-2.2.15.orig/Rakefile	2010-11-05 03:19:02.000000000 +0000
++++ passenger-2.2.15/Rakefile	2010-11-05 03:23:45.000000000 +0000
+@@ -744,7 +744,7 @@
+ 	extdir = "#{libdir}/#{CONFIG['arch']}"
+ 	bindir = "#{fakeroot}/usr/bin"
+   docdir = "#{fakeroot}/usr/share/doc/passenger-#{PACKAGE_VERSION}"
+-	libexecdir = "#{fakeroot}/usr/lib/phusion_passenger"
++	libexecdir = "#{fakeroot}/usr/libexec/phusion_passenger"
+ 	
+ 	sh "rm -rf #{fakeroot}"
+ 	sh "mkdir -p #{fakeroot}"
+diff -Nuar passenger-2.2.15.orig/ext/common/Utils.cpp passenger-2.2.15/ext/common/Utils.cpp
+--- passenger-2.2.15.orig/ext/common/Utils.cpp	2010-06-24 11:53:02.000000000 +0000
++++ passenger-2.2.15/ext/common/Utils.cpp	2010-11-05 03:22:39.000000000 +0000
+@@ -113,7 +113,7 @@
+ 			return path;
+ 		} else {
+ 			path.assign(root);
+-			path.append("lib/phusion_passenger/passenger-spawn-server");
++			path.append("libexec/phusion_passenger/passenger-spawn-server");
+ 			return path;
+ 		}
+ 		return path;
+@@ -152,7 +152,7 @@
+ 		return path;
+ 	} else {
+ 		path.assign(root);
+-		path.append("lib/phusion_passenger/ApplicationPoolServerExecutable");
++		path.append("libexec/phusion_passenger/ApplicationPoolServerExecutable");
+ 		return path;
+ 	}
+ }
diff --git a/www-apache/passenger/passenger-2.2.15-r1.ebuild b/www-apache/passenger/passenger-2.2.15-r1.ebuild
new file mode 100644
index 000000000000..f97f3b224a86
--- /dev/null
+++ b/www-apache/passenger/passenger-2.2.15-r1.ebuild
@@ -0,0 +1,58 @@
+# 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.15-r1.ebuild,v 1.1 2010/11/06 11:08:26 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
+	epatch "${FILESDIR}"/${PV}-gentoo-multilib-strict.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
+}