Version bump.

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

3 files changed, 126 insertions, 9 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index 97d329065169..a9c5dfd519dc 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/passenger
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.91 2014/05/04 18:30:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.92 2014/05/10 07:20:55 graaff Exp $
+
+*passenger-4.0.42 (10 May 2014)
+
+  10 May 2014; Hans de Graaff <graaff@gentoo.org> +passenger-4.0.42.ebuild:
+  Version bump.
 
   04 May 2014; Diego E. Pettenò <flameeyes@gentoo.org>
   passenger-3.0.21-r1.ebuild, passenger-4.0.41.ebuild:
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index f8f96b263d9a..91f163d934be 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -16,18 +16,16 @@ AUX passenger-4.0.21-gentoo.patch 1759 SHA256 86070ab8259af80eee024162340fbf53a2
 AUX passenger-4.0.33-gentoo.patch 1066 SHA256 f1eb0799b3b1dfbc35985aed4b4f972d7ab92b354d8f77d9fd6d9e1a7397603a SHA512 d2060b54e10ca75bf4876b6d6076e64fb182f6d07f3609893a71bc62f564d37016edffc6d5eab684864ecb15717c7e18116c94c763cf105203c76031df5b2a70 WHIRLPOOL 3f8db66d1d408dcd552ea7657058050676f6d430a7a07fef012cd28e272dfaf5f4d6f612033958d4904489f7a0bfebb9fee2f2de1a6dcd7ae335cc08b4026991
 DIST passenger-3.0.21.tar.gz 2657475 SHA256 82a79a2ff6803e1669ebf806ab320180990ddc096e3d30977ad1c86081b594a5 SHA512 4e92fe8cc679776531a73525ac0dd99612096c1370b4019dcda54aa928cbf6ba17c024124286342209a2b9d1ec9cb22d3783fc6bedc85cb9a0d0fb7561995eec WHIRLPOOL 11f9a5655e7ebcfd9f4a03a63d077126a0766ed7ad92e24494c3515202603782d3a8c999b4662004577d3463de68c040d783d9f93c01f95aa935289c0628780d
 DIST passenger-4.0.41.tar.gz 4060645 SHA256 7b1857e02280066d4be9123a1c13ead1eba280e60e3eba7b4f0e16279fd71259 SHA512 a65c1a2b3ef14d9ea03f0dab0588f96dc3edcc9752cc00d7ea9f8b5839d000e9a993dc9ce93cf9f3a94a7565aae338835041efbaf5272506e4adabf393078fd0 WHIRLPOOL def6f3ac303895f9d807a5a559f6debe682a5a7e661abaac4fc5cfaf5d56d968b9059e47e1966f56039a91c47230b1fdda98df2fb36f4cdad3627f2edb5fc1fe
+DIST passenger-4.0.42.tar.gz 3910485 SHA256 95ca998adf83b6d37bcbc3322fb65e8e6c053d1b9980fceac603858c795cfda3 SHA512 d299082dbbea938ac49f0d62cb5489bdd66dd4e9ab6f86f5c01eceb511c389eb1e6b4a102c25ee9de5a9f3c994f50e384197ac53a1e9fbdd1a1d8984275d3fc8 WHIRLPOOL a9b93302df8c87aeaf17c468801b7b8f9b0a3710a88fd85b867ef027f6426b37b0d2d90f46553de7f0daaccc9d2d55f515d993289ff0e797317348854675ad9a
 EBUILD passenger-3.0.21-r1.ebuild 3121 SHA256 62925e40e503fb4dc786bad538b7d241e8b3a4067bb06dd08a699e1e48c081ca SHA512 6678ea9b714c80c622074edd3f63d40cc5e57e7f68a479f9615b81271c1aaa33dc20bdcb047b0f122397effb68e1ea22b5fd2288bd47b69fc1e6006c753fe9cf WHIRLPOOL 29a97b40041cdc4cea999c0cc1f49debd0a41fb7be4322eabfb456df455b9ca8c5ca9b55c496b4efd771544432cda82811c73fe86036f68ecd7668f298b94cda
 EBUILD passenger-4.0.41.ebuild 3677 SHA256 53a499c9d41e7a94427836a1c128e183325b8d232a3fa2fc0befc0ad701c6b40 SHA512 3bde934d4049b0d2f8af67ab59c247bd415911cf86a600389fb2fcb115c2e440ae39995e363b0b65ab2c981c0da68fa4ded326a555d221ef39f729ee0d7be47c WHIRLPOOL 4a1c2486e3c37a6b341dfb3b2138dba77604571073d0033dca66b3021aa9caf66c105ca196d7ea9dac80db9317922d41018214078f901f3982623fbdb4bc49fd
-MISC ChangeLog 14212 SHA256 ac4e6bbb0f5de4d7c4f02cbb9712930c469c4a8a4fbd9b16f77f554eed299459 SHA512 d4e9a5905ec3ca9817ad7bfdd28c3b4fbf59572d9fd066df5373f2048ac50a96b04308e8eebf9ecab4cbc308f40ddff19c4cc401468b7d9d5a6779c182f6e4be WHIRLPOOL 5c3337460946139c1480ef39fd7960aa935f170e7518b78b64521b39be427da2be0ea733b54b956d0678f4d6bc057d66f847176cbcc90a5cf3b6c38ed6c7ac44
+EBUILD passenger-4.0.42.ebuild 3674 SHA256 94f9ff939cbc0d0314f244f97173a3f59d082701761b5ba53e0ea309c20d7816 SHA512 090337446021ad24165372a70c909e0ea35d73a601b1cd32af9f04c326925a7d6a7d8d1d01c64c73355a46ee8ba81f0648b10e610e28aad5a319c6d667f9bba9 WHIRLPOOL b098f99d4f0dc54e2fdb9ddc52c6d1ea5ecf505fd6b764cdad728c4c3b38a9c2a794e13c1a4877a0c4f25bada2d7987d502a110781181393b47e072dd6449d94
+MISC ChangeLog 14335 SHA256 1f5c2613171b54d8bc81fa385dbeb96fa46b85da7c77eeb2ba8cec99d96a37bc SHA512 c5f84c041cff850ce72ac53035355576d0c5d2d58dd76495da49d29814ef9e5a021da7eb00195a99219ae3933408c615bc8574a7781eb405f38c530dcbc486bc WHIRLPOOL a69340ed2cd755f61e9d7afdf87282efac7f889611c985ec865b9b70e50b5ca427fb81d2285f178f10178b4c5a2d73b3757e4a6067c079c8e571fe1cc1f268b5
 MISC metadata.xml 300 SHA256 587c979e6c7d5d5755ee3b7861a7b35038abf4c64633526eef338db1f6477c94 SHA512 fda4f74b7e039c72a54389253a980fcda052d25efe2d43f6cf3d54c67bcfaa20adf9fe74c292bf4774ce2621dd321c2e9f282c7c081e0145cc633de263cf6f4d WHIRLPOOL 8137bbdf332c5394440f888334cd32c0d2a23b12d6c46ae38c7bf74eebad100a25d5000f137a41baf449b607e5ea03688f311268982480ef5d3fe5ac757f76aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTZoc8AAoJEBzRPIrUMBNCnM8H/3bWV9rZYEexYh5nb3tAJiCT
-cQPiyQfk6O0fDkP9gdgDscAnhLBdRxvugTA+BUjiw0CZ6A1t4mKInno+SgXZzuzJ
-dTLCzxPDpeurXMddu9zqeeSxZaKtq3CtkNnfwcPjU9AtUXV+2WsDmSz+fWwQckV2
-HH7gbFNMbDRHmIMoz+DWRGK8PsT75OM9r6GG08XZq2EDzNcj5QDjh/wjUy6yzdIa
-ze3m+lR1unRuGyljoHFclQ82rY2y4dgkLx2Twi7ua4KUjRHxs4sl3qrs5zOjOkJ9
-/jUvINhwfZOwk/vNNc+eaKlftaEpoWWi0Iocfii/CUaUz4MCVqeB2N/RII4z8aY=
-=/m78
+iF4EAREIAAYFAlNt01gACgkQiIP6VqMIqNeQbAD9FmWetu+LvjHMSNR72Lzr4MOQ
+Wab8zRXLMgz7fvBebrEA/0o8qWq/X1aNOO3A/xLFLDsXJ8Dh38lz8du4GpB1Q0dN
+=Nya7
 -----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/passenger-4.0.42.ebuild b/www-apache/passenger/passenger-4.0.42.ebuild
new file mode 100644
index 000000000000..dd3912bfff38
--- /dev/null
+++ b/www-apache/passenger/passenger-4.0.42.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-4.0.42.ebuild,v 1.1 2014/05/10 07:20:55 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+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]
+	www-servers/apache[apache2_modules_unixd(+)]"
+
+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}-4.0.33-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
+
+	# Fix hard-coded use of AR
+	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/cplusplus_support.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}" \
+	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
+	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	EXTRA_LDFLAGS="${LDFLAGS}" \
+	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."
+}