Version bump.

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

3 files changed, 132 insertions, 15 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index 90adaeb19b1e..e9d38aea6dcb 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.103 2014/10/30 14:17:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.104 2014/12/29 07:30:40 graaff Exp $
+
+*passenger-4.0.56 (29 Dec 2014)
+
+  29 Dec 2014; Hans de Graaff <graaff@gentoo.org> +passenger-4.0.56.ebuild:
+  Version bump.
 
   30 Oct 2014; Agostino Sarubbo <ago@gentoo.org> passenger-4.0.41.ebuild:
   Stable for amd64, wrt bug #512188
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 30c8818b7f9d..4a88d16244f3 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -21,28 +21,20 @@ DIST passenger-4.0.48.tar.gz 4392898 SHA256 0fe6a42c82eee59511b04aa683f65fb4eaf1
 DIST passenger-4.0.49.tar.gz 4432910 SHA256 8b1f3fe9194d46a65950acce2c0cbda6a211ba26c0dd55a0e24d6b96dc7a07ef SHA512 8d027b50fe6691da099a4726bde23c5c239f869555bf9e6e7b2b8875a0c06c1a2d7790ca01aaecdf7ebb8add619c197b5948d31f030b6bbeb17caebc3ec248fa WHIRLPOOL ecc7e3047daa087b09d79294cc5f97db3fba1f47b1e6d9696bac24d6f23694e873e19efb0f03dc2bde5204cf0bcb3d9095c9a273dcba9e583f6ebedcd9981f73
 DIST passenger-4.0.52.tar.gz 4447196 SHA256 ec57db39cf6f45d9b205062dbd78ea5cbbdc908a49b691be278decf61a98122d SHA512 4f3564ce2e5c618fb30cc72911c29c6e653049c56a7b922733eb97ac99b88e1c5d61c925acd2da5abd0ec89fbb5389cbc0d9be6824f68d66d820a1b998a55e89 WHIRLPOOL 1a4dcd5b18cb0ae36301c1388834753902af7dafd37a9e9d96e754e976e61e20090c2d4055d650357c47cf8d8a8812a383fdfce44de717b0f2fcbce028108e12
 DIST passenger-4.0.53.tar.gz 4447609 SHA256 0b8d256cd930f93cfe723392aaa12fa3f9d5ddfddc82bbb7ab287673d029e101 SHA512 45919317c42da898783a22095fe75ed26f9142d227a25f5546f16861ce8c3ecfe2d804a845d389a00019df914cafd7625dc4e8fb31bc2f4ede5ecf41ce69c2a7 WHIRLPOOL fd205aefdec95eee82165d5a65e3dcf112544784549aa51d8a52703b51242120583e64837604ba31957e2cc98fb85a164f9ee19c367980869e0ff0159759c492
+DIST passenger-4.0.56.tar.gz 4520584 SHA256 d09de65d7ac2598f9d383bbaf27c0cbb1c46a9556397a18c8c0e3bee08f3e645 SHA512 a778cd2a2b6c2d6cf9d32e74e5d96414b2cfceb8f7ad918e12a8c5a65b08b5db1e3b96d8cc2353c1fd6bd309179faf48bf303ed536a2d85a8517c3fa8ee1d1d9 WHIRLPOOL 44efd0c011a057b32444e74ed26be77e0fcf4e11fe092023a12d9c415a337e69bf716e35af050bfaf117f754498c9a6da7df646a5decffe56b0290b2f1d5970c
 EBUILD passenger-3.0.21-r1.ebuild 3121 SHA256 62925e40e503fb4dc786bad538b7d241e8b3a4067bb06dd08a699e1e48c081ca SHA512 6678ea9b714c80c622074edd3f63d40cc5e57e7f68a479f9615b81271c1aaa33dc20bdcb047b0f122397effb68e1ea22b5fd2288bd47b69fc1e6006c753fe9cf WHIRLPOOL 29a97b40041cdc4cea999c0cc1f49debd0a41fb7be4322eabfb456df455b9ca8c5ca9b55c496b4efd771544432cda82811c73fe86036f68ecd7668f298b94cda
 EBUILD passenger-4.0.41.ebuild 3662 SHA256 f9ca21e4467e35cd05ece5b30abc9d4ef5ea426d20de68544e7573d9299cce1e SHA512 a4f3791de69faffa71480da47b575a914cdeb71ac2366d2522f0c437b8ee77c12ff53589b9e9a14a7a60ab048def42d8165af51bcacb30fcab9203501b65da63 WHIRLPOOL d79a21f84347a9abb081e90ca2f63974793b348d2b2ee2c05fd9bf2b450bea902a508e80c49601ee8286064fc2504c04967dc0ae6e39a116354dd16ae6f210f3
 EBUILD passenger-4.0.48.ebuild 3697 SHA256 ab44b1315b0e16dc10c30aa36cdd57efa81afcb5680a4b92a31d2841827deccd SHA512 6ba725bedc870317df45fa1f131dffabf6e398b592a052695f083994ae4fee51bc7699e7f48f0e281a4ad922593ae70ab242c41f888b35597dbda55932933389 WHIRLPOOL 47393d614ec699cb0539904e4694c1541c4d4e008a741825c0b9f18fb0da9126bcd0e568185e6b7c3a2ba72fc4cb3135a945dddafa341dffce50f0a2fdd499e9
 EBUILD passenger-4.0.49.ebuild 3697 SHA256 e55bac78f8fd07053f15923a8abb2143767e68fba220b46b26c5390c89167201 SHA512 cb595642e70ace5ee8de221e80b46a54f3bf2a3a7b83de22a8fe699ccd3b8a3845ddb012ec9674aef2b154bba256254cccc0249911704057767399c93fd15e96 WHIRLPOOL bd64e25a7bab46f093eba4006045c8b5051fe4a7dbb1e41fa18c05b4842327972097630d7c9b37d5a15e20e17ba7781ffc6559bf387906f7c9fe25de1ec353da
 EBUILD passenger-4.0.52.ebuild 3828 SHA256 4be5e0cf46d8ab5e5a02daf8fdde88da668971f136cd4f6ef7959a272c53dc11 SHA512 5b302eb77d5509d9cb505882d80614f255a0100a00f26d63231a53152baa13db4d0298b85286bb814040955746685d7aa07cf11ef31b77d50b06ddebe6d1a027 WHIRLPOOL a668c3c3841604e30332e1fd4f77a9a636bd22aabda576dded5e51b2d44efd30551bf5f29c819bdf578113931d6eb7ce7c3659600b87a04a1b4f7e6d4100a2ac
 EBUILD passenger-4.0.53.ebuild 3828 SHA256 564f16ae775fcd74b2a250a141330b13a847c699e6a667e7d32ac9d421b93fa0 SHA512 ac1d199b7b669ff3acf896d6a71e9f05553210df9db668829c2e74dc8f51d8245c3fac02f15c2b2535e7a21004e9a232015cadf4e987e2a78be2689f4292be42 WHIRLPOOL 54ab419bdcfdda5e8c0a1f3c6336805accd83b025a0e955389c5140c4a8b29287c476fac7f4562e9b86fa4d30ad28654aef84f209fe66d7e1b5439f11a8bf38f
-MISC ChangeLog 15764 SHA256 60edeffc0356a2bf55fe2b2f7d2240d9db217a7c416ebe348fb41e1375cccad6 SHA512 b2b7622abcc80decdce21be146255d64cfe1a47772b32035def506749c40a9ea305c2ec20540bd061303791f8e35cf33b4cad6f123c867a34025f1b8f92eb545 WHIRLPOOL a4b5b6840ca4238cf3d0860affcc5b5848a56410f2d60b601d1b523012d8baeefb99f0e95b151917a1ba09f672de137424024a9083e977b94f3e7614f9d1398b
+EBUILD passenger-4.0.56.ebuild 3856 SHA256 38a4ab5cd40b7c5aad9ad0c338f739e79c3902b517eaec6c22fbcefe4879f469 SHA512 8a0ff27f0032585d9ece71330d8cbb56e682212105133aa483da4d97be6e84e7f8750fa5578de7f4420349c6c9e3916363e681aad1a4c9d76938ae3bcf3deb13 WHIRLPOOL 7b63eab37c812c4d34e76f30fa07fe5fc85cd968e55def97adb6a5793041bf6ccd1224f9e44a78c225a24b0904223896b522f7adca517b591a14f05451e2109a
+MISC ChangeLog 15893 SHA256 5de0845d18ec90a73cfee06530881a9da45ae1c5a3f23d1404688330d75ae23e SHA512 dd3bbe38dedcdfa15abbef3dd10b3f592de5274edc28a0fdfa5ac284241929db8c62122d1a4bb4f517419ac0572519268dabb64f91b8c4a2ae28b58e9de6b827 WHIRLPOOL 199e9c4d3220613834d848129ebb58eded1f54c01370ca2d7504955ed940f14b31a141272d0825c8074521c955a3a23e2dc84291d2b9de1f4ca1a6b64001931c
 MISC metadata.xml 300 SHA256 587c979e6c7d5d5755ee3b7861a7b35038abf4c64633526eef338db1f6477c94 SHA512 fda4f74b7e039c72a54389253a980fcda052d25efe2d43f6cf3d54c67bcfaa20adf9fe74c292bf4774ce2621dd321c2e9f282c7c081e0145cc633de263cf6f4d WHIRLPOOL 8137bbdf332c5394440f888334cd32c0d2a23b12d6c46ae38c7bf74eebad100a25d5000f137a41baf449b607e5ea03688f311268982480ef5d3fe5ac757f76aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUUkiPAAoJELp701BxlEWf0pAP/Axw9pVu5JrVBiWIA6KaSC6P
-6Ofu+NGixTAIdki0rzSwvenR5hFZUrODtUuL3tS9ipF3YJ9NXs9N4j5dE6iqPJE2
-AZzQwGzW0lkIMtHY1md33jf5sPUBQkuKDxK6+U4mKv1oRPCm+2lj6+0rzOuWFodn
-uDP0zXL4D2Y9TaTVbnqmUarK1o/cU03PXv8LSfz4YbGPOkau3C6atdRgce28VfGG
-EWYVzxbTmTd7pRn7/rAypLZShhraSfu5crgPVPkad5VwmZC9pHmb2f7MQs3T22ZO
-COpvX0Ug+htM0vaSSW6QlKEGdQmHoXjbZYKlZ8aEmiErm32QjF1mUTRpASpa4/a4
-SECTznyQ2cq85Mn+5jelmS2FbEaoD3dDSrEIM1M27x8YkgWIB0f3quxyjxEdnRrt
-Mhbsi68BKr+APRTewa28qxO2Ek9OJdFSAvp/qVq7+wkcvsY6vM17WKx9VpYcAoOV
-3o8ukPGoPck+S8dFA6g4rvssvkdoKPRgdNe3f4/ba8GSWchKCgYod8o/6ykSA7Si
-FfjwCCorMOFleWQySeqlwfYz0ddVTxU4AQ7OqgqRuWzEVRvJ0LBea04kEgRKjpNp
-T9nTucJqwOIpj8HVpQd09Ew258svpCguDH8nzwBUX48fICKS17QAUzAK+8uMvEaD
-Pi3TeLRt9K2VsrcpwjBu
-=8Eyh
+iF4EAREIAAYFAlShAyEACgkQiIP6VqMIqNdBHAD8CElQycT1eaP7GsDDGT0RQUCe
+IUg42cV1m+0QSAoyLmwA/A+phQylHsuXgmAvdt/qcT+wkq4zc+5glGqlum8nx222
+=z/F1
 -----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/passenger-4.0.56.ebuild b/www-apache/passenger/passenger-4.0.56.ebuild
new file mode 100644
index 000000000000..c848e9196288
--- /dev/null
+++ b/www-apache/passenger/passenger-4.0.56.ebuild
@@ -0,0 +1,120 @@
+# 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.56.ebuild,v 1.1 2014/12/29 07:30:40 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.49-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
+
+	# Avoid fixed debugging CFLAGs.
+	sed -e '/debugging_cflags/areturn ""' -i lib/phusion_passenger/platform_info/compiler.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
+
+	dodoc CHANGELOG README.md
+}
+
+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."
+}