11 files changed, 231 insertions, 29 deletions
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index d72b51f5eae6..4d85b3e12d22 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 b1d66bbc0cb1..65d400122176 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -3,9 +3,13 @@ DIST mod_http2-1.12.1.tar.gz 1030534 BLAKE2B cbe02be6dfd1d1563a86c020f7eb8f5922e
 DIST mod_http2-1.12.2.tar.gz 1030072 BLAKE2B efb829eb98bb40489e9a52267125d79093ed2055e50ef6ae6c5fed7616df050e9ec659dd72764534ec778d75e6c462764baff88193970d2bbadf85572d5535f2 SHA512 2fab9625ba7adaa85fa4b1c55e0e1420851d1e44766f81c1e5b60b0b310b071047651c07b44b0dbeaf2d3cb2c722b9de3c52f145eb12e63c08301cf8c1f294cc
 DIST mod_http2-1.12.3.tar.gz 1038823 BLAKE2B 86c0f0a6ba04e67976842aa8dae29f401eb594cb66dfb5790bee2838fd017437acfa83d0129d6d91f623304c0d5b3e0eace605adc655dc4e459725d3019a79b0 SHA512 864381a4610a58c962fc59ab885655b20a8bd8aa711688e4ee1b6c5fc3804de843a81c7c0976d5862c18d40657f8e7f5caf2650e4975d946581b32d93af6ef71
 DIST mod_http2-1.12.5.tar.gz 1039313 BLAKE2B 13871ad7af9581657e09d46e107ceb8330d673a0e5c4ce761ff6aa956a2d674694ffe985e21190e0efb960f1cdcd1dfe3b9c1aa775edb8c892a3c15b1bdaff38 SHA512 63e2e6cbb6a1b222e3bb0611170e6cbee2ff652c3b44004176af5e3ba02cf2484b8826289586d47be2b18d453a8042d52407e6d798c49d3ed37cf52796d0e4be
+DIST mod_http2-1.13.0.tar.gz 1037382 BLAKE2B 8df02fe48d65c08504adf8fad9f328a525c0e0d677132843240410ba2008422ffee1a836e7884b5907c60ee9906ada3fcb9ad50d4c9e301ad8807af6eca3da6b SHA512 1302d4e9255811411432043df606dee775fbecd986bb5d9da53b5ef5c8a3600f3e23904f59e3d35d67910b70bde0e1d906445d5e3037ac80e5381eefe3839082
+DIST mod_http2-1.13.1.tar.gz 1031498 BLAKE2B 53716d7973e5996d48a85cc96c2634d40d6908f15529cf1e17b94ffe23e171de63914c862ab6dcb968cd74a9ca042778f8004b3bfdb2461f3dd30314dd1ef1ad SHA512 e14fe9d1910e5f4a48e3c0f94b2aa7ac73380ee8417b74c6a3e38360fe5bffaa16f59f48b7a0d0d7f9f50f933273b6b96e7530699e2bfd3ea485f34752a55a5b
 EBUILD mod_h2-1.12.1.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
 EBUILD mod_h2-1.12.2.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
 EBUILD mod_h2-1.12.3.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
 EBUILD mod_h2-1.12.5.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
+EBUILD mod_h2-1.13.0.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
+EBUILD mod_h2-1.13.1.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
 EBUILD mod_h2-9999.ebuild 888 BLAKE2B cc260a4fdbe81d168096723f0e0d135350069cd9b2c9e853b0b7efe351ae96ddbaa9fa5dc219feec73671c496e2ecf2e5b26623e624850de8668088298f6313a SHA512 d0d0980cf07096df9ee3199d0e8aff6b5ce608c1c33348510cd201f8934d21c493f6a6a53884a90a064c852fb4641930c74f3b4493923cce74afbac9d184f9b5
 MISC metadata.xml 325 BLAKE2B 4154e88a0c1eb61e74e41ca0b86a2746d6fa8f0e573c5c8c36a9acc0306306804ce6c9b83834b67ae99476468f9143273f977bf868e06d1bc4b5022dd08b2722 SHA512 8dd16aa1fbf71b64c679cba7dc5759fb51410690fd6e6b77416d3604ea746a00516283510a0b24971aa0f5c08359eba6f5d96fab2f8eebdda7f2ebd8f428a04f
diff --git a/www-apache/mod_h2/mod_h2-1.13.0.ebuild b/www-apache/mod_h2/mod_h2-1.13.0.ebuild
new file mode 100644
index 000000000000..3e6d435d3f82
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.13.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 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-1.13.1.ebuild b/www-apache/mod_h2/mod_h2-1.13.1.ebuild
new file mode 100644
index 000000000000..3e6d435d3f82
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.13.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 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_limitipconn/Manifest b/www-apache/mod_limitipconn/Manifest
index ca521ac52e45..522b4d8145c1 100644
--- a/www-apache/mod_limitipconn/Manifest
+++ b/www-apache/mod_limitipconn/Manifest
@@ -1,5 +1,5 @@
 AUX 27_mod_limitipconn.conf 554 BLAKE2B 2bd5e2224a19d2b5a18b64224db41e232ed2c9028fdcaa751251e29d9990e1006b0ca25d09682f1a108d176a5898d2460bb26dc92816dd79530706434ac1adb6 SHA512 7ded8b48b769529a8fcb6b25855d31ef82cf3de423a75ae5e986974ba2c21643adff235ec9bfcde1955513d10fc3fc9dde172ddb9fb43626eb625bed96936c3d
 DIST mod_limitipconn-0.24.tar.bz2 10150 BLAKE2B 0715a0494f6d434217093625f10b5b723de3823c88c82fe2ffa22972b2496abae0924fc7b5d773568af125dc92466e8ab84e3e86acde7756c9535b244e729e88 SHA512 caf1337231ac83ef57938b0f89769afcf309a4a09a0a2c3fb171e49f038d42a5859dfdac06b2c7766f05d9431132b8752aa8ad5164794c89638eb90f392e827f
-EBUILD mod_limitipconn-0.24-r3.ebuild 565 BLAKE2B 2634ef79bd35047abbabfc5d9ed9a52462feac1026a2a1e383824a36ccc51c2a2ef0115e49904d26aab62be7b2ac2df5cbd9b01eae026528e92b789bb6328801 SHA512 ccd8085ca5319d475779cf09e956ad65515f1245257262aa445cd417162376e2184dd0c8fd8425bea392382d031d47efd75180d3b0108d7b3651a73457c74f1d
+EBUILD mod_limitipconn-0.24-r3.ebuild 564 BLAKE2B aabfc90134e493726befedc02698770fa11f2883b08b769c6e31b2ddd1b72b4456f59b12e951df9d7395bb401695afedf1a9810d02bc4c2415f2fe0eb44d1228 SHA512 746fa482e0dd53257b0415dcc79604b5314d3ece6b50a8fe5c0d21f3874c5dd24279941c8faac6a9adca2d8a89a9f647300fe02581e673a5f73395101c16896b
 EBUILD mod_limitipconn-0.24.ebuild 550 BLAKE2B 7b856fc0b40c3a585e982423bc8bda2228735eb000389f486915d62ba27cc51b7678eb50cb8b07a95830e516e752af0372630f6ae04a19622b942f56195ed88e SHA512 68bcab646ac732ced0ed6309a36db46f57d64b2a6b6ceacfaae351c654f694776f96d9420d61108e63f3e3570b2cf81d3f4552ee55497c9adeead5d4cb180ac9
 MISC metadata.xml 358 BLAKE2B 557957d79622c5cee28e1c29cf2b72a812814427f198e5795af545a705848766278b04d6d7f650dac7e7374e82456208716cf2223b562707d5870a0020dfe973 SHA512 89dd1558e063150565f346d3b844bb6534bf49fb65c0f32208c620df671c9482d42b8f50c93de34d1d5f290c9e5bb4109d8a818edf994871c5428f7b3a387930
diff --git a/www-apache/mod_limitipconn/mod_limitipconn-0.24-r3.ebuild b/www-apache/mod_limitipconn/mod_limitipconn-0.24-r3.ebuild
index 668260a721e9..d4752fe87fca 100644
--- a/www-apache/mod_limitipconn/mod_limitipconn-0.24-r3.ebuild
+++ b/www-apache/mod_limitipconn/mod_limitipconn-0.24-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://dominia.org/djao/limit/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/www-apache/mod_log_rotate/Manifest b/www-apache/mod_log_rotate/Manifest
index e57d724038c6..0878b04f8b1c 100644
--- a/www-apache/mod_log_rotate/Manifest
+++ b/www-apache/mod_log_rotate/Manifest
@@ -1,6 +1,4 @@
 AUX 10_mod_log_rotate.conf 132 BLAKE2B a7bb07653e4f31bd5e54f864d06ec62a8ff2cbdc298917b92f2da1b59e0bf7835863caf61461dbff3663eb3c9762cfca6a281166ed0a1da82e815f1215b9938b SHA512 70f973aba76042486bc9ca71365bc2c0e1e78266956418d3804ba4af4a6a491373e62da96b40a7ad1a5f24ab75692419214565e4e579ba75ec5a1259dbdbed27
-DIST mod_log_rotate-1.00.tar.bz2 4697 BLAKE2B a53d246b55da66b0708e62e0a91ac93e33da217febdd703e73aa61a8ef62aa0a1e516f8255cf0e49b04c16c242e3478a64aead1eb0b7af9cd8984afba986a520 SHA512 dbfa1399f70333e6d53cee039ba9c81a213b485a8a6824976983ebc85b2c856061dbbc13fa899b5e98912c519c9fb37009bf2fbf8b6a9f46cca65c0e3bd1595e
 DIST mod_log_rotate-1.01.tar.gz 9772 BLAKE2B 87fd9f3d02c2aad3849236c8a7e8713e9f550b6b795fecfe75226e5d429c5abe0f2626754f8a82036e0ee1b90802e46ddd90ac622ba3740c0e3382346bdad534 SHA512 7da606ae8ce5e0f2ade16fdffffc57fa9549b4b5e9529eb3149ff7390caa64f7ec065aa7416b5c8ab751e2b3eaf35cf79c96b8c7e68e1165a46851547781c076
-EBUILD mod_log_rotate-1.00.ebuild 488 BLAKE2B d499784b2ed2fcf5c2d7111d56b7a17ade4ff7d33e21d9db109820fe84d61144577cac52780994d25d62e4d22f8a79d6d62b701634862b34f65afaf2c3176f78 SHA512 0f83baa0a9202fa0e0426f170a74b9d8908bda6990e9da004e1099ee856dc5bbd6b0f9c8a388851623dc585b5a69d667e361e675b87fefbd60c277759c353947
-EBUILD mod_log_rotate-1.01.ebuild 520 BLAKE2B 87974b686373b56877c8aaa5346a563f6adfbd9051ca26be10eae8b0a3d26d6e43c9b8911258b40106aeca422218ee0419c90aa6850a42a0382d6655fbe0c5b8 SHA512 0a0ddd299137f848e7df7e3f1bab54d0d4e68c662af322fe1d6746b20cd9cd9e7a87fc040a6a067f06ba9ddee899b18080caf46b3ecb2f606c61560227ce77f9
+EBUILD mod_log_rotate-1.01.ebuild 519 BLAKE2B 62bdce177816e7bfeba39474fa0fd7152cfeb00fbe0913535a478cc558d1bb2d74279a06a796db81d0e1d233e45ab9f179bf20c36a44be5804a1fd16431bece9 SHA512 397a40ad12db88b6f7719860d1e98ed5c4faba5a5af1c5162fd7f9945e82fb2ca8badd2239256f5e5d996038d7bfa418bbdb90381be320fd3dc37a0039f752c4
 MISC metadata.xml 253 BLAKE2B a3482b13c7710d65b2556341e18a25afe2ad2cc468485a697fb0d78a13b923313f254488aa1055a6992070d07774b0bda4f002ec6d0e3687b90a64006a800554 SHA512 e09da9ca586edbc4a97e071e75a8eabfee4845ea3f4849fecda9be93c653c992c6aac4bbd35cba273546f21144fd0fc18b82a4ae0c2e30aeb25e65b90df962c5
diff --git a/www-apache/mod_log_rotate/mod_log_rotate-1.00.ebuild b/www-apache/mod_log_rotate/mod_log_rotate-1.00.ebuild
deleted file mode 100644
index 4ec229612b9e..000000000000
--- a/www-apache/mod_log_rotate/mod_log_rotate-1.00.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils apache-module
-
-DESCRIPTION="mod_log_rotate adds log rotation support to mod_log_config based on strftime(3)"
-HOMEPAGE="https://github.com/JBlond/mod_log_rotate"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-APACHE2_MOD_CONF="10_${PN}"
-APACHE2_MOD_DEFINE="LOG_ROTATE"
-
-need_apache2
diff --git a/www-apache/mod_log_rotate/mod_log_rotate-1.01.ebuild b/www-apache/mod_log_rotate/mod_log_rotate-1.01.ebuild
index e3b64c1650d4..e2f226068c1a 100644
--- a/www-apache/mod_log_rotate/mod_log_rotate-1.01.ebuild
+++ b/www-apache/mod_log_rotate/mod_log_rotate-1.01.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/JBlond/${PN}/archive/${PV}.tar.gz -> ${P}.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 b4d6ef49f198..be4a08aabfa4 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -3,6 +3,8 @@ AUX passenger-5.1.1-isnan.patch 1155 BLAKE2B bb11276f94f4be93a7ef089e09079d36971
 AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f0163f320d4f4d1bbd9d34ec34ec81f2fd2e7d9ea6f3d03c4a611f13095c4ad414ba7c0920064f8408837a2600d2d2e9 SHA512 c75442ac0403131e5fdbe76ec52acdcffcb6947af81ce79e003ebbb9e97d25a855651bd62c0aad66dd22d8cd4dff2221fc84b0ce74da3908f06f272c8b133c2d
 DIST passenger-5.3.7.tar.gz 7195477 BLAKE2B 43a2384574316f6c8472f326389e8c1feed769e78d66c20e63f6d2679b1ac1b20a9122612c98e3006520e6f24c5883addd93ef11e8f0385759ee0c9e9299b7ad SHA512 bbef4881e0e0c698b29b10ff8a7afbc001c31d14fb80ffa27ed6867a92ad23712319733e6162be1f7720ebda421630af2f258f8167fa73c7b5ea594bc8247158
 DIST passenger-6.0.1.tar.gz 7203144 BLAKE2B 1c59a4e7c6e82fc57f507653d8648cc8c21fae6ce8fb008b0839b60e6a076227f139300d7521eaff281ce2f935f20a730b3b34cb2cf3527a807f38e78219277d SHA512 d2fdd27367a2adc8e5486038c7bb9a504c13bc675ba9640123c1a091e6a891238c90c54a75938cd119d74f40c8d0b28257704c83ebefa024057c744ea845997d
+DIST passenger-6.0.2.tar.gz 7204982 BLAKE2B 056f85f88e49ca7dcfe37d1d1003beaa5325259a130b44aa60a319d36987c901b0a8a188998d38b68f3d396a71df0db8b8fc9562e58327b61a712dc39fb7ce1e SHA512 05a1c598588ad96864ef81ff8bc45535b3cb35c0f4840f16b93d39c0ece94378e806d967190a3d69b28b37d463624955bb45970459cf8febb258d8fd135e97f2
 EBUILD passenger-5.3.7.ebuild 3977 BLAKE2B da5ac9a4676d2ae1cd238be73803583619f2b0c5711761790a399cb19633f3f760de25dd7e04ad76a89cf2a7420fc74a60d150fc2fb2a25eff7aa7a8c6e60a5c SHA512 b6a6df0c2a3c0502632e6bb65511e9df1e468b013bbc56dbb430055e6dcca3dcf773f09fa108f9d993c1bddd5a2c41fd29cce889bc5a0985888b5cecc15bade2
 EBUILD passenger-6.0.1.ebuild 3986 BLAKE2B 0485d3f5041b1f833df6a475a824a9ae88f1ff86e6be1190b1c8a5719fe07d471c55a2d7ebe1aacc8a08e5d104cf02e9e4d4e54b934c5bc0b2a4dc818869c219 SHA512 be4cc479158cd2458e959fc96b9fe49808e4fde6baef440009c0b84c603ebb0c703ba454cdf69db62d8613eb3545faf4dbc7ecee185107693043fb3e54faf24e
+EBUILD passenger-6.0.2.ebuild 3986 BLAKE2B 0485d3f5041b1f833df6a475a824a9ae88f1ff86e6be1190b1c8a5719fe07d471c55a2d7ebe1aacc8a08e5d104cf02e9e4d4e54b934c5bc0b2a4dc818869c219 SHA512 be4cc479158cd2458e959fc96b9fe49808e4fde6baef440009c0b84c603ebb0c703ba454cdf69db62d8613eb3545faf4dbc7ecee185107693043fb3e54faf24e
 MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8
diff --git a/www-apache/passenger/passenger-6.0.2.ebuild b/www-apache/passenger/passenger-6.0.2.ebuild
new file mode 100644
index 000000000000..e9d13ce882e4
--- /dev/null
+++ b/www-apache/passenger/passenger-6.0.2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+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"
+}