Version bump.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

4 files changed, 161 insertions, 16 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index 7a93f765b51a..3748e1f5cef4 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/passenger
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.69 2013/08/07 13:35:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.70 2013/10/05 13:29:23 graaff Exp $
+
+*passenger-4.0.18 (05 Oct 2013)
+
+  05 Oct 2013; Hans de Graaff <graaff@gentoo.org> +passenger-4.0.18.ebuild,
+  +files/passenger-4.0.18-gentoo.patch:
+  Version bump.
 
   07 Aug 2013; Agostino Sarubbo <ago@gentoo.org> passenger-3.0.21.ebuild:
   Stable for x86, wrt bug #477048
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 56fa75559ab8..cefded8cdfc0 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 2.2.15-gentoo-multilib-strict.patch 1278 SHA256 dced348f25d2bb41dff59f51c1dd7a8b6771c81dd699a54170e3627bef12ddea SHA512 19bdd5fd1fe2d9ff0c6797acde965cddf0e997aac87a9572a0516143eeb1ae858b3fd298c186e611df9f6dc1380d3f4d85c7d5bb0141e82fc91e10072ef43c90 WHIRLPOOL 9368f5591cc3a9e6b69eaf0566747cda936fa447d75159dcef88b4869d17ff3568adc04a698f3cb74b8a2216e5c9fd982262b03e4ea2096f8596e4ebff91251b
 AUX 2.2.4-gentoo.patch 1617 SHA256 d90394f0742131f32dc42a9619305b2712bed3967b78d56480447500d190b8ea SHA512 5a80b36b0b62e2a450584f7a7c25f574ad0ae5b9be813ea94069a68583db4bc944e7624a53ac0b1c00eb56329b97f2f37027d530731633fdb4ff4461843a102c WHIRLPOOL 147dddd7762a6a914962283c6e6737e10575da03954e10ea5b70dc80c7e975461f61c21db0fc555ab442689ca3f8d812a252fba6b1a7ae0c95def409bc03e9e9
@@ -10,28 +10,21 @@ AUX passenger-3.0.0-ldflags.patch 572 SHA256 22b7c85b2c3e0fb2c0275e0a63308cf65aa
 AUX passenger-3.0.12-ldflags.patch 414 SHA256 b17694c0a148980e39e60d5582b3e6ee313b63858d4aa827afe71ba1e7c7790e SHA512 b23014f7fcc708f266a1460fc93565a449e0493ab546b4bb4e457a53dcdc1fb91abd29e8825a0f65c30d2dca57cb9ce455b66e3386559f1c490c48cedd586e7b WHIRLPOOL b06595f84feb1dfce5aaaa1f190681004eb3925dabe60aa1cd1a5895e20a9b6325b82a258ad0c3019a0d612f6448803b0ddd6a89ffa636c186b046be0bf2871c
 AUX passenger-3.0.8-gentoo.patch 1746 SHA256 d639c675c7d2c3c23001f33513d0758a33e7cdb88406a311608be2f47f746f2e SHA512 bef5911e4f574cd96e67f008517d082ca3dea3e59c3586aaf170fb472f406b4f73a1c583ace527f0f5ab2d0de4cb50c8e9aa4b995eeec4066ea26da93f4a8bc6 WHIRLPOOL 6ca98d8caa9e5ad40edad2c8198c1d1f7c5174c4017bed2bdfe6abdaf8c4f11736b9707f9b11d753e243150458c79bf2915ae4adc46d6dbe7ab6564d99ba7629
 AUX passenger-4.0.10-gentoo.patch 2131 SHA256 113e75b58164f05f901430ed4f426b73028143d1bdab632eab40ded620cbe4db SHA512 c9795cc79f80092828ffc9a53e417fccc11de8e2245de1e502df87302609a2769c1aa14940258484f886441a21857311f0ddf10f601fd3cc914a55bb4553dee4 WHIRLPOOL 6ae2fcd36128daf3af75add417161ae533f1048513939ef768577373eb591f5ba9a402654a852521a3edd151a15a4f4aaa4a5f48fea66146ac217797eb633974
+AUX passenger-4.0.18-gentoo.patch 1682 SHA256 1331a98ed68ed60fb0d49ccbfafc22a755c7d8fa0fcb8aeeec2d52d3d036ed93 SHA512 0e33ff52262976a282800359b5790a4109664f5cc081df893b2f4fb9687aeb97e1419c36d21a89f497faa354fcacbf7336492e8d1cac7ddf7b58234b8f4fa15f WHIRLPOOL f5a00b3d67a5280c43ad9fbad0eeb81df873650a2d794d820043b2f46dbed6a8392924009d713d43d9100c2aa5f9f2398afaa83738f93e79f27c6bd9952d4a14
 DIST passenger-3.0.17.tar.gz 2667619 SHA256 3f1380cdf8342fd3b0df344b4b95e5f7810114dd331e56ca1900eda1f5747f01 SHA512 485a2e9893c81989cd89aae2d4922da4a0391b26687286f56c9b5d2b9b1e8e8e0607376895e7a44f7073743c1ea9f7de335420407145a39b1ab275e01bc77466 WHIRLPOOL e168e599d84d841ef4655905512f4b2e17e07d396793b7ea574cc587df634f4853635b8e9f3c8fefa33a74d6fb952be03284696b0fabeb39cd887b8eaf486cd2
 DIST passenger-3.0.21.tar.gz 2657475 SHA256 82a79a2ff6803e1669ebf806ab320180990ddc096e3d30977ad1c86081b594a5 SHA512 4e92fe8cc679776531a73525ac0dd99612096c1370b4019dcda54aa928cbf6ba17c024124286342209a2b9d1ec9cb22d3783fc6bedc85cb9a0d0fb7561995eec WHIRLPOOL 11f9a5655e7ebcfd9f4a03a63d077126a0766ed7ad92e24494c3515202603782d3a8c999b4662004577d3463de68c040d783d9f93c01f95aa935289c0628780d
 DIST passenger-4.0.10.tar.gz 3623488 SHA256 e83248bb54769fff87ad4778277240153f9972d9d5fb8fcda2eec45feb51dcc6 SHA512 5466f614f4037b03b46dfcf83cf79058771a1ca4c896b66c752aa05c0b9dafe8625e20c713b4b459e20af23200aaba461272c893084b84fe5e7faf5bd1acaab6 WHIRLPOOL 5e9291079d6d663531935e4341f0ffd5584c43782763e18975f22a3e05afaf39ea749cce1313f6ef6f5f67d5720ebb0410fba782576e1d5a162dd1efd4fcee22
+DIST passenger-4.0.18.tar.gz 3905329 SHA256 cd2907c7fa17a82fb88f63892f2d39cb328e01321648f140a00e7980c4e1df32 SHA512 e4c29d2ceb8f5069d8a22c47259935954109033b90569791eeb1978aa585ed1d943b245b7b5042584a20ee814cfca05fac11601eabd785efcfe9eea4c8ebaeb3 WHIRLPOOL 910f7ebe68d4f6c4b859e2a14d54dc1614c54b11b83c28d95e769b7928cc9a1f86fdb937ce1256448e0547eb6183d4df77300d5987ddf274f0e3841af246ce8e
 EBUILD passenger-3.0.17.ebuild 3025 SHA256 af7a3fee5eb186cdc763e60d8eeb5a73a9dcf3e7ff72d4c019974257cbf046af SHA512 c4c398465fdccd78453d84916baa600e98141f4ff31bed6e1784c8f621e5657d5c71f4fe02c711640b069d2006afa7fb26bf4188971ec98f28f88924a8b3f892 WHIRLPOOL d9dda4ba8b783667ea3c5b1edea5c95b444c435d6305be5b2b59a08fa50c4bf4958a67fe6e280b5607be5c5c622273acaab7558ba4ddd7d1e7d145f8023e8554
 EBUILD passenger-3.0.21.ebuild 3019 SHA256 f198094111a2b47de8e1f17404c3d2daba1d72f131604e2fd92f3405f3cf0d2a SHA512 5b3342d72d3432451547cc51e1476c60820747bf2fa66a31b9bcd37fbe8dd365eed6d609c519f2541a5ba00795c4c9c32d6f4d7ea04a955bca3317060a12f351 WHIRLPOOL dc6e7f0e2ff9ad20b0b38050449cfb23cd8b01b5f427ce286d24c04620af5c7f5ed7c1bfc0d39659f5f9978987a19a25c33ed200f30dfc9790ee291de6fa3889
 EBUILD passenger-4.0.10.ebuild 3363 SHA256 1d6a750abaf02b6cbe92d3fcad92b41c7efa4c58b807b7ec0a5d2f591b290c33 SHA512 02e0bc3910712f6017b5167fff931829646fd49f2d65658e4650978e359d5844013af65fd290c71942cc4f19be6beb3e00f87b209362b39d6911f252f7e44273 WHIRLPOOL 4257d6cb49be09f8fab23a7d81ce3a9d9bbbb279b380fc8224e75d1087e02416a89808857ebb0ee6c11d1280ad7096338109e32fa0080290b8a80a744ed910a1
-MISC ChangeLog 10959 SHA256 0047fb3c826c2ef8aa64c6d0f94c991b0564f818ebac5d081fc1433d5a7027ea SHA512 42f189ea00881045ace816efeb112a527746f5cbd6a71b88625c91bd671d5c22795cfd01847122f7cdba894b007e80a9c313452e1fd9aa9afe6c2937f75d7d07 WHIRLPOOL 3ad041fa6a2560e41b19f9d8efd9cc93b8d42bbf95d392cd678c6a89ccc5d137e7162a16d4d5e275b9dbf372924691a1fd67b052e3471779a0e16b2771004252
+EBUILD passenger-4.0.18.ebuild 3389 SHA256 aa353a4ef62ac207cadbcc16f1b70ba80d900d5491c669d880d541c5723c924e SHA512 b4b6a60e9d1e011a475a5d5e780ed256e9fd289dc1cf203cfd99fae31814ae42bc839cc3bf004f63b1e47ba9f89512966ec2270e1b7e4a9b9cd786931a594331 WHIRLPOOL 056d3e536539dbe25406b6d776530df2e0f8dc33b522da3cdda87ceb4e3f30b50291fddac4c14e85eef2c4116954f5f65a0d4c4e04cf5f7316d5eba3151d9ef5
+MISC ChangeLog 11128 SHA256 10562d757d9fd9b10b083fa2bf01d5095cac9c039c3f6bea6a70ff930d63349d SHA512 7187c4e929c31f9e7647d3eb2873dad54d6ed32d865dbf249b13d5577636b7454f8873f9e5fe1545e19cbd8ea72848768be893a6f2f7c4745cdffe2b62e0b396 WHIRLPOOL a412ec6a421f1e18a3c61a8814de85d57346eb4ab1c0a757f2c5fd4a80a8e9acb6a23cf2caf79b18445418ac9c8be48e23a254070d431dababdbc8a2c0d0a077
 MISC metadata.xml 301 SHA256 867721645f57dbb8f265285065ec9f1dd6c2a22eedcf9ff39da9723b3e24dd88 SHA512 d5b721477a7b5b69ba5d26bd6d1a42f2acd7007ce511e6d9e4e6512721e80718758eea318a4f4af2cec6ae4a6fef6a323f163825fd73f470d9b9754012038b8f WHIRLPOOL 264e4bf232aafe04b68854c1a3252895cc54707ff3ab117bc7416eadf437358781ae058709ca5d40e72f1cf28238d36e7a19eddbe55f053ebeac2279ea7b296a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSAkxYAAoJELp701BxlEWffDcP/jq5S2ijuiOJEWuztXgfOLvD
-2CKy0bBSL3S6ttB/Lcas8l+BiRLwRI69sV21+/2BxqD/ej3UwSiDcQ2ktoMdIBBa
-UIitxcve36rbb78Ny7b+owT6tYkH60abOVksVzdyi3n7CdSSFkKbDB0MR3E0H/qp
-TqPp+ikC70IBGG/XdbmfCOcJoilKrtdnbzEkgKsNCLvJAeV0n6QXdcVpQTkBQNdv
-lZLxcJPT2sSu9fV+0DLaR3lf/Yj/w/t3ATcPujqDhsrtwAUki8a91hv3RhhApYhO
-hVkGJRna9OwrOVDU02NpGCTax4Ieoo05g835mOJr23kR1Wt8iYG/tZj3eIHcVy9k
-xN/HNqO0JriccDFB5/Q41c+H7DkXfuSotFowVhESARvREXAi00WzApf02josFEag
-qITopDH/8uW3xwalw4JJ/AceQOjDSvXKUkJvLIETvQIXGJKXoK4ai2mmnzsp9adu
-+UU9hlULg7HbeEhNMZzN5andMwMfLA2hT9m3LSUkGGMQ4lMjIRs9TaVSljDKQiFD
-Z1GvFtb5BGE9HaqGPbdO/t97ka5RYa57GOOXSq4DanskILoPSSUg6iyzUnvhEXW7
-n60q6uOnqvBoZ/4TiSWXWeJkHpyQrHuLMs270ltMyMlb4Lp7dooGvy91YRA1AQiQ
-828esn9OOYwM1iiH9AVK
-=WOzh
+iF4EAREIAAYFAlJQFDoACgkQiIP6VqMIqNfVUwEAgyLV9422qZIG45F8bXfqY6Df
+NJgZ+EFrgh3dbeiYsHkBAIsxm5HnB8QN/TGO+z+d3/AoGh8psDQ8F1ZMMty4U070
+=u8Zu
 -----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/files/passenger-4.0.18-gentoo.patch b/www-apache/passenger/files/passenger-4.0.18-gentoo.patch
new file mode 100644
index 000000000000..7eb7c3392062
--- /dev/null
+++ b/www-apache/passenger/files/passenger-4.0.18-gentoo.patch
@@ -0,0 +1,39 @@
+--- build/packaging.rb.~1~	2013-09-14 10:09:56.000000000 +0200
++++ build/packaging.rb	2013-10-05 15:03:51.474846961 +0200
+@@ -306,14 +306,14 @@
+ 	require 'rbconfig'
+ 	require 'fileutils'
+ 	include RbConfig
+-	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_rubylibdir = "#{fakeroot}/usr/lib/ruby/vendor_ruby"
++	fake_rubylibdir = "#{fakeroot}#{CONFIG['vendordir']}"
+ 	fake_libdir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}"
+-	fake_native_support_dir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
++	fake_native_support_dir = "#{fakeroot}#{CONFIG['archdir']}"
+ 	fake_agents_dir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
+ 	fake_helper_scripts_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
+ 	fake_resources_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}"
+@@ -326,7 +326,6 @@
+ 	fake_ruby_extension_source_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
+ 	fake_nginx_module_source_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module"
+ 	
+-	sh "rm -rf #{fakeroot}"
+ 	sh "mkdir -p #{fakeroot}"
+ 	
+ 	# Ruby sources
+@@ -405,10 +404,6 @@
+ 		end
+ 	end
+ 	
+-	# Apache 2 module
+-	sh "mkdir -p #{fake_apache2_module_dir}"
+-	sh "cp #{APACHE2_MODULE} #{fake_apache2_module_dir}/"
+-
+ 	# Ruby extension sources
+ 	sh "mkdir -p #{fake_ruby_extension_source_dir}"
+ 	sh "cp -R #{PhusionPassenger.ruby_extension_source_dir}/* #{fake_ruby_extension_source_dir}"
diff --git a/www-apache/passenger/passenger-4.0.18.ebuild b/www-apache/passenger/passenger-4.0.18.ebuild
new file mode 100644
index 000000000000..91fefef96324
--- /dev/null
+++ b/www-apache/passenger/passenger-4.0.18.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-4.0.18.ebuild,v 1.1 2013/10/05 13:29:23 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19"
+
+inherit apache-module flag-o-matic multilib 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="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+ruby_add_rdepend "
+	>=dev-ruby/daemon_controller-1.1.0
+	>=dev-ruby/rack-1.0.0"
+
+CDEPEND=">=dev-libs/libev-4.11 net-misc/curl[ssl]"
+
+RDEPEND="${RDEPEND} ${CDEPEND}"
+DEPEND="${DEPEND} ${CDEPEND}"
+
+APACHE2_MOD_CONF="30_mod_${PN}-4.0.0 30_mod_${PN}"
+APACHE2_MOD_DEFINE="PASSENGER"
+
+need_apache2
+
+pkg_setup() {
+	use debug && append-flags -DPASSENGER_DEBUG
+}
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${PN}-${PV}-gentoo.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)/" \
+		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
+
+	# Use sed here so that we can dynamically set the documentation directory.
+	sed -i -e "s:/usr/share/doc/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."
+
+	# Avoid building documentation to avoid a dependency on mizuho.
+	#sed -i -e 's/, :doc//' build/packaging.rb || die
+	touch doc/*.html || die
+
+	# Use the correct arch-specific lib directory
+	sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' build/packaging.rb || die
+}
+
+all_ruby_compile() {
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
+	ruby -S rake apache2 || die "rake failed"
+}
+
+each_ruby_compile() {
+	append-flags -fno-strict-aliasing
+
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
+	${RUBY} -S rake native_support || die "rake failed"
+}
+
+all_ruby_install() {
+	APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
+	apache-module_src_install
+
+	# Patch in the correct libdir
+	sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
+}
+
+each_ruby_install() {
+	DISTDIR="${D}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
+	${RUBY} -S rake fakeroot || die "rake failed"
+}
+
+pkg_postint() {
+	einfo "The apache module is compiled for the currently eselected ruby."
+	einfo" If you eselect another ruby you must recompile passenger as well."
+}