Version bump.

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

3 files changed, 130 insertions, 5 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index 2afeef949184..04a71ef96b79 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.114 2015/07/11 06:28:52 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.115 2015/07/18 06:05:16 graaff Exp $
+
+*passenger-5.0.14 (18 Jul 2015)
+
+  18 Jul 2015; Hans de Graaff <graaff@gentoo.org> +passenger-5.0.14.ebuild:
+  Version bump.
 
 *passenger-5.0.13 (11 Jul 2015)
 
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index fa474fd0a4cb..121599b11464 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -20,17 +20,19 @@ AUX passenger-5.0.4-gentoo.patch 1103 SHA256 a6d1a18977270545a3c587268b7c2459563
 DIST passenger-4.0.53.tar.gz 4447609 SHA256 0b8d256cd930f93cfe723392aaa12fa3f9d5ddfddc82bbb7ab287673d029e101 SHA512 45919317c42da898783a22095fe75ed26f9142d227a25f5546f16861ce8c3ecfe2d804a845d389a00019df914cafd7625dc4e8fb31bc2f4ede5ecf41ce69c2a7 WHIRLPOOL fd205aefdec95eee82165d5a65e3dcf112544784549aa51d8a52703b51242120583e64837604ba31957e2cc98fb85a164f9ee19c367980869e0ff0159759c492
 DIST passenger-4.0.59.tar.gz 4521206 SHA256 8b4756564a5133dc97425883d15d1ba1c9f6566c79e92794dc3e1f5b749238ae SHA512 d29400c71cf9530b41ce8b8d4cf94007e4d77fb4ceff290786506d6b9dfbab790f18423dc5dcd71aef07147ba2610c2982f7ca733a8e491de6a0cb3704c54bfb WHIRLPOOL 4683d19813ecbb284ec3eb9681c6c1a1b84f256f0262e6c2b1941df5872031a30da1396cb22fa1cfbad2f53f8971131ed0418c2ef4c20160a3d67f151d54208a
 DIST passenger-5.0.13.tar.gz 5556161 SHA256 9fef27b97e883e6bc55d817c52b927f2d5cd8bbc2ce79686a3de794d7e0c40e1 SHA512 68ff1e6701e431b1e26ffce8dd46198fffdddaa14bfa2f3917a20d32a7d54b3acac46d1ce797b551d9f988e7e0129d8372158f2e096342e08cb1a614d9fbf716 WHIRLPOOL 85282b61b675a0459a33208dd267d9e3b2284134bd5931df619041b5e4a2265542f9355e7f1feae2c98ffc27128504ecd46dc6493e8cbb8d55e7f9dfbf5deeac
+DIST passenger-5.0.14.tar.gz 5557110 SHA256 dbc994a9d8a0f28f2abeec25191471bbfec6e51d3e0748d7e16947bc8713f6d5 SHA512 39540136547db1b21c61174a4e86a4b5255c1f59036abbfc571eaee6fb03c48d4ec262d7fb1f1a27bf08b093112d8aaeb09c294304b597d0fdcd1fc278167b79 WHIRLPOOL 8cc983685142abbde9e85b12ee7283246fa7ebd627d56516328d6fc2ad5362439da9fcab37fffc129c2b4e992834c5efd09cfa9ee570d2c577dfd27ec8c56f95
 DIST passenger-5.0.4.tar.gz 5289792 SHA256 5c29f2c1407db515ddccd540443cb34bff7ca180b3e269c2e28a34ad795f99f6 SHA512 a04bcf579a8148b34c34743a87f4f3b180218e871ed6309d7b83e9b4ab88334f01a566896c7406e3ddaf11ba0322128557cf5cfb2bcf5da7e4ea81f0539784ec WHIRLPOOL f2d523266a616d2b893963d5139be0d781a2bf76b122b4c76bb5cb6af7a655e5492b8c58d2f38f97858616108d0c3122278598fcfa7a262bab252e079e888536
 EBUILD passenger-4.0.53.ebuild 3816 SHA256 a2492c78c24bd88cd2e7a50af626cf0187df59a3405ede45273b0fb5b5f7111f SHA512 5008a541a8a3a5630571cec11037929ef7ea7be002da902bc331eaf07fc0258d76dc96ac3d9a09ae02ad9e32bb1aa1060838bc9026c08f695d2d502905fe61e9 WHIRLPOOL b5753ed52d2a4ff5febe2a506b7d16d9d10f7bfa3cfa24bc1fa012ec1359010580d683b0ff489fdd0145d47365ff9de4e9bcdb180d5a1a3517f842da7b66ad2a
 EBUILD passenger-4.0.59.ebuild 3696 SHA256 f7bce81db6215280765ab7703d32915388917526e7b7ec49ba0f1c423690f5ce SHA512 d9ddb0400f08664d9d5faf28c972cf7e689fe48a09bce11aed39eb4f69f49a3147304770d5662381fea3fa09a588b4167b97d11a75cb3e2749d74de78ca0a512 WHIRLPOOL 1bd9cac71c50c7ac62d83aaa2c6b574a8b4bc2ce44693a017800381ae06a45e35587d9bb2e130ff3654d2bf246290222ab7059d0ca18b29453d23cd5c6b24256
 EBUILD passenger-5.0.13.ebuild 3823 SHA256 47c646fd60cf9753917da514b94b6092dc50099e7819b322712935d23146b4b9 SHA512 620d46bb641c08fbce74085121520e525539858e2627e41181991bc7a4eb841c3f74db20699f3ee72c7741d47f05a870770f606506acb3b774006e5a6c189608 WHIRLPOOL 7d2ab352948a1fc234614a6503f231ed2b818d05457ecf8e480c843e3dc6e655d19457b7083878fd726fc75d9a3fbe52ac49e33b56366b94cf29c4e964efb790
+EBUILD passenger-5.0.14.ebuild 3823 SHA256 d2612a78d54b245f9f9f6856cf24e728c0f9d33be451ac4180f19a6e6764fd55 SHA512 4703d30efbbe05b64aff2d0c1123cb24cf9eac087b897fe17056c7d83fb3db85bc130e87b9c8a51c916c6f16eff6388b5976f46366eb7f116af7665645794ede WHIRLPOOL 8576b03d3d83dc8b7cd1b656df72401c34c40ffabfcab44367b5c1df99a7a3b836e3c31a74e95a0c0338ba04534b610a7b29d951fe607faacaa8813edcb638bd
 EBUILD passenger-5.0.4.ebuild 3681 SHA256 57c32cdcd35a9e5a24d9b845f3b1bb430192f8f8e07d2b324d91b354103d3513 SHA512 eafd5b606d0c180e6252b3e39a3bd06b352a525c354713932562d764c00f0fbc1fa96278f9f99152ffd0126e2175e18835a9e5acab018908ae3dc10935ec1428 WHIRLPOOL a2c814fabf447a498183e1d73ae77220057cdad9baed4afde62f8651cdc3f2432e09270a49960c881f5081194c86d47e6d54c1c9604fe969136893a5f293028f
-MISC ChangeLog 17225 SHA256 bebd45d0bfe75b2d4ca0b4c176e4bb45d41e3f779a855ccdaef98fdaa18c917f SHA512 a752f87eebafb0d72e8a82e879df87e129a2f0102da221b2ae97a50690ec7894c52bae950e46506f6362d4dc69764de23a4b2460f7bc5a532286a24eea7921b9 WHIRLPOOL e6b657fc49d7144504eb12c4b0a0cb93f28b5c6e2989f76a05ce6e7d46748a0e84dfb4d925e104e13288fc044635adc7566016a9b14314e9be93ab67897d3bdf
+MISC ChangeLog 17351 SHA256 25abdadae21e308556904475d3a8f0c70274497eb69d917deb0aeb9c0aeed02f SHA512 185db00f89b00e3a6dcd01979266068e3632250b1cd68de5468c759a33bc0f10ddfca36cce4326e693354471b6a485445905abafedc89c8aca6aac18276acd5c WHIRLPOOL f7acd8802839c1d473820c1fde1025e86be2090db5da7ae0392545d298d97d33205b0a7d1ea1e71a7c2eea6026a908bb0fcd281f3c5a53985c03c3bdc325d8ef
 MISC metadata.xml 300 SHA256 587c979e6c7d5d5755ee3b7861a7b35038abf4c64633526eef338db1f6477c94 SHA512 fda4f74b7e039c72a54389253a980fcda052d25efe2d43f6cf3d54c67bcfaa20adf9fe74c292bf4774ce2621dd321c2e9f282c7c081e0145cc633de263cf6f4d WHIRLPOOL 8137bbdf332c5394440f888334cd32c0d2a23b12d6c46ae38c7bf74eebad100a25d5000f137a41baf449b607e5ea03688f311268982480ef5d3fe5ac757f76aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlWgt6UACgkQiIP6VqMIqNfW3QD/XstVHGzRFUM8RsZYlDjkiHgu
-brgqr37IljLNde0KH4gA/2W5hcxmtfnrl3ix85iVYgnl2u163RI2CCo4XYeGOjc8
-=bdR7
+iF4EAREIAAYFAlWp7J0ACgkQiIP6VqMIqNcMfAD/abZTy53Be9od1r7piF548p4X
+P+1yyFqccfpBCpVCzpYA/jgjoy6G/D7DPwpg8au67dh4RKhk+JGNtJIG1GqmwndY
+=roAL
 -----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/passenger-5.0.14.ebuild b/www-apache/passenger/passenger-5.0.14.ebuild
new file mode 100644
index 000000000000..cabbebb3ee27
--- /dev/null
+++ b/www-apache/passenger/passenger-5.0.14.ebuild
@@ -0,0 +1,118 @@
+# 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-5.0.14.ebuild,v 1.1 2015/07/18 06:05:16 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/rack-1.0.0:*
+	>=dev-ruby/rake-0.8.1"
+
+# libev is bundled but with adapations that do not seem to be accepted
+# upstream, so we must use the bundled version :-(
+CDEPEND="
+	>=dev-libs/libuv-1.5.0
+	net-misc/curl[ssl]
+	www-servers/apache[apache2_modules_unixd(+)]"
+
+RDEPEND="${RDEPEND} ${CDEPEND}"
+DEPEND="${DEPEND} ${CDEPEND}"
+
+APACHE2_MOD_CONF="30_mod_${PN}-5.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}-5.0.4-gentoo.patch
+
+	# Change these with sed instead of a patch so that we can easily use
+	# the toolchain-funcs methods.
+	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
+		-e "/^CXX/ s/=.*$/= '$(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 where possible
+	rm -rf ext/libuv || die "Unable to remove vendored code."
+
+	# 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_LIBUV="no" LIBUV_LIBS="-luv" \
+	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_LIBUV="no" LIBUV_LIBS="-luv" \
+	${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_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake fakeroot || die "rake failed"
+}