Version bump.

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

3 files changed, 127 insertions, 15 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index aaa23689cdc7..28b51c04cc8b 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.96 2014/07/14 17:47:18 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.97 2014/07/17 05:48:53 graaff Exp $
+
+*passenger-4.0.46 (17 Jul 2014)
+
+  17 Jul 2014; Hans de Graaff <graaff@gentoo.org> +passenger-4.0.46.ebuild:
+  Version bump.
 
   14 Jul 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> passenger-4.0.41.ebuild:
   x86 stable wrt bug #512188
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 2cd2d9df991b..a6ac75dbad40 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -19,27 +19,19 @@ DIST passenger-4.0.41.tar.gz 4060645 SHA256 7b1857e02280066d4be9123a1c13ead1eba2
 DIST passenger-4.0.42.tar.gz 3910485 SHA256 95ca998adf83b6d37bcbc3322fb65e8e6c053d1b9980fceac603858c795cfda3 SHA512 d299082dbbea938ac49f0d62cb5489bdd66dd4e9ab6f86f5c01eceb511c389eb1e6b4a102c25ee9de5a9f3c994f50e384197ac53a1e9fbdd1a1d8984275d3fc8 WHIRLPOOL a9b93302df8c87aeaf17c468801b7b8f9b0a3710a88fd85b867ef027f6426b37b0d2d90f46553de7f0daaccc9d2d55f515d993289ff0e797317348854675ad9a
 DIST passenger-4.0.44.tar.gz 3928963 SHA256 201308c9d95ccbd7aa5167a22bdc4e403f90ba7a185d5cc51a840caa0c3cd30e SHA512 1a03209b43c33819d1291add1b811575d43f73086bbde11c8cdc40bec31d7dc3d4fadb9615a63344d3c81a03e2e2e4f1e28cffa6a2b66e649b427ef5fae62821 WHIRLPOOL 2505f1062842004e2058d5b8b859da3175ff0ec224b7eb0f4c82c7abfac73cf7f72fe8254338fbd1afc9b5aac8aef79c0553a1c78347896bd9933df74112fa7e
 DIST passenger-4.0.45.tar.gz 4363360 SHA256 5363611ebe5086b1ba699057ead3af1c06d0a70f368d1a41bdc399a45f934579 SHA512 c3e895341d318a3a429db243eae28bf69d932de311c969a6b6976138245a4ffd39e52dcac1e8520500dd6e08cfbfe667a6d002baaebea7ab9b7f08e60785018b WHIRLPOOL ecc8776ce5a6debfdfbe10396955603902c081cc721eb1ece0bd76906f54c511ef6237efd3730fbe662c80fa2ff55ca00d4080c21ec047f79c5fac86167ba74c
+DIST passenger-4.0.46.tar.gz 4392809 SHA256 c41156463bd7bc2f2c6655fb9f767a2f12f0e994ec5edd9c40c475439ce35e9d SHA512 4bb3a82d9bc03bd177a13cf8a2ef57818a7242a82afeb87a88ca5ad4fc8a7a984d1e7f767b7095ae0b07c97eab99bbff13bf22ad83689e5a943084949cfe5919 WHIRLPOOL 2b45a20a52994477bd2fdce91c6ef95e45551552f7dbf85465a48c5986d66b81e426b617448007b54d002aa549177370e43ed02b86bc6eda3457b5f58bd08b61
 EBUILD passenger-3.0.21-r1.ebuild 3121 SHA256 62925e40e503fb4dc786bad538b7d241e8b3a4067bb06dd08a699e1e48c081ca SHA512 6678ea9b714c80c622074edd3f63d40cc5e57e7f68a479f9615b81271c1aaa33dc20bdcb047b0f122397effb68e1ea22b5fd2288bd47b69fc1e6006c753fe9cf WHIRLPOOL 29a97b40041cdc4cea999c0cc1f49debd0a41fb7be4322eabfb456df455b9ca8c5ca9b55c496b4efd771544432cda82811c73fe86036f68ecd7668f298b94cda
 EBUILD passenger-4.0.41.ebuild 3670 SHA256 7325c1a6ee8460821cc327a2c87d1d0eb7740e861404fc102a1aa45428c2023c SHA512 fe572c20f0b3908777f470e0b6ba542e1b9ece00d8aecd963c800dd2b464f873d5e94574170fda77750fdb8cf43f813d1518969c1f37fd63d0e44296ed3bdbef WHIRLPOOL fd7787c1b409fd85d703f85c3da7ed78f72672d9711ed922e9d91a83b94587d4144eae5146cf5bbaa8ab0d54399c2a6e7de03c3f2659763118aa7ee6e2243346
 EBUILD passenger-4.0.42.ebuild 3674 SHA256 94f9ff939cbc0d0314f244f97173a3f59d082701761b5ba53e0ea309c20d7816 SHA512 090337446021ad24165372a70c909e0ea35d73a601b1cd32af9f04c326925a7d6a7d8d1d01c64c73355a46ee8ba81f0648b10e610e28aad5a319c6d667f9bba9 WHIRLPOOL b098f99d4f0dc54e2fdb9ddc52c6d1ea5ecf505fd6b764cdad728c4c3b38a9c2a794e13c1a4877a0c4f25bada2d7987d502a110781181393b47e072dd6449d94
 EBUILD passenger-4.0.44.ebuild 3697 SHA256 23a8afd9187a7ee1510301acc319effe4efc9e22a7459f0f707f43df45d10596 SHA512 b474f7cb2f569ec99f38ab229967d1c4f316e55439c7cab9d1c0e80d38fbc05a04da082827b35f03004f8d03e78746aae9cf3c204e161428fe3c567976f3590e WHIRLPOOL 3cbcdae191a0f4a764fd673c484ab0afcfdfb3dfa6340c7d1230c475da9fefba529fa4a0b86144750a394923f1e370163b6335c3b4ede8a1cad54518a584fe6d
 EBUILD passenger-4.0.45.ebuild 3697 SHA256 1fb7fbbf3c43242cc955483b6ff2dd26bd9f0a8d095e1c7b6b94470e9790f454 SHA512 4cace6641d978938b4906832a3cd68f3b378d6714b128016a8d0eb7cae0d7a3b6047da1cef67f81fd0567abc9e835c4dc3200375f405ab1f00fbe68115ac8902 WHIRLPOOL e36db178789915b355b4800c9c2b91210780e88226751c3e52fe2b3bf76e480734e8557162f08b2881319dfb372eec558aa8ff78384687cc2c774fedb12babac
-MISC ChangeLog 14821 SHA256 826b9c6738de1d983a75ff9f8300dd3b0b21cf7e1bce6ba51d1be6c9ca442c9f SHA512 bf0adde56ddf365e13faa742c6e22e2eb892ae79b829d11f974b6fb2e0eb71fca1e3ae80837488761ecb2eaf3eea48bc2430510234a57c82fd9326edac2607af WHIRLPOOL 71baf38d8e0f5d19ca5ce7982e2dc14be53a1343285a0e9146f2f6ffc4c5f773c1fc95bfbf586fc87bd2b51035e2c74aef79c0e2ea6c719cfff758b25565dd63
+EBUILD passenger-4.0.46.ebuild 3697 SHA256 ed1ecbc13c45eacae6ae6796439b0d7c8b51718ac605df3c402d391784ed8b3d SHA512 d5fb4a1ba7205f2c501e33421b9f3ff3640f877b378ee7d627e361c9f7a3580f775829064b8b4f8954535425e9837833551574e2f5a8d6a9d893512b08e91f8a WHIRLPOOL 26d356d1545a0cb7b676f1ec86f0545c7ccc3889af8c116a2dd571b542259268c9d628a773ecb4cea02e7baebc03e20b8068c53e3ccd9d472e932d7d0172a95a
+MISC ChangeLog 14943 SHA256 bfbf69364b37f7dc880b7dcbb4f4524ae56dfa867b54966c5f7105935f48917c SHA512 4aed65802b5e2cce5e87abcc4694665b09fbb9c82095387514b525ab148f80e706e0a6599e61f6605d8270b1028962b85b111e4bf465021b9a58b76fea5e4c92 WHIRLPOOL ce71dbc3f94d7634499e063d460292f68b5e3418a4c9e1ffddb90197ffa27526b049a08dc09f38e39c3d04acb68302c1595284736ea19c5d47acdb06d8277010
 MISC metadata.xml 300 SHA256 587c979e6c7d5d5755ee3b7861a7b35038abf4c64633526eef338db1f6477c94 SHA512 fda4f74b7e039c72a54389253a980fcda052d25efe2d43f6cf3d54c67bcfaa20adf9fe74c292bf4774ce2621dd321c2e9f282c7c081e0145cc633de263cf6f4d WHIRLPOOL 8137bbdf332c5394440f888334cd32c0d2a23b12d6c46ae38c7bf74eebad100a25d5000f137a41baf449b607e5ea03688f311268982480ef5d3fe5ac757f76aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTxBeoAAoJEE8aJVXqcZkdKQUQALfNgrEIdt7aOvGsWA7MXJ4q
-YOo1HZhLGyoPZMYemj+noKJ1fAvlwV+h1giSfEekFnpSFMNGGg10W8W4r3n0v3Ek
-XoyJDV9+JPXOcNkXH+IfAPRVenp3yTeN42YIf5qEjjeB0XzM8SQi9FQCOTp2NKkP
-fBkuflO2EY5yrXvKByW4ObgcdAtLp0eX14T/wMJITSKTPm478YO9M3xwRxgTs4zP
-lL6WY6MGKAHqEYvSliTnyP8ssXOL5nMPlJwgrv0aR2ud3hUPkzB8qxdhFxE7EMpG
-KoAGwTsHjLvMaXmaMGlWABX3LhARJLhhWd9/2fzw5QbEv51Wl1boEUIZIe8zzd8Y
-nECAnofWGZ6iRMnavKwJ4BcvaQujGOFH0R3Yo6Hz0qI4qVplNqBmbUZ5ar/Haddd
-G5V9xiGQ3Y91hb/G/9Oqd6aBADdid4HuaSCFsRYluGDbR2ggkabWM5q4aGNTS9Em
-Vvt3AXyMK9KQrAnI1vXZK6e0o+w7mbBujz/ugTKDItWEYUj8EhOKwEQnwTzYW1Xv
-9XLXZZDDG7xaVgDTaOa6fRadg2VxV0B6REWI/06+1G7awg8f4JWMPB2RKYKAdmaD
-r/LsLD91FB1qq0naYbhfWGPYk0UbEPOiR4gZVd0bDpQlGz89fMCojuxInk/oikCI
-/z5MQPvT6lpb6rOkAJuJ
-=OmEW
+iF4EAREIAAYFAlPHY80ACgkQiIP6VqMIqNc9IwD9Ed8rBuRI5gzJIlfgZvk3Qt/b
+EZGJ2ztvFeesrkTshHsA/AyF3cI032gqm2Q2KkeX5NsuoCJ4UbbTXVUBtZUeNPH7
+=J6Ew
 -----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/passenger-4.0.46.ebuild b/www-apache/passenger/passenger-4.0.46.ebuild
new file mode 100644
index 000000000000..f8590284b4e4
--- /dev/null
+++ b/www-apache/passenger/passenger-4.0.46.ebuild
@@ -0,0 +1,115 @@
+# 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.46.ebuild,v 1.1 2014/07/17 05:48:53 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.2.0
+	>=dev-ruby/rack-1.0.0
+	>=dev-ruby/rake-0.8.1"
+
+CDEPEND=">=dev-libs/libev-4.15 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."
+}