Nginx bump; Fixes #53; Added nchan; fixed rrd; // defer-fixes #51;

Signed-off-by: Vadim A. Misbakh-Soloviov <git@mva.name>

dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild

@@ -59,8 +59,8 @@ src_install(){
 	# Maybe this is needed for the tools directory too.
 	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
 
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+	fowners root:android -R "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+	fperms 0775 -R "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
 
 	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
 

profiles/make.defaults

@@ -1 +1 @@
-USE_EXPAND="${USE_EXPAND} NGINX_MODULES_STREAM"
+USE_EXPAND="${USE_EXPAND} NGINX_MODULES_STREAM LUA_TARGETS"

www-servers/nginx/Manifest

@@ -5,11 +5,12 @@ DIST encrypted-session-nginx-module-0.04.tar.gz 10006 SHA256 d24393dbee47188cd01
 DIST form-input-nginx-module-0.11.tar.gz 10699 SHA256 e986845a8cee2f20906346d84ee65568c038eb3b7e898c7d882174b20dcab082 SHA512 914565f96598cd5bade24385ae711f63d01a80565c9f69f91d836f11e46bfa0ba3ca14bdf873b3f69125570c0d3783073591b40d7e6800fa74f5f8f892d3c7bd WHIRLPOOL b3e041e51d02c1d1909ca0def6015bad1201bf42d8d860329e9e314d6bf720117d4d22f87218fad899b5927a90848da8d3e97dbb22566761e129b90ac769ae98
 DIST headers-more-nginx-module-a744defdfac1d6874152a51e3a8a604a85354a2c.tar.gz 26932 SHA256 4fb1ec98d6af7ddc8a761e0a087cf8b1337218e3ca2818a58972bc8690e77904 SHA512 6f5bce1145cb642a4e2a4226a1f2d49bf048da5da4b386695b4e0e8a14f801b1d5a40c0f81c48ec8344e1dfeb47d1c3bcd5fed371ed1d12d0b06595569a9c92d WHIRLPOOL 10ceb22b8924a26075724a788d06a25cf31e17dbfe52fa6f37990be20253b8f4118f8ead05d50f1e17dc20808f4a3c093387b5e1909d5dd10ce1688a7fcba661
 DIST iconv-nginx-module-0.13.tar.gz 13177 SHA256 6c584754b036dd54404596830156e373f8e5a4ba89d0153b2e3997fafd86c59c SHA512 2138e0a2460b822683d40541fc55add618b68a2ddccfada1aac845418b0eaf7564a95716f436ca329879fc89f469edb6b6ddc8e43ad1c5ba59813a8d6aa770f3 WHIRLPOOL 9c2808b5fc0a88f95882aaf2e4aa8d51cd3a6bcbc3012e10c4fca037cc658f8848a5b29a36b02db43373248f72f29cf4365a9a2553c97bcaa226563136847aad
-DIST lua-nginx-module-0.9.20rc1.tar.gz 543046 SHA256 11e54584c7d88b1fbdd87fbbfa8dcf73fc0add1cf016f14c1ecaa5a208fbfaca SHA512 7ddea31006623f7baeacbcd8ebd46f6896bf726ebc9e21df97a308f55026c2b84dbec17435cfaac16f8eab281329c713842b8e1f44007511c4794e155a534cd0 WHIRLPOOL 20898b492893f8d0571644d1609ebfe9b48337302989e3253c351ae5430699ce3add5fb8d72bf282861d822437471c12ce65cb1ae3eebec4cbf83ac389efed91
+DIST lua-nginx-module-0.10.0.tar.gz 569372 SHA256 cf31c64b107a54999fdf8b68e8b8d52d88a3c95d9307417f049c32c5687ed780 SHA512 8d1b07a040368e236a3473c5e9ed7aac6867743c08b57ffe7c708806ccee87e6dfca5412f37753f2576ca7a518acbd06fa0fd573c75e864c6bcfbed160f7221e WHIRLPOOL ec541230caf172802fb200fe11a185879a5c533cd41c3e3ba56b441aa4f82e2101f27156e8a17cda97960cc6ffa8814dc1005e7f1f8e4f7f86f0b847ed25220a
 DIST lua-upstream-nginx-module-0.04.tar.gz 10479 SHA256 eec4bbb40fd14e12179fd536a029e2fe82a7f29340ed357879d0b02b65302913 SHA512 9e79e5ccee8887e77d0a1214bec93b6749715c0ff810b8387c3b99cae2770634feca2afaf4b0fef94514c69dfc64cf969aedae77ceb2e32105f88aef5d6bd894 WHIRLPOOL 0081bc6232d13d6810d967d3d14dc518f32b46d197e17bb1dd004f5ee87fc894be12c58e93451b726c7f0bb5c2aacb897212748d5587ec7e8c58c5a8f1268867
 DIST memc-nginx-module-0.16.tar.gz 38560 SHA256 24f3c3270831aed2d157c01ef74cb26eab26b832971fe7b9f42a03dbfac10ce4 SHA512 e48a864ac9ae627e840b189f33157aa3a1c0966d2bcffd1f93030b0e6f5962355c004737cae0a5a00f2a1cbcb201369c37053f0823bb601618d18ef87561e353 WHIRLPOOL c53decff852790758b3b92ca1d207a5b99b592e708271411699d70dd9683d7f551b469e057f480f66adfdffa1cb1b91b9c7e031835311ac0b6bfab0f444852f9
-DIST mod_rrd_graph-0.2.0.tar.gz 3793 SHA256 fbb095b5dbab87ab0ef6be663d9837ec07efbb5df5250efe40fbbab1b898372d SHA512 9cfeb928843837762379b0efece963c4df5062239cd020f036e65b5e2b07beda1e90683a584b0b6cf87ed4462982a5d5e1052098cdbc69697e60db290dbd08a4 WHIRLPOOL 5286deb77b842c127b9c25de6f1c2e3fe21274b9d2b2b54a9a306de95762062e9988b857d6ebc6b3b839ffb987825f3c51fe2ae580de1c94eb3dd6dce48b0d3c
+DIST mod_rrd_graph-5d4c1a90d4d67cffb9df241540db1401fae7423c.tar.gz 3958 SHA256 6303de07b414b46811f48e8f156fb1efadc4b0d19a2e33fdf7869ec241506a00 SHA512 c249a85f7f30e4e99d1f8aaba1cc22c54798c14d5e70c009872648c7ac852b17f90f4c435a5337899856ea86e79574b7702d6443c7eda0917cbb40ddd1d1138d WHIRLPOOL 411cd15b3aba33ae6aeaaef7a2e593a6f7e2c7202ad93cdeb77492c14780f565184ac4914462928d042f814931eb729a562274966a6e3d4a72752f9958dd1c69
 DIST naxsi-0.54.tar.gz 163809 SHA256 9cc2c09405bc71f78ef26a8b6d70afcea3fccbe8125df70cb0cfc480133daba5 SHA512 91934bfd41495715269cc6e549d17f6da66f2bdd0c9a6821fa9096b694dd3927109c4aad2f8b327620ae7c34f76a0839ac16669cd8c65081bc01fa7f829c1d43 WHIRLPOOL ef68cfecc9849086527c3590744d3c0d73cec830c6cf1ebca63566a7444438757a85d0c79fa552c4763e0416a615f4cf8d99622e2f36d3713b7072138a82f5a8
+DIST nchan-0.98.tar.gz 334339 SHA256 5d1b9c61fe0f6a29fd5f3fca781bc362b433c9b3d86023e2ec7e1037f7ad4b93 SHA512 c4f58d905eb257be2dc0f1b4875b37a103fbe1a0bd226c5fe43eddc69f18106cac6c111ab6365f1be8cfeedbf73378eac1f030d9497f53f3fcf350c9b34f0e23 WHIRLPOOL 54c8242b0a66dc79a064376f3a074664ef9e06bac234f11a651e7f282d57b964f173f9dc10a0e3bcd34020309986af49854116bfc54b4a5d690034fed871d938
 DIST nginx-1.9.9.tar.gz 887908 SHA256 de66bb2b11c82533aa5cb5ccc27cbce736ab87c9f2c761e5237cda0b00068d73 SHA512 9b8a82cccb834a1647f0d0ea5e202d8bebae273ed9865c232dae228746e7c4334aa03616a7553494550dbbd99d41f790ba4d880b10381da50513c8659cb5e9b3 WHIRLPOOL ee661a95b137eb0983023b2d9992aa6a937e5a19f2bf5c4635ddd1f9932c9c879362656ad7819a451766c6b1c93c9a6b81c6d2014967482631f6b8d8d5f3ab17
 DIST nginx-audio-track-for-hls-module-1e8f2208e243971427154392b855fd973bfedbed.tar.gz 2067903 SHA256 51d1c2feba63e6951c9ca724a3feb84fe64914342472101b7c7bc03972936d32 SHA512 86cedd1fad8c8aaab2a10aef763d77b3a5425b3a190562c62d04c7205dd85c7b6a2eb4d400dc8a815ae7374fdf2fa029a1f2344cc313f67edc9eb5525172bea9 WHIRLPOOL 1bd131b9861f84204562cdff6efb5739d2dfac6a286b3982fb99256fb33fa7e486498e86216450cdfa32d5a375e0a84719727f2fb30db9dd952b907041992977
 DIST nginx-dav-ext-module-0.0.3.tar.gz 6260 SHA256 d428a0236c933779cb40ac8c91afb19d5c25a376dc3caab825bfd543e1ee530d SHA512 4763b1c5e417248d80acfacf20bfc5ba3e06675ff08e37703867daef99a400980b536941e4955c259432905bd11ab998bc2e2489a50350413c7bf37e18eafb74 WHIRLPOOL 5adbcea768fbb179249a03fe69304505ec09a1dafac848dd5e3cde96693c6fbcf6cf6c128ca116d02b36c1be0008807d9e86fee5b411e137b18b15a60291f29b
@@ -29,13 +30,13 @@ DIST ngx_http_auth_pam_module-1.4.tar.gz 6502 SHA256 095742c5bcb86f2431e215db785
 DIST ngx_http_enhanced_memcached_module-nginx_1.9.5.tar.gz 100769 SHA256 ff7bd9eeeaf137957183e8b541436f1e3d6534052e21eee0cb969c29489d6691 SHA512 61db52244b762d36118b9c56cc1a249ccb370ccff06264249a4da6a1c46856fee7e29bcd89447d6a7feb02b3f1b17c5f6f5fdc23db8f4ef217e0edb19479496b WHIRLPOOL 79b3d316774c7bb5d47be6f4a79d169ebffa1e7bb875e9ebe69bba0f33a8af8b38ce2196385eb0ec325835cc2db01d11b83a106fe52f242c3c8294a4ee9c0690
 DIST ngx_metrics-0.1.1.tar.gz 2964 SHA256 1c62ebb31e3caafad91720962770b0e7a4287f195520cf12471c262ac19b154e SHA512 d36a8fb0104c83b6b564e03b351aa750cab08650264c74d6f786af357bfb7006b531a93270dd961896ea8dafe27e5db8548ede714c5f52c4742876bc73af4b5e WHIRLPOOL 2796f5a97e76dfcc91133240e8e90ba493f0356f781a173d8cacdd09eba64b75ef531db398c0566fda395124700de8c991b771433e376ca0d5898c2ea6f82868
 DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 SHA256 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1 WHIRLPOOL 64c9b11ad938e6dbe5ba31298f1cd46f6e6bb4ba039c96b1e43bd85919d1606326f74b677f789ecabe0b0f4e0f08ac5aaf8148bf820de65aaa1e9966a28b9f61
-DIST ngx_pagespeed-release-1.10.33.1-beta.tar.gz 105140 SHA256 8baa3e4f31fea77a1f6e01a161d656b1d6cfa5ea4d782aa791f9e24f649de60d SHA512 5f2abf176edfa7435026bdd565b4319380065bc49911c162504b50571c88acd7132df846b280c86243974d7f98b539b2e586d9870bcb36d04f4ea74bb6061f05 WHIRLPOOL 893822d39a89dc7a47678a4f160509e5e14cc926e118a966423c55ef4327964ff12ff2858f6d8e6f6e0945f6e7c6b238eb06efef34d23a544968cf8621c56425
+DIST ngx_pagespeed-release-1.10.33.2-beta.tar.gz 105188 SHA256 b5496e18c8a55749c225e7c23efa1ce9f9c3095f9419483811ccebf98122acdc SHA512 39a44084f0b5653d6ec8b5d0c7a93e1b264ceab13a3d0d3ecea75d25281887056196d18a0958cf9cef53bb2c5d78603bca0a3c90d4951d949456c767d125253e WHIRLPOOL 8aa82f6e20056dcde88e12da50bf686f5bfa4865e6102ff2509212f2bb7f3651c03b285281f7ba385afdb340b12e96562c5d29d772d01411ea24345255e41361
 DIST ngx_postgres-1.0rc7.tar.gz 40742 SHA256 c942e674a7273ab87caab4dcad626ab54852be192c29b1add50d2cb535e3cbb9 SHA512 72a5ca839dd20a9b5de909ac4861a9f3fd6a958238d01d7b2f0ec575edba7ab36c50634fa52cb1b997bc0b29d62d4d8bb69d5ff2f08c0b3acf28ddebcbcf8ca5 WHIRLPOOL 4082554beb3176ce41a14f28fb1ba76721e5882eb325d8fb5e44cff32996048cb70fec45280a9a334290c0625bab0cb35d52cffd31b86957b259509e415d3c4f
 DIST ngx_slowfs_cache-1.10.tar.gz 11122 SHA256 aef0065bfdfdb4d2740a95311654bd8af218b1002a02e06f8129afbf9e17e195 SHA512 f6b6c06a743f0406de6a8f8313f84b9bb43c9e84f87b34bec039120b660c2ab00de2474019a08ab3070f7ccb4df1d62d8e060cc04962412b2c476a3d42a0ee37 WHIRLPOOL e8f3eee53e907fad2d9a4b265c3621af2a4336734a5bd2d54f7ac44af636050805711152f2fce12776a67fd45637cbf1b3ead2387c7e018c7416848bb6b861df
 DIST ngx_supervisord-1.4.tar.gz 19351 SHA256 0954a4efb1b955692acf523e169221146d6aa93ad1643c9f2482f75a1fbf9e3b SHA512 46fbfb2ff8182e3f3793847fe7b3983f3f1badf2bdb0605c2bbf1fdc12f1dab52520aee5a1736106d54e7dd1550dd36829c0576b5f260b3219d861c95f432389 WHIRLPOOL 7e08c26151f567dde1cd6bfee0cdd39d5eb49b259e0665b0d4912f2e4da9492f372306ef84a91723e6bcdc6625e5773d13134ad4aea7d721f1905ddc637b088e
 DIST njs-48d441db0ec8.tar.gz 123032 SHA256 34f0820d250b51833c01549622602ecad7f53416cf2144756520561c7f3548a2 SHA512 40f098ad5fbe2612e6cadce35cde34bcecf92d60d7eda1851fac0b994affd7ad200d3ff83204fcefad7491efdd80d13876ba729d0bd361a6e38c8d8d7a38fdf3 WHIRLPOOL 359caafb62b854a309d4138eb2d4ce406a6d994025432fda1169e4673829a4a511af4598da6dd4ae142ef97597ac16010932734a037c257f9441adfa0dcb6a8e
-DIST passenger-release-5.0.22.tar.gz 4908479 SHA256 d35d58b3e523de03d5d2adc445575085f37b1fbd00f945b6d3c2d39b2e91b9a8 SHA512 1dfea306563d211c8a1aec20802c3b2fb3ec1b37bc6d818df59e28c608925c7d445c0dcafbf17d3c3c59813a0dcc7fc233b8ef7f659239c807dc4ec0e200999c WHIRLPOOL 0ce6bcee45b0ce6b99b6e0cc246a5cde6135f956a9af46c2e4dd7b84cf189315e6e1264564be0af40cdff7d0f4a04ac9c1897b3eefaefef8395b583fd62f5911
-DIST psol-1.10.33.1.tar.gz 116932324 SHA256 06cbd0f20c80673037458a1e7a7e82f3611994cb9f2a91609f8acdb823de0d3e SHA512 093e6b6dacea2eabb104e8833c4f45dea1951832f172788010d41a318a405458019f36db4d1744af5094f92ad7b00ff7459736bf251019789dd5def5a4db1e05 WHIRLPOOL e72f20c69cb066e891160cc8292d49b40907da895780220f624e5bff9acb7197ae71e22d493e5908611ed3b407914e1185c1a4bececd6e6650d3a3016e9321ee
+DIST passenger-release-5.0.23.tar.gz 4908869 SHA256 3f8dee01ab66cd31a1aa2982280c4659b0c27cb1cc74bb350d1ad7d7d5fff1d7 SHA512 3dbd3a2ae12e8ef7040e2750337b2ec3482cb4d279289c6f2fbeb74db7c16bc5e0c04d54b30d9c04363649dfc737cdf703b4e4021123463498f887b596bfa1f8 WHIRLPOOL 67c1619aa35b02feda8d3b21a90199de8b4c7506649200f2e9494a2b2ed806e069e6ed6dbe3c7f7cde4f10887aea458d4a0501d5240b5af3d96c781ad1a8df31
+DIST psol-1.10.33.2.tar.gz 116928979 SHA256 1093b999d01cd84e3462d982afe3572c930f03d975a4a807d79eb61ff6dc3b99 SHA512 278d78c63a6500cb60e88ec0b0d9ad4d56d3c9719c399d4c6c0445c9c0bb2b616f30da52520e55333831a8a8f96899d92f9c2c25e84059f123076f3c48d0bcb7 WHIRLPOOL 76acf3c50fb3f839d004c5bd1ba8a4df06da9d2d6c9122dc641d1801d7f238e41d2e841e8f405fee5358ddab295f5306642c6e57fd7be81553a28e59a8a3f30f
 DIST rds-csv-nginx-module-0.07.tar.gz 19444 SHA256 b204909c6fb194fe8fed7627a3733bc9598f64251dc04a5b6a5bbd612e925324 SHA512 52188a4c719effc9e7f4b8f18f435ba361e5b6abc655e439b864aad5437fddc1cbe2fb5d158e343df9d3a8bf499c61db1f912b711d0795698001ce493dffeba5 WHIRLPOOL 150e80033bf6c8f788315a01d1cad7b969548946f246d0974a01edc3ea05edd10a964d37f3b426c72e2e7c754850720825ac3d9b4bfe61939fa07be8747e3a38
 DIST rds-json-nginx-module-0.14.tar.gz 33496 SHA256 99aedf222a9664484918392988cce41b1a6238240d42f8bd44f5ff102c05c36c SHA512 7239030f192c072887fbc058852827e048b18bb1add5abf63bb5f8ae4b6e74bb094d732c3eb09013c025072ab8c54945292add121822c98c3c475ec5754bc3e9 WHIRLPOOL 9be87e2825ba816acb09f55a6e89c8c6753ff44ba70346cb4f0d3e1f81acddb7867801a6319afe92996f99aa583c741fd1f46a83df0290d8b62dff03ade79a4e
 DIST redis2-nginx-module-0.12.tar.gz 28981 SHA256 baf5274c815a5f27854747df09ff5bcd6d82e0baa2f224a9db6450d2f3a35a4f SHA512 1b586688b9d11ea9c195b63abe06fb24a9f20011225179551774538147a159837270ecca3b8fba2ab51a19d9fc2c18b04c47707b3f295154cbefbaee9cb58811 WHIRLPOOL e6b8e90e2a5d55121b0099ba5aff370ee9c4d06e4db03c418dc9e2c54918150bbd49bad786432bb79612d822897f593ec1f4f5699d028fde5cb9488fcbae0aeb

www-servers/nginx/nginx-1.9.9.ebuild

@@ -15,7 +15,7 @@ EAPI="5"
 
 # prevent perl-module from adding automagic perl DEPENDs
 GENTOO_DEPEND_ON_PERL="no"
-USE_RUBY="jruby ruby20 ruby21 ruby22"
+USE_RUBY="jruby ruby20 ruby21 ruby22 ruby23"
 RUBY_OPTIONAL="yes"
 LUA_OPTIONAL="yes"
 
@@ -38,7 +38,7 @@ HTTP_TCPPROXY_MODULE_WD="${WORKDIR}/${HTTP_TCPPROXY_MODULE_P}"
 # http_passenger (https://github.com/phusion/passenger/tags, MIT)
 HTTP_PASSENGER_MODULE_A="phusion"
 HTTP_PASSENGER_MODULE_PN="passenger"
-HTTP_PASSENGER_MODULE_PV="5.0.22"
+HTTP_PASSENGER_MODULE_PV="5.0.23"
 #HTTP_PASSENGER_MODULE_SHA=""
 HTTP_PASSENGER_MODULE_P="${HTTP_PASSENGER_MODULE_PN}-${HTTP_PASSENGER_MODULE_SHA:-release-${HTTP_PASSENGER_MODULE_PV}}"
 HTTP_PASSENGER_MODULE_URI="https://github.com/${HTTP_PASSENGER_MODULE_A}/${HTTP_PASSENGER_MODULE_PN}/archive/${HTTP_PASSENGER_MODULE_SHA:-release-${HTTP_PASSENGER_MODULE_PV}}.tar.gz"
@@ -67,14 +67,14 @@ HTTP_PASSENGER_UNION_STATION_HOOKS_RAILS_WD="${WORKDIR}/${HTTP_PASSENGER_UNION_S
 # http_pagespeed (https://github.com/pagespeed/ngx_pagespeed/tags, BSD-2)
 HTTP_PAGESPEED_MODULE_A="pagespeed"
 HTTP_PAGESPEED_MODULE_PN="ngx_pagespeed"
-HTTP_PAGESPEED_MODULE_PV="release-1.10.33.1-beta"
+HTTP_PAGESPEED_MODULE_PV="release-1.10.33.2-beta"
 #HTTP_PAGESPEED_MODULE_SHA="1c5b61679cc47716930399516e188e1e896060dd"
 HTTP_PAGESPEED_MODULE_P="${HTTP_PAGESPEED_MODULE_PN}-${HTTP_PAGESPEED_MODULE_SHA:-${HTTP_PAGESPEED_MODULE_PV}}"
 HTTP_PAGESPEED_MODULE_URI="https://github.com/${HTTP_PAGESPEED_MODULE_A}/${HTTP_PAGESPEED_MODULE_PN}/archive/${HTTP_PAGESPEED_MODULE_SHA:-${HTTP_PAGESPEED_MODULE_PV}}.tar.gz"
 HTTP_PAGESPEED_MODULE_WD="${WORKDIR}/${HTTP_PAGESPEED_MODULE_P}"
 
 HTTP_PAGESPEED_PSOL_PN="psol"
-HTTP_PAGESPEED_PSOL_PV="1.10.33.1"
+HTTP_PAGESPEED_PSOL_PV="1.10.33.2"
 HTTP_PAGESPEED_PSOL_P="${HTTP_PAGESPEED_PSOL_PN}-${HTTP_PAGESPEED_PSOL_SHA:-${HTTP_PAGESPEED_PSOL_PV}}"
 HTTP_PAGESPEED_PSOL_URI="https://dl.google.com/dl/page-speed/${HTTP_PAGESPEED_PSOL_PN}/${HTTP_PAGESPEED_PSOL_PV}.tar.gz"
 HTTP_PAGESPEED_PSOL_WD="${WORKDIR}/${HTTP_PAGESPEED_PSOL_PN}"
@@ -96,10 +96,18 @@ HTTP_UPLOAD_PROGRESS_MODULE_P="${HTTP_UPLOAD_PROGRESS_MODULE_PN}-${HTTP_UPLOAD_P
 HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/${HTTP_UPLOAD_PROGRESS_MODULE_A}/${HTTP_UPLOAD_PROGRESS_MODULE_PN}/archive/${HTTP_UPLOAD_PROGRESS_MODULE_SHA:-v${HTTP_UPLOAD_PROGRESS_MODULE_PV}}.tar.gz"
 HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/${HTTP_UPLOAD_PROGRESS_MODULE_P}"
 
+# http_nchan (https://github.com/slact/nchan/tags, BSD-2)
+HTTP_NCHAN_MODULE_A="slact"
+HTTP_NCHAN_MODULE_PN="nchan"
+HTTP_NCHAN_MODULE_PV="0.98"
+HTTP_NCHAN_MODULE_P="${HTTP_NCHAN_MODULE_PN}-${HTTP_NCHAN_MODULE_SHA:-${HTTP_NCHAN_MODULE_PV}}"
+HTTP_NCHAN_MODULE_URI="https://github.com/${HTTP_NCHAN_MODULE_A}/${HTTP_NCHAN_MODULE_PN}/archive/${HTTP_NCHAN_MODULE_SHA:-v${HTTP_NCHAN_MODULE_PV}}.tar.gz"
+HTTP_NCHAN_MODULE_WD="${WORKDIR}/${HTTP_NCHAN_MODULE_P}"
+
 # http_headers_more (https://github.com/openresty/headers-more-nginx-module/tags, BSD)
 HTTP_HEADERS_MORE_MODULE_A="openresty"
 HTTP_HEADERS_MORE_MODULE_PN="headers-more-nginx-module"
-HTTP_HEADERS_MORE_MODULE_PV="0.28"
+HTTP_HEADERS_MORE_MODULE_PV="0.29rc1"
 HTTP_HEADERS_MORE_MODULE_SHA="a744defdfac1d6874152a51e3a8a604a85354a2c"
 HTTP_HEADERS_MORE_MODULE_P="${HTTP_HEADERS_MORE_MODULE_PN}-${HTTP_HEADERS_MORE_MODULE_SHA:-${HTTP_HEADERS_MORE_MODULE_PV}}"
 HTTP_HEADERS_MORE_MODULE_URI="https://github.com/${HTTP_HEADERS_MORE_MODULE_A}/${HTTP_HEADERS_MORE_MODULE_PN}/archive/${HTTP_HEADERS_MORE_MODULE_SHA:-v${HTTP_HEADERS_MORE_MODULE_PV}}.tar.gz"
@@ -163,7 +171,7 @@ HTTP_REDIS_MODULE_WD="${WORKDIR}/${HTTP_REDIS_MODULE_P}"
 # http_lua, NginX Lua module (https://github.com/openresty/lua-nginx-module/tags, BSD)
 HTTP_LUA_MODULE_A="openresty"
 HTTP_LUA_MODULE_PN="lua-nginx-module"
-HTTP_LUA_MODULE_PV="0.9.20rc1"
+HTTP_LUA_MODULE_PV="0.10.0"
 #HTTP_LUA_MODULE_SHA="8a0a3e4706cdd58272a8f38e8f09cc5e9db0307b"
 HTTP_LUA_MODULE_P="${HTTP_LUA_MODULE_PN}-${HTTP_LUA_MODULE_SHA:-${HTTP_LUA_MODULE_PV}}"
 HTTP_LUA_MODULE_URI="https://github.com/${HTTP_LUA_MODULE_A}/${HTTP_LUA_MODULE_PN}/archive/${HTTP_LUA_MODULE_SHA:-v${HTTP_LUA_MODULE_PV}}.tar.gz"
@@ -372,9 +380,13 @@ HTTP_AUTH_PAM_MODULE_P="${HTTP_AUTH_PAM_MODULE_PN}-${HTTP_AUTH_PAM_MODULE_SHA:-$
 HTTP_AUTH_PAM_MODULE_URI="https://github.com/${HTTP_AUTH_PAM_MODULE_A}/${HTTP_AUTH_PAM_MODULE_PN}/archive/v${HTTP_AUTH_PAM_MODULE_SHA:-${HTTP_AUTH_PAM_MODULE_PV}}.tar.gz"
 HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/${HTTP_AUTH_PAM_MODULE_P}"
 
+# http_rrd (https://github.com/evanmiller/mod_rrd_graph/tags, BSD-2)
+RRD_MODULE_A="evanmiller"
+RRD_MODULE_PN="mod_rrd_graph"
 RRD_MODULE_PV="0.2.0"
-RRD_MODULE_P="mod_rrd_graph-${RRD_MODULE_PV}"
-RRD_MODULE_URI="http://wiki.nginx.org/images/9/9d/${RRD_MODULE_P/m/M}.tar.gz"
+RRD_MODULE_SHA="5d4c1a90d4d67cffb9df241540db1401fae7423c"
+RRD_MODULE_P="${RRD_MODULE_PN}-${RRD_MODULE_SHA:-${RRD_MODULE_PV}}"
+RRD_MODULE_URI="https://github.com/${RRD_MODULE_A}/${RRD_MODULE_PN}/archive/${RRD_MODULE_SHA:-${RRD_MODULE_PV}}.tar.gz"
 RRD_MODULE_WD="${WORKDIR}/${RRD_MODULE_P}"
 
 # sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/downloads#tag-downloads, BSD-2)
@@ -447,6 +459,7 @@ SRC_URI="
 	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
 	nginx_modules_http_postgres? ( ${HTTP_POSTGRES_MODULE_URI} -> ${HTTP_POSTGRES_MODULE_P}.tar.gz )
 	nginx_modules_http_coolkit? ( ${HTTP_COOLKIT_MODULE_URI} -> ${HTTP_COOLKIT_MODULE_P}.tar.gz )
+	nginx_modules_http_nchan? ( ${HTTP_NCHAN_MODULE_URI} -> ${HTTP_NCHAN_MODULE_P}.tar.gz )
 	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
 	nginx_modules_http_supervisord? ( ${HTTP_SUPERVISORD_MODULE_URI} -> ${HTTP_SUPERVISORD_MODULE_P}.tar.gz )
 	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
@@ -563,6 +576,7 @@ NGINX_MODULES_3RD="
 	http_form_input
 	http_echo
 	http_memc
+	http_nchan
 	http_rds_json
 	http_rds_csv
 	http_postgres
@@ -614,9 +628,10 @@ REQUIRED_USE="
 		nginx_modules_http_security? ( pcre )
 		nginx_modules_http_push_stream? ( ssl )
 		pcre-jit? ( pcre )
+		http2? ( nginx_modules_http_v2 )
 "
 
-IUSE="aio debug +http +http-cache ipv6 libatomic mail pam +pcre pcre-jit perftools rrd ssl stream threads vim-syntax luajit selinux rtmp"
+IUSE="aio debug +http +http-cache ipv6 libatomic mail pam +pcre pcre-jit perftools rrd ssl stream threads vim-syntax luajit selinux rtmp http2"
 
 for mod in $NGINX_MODULES_STD; do
 	IUSE="${IUSE} +nginx_modules_http_${mod}"
@@ -1106,6 +1121,12 @@ src_configure() {
 		myconf+=" --add-module=${HTTP_FANCYINDEX_MODULE_WD}"
 	fi
 
+# http_nchan
+	if use nginx_modules_http_nchan; then
+		http_enabled=1
+		myconf+=" --add-module=${HTTP_NCHAN_MODULE_WD}"
+	fi
+
 # http_upload_progress
 	if use nginx_modules_http_upload_progress; then
 		http_enabled=1
@@ -1427,6 +1448,12 @@ src_install() {
 		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md}
 	fi
 
+# http_nchan
+	if use nginx_modules_http_nchan; then
+		docinto "${HTTP_NCHAN_MODULE_P}"
+		dodoc "${HTTP_NCHAN_MODULE_WD}"/README.md
+	fi
+
 # http_upload_progress
 	if use nginx_modules_http_upload_progress; then
 		docinto "${HTTP_UPLOAD_PROGRESS_MODULE_P}"