Version bump. Respect CC and CXX settings, bug 331287 with patch from Olivier Huber.

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

3 files changed, 99 insertions, 5 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index 117f8848a1da..8cde12e13030 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/passenger
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.38 2011/10/14 09:23:35 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.39 2011/12/26 11:51:00 graaff Exp $
+
+*passenger-3.0.11 (26 Dec 2011)
+
+  26 Dec 2011; Hans de Graaff <graaff@gentoo.org> +passenger-3.0.11.ebuild:
+  Version bump. Respect CC and CXX settings, bug 331287 with patch from Olivier
+  Huber.
 
 *passenger-3.0.9 (14 Oct 2011)
 
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 3ad56b2dd7a0..34ced9f74b4d 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -8,20 +8,22 @@ AUX passenger-3.0.0-gentoo.patch 1689 RMD160 3a510af572f07a947748c4024251a957fab
 AUX passenger-3.0.0-ldflags.patch 572 RMD160 dbbe8839ad0318ad2730350aa47a622577288ae6 SHA1 6ff3da382026b6fe0c7ff9b179fc21d6c4c5552b SHA256 22b7c85b2c3e0fb2c0275e0a63308cf65aa0ab2a1398c64b95ab149b8cb58392
 AUX passenger-3.0.8-gentoo.patch 1746 RMD160 17f2e03fd29d5c7933f88241734c307f733e714a SHA1 e78e5ff42a1174e8063e0f0b15ed013835dfac48 SHA256 d639c675c7d2c3c23001f33513d0758a33e7cdb88406a311608be2f47f746f2e
 DIST passenger-2.2.15.tar.gz 2128473 RMD160 52d0eb505d6c19e45ccc0dac8d1e675aed505c14 SHA1 dbb2f3346061872a43efc554990d8993172c8ff9 SHA256 95a9f61070d268ecaa311539d8e28b348765ca0e1528665ef928fc4b4bcc1436
+DIST passenger-3.0.11.tar.gz 2378398 RMD160 4e66832d825cb1f5bf06d117d4285c0b0ab54c12 SHA1 6406ecd47b4f100eb98a2cac611793aab15cd31e SHA256 7bbabfafb9d7f4e1beb6a231dea1fe68d540910ceafec6469f51187a43d8ee4e
 DIST passenger-3.0.7.tar.gz 2830376 RMD160 3a22895d72b3f6c9f953e00cb90fe0193494d058 SHA1 f6fd2ff499af9b5ed637505bb3bbe3cc7675b989 SHA256 021972c7f4fecd80042e7fc1d8f19ee3008a5491a3b1d34958b2b7ed42bddc85
 DIST passenger-3.0.8.tar.gz 2362561 RMD160 1264b76a3440492b3d435050007611735a627c72 SHA1 265d1dcb66a29b944fa475f7d6831ce16ac37e2e SHA256 ccef21dc97b54de17c1d44644b2bc67b7732a860ff67206a4c557727311a8349
 DIST passenger-3.0.9.tar.gz 2365647 RMD160 51b3ec35d56bb93b7b2fd24f3fe5d64a5c60306a SHA1 dd158388786c606f71dc14014f07a43b6e13a34a SHA256 40a15c46bd0be13a8d55931cc526c5dae740f7c02d2bfc40a82075967131d7f6
 EBUILD passenger-2.2.15-r1.ebuild 1372 RMD160 7b31bf101d0914063e790a710f4945f3ae7794eb SHA1 7b755ee72a6a46fe38ed33c5b3262e64030d1fc7 SHA256 5de33fbcfc3ab8c09f885fa7a15669cc37b942f4df58b55fc831818ad6206a22
 EBUILD passenger-2.2.15.ebuild 1310 RMD160 de65bb9d8c9de2565db681ec0366d6e36189142d SHA1 f3271497fd03e28efbf56640fc7127004fa9e937 SHA256 adfb99efd637dd1f9f6b7d87c751f86de68048349cb602b6a137aecb7794f016
+EBUILD passenger-3.0.11.ebuild 2712 RMD160 c251ba9c502a222dbc016c07fd96ab511393171b SHA1 02e9e6ed4fd834a005cc674a86dcc4a4ad6b2e0e SHA256 4a7ed2e1587ee6e8fa976ba1edc2e5601b869501f8f3f6e3476bafd8a48ae040
 EBUILD passenger-3.0.7.ebuild 2504 RMD160 c2c94c8a7fbc7cec7aede8460839f2cf49b5c6cc SHA1 197a7b644c8f88b8cf277a274d3584ea6e8037cb SHA256 7c2a9783f6272216032c0c48420b2fb337677765ea5deae87b3b282b6e0c1703
 EBUILD passenger-3.0.8.ebuild 2512 RMD160 3047f366f107566aab6acd9d2b935e2d38cda178 SHA1 b5530a1b56424f5baf8f7065db8d7d2fa22b31fb SHA256 2945e07d685848169eb03dbbf68391abd1731e981a917d190cec3e6f743bb980
 EBUILD passenger-3.0.9.ebuild 2512 RMD160 5cdaa6675751c7f5957aa0ca73a475077138da4a SHA1 be64df13b281b455398c6c1cf1dee16337e55338 SHA256 c8a03929566079216e61f4eb50eee925d31861a68220db3966ef379e2a5255d5
-MISC ChangeLog 6858 RMD160 457810bda0ed41f4d4d7731bbabe5408ce4a8e75 SHA1 da341c795b6d603c533911c09e2b2a99dbbf00bb SHA256 29606f0ce624d4cf061168d0f89c8ed6e27c3ae47c6c4e8ac92bb3679f5b1fe6
+MISC ChangeLog 7057 RMD160 9d7f87829bc6c98f939f0f0d5035874e7b575a07 SHA1 6c01346b4498c19df222259062c74201b77b13c5 SHA256 78f903d1980dd0c10a27c6e9b4e592631abcb3ce4dd56bdeaa0274bec4012aeb
 MISC metadata.xml 179 RMD160 046a67d39c9a5784800b120b3da44d67caa1f0af SHA1 31e15b20d55994a9989fff90a20847c1e76db2cb SHA256 d07e5a69f0aaee3b23884e0e414fad4aba70b9f4a115d2649714b8f1bd99d9fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6X/6QACgkQiIP6VqMIqNdjYAD9E4Ek1UpLGJGx5RyWsTEwMr0/
-nLh3Jqt9vwqlrL8EoUoBAImFf0gSF+6wKPoihNGua8D2TiXUbul6ryKnAePpkMpq
-=5yrH
+iF4EAREIAAYFAk74X6oACgkQiIP6VqMIqNeV9AD+IPjfLaSxOPbwrk+yv9NqnDLM
+BjtTzzCjaXIczYbO4OABAJDOYZcf7mjctw6CW2yddUxjkm7GaPGlppmkX9i+C0bM
+=0VMu
 -----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/passenger-3.0.11.ebuild b/www-apache/passenger/passenger-3.0.11.ebuild
new file mode 100644
index 000000000000..3e60b4142804
--- /dev/null
+++ b/www-apache/passenger/passenger-3.0.11.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-3.0.11.ebuild,v 1.1 2011/12/26 11:51:00 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18"
+
+inherit apache-module flag-o-matic ruby-ng toolchain-funcs
+
+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"
+
+ruby_add_rdepend "
+	>=dev-ruby/daemon_controller-0.2.5
+	>=dev-ruby/fastthread-1.0.1
+	>=dev-ruby/rack-1.0.0"
+
+CDEPEND=">=dev-libs/libev-3.90 net-misc/curl[ssl]"
+
+RDEPEND="${RDEPEND} ${CDEPEND}"
+DEPEND="${DEPEND} ${CDEPEND}
+	doc? ( >=app-text/asciidoc-8.6.5[highlight] )"
+
+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
+}
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0.8-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-3.0.0-ldflags.patch
+
+	# Change these with sed instead of a patch so that we can easily use
+	# the toolchain-funcs methods.
+	sed -i -e "s/gcc/$(tc-getCC)/" -e "s/g++/$(tc-getCXX)/" build/config.rb || die
+
+	# Use sed here so that we can dynamically set the documentation directory.
+	sed -i -e "s:/usr/share/doc/phusion-passenger:/usr/share/doc/${P}:" \
+		-e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \
+		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
+		lib/phusion_passenger.rb || die
+	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" ext/common/ResourceLocator.h || die
+
+	# Don't install a tool that won't work in our setup.
+	sed -i -e '/passenger-install-apache2-module/d' lib/phusion_passenger/packaging.rb || die
+	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
+
+	# Make sure we use the system-provided version.
+	rm -rf ext/libev || die "Unable to remove vendored libev."
+}
+
+each_ruby_compile() {
+	append-flags -fno-strict-aliasing
+
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
+	rake apache2 native_support || die "rake failed"
+
+	if use doc; then
+		rake doc || die "rake doc failed"
+	fi
+}
+
+each_ruby_install() {
+	DISTDIR="${D}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
+	rake fakeroot || die "rake failed"
+
+	# TODO: this will create a mess when multiple RUBY_TARGETS have been
+	# selected.
+	APACHE2_MOD_FILE="${S}/ext/apache2/mod_${PN}.so"
+	apache-module_src_install
+}