Version bump.

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

4 files changed, 131 insertions, 5 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index c61502e084e5..449957dc80de 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.36 2011/06/24 18:28:00 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.37 2011/08/21 08:41:24 graaff Exp $
+
+*passenger-3.0.8 (21 Aug 2011)
+
+  21 Aug 2011; Hans de Graaff <graaff@gentoo.org> +passenger-3.0.8.ebuild,
+  +files/passenger-3.0.8-gentoo.patch:
+  Version bump.
 
   24 Jun 2011; Hans de Graaff <graaff@gentoo.org> -passenger-3.0.2.ebuild:
   Remove old version.
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 84ccb15430dd..5f6dd194dd39 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -6,17 +6,20 @@ AUX 2.2.4-gentoo.patch 1617 RMD160 bb019e88f04a8f04c9c0dfa6ef1d3f908fc5ffcc SHA1
 AUX 30_mod_passenger-2.0.1.conf 2697 RMD160 2a04e5087b97e07360d59812c6571d8123ad9c64 SHA1 4bb2c583782de3c1ed9f46c5ec5e20244b242ea1 SHA256 f39b8349cd0f9a80bf15182d562e56071ed95f22272cfa0c7fd37045d6e2ded9
 AUX passenger-3.0.0-gentoo.patch 1689 RMD160 3a510af572f07a947748c4024251a957fab728ff SHA1 cf2d3f74e26dea1b4f5309202add483a87d8136d SHA256 81d38f638499b4b3020614165e54647ad1c11630edf43c11f98911b740b15849
 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.7.tar.gz 2830376 RMD160 3a22895d72b3f6c9f953e00cb90fe0193494d058 SHA1 f6fd2ff499af9b5ed637505bb3bbe3cc7675b989 SHA256 021972c7f4fecd80042e7fc1d8f19ee3008a5491a3b1d34958b2b7ed42bddc85
+DIST passenger-3.0.8.tar.gz 2362561 RMD160 1264b76a3440492b3d435050007611735a627c72 SHA1 265d1dcb66a29b944fa475f7d6831ce16ac37e2e SHA256 ccef21dc97b54de17c1d44644b2bc67b7732a860ff67206a4c557727311a8349
 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.7.ebuild 2504 RMD160 c2c94c8a7fbc7cec7aede8460839f2cf49b5c6cc SHA1 197a7b644c8f88b8cf277a274d3584ea6e8037cb SHA256 7c2a9783f6272216032c0c48420b2fb337677765ea5deae87b3b282b6e0c1703
-MISC ChangeLog 6571 RMD160 3c8c8e58520f75412de756312456bd52e71f17bd SHA1 6c7e6c846430f84c36d48fcdee9257ff9d5ef05a SHA256 8e3cc01b950f2e88f9453730be878b18909367b2c4d88818c1288de2e4513338
+EBUILD passenger-3.0.8.ebuild 2512 RMD160 3047f366f107566aab6acd9d2b935e2d38cda178 SHA1 b5530a1b56424f5baf8f7065db8d7d2fa22b31fb SHA256 2945e07d685848169eb03dbbf68391abd1731e981a917d190cec3e6f743bb980
+MISC ChangeLog 6734 RMD160 5682464672ad68daa1023f5e1dfd166652e62276 SHA1 f528b354cdebdee838adcca5b0ee1b90dc35a896 SHA256 b9b69765c085bc566996886e1cf3c9a3c738630f4818575e369e341516b73537
 MISC metadata.xml 179 RMD160 046a67d39c9a5784800b120b3da44d67caa1f0af SHA1 31e15b20d55994a9989fff90a20847c1e76db2cb SHA256 d07e5a69f0aaee3b23884e0e414fad4aba70b9f4a115d2649714b8f1bd99d9fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4E1zUACgkQrnu0mw69JkpXRwD/SdLuftAuuwSqwUqlIkfgosD2
-g1P2WlXrCf4AiswSgfcA/0lsy86qTX6JJWT0xK7xCLMU3OzXI3JiCRLyc9pr12cy
-=IqVp
+iF4EAREIAAYFAk5QxMAACgkQiIP6VqMIqNcaqQD+Ilu05rCSb9cQwROj7YTOPZca
+GzIO43HGw/uIIhX8kHQA/AoMnTuBISTfLe8gQ4ILlso26O5+4j1HwBVSuka72flP
+=HdnE
 -----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/files/passenger-3.0.8-gentoo.patch b/www-apache/passenger/files/passenger-3.0.8-gentoo.patch
new file mode 100644
index 000000000000..6ca33dd32812
--- /dev/null
+++ b/www-apache/passenger/files/passenger-3.0.8-gentoo.patch
@@ -0,0 +1,35 @@
+--- build/config.rb.~1~	2010-10-01 12:22:34.000000000 +0200
++++ build/config.rb	2010-11-02 10:56:25.309314070 +0100
+@@ -17,12 +17,8 @@
+ OPTIMIZE = boolean_option("OPTIMIZE")
+ CC       = string_option("CC", "gcc")
+ CXX      = string_option("CXX", "g++")
+ # TODO: consider -fcommon
+-if OPTIMIZE
+-	OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS".strip
+-else
+-	OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS".strip
+-end
++OPTIMIZATION_FLAGS = "#{ENV['CXXFLAGS']} -DBOOST_DISABLE_ASSERTS".strip
+ 
+ # Extra compiler flags that should always be passed to the C/C++ compiler.
+ # Should be included last in the command string, even after PlatformInfo.portability_cflags.
+--- build/packaging.rb.~1~	2010-10-10 20:52:03.000000000 +0200
++++ build/packaging.rb	2010-11-02 11:03:56.944938507 +0100
+@@ -87,13 +87,13 @@
+ 	require 'rbconfig'
+ 	require 'fileutils'
+ 	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.
+-	fake_libdir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}"
+-	fake_native_support_dir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
++  fake_libdir = "#{fakeroot}/#{CONFIG['sitedir']}/#{CONFIG['ruby_version']}"
++  fake_native_support_dir = "#{fakeroot}/#{CONFIG['sitedir']}/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
+ 	fake_agents_dir = "#{fakeroot}#{NATIVELY_PACKAGED_AGENTS_DIR}"
+ 	fake_helper_scripts_dir = "#{fakeroot}#{NATIVELY_PACKAGED_HELPER_SCRIPTS_DIR}"
+ 	fake_docdir = "#{fakeroot}#{NATIVELY_PACKAGED_DOCDIR}"
diff --git a/www-apache/passenger/passenger-3.0.8.ebuild b/www-apache/passenger/passenger-3.0.8.ebuild
new file mode 100644
index 000000000000..bcc9c478d6a0
--- /dev/null
+++ b/www-apache/passenger/passenger-3.0.8.ebuild
@@ -0,0 +1,82 @@
+# 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.8.ebuild,v 1.1 2011/08/21 08:41:24 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18"
+
+inherit apache-module flag-o-matic ruby-ng
+
+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
+
+	# 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
+}