Version bump.

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

3 files changed, 127 insertions, 5 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index 93dca2d08c36..8074195f39d5 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.94 2014/06/02 18:28:00 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.95 2014/06/13 07:04:20 graaff Exp $
+
+*passenger-4.0.45 (13 Jun 2014)
+
+  13 Jun 2014; Hans de Graaff <graaff@gentoo.org> +passenger-4.0.45.ebuild:
+  Version bump.
 
   02 Jun 2014; Hans de Graaff <graaff@gentoo.org> passenger-4.0.41.ebuild:
   Drop ruby21 to create a stable candidate.
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 2c114e2c637a..2aceb86f0eeb 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -18,16 +18,18 @@ DIST passenger-3.0.21.tar.gz 2657475 SHA256 82a79a2ff6803e1669ebf806ab320180990d
 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
 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
 EBUILD passenger-3.0.21-r1.ebuild 3121 SHA256 62925e40e503fb4dc786bad538b7d241e8b3a4067bb06dd08a699e1e48c081ca SHA512 6678ea9b714c80c622074edd3f63d40cc5e57e7f68a479f9615b81271c1aaa33dc20bdcb047b0f122397effb68e1ea22b5fd2288bd47b69fc1e6006c753fe9cf WHIRLPOOL 29a97b40041cdc4cea999c0cc1f49debd0a41fb7be4322eabfb456df455b9ca8c5ca9b55c496b4efd771544432cda82811c73fe86036f68ecd7668f298b94cda
 EBUILD passenger-4.0.41.ebuild 3667 SHA256 176b5f079401915c21df8a536433552fb998c18735b6eeb5110aee4496c06ede SHA512 190bad4c4632d98040b6c49d56752c624fb66b7ec52feedbd30bfffe761d597b48a1125e1a702fc0a562b048de0b52e538174317c635b2d79e0c80ee5343228f WHIRLPOOL 1d63c87c1865fb978ed3b0a8cbc903d9d43370faeed21f29ac50a2dd663ba5c506297c26a0e53a5064e63c5933eee5008eea43a0b90e243afaa4d183f732d98e
 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
-MISC ChangeLog 14581 SHA256 6afc982eadb066e3081189e6e190ff226a62aa2bbe956783ec26377209d6e69c SHA512 f55e34fcfc27b3b93f41f798d4d02ce5a16cb9f07b0b892a7694a462fa6632dadf3d9668499d081dc1f6644a859eac9de1cc96006a342f688af420844827ff26 WHIRLPOOL 311f17d0e199cf1476f51d155c62abd6e2c872e130384e1209db44ed81c99f0c5dc3dcc9114d9fb7d1627ea33d1877f2574ebc08447e677e48b344689375ed89
+EBUILD passenger-4.0.45.ebuild 3697 SHA256 1fb7fbbf3c43242cc955483b6ff2dd26bd9f0a8d095e1c7b6b94470e9790f454 SHA512 4cace6641d978938b4906832a3cd68f3b378d6714b128016a8d0eb7cae0d7a3b6047da1cef67f81fd0567abc9e835c4dc3200375f405ab1f00fbe68115ac8902 WHIRLPOOL e36db178789915b355b4800c9c2b91210780e88226751c3e52fe2b3bf76e480734e8557162f08b2881319dfb372eec558aa8ff78384687cc2c774fedb12babac
+MISC ChangeLog 14707 SHA256 0c575afd06f9ca81bb337382cc3709e952cdae8e56c3a4d9af9249b8bb947217 SHA512 79f36f63a490731e83ec345d20eafdafdf2b9142ad0cd473e40b297397a13e4af5cd0ad0de093e863871461260ceef4d6d9816945d1f644bdc8f4dcd204fe50a WHIRLPOOL 375ee53ca44d5f96bb617d2bb1cc068a6ac065e63bcea8fa0c8895e50cfb37497bda382c2db44eaf24eabbe17d4a8f72ffe4e2f56f25b4bd6c4dac16f706d176
 MISC metadata.xml 300 SHA256 587c979e6c7d5d5755ee3b7861a7b35038abf4c64633526eef338db1f6477c94 SHA512 fda4f74b7e039c72a54389253a980fcda052d25efe2d43f6cf3d54c67bcfaa20adf9fe74c292bf4774ce2621dd321c2e9f282c7c081e0145cc633de263cf6f4d WHIRLPOOL 8137bbdf332c5394440f888334cd32c0d2a23b12d6c46ae38c7bf74eebad100a25d5000f137a41baf449b607e5ea03688f311268982480ef5d3fe5ac757f76aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlOMwjEACgkQiIP6VqMIqNcrswD/RlBDqE3Y4GThYSfz2mCnc9QJ
-gyuPOYVckstsFnSsCmcA/0mCr5cW1fgQxq6eudRQS7HTMKM/KwaWbLw1XbALpXou
-=6pNn
+iF4EAREIAAYFAlOaonYACgkQiIP6VqMIqNf8hwD/WGexKVbHbraxIA9Ku6CaAAKx
+8484FTDahTpGYIp5cVMA/0OTIe+tH+pn8iQSL/4pnqX1qMB1ASf06H668cHo/h7L
+=3bA3
 -----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/passenger-4.0.45.ebuild b/www-apache/passenger/passenger-4.0.45.ebuild
new file mode 100644
index 000000000000..22eba44d7ecc
--- /dev/null
+++ b/www-apache/passenger/passenger-4.0.45.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.45.ebuild,v 1.1 2014/06/13 07:04:21 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."
+}