Version bump, fixing bug 543072.

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

5 files changed, 222 insertions, 5 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index b7e64d05bfdd..3997f6ec8bbf 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,12 @@
 # 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.109 2015/03/14 05:36:17 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.110 2015/03/14 06:08:10 graaff Exp $
+
+*passenger-5.0.4 (14 Mar 2015)
+
+  14 Mar 2015; Hans de Graaff <graaff@gentoo.org> +passenger-5.0.4.ebuild,
+  +files/30_mod_passenger-5.0.0.conf, +files/passenger-5.0.4-gentoo.patch:
+  Version bump, fixing bug 543072.
 
   14 Mar 2015; Hans de Graaff <graaff@gentoo.org> -passenger-3.0.21-r1.ebuild:
   Cleanup.
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 4fcb5003177b..100ff445a4ca 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -5,6 +5,7 @@ AUX 2.2.15-gentoo-multilib-strict.patch 1278 SHA256 dced348f25d2bb41dff59f51c1dd
 AUX 2.2.4-gentoo.patch 1617 SHA256 d90394f0742131f32dc42a9619305b2712bed3967b78d56480447500d190b8ea SHA512 5a80b36b0b62e2a450584f7a7c25f574ad0ae5b9be813ea94069a68583db4bc944e7624a53ac0b1c00eb56329b97f2f37027d530731633fdb4ff4461843a102c WHIRLPOOL 147dddd7762a6a914962283c6e6737e10575da03954e10ea5b70dc80c7e975461f61c21db0fc555ab442689ca3f8d812a252fba6b1a7ae0c95def409bc03e9e9
 AUX 30_mod_passenger-2.0.1.conf 2695 SHA256 65095dd4e633c81d6283faa7f6cd91324b0a964ce73a79f7330c177eaf0d2bff SHA512 251648009a9dac7e87efcb42481c222497a6609e0c72b0ae36adbae75d982c5732549379b0b169c79fd7267609f6f397926dd091a53643055f5540fa1b268d4d WHIRLPOOL d73cf3df89a7147a626bfad9a2ecef304e2dd931b6c6de066842a8930bfdd7451c223f3da881ee38498298f51030ce6b86e22d9443f263d69c2e67cd56488ae3
 AUX 30_mod_passenger-4.0.0.conf 2737 SHA256 c5cd9c6b0a6616c9934a1c1fc9952036a6b4adcd9049e11f5614157f786c736d SHA512 847aa6d0ebb2e4ceaa744fdddf72f22613aeb76df38a36fb3c8b16803222cec116e6d5c23d2173beffd5889ebb8ba0247ffd3b9e900a70d78c2236f00c1a5d4d WHIRLPOOL b7ad6e2cfd1677469c67d8c47e2b53f3087a84477beb4a29d10f71196c7f73590964add0316c97e791ed4e9bf03020d586a118da5c0ba499bb9b5547bf30b6d9
+AUX 30_mod_passenger-5.0.0.conf 2737 SHA256 c5cd9c6b0a6616c9934a1c1fc9952036a6b4adcd9049e11f5614157f786c736d SHA512 847aa6d0ebb2e4ceaa744fdddf72f22613aeb76df38a36fb3c8b16803222cec116e6d5c23d2173beffd5889ebb8ba0247ffd3b9e900a70d78c2236f00c1a5d4d WHIRLPOOL b7ad6e2cfd1677469c67d8c47e2b53f3087a84477beb4a29d10f71196c7f73590964add0316c97e791ed4e9bf03020d586a118da5c0ba499bb9b5547bf30b6d9
 AUX passenger-3.0.0-gentoo.patch 1689 SHA256 81d38f638499b4b3020614165e54647ad1c11630edf43c11f98911b740b15849 SHA512 32426df199d597c26da657a45dfa7cd98b8abfebd687e8d25fbeb96a403288983443606c83a40594b4e82e3bdcb43b4c662f7bc3679d797ba90827fe60fd9b1d WHIRLPOOL 9b53a33d30de0699ce3f1895eb251e565622af334e879774de0a18f451df30ad1d915799cd07e02ac8a3b0f08a2d0966b90d98d873394daab50529bb86d75c51
 AUX passenger-3.0.0-ldflags.patch 572 SHA256 22b7c85b2c3e0fb2c0275e0a63308cf65aa0ab2a1398c64b95ab149b8cb58392 SHA512 48c06072bbf3db19cd92078c37307703ae4d0cb7f5054563b82b2c73fb9e099188825489f2b774495419e325ba830b212f3321d1cc0c6e89416ffa27a0b91c1d WHIRLPOOL 458f044df7bc2798f6cf8d6290f1f67ff5e7d98a1a0335516b9f6ebdcd2d94941e01971ea467269e55c314b7e88f337fa74b40c8a65552b6c72ddd921b73e7ac
 AUX passenger-3.0.12-ldflags.patch 414 SHA256 b17694c0a148980e39e60d5582b3e6ee313b63858d4aa827afe71ba1e7c7790e SHA512 b23014f7fcc708f266a1460fc93565a449e0493ab546b4bb4e457a53dcdc1fb91abd29e8825a0f65c30d2dca57cb9ce455b66e3386559f1c490c48cedd586e7b WHIRLPOOL b06595f84feb1dfce5aaaa1f190681004eb3925dabe60aa1cd1a5895e20a9b6325b82a258ad0c3019a0d612f6448803b0ddd6a89ffa636c186b046be0bf2871c
@@ -15,20 +16,23 @@ AUX passenger-4.0.18-gentoo.patch 1682 SHA256 1331a98ed68ed60fb0d49ccbfafc22a755
 AUX passenger-4.0.21-gentoo.patch 1759 SHA256 86070ab8259af80eee024162340fbf53a246b69bf04bd1309e3275323f856bec SHA512 b9dd7932a1c59de80ba2e30d4487ea69df750393b05bbfe32ad1c616afc1e10e04c1d62a6e6c847f87ca22c4abf51c853e9dd55f209bb05106065794ac0389a1 WHIRLPOOL 1735a410352654784fbbb3942fffa88ee9896400b92b0651c062990c8cd614686432ce264092ef6460d217d69b1fc16cee34ffcb7a5362a5aa385cf14e418f54
 AUX passenger-4.0.33-gentoo.patch 1066 SHA256 f1eb0799b3b1dfbc35985aed4b4f972d7ab92b354d8f77d9fd6d9e1a7397603a SHA512 d2060b54e10ca75bf4876b6d6076e64fb182f6d07f3609893a71bc62f564d37016edffc6d5eab684864ecb15717c7e18116c94c763cf105203c76031df5b2a70 WHIRLPOOL 3f8db66d1d408dcd552ea7657058050676f6d430a7a07fef012cd28e272dfaf5f4d6f612033958d4904489f7a0bfebb9fee2f2de1a6dcd7ae335cc08b4026991
 AUX passenger-4.0.49-gentoo.patch 1062 SHA256 bbba30cbb674a91f02b6cee7405d09b9a3ca0f5f1b2ffebc29dfce0b8c3c165a SHA512 7e06cf7901348ddd5279a5f8a494c771f5f889f03c855d49a686d4cf91ea921140f7cca33026a9b8dbe131477e62f757fcccaf766a47d466a9dc1cc26699b887 WHIRLPOOL bb8307fe7fc981806f93685d396462d094f4d5135c859e28d3c1c6e5174ea7281a65161f4e5bd3ebcb7cfd56159637211cb701ef46d39363fe656dd4b0128ce6
+AUX passenger-5.0.4-gentoo.patch 1103 SHA256 a6d1a18977270545a3c587268b7c24595631a760c71abaf44cda8eca2810a2c9 SHA512 328ed6f347691b8c59528f2a29fd3f46549c77a079142895bc4a771a550e3be33e94f4ec4835db59fa8637a5a93a6fd1c54411c3251ea10020152910f94d5e3f WHIRLPOOL 63fbbf1e57724c3fde253d37625a3047e8cf2d5c4ac3155e1ea5e7946e53d47b131b7a0629ad57a227539a8401492f1c2f8bea3de62c7da093b0b50b2b91b46c
 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
+DIST passenger-5.0.4.tar.gz 5289792 SHA256 5c29f2c1407db515ddccd540443cb34bff7ca180b3e269c2e28a34ad795f99f6 SHA512 a04bcf579a8148b34c34743a87f4f3b180218e871ed6309d7b83e9b4ab88334f01a566896c7406e3ddaf11ba0322128557cf5cfb2bcf5da7e4ea81f0539784ec WHIRLPOOL f2d523266a616d2b893963d5139be0d781a2bf76b122b4c76bb5cb6af7a655e5492b8c58d2f38f97858616108d0c3122278598fcfa7a262bab252e079e888536
 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
 EBUILD passenger-4.0.59.ebuild 3696 SHA256 f7bce81db6215280765ab7703d32915388917526e7b7ec49ba0f1c423690f5ce SHA512 d9ddb0400f08664d9d5faf28c972cf7e689fe48a09bce11aed39eb4f69f49a3147304770d5662381fea3fa09a588b4167b97d11a75cb3e2749d74de78ca0a512 WHIRLPOOL 1bd9cac71c50c7ac62d83aaa2c6b574a8b4bc2ce44693a017800381ae06a45e35587d9bb2e130ff3654d2bf246290222ab7059d0ca18b29453d23cd5c6b24256
-MISC ChangeLog 16545 SHA256 374be45d29cc3c766e6977226eec236e17432689aa940acd663848a52754ce6d SHA512 0cb98660f361632d3c2745a0a6e9d202e33247d04c68affbefc7394bb8b4a901e3688d1c79cd3e2e8e6c0729963b24f8606c9b84dc25106dba92aee2fc69ebe7 WHIRLPOOL a47665a3dc6d70e748bcba71f74bc9c6d870fed588473032d8a454e5058f7e4c8b6e3de94f67b43bd9b9fff502c4538a5f89c2f12bad27458e4d94675e554a51
+EBUILD passenger-5.0.4.ebuild 3681 SHA256 57c32cdcd35a9e5a24d9b845f3b1bb430192f8f8e07d2b324d91b354103d3513 SHA512 eafd5b606d0c180e6252b3e39a3bd06b352a525c354713932562d764c00f0fbc1fa96278f9f99152ffd0126e2175e18835a9e5acab018908ae3dc10935ec1428 WHIRLPOOL a2c814fabf447a498183e1d73ae77220057cdad9baed4afde62f8651cdc3f2432e09270a49960c881f5081194c86d47e6d54c1c9604fe969136893a5f293028f
+MISC ChangeLog 16763 SHA256 2b785afb712b7f694f6ef5712bc403eda0737774954b153af99c1c8d252db29b SHA512 aeb9d3c7f346e8d488cf8bf0e78c604ab1dbf75a8951da3024885c3946c655059c7e79fa3625ed412962b50ea6ca22c7cf080f00dcc603d6309e068d9345d041 WHIRLPOOL 396097878838958da76e48a672fc1afc91dcb391b12cb83f47905f099e51233014b6310e16d76a669665fd55e1c3c6dec0487befd25f4a1086fe3d4999ae66d0
 MISC metadata.xml 300 SHA256 587c979e6c7d5d5755ee3b7861a7b35038abf4c64633526eef338db1f6477c94 SHA512 fda4f74b7e039c72a54389253a980fcda052d25efe2d43f6cf3d54c67bcfaa20adf9fe74c292bf4774ce2621dd321c2e9f282c7c081e0145cc633de263cf6f4d WHIRLPOOL 8137bbdf332c5394440f888334cd32c0d2a23b12d6c46ae38c7bf74eebad100a25d5000f137a41baf449b607e5ea03688f311268982480ef5d3fe5ac757f76aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlUDyNIACgkQiIP6VqMIqNe9wgD9ENBfkSFBiMu0WoqxvYBAM4yx
-TFquB++FAZA4ixGXN/UA+wWdtBQa3FZGYf4R/N611dcg6cMrEFPcREfuoDxhZVfa
-=b9uS
+iF4EAREIAAYFAlUD0EsACgkQiIP6VqMIqNft0gD/cUKiIh3/oLvbX7l5b2bacd8s
+H6hbl+bLjb5YcNn6V3MA/iBHft+/B2wgdPwfLt+MJscAY5KXr80echMREY9eFtuu
+=0Bh2
 -----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/files/30_mod_passenger-5.0.0.conf b/www-apache/passenger/files/30_mod_passenger-5.0.0.conf
new file mode 100644
index 000000000000..f218b59ca412
--- /dev/null
+++ b/www-apache/passenger/files/30_mod_passenger-5.0.0.conf
@@ -0,0 +1,63 @@
+<IfDefine PASSENGER>
+LoadModule passenger_module modules/mod_passenger.so
+
+# The location to the Phusion Passenger root directory. This configuration
+# option is essential to Phusion Passenger. The correct value is given by the
+# installer, and should usually not be changed manually.
+PassengerRoot /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini
+
+# This option allows one to specify how much information Phusion Passenger
+# should write to the Apache error log file. A higher log level value means
+# that more information will be logged.
+#
+# Possible values are:
+#
+#    0: Show only errors and warnings.
+#    1: Show the most important debugging information. This might be useful for
+#       system administrators who are trying to figure out the cause of a
+#       problem.
+#    2: Show more debugging information. This is typically only useful for
+#       developers.
+#    3: Show even more debugging information.
+PassengerLogLevel 0
+
+# This option specifies the default global version of Ruby to use.
+PassengerDefaultRuby /usr/bin/ruby
+
+# This option allows one to specify the Ruby interpreter to use for
+# specific instances.
+# PassengerRuby /usr/bin/ruby
+
+# The maximum number of Ruby on Rails application instances that may be
+# simultaneously active. A larger number results in higher memory usage, but
+# improved ability to handle concurrent HTTP clients.
+PassengerMaxPoolSize 20
+
+# The maximum number of seconds that a Ruby on Rails application instance may
+# be idle. That is, if an application instance hasn't done anything after the
+# given number of seconds, then it will be shutdown in order to conserve
+# memory.
+PassengerPoolIdleTime 120
+
+# The maximum number of application instances that may be simultaneously active
+# for a single application. This helps to make sure that a single application
+# will not occupy all available slots in the application pool.
+#
+# This value must be less than PassengerMaxPoolSize. A value of 0 means that
+# there is no limit placed on the number of instances a single application may
+# use, i.e. only the global limit of PassengerMaxPoolSize will be enforced.
+PassengerMaxInstancesPerApp 0
+
+# When the PassengerUserSwitching option is enabled a Rails application is started
+# as the owner of the file config/environment.rb. So if
+# /home/webapps/foo/config/environment.rb is owned by joe, then Passenger will
+# launch the corresponding Rails application as joe as well.
+PassengerUserSwitching On
+
+# Under no circumstances will Rails applications be run as root. If
+# environment.rb is owned by root or by an unknown user, then the Rails
+# application will run as the user specified by PassengerDefaultUser.
+PassengerDefaultUser apache
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/passenger/files/passenger-5.0.4-gentoo.patch b/www-apache/passenger/files/passenger-5.0.4-gentoo.patch
new file mode 100644
index 000000000000..713deb070324
--- /dev/null
+++ b/www-apache/passenger/files/passenger-5.0.4-gentoo.patch
@@ -0,0 +1,30 @@
+--- build/packaging.rb.orig	2015-03-14 06:52:27.284475606 +0100
++++ build/packaging.rb	2015-03-14 06:52:35.128268388 +0100
+@@ -513,7 +513,7 @@
+   psg_ruby_extension_source_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
+   psg_nginx_module_source_dir   = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module"
+ 
+-  fakeroot = "pkg/fakeroot"
++  fakeroot = ENV['DISTDIR']
+   fake_rubylibdir = "#{fakeroot}#{psg_rubylibdir}"
+   fake_nodelibdir = "#{fakeroot}#{psg_nodelibdir}"
+   fake_libdir     = "#{fakeroot}#{psg_libdir}"
+@@ -531,7 +531,6 @@
+ 
+   packaging_method = ENV['NATIVE_PACKAGING_METHOD'] || ENV['PACKAGING_METHOD'] || "deb"
+ 
+-  sh "rm -rf #{fakeroot}"
+   sh "mkdir -p #{fakeroot}"
+ 
+   # Ruby sources
+@@ -622,10 +621,6 @@
+     end
+   end
+ 
+-  # Apache 2 module
+-  sh "mkdir -p #{File.dirname(fake_apache2_module_path)}"
+-  sh "cp #{APACHE2_MODULE} #{fake_apache2_module_path}"
+-
+   # Ruby extension sources
+   sh "mkdir -p #{fake_ruby_extension_source_dir}"
+   sh "cp -R #{PhusionPassenger.ruby_extension_source_dir}/* #{fake_ruby_extension_source_dir}"
diff --git a/www-apache/passenger/passenger-5.0.4.ebuild b/www-apache/passenger/passenger-5.0.4.ebuild
new file mode 100644
index 000000000000..16bbc7118654
--- /dev/null
+++ b/www-apache/passenger/passenger-5.0.4.ebuild
@@ -0,0 +1,114 @@
+# 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.4.ebuild,v 1.1 2015/03/14 06:08:10 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"
+
+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}-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.
+	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"
+}