version bump wrt #383079

Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index cf8181f6b134f4fb403a6218caa157c6f25a7c63..836e6fa3ba42e9edf1258d8a359011477f239ffc 100644 (file)
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.289 2011/09/09 16:44:14 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.290 2011/09/30 06:45:06 hollow Exp $
+
+*nginx-1.1.4 (30 Sep 2011)
+
+  30 Sep 2011; Benedikt Böhm <hollow@gentoo.org> -nginx-1.0.5.ebuild,
+  +nginx-1.1.4.ebuild, metadata.xml:
+  version bump wrt #383079
 
   09 Sep 2011; Benedikt Böhm <hollow@gentoo.org> nginx-1.0.4.ebuild,
   nginx-1.0.5.ebuild, nginx-1.0.6.ebuild, nginx-1.1.2.ebuild:

diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 9cb5c927085917c258326828a34f6ce0807b38dd..64c1177244d84f34d7dd6c9a786019f75ad2a029 100644 (file)
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,14 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX nginx-0.8.32-ey-balancer.patch 1977 RMD160 fff19fd36b4f29c74b92bb55e6b1366163703b5f SHA1 844b771f567d4f0318977de904ed1559e88cc5c4 SHA256 2f254cdf0e95357226aed112d0798f2dac14b8a4f1392119aac95f75c00a3fac
 AUX nginx.conf-r4 1358 RMD160 a948df249a16be86c114d587cfa5ee570d84a356 SHA1 e9db0447a1beb326a0858cf8189328229d1d3edf SHA256 6ff6c9301ea2a4d74a335b9119d7f9dba87d4e83793cf22d837d49f061763096
 AUX nginx.init-r2 1827 RMD160 2ece9278fd4a3ca948106e024c2607fca02e2599 SHA1 76af70e8fcad8b298851382d18160d11dc3e2cca SHA256 89801c2e0ea3480380dedfbc84b0cc993ab6b93768886246a22e650ba0a61798
 AUX nginx.logrotate 364 RMD160 9fdfd2ea2f49b8dba20a030d893e34779bb32364 SHA1 4ab07992fa5c64f753e3643e1b51fcab4dec6ccf SHA256 9e3e090dfd10861d5f9b279e19113ce8d05caf9f33d488f6aabf9f19ac0cf925
 DIST nginx-1.0.4.tar.gz 661444 RMD160 378b303ed91dc76cda12f2984b26c3aae9337599 SHA1 0496b7377e583116497f18453003cba3269417e9 SHA256 ff54f7deea3dc69da467f3b4c2c8167d5967a096451148ed362e20fb0203f043
-DIST nginx-1.0.5.tar.gz 662122 RMD160 0dffd97fc59b706e11312f25f7937b7a74acb56c SHA1 34418bb8caade9a1204c6ddafc389edece052617 SHA256 b8c6df4e55a41425b57ba0de5ed8a84722dceb0eb7fbb4123f7f8f314763c8df
 DIST nginx-1.0.6.tar.gz 670835 RMD160 c0f81d1f15bccea44321c31e3f08e299e5e2e564 SHA1 e8b61da1aa5e53e0d298ec0159c4fca785dccd70 SHA256 2580c2d4cb56a70802702b81c0aea2e6b359a131c049a993b806f32791086cbe
 DIST nginx-1.1.2.tar.gz 674101 RMD160 54a1554a894cdd7e041da2a5cbf0876ee6092e88 SHA1 a8214bff7452c39c44f91853c104879b67849809 SHA256 cc64476ae800c45d2ba810274387139e5d8cbb8c1e45e8701416eea2a377151b
+DIST nginx-1.1.4.tar.gz 692544 RMD160 8596855da55d5c601f81840d5bd983da27c8ce76 SHA1 748ecbab8dc614a0d7fe16a21dbcfe26b42ff970 SHA256 a5fc829bc4296ce49953a772c27891aa5be649a19f7f101221c684898fe75a63
 DIST nginx-ey-balancer-0.0.6.tar.gz 13192 RMD160 0e1dee4034023fd83639f1cc8333e05736b40a5c SHA1 2a4a97f7e6253b406775f29cff7b0b6b450563e2 SHA256 0b4728cfba04a452a5b9ebc3e304a6724ea914122d56edf0ff7c3b783205a905
 DIST nginx_http_push_module-0.692.tar.gz 29119 RMD160 9d2be16074cf28115af0f1d8f3646937cda649ad SHA1 72103084cad8f4d3d9a49a6b04cf780e4541605d SHA256 64868708071aa21dbc4c7a07d149dd6ec9108fb7eaf2aad5ad069406151f17fe
 DIST nginx_upload_module-2.2.0.tar.gz 25796 RMD160 5734af837be3fe8ec444a7e5e7f6707118594098 SHA1 93d6e83e613a0ce2ed057a434b344fa1b6609b47 SHA256 b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805
@@ -18,17 +15,8 @@ DIST ngx_http_headers_more-0.15.tar.gz 22738 RMD160 2200ab529a086dd6bcf11a9a0470
 DIST ngx_slowfs_cache-1.6.tar.gz 10972 RMD160 e1d10851db4a55fc465665caa3f6989d142af2d3 SHA1 072d06b7547629b244bebeef7df7425567f264c9 SHA256 cc0505dbba30153691ff7b3a7353804d5ceb9a519a407b938cae49e9913a7bcc
 DIST ngx_upload_progress-0.8.2.tar.gz 16559 RMD160 3aadb9bf9b15b3810d1acb466d331ea5bdae6062 SHA1 cbff2734cccc3ac93b3422a9a01547af29f9c11d SHA256 cab70d2e300cfa0d9d7d3b34bf27810533ecbf11dddcd5078a4754cfab337c95
 EBUILD nginx-1.0.4.ebuild 11019 RMD160 d1aa3ca9459cab677790986c92c48b75589736c8 SHA1 f773210ae817cb8340704c5844922602636fd363 SHA256 363b15c8dd8be0827dfcf30692212a70dffd525842949a5ee9a129eb7ba62cd8
-EBUILD nginx-1.0.5.ebuild 11021 RMD160 c2b57dbe49548e6d6027736208ac5b3a85812259 SHA1 33b8446181f1ac42c2e56db93997fc2e6f2edee3 SHA256 7fbce9cbb38aca77bf8b57f5d1c0e2c97cc6ca030b0880d1154d22e40ba4d845
 EBUILD nginx-1.0.6.ebuild 11055 RMD160 4dbd8ad56e74df8efa1689712c41122b42cfb52e SHA1 83ca3dca18031b7b829ec7f0ed952935f8fc9fd5 SHA256 cbb40d932e96045b954c35c8f56082f4db2d891abff0cc14184e606d1d4f2699
 EBUILD nginx-1.1.2.ebuild 11055 RMD160 fa120aacd731f0e64bb48be2528d61fd3756cdac SHA1 d30f6c4855eebaeaa52522615b314c4bc88bcbee SHA256 a06baef7980fd34875562880169f62dee7dc11f951ed3006ac65e57ed020616b
-MISC ChangeLog 47507 RMD160 8a5cfcf91e42cb584accfde7e401ecb44caa58f9 SHA1 e129b6fe74ba478ebdab24bb0d0fdd7591eb432e SHA256 303f17c40e5d64bacd62240f082a98e78ee814ff458e74b1183f2a576cd0fc2c
-MISC metadata.xml 2402 RMD160 fee632a79ad08ef0fe36cd73d718a81348d71370 SHA1 12b7d3eac7a8e9f99dbe2b64bc288aa5e3f4608c SHA256 f133dca88780f2716797c5d2fc309466013d35b3dccf752ab27fb4ee399c6e47
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59uC0ACgkQfXuS5UK5QB2F1QP+MdipX6cpdowWDSreeeKwgmlH
-zjOQ2rZisbY0doi2etfL+uGLPsOnGjPAaOzGNrBP+z7lrRXhAFycQ2YH8q9GxRA+
-KhRjR1zMOzKeq7+Z7spVJNEzgzueUgDnaxvSnseZUH0Wgb96eWF4iackISPk2cMM
-iiAl4K0RweUsy5DVUF0=
-=QkNP
------END PGP SIGNATURE-----
+EBUILD nginx-1.1.4.ebuild 11059 RMD160 8216fe64c66067856221321a612ed3cdc595ba54 SHA1 54f030096326d90e02345dc65539a30bc5f69d6c SHA256 fc987cb555ce33b35d082773828e076d0598a9fc2c62fc504c1e485cdf66ca00
+MISC ChangeLog 47671 RMD160 23d6b00e17de68563092653e0c5f692c4379c7fd SHA1 9f39dc48c8d2c9f3db79a2e4667f4a97b2a56c3b SHA256 f8d90ecefc65ad82c577cb04687d235d40899f5b69f60a59740912bd20232934
+MISC metadata.xml 2525 RMD160 df285e1bcb9533d4fa1deb6bd89dd8c6475f019f SHA1 9c022f0dbb97b54595d0b888e1b4efa0a3786733 SHA256 b3376e545c4be7ac09cf010e595c375ec15324b2b6d59678f5c7cead6a99a8be

diff --git a/www-servers/nginx/metadata.xml b/www-servers/nginx/metadata.xml
index 9c19bbe4abb29ae521208adea5b6d8bce7e262af..a8693e07c4b7720867ae2a1221b2bed3f2bdf378 100644 (file)
--- a/www-servers/nginx/metadata.xml
+++ b/www-servers/nginx/metadata.xml
@@ -40,6 +40,8 @@
                        ability to cache static files</flag>
                <flag name='nginx_modules_http_upload_progress'>This module adds the
                        ability to track POST upload progress via JSON API</flag>
+               <flag name='nginx_modules_http_mp4'>This module adds pseudo-streaming
+                       support for H.264/AAC in MP4 containers.</flag>
                <flag name='nginx_modules_mail_imap'>Enables IMAP proxy support</flag>
                <flag name='nginx_modules_mail_pop3'>Enables POP3 proxy support</flag>
                <flag name='nginx_modules_mail_smtp'>Enables SMTP proxy support</flag>

diff --git a/www-servers/nginx/nginx-1.0.5.ebuild b/www-servers/nginx/nginx-1.1.4.ebuild
similarity index 70%
rename from www-servers/nginx/nginx-1.0.5.ebuild
rename to www-servers/nginx/nginx-1.1.4.ebuild
index 273289b08a24319b0979a80699292ab885ea0db0..488c68dfe258ad66630c87171bd7dbf4dd5bae44 100644 (file)
--- a/www-servers/nginx/nginx-1.0.5.ebuild
+++ b/www-servers/nginx/nginx-1.1.4.ebuild
@@ -1,61 +1,66 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.0.5.ebuild,v 1.2 2011/09/09 16:44:14 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.1.4.ebuild,v 1.1 2011/09/30 06:45:06 hollow Exp $
 
-EAPI="2"
+EAPI="4"
 
 # Maintainer notes:
 # - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
 # - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following 3 requirements in mind before adding external modules:
+# - keep the following requirements in mind before adding external modules:
 #   * alive upstream
 #   * sane packaging
 #   * builds cleanly
+#   * does not need a patch for nginx core
 # - TODO: test the google-perftools module (included in vanilla tarball)
 
 # prevent perl-module from adding automagic perl DEPENDs
 GENTOO_DEPEND_ON_PERL="no"
 
+# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
+HTTP_UPLOAD_PROGRESS_MODULE_PV="0.8.2"
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+HTTP_UPLOAD_PROGRESS_MODULE_SHA1="8b55a34"
+HTTP_UPLOAD_PROGRESS_MODULE_URI="http://github.com/masterzen/nginx-upload-progress-module/tarball/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+
 # http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.13"
-HTTP_HEADERS_MORE_MODULE_P="ngx-http-headers-more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_SHA1="9508330"
+HTTP_HEADERS_MORE_MODULE_PV="0.15"
+HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_SHA1="137855d"
+HTTP_HEADERS_MORE_MODULE_URI="http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV}"
 
 # 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_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
 HTTP_CACHE_PURGE_MODULE_PV="1.3"
 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 Upload module from Valery Kholodkov
 # (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}"
-
-# ey-balancer/maxconn module (https://github.com/ry/nginx-ey-balancer, as-is)
-HTTP_EY_BALANCER_MODULE_PV="0.0.6"
-HTTP_EY_BALANCER_MODULE_P="nginx-ey-balancer-${HTTP_EY_BALANCER_MODULE_PV}"
-HTTP_EY_BALANCER_MODULE_SHA1="d373670"
+HTTP_UPLOAD_MODULE_URI="http://www.grid.net.ru/nginx/download/${HTTP_UPLOAD_MODULE_P}.tar.gz"
 
 # http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
 HTTP_SLOWFS_CACHE_MODULE_PV="1.6"
 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"
 
 inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic
 
 DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="http://nginx.net/
-       http://pushmodule.slact.net/
-       http://labs.frickle.com/nginx_ngx_cache_purge/"
-SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz
-       nginx_modules_http_headers_more? ( http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-       nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz )
-       nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-       nginx_modules_http_upload? ( http://www.grid.net.ru/nginx/download/${HTTP_UPLOAD_MODULE_P}.tar.gz )
-       nginx_modules_http_ey_balancer? ( https://github.com/ry/nginx-ey-balancer/tarball/v${HTTP_EY_BALANCER_MODULE_PV} -> ${HTTP_EY_BALANCER_MODULE_P}.tar.gz )
-       nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )"
+HOMEPAGE="http://nginx.org"
+SRC_URI="http://nginx.org/download/${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} )"
 
 LICENSE="as-is BSD BSD-2 GPL-2 MIT"
 SLOT="0"
@@ -65,10 +70,16 @@ NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
 geo gzip limit_req limit_zone map memcached proxy referer rewrite scgi ssi
 split_clients upstream_ip_hash userid uwsgi"
 NGINX_MODULES_OPT="addition dav degradation flv geoip gzip_static image_filter
-perl random_index realip secure_link stub_status sub xslt"
+mp4 perl random_index realip secure_link stub_status sub xslt"
 NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="http_cache_purge http_headers_more http_passenger http_push
-http_upload http_ey_balancer http_slowfs_cache"
+NGINX_MODULES_3RD="
+       http_upload_progress
+       http_headers_more
+       http_passenger
+       http_push
+       http_cache_purge
+       http_upload
+       http_slowfs_cache"
 
 IUSE="aio debug +http +http-cache ipv6 libatomic +pcre ssl vim-syntax"
 
@@ -128,7 +139,7 @@ pkg_setup() {
        ebegin "Creating nginx user and group"
        enewgroup ${PN}
        enewuser ${PN} -1 -1 -1 ${PN}
-       eend ${?}
+       eend $?
 
        if use libatomic; then
                ewarn "GCC 4.1+ features built-in atomic operations."
@@ -151,70 +162,66 @@ pkg_setup() {
 
 src_prepare() {
        sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make
-
-       if use nginx_modules_http_ey_balancer; then
-               epatch "${FILESDIR}"/nginx-0.8.32-ey-balancer.patch
-       fi
 }
 
 src_configure() {
        local myconf= http_enabled= mail_enabled=
 
-       use aio && myconf="${myconf} --with-file-aio --with-aio_module"
-       use debug && myconf="${myconf} --with-debug"
-       use ipv6 && myconf="${myconf} --with-ipv6"
-       use libatomic && myconf="${myconf} --with-libatomic"
-       use pcre && myconf="${myconf} --with-pcre"
+       use aio       && myconf+=" --with-file-aio --with-aio_module"
+       use debug     && myconf+=" --with-debug"
+       use ipv6      && myconf+=" --with-ipv6"
+       use libatomic && myconf+=" --with-libatomic"
+       use pcre      && myconf+=" --with-pcre"
 
        # HTTP modules
        for mod in $NGINX_MODULES_STD; do
                if use nginx_modules_http_${mod}; then
                        http_enabled=1
                else
-                       myconf="${myconf} --without-http_${mod}_module"
+                       myconf+=" --without-http_${mod}_module"
                fi
        done
 
        for mod in $NGINX_MODULES_OPT; do
                if use nginx_modules_http_${mod}; then
                        http_enabled=1
-                       myconf="${myconf} --with-http_${mod}_module"
+                       myconf+=" --with-http_${mod}_module"
                fi
        done
 
        if use nginx_modules_http_fastcgi; then
-               myconf="${myconf} --with-http_realip_module"
+               myconf+=" --with-http_realip_module"
        fi
 
        # 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}"
+       fi
+
        if use nginx_modules_http_headers_more; then
                http_enabled=1
-               myconf="${myconf} --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
+               myconf+=" --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
        fi
 
        if use nginx_modules_http_push; then
                http_enabled=1
-               myconf="${myconf} --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
+               myconf+=" --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
        fi
 
        if use nginx_modules_http_cache_purge; then
                http_enabled=1
-               myconf="${myconf} --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
+               myconf+=" --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
        fi
 
        if use nginx_modules_http_upload; then
                http_enabled=1
-               myconf="${myconf} --add-module=${WORKDIR}/${HTTP_UPLOAD_MODULE_P}"
-       fi
-
-       if use nginx_modules_http_ey_balancer; then
-               http_enabled=1
-               myconf="${myconf} --add-module=${WORKDIR}/ry-nginx-ey-balancer-${HTTP_EY_BALANCER_MODULE_SHA1}"
+               myconf+=" --add-module=${WORKDIR}/${HTTP_UPLOAD_MODULE_P}"
        fi
 
        if use nginx_modules_http_slowfs_cache; then
                http_enabled=1
-               myconf="${myconf} --add-module=${WORKDIR}/${HTTP_SLOWFS_CACHE_MODULE_P}"
+               myconf+=" --add-module=${WORKDIR}/${HTTP_SLOWFS_CACHE_MODULE_P}"
        fi
 
        if use http || use http-cache; then
@@ -222,10 +229,10 @@ src_configure() {
        fi
 
        if [ $http_enabled ]; then
-               use http-cache || myconf="${myconf} --without-http-cache"
-               use ssl && myconf="${myconf} --with-http_ssl_module"
+               use http-cache || myconf+=" --without-http-cache"
+               use ssl && myconf+=" --with-http_ssl_module"
        else
-               myconf="${myconf} --without-http --without-http-cache"
+               myconf+=" --without-http --without-http-cache"
        fi
 
        # MAIL modules
@@ -233,18 +240,18 @@ src_configure() {
                if use nginx_modules_mail_${mod}; then
                        mail_enabled=1
                else
-                       myconf="${myconf} --without-mail_${mod}_module"
+                       myconf+=" --without-mail_${mod}_module"
                fi
        done
 
        if [ $mail_enabled ]; then
-               myconf="${myconf} --with-mail"
-               use ssl && myconf="${myconf} --with-mail_ssl_module"
+               myconf+=" --with-mail"
+               use ssl && myconf+=" --with-mail_ssl_module"
        fi
 
        # custom modules
        for mod in $NGINX_ADD_MODULES; do
-               myconf="${myconf} --add-module=${mod}"
+               myconf+=" --add-module=${mod}"
        done
 
        # https://bugs.gentoo.org/286772
@@ -278,6 +285,7 @@ src_compile() {
 
 src_install() {
        keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi,scgi,uwsgi}
+       keepdir /var/www/localhost/htdocs
 
        dosbin objs/nginx
        newinitd "${FILESDIR}"/nginx.init-r2 nginx
@@ -317,11 +325,6 @@ src_install() {
                dodoc "${WORKDIR}"/${HTTP_UPLOAD_MODULE_P}/{Changelog,README}
        fi
 
-       if use nginx_modules_http_ey_balancer; then
-               docinto ${HTTP_EY_BALANCER_MODULE_P}
-               dodoc "${WORKDIR}"/ry-nginx-ey-balancer-${HTTP_EY_BALANCER_MODULE_SHA1}/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}