gentoo resync : 22.10.2018

11 files changed, 192 insertions, 14 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 886bf4ca18af..6e91a7aa1c23 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index 12ca77b972bc..950d8839f94e 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,5 +1,7 @@
 AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3409f69f8e31a7e0a8eb14aab4f2abe1d7ec833896d950d3878020e05100f83ae63a3823b0e91b9d SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5
 DIST mod_http2-1.10.10.tar.gz 528560 BLAKE2B 7389441b1d30d0448bb17fc02a73957cf20365020796ce7260c1d63d1468537ecdeab83db12d1b245af1e760236da8e8d0ccf9ffb222d2dec1e55491ac77dc11 SHA512 b4b9e734ed35ca63fa114462f1adb358bb73e4cbd8df95ab28c4518b8f7db40233f4ba13bc2194847eb9c1adbc3eb86fc63cbb56389fc0867767658d4d8ba77b
+DIST mod_http2-1.11.3.tar.gz 1028467 BLAKE2B 3a5d644f87104e1f7baae05396fefe94975e86e9289bb9c4e6d7ed94e45e1d9b38dfc79d0e0d9ee9270efedcd811db2374c898e419d4c16f73b38f53512e91ed SHA512 b97697f44eab9984b7dcaa7d941f23375cd5c2c81405842e17910a37dc2c952fc36a37e0802755457ccedd196c5fd2fb5b60467cb0ed16ed7aeb88cce4eabd2f
 EBUILD mod_h2-1.10.10.ebuild 913 BLAKE2B 8efef07e602ac6dfd6db30f8b36ad91c5675c949b65848e6ec6948abd4e031aa86170406186d3e8a1294f2a6276618bc0cf98d868e56a938dc435836579bc614 SHA512 08f4d81ba78e40b322cb378d737eaec7bbc2f9cb41a68615e115f09bccc04d6c512caf79ef2cc0bb1e763edf79dfea97ad3c58c0e1f90961d256077e83c59f25
-EBUILD mod_h2-9999.ebuild 913 BLAKE2B 8efef07e602ac6dfd6db30f8b36ad91c5675c949b65848e6ec6948abd4e031aa86170406186d3e8a1294f2a6276618bc0cf98d868e56a938dc435836579bc614 SHA512 08f4d81ba78e40b322cb378d737eaec7bbc2f9cb41a68615e115f09bccc04d6c512caf79ef2cc0bb1e763edf79dfea97ad3c58c0e1f90961d256077e83c59f25
+EBUILD mod_h2-1.11.3.ebuild 888 BLAKE2B cc260a4fdbe81d168096723f0e0d135350069cd9b2c9e853b0b7efe351ae96ddbaa9fa5dc219feec73671c496e2ecf2e5b26623e624850de8668088298f6313a SHA512 d0d0980cf07096df9ee3199d0e8aff6b5ce608c1c33348510cd201f8934d21c493f6a6a53884a90a064c852fb4641930c74f3b4493923cce74afbac9d184f9b5
+EBUILD mod_h2-9999.ebuild 888 BLAKE2B cc260a4fdbe81d168096723f0e0d135350069cd9b2c9e853b0b7efe351ae96ddbaa9fa5dc219feec73671c496e2ecf2e5b26623e624850de8668088298f6313a SHA512 d0d0980cf07096df9ee3199d0e8aff6b5ce608c1c33348510cd201f8934d21c493f6a6a53884a90a064c852fb4641930c74f3b4493923cce74afbac9d184f9b5
 MISC metadata.xml 244 BLAKE2B 8d77ec488a1873fece64c647739c050cd3fbc933824576c2f35205a20fb47cdbb2be17cdc278ebbae566d29aaeda094098b5a6e9505036ca3977b3fba2123858 SHA512 e024554a3ed54f32c7d2adddf91a72743ee6da18f02d4955126bc4286e545944bddddcb09bc6bb8520a2dad285b9616c38735f25d7ff7e0b5c8875e1d08fd04b
diff --git a/www-apache/mod_h2/mod_h2-1.11.3.ebuild b/www-apache/mod_h2/mod_h2-1.11.3.ebuild
new file mode 100644
index 000000000000..7a124f105c05
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.11.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit apache-module autotools
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+	inherit git-r3
+else
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+need_apache2_4
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	APACHE2_MOD_DEFINE="HTTP2"
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/www-apache/mod_h2/mod_h2-9999.ebuild b/www-apache/mod_h2/mod_h2-9999.ebuild
index eaf87ecaf6b9..7a124f105c05 100644
--- a/www-apache/mod_h2/mod_h2-9999.ebuild
+++ b/www-apache/mod_h2/mod_h2-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit apache-module
+inherit apache-module autotools
 
 MY_P="${PN/h2/http2}-${PV}"
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit autotools git-r3
+	inherit git-r3
 else
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
@@ -31,7 +31,7 @@ need_apache2_4
 
 src_prepare() {
 	default
-	[[ ${PV} = 9999 ]] && eautoreconf
+	eautoreconf
 }
 
 src_compile() {
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index fab09f8ca4e8..1301332da185 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -3,5 +3,5 @@ AUX modsecurity-2.7.conf 394 BLAKE2B c9d55e8b4419e5b54a364e03dd02e9d0e5609954d15
 DIST modsecurity-2.9.1.tar.gz 4261212 BLAKE2B c47c7934d8da870e629c5733cc8c37452e4d90351269a14b99483188e8e3161891bd63bfd70e0723648c8daf51f1c33d900bd90ab0157332f826eab772f09f62 SHA512 374733cbfc26e53d95b78c8f268a4e465d838163e9893fc24e33a9d272b114f1b287147bab6d0289575074cbbd94f48983e23fa59832cbcb32950046cea59269
 DIST modsecurity-apache_2.7.7.tar.gz 1003835 BLAKE2B b36370e67945928df1948adcacb2303f80b461eb48409b2bda6b8013620e0dd977bec6a0c5d3c3cc098479f5c231c558fb7462b6300b4552ad65064f8ce1fb8d SHA512 859f72580b6acaae5db180f98ee32ad2cb0f3ef24321d0c2df20ddd9fcfbc6c09c98b672012dc4931a6fd14f3c21c38ed31ab8900940382fcb48b37f30005a7d
 EBUILD mod_security-2.7.7.ebuild 2400 BLAKE2B c2332486bf76795fa8340c257b6b87c034a5208e8a91d89149f62bcdbe2eccba667ad4e65c889252af58061865fa09eb89944ed886eef1694f79726201f8e5c6 SHA512 66bc689874fd34b924ef902c72844e0e66f2faa3afac637e40cd8b8ff4c46a6f7ce3867c5892fd2126827b82cfd5d6694bd14fbb3d0acee1be6fa3784c52ea8b
-EBUILD mod_security-2.9.1-r1.ebuild 2773 BLAKE2B 192628953bc1b028214fd322c40f25d1cb4b6ca718fafd8fd90d9929d68373af6948fd0944cc2c7201f8e81a06e6e2de8e9d5abbccb1e8079ed711b0f14c3404 SHA512 55e682098d6c5775cf06de18d98e8548943c50bcecee15c0047ebb50c2896dee3318336fec305843a6be4046ce04bb1cb847e66479ba934b9d17a1edafd7d8a2
+EBUILD mod_security-2.9.1-r1.ebuild 2768 BLAKE2B a278a8138efb52c23378fc561adcb2e72345bf63d5c628f11e7c2ecf641ce16dcc5d9d018a7fdfd78f95e03783f8700062ab3fc8e78f1ed41ea3a53bb93fbec1 SHA512 09a1dacfa56d0c188976312a0d4786ee712dfba38ca2d280f96945c308d6f2cae54c014edbc6f5c9ea82bb233fba2bca368a3e7c1123bfa9032ca00666f113e8
 MISC metadata.xml 982 BLAKE2B f65a4592e166d75885dd1f2c9a9de79a4f3cb44be079c38300f65f3ffad9eccad8f87695ba665a175b3a38cd249aeb7875dc16884218b735e51b13812b7be3ea SHA512 a2a0c01efa1c1bf5193c0d41df0fd03f915bf53ffa51205d32cc76b633d1707a832b0177b0fc09dd88ea7e44b53caa1c03820c2e0934ced2411862674332a293
diff --git a/www-apache/mod_security/mod_security-2.9.1-r1.ebuild b/www-apache/mod_security/mod_security-2.9.1-r1.ebuild
index 6dc8bf354d1c..bd1f363f6e7a 100644
--- a/www-apache/mod_security/mod_security-2.9.1-r1.ebuild
+++ b/www-apache/mod_security/mod_security-2.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://www.modsecurity.org/tarball/${PV}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc fuzzyhash geoip jit json lua mlogc"
 
 COMMON_DEPEND="dev-libs/apr
diff --git a/www-apache/modsecurity-crs/Manifest b/www-apache/modsecurity-crs/Manifest
index 01bab1472a62..fa5c73d3ea6b 100644
--- a/www-apache/modsecurity-crs/Manifest
+++ b/www-apache/modsecurity-crs/Manifest
@@ -4,5 +4,5 @@ DIST modsecurity-crs-2.2.9.tar.gz 279898 BLAKE2B 75e9c5c9fb0fdf3957b17926b923d1d
 DIST modsecurity-crs-3.0.2.tar.gz 156751 BLAKE2B 111a330b6081d476899be321e15d74379b3c3db23f429a4a4ef1900c87e4b29229638acf3bb367745446ef97ccba4679db91b0d84bae93f2c127bbb6e8031851 SHA512 ae8fe9a0f00a57708c8680cb76882214e4f5ff647e13087aaf1bfc7382cefb38d2f3a88eb1f210031b553f56d3e44c12dbdc68f8b0d09fb4a9e2f15a70d885aa
 EBUILD modsecurity-crs-2.2.7.ebuild 4130 BLAKE2B 891afb7917e10f74674c039725c393129ab6bf7be717dd517794566dc06f1ac917dc8421ccfb5af866077ff256fa78f75ddb80840e969f3088a53b002b14ce27 SHA512 21ae265889535b3dd18b0adec162f744425da149f58c4ab0ebfb245bd02d8e21abe0cbc21f14a587f9e619b3a5d10fd027deb3a71815ecf383e473fc4634dc6b
 EBUILD modsecurity-crs-2.2.9.ebuild 4221 BLAKE2B 0270d493848b9ab2a72938bda4fec4a7fb43ffed160c91100eabb98c52a48d4c6aac19443995a0edd460185837eee250936b6aa17ae41024bbfe69fe828d2d4d SHA512 aa2bceb00dc5d61b560d61e21b217ecae63661080e902a1519fb9644cc50a3ba113cb3a86293accb6de7288ef72be4f1bb5b45b78f58ce97504293de44506003
-EBUILD modsecurity-crs-3.0.2.ebuild 1562 BLAKE2B bddc90140b7988843f06cf1f12fda32393e4bbc3264cc19f922507889c4e79c4643e02b3938980213ac1cb220f9d403b8f7ff5855901280c740f538634ebb2ca SHA512 10ae6dac8b32afccf1e5620cef1feb7dc250054a39f74e8c3850b11ee4c373df723f3164c08d10f4a4e904999b6c0a47b92be90d2eec0ffb0c6be968c23f925e
+EBUILD modsecurity-crs-3.0.2.ebuild 1558 BLAKE2B 19f4f4c2def91ffb8337caa4ad286138474fd4c3db64cc057a51a5ba34111987ceb994923835d7be583642da222221016063bfcae9049334ae5ab25b43b5f5d5 SHA512 c35167cf77bf17c8f34103911178cd4bf51f057176cdccc9cda639a64c6cebd8bf1369981b6ff362d91bd5cae3703feee11d15c67c28f552f961890cc238eef6
 MISC metadata.xml 240 BLAKE2B 9ac73447401500c93e9ab7fce069726f63e07989f48154f4c99346e7913696e53d2451b08ea9fe4c72af28c43e13091599d84c70979e3cb504e301ac785d37a0 SHA512 f387811090c36052ca6dfd48c20af460ebb892738ecd449a5a213ecf7313dfc1cc6eb118e4d28ec24e26078995c4d291784f26b6afc1f822cf83ca5482bd7310
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-3.0.2.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-3.0.2.ebuild
index 7ac22cdb9d30..5eca2f158d2c 100644
--- a/www-apache/modsecurity-crs/modsecurity-crs-3.0.2.ebuild
+++ b/www-apache/modsecurity-crs/modsecurity-crs-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/SpiderLabs/owasp-${PN}/archive/v${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index c6127e0f1d9b..ff106a3e26e5 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,10 +1,12 @@
 AUX 30_mod_passenger-5.0.0.conf 2737 BLAKE2B 781ffa4831313356b6caa493fc94a784f6b0245c2c37c27cc69eeba9be62c8b626b8fdf26c18ddffe0a06743abf1d529318f46c0091f64370f2a9d82f1b54116 SHA512 847aa6d0ebb2e4ceaa744fdddf72f22613aeb76df38a36fb3c8b16803222cec116e6d5c23d2173beffd5889ebb8ba0247ffd3b9e900a70d78c2236f00c1a5d4d
 AUX passenger-5.1.1-isnan.patch 1155 BLAKE2B bb11276f94f4be93a7ef089e09079d36971ca028df4f8962e4220880361b96c3640475ac537f62d5e7ad198fdfb477fe15f34dbd86db4143b24246d11278eb58 SHA512 a80a9a229f1eeb34780236d0b2418fe5d2f57b9ae8c3c4ccdec729806f4afad8979de4ab3ea0834cdb76218192825ee4bfaf02b48f3bda240c2db441bcc870d9
-AUX passenger-5.1.11-gentoo.patch 1064 BLAKE2B f62d689d7425e11609917506b1c19e15f9eebd5255c3b16f89d98ed44493af7dd0b7e5576430b2c603af29f51ea1ee2c82c34b83d6042c0419db2069740183e2 SHA512 7aa098e4c2d4958deaf1369c0570e5f0c5661739047982d428555e5136dc9d5414ce575b3236b30223f14178dd2a4262f62f129d1d383f5c0c78312e80634670
+AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f0163f320d4f4d1bbd9d34ec34ec81f2fd2e7d9ea6f3d03c4a611f13095c4ad414ba7c0920064f8408837a2600d2d2e9 SHA512 c75442ac0403131e5fdbe76ec52acdcffcb6947af81ce79e003ebbb9e97d25a855651bd62c0aad66dd22d8cd4dff2221fc84b0ce74da3908f06f272c8b133c2d
 DIST passenger-5.3.2.tar.gz 7039759 BLAKE2B be10b368530b8560d7d93664bbf91711ace0cadb0d1e15a978c0a52311a626ea2e1c6d05e507ef488b384e4a7ccc4b02da35bd5bd5878788b036401e06a33b5f SHA512 97900a0e0de67cc3c3770c291c85c6fe937fceab5632c9832bc5c461d3b4e586a47c9733a1a50a805834f591e5af90651789ed74bf74e0eed4d6ce8084c51967
 DIST passenger-5.3.3.tar.gz 7040055 BLAKE2B 1a9caa34dd809f96da84e9e3c00f365fd5a5e80c5134c25be810ad2bd9e1f01d0f64c6323211f28121590ac4d4593572c5f4392e1be2bc87d78741a0fdd73885 SHA512 ae0b4a2681e7877c7a57d236139033f17782f3d0d891ac58bbfec211e77e3ada9d36c250c9c9234d853c666d1501ccc0e2d5997c247f10985cad936ad97a741e
 DIST passenger-5.3.4.tar.gz 7201951 BLAKE2B bc67fc5a0a1a8a38918d5c36470cc9df888eb7b85304b06f283199692b18922a9077db11db374fded091f851d5af67e7852d662f0e22a7ac4d49381eae35cbf9 SHA512 08fa0b06ae85cd48c748739be77713752c989ef031910441c243b5beacef398d544c41c87faa05a4d3f088da048b20ff5923d368ca12e0e2fd815726e9ce8c1a
+DIST passenger-5.3.5.tar.gz 7217952 BLAKE2B 80fca5713590c73b7d6afa73b5d3e323188ba6496082d0203dd09ee7d52d9751c6780ef1f68cb646722973743dfecf3aa810019c68a3f3ff0220a42de84d4081 SHA512 3b892f5d86247913572eb28541625f62fc22efba907541f5d3ef8a2d3a7bc81b7d90d5789650353bb4f2e11184e9ac272ea3d954db20ad5c6f9c9bdc52d2d035
 EBUILD passenger-5.3.2.ebuild 3980 BLAKE2B 90f06491d9546734822f033e4f8acf0aeae40e2a8f8185ff48d9995869eea7aa6731a290d0f7e8066c4ef92d50f5ed458ec1de979df518b3b29e0bbf6fd31c51 SHA512 c0defec19d84def74d81f1b3e8fb2f69228a5f1805d3a7fd40ea2894b22662deda3dbce5ba4fbba8c4481483718618fe4a9602666a0fa8b6b06e0d795905b0c4
 EBUILD passenger-5.3.3.ebuild 3982 BLAKE2B 89e14bf8db6ed5f52a9b7ac08ca58977e1b7d8afd492bbfd67dec1174046c030168cbc2462db0e8eefdb90c1f11f64c311b75dfc5988d2259f09f65536454912 SHA512 2fb7572a1c84e6d28a73ec33da00dfdf484bc8152018d5a713b096631e704b4b32947cb901809adf5ad46ba9a765dd410f1ab251fc0c78ebeb0b4ef3a60f7c05
 EBUILD passenger-5.3.4.ebuild 3982 BLAKE2B 89e14bf8db6ed5f52a9b7ac08ca58977e1b7d8afd492bbfd67dec1174046c030168cbc2462db0e8eefdb90c1f11f64c311b75dfc5988d2259f09f65536454912 SHA512 2fb7572a1c84e6d28a73ec33da00dfdf484bc8152018d5a713b096631e704b4b32947cb901809adf5ad46ba9a765dd410f1ab251fc0c78ebeb0b4ef3a60f7c05
+EBUILD passenger-5.3.5.ebuild 3979 BLAKE2B 93e7172e6d1886aece5cee9e34f9d85479f226203424aa71c22bfce2acee354574fbe0144f2303c6a08a2adf4e5bebd07333a42dcf82ff6a6b859cf43c34aa86 SHA512 c237287d7c5a09f0ada83551c152d16660705da43af3a9b1d68a906f02e7eb5403b614125077f016b54856da561b20783150f6abbbc571612b0f1cb38e12c974
 MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8
diff --git a/www-apache/passenger/files/passenger-5.1.11-gentoo.patch b/www-apache/passenger/files/passenger-5.1.11-gentoo.patch
index 5a2565c0315d..5981ead136f0 100644
--- a/www-apache/passenger/files/passenger-5.1.11-gentoo.patch
+++ b/www-apache/passenger/files/passenger-5.1.11-gentoo.patch
@@ -1,5 +1,5 @@
---- build/packaging.rb.~1~	2013-10-27 00:00:00.000000000 +0200
-+++ build/packaging.rb	2015-09-28 07:44:04.584236386 +0200
+--- a/build/packaging.rb.~1~	2013-10-27 00:00:00.000000000 +0200
++++ b/build/packaging.rb	2015-09-28 07:44:04.584236386 +0200
 @@ -575,7 +575,7 @@
    psg_ruby       = ENV['RUBY'] || "#{fs_bindir}/ruby"
    psg_free_ruby  = ENV['FREE_RUBY'] || "/usr/bin/env ruby"
diff --git a/www-apache/passenger/passenger-5.3.5.ebuild b/www-apache/passenger/passenger-5.3.5.ebuild
new file mode 100644
index 000000000000..3e6bbbe20254
--- /dev/null
+++ b/www-apache/passenger/passenger-5.3.5.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
+
+DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
+HOMEPAGE="https://www.phusionpassenger.com/"
+SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache2 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.8.0
+	net-misc/curl[ssl]
+	apache2? ( 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"
+
+want_apache2
+
+pkg_setup() {
+	use debug && append-flags -DPASSENGER_DEBUG
+	depend.apache_pkg_setup
+}
+
+all_ruby_prepare() {
+	eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
+	eapply "${FILESDIR}"/${PN}-5.1.1-isnan.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/ s/=.*$/= '$(tc-getCXX)'/" \
+		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
+
+	# Avoid fixed debugging CFLAGs.
+	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/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/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
+		src/ruby_supportlib/phusion_passenger.rb || die
+	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
+
+	# Don't install a tool that won't work in our setup.
+	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/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 src/cxx_supportlib/vendor-copy/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
+
+	# Fix hard-coded use of AR
+	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
+
+	# Make sure apache support is not attempted with -apache2
+	if ! use apache2 ; then
+		sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
+	fi
+}
+
+all_ruby_compile() {
+	if use apache2 ; then
+		V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+		 APXS2="${APXS}" \
+		 HTTPD="${APACHE_BIN}" \
+		 FS_LIBDIR='/usr/'$(get_libdir) \
+		 USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+		 ruby -S rake apache2 || die "rake failed"
+	fi
+}
+
+each_ruby_compile() {
+	append-flags -fno-strict-aliasing
+
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake native_support || die "rake failed"
+}
+
+all_ruby_install() {
+	if use apache2 ; then
+		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
+	fi
+
+	dodoc CHANGELOG README.md
+}
+
+each_ruby_install() {
+	DISTDIR="${D}" \
+	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
+	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	EXTRA_LDFLAGS="${LDFLAGS}" \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake fakeroot || die "rake failed"
+}