Version bump.

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

3 files changed, 123 insertions, 5 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index 481fa9833709..b9338af9ca92 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/passenger
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.77 2013/11/15 06:49:46 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.78 2013/11/15 06:54:43 graaff Exp $
+
+*passenger-4.0.24 (15 Nov 2013)
+
+  15 Nov 2013; Hans de Graaff <graaff@gentoo.org> +passenger-4.0.24.ebuild:
+  Version bump.
 
   15 Nov 2013; Hans de Graaff <graaff@gentoo.org> -passenger-3.0.17.ebuild,
   -passenger-4.0.10.ebuild, -passenger-4.0.18.ebuild:
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index cf82e584e0b7..8b1530121f7d 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -16,16 +16,18 @@ AUX passenger-4.0.21-gentoo.patch 1759 SHA256 86070ab8259af80eee024162340fbf53a2
 DIST passenger-3.0.21.tar.gz 2657475 SHA256 82a79a2ff6803e1669ebf806ab320180990ddc096e3d30977ad1c86081b594a5 SHA512 4e92fe8cc679776531a73525ac0dd99612096c1370b4019dcda54aa928cbf6ba17c024124286342209a2b9d1ec9cb22d3783fc6bedc85cb9a0d0fb7561995eec WHIRLPOOL 11f9a5655e7ebcfd9f4a03a63d077126a0766ed7ad92e24494c3515202603782d3a8c999b4662004577d3463de68c040d783d9f93c01f95aa935289c0628780d
 DIST passenger-4.0.21.tar.gz 4122298 SHA256 3cc7db6de66e8974b5246d7ba0676f5cd3b4dfb257d5f545556ecf046a4a4dc2 SHA512 65460dfa6e61b53e3b2c6f271d56d43f7460f7e1b981a32d8546dcbb62a6f56d0b68e2bdc7bc7292f7ab5418f2f6dcf856606312f85a755d4a904d0700fa1263 WHIRLPOOL d10caa788128afd38eec53495975b2f6226b27504b81b262cd89cb9e4d3f034c738e409bab6cc2e18a4cd89ea0d49ee7a057f95914ed6f3f6ad7a71864a524f6
 DIST passenger-4.0.23.tar.gz 4128960 SHA256 4654c53f0442d3ed440a9cb428bca7dbcc7d3e8cec9ff835f91bff3e62b66439 SHA512 090b1477adf044a7dfe06c21c83fdccf27bd64f9a62de53ac47f52a8cd77cc1064c6c0c862bd6004ef81d7b202f30668bc8017db707ace31e613f7d581f02563 WHIRLPOOL 8a08b59794e887db7ca58048acdf38aa944101a7c713c2910af7e339cf678d6c8dbe6308645ee912bc41235be122718a692eeaeeac2abed2af52c582dbeeafcb
+DIST passenger-4.0.24.tar.gz 4134840 SHA256 c89dec3f92c8ba5997060496a9b98eafaec8b6550542ebcd8179cfa62e450f69 SHA512 5d02f0eaccf22fe7469106dafa84492e8499ea5e4a4453b5f86db1793ac7053cf728b4cfa71df1ce94df41b884c5a69b5acfade01b60636b9ed1b67e138ff46a WHIRLPOOL a66f2b0c8900eab671262f49ca7651a85a8868dd408ad58edbe1e2b90a3ca063f0e60e4639c119a546a8b46723d957f26bf7b617cac7a7774b60afadcf2ae2fc
 EBUILD passenger-3.0.21-r1.ebuild 3253 SHA256 19b231560cbfe3b4a4bc8303fab0da874927a5f30ad897187fe4028cfaa76bf6 SHA512 4ae46a34d9aa5b5756949380bc6a8a2ebd475852052c374059ec072a5e03c97724a13fbdb9e0b40cadff438c527c8034b3c5293e9c165b4a0360f6190ec5562c WHIRLPOOL f9b99a8e94a842ff2b61eb3b7f57d4d3b264072b95c73c64dcca9482e6c9013396be0ea4310bfa804e07f171340af7df8289c0eee50bc6ed840ce41a7d61292f
 EBUILD passenger-3.0.21.ebuild 3019 SHA256 f198094111a2b47de8e1f17404c3d2daba1d72f131604e2fd92f3405f3cf0d2a SHA512 5b3342d72d3432451547cc51e1476c60820747bf2fa66a31b9bcd37fbe8dd365eed6d609c519f2541a5ba00795c4c9c32d6f4d7ea04a955bca3317060a12f351 WHIRLPOOL dc6e7f0e2ff9ad20b0b38050449cfb23cd8b01b5f427ce286d24c04620af5c7f5ed7c1bfc0d39659f5f9978987a19a25c33ed200f30dfc9790ee291de6fa3889
 EBUILD passenger-4.0.21.ebuild 3396 SHA256 f5271cb4ef23cdd6ccde234b80617c47e33de824966479eca83bfbfab7f490de SHA512 4092647f538fe2ec1748780da86a56caa299df9ccbcd5f7635136bd0cb14f84c3f98d22336d92216bcb4dfde1434f2c8b912c4547044379de577f3e58ac884f7 WHIRLPOOL b44eeaab10e88bcaae6d0565abf99598381ed66d090eb83fe3f681dc257d15dfb1e7d4132b4e46b86bcc83813fe2465a24d3ed5eeac040b4e7c4102dc0ec3aa9
 EBUILD passenger-4.0.23.ebuild 3531 SHA256 14ab688cc5efdb5c1c62d2f5005808c67a2a69bc1f526480530980ae4d81d332 SHA512 032f8765e341ad023de7102e4dc40ad413b94ed27b5e64b467afca4253c920908e72ffb3d11d514a6e1bd5609d7c820036e620962541f669c53d4dbf362c9e86 WHIRLPOOL 187ba040217e99b5887b260bea177ebd66ab6281dc2fd93987b8ed8455bc36cf21cddd886cf638951464a7d61d5f1bcb69c519ccf040ddfa06ef3e1af0a1caa1
-MISC ChangeLog 12146 SHA256 4d2cd9b0b0b0162af42ec7ed67925fc8824532685fc6b89d1420b405cc087a39 SHA512 3d50b4c3807af1267e193a1b9a167fef2a0b9a14fbecf337b73f5add73fb3172dd1d5c29b38d0698a7b4c41511923e1bec99c75def7776cef79b3977c08867cf WHIRLPOOL cf795ad5c2d2c4354ec68014a782b771181b62efd3e8ef98d9a94fe63d4f64eeaeb85f0f3056a57104229aa6e6dc45b2644cc0ad0fbd2432ed7d5f338e544082
+EBUILD passenger-4.0.24.ebuild 3531 SHA256 84278ed246a71a721e53376119a082384f51650b1e054a4734f4001e3a58b67f SHA512 f9ee853ec3704df1c769f12075025b42e37983ede9f9e09a272a4be728083ffec083d22dcd372b9b8e158937b726bc56ca7cc8ff6dea7f7e2f6553091c89d952 WHIRLPOOL 8c5c37485e45d4785a3c9cb84b15af168ed4d1b487000f27904d0fb47be93a01ba3ca69931750511315fb95a400ffc25dad08bca97fd66c2e3640040e85f4532
+MISC ChangeLog 12272 SHA256 5ba227e446c94c81f9501882ea3125603ebea7f7c38e710299d5e001cf893126 SHA512 a906aaf20f65a397487451f99dbf245bb7d783a55c0dcbb07520838b98b42f40e58acb8a4056cc7ddb07ec7cff9fd371a928e11a9b2e81c3a94803531521df71 WHIRLPOOL 37a1961108556d1861b59edcacb4b61bcff4b3583533312a1987f8c06b635314b5660612ef0d39f136a58cecbcae74b980d93ba8ff9acc48f10bdb9fd425e7d2
 MISC metadata.xml 300 SHA256 587c979e6c7d5d5755ee3b7861a7b35038abf4c64633526eef338db1f6477c94 SHA512 fda4f74b7e039c72a54389253a980fcda052d25efe2d43f6cf3d54c67bcfaa20adf9fe74c292bf4774ce2621dd321c2e9f282c7c081e0145cc633de263cf6f4d WHIRLPOOL 8137bbdf332c5394440f888334cd32c0d2a23b12d6c46ae38c7bf74eebad100a25d5000f137a41baf449b607e5ea03688f311268982480ef5d3fe5ac757f76aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlKFxBAACgkQiIP6VqMIqNcv+wD/eB0wgu1VpJWDziQXTeujruFq
-EuNA/73KRXA0MK4hEwUA/1OgUKeGZ25WX/CgiQPXfFCilBjB57+DfIw5p1FybW45
-=5YT1
+iF4EAREIAAYFAlKFxTQACgkQiIP6VqMIqNeaWwEAh1r+wxalCDlWpnHDE4nT5NGY
+pdwadAzFSlmJPDn8MmIA/3RAMm/d1T5pjwH/l9//LB8R7+WsM96JoqaMf8gOv6/m
+=GqgL
 -----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/passenger-4.0.24.ebuild b/www-apache/passenger/passenger-4.0.24.ebuild
new file mode 100644
index 000000000000..96fa9eeff1ef
--- /dev/null
+++ b/www-apache/passenger/passenger-4.0.24.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-4.0.24.ebuild,v 1.1 2013/11/15 06:54:43 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 ruby20"
+
+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.1.0
+	>=dev-ruby/rack-1.0.0"
+
+CDEPEND=">=dev-libs/libev-4.11 net-misc/curl[ssl]"
+
+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.21-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}" \
+	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."
+}