Version bump. Add ruby22.

Package-Manager: portage-2.2.14/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 fb25c14df495..49b1671a519e 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/passenger
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.107 2015/01/17 10:00:37 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.108 2015/03/02 19:48:12 graaff Exp $
+
+*passenger-4.0.59 (02 Mar 2015)
+
+  02 Mar 2015; Hans de Graaff <graaff@gentoo.org> +passenger-4.0.59.ebuild:
+  Version bump. Add ruby22.
 
   17 Jan 2015; Hans de Graaff <graaff@gentoo.org> passenger-4.0.56.ebuild:
   Remove obsolete pkg_post instructions that are no longer true for Passenger
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index c0eb9f05f53b..b814c0a6c3bc 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -19,16 +19,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.53.tar.gz 4447609 SHA256 0b8d256cd930f93cfe723392aaa12fa3f9d5ddfddc82bbb7ab287673d029e101 SHA512 45919317c42da898783a22095fe75ed26f9142d227a25f5546f16861ce8c3ecfe2d804a845d389a00019df914cafd7625dc4e8fb31bc2f4ede5ecf41ce69c2a7 WHIRLPOOL fd205aefdec95eee82165d5a65e3dcf112544784549aa51d8a52703b51242120583e64837604ba31957e2cc98fb85a164f9ee19c367980869e0ff0159759c492
 DIST passenger-4.0.56.tar.gz 4520584 SHA256 d09de65d7ac2598f9d383bbaf27c0cbb1c46a9556397a18c8c0e3bee08f3e645 SHA512 a778cd2a2b6c2d6cf9d32e74e5d96414b2cfceb8f7ad918e12a8c5a65b08b5db1e3b96d8cc2353c1fd6bd309179faf48bf303ed536a2d85a8517c3fa8ee1d1d9 WHIRLPOOL 44efd0c011a057b32444e74ed26be77e0fcf4e11fe092023a12d9c415a337e69bf716e35af050bfaf117f754498c9a6da7df646a5decffe56b0290b2f1d5970c
+DIST passenger-4.0.59.tar.gz 4521206 SHA256 8b4756564a5133dc97425883d15d1ba1c9f6566c79e92794dc3e1f5b749238ae SHA512 d29400c71cf9530b41ce8b8d4cf94007e4d77fb4ceff290786506d6b9dfbab790f18423dc5dcd71aef07147ba2610c2982f7ca733a8e491de6a0cb3704c54bfb WHIRLPOOL 4683d19813ecbb284ec3eb9681c6c1a1b84f256f0262e6c2b1941df5872031a30da1396cb22fa1cfbad2f53f8971131ed0418c2ef4c20160a3d67f151d54208a
 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.53.ebuild 3821 SHA256 59cf3f9bb2ec61eefdcb41f765eb2f98cba9aae3baa2120512f853738e6e52d9 SHA512 e5389588be6231a4dbe03576da4ca01b089ba61ea51f9c5fc819071cf95f547bc27582a35069b6dfd3c494b750e07127f97af246d682ca11ed42332d91a241c1 WHIRLPOOL b7fd8d7abf0f012ebf91c48bc9efc3fb301bf1a72160b1382536fd6783a0ee226415e2694f6c4310434c4927593de2b80bd3a2cfa2a020b2e2e70d7d895641f1
 EBUILD passenger-4.0.56.ebuild 3689 SHA256 b832cfa0b93796dc3ce57801b6c221359417e72e6ae835dffecd62866011d328 SHA512 6f7d5de657ef753004e8842ef4c6573ad031ad0aa6939261233c8fdd4b57cf7b8a1427eb4100f3f73e243a832d90adea1a35aabd0d1ca7752c30b50503e0ee27 WHIRLPOOL f2d5c2c2d21bf06f0a97f7621a4d023158772ca21376e8a7a0ec78e4579697c8d9988ab43526a8a16c46019c1dd2c8637303bd80bd82d6a8d79e9afff65cf419
-MISC ChangeLog 16316 SHA256 5a3a07b014c7968725295ebb1877c333a3809571da047c7be38c966edf3dce2f SHA512 1cd0f544c19f4fc414d54657657e9664904f019c11f72176af2ecd96cf81686b81e4d1ff0c2d73d093c0911828796ed7e6697a2e2a2ed5cfd015cfc196e00e8b WHIRLPOOL 32845f2868677eafc3649499a1b36f9ed1f37a0afd792fc34c9eebd500aed7467153bcd7b071a7bf02015d5bf6f46f35e751defa4483f510395f78648244aff1
+EBUILD passenger-4.0.59.ebuild 3696 SHA256 f7bce81db6215280765ab7703d32915388917526e7b7ec49ba0f1c423690f5ce SHA512 d9ddb0400f08664d9d5faf28c972cf7e689fe48a09bce11aed39eb4f69f49a3147304770d5662381fea3fa09a588b4167b97d11a75cb3e2749d74de78ca0a512 WHIRLPOOL 1bd9cac71c50c7ac62d83aaa2c6b574a8b4bc2ce44693a017800381ae06a45e35587d9bb2e130ff3654d2bf246290222ab7059d0ca18b29453d23cd5c6b24256
+MISC ChangeLog 16454 SHA256 d1e1abd2d068d6179cf8af5002f5bf0349782af1e1ab1b4859bb0b64da9b8246 SHA512 30075d3588dd935d5f884a0149cbbfb2d3a8e7a5ff183a6514d217c5a540e0506d05a562fcb48f7702d37c74668d0234291b2aae2e9838d9866aa90fda133362 WHIRLPOOL a08d85478165a749eb320837fbc926c2560e1c23bfd33a1390d129e95eb8f2660d0e85237498e5b96bc1584d6c49329cf8c1b24041fa64e90c40dd6517f544c9
 MISC metadata.xml 300 SHA256 587c979e6c7d5d5755ee3b7861a7b35038abf4c64633526eef338db1f6477c94 SHA512 fda4f74b7e039c72a54389253a980fcda052d25efe2d43f6cf3d54c67bcfaa20adf9fe74c292bf4774ce2621dd321c2e9f282c7c081e0145cc633de263cf6f4d WHIRLPOOL 8137bbdf332c5394440f888334cd32c0d2a23b12d6c46ae38c7bf74eebad100a25d5000f137a41baf449b607e5ea03688f311268982480ef5d3fe5ac757f76aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlS6MskACgkQiIP6VqMIqNcWvwD+NG4kmVAMqfCePe/uwRPr5y9R
-p3scieJZkhCFOBeA3ZIA/j4e3JqlACtzUc3F5klZUue9B7h6oGj+IQZdci/nr9Mv
-=rKh/
+iF4EAREIAAYFAlT0vn0ACgkQiIP6VqMIqNcLIAD9HmermUWl+oWYZ/Le2rE35q50
+MSH4VBSK+rvf+a4VhjcBAIDjBHorj8gbRjyo8sxjsnepf+fRJFZL1IGzE6I0Eqm7
+=8c/U
 -----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/passenger-4.0.59.ebuild b/www-apache/passenger/passenger-4.0.59.ebuild
new file mode 100644
index 000000000000..229487e9b3a0
--- /dev/null
+++ b/www-apache/passenger/passenger-4.0.59.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-4.0.59.ebuild,v 1.1 2015/03/02 19:48:12 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+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"
+}