Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/www-servers
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2012-07-30 08:18:38 +0000
committerBenedikt Boehm <hollow@gentoo.org>2012-07-30 08:18:38 +0000
commit1109693625ae1c0aad0bcdeaac8b196961cd8a24 (patch)
tree8ecd7aa27b971fc16ac4d0506db3e3091d100fff /www-servers
parentBug Fix 428452 - Ebuild/Pkg Locale Handling Conflict, Updated python dependen... (diff)
downloadhistorical-1109693625ae1c0aad0bcdeaac8b196961cd8a24.tar.gz
historical-1109693625ae1c0aad0bcdeaac8b196961cd8a24.tar.bz2
historical-1109693625ae1c0aad0bcdeaac8b196961cd8a24.zip
add lua module + cleanup
Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/nginx/ChangeLog6
-rw-r--r--www-servers/nginx/Manifest13
-rw-r--r--www-servers/nginx/nginx-1.2.2.ebuild106
-rw-r--r--www-servers/nginx/nginx-1.3.3.ebuild106
4 files changed, 153 insertions, 78 deletions
diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 2798ef4b8ae0..f33efaa2bbde 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-servers/nginx
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.329 2012/07/30 06:29:23 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.330 2012/07/30 08:18:38 hollow Exp $
+
+ 30 Jul 2012; Benedikt Böhm <hollow@gentoo.org> nginx-1.2.2.ebuild,
+ nginx-1.3.3.ebuild:
+ add lua module + cleanup
30 Jul 2012; Benedikt Böhm <hollow@gentoo.org> nginx-1.2.1.ebuild,
nginx-1.2.2.ebuild, -nginx-1.3.1.ebuild, nginx-1.3.3.ebuild:
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 0e0b4c5761a6..be10859c8b5d 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -10,15 +10,22 @@ DIST nginx_upload_module-2.2.0.tar.gz 25796 SHA256 b1c26abe0427180602e257627b4ed
DIST ngx-fancyindex-0.3.1.tar.gz 13148 SHA256 49328a175548a456e2e2b78d0be87df7aade60345e07be57f2337c83058da115 SHA512 6d21d8498eac949dc37c36fdfe24e7e4dd172293c840543bb02b6581dbb8982502e5f70d2badce4bfd0dad2b41ab3f01abb746b5b275f286cb01af4f297e2ce5 WHIRLPOOL 47b2f82d766589ed57d0878e63642d609fcb494df25c8265ccfd51b51e4a831eb42cff1e1aedafc6553885383d06ece4d9d493485dbc53df81bb1d300679113b
DIST ngx_cache_purge-1.4.tar.gz 6899 SHA256 4764e3d565445644f4a6b183cb9e987fce535396b00d68dc923bb35731a88886 SHA512 bc5d286564981a11b197059d6b57c54b06f4b5c33239cec6c4da409bff3ffb830fb91ab31bf2e80ecfbea343692402d475b52dd2599a43670ff71da157489edb WHIRLPOOL c431c95483fbeab6534fe653a672e19cb4e0b0aeafc6da97318228a5773103d37b4fa78dc5d15192e2e76850b8819465ffc7cb372f132ad2346353e25b92dacf
DIST ngx_cache_purge-1.5.tar.gz 7149 SHA256 4b9cf48c0cf8f13150dfc329a889c221f6206a44aa9dcf8fa2f347abce55995c SHA512 2e7fa1f015976c7c1e33d025b3efd105439a8ae673a0cc356fa475d337340def73e72faca44f6f60e9b1ab540327ed712113f538dd8ec1f7ccaefde3a45eecab WHIRLPOOL 46e7efe15f45cd23f6d9988ff160fd2ca412cfbffadb8aad6e2f172b43706ccd63ff78dd4f80a2f95a9cdac36008b506e68a01c0921bb1128d1c71e6717ba097
+DIST ngx_cache_purge-1.6.tar.gz 7296 SHA256 863d6dd60e31b3c24c1f2d314f294c62a4ab5cf37f98c20ded9f6df1018baac8 SHA512 d1e8d3ebd170a3d26eb1dd03a058974ea6a5c0b29e0feb2c7518f9de7524b62816a697b3b17de4199fdb36e405ce88aef722005916ad1d903f44a653e2c3458f WHIRLPOOL 891e82dbef1db64527c767656ae74dd0d2ae230e359654d3aa038ad44d317a95721dd0d7ad8bf7e096ac15e1a8d8c8d8db98e6339ca48a7ec1ad6d9e2f6150b5
+DIST ngx_devel_kit-0.2.17.tar.gz 64964 SHA256 bf5540d76d1867b4411091f16c6c786fd66759099c59483c76c68434020fdb02 SHA512 d2d935ec28719a8046358b248a5d4eef3f39bba437f3fc986a0621a12855acfa541f30720b33dc4afea2718d36e282be8673e7c800fa62f7e1ac67a8839a620d WHIRLPOOL eb55bf12624b07f2357fd05901acb5f5fdc7d83d49388e6e9d3e20394693ff922dbcf7816f604b7592fb16c8067ba96cc0d828368be9de7469138e262457917d
+DIST ngx_http_fancyindex-0.3.1.tar.gz 13148 SHA256 49328a175548a456e2e2b78d0be87df7aade60345e07be57f2337c83058da115 SHA512 6d21d8498eac949dc37c36fdfe24e7e4dd172293c840543bb02b6581dbb8982502e5f70d2badce4bfd0dad2b41ab3f01abb746b5b275f286cb01af4f297e2ce5 WHIRLPOOL 47b2f82d766589ed57d0878e63642d609fcb494df25c8265ccfd51b51e4a831eb42cff1e1aedafc6553885383d06ece4d9d493485dbc53df81bb1d300679113b
DIST ngx_http_headers_more-0.15.tar.gz 22738 SHA256 d5ada29c15ff112c39599e3b245450ef785bb096c6724ecd8eaf1699b06e10e2 SHA512 38ccffdf20d7d17394c59f555b4f0166dece0109ea9f3665ed36ce24b589db0d03132529efa1ef33199701cbc4c2c19778907f78b362a10055eb9bd26cbbb575 WHIRLPOOL 89363c41f732a3db27815f69fc26e7b73626d01366175c57046d96c3ec4bceb71387effe4d7a16918a2fc97ce1acad6a313d1fad18fd09dd6b8206c5ff8a2d74
+DIST ngx_http_headers_more-0.17.tar.gz 23324 SHA256 039b8296f3954748fcb86a80076af4d8d5ee8e84340c1f55ccdbef72437357d9 SHA512 b53a7c8783b2a5cc77e3cfdd399873b6ddc5951193e7342e92d4b22f29188994cbccf804bbd8ab04c7db0202f14b924ffbb5acce297f96a6a038194f79177a98 WHIRLPOOL 0ddf6dfb172552ccd57105995aac2b08920df33fc9000210520fdd827295e3f0ecc3a5b59ea8cbfb1c587f12a0ea7c179d8b0cec1415cbf7c0bb097f7fb9d19b
DIST ngx_http_headers_more-0.17rc1.tar.gz 24707 SHA256 826b62c13605281f843ad4a612a00b38d71599a673c3112480bff9bdbbcd36cd SHA512 c6088e361ed3ca3a9ff3c99126742639d5a02f15996cb696f127f963499fca80332a5f5a2dc7d334405123890e706d8628448793b41301b130a043a0175f9057 WHIRLPOOL ae677712bdea2b82728a5f58172b11d175a2672bbcf127eed789d73300362c614f1a62a226548e883b68a32432737d4c61ba9ecae33936dc448331a5e94c25fd
+DIST ngx_http_lua-0.5.10.tar.gz 369553 SHA256 d8a2d91f4fb2792c55ecc2c7dcf24e40a1b795ac91e1f73d98b67d000b957ee6 SHA512 3a2088fb5a4da251afc8a500e3626035570f6fbf1bbd943e6ad1f7fa240ee849f07d4bd595a1d8d5137c3db7fcae1793e898efc286c10841b9179562ca60d7ed WHIRLPOOL 04ff8aec6c4de25a49b8394886e0c47a78a56cd4a0f6dac4018de9a474fdf1a1578ffedeede6dcd9bec3885c6296ba077ec9f34e33c3719a059155c6744026d5
+DIST ngx_http_upload_progress-0.9.0.tar.gz 17020 SHA256 3fb903dab595cf6656fa0fc5743a48daffbba2f6b5c554836be630800eaad4e2 SHA512 8b585609983b34a9f3fa39aa18b744be7109beee2e1892ec723deae0353fb366f700e58e120569b7ff364841d271d04b32a9022a0165e9f33e07a21437e1c0ca WHIRLPOOL 42aefc25e98cd0a8f48705638462927494a3b0bcbed1fb0ea7b33a6027a848950347d20d1b055211890ccf4be4f31c7e417614948adeec1272ea01c2e5f0d29a
DIST ngx_slowfs_cache-1.6.tar.gz 10972 SHA256 cc0505dbba30153691ff7b3a7353804d5ceb9a519a407b938cae49e9913a7bcc SHA512 a7fb811d89c15732f279d274acff1ddb548c6635e59e6bf78e0af8172509d7a89fcf856fc7971f6b36db727b283819b0f3fe7a42d4d79f7b228d70dad72175cc WHIRLPOOL d6a90fba4e27a94a5ea8697f652c9db40f33d3f3f9b5613670a91dd280aea4a5135bf602597d096beff1c7fc7b92746693e0914be058e0cbd37a3419873a676d
DIST ngx_slowfs_cache-1.8.tar.gz 11408 SHA256 3ab8aa47912a3f7a07cda0a4fbf6d2e870b9c9cbf5477014ac109001cdcb3644 SHA512 3e6da55135da51b1b1abc1b8c62f058777dacfd6e3ffb0082be39ecc6ed8ece6fb1da36ea8fe9d7d684affaf183b285f5f19d2ca0812e7e48f1735f85735dc7f WHIRLPOOL 504701ffe7c82de471b90badaac87b0772a3285c923307005d96c6ad9d7ba8da8cba74221bc962be8904dde6ad0ee2f6482408b1fbf7f894a7c1da6c4f024f9b
+DIST ngx_slowfs_cache-1.9.tar.gz 11527 SHA256 7a2e07033550f3b594949a4392ac9a34e5583025ffea4e33e39a7f0d9fdc8b42 SHA512 4151ecd9272de332720de8b838fded1e7b192b2426683c3d7e49f67307603154076625b87a218b34609afd0d0fb0827f8a831b38c95cdc0f2a369aade663d25e WHIRLPOOL 24a4f5bb03563557ab1bc32bf82915c36017af3abe4e1ae2a92f1b688f189a3712bced7484d9786598dce0fc1ae7d80bceb184fc23ce9c2a130bc135b6e61a9b
DIST ngx_upload_progress-0.8.3.tar.gz 16694 SHA256 f391da7fd1a89bd65e852182b6cbc746289cd10c83b211be18e703ff3e3986ae SHA512 c7e39bbf82379ea50dfbc2be995f9cf3bd8df43237b3cc4f8f9ace614668a58a12f939aab311103ab98a7a3d51265eb4a70c8450eaf83961c477ef2bab1c76d2 WHIRLPOOL 9af31c2034e1c07e4fbb0217bc7a672b6a19e4604e75dd2aef84dfd2c28162c46c66c138d3d38c5595dce9accf2062fe3574a1ad5530224b723997a720989ff4
DIST ngx_upload_progress-0.9.0.tar.gz 17020 SHA256 3fb903dab595cf6656fa0fc5743a48daffbba2f6b5c554836be630800eaad4e2 SHA512 8b585609983b34a9f3fa39aa18b744be7109beee2e1892ec723deae0353fb366f700e58e120569b7ff364841d271d04b32a9022a0165e9f33e07a21437e1c0ca WHIRLPOOL 42aefc25e98cd0a8f48705638462927494a3b0bcbed1fb0ea7b33a6027a848950347d20d1b055211890ccf4be4f31c7e417614948adeec1272ea01c2e5f0d29a
EBUILD nginx-1.0.15.ebuild 11216 SHA256 085ac5eddd552f713d60671df3891ade51bdfd5342aebcb58893b16ca33e0f06 SHA512 7cb073d517ac38b6e23a835465e63bfb4419232c1ae39a31ac830948569dff2a7c852a9c5a10ccd992770b137615721d020d027f649fdeb7b86c9402a8299e2a WHIRLPOOL f6f574cff2e436c69df8c4f16822a80cd4a0c26230b35e950fd592a3502209321032f45585fef08950d5d6c5a13990b2031864fcdd8d900d855889627db46a6d
EBUILD nginx-1.2.1.ebuild 12518 SHA256 2f037b91ceef492fb32e3a7735f86069eb65b07db927e84ac168b7cbe31f0948 SHA512 60d95b206e88472cc8ae1e280bcfaa646c063c1331b38687a0ee61eaf68979d991a3e4f03ac969052558b27a7c032c74971ba3f60a92dc26781380bf91593eea WHIRLPOOL ab0f92337b29497cfd704f534add72d5083469af1485090613c8199ab869eb8ecd9cef17ba3f51632b0554024ae6ebc414cff2e34c35e473bcbc1bec1580808a
-EBUILD nginx-1.2.2.ebuild 12520 SHA256 21fbebe4e83b4c9cc33ae7c371f1f086a45692d062f4f11b6173e2be2d5b2563 SHA512 44918a8b901de33a698fac7a47fd9e033ae9cb221bf5e555e46e2a71dd0a8261b7fdac12d670b3b5b2fe94f946d2a4c6629d7cc465dfd7e5f460b49348c99144 WHIRLPOOL 5ce5040fb1f106e7edf1bdf4a9f2560a187cb1dae2fc1f5b69c73c7ab28298f106562c7d227a9834de86eab232d19527b37fad835520ecd11abdf4e76885779e
-EBUILD nginx-1.3.3.ebuild 12520 SHA256 c44f5d9026226a62c7b4d68a5788be5d37c181c6f115ce833096209f95f19d60 SHA512 addd138f376c4ec35934e603a69cc2cfdcb6d30ac1d9d65a10bf69af87d5b8034b2a853011124a4368dec1ec13b615cc0fce0fa7fc008f14841320682210ae13 WHIRLPOOL 91210d4df9dea20c5da56768cc2f93e979bb1d1b0b7f60f6e1b814e6a21ce9069232d77f0777fa8afae5524a77cecd5ee795953c03ce311683f01a46cb0fafe4
-MISC ChangeLog 53940 SHA256 6c253a7dd742531ad0e9187feb1e0a055f9497c2489ca7429cf711001bc23b48 SHA512 7455cd6ccb9bb4cb8a09a1742f5281d6140db0ee79ee0d1120e695d1a485f8af6c981ae3b5781f40fe3690b320321f83dea2b2bb4c4cf68ea2717c8c19f0e08c WHIRLPOOL 8ef12f1033097679ab18404883f3aaf8e0884ca4f08a29e6f094ef020052100bf9e1abe5fd8cbe324f184d8bc73abfad281b0d3047825d58bb52f9f9c7f686b3
+EBUILD nginx-1.2.2.ebuild 14033 SHA256 0059a0e5f537109d976deed0d679a086fab5aa14e1a7a5e35483190fcd794624 SHA512 a0cabd0352ea3e28a16a41449aa0d04dec9d320df90780722e5d3c67e2955efc80e5cb0d3a090c8405c603217c3d38bea5afdd68a54c216ad7f5e5d23771a9b1 WHIRLPOOL 59c778a831bb76d53abc688285fcb51e2d809d0319dcf4cfeace51fb55433b29d73ea1db52e436ac15eac5fbd634cd50e1238b9d2ac3661dc80093de4161ecec
+EBUILD nginx-1.3.3.ebuild 14033 SHA256 7c107b4085626c0969ed90eb0dbc45602790f0f609726f888ad17cf00f293f0f SHA512 544436d7a59d4ecbbb3af1865295812c342ca1a24a688bd8a5b411e9224a2a82b9025bd8bf0537477fab11cdc87bf63afcf7bb73a7acd43b33be257e121e2779 WHIRLPOOL 91c89f8ef61384a6ebcffcd9d3175d8ab2ce202f674ec43e6bb94875d45ebe638f93330196941ebc4517e0b082055d2acb54760b089ec5748b76107e3c8fc55a
+MISC ChangeLog 54060 SHA256 8363bfd801b7e0cd604d39e24a7429562ee507adc07310527945712b83cc28a3 SHA512 fa4bfa12dab2974fef21c05efcefd1bf67480af1efeeca9f167a069e35807cbe3ed4b116df79962f6c925ffab43b5ba7bd2f904cb5e5217f67ad32762e3521fc WHIRLPOOL 35dfdb0831eb6800ecf6d49d8cfcefa2618bd58450b1109e93085db480c8964137b7910e4f18b5dd285b5c2dd0b2038ea450cca9c96cd6f44256961d29446f23
MISC metadata.xml 827 SHA256 750fe1d3ad8a43f2772ba296a0bfd35259d32a1746847dfe4119a18d49c01397 SHA512 5248aaf2524123b68d6fd6b82bc58426d419801763d8dcb87b5a5b15475936daf0160f9e878db06307ede0ab215ba0b571a9ff39873f7a77c18780f31c92b0d0 WHIRLPOOL 70c74c2b920dc049b01038e89d7046d188cad9a8a60cbd52dd11db32fe34ca9b55e62ec0bf3ad32c7fb8b26e519a97dc38175f1be3ef5e24c3d55d76f6ed8d10
diff --git a/www-servers/nginx/nginx-1.2.2.ebuild b/www-servers/nginx/nginx-1.2.2.ebuild
index 92139467d709..6f9c5edc640e 100644
--- a/www-servers/nginx/nginx-1.2.2.ebuild
+++ b/www-servers/nginx/nginx-1.2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.2.2.ebuild,v 1.2 2012/07/30 06:29:23 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.2.2.ebuild,v 1.3 2012/07/30 08:18:38 hollow Exp $
EAPI="4"
@@ -17,59 +17,78 @@ EAPI="4"
# prevent perl-module from adding automagic perl DEPENDs
GENTOO_DEPEND_ON_PERL="no"
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
+DEVEL_KIT_MODULE_PV="0.2.17"
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+DEVEL_KIT_MODULE_SHA1="bc97eea"
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/tarball/v${DEVEL_KIT_MODULE_PV}"
+DEVEL_KIT_MODULE_WD="${WORKDIR}/simpl-ngx_devel_kit-${DEVEL_KIT_MODULE_SHA1}"
+
# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.0"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
HTTP_UPLOAD_PROGRESS_MODULE_SHA1="a788dea"
HTTP_UPLOAD_PROGRESS_MODULE_URI="http://github.com/masterzen/nginx-upload-progress-module/tarball/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/masterzen-nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_SHA1}"
# http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.17rc1"
+HTTP_HEADERS_MORE_MODULE_PV="0.17"
HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_SHA1="3580526"
+HTTP_HEADERS_MORE_MODULE_SHA1="b7c8cfc"
HTTP_HEADERS_MORE_MODULE_URI="http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
# http_push (http://pushmodule.slact.net/, MIT license)
HTTP_PUSH_MODULE_PV="0.692"
-HTTP_PUSH_MODULE_P="nginx_http_push_module-${HTTP_PUSH_MODULE_PV}"
-HTTP_PUSH_MODULE_URI="http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz"
+HTTP_PUSH_MODULE_P="ngx_http_push-${HTTP_PUSH_MODULE_PV}"
+HTTP_PUSH_MODULE_URI="http://pushmodule.slact.net/downloads/nginx_http_push_module-${HTTP_PUSH_MODULE_PV}.tar.gz"
+HTTP_PUSH_MODULE_WD="${WORKDIR}/nginx_http_push_module-${HTTP_PUSH_MODULE_PV}"
# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="1.5"
-HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz"
+HTTP_CACHE_PURGE_MODULE_PV="1.6"
+HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
+HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-# HTTP Upload module from Valery Kholodkov
-# (http://www.grid.net.ru/nginx/upload.en.html, BSD license)
+# http_upload (http://www.grid.net.ru/nginx/upload.en.html, BSD license)
HTTP_UPLOAD_MODULE_PV="2.2.0"
-HTTP_UPLOAD_MODULE_P="nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}"
-HTTP_UPLOAD_MODULE_URI="http://www.grid.net.ru/nginx/download/${HTTP_UPLOAD_MODULE_P}.tar.gz"
+HTTP_UPLOAD_MODULE_P="ngx_http_upload-${HTTP_UPLOAD_MODULE_PV}"
+HTTP_UPLOAD_MODULE_URI="http://www.grid.net.ru/nginx/download/nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}.tar.gz"
+HTTP_UPLOAD_MODULE_WD="${WORKDIR}/nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}"
# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.8"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz"
+HTTP_SLOWFS_CACHE_MODULE_PV="1.9"
+HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
+HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-# http_fancyindex_module (http://wiki.nginx.org/NgxFancyIndex, BSD license)
+# http_fancyindex (http://wiki.nginx.org/NgxFancyIndex, BSD license)
HTTP_FANCYINDEX_MODULE_PV="0.3.1"
-HTTP_FANCYINDEX_MODULE_PN="ngx-fancyindex"
-# gitorious names the tarbell oddly, hence PNPN
-HTTP_FANCYINDEX_MODULE_PNPN="ngx-fancyindex-ngx-fancyindex"
-HTTP_FANCYINDEX_MODULE_P="${HTTP_FANCYINDEX_MODULE_PN}-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="http://gitorious.org/${HTTP_FANCYINDEX_MODULE_PN}/${HTTP_FANCYINDEX_MODULE_PN}/archive-tarball/v${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_URI="http://gitorious.org/ngx-fancyindex/ngx-fancyindex/archive-tarball/v${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-ngx-fancyindex"
+
+# http_lua (https://github.com/chaoslawful/lua-nginx-module, BSD license)
+HTTP_LUA_MODULE_PV="0.5.10"
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_SHA1="db0bebe"
+HTTP_LUA_MODULE_URI="https://github.com/chaoslawful/lua-nginx-module/tarball/v${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_WD="${WORKDIR}/chaoslawful-lua-nginx-module-${HTTP_LUA_MODULE_SHA1}"
inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user
DESCRIPTION="Robust, small and high performance http and reverse proxy server"
HOMEPAGE="http://nginx.org"
SRC_URI="http://nginx.org/download/${P}.tar.gz
+ ${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
nginx_modules_http_push? ( ${HTTP_PUSH_MODULE_URI} )
nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} )
nginx_modules_http_upload? ( ${HTTP_UPLOAD_MODULE_URI} )
nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} )
- nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )"
+ nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
+ nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )"
LICENSE="as-is BSD BSD-2 GPL-2 MIT"
SLOT="0"
@@ -89,7 +108,8 @@ NGINX_MODULES_3RD="
http_cache_purge
http_upload
http_slowfs_cache
- http_fancyindex"
+ http_fancyindex
+ http_lua"
IUSE="aio debug +http +http-cache ipv6 libatomic +pcre pcre-jit selinux ssl vim-syntax"
@@ -122,7 +142,8 @@ CDEPEND="
nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) )
- nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )"
+ nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
+ nginx_modules_http_lua? ( || ( dev-lang/lua dev-lang/luajit ) )"
RDEPEND="${CDEPEND}"
DEPEND="${CDEPEND}
arm? ( dev-libs/libatomic_ops )
@@ -214,37 +235,43 @@ src_configure() {
# third-party modules
if use nginx_modules_http_upload_progress; then
http_enabled=1
- myconf+=" --add-module=${WORKDIR}/masterzen-nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_SHA1}"
+ myconf+=" --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD}"
fi
if use nginx_modules_http_headers_more; then
http_enabled=1
- myconf+=" --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
+ myconf+=" --add-module=${HTTP_HEADERS_MORE_MODULE_WD}"
fi
if use nginx_modules_http_push; then
http_enabled=1
- myconf+=" --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
+ myconf+=" --add-module=${HTTP_PUSH_MODULE_WD}"
fi
if use nginx_modules_http_cache_purge; then
http_enabled=1
- myconf+=" --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
+ myconf+=" --add-module=${HTTP_CACHE_PURGE_MODULE_WD}"
fi
if use nginx_modules_http_upload; then
http_enabled=1
- myconf+=" --add-module=${WORKDIR}/${HTTP_UPLOAD_MODULE_P}"
+ myconf+=" --add-module=${HTTP_UPLOAD_MODULE_WD}"
fi
if use nginx_modules_http_slowfs_cache; then
http_enabled=1
- myconf+=" --add-module=${WORKDIR}/${HTTP_SLOWFS_CACHE_MODULE_P}"
+ myconf+=" --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD}"
fi
if use nginx_modules_http_fancyindex; then
http_enabled=1
- myconf+=" --add-module=${WORKDIR}/${HTTP_FANCYINDEX_MODULE_PNPN}"
+ myconf+=" --add-module=${HTTP_FANCYINDEX_MODULE_WD}"
+ fi
+
+ if use nginx_modules_http_lua; then
+ http_enabled=1
+ myconf+=" --add-module=${DEVEL_KIT_MODULE_WD}"
+ myconf+=" --add-module=${HTTP_LUA_MODULE_WD}"
fi
if use http || use http-cache; then
@@ -332,27 +359,32 @@ src_install() {
if use nginx_modules_http_push; then
docinto ${HTTP_PUSH_MODULE_P}
- dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README}
+ dodoc "${HTTP_PUSH_MODULE_WD}"/{changelog.txt,protocol.txt,README}
fi
if use nginx_modules_http_cache_purge; then
docinto ${HTTP_CACHE_PURGE_MODULE_P}
- dodoc "${WORKDIR}"/${HTTP_CACHE_PURGE_MODULE_P}/{CHANGES,README.md,TODO.md}
+ dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
fi
if use nginx_modules_http_upload; then
docinto ${HTTP_UPLOAD_MODULE_P}
- dodoc "${WORKDIR}"/${HTTP_UPLOAD_MODULE_P}/{Changelog,README}
+ dodoc "${HTTP_UPLOAD_MODULE_WD}"/{Changelog,README}
fi
if use nginx_modules_http_slowfs_cache; then
docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
- dodoc "${WORKDIR}"/${HTTP_SLOWFS_CACHE_MODULE_P}/{CHANGES,README.md}
+ dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
fi
if use nginx_modules_http_fancyindex; then
docinto ${HTTP_FANCYINDEX_MODULE_P}
- dodoc "${WORKDIR}"/${HTTP_FANCYINDEX_MODULE_PNPN}/README.rst
+ dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
+ fi
+
+ if use nginx_modules_http_lua; then
+ docinto ${HTTP_LUA_MODULE_P}
+ dodoc "${HTTP_LUA_MODULE_WD}"/{Changes,README.markdown}
fi
}
diff --git a/www-servers/nginx/nginx-1.3.3.ebuild b/www-servers/nginx/nginx-1.3.3.ebuild
index d7a26b27c7b9..5e795100354e 100644
--- a/www-servers/nginx/nginx-1.3.3.ebuild
+++ b/www-servers/nginx/nginx-1.3.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.3.3.ebuild,v 1.2 2012/07/30 06:29:23 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.3.3.ebuild,v 1.3 2012/07/30 08:18:38 hollow Exp $
EAPI="4"
@@ -17,59 +17,78 @@ EAPI="4"
# prevent perl-module from adding automagic perl DEPENDs
GENTOO_DEPEND_ON_PERL="no"
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
+DEVEL_KIT_MODULE_PV="0.2.17"
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+DEVEL_KIT_MODULE_SHA1="bc97eea"
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/tarball/v${DEVEL_KIT_MODULE_PV}"
+DEVEL_KIT_MODULE_WD="${WORKDIR}/simpl-ngx_devel_kit-${DEVEL_KIT_MODULE_SHA1}"
+
# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.0"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
HTTP_UPLOAD_PROGRESS_MODULE_SHA1="a788dea"
HTTP_UPLOAD_PROGRESS_MODULE_URI="http://github.com/masterzen/nginx-upload-progress-module/tarball/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/masterzen-nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_SHA1}"
# http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.17rc1"
+HTTP_HEADERS_MORE_MODULE_PV="0.17"
HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_SHA1="3580526"
+HTTP_HEADERS_MORE_MODULE_SHA1="b7c8cfc"
HTTP_HEADERS_MORE_MODULE_URI="http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
# http_push (http://pushmodule.slact.net/, MIT license)
HTTP_PUSH_MODULE_PV="0.692"
-HTTP_PUSH_MODULE_P="nginx_http_push_module-${HTTP_PUSH_MODULE_PV}"
-HTTP_PUSH_MODULE_URI="http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz"
+HTTP_PUSH_MODULE_P="ngx_http_push-${HTTP_PUSH_MODULE_PV}"
+HTTP_PUSH_MODULE_URI="http://pushmodule.slact.net/downloads/nginx_http_push_module-${HTTP_PUSH_MODULE_PV}.tar.gz"
+HTTP_PUSH_MODULE_WD="${WORKDIR}/nginx_http_push_module-${HTTP_PUSH_MODULE_PV}"
# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="1.5"
-HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz"
+HTTP_CACHE_PURGE_MODULE_PV="1.6"
+HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
+HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-# HTTP Upload module from Valery Kholodkov
-# (http://www.grid.net.ru/nginx/upload.en.html, BSD license)
+# http_upload (http://www.grid.net.ru/nginx/upload.en.html, BSD license)
HTTP_UPLOAD_MODULE_PV="2.2.0"
-HTTP_UPLOAD_MODULE_P="nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}"
-HTTP_UPLOAD_MODULE_URI="http://www.grid.net.ru/nginx/download/${HTTP_UPLOAD_MODULE_P}.tar.gz"
+HTTP_UPLOAD_MODULE_P="ngx_http_upload-${HTTP_UPLOAD_MODULE_PV}"
+HTTP_UPLOAD_MODULE_URI="http://www.grid.net.ru/nginx/download/nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}.tar.gz"
+HTTP_UPLOAD_MODULE_WD="${WORKDIR}/nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}"
# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.8"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz"
+HTTP_SLOWFS_CACHE_MODULE_PV="1.9"
+HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
+HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-# http_fancyindex_module (http://wiki.nginx.org/NgxFancyIndex, BSD license)
+# http_fancyindex (http://wiki.nginx.org/NgxFancyIndex, BSD license)
HTTP_FANCYINDEX_MODULE_PV="0.3.1"
-HTTP_FANCYINDEX_MODULE_PN="ngx-fancyindex"
-# gitorious names the tarbell oddly, hence PNPN
-HTTP_FANCYINDEX_MODULE_PNPN="ngx-fancyindex-ngx-fancyindex"
-HTTP_FANCYINDEX_MODULE_P="${HTTP_FANCYINDEX_MODULE_PN}-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="http://gitorious.org/${HTTP_FANCYINDEX_MODULE_PN}/${HTTP_FANCYINDEX_MODULE_PN}/archive-tarball/v${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_URI="http://gitorious.org/ngx-fancyindex/ngx-fancyindex/archive-tarball/v${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-ngx-fancyindex"
+
+# http_lua (https://github.com/chaoslawful/lua-nginx-module, BSD license)
+HTTP_LUA_MODULE_PV="0.5.10"
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_SHA1="db0bebe"
+HTTP_LUA_MODULE_URI="https://github.com/chaoslawful/lua-nginx-module/tarball/v${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_WD="${WORKDIR}/chaoslawful-lua-nginx-module-${HTTP_LUA_MODULE_SHA1}"
inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user
DESCRIPTION="Robust, small and high performance http and reverse proxy server"
HOMEPAGE="http://nginx.org"
SRC_URI="http://nginx.org/download/${P}.tar.gz
+ ${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
nginx_modules_http_push? ( ${HTTP_PUSH_MODULE_URI} )
nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} )
nginx_modules_http_upload? ( ${HTTP_UPLOAD_MODULE_URI} )
nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} )
- nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )"
+ nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
+ nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )"
LICENSE="as-is BSD BSD-2 GPL-2 MIT"
SLOT="0"
@@ -89,7 +108,8 @@ NGINX_MODULES_3RD="
http_cache_purge
http_upload
http_slowfs_cache
- http_fancyindex"
+ http_fancyindex
+ http_lua"
IUSE="aio debug +http +http-cache ipv6 libatomic +pcre pcre-jit selinux ssl vim-syntax"
@@ -122,7 +142,8 @@ CDEPEND="
nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) )
- nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )"
+ nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
+ nginx_modules_http_lua? ( || ( dev-lang/lua dev-lang/luajit ) )"
RDEPEND="${CDEPEND}"
DEPEND="${CDEPEND}
arm? ( dev-libs/libatomic_ops )
@@ -214,37 +235,43 @@ src_configure() {
# third-party modules
if use nginx_modules_http_upload_progress; then
http_enabled=1
- myconf+=" --add-module=${WORKDIR}/masterzen-nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_SHA1}"
+ myconf+=" --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD}"
fi
if use nginx_modules_http_headers_more; then
http_enabled=1
- myconf+=" --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
+ myconf+=" --add-module=${HTTP_HEADERS_MORE_MODULE_WD}"
fi
if use nginx_modules_http_push; then
http_enabled=1
- myconf+=" --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
+ myconf+=" --add-module=${HTTP_PUSH_MODULE_WD}"
fi
if use nginx_modules_http_cache_purge; then
http_enabled=1
- myconf+=" --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
+ myconf+=" --add-module=${HTTP_CACHE_PURGE_MODULE_WD}"
fi
if use nginx_modules_http_upload; then
http_enabled=1
- myconf+=" --add-module=${WORKDIR}/${HTTP_UPLOAD_MODULE_P}"
+ myconf+=" --add-module=${HTTP_UPLOAD_MODULE_WD}"
fi
if use nginx_modules_http_slowfs_cache; then
http_enabled=1
- myconf+=" --add-module=${WORKDIR}/${HTTP_SLOWFS_CACHE_MODULE_P}"
+ myconf+=" --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD}"
fi
if use nginx_modules_http_fancyindex; then
http_enabled=1
- myconf+=" --add-module=${WORKDIR}/${HTTP_FANCYINDEX_MODULE_PNPN}"
+ myconf+=" --add-module=${HTTP_FANCYINDEX_MODULE_WD}"
+ fi
+
+ if use nginx_modules_http_lua; then
+ http_enabled=1
+ myconf+=" --add-module=${DEVEL_KIT_MODULE_WD}"
+ myconf+=" --add-module=${HTTP_LUA_MODULE_WD}"
fi
if use http || use http-cache; then
@@ -332,27 +359,32 @@ src_install() {
if use nginx_modules_http_push; then
docinto ${HTTP_PUSH_MODULE_P}
- dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README}
+ dodoc "${HTTP_PUSH_MODULE_WD}"/{changelog.txt,protocol.txt,README}
fi
if use nginx_modules_http_cache_purge; then
docinto ${HTTP_CACHE_PURGE_MODULE_P}
- dodoc "${WORKDIR}"/${HTTP_CACHE_PURGE_MODULE_P}/{CHANGES,README.md,TODO.md}
+ dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
fi
if use nginx_modules_http_upload; then
docinto ${HTTP_UPLOAD_MODULE_P}
- dodoc "${WORKDIR}"/${HTTP_UPLOAD_MODULE_P}/{Changelog,README}
+ dodoc "${HTTP_UPLOAD_MODULE_WD}"/{Changelog,README}
fi
if use nginx_modules_http_slowfs_cache; then
docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
- dodoc "${WORKDIR}"/${HTTP_SLOWFS_CACHE_MODULE_P}/{CHANGES,README.md}
+ dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
fi
if use nginx_modules_http_fancyindex; then
docinto ${HTTP_FANCYINDEX_MODULE_P}
- dodoc "${WORKDIR}"/${HTTP_FANCYINDEX_MODULE_PNPN}/README.rst
+ dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
+ fi
+
+ if use nginx_modules_http_lua; then
+ docinto ${HTTP_LUA_MODULE_P}
+ dodoc "${HTTP_LUA_MODULE_WD}"/{Changes,README.markdown}
fi
}