Bump

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64

3 files changed, 104 insertions, 3 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index 0e3018bd9dcd..afce2e604e1e 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/passenger
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.56 2012/11/04 13:45:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.57 2012/11/16 07:08:37 patrick Exp $
+
+*passenger-3.0.18 (16 Nov 2012)
+
+  16 Nov 2012; Patrick Lauer <patrick@gentoo.org> +passenger-3.0.18.ebuild:
+  Bump
 
   04 Nov 2012; <ago@gentoo.org> passenger-3.0.17.ebuild:
   Stable for amd64, wrt bug #440098
@@ -269,4 +274,3 @@
   25 Apr 2008; Benedikt Böhm <hollow@gentoo.org> +files/1.0.1-gentoo.patch,
   +files/30_mod_passenger.conf, +metadata.xml, +passenger-1.0.1.ebuild:
   initial version wrt #218170
-
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index bd868444ab09..4263fa4c96dd 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -9,12 +9,14 @@ DIST passenger-2.2.15.tar.gz 2128473 SHA256 95a9f61070d268ecaa311539d8e28b348765
 DIST passenger-3.0.13.tar.gz 2654448 SHA256 87d5299dd41cb9592bf459d8e4526090a9b37170af9c50c043a20fd43fb09b72 SHA512 70baa691fd8833d3354a2d68824a0fe6455740cfa75d669e7d1a15389889395f2dcfc13d25f15c804cc1114ae26bbf3f66557ab59b1804eb1df333dc456ed07e WHIRLPOOL 0a5062051297e994ace166d45d65b99ae1dc6f1b739b781d9926cdf522a97ec99f6789012ae9572916d61878c43b3805bf4ca7d9267bbfb6e52d097a09547a95
 DIST passenger-3.0.14.tar.gz 2654651 SHA256 f9af8d0a39a5bd19698abd7c4e8e1be18dd7c628affd985a49979c098e3427d7 SHA512 9f8d6223336209f405eaa64a8d0e96c65a3b6ada371bcb6538a6805149d4336250d24465ad33b6b6b32b662feee4ae144237452b368262818ac94a5175574138 WHIRLPOOL 7992e02e2f0d9ec32091f7624f609e08643d147d6ae1a674a772cff1239b78532300f6b0b585f1b5691436a5673a9bb05dbe5cf512ca3908a1760fbbfb6b4bed
 DIST passenger-3.0.17.tar.gz 2667619 SHA256 3f1380cdf8342fd3b0df344b4b95e5f7810114dd331e56ca1900eda1f5747f01 SHA512 485a2e9893c81989cd89aae2d4922da4a0391b26687286f56c9b5d2b9b1e8e8e0607376895e7a44f7073743c1ea9f7de335420407145a39b1ab275e01bc77466 WHIRLPOOL e168e599d84d841ef4655905512f4b2e17e07d396793b7ea574cc587df634f4853635b8e9f3c8fefa33a74d6fb952be03284696b0fabeb39cd887b8eaf486cd2
+DIST passenger-3.0.18.tar.gz 2669419 SHA256 ac96993dc085b0384ca8802d392e19ce68d20057bf2ba7fbb7cc84a13826eedd SHA512 6f0c67cac39cb4855a3e3444ee0dc16e9f88b7e2842d92394978cf5dd2e24e4de8dbaf8f2dc640688f3a66c510a9405c7968dc180822b4b0029a5d240b0bd370 WHIRLPOOL f6f2a31cddb2d95a113ff89e9ad458b5551e84730eebc215b554ba3f045e5fed13e438892cdddb954701fd410f6b03e83086742cb0a11db472df730c6fbcb41b
 DIST passenger-3.0.7.tar.gz 2830376 SHA256 021972c7f4fecd80042e7fc1d8f19ee3008a5491a3b1d34958b2b7ed42bddc85 SHA512 44e63770edbbdfc275933e707b32f646bba4b3060b5a509c02e7aabdb658af92cf2e3e841ac7335b1eb5b9b0049522ee17f314fee53376c5ed0e4012c4708045 WHIRLPOOL 74efe292fbeb1f1267aa46f1393ba7d9cf7c352ea6895f2bb4c3624a358bd131f726bfae247eafbc5a4a788905103eab3a02af69b8ab23aae54b4d996a8a54a0
 EBUILD passenger-2.2.15-r1.ebuild 1372 SHA256 5de33fbcfc3ab8c09f885fa7a15669cc37b942f4df58b55fc831818ad6206a22 SHA512 da9358bd38247437860aba55b8ab26c515c337298ff5ab69a066047d961db978576bcfde9ec4316ab6714c9748d838281b6df773c307cc55b66d1cc849ae0b8e WHIRLPOOL 0dbe621e85f8d3ad6fcaa9163cd593c8e82799582544f95b65218ba72ae0163c1b6eb45e575f4ed40d6e1df145f3a4aca1131c77e85c04b61cf3095784eb6ad2
 EBUILD passenger-2.2.15.ebuild 1310 SHA256 adfb99efd637dd1f9f6b7d87c751f86de68048349cb602b6a137aecb7794f016 SHA512 a928a41badb0cb122bd38476b1176b89dcabae27e3cc1907247086a27bf3b12252962f2b11f5f9f88d502a1a7204d394abd12d9bc2b01a4fce9cd2f8b898ee68 WHIRLPOOL 44db92c92505b434faf9488ffeb6bd715de02d51270b25afcbe40c5f1ef306856143b71ecc296dfa6cae28d4d9158577e1230e29732893dd62e9a03eb502a5f3
 EBUILD passenger-3.0.13.ebuild 2992 SHA256 ab74db4e9c0c03ed950f3d7aa634bcf9391f0f12f1ab27ed1e5245393873248a SHA512 ead232f4533654f6754e2d743bf89b7292c763bb862c5c117b1b1281a6e9f8f5efda8b0be6534c4770c0e1beecc0ef80e9e90081f2499a6d1ca2d65f7caed1eb WHIRLPOOL da4b9362fd21cfa910e4942b8bc1fc8ecc9a461d4bc1f36e7f42cf072381e10ab73e212e416deda837fb73bcaa9821f5196019818fef73f8eb4e1e7b36bbf93a
 EBUILD passenger-3.0.14.ebuild 2990 SHA256 ba4f20503f3469702bfc2b7750e85ac1c0d79d2a8586c3fbb066a73e10384937 SHA512 d2736867281b5296ee1fd6491414b1ec561349de3a258407155b946b335addfc16b4dca013269c984730d5e5892205139e9ae7a63117f005ae374ecccb2ee9f0 WHIRLPOOL 7e2b8b8413f1031c22e03e148e2b72546a7feddd34cf92b4888dd5d603d3f1fb9057ca3779d868d6e3f8d36c9411973547f42d3b7abd01c6f897b37c7edc6407
 EBUILD passenger-3.0.17.ebuild 3020 SHA256 7eac750dcbf7a107d126c05322abd9d09189b0d9ac57f05815a14fc3a0b8f8a6 SHA512 22fa62c06f4e4a0c86a56cbbfba531e19febdbc2ecdef00d649743519a479d2bb6a8dfa7c51fb10ac9f35f429a844be6bd08fd6c08b1709bb4ee05ab81683a91 WHIRLPOOL f84c987fe3140520980577c30eb83b5037abdf961cdf80e96264e75f2b91459ac128a0aa2b1ada61c5581fb47e806707fd59cf2a11d8839636397c47b80b68d7
+EBUILD passenger-3.0.18.ebuild 3025 SHA256 3393cbf1413381dc5f2516617808bbe93c96639397adfa37d5e5a4917a2c9e07 SHA512 34f3d880d5fe81219546eedeb6fb0922a0157dc3e1f4bf09c5a5b4bbf0fa338b0f1b0b017e7b1f354a72b832b6a61a652b17fb4b260f856f1494663042f7bdf7 WHIRLPOOL 94d3b947a71643afb51461a7a87ec8797b9f9a28d6f4a8bed25daa2d516449fbaf0361b3630a2c99b17bac58b6c8275f3ab1e2de9b3e1bc5a4319660f8194917
 EBUILD passenger-3.0.7.ebuild 2506 SHA256 a5ec450770867f3d4981f6ba77ea95e91cd6ae22a419a42a471360a1a30083d9 SHA512 ee22c70431161e24c8803088b8dff45ed28fc077f78fe4dc90c9761f48b0fb4feb57ac35389b34971a597a9860457c3aae2f511ebeeb085c799a75f854fb8beb WHIRLPOOL 727f17ddb64a16b02c0783a657184a8a12f30fa00dc3c513797b96214cefe0ad8ccf419762757d2c2729e6a7785aa0bf58d2235d290999e72ce1ccc668d78fb3
-MISC ChangeLog 9114 SHA256 3791f790eaf60e5468ce18ac9b36c9f3d9541f6438e437319821f1efcf1bd257 SHA512 3fd25d67b3cc44c2ff4258a5f336e3ac0315736f38aafe59ee6d27a1847f997d883b92289b2d6877b82e5a3d0c170289cb5b1e14aa13dc7629006ea39c40395d WHIRLPOOL c6e36b783a53baedf937e2ea15eb96b687b5ec26be76ba8d8996b666fa7f430268f0f69d98fd688303892504b4cad8396c55848d5dd21d7fe58ac35058682b3f
+MISC ChangeLog 9234 SHA256 d3b6ac2bd53602458e0188c479cb94f323ffd95a48109879a35982ac16701178 SHA512 1c771ee6fca44ac40bda1c9c759ec5635ec0b1b264a014dc66ea459e5e9bd5a45383b6870a3bd678aea2cc958827192a1e9bce5530fb68eaacff709c5ba92f12 WHIRLPOOL 4f1f65eb916bef4dcdb6b054ce9f8279d5f6a778f8c11fa539a2c4aff198ded024950dd9fa95485b3aade3249b6b899dbdd8c2df9a6dbc8aedcb980282712fea
 MISC metadata.xml 256 SHA256 683b0a0169c586b4bdacfaba92b87c0679f145a99c115da39c4438f164f76ca5 SHA512 5a0cd6cad10a98507793c44592c271c4996683a48347007ba1af12115fdc241a90ec73f8fc3e23a2231ef9a07df487be407905c71ba3a1243155198f0a828433 WHIRLPOOL 2945ba40bf3c6574d3e9df625eb397c3ae36b6a525b6d3e35cb3fcf9733f95ca5084ba37fbee23bedb940a2960b603c795f1a38e85058464e39d5b9c6154c235
diff --git a/www-apache/passenger/passenger-3.0.18.ebuild b/www-apache/passenger/passenger-3.0.18.ebuild
new file mode 100644
index 000000000000..a960a6f5a0fc
--- /dev/null
+++ b/www-apache/passenger/passenger-3.0.18.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-3.0.18.ebuild,v 1.1 2012/11/16 07:08:37 patrick Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19"
+
+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_bdepend "dev-ruby/rake"
+
+ruby_add_rdepend "
+	>=dev-ruby/daemon_controller-1.0.0
+	>=dev-ruby/rack-1.0.0"
+
+USE_RUBY="ruby18" ruby_add_rdepend ">=dev-ruby/fastthread-1.0.1"
+
+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"
+
+REQUIRED_USE+=" ruby_targets_ruby18? ( !ruby_targets_ruby19 )
+	ruby_targets_ruby19? ( !ruby_targets_ruby18 )"
+
+need_apache2
+
+pkg_setup() {
+	use debug && append-flags -DPASSENGER_DEBUG
+}
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0.8-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-3.0.12-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."
+
+	# fix automagic use of asciidoc, bug 413469
+	sed -i -e '/fakeroot/ s/+ Packaging::ASCII_DOCS//' build/packaging.rb || die
+}
+
+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
+}