[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/, www-servers/nginx/

Thomas Deutschmann Wed, 12 Oct 2016 12:48:52 -0700

commit:     d2b1f12c9d19386a8c4e14a5940661b06bb126da
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 19:47:33 2016 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 19:48:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2b1f12c


www-servers/nginx: Drop old

Package-Manager: portage-2.3.2

 www-servers/nginx/Manifest                         |   2 -
 ....11.3-fix-build-without-stream_ssl_module.patch |  30 -
 www-servers/nginx/nginx-1.10.1-r2.ebuild           | 768 --------------------
 www-servers/nginx/nginx-1.11.3-r1.ebuild           | 782 ---------------------
 www-servers/nginx/nginx-1.11.3-r2.ebuild           | 782 ---------------------
 5 files changed, 2364 deletions(-)

diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 6053301..af7423c 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,6 +1,5 @@
 DIST modsecurity-2.9.1.tar.gz 4261212 SHA256 
958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24 SHA512 
374733cbfc26e53d95b78c8f268a4e465d838163e9893fc24e33a9d272b114f1b287147bab6d0289575074cbbd94f48983e23fa59832cbcb32950046cea59269
 WHIRLPOOL 
5f41bebf032f8a269412d104b7632a06af4d4c495658c9cd1ebf69b82c10ce1bbcb34b9dd159a7b00e57348714a5e93ad3db19701dda51479accd3a9dc79a9cb
 DIST nginx-1.10.1.tar.gz 909077 SHA256 
1fd35846566485e03c0e318989561c135c598323ff349c503a6c14826487a801 SHA512 
fa1329d40e83340380332dd5e2ed66f08dd59cc7f7582dd0e0193c493353ba550e80dc80e5165c225d70532d4197abc49cc8c760e8ab72e48f630cb57c2803e1
 WHIRLPOOL 
6942f70c3279a28bd8d664d085dee68bf0d0526c8dcb636f3258c9de598268efc984af72e527efd86889bd13911b38b0bdb2de1e92eef69cabd02f7080f64eb6
-DIST nginx-1.11.3.tar.gz 938045 SHA256 
4a667f40f9f3917069db1dea1f2d5baa612f1fa19378aadf71502e846a424610 SHA512 
b983aca61335facf5778675b80fc28341ec9cfee2190319ed130b9c5d5ceff8133677f4609ecafd5a782daa5962e41bb6cb6a857380bbbe9cee67cd0ab2026d4
 WHIRLPOOL 
f197bc4f5e1ed234b26d625db5bf665a24c09da316e3cae3c0f394f0b4db116acad5db15add7fd92b5fe1428f95449538584f57272f8bad89b912fb38fbb2c7d
 DIST nginx-1.11.4.tar.gz 949793 SHA256 
06221c1f43f643bc6bfe5b2c26d19e09f2588d5cde6c65bdb77dfcce7c026b3b SHA512 
c6a03c440a274576434aa74932b3fa7cd49174d9e2d8c6e480838637f33f158e31b6f25cac97e158f386bb92f62ff9636c2d3ac1a552e27a860eb9448e2f3f94
 WHIRLPOOL 
53c371cb34bc55f28d0a0915e08a4fdeffcfcbc8571628db086e0a75627c926693f2faba8608f0c444bc79df244b7f321e6017eda0eb7710d2ccb6f25aac8b75
 DIST nginx-1.11.5.tar.gz 956517 SHA256 
223f8a2345a75f891098cf26ccdf208b293350388f51ce69083674c9432db6f6 SHA512 
f41b21b5d8c6b7fe7f8713e96fb6b1c40da49bf64ebb790fb5aa38f036a37b36fcf048ff72c2216552b2f75366b30c5fcdef26312bd4e5515b2476a1cd944b8c
 WHIRLPOOL 
fba49ae277ec2114b06eb0fdce87161ac7bd3e0ca90387dc58caf327c5f12056be07eeba677ff37c59e7d759054ec276ce4db647250774c57588619a1803592c
 DIST nginx-auth-ldap-49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz 17159 
SHA256 3c11c32f05da04f1a4647dc4e35dd8d8aeacd5a2e763ba349feba3dba8663132 SHA512 
323abd0ca8e90f5afcaf81a8ff1a8abe3dfcbff3d69f0dd4a1c005fe6436acbf3076c4c57a4df877b3d8e388cbea085d46301bb2df9c0752e2567817ff7cca92
 WHIRLPOOL 
ad65e8182b2634db5fa06055ef7d91c7d8aabd0fa986d8402a4845977354d6edb329621b6f9f96c90ce2d158cff20e42ae50fba06a088a84de3e3f414205dbc2
@@ -32,5 +31,4 @@ DIST ngx_metrics-0.1.1.tar.gz 2964 SHA256 
1c62ebb31e3caafad91720962770b0e7a4287f
 DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 SHA256 
7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SHA512 
b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1
 WHIRLPOOL 
64c9b11ad938e6dbe5ba31298f1cd46f6e6bb4ba039c96b1e43bd85919d1606326f74b677f789ecabe0b0f4e0f08ac5aaf8148bf820de65aaa1e9966a28b9f61
 DIST ngx_rtmp-1.1.10.tar.gz 519877 SHA256 
f9491dd24390b0d5d70dfe3553edf3d14efeb7c7a81b4d4a20c5cfeaefc1141c SHA512 
bcc0aee3308af7c61bf01a5530fcf1dae938e6778306f6e3eb5995e6d0529f43d33b7ee2acb813d5a39acc92e4853d207a01e8e41b766a6e0dd07aade60cd98f
 WHIRLPOOL 
655f4dcb02f928698ae14d29e5b7f60ad3fd71c757d67f1930c695a3501054d124a92f7ada7d4e605204f1e73e0779cad0b60102bc98d64764535581db0b1867
 DIST ngx_rtmp-1.1.7.tar.gz 519735 SHA256 
7922b0e3d5f3d9c4b275e4908cfb8f5fb1bfb3ac2df77f4c262cda56df21aab3 SHA512 
9883462a04683f1e7af175da04b86d259ff6d677864667588fb073143f7130969eb2a5a5a48ddceda7a555b908580f179bdcacb7f0111413d51db5bfe43b396e
 WHIRLPOOL 
e9c1fc9c3c965ae7047657f76e0997d5da107aff7dd9e5cf3ddb5a2d8f388efd8439b82923e199dc36def449567b8529e06c80f69c36f42128236ac0be5719d5
-DIST ngx_rtmp-1.1.8.tar.gz 519647 SHA256 
de5866111a5b18c9dfb1c10f3a0e84b56af77f7005a41807368f7769b8a50965 SHA512 
554249b1b8bb70952a0585dcc5c55c70daa63f2eba5ef35f8b1a4932fdfd6c95b0a48739857ba8dcab08ff1e91d048f3dc43bf65250890fd7a679cdabfed880a
 WHIRLPOOL 
a8cd4361419fbae97f199d788078c62ffc442158d0338aa677e5d6d21fb27a336da85e901ee6463ff6b33201092575237d5b6f20a1d80d924ac6591cbb75c9d7
 DIST ngx_rtmp-1.1.9.tar.gz 519807 SHA256 
46d914e3ba1f4c2353c1ef01a7423305255cb78226c84fac419586f849b7ea55 SHA512 
888c268eb0371649e9bf971462e20472f819946f49ef5e50af97d0590a03df6d37c1fa8016eb7ea81faa0c212c429618d399102f513b029c66226d48e444f70c
 WHIRLPOOL 
94fc496b059549a56338cd51e0bbf9a3b11b10640e1ef83e1e7cdb2845dfecde012e0951003665e02bff4ef45870b78e399d4194997cb082647dbcd638cc9716

diff --git 
a/www-servers/nginx/files/nginx-1.11.3-fix-build-without-stream_ssl_module.patch
 
b/www-servers/nginx/files/nginx-1.11.3-fix-build-without-stream_ssl_module.patch
deleted file mode 100644
index 6163730..00000000
--- 
a/www-servers/nginx/files/nginx-1.11.3-fix-build-without-stream_ssl_module.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-
-# HG changeset patch
-# User Vladimir Homutov <v...@nginx.com>
-# Date 1469550852 -10800
-# Node ID d43ee392e825186545d81e683b88cc58ef8479bc
-# Parent  0b4249f975eba48c17b69c5e225fd12b470c0184
-Stream: fixed build without stream_ssl_module (ticket #1032).
-
-diff -r 0b4249f975eb -r d43ee392e825 src/stream/ngx_stream_proxy_module.c
---- a/src/stream/ngx_stream_proxy_module.c     Tue Jul 26 19:07:18 2016 +0300
-+++ b/src/stream/ngx_stream_proxy_module.c     Tue Jul 26 19:34:12 2016 +0300
-@@ -538,7 +538,7 @@
-         return;
-     }
- 
--#if (NGX_HTTP_SSL)
-+#if (NGX_STREAM_SSL)
-     u->ssl_name = uscf->host;
- #endif
- 
-@@ -1157,7 +1157,7 @@
-     u = s->upstream;
-     ur = u->resolved;
- 
--    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, s->connection->log, 0,
-+    ngx_log_debug0(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
-                    "stream upstream resolve");
- 
-     if (ctx->state) {
-

diff --git a/www-servers/nginx/nginx-1.10.1-r2.ebuild 
b/www-servers/nginx/nginx-1.10.1-r2.ebuild
deleted file mode 100644
index a320bc8..00000000
--- a/www-servers/nginx/nginx-1.10.1-r2.ebuild
+++ /dev/null
@@ -1,768 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-# 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 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"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.3.0"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz";
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# http_uploadprogress 
(https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.1"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz";
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD 
license)
-HTTP_HEADERS_MORE_MODULE_PV="0.30"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz";
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 
license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-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_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 
license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-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 (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.4.0"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz";
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.5"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz";
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, 
http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.5.1"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz";
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check 
(https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="0.3.0-10-g10782ea"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/v${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz";
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-10782eaff51872a8f44e65eed89bbe286004bcb1"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz";
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.54"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz";
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.1.8"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz";
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD 
license)
-HTTP_DAV_EXT_MODULE_PV="0.0.3"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz";
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD 
license)
-HTTP_ECHO_MODULE_PV="0.59"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz";
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
-# keep the MODULE_P here consistent with upstream to avoid tarball duplication
-HTTP_SECURITY_MODULE_PV="2.9.1"
-HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz";
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
-
-# push-stream-module (http://www.nginxpushstream.com, 
https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="0.5.2"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz";
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, 
BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2";
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-c78b7dd79d0d"
-
-# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz";
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.17"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz";
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
-HTTP_LDAP_MODULE_PV="dbcef31bebb2d54b6120422d0b178bbf78bc48f7"
-HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz";
-HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-
-# We handle deps below ourselves
-SSL_DEPS_SKIP=1
-
-inherit ssl-cert toolchain-funcs perl-module flag-o-matic user systemd 
versionator multilib
-
-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_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> 
${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-       nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> 
${HTTP_SLOWFS_CACHE_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 )
-       nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> 
${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-       nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} 
-> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
-       nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> 
${HTTP_METRICS_MODULE_P}.tar.gz )
-       nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> 
${HTTP_NAXSI_MODULE_P}.tar.gz )
-       rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )
-       nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> 
${HTTP_DAV_EXT_MODULE_P}.tar.gz )
-       nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> 
${HTTP_ECHO_MODULE_P}.tar.gz )
-       nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> 
${HTTP_SECURITY_MODULE_P}.tar.gz )
-       nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> 
${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
-       nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> 
${HTTP_STICKY_MODULE_P}.tar.bz2 )
-       nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> 
${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-       nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> 
${HTTP_MEMC_MODULE_P}.tar.gz )
-       nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> 
${HTTP_LDAP_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
-       nginx_modules_http_security? ( Apache-2.0 )
-       nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
-       fastcgi geo gzip limit_req limit_conn map memcached proxy referer
-       rewrite scgi ssi split_clients upstream_ip_hash userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
-       gzip_static image_filter mp4 perl random_index realip secure_link
-       slice stub_status sub xslt"
-NGINX_MODULES_STREAM="access limit_conn upstream"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-       http_upload_progress
-       http_headers_more
-       http_cache_purge
-       http_slowfs_cache
-       http_fancyindex
-       http_lua
-       http_auth_pam
-       http_upstream_check
-       http_metrics
-       http_naxsi
-       http_dav_ext
-       http_echo
-       http_security
-       http_push_stream
-       http_sticky
-       http_mogilefs
-       http_memc
-       http_auth_ldap"
-
-IUSE="aio debug +http +http2 +http-cache ipv6 libatomic libressl luajit +pcre
-       pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-       IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-       IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM; do
-       IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-       IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-       IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-# Add so we can warn users updating about config changes
-# @TODO: jbergstroem: remove on next release series
-IUSE="${IUSE} nginx_modules_http_spdy"
-
-CDEPEND="
-       pcre? ( >=dev-libs/libpcre-4.2 )
-       pcre-jit? ( >=dev-libs/libpcre-8.20[jit] )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0= )
-               libressl? ( dev-libs/libressl:= )
-       )
-       http2? (
-               !libressl? ( >=dev-libs/openssl-1.0.1c:0= )
-               libressl? ( dev-libs/libressl:= )
-       )
-       http-cache? (
-               userland_GNU? (
-                       !libressl? ( dev-libs/openssl:0= )
-                       libressl? ( dev-libs/libressl:= )
-               )
-       )
-       nginx_modules_http_geoip? ( dev-libs/geoip )
-       nginx_modules_http_gunzip? ( sys-libs/zlib )
-       nginx_modules_http_gzip? ( sys-libs/zlib )
-       nginx_modules_http_gzip_static? ( sys-libs/zlib )
-       nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
-       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? (
-                       !libressl? ( dev-libs/openssl:0= )
-                       libressl? ( dev-libs/libressl:= )
-               )
-       )
-       nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
-       nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( 
dev-lang/luajit:2= ) )
-       nginx_modules_http_auth_pam? ( virtual/pam )
-       nginx_modules_http_metrics? ( dev-libs/yajl )
-       nginx_modules_http_dav_ext? ( dev-libs/expat )
-       nginx_modules_http_security? ( >=dev-libs/libxml2-2.7.8 
dev-libs/apr-util www-servers/apache )
-       nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )"
-RDEPEND="${CDEPEND}
-       selinux? ( sec-policy/selinux-nginx )
-       !www-servers/nginx:mainline"
-DEPEND="${CDEPEND}
-       arm? ( dev-libs/libatomic_ops )
-       libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
-       nginx_modules_http_lua? ( nginx_modules_http_rewrite )
-       nginx_modules_http_naxsi? ( pcre )
-       nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
-       nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
-       nginx_modules_http_security? ( pcre )
-       nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
-       NGINX_HOME="/var/lib/nginx"
-       NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
-       ebegin "Creating nginx user and group"
-       enewgroup ${PN}
-       enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
-       eend $?
-
-       if use libatomic; then
-               ewarn "GCC 4.1+ features built-in atomic operations."
-               ewarn "Using libatomic_ops is only needed if using"
-               ewarn "a different compiler or a GCC prior to 4.1"
-       fi
-
-       if [[ -n $NGINX_ADD_MODULES ]]; then
-               ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-               ewarn "This nginx installation is not supported!"
-               ewarn "Make sure you can reproduce the bug without those 
modules"
-               ewarn "_before_ reporting bugs."
-       fi
-
-       if use !http; then
-               ewarn "To actually disable all http-functionality you also have 
to disable"
-               ewarn "all nginx http modules."
-       fi
-
-       if use nginx_modules_http_mogilefs && use threads; then
-               eerror "mogilefs won't compile with threads support."
-               eerror "Please disable either flag and try again."
-               die "Can't compile mogilefs with threads support"
-       fi
-}
-
-src_prepare() {
-       eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-       eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
-
-       if use nginx_modules_http_upstream_check; then
-               eapply -p0 "${HTTP_UPSTREAM_CHECK_MODULE_WD}/check_1.9.2+".patch
-       fi
-
-       if use nginx_modules_http_lua; then
-               sed -i -e 's/-llua5.1/-llua/' "${HTTP_LUA_MODULE_WD}/config" || 
die
-       fi
-
-       find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& 
\\$(MAKE):' || die
-       # We have config protection, don't rename etc files
-       sed -i 's:.default::' auto/install || die
-       # remove useless files
-       sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
-       # don't install to /etc/nginx/ if not in use
-       local module
-       for module in fastcgi scgi uwsgi ; do
-               if ! use nginx_modules_http_${module}; then
-                       sed -i -e "/${module}/d" auto/install || die
-               fi
-       done
-
-       eapply_user
-}
-
-src_configure() {
-       # mod_security needs to generate nginx/modsecurity/config before 
including it
-       if use nginx_modules_http_security; then
-               cd "${HTTP_SECURITY_MODULE_WD}" || die
-               if use luajit ; then
-                       sed -i \
-                               -e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
-                               configure || die
-               fi
-               ./configure \
-                       --enable-standalone-module \
-                       $(use_enable pcre-jit) \
-                       $(use_with nginx_modules_http_lua lua) || die 
"configure failed for mod_security"
-       fi
-
-       cd "${S}" || die
-
-       local myconf=() http_enabled= mail_enabled= stream_enabled=
-
-       use aio       && myconf+=( --with-file-aio )
-       use debug     && myconf+=( --with-debug )
-       use http2     && myconf+=( --with-http_v2_module )
-       use ipv6      && myconf+=( --with-ipv6 )
-       use libatomic && myconf+=( --with-libatomic )
-       use pcre      && myconf+=( --with-pcre )
-       use pcre-jit  && myconf+=( --with-pcre-jit )
-       use threads   && myconf+=( --with-threads )
-
-       # HTTP modules
-       for mod in $NGINX_MODULES_STD; do
-               if use nginx_modules_http_${mod}; then
-                       http_enabled=1
-               else
-                       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+=( --with-http_${mod}_module )
-               fi
-       done
-
-       if use nginx_modules_http_fastcgi; then
-               myconf+=( --with-http_realip_module )
-       fi
-
-       # third-party modules
-       if use nginx_modules_http_upload_progress; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_headers_more; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_cache_purge; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_slowfs_cache; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_fancyindex; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_lua; then
-               http_enabled=1
-               if use luajit; then
-                       export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
-                       export LUAJIT_INC=$(pkg-config --variable includedir 
luajit)
-               else
-                       export LUA_LIB=$(pkg-config --variable libdir lua)
-                       export LUA_INC=$(pkg-config --variable includedir lua)
-               fi
-               myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
-               myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_auth_pam; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_upstream_check; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_metrics; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_naxsi ; then
-               http_enabled=1
-               myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
-       fi
-
-       if use rtmp ; then
-               http_enabled=1
-               myconf+=( --add-module=${RTMP_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_dav_ext ; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_echo ; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_security ; then
-               http_enabled=1
-               myconf+=( 
--add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
-       fi
-
-       if use nginx_modules_http_push_stream ; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_sticky ; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_mogilefs ; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_memc ; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_auth_ldap; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
-       fi
-
-       if use http || use http-cache || use http2; then
-               http_enabled=1
-       fi
-
-       if [ $http_enabled ]; then
-               use http-cache || myconf+=( --without-http-cache )
-               use ssl && myconf+=( --with-http_ssl_module )
-       else
-               myconf+=( --without-http --without-http-cache )
-       fi
-
-       # Stream modules
-       for mod in $NGINX_MODULES_STREAM; do
-               if use nginx_modules_stream_${mod}; then
-                       stream_enabled=1
-               else
-                       # Treat stream upstream slightly differently
-                       if ! use nginx_modules_stream_upstream; then
-                               myconf+=( --without-stream_upstream_hash_module 
)
-                               myconf+=( 
--without-stream_upstream_least_conn_module )
-                               myconf+=( --without-stream_upstream_zone_module 
)
-                       else
-                               myconf+=( --without-stream_${mod}_module )
-                       fi
-               fi
-       done
-
-       if [ $stream_enabled ]; then
-               myconf+=( --with-stream )
-               use ssl && myconf+=( --with-stream_ssl_module )
-       fi
-
-       # MAIL modules
-       for mod in $NGINX_MODULES_MAIL; do
-               if use nginx_modules_mail_${mod}; then
-                       mail_enabled=1
-               else
-                       myconf+=( --without-mail_${mod}_module )
-               fi
-       done
-
-       if [ $mail_enabled ]; then
-               myconf+=( --with-mail )
-               use ssl && myconf+=( --with-mail_ssl_module )
-       fi
-
-       # custom modules
-       for mod in $NGINX_ADD_MODULES; do
-               myconf+=(  --add-module=${mod} )
-       done
-
-       # https://bugs.gentoo.org/286772
-       export LANG=C LC_ALL=C
-       tc-export CC
-
-       if ! use prefix; then
-               myconf+=( --user=${PN} )
-               myconf+=( --group=${PN} )
-       fi
-
-       ./configure \
-               --prefix="${EPREFIX}"/usr \
-               --conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-               --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-               --pid-path="${EPREFIX}"/run/${PN}.pid \
-               --lock-path="${EPREFIX}"/run/lock/${PN}.lock \
-               --with-cc-opt="-I${EROOT}usr/include" \
-               --with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
-               --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-               
--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
-               --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
-               --http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
-               --http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
-               --http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
-               "${myconf[@]}" || die "configure failed"
-
-       # A purely cosmetic change that makes nginx -V more readable. This can 
be
-       # good if people outside the gentoo community would troubleshoot and
-       # question the users setup.
-       sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
-       use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
-
-       # https://bugs.gentoo.org/286772
-       export LANG=C LC_ALL=C
-       emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-       emake DESTDIR="${D%/}" install
-
-       cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die
-
-       newinitd "${FILESDIR}"/nginx.initd-r3 nginx
-
-       systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
-       doman man/nginx.8
-       dodoc CHANGES* README
-
-       # just keepdir. do not copy the default htdocs files (bug #449136)
-       keepdir /var/www/localhost
-       rm -rf "${D}"usr/html || die
-
-       # set up a list of directories to keep
-       local keepdir_list="${NGINX_HOME_TMP}"/client
-       local module
-       for module in proxy fastcgi scgi uwsgi; do
-               use nginx_modules_http_${module} && keepdir_list+=" 
${NGINX_HOME_TMP}/${module}"
-       done
-
-       keepdir /var/log/nginx ${keepdir_list}
-
-       # this solves a problem with SELinux where nginx doesn't see the 
directories
-       # as root and tries to create them as nginx
-       fperms 0750 "${NGINX_HOME_TMP}"
-       fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
-       fperms 0700 /var/log/nginx ${keepdir_list}
-       fowners ${PN}:${PN} /var/log/nginx ${keepdir_list}
-
-       # logrotate
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
-       if use nginx_modules_http_perl; then
-               cd "${S}"/objs/src/http/modules/perl/ || die
-               emake DESTDIR="${D}" INSTALLDIRS=vendor
-               perl_delete_localpod
-               cd "${S}" || die
-       fi
-
-       if use nginx_modules_http_cache_purge; then
-               docinto ${HTTP_CACHE_PURGE_MODULE_P}
-               dodoc 
"${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
-       fi
-
-       if use nginx_modules_http_slowfs_cache; then
-               docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-               dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
-       fi
-
-       if use nginx_modules_http_fancyindex; then
-               docinto ${HTTP_FANCYINDEX_MODULE_P}
-               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
-
-       if use nginx_modules_http_auth_pam; then
-               docinto ${HTTP_AUTH_PAM_MODULE_P}
-               dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
-       fi
-
-       if use nginx_modules_http_upstream_check; then
-               docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
-               dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
-       fi
-
-       if use nginx_modules_http_naxsi; then
-               insinto /etc/nginx
-               doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
-       fi
-
-       if use rtmp; then
-               docinto ${RTMP_MODULE_P}
-               dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
-       fi
-
-       if use nginx_modules_http_dav_ext; then
-               docinto ${HTTP_DAV_EXT_MODULE_P}
-               dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README
-       fi
-
-       if use nginx_modules_http_echo; then
-               docinto ${HTTP_ECHO_MODULE_P}
-               dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
-       fi
-
-       if use nginx_modules_http_security; then
-               docinto ${HTTP_SECURITY_MODULE_P}
-               dodoc 
"${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt}
-       fi
-
-       if use nginx_modules_http_push_stream; then
-               docinto ${HTTP_PUSH_STREAM_MODULE_P}
-               dodoc 
"${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
-       fi
-
-       if use nginx_modules_http_sticky; then
-               docinto ${HTTP_STICKY_MODULE_P}
-               dodoc 
"${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
-       fi
-
-       if use nginx_modules_http_memc; then
-               docinto ${HTTP_MEMC_MODULE_P}
-               dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
-       fi
-
-       if use nginx_modules_http_auth_ldap; then
-               docinto ${HTTP_LDAP_MODULE_P}
-               dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
-       fi
-}
-
-pkg_postinst() {
-       if use ssl; then
-               if [ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]; then
-                       install_cert /etc/ssl/${PN}/${PN}
-                       use prefix || chown ${PN}:${PN} 
"${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-               fi
-       fi
-
-       if use nginx_modules_http_spdy; then
-               ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
-               ewarn "Update your configs and package.use accordingly."
-       fi
-
-       if use nginx_modules_http_lua && use http2; then
-               ewarn "Lua 3rd party module author warns against using ${P} 
with"
-               ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see 
http://git.io/OldLsg";
-       fi
-
-       # This is the proper fix for bug #458726/#469094, resp. CVE-2013-0337 
for
-       # existing installations
-       local fix_perms=0
-
-       for rv in ${REPLACING_VERSIONS} ; do
-               version_compare ${rv} 1.4.1-r2
-               [[ $? -eq 1 ]] && fix_perms=1
-       done
-
-       if [[ $fix_perms -eq 1 ]] ; then
-               ewarn "To fix a security bug (CVE-2013-0337, bug #458726) had 
the following"
-               ewarn "directories the world-readable bit removed (if set):"
-               ewarn "  ${EPREFIX}/var/log/nginx"
-               ewarn "  
${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
-               ewarn "Check if this is correct for your setup before 
restarting nginx!"
-               ewarn "This is a one-time change and will not happen on 
subsequent updates."
-               ewarn "Furthermore nginx' temp directories got moved to 
${NGINX_HOME_TMP}"
-               chmod -f o-rwx "${EPREFIX}"/var/log/nginx 
"${EPREFIX}${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
-       fi
-
-       # If the nginx user can't change into or read the dir, display a 
warning.
-       # If su is not available we display the warning nevertheless since we 
can't check properly
-       su -s /bin/sh -c 'cd /var/log/nginx/ && ls' nginx >&/dev/null
-       if [ $? -ne 0 ] ; then
-               ewarn "Please make sure that the nginx user or group has at 
least"
-               ewarn "'rx' permissions on /var/log/nginx (default on a fresh 
install)"
-               ewarn "Otherwise you end up with empty log files after a 
logrotate."
-       fi
-
-       # HTTPoxy mitigation
-       ewarn ""
-       ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
-       ewarn "vulnerability for FastCGI applications by setting the HTTP_PROXY 
FastCGI"
-       ewarn "parameter to an empty string per default when you are sourcing 
the default"
-       ewarn "'fastcgi_params' or 'fastcgi.conf' in your server block(s)."
-       ewarn ""
-       ewarn "If this is causing any problems for you make sure that you are 
sourcing the"
-       ewarn "default parameters _before_ you set your own values."
-       ewarn "If you are relying on user-supplied proxy values you have to 
remove the"
-       ewarn "correlating lines from 'fastcgi_params' and or 'fastcgi.conf'."
-}

diff --git a/www-servers/nginx/nginx-1.11.3-r1.ebuild 
b/www-servers/nginx/nginx-1.11.3-r1.ebuild
deleted file mode 100644
index 1e280aa..00000000
--- a/www-servers/nginx/nginx-1.11.3-r1.ebuild
+++ /dev/null
@@ -1,782 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-# 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 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"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.3.0"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz";
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# http_uploadprogress 
(https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.1"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz";
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD 
license)
-HTTP_HEADERS_MORE_MODULE_PV="0.30"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz";
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 
license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-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_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 
license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-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 (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.4.0"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz";
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.5"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz";
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, 
http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.5.1"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz";
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check 
(https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="0.3.0-10-g10782ea"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/v${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz";
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-10782eaff51872a8f44e65eed89bbe286004bcb1"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz";
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.54"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz";
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.1.8"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz";
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD 
license)
-HTTP_DAV_EXT_MODULE_PV="0.0.3"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz";
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD 
license)
-HTTP_ECHO_MODULE_PV="0.59"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz";
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
-# keep the MODULE_P here consistent with upstream to avoid tarball duplication
-HTTP_SECURITY_MODULE_PV="2.9.1"
-HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz";
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
-
-# push-stream-module (http://www.nginxpushstream.com, 
https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="0.5.2"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz";
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, 
BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2";
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-c78b7dd79d0d"
-
-# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz";
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.17"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz";
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
-HTTP_LDAP_MODULE_PV="dbcef31bebb2d54b6120422d0b178bbf78bc48f7"
-HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz";
-HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-
-# We handle deps below ourselves
-SSL_DEPS_SKIP=1
-
-inherit ssl-cert toolchain-funcs perl-module flag-o-matic user systemd 
versionator multilib
-
-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_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> 
${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-       nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> 
${HTTP_SLOWFS_CACHE_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 )
-       nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> 
${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-       nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} 
-> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
-       nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> 
${HTTP_METRICS_MODULE_P}.tar.gz )
-       nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> 
${HTTP_NAXSI_MODULE_P}.tar.gz )
-       rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )
-       nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> 
${HTTP_DAV_EXT_MODULE_P}.tar.gz )
-       nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> 
${HTTP_ECHO_MODULE_P}.tar.gz )
-       nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> 
${HTTP_SECURITY_MODULE_P}.tar.gz )
-       nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> 
${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
-       nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> 
${HTTP_STICKY_MODULE_P}.tar.bz2 )
-       nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> 
${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-       nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> 
${HTTP_MEMC_MODULE_P}.tar.gz )
-       nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> 
${HTTP_LDAP_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
-       nginx_modules_http_security? ( Apache-2.0 )
-       nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
-       fastcgi geo gzip limit_req limit_conn map memcached proxy referer
-       rewrite scgi ssi split_clients upstream_hash upstream_ip_hash
-       upstream_keepalive upstream_least_conn upstream_zone userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
-       gzip_static image_filter mp4 perl random_index realip secure_link
-       slice stub_status sub xslt"
-NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
-       upstream_hash upstream_least_conn upstream_zone"
-NGINX_MODULES_STREAM_OPT="geoip"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-       http_upload_progress
-       http_headers_more
-       http_cache_purge
-       http_slowfs_cache
-       http_fancyindex
-       http_lua
-       http_auth_pam
-       http_upstream_check
-       http_metrics
-       http_naxsi
-       http_dav_ext
-       http_echo
-       http_security
-       http_push_stream
-       http_sticky
-       http_mogilefs
-       http_memc
-       http_auth_ldap"
-
-IUSE="aio debug +http +http2 +http-cache ipv6 libatomic libressl luajit +pcre
-       pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-       IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-       IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_STD; do
-       IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_OPT; do
-       IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-       IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-       IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-# Add so we can warn users updating about config changes
-# @TODO: jbergstroem: remove on next release series
-IUSE="${IUSE} nginx_modules_http_spdy"
-
-CDEPEND="
-       pcre? ( >=dev-libs/libpcre-4.2 )
-       pcre-jit? ( >=dev-libs/libpcre-8.20[jit] )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0= )
-               libressl? ( dev-libs/libressl:= )
-       )
-       http2? (
-               !libressl? ( >=dev-libs/openssl-1.0.1c:0= )
-               libressl? ( dev-libs/libressl:= )
-       )
-       http-cache? (
-               userland_GNU? (
-                       !libressl? ( dev-libs/openssl:0= )
-                       libressl? ( dev-libs/libressl:= )
-               )
-       )
-       nginx_modules_http_geoip? ( dev-libs/geoip )
-       nginx_modules_http_gunzip? ( sys-libs/zlib )
-       nginx_modules_http_gzip? ( sys-libs/zlib )
-       nginx_modules_http_gzip_static? ( sys-libs/zlib )
-       nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
-       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? (
-                       !libressl? ( dev-libs/openssl:0= )
-                       libressl? ( dev-libs/libressl:= )
-               )
-       )
-       nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
-       nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( 
dev-lang/luajit:2= ) )
-       nginx_modules_http_auth_pam? ( virtual/pam )
-       nginx_modules_http_metrics? ( dev-libs/yajl )
-       nginx_modules_http_dav_ext? ( dev-libs/expat )
-       nginx_modules_http_security? ( >=dev-libs/libxml2-2.7.8 
dev-libs/apr-util www-servers/apache )
-       nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )"
-RDEPEND="${CDEPEND}
-       selinux? ( sec-policy/selinux-nginx )
-       !www-servers/nginx:0"
-DEPEND="${CDEPEND}
-       arm? ( dev-libs/libatomic_ops )
-       libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
-       nginx_modules_http_lua? ( nginx_modules_http_rewrite )
-       nginx_modules_http_naxsi? ( pcre )
-       nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
-       nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
-       nginx_modules_http_security? ( pcre )
-       nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
-       NGINX_HOME="/var/lib/nginx"
-       NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
-       ebegin "Creating nginx user and group"
-       enewgroup ${PN}
-       enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
-       eend $?
-
-       if use libatomic; then
-               ewarn "GCC 4.1+ features built-in atomic operations."
-               ewarn "Using libatomic_ops is only needed if using"
-               ewarn "a different compiler or a GCC prior to 4.1"
-       fi
-
-       if [[ -n $NGINX_ADD_MODULES ]]; then
-               ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-               ewarn "This nginx installation is not supported!"
-               ewarn "Make sure you can reproduce the bug without those 
modules"
-               ewarn "_before_ reporting bugs."
-       fi
-
-       if use !http; then
-               ewarn "To actually disable all http-functionality you also have 
to disable"
-               ewarn "all nginx http modules."
-       fi
-
-       if use nginx_modules_http_mogilefs && use threads; then
-               eerror "mogilefs won't compile with threads support."
-               eerror "Please disable either flag and try again."
-               die "Can't compile mogilefs with threads support"
-       fi
-}
-
-src_prepare() {
-       eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-       eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
-       eapply 
"${FILESDIR}/${PN}-1.11.3-fix-build-without-stream_ssl_module.patch"
-
-       if use nginx_modules_http_sticky; then
-               cd "${HTTP_STICKY_MODULE_WD}" || die
-               eapply "${FILESDIR}"/http-sticky-nginx-1.11.2.patch
-               cd "${S}" || die
-       fi
-
-       if use nginx_modules_http_upstream_check; then
-               eapply -p0 "${HTTP_UPSTREAM_CHECK_MODULE_WD}/check_1.9.2+".patch
-       fi
-
-       if use nginx_modules_http_lua; then
-               sed -i -e 's/-llua5.1/-llua/' "${HTTP_LUA_MODULE_WD}/config" || 
die
-       fi
-
-       find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& 
\\$(MAKE):' || die
-       # We have config protection, don't rename etc files
-       sed -i 's:.default::' auto/install || die
-       # remove useless files
-       sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
-       # don't install to /etc/nginx/ if not in use
-       local module
-       for module in fastcgi scgi uwsgi ; do
-               if ! use nginx_modules_http_${module}; then
-                       sed -i -e "/${module}/d" auto/install || die
-               fi
-       done
-
-       eapply_user
-}
-
-src_configure() {
-       # mod_security needs to generate nginx/modsecurity/config before 
including it
-       if use nginx_modules_http_security; then
-               cd "${HTTP_SECURITY_MODULE_WD}" || die
-               if use luajit ; then
-                       sed -i \
-                               -e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
-                               configure || die
-               fi
-               ./configure \
-                       --enable-standalone-module \
-                       $(use_enable pcre-jit) \
-                       $(use_with nginx_modules_http_lua lua) || die 
"configure failed for mod_security"
-       fi
-
-       cd "${S}" || die
-
-       local myconf=() http_enabled= mail_enabled= stream_enabled=
-
-       use aio       && myconf+=( --with-file-aio )
-       use debug     && myconf+=( --with-debug )
-       use http2     && myconf+=( --with-http_v2_module )
-       use ipv6      && myconf+=( --with-ipv6 )
-       use libatomic && myconf+=( --with-libatomic )
-       use pcre      && myconf+=( --with-pcre )
-       use pcre-jit  && myconf+=( --with-pcre-jit )
-       use threads   && myconf+=( --with-threads )
-
-       # HTTP modules
-       for mod in $NGINX_MODULES_STD; do
-               if use nginx_modules_http_${mod}; then
-                       http_enabled=1
-               else
-                       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+=( --with-http_${mod}_module )
-               fi
-       done
-
-       if use nginx_modules_http_fastcgi; then
-               myconf+=( --with-http_realip_module )
-       fi
-
-       # third-party modules
-       if use nginx_modules_http_upload_progress; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_headers_more; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_cache_purge; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_slowfs_cache; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_fancyindex; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_lua; then
-               http_enabled=1
-               if use luajit; then
-                       export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
-                       export LUAJIT_INC=$(pkg-config --variable includedir 
luajit)
-               else
-                       export LUA_LIB=$(pkg-config --variable libdir lua)
-                       export LUA_INC=$(pkg-config --variable includedir lua)
-               fi
-               myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
-               myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_auth_pam; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_upstream_check; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_metrics; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_naxsi ; then
-               http_enabled=1
-               myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
-       fi
-
-       if use rtmp ; then
-               http_enabled=1
-               myconf+=( --add-module=${RTMP_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_dav_ext ; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_echo ; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_security ; then
-               http_enabled=1
-               myconf+=( 
--add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
-       fi
-
-       if use nginx_modules_http_push_stream ; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_sticky ; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_mogilefs ; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_memc ; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_auth_ldap; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
-       fi
-
-       if use http || use http-cache || use http2; then
-               http_enabled=1
-       fi
-
-       if [ $http_enabled ]; then
-               use http-cache || myconf+=( --without-http-cache )
-               use ssl && myconf+=( --with-http_ssl_module )
-       else
-               myconf+=( --without-http --without-http-cache )
-       fi
-
-       # Stream modules
-       for mod in $NGINX_MODULES_STREAM_STD; do
-               if use nginx_modules_stream_${mod}; then
-                       stream_enabled=1
-               else
-                       myconf+=( --without-stream_${mod}_module )
-               fi
-       done
-
-       for mod in $NGINX_MODULES_STREAM_OPT; do
-               if use nginx_modules_stream_${mod}; then
-                       stream_enabled=1
-                       myconf+=( --with-stream_${mod}_module )
-               fi
-       done
-
-       if [ $stream_enabled ]; then
-               myconf+=( --with-stream )
-               use ssl && myconf+=( --with-stream_ssl_module )
-       fi
-
-       # MAIL modules
-       for mod in $NGINX_MODULES_MAIL; do
-               if use nginx_modules_mail_${mod}; then
-                       mail_enabled=1
-               else
-                       myconf+=( --without-mail_${mod}_module )
-               fi
-       done
-
-       if [ $mail_enabled ]; then
-               myconf+=( --with-mail )
-               use ssl && myconf+=( --with-mail_ssl_module )
-       fi
-
-       # custom modules
-       for mod in $NGINX_ADD_MODULES; do
-               myconf+=(  --add-module=${mod} )
-       done
-
-       # https://bugs.gentoo.org/286772
-       export LANG=C LC_ALL=C
-       tc-export CC
-
-       if ! use prefix; then
-               myconf+=( --user=${PN} )
-               myconf+=( --group=${PN} )
-       fi
-
-       ./configure \
-               --prefix="${EPREFIX}"/usr \
-               --conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-               --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-               --pid-path="${EPREFIX}"/run/${PN}.pid \
-               --lock-path="${EPREFIX}"/run/lock/${PN}.lock \
-               --with-cc-opt="-I${EROOT}usr/include" \
-               --with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
-               --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-               
--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
-               --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
-               --http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
-               --http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
-               --http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
-               "${myconf[@]}" || die "configure failed"
-
-       # A purely cosmetic change that makes nginx -V more readable. This can 
be
-       # good if people outside the gentoo community would troubleshoot and
-       # question the users setup.
-       sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
-       use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
-
-       # https://bugs.gentoo.org/286772
-       export LANG=C LC_ALL=C
-       emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-       emake DESTDIR="${D%/}" install
-
-       cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die
-
-       newinitd "${FILESDIR}"/nginx.initd-r3 nginx
-
-       systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
-       doman man/nginx.8
-       dodoc CHANGES* README
-
-       # just keepdir. do not copy the default htdocs files (bug #449136)
-       keepdir /var/www/localhost
-       rm -rf "${D}"usr/html || die
-
-       # set up a list of directories to keep
-       local keepdir_list="${NGINX_HOME_TMP}"/client
-       local module
-       for module in proxy fastcgi scgi uwsgi; do
-               use nginx_modules_http_${module} && keepdir_list+=" 
${NGINX_HOME_TMP}/${module}"
-       done
-
-       keepdir /var/log/nginx ${keepdir_list}
-
-       # this solves a problem with SELinux where nginx doesn't see the 
directories
-       # as root and tries to create them as nginx
-       fperms 0750 "${NGINX_HOME_TMP}"
-       fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
-       fperms 0700 /var/log/nginx ${keepdir_list}
-       fowners ${PN}:${PN} /var/log/nginx ${keepdir_list}
-
-       # logrotate
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
-       if use nginx_modules_http_perl; then
-               cd "${S}"/objs/src/http/modules/perl/ || die
-               emake DESTDIR="${D}" INSTALLDIRS=vendor
-               perl_delete_localpod
-               cd "${S}" || die
-       fi
-
-       if use nginx_modules_http_cache_purge; then
-               docinto ${HTTP_CACHE_PURGE_MODULE_P}
-               dodoc 
"${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
-       fi
-
-       if use nginx_modules_http_slowfs_cache; then
-               docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-               dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
-       fi
-
-       if use nginx_modules_http_fancyindex; then
-               docinto ${HTTP_FANCYINDEX_MODULE_P}
-               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
-
-       if use nginx_modules_http_auth_pam; then
-               docinto ${HTTP_AUTH_PAM_MODULE_P}
-               dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
-       fi
-
-       if use nginx_modules_http_upstream_check; then
-               docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
-               dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
-       fi
-
-       if use nginx_modules_http_naxsi; then
-               insinto /etc/nginx
-               doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
-       fi
-
-       if use rtmp; then
-               docinto ${RTMP_MODULE_P}
-               dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
-       fi
-
-       if use nginx_modules_http_dav_ext; then
-               docinto ${HTTP_DAV_EXT_MODULE_P}
-               dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README
-       fi
-
-       if use nginx_modules_http_echo; then
-               docinto ${HTTP_ECHO_MODULE_P}
-               dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
-       fi
-
-       if use nginx_modules_http_security; then
-               docinto ${HTTP_SECURITY_MODULE_P}
-               dodoc 
"${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt}
-       fi
-
-       if use nginx_modules_http_push_stream; then
-               docinto ${HTTP_PUSH_STREAM_MODULE_P}
-               dodoc 
"${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
-       fi
-
-       if use nginx_modules_http_sticky; then
-               docinto ${HTTP_STICKY_MODULE_P}
-               dodoc 
"${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
-       fi
-
-       if use nginx_modules_http_memc; then
-               docinto ${HTTP_MEMC_MODULE_P}
-               dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
-       fi
-
-       if use nginx_modules_http_auth_ldap; then
-               docinto ${HTTP_LDAP_MODULE_P}
-               dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
-       fi
-}
-
-pkg_postinst() {
-       if use ssl; then
-               if [[ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]]; then
-                       install_cert /etc/ssl/${PN}/${PN}
-                       use prefix || chown ${PN}:${PN} 
"${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-               fi
-       fi
-
-       if use nginx_modules_http_spdy; then
-               ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
-               ewarn "Update your configs and package.use accordingly."
-       fi
-
-       if use nginx_modules_http_lua && use http2; then
-               ewarn "Lua 3rd party module author warns against using ${P} 
with"
-               ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see 
http://git.io/OldLsg";
-       fi
-
-       # This is the proper fix for bug #458726/#469094, resp. CVE-2013-0337 
for
-       # existing installations
-       local fix_perms=0
-
-       for rv in ${REPLACING_VERSIONS}; do
-               version_compare ${rv} 1.4.1-r2
-               [[ $? -eq 1 ]] && fix_perms=1
-       done
-
-       if [[ $fix_perms -eq 1 ]] ; then
-               ewarn "To fix a security bug (CVE-2013-0337, bug #458726) had 
the following"
-               ewarn "directories the world-readable bit removed (if set):"
-               ewarn "  ${EPREFIX}/var/log/nginx"
-               ewarn "  
${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
-               ewarn "Check if this is correct for your setup before 
restarting nginx!"
-               ewarn "This is a one-time change and will not happen on 
subsequent updates."
-               ewarn "Furthermore nginx' temp directories got moved to 
${NGINX_HOME_TMP}"
-               chmod -f o-rwx "${EPREFIX}"/var/log/nginx 
"${EPREFIX}${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
-       fi
-
-       # If the nginx user can't change into or read the dir, display a 
warning.
-       # If su is not available we display the warning nevertheless since we 
can't check properly
-       su -s /bin/sh -c 'cd /var/log/nginx/ && ls' nginx >&/dev/null
-       if [ $? -ne 0 ] ; then
-               ewarn "Please make sure that the nginx user or group has at 
least"
-               ewarn "'rx' permissions on /var/log/nginx (default on a fresh 
install)"
-               ewarn "Otherwise you end up with empty log files after a 
logrotate."
-       fi
-
-       # HTTPoxy mitigation
-       ewarn ""
-       ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
-       ewarn "vulnerability for FastCGI applications by setting the HTTP_PROXY 
FastCGI"
-       ewarn "parameter to an empty string per default when you are sourcing 
the default"
-       ewarn "'fastcgi_params' or 'fastcgi.conf' in your server block(s)."
-       ewarn ""
-       ewarn "If this is causing any problems for you make sure that you are 
sourcing the"
-       ewarn "default parameters _before_ you set your own values."
-       ewarn "If you are relying on user-supplied proxy values you have to 
remove the"
-       ewarn "correlating lines from 'fastcgi_params' and or 'fastcgi.conf'."
-}

diff --git a/www-servers/nginx/nginx-1.11.3-r2.ebuild 
b/www-servers/nginx/nginx-1.11.3-r2.ebuild
deleted file mode 100644
index 883918d..00000000
--- a/www-servers/nginx/nginx-1.11.3-r2.ebuild
+++ /dev/null
@@ -1,782 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-# 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 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"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.3.0"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz";
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# http_uploadprogress 
(https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz";
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD 
license)
-HTTP_HEADERS_MORE_MODULE_PV="0.31"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz";
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, 
https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-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_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 
license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-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 (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.4.1"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz";
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.6"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz";
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, 
http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.5.1"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz";
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check 
(https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="0.3.0-10-g10782ea"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/v${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz";
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-10782eaff51872a8f44e65eed89bbe286004bcb1"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz";
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.54"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz";
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.1.9"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz";
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD 
license)
-HTTP_DAV_EXT_MODULE_PV="0.0.3"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz";
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD 
license)
-HTTP_ECHO_MODULE_PV="0.60"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz";
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
-# keep the MODULE_P here consistent with upstream to avoid tarball duplication
-HTTP_SECURITY_MODULE_PV="2.9.1"
-HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz";
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
-
-# push-stream-module (http://www.nginxpushstream.com, 
https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="0.5.2"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz";
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, 
BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2";
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-c78b7dd79d0d"
-
-# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz";
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.17"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz";
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
-HTTP_LDAP_MODULE_PV="dbcef31bebb2d54b6120422d0b178bbf78bc48f7"
-HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz";
-HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-
-# We handle deps below ourselves
-SSL_DEPS_SKIP=1
-
-inherit ssl-cert toolchain-funcs perl-module flag-o-matic user systemd 
versionator multilib
-
-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_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> 
${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-       nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> 
${HTTP_SLOWFS_CACHE_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 )
-       nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> 
${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-       nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} 
-> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
-       nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> 
${HTTP_METRICS_MODULE_P}.tar.gz )
-       nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> 
${HTTP_NAXSI_MODULE_P}.tar.gz )
-       rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )
-       nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> 
${HTTP_DAV_EXT_MODULE_P}.tar.gz )
-       nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> 
${HTTP_ECHO_MODULE_P}.tar.gz )
-       nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> 
${HTTP_SECURITY_MODULE_P}.tar.gz )
-       nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> 
${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
-       nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> 
${HTTP_STICKY_MODULE_P}.tar.bz2 )
-       nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> 
${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-       nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> 
${HTTP_MEMC_MODULE_P}.tar.gz )
-       nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> 
${HTTP_LDAP_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
-       nginx_modules_http_security? ( Apache-2.0 )
-       nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
-       fastcgi geo gzip limit_req limit_conn map memcached proxy referer
-       rewrite scgi ssi split_clients upstream_hash upstream_ip_hash
-       upstream_keepalive upstream_least_conn upstream_zone userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
-       gzip_static image_filter mp4 perl random_index realip secure_link
-       slice stub_status sub xslt"
-NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
-       upstream_hash upstream_least_conn upstream_zone"
-NGINX_MODULES_STREAM_OPT="geoip"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-       http_upload_progress
-       http_headers_more
-       http_cache_purge
-       http_slowfs_cache
-       http_fancyindex
-       http_lua
-       http_auth_pam
-       http_upstream_check
-       http_metrics
-       http_naxsi
-       http_dav_ext
-       http_echo
-       http_security
-       http_push_stream
-       http_sticky
-       http_mogilefs
-       http_memc
-       http_auth_ldap"
-
-IUSE="aio debug +http +http2 +http-cache ipv6 libatomic libressl luajit +pcre
-       pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-       IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-       IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_STD; do
-       IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_OPT; do
-       IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-       IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-       IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-# Add so we can warn users updating about config changes
-# @TODO: jbergstroem: remove on next release series
-IUSE="${IUSE} nginx_modules_http_spdy"
-
-CDEPEND="
-       pcre? ( >=dev-libs/libpcre-4.2 )
-       pcre-jit? ( >=dev-libs/libpcre-8.20[jit] )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0= )
-               libressl? ( dev-libs/libressl:= )
-       )
-       http2? (
-               !libressl? ( >=dev-libs/openssl-1.0.1c:0= )
-               libressl? ( dev-libs/libressl:= )
-       )
-       http-cache? (
-               userland_GNU? (
-                       !libressl? ( dev-libs/openssl:0= )
-                       libressl? ( dev-libs/libressl:= )
-               )
-       )
-       nginx_modules_http_geoip? ( dev-libs/geoip )
-       nginx_modules_http_gunzip? ( sys-libs/zlib )
-       nginx_modules_http_gzip? ( sys-libs/zlib )
-       nginx_modules_http_gzip_static? ( sys-libs/zlib )
-       nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
-       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? (
-                       !libressl? ( dev-libs/openssl:0= )
-                       libressl? ( dev-libs/libressl:= )
-               )
-       )
-       nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
-       nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( 
dev-lang/luajit:2= ) )
-       nginx_modules_http_auth_pam? ( virtual/pam )
-       nginx_modules_http_metrics? ( dev-libs/yajl )
-       nginx_modules_http_dav_ext? ( dev-libs/expat )
-       nginx_modules_http_security? ( >=dev-libs/libxml2-2.7.8 
dev-libs/apr-util www-servers/apache )
-       nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )"
-RDEPEND="${CDEPEND}
-       selinux? ( sec-policy/selinux-nginx )
-       !www-servers/nginx:0"
-DEPEND="${CDEPEND}
-       arm? ( dev-libs/libatomic_ops )
-       libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
-       nginx_modules_http_lua? ( nginx_modules_http_rewrite )
-       nginx_modules_http_naxsi? ( pcre )
-       nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
-       nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
-       nginx_modules_http_security? ( pcre )
-       nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
-       NGINX_HOME="/var/lib/nginx"
-       NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
-       ebegin "Creating nginx user and group"
-       enewgroup ${PN}
-       enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
-       eend $?
-
-       if use libatomic; then
-               ewarn "GCC 4.1+ features built-in atomic operations."
-               ewarn "Using libatomic_ops is only needed if using"
-               ewarn "a different compiler or a GCC prior to 4.1"
-       fi
-
-       if [[ -n $NGINX_ADD_MODULES ]]; then
-               ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-               ewarn "This nginx installation is not supported!"
-               ewarn "Make sure you can reproduce the bug without those 
modules"
-               ewarn "_before_ reporting bugs."
-       fi
-
-       if use !http; then
-               ewarn "To actually disable all http-functionality you also have 
to disable"
-               ewarn "all nginx http modules."
-       fi
-
-       if use nginx_modules_http_mogilefs && use threads; then
-               eerror "mogilefs won't compile with threads support."
-               eerror "Please disable either flag and try again."
-               die "Can't compile mogilefs with threads support"
-       fi
-}
-
-src_prepare() {
-       eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-       eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
-       eapply 
"${FILESDIR}/${PN}-1.11.3-fix-build-without-stream_ssl_module.patch"
-
-       if use nginx_modules_http_sticky; then
-               cd "${HTTP_STICKY_MODULE_WD}" || die
-               eapply "${FILESDIR}"/http-sticky-nginx-1.11.2.patch
-               cd "${S}" || die
-       fi
-
-       if use nginx_modules_http_upstream_check; then
-               eapply -p0 "${HTTP_UPSTREAM_CHECK_MODULE_WD}/check_1.9.2+".patch
-       fi
-
-       if use nginx_modules_http_lua; then
-               sed -i -e 's/-llua5.1/-llua/' "${HTTP_LUA_MODULE_WD}/config" || 
die
-       fi
-
-       find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& 
\\$(MAKE):' || die
-       # We have config protection, don't rename etc files
-       sed -i 's:.default::' auto/install || die
-       # remove useless files
-       sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
-       # don't install to /etc/nginx/ if not in use
-       local module
-       for module in fastcgi scgi uwsgi ; do
-               if ! use nginx_modules_http_${module}; then
-                       sed -i -e "/${module}/d" auto/install || die
-               fi
-       done
-
-       eapply_user
-}
-
-src_configure() {
-       # mod_security needs to generate nginx/modsecurity/config before 
including it
-       if use nginx_modules_http_security; then
-               cd "${HTTP_SECURITY_MODULE_WD}" || die
-               if use luajit ; then
-                       sed -i \
-                               -e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
-                               configure || die
-               fi
-               ./configure \
-                       --enable-standalone-module \
-                       $(use_enable pcre-jit) \
-                       $(use_with nginx_modules_http_lua lua) || die 
"configure failed for mod_security"
-       fi
-
-       cd "${S}" || die
-
-       local myconf=() http_enabled= mail_enabled= stream_enabled=
-
-       use aio       && myconf+=( --with-file-aio )
-       use debug     && myconf+=( --with-debug )
-       use http2     && myconf+=( --with-http_v2_module )
-       use ipv6      && myconf+=( --with-ipv6 )
-       use libatomic && myconf+=( --with-libatomic )
-       use pcre      && myconf+=( --with-pcre )
-       use pcre-jit  && myconf+=( --with-pcre-jit )
-       use threads   && myconf+=( --with-threads )
-
-       # HTTP modules
-       for mod in $NGINX_MODULES_STD; do
-               if use nginx_modules_http_${mod}; then
-                       http_enabled=1
-               else
-                       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+=( --with-http_${mod}_module )
-               fi
-       done
-
-       if use nginx_modules_http_fastcgi; then
-               myconf+=( --with-http_realip_module )
-       fi
-
-       # third-party modules
-       if use nginx_modules_http_upload_progress; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_headers_more; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_cache_purge; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_slowfs_cache; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_fancyindex; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_lua; then
-               http_enabled=1
-               if use luajit; then
-                       export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
-                       export LUAJIT_INC=$(pkg-config --variable includedir 
luajit)
-               else
-                       export LUA_LIB=$(pkg-config --variable libdir lua)
-                       export LUA_INC=$(pkg-config --variable includedir lua)
-               fi
-               myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
-               myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_auth_pam; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_upstream_check; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_metrics; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_naxsi ; then
-               http_enabled=1
-               myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
-       fi
-
-       if use rtmp ; then
-               http_enabled=1
-               myconf+=( --add-module=${RTMP_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_dav_ext ; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_echo ; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_security ; then
-               http_enabled=1
-               myconf+=( 
--add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
-       fi
-
-       if use nginx_modules_http_push_stream ; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_sticky ; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_mogilefs ; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_memc ; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
-       fi
-
-       if use nginx_modules_http_auth_ldap; then
-               http_enabled=1
-               myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
-       fi
-
-       if use http || use http-cache || use http2; then
-               http_enabled=1
-       fi
-
-       if [ $http_enabled ]; then
-               use http-cache || myconf+=( --without-http-cache )
-               use ssl && myconf+=( --with-http_ssl_module )
-       else
-               myconf+=( --without-http --without-http-cache )
-       fi
-
-       # Stream modules
-       for mod in $NGINX_MODULES_STREAM_STD; do
-               if use nginx_modules_stream_${mod}; then
-                       stream_enabled=1
-               else
-                       myconf+=( --without-stream_${mod}_module )
-               fi
-       done
-
-       for mod in $NGINX_MODULES_STREAM_OPT; do
-               if use nginx_modules_stream_${mod}; then
-                       stream_enabled=1
-                       myconf+=( --with-stream_${mod}_module )
-               fi
-       done
-
-       if [ $stream_enabled ]; then
-               myconf+=( --with-stream )
-               use ssl && myconf+=( --with-stream_ssl_module )
-       fi
-
-       # MAIL modules
-       for mod in $NGINX_MODULES_MAIL; do
-               if use nginx_modules_mail_${mod}; then
-                       mail_enabled=1
-               else
-                       myconf+=( --without-mail_${mod}_module )
-               fi
-       done
-
-       if [ $mail_enabled ]; then
-               myconf+=( --with-mail )
-               use ssl && myconf+=( --with-mail_ssl_module )
-       fi
-
-       # custom modules
-       for mod in $NGINX_ADD_MODULES; do
-               myconf+=(  --add-module=${mod} )
-       done
-
-       # https://bugs.gentoo.org/286772
-       export LANG=C LC_ALL=C
-       tc-export CC
-
-       if ! use prefix; then
-               myconf+=( --user=${PN} )
-               myconf+=( --group=${PN} )
-       fi
-
-       ./configure \
-               --prefix="${EPREFIX}"/usr \
-               --conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-               --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-               --pid-path="${EPREFIX}"/run/${PN}.pid \
-               --lock-path="${EPREFIX}"/run/lock/${PN}.lock \
-               --with-cc-opt="-I${EROOT}usr/include" \
-               --with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
-               --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-               
--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
-               --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
-               --http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
-               --http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
-               --http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
-               "${myconf[@]}" || die "configure failed"
-
-       # A purely cosmetic change that makes nginx -V more readable. This can 
be
-       # good if people outside the gentoo community would troubleshoot and
-       # question the users setup.
-       sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
-       use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
-
-       # https://bugs.gentoo.org/286772
-       export LANG=C LC_ALL=C
-       emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-       emake DESTDIR="${D%/}" install
-
-       cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die
-
-       newinitd "${FILESDIR}"/nginx.initd-r3 nginx
-
-       systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
-       doman man/nginx.8
-       dodoc CHANGES* README
-
-       # just keepdir. do not copy the default htdocs files (bug #449136)
-       keepdir /var/www/localhost
-       rm -rf "${D}"usr/html || die
-
-       # set up a list of directories to keep
-       local keepdir_list="${NGINX_HOME_TMP}"/client
-       local module
-       for module in proxy fastcgi scgi uwsgi; do
-               use nginx_modules_http_${module} && keepdir_list+=" 
${NGINX_HOME_TMP}/${module}"
-       done
-
-       keepdir /var/log/nginx ${keepdir_list}
-
-       # this solves a problem with SELinux where nginx doesn't see the 
directories
-       # as root and tries to create them as nginx
-       fperms 0750 "${NGINX_HOME_TMP}"
-       fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
-       fperms 0700 /var/log/nginx ${keepdir_list}
-       fowners ${PN}:${PN} /var/log/nginx ${keepdir_list}
-
-       # logrotate
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
-       if use nginx_modules_http_perl; then
-               cd "${S}"/objs/src/http/modules/perl/ || die
-               emake DESTDIR="${D}" INSTALLDIRS=vendor
-               perl_delete_localpod
-               cd "${S}" || die
-       fi
-
-       if use nginx_modules_http_cache_purge; then
-               docinto ${HTTP_CACHE_PURGE_MODULE_P}
-               dodoc 
"${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
-       fi
-
-       if use nginx_modules_http_slowfs_cache; then
-               docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-               dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
-       fi
-
-       if use nginx_modules_http_fancyindex; then
-               docinto ${HTTP_FANCYINDEX_MODULE_P}
-               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}"/README.markdown
-       fi
-
-       if use nginx_modules_http_auth_pam; then
-               docinto ${HTTP_AUTH_PAM_MODULE_P}
-               dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
-       fi
-
-       if use nginx_modules_http_upstream_check; then
-               docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
-               dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
-       fi
-
-       if use nginx_modules_http_naxsi; then
-               insinto /etc/nginx
-               doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
-       fi
-
-       if use rtmp; then
-               docinto ${RTMP_MODULE_P}
-               dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
-       fi
-
-       if use nginx_modules_http_dav_ext; then
-               docinto ${HTTP_DAV_EXT_MODULE_P}
-               dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README
-       fi
-
-       if use nginx_modules_http_echo; then
-               docinto ${HTTP_ECHO_MODULE_P}
-               dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
-       fi
-
-       if use nginx_modules_http_security; then
-               docinto ${HTTP_SECURITY_MODULE_P}
-               dodoc 
"${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt}
-       fi
-
-       if use nginx_modules_http_push_stream; then
-               docinto ${HTTP_PUSH_STREAM_MODULE_P}
-               dodoc 
"${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
-       fi
-
-       if use nginx_modules_http_sticky; then
-               docinto ${HTTP_STICKY_MODULE_P}
-               dodoc 
"${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
-       fi
-
-       if use nginx_modules_http_memc; then
-               docinto ${HTTP_MEMC_MODULE_P}
-               dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
-       fi
-
-       if use nginx_modules_http_auth_ldap; then
-               docinto ${HTTP_LDAP_MODULE_P}
-               dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
-       fi
-}
-
-pkg_postinst() {
-       if use ssl; then
-               if [[ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]]; then
-                       install_cert /etc/ssl/${PN}/${PN}
-                       use prefix || chown ${PN}:${PN} 
"${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-               fi
-       fi
-
-       if use nginx_modules_http_spdy; then
-               ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
-               ewarn "Update your configs and package.use accordingly."
-       fi
-
-       if use nginx_modules_http_lua && use http2; then
-               ewarn "Lua 3rd party module author warns against using ${P} 
with"
-               ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see 
http://git.io/OldLsg";
-       fi
-
-       # This is the proper fix for bug #458726/#469094, resp. CVE-2013-0337 
for
-       # existing installations
-       local fix_perms=0
-
-       for rv in ${REPLACING_VERSIONS}; do
-               version_compare ${rv} 1.4.1-r2
-               [[ $? -eq 1 ]] && fix_perms=1
-       done
-
-       if [[ $fix_perms -eq 1 ]] ; then
-               ewarn "To fix a security bug (CVE-2013-0337, bug #458726) had 
the following"
-               ewarn "directories the world-readable bit removed (if set):"
-               ewarn "  ${EPREFIX}/var/log/nginx"
-               ewarn "  
${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
-               ewarn "Check if this is correct for your setup before 
restarting nginx!"
-               ewarn "This is a one-time change and will not happen on 
subsequent updates."
-               ewarn "Furthermore nginx' temp directories got moved to 
${NGINX_HOME_TMP}"
-               chmod -f o-rwx "${EPREFIX}"/var/log/nginx 
"${EPREFIX}${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
-       fi
-
-       # If the nginx user can't change into or read the dir, display a 
warning.
-       # If su is not available we display the warning nevertheless since we 
can't check properly
-       su -s /bin/sh -c 'cd /var/log/nginx/ && ls' nginx >&/dev/null
-       if [ $? -ne 0 ] ; then
-               ewarn "Please make sure that the nginx user or group has at 
least"
-               ewarn "'rx' permissions on /var/log/nginx (default on a fresh 
install)"
-               ewarn "Otherwise you end up with empty log files after a 
logrotate."
-       fi
-
-       # HTTPoxy mitigation
-       ewarn ""
-       ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
-       ewarn "vulnerability for FastCGI applications by setting the HTTP_PROXY 
FastCGI"
-       ewarn "parameter to an empty string per default when you are sourcing 
the default"
-       ewarn "'fastcgi_params' or 'fastcgi.conf' in your server block(s)."
-       ewarn ""
-       ewarn "If this is causing any problems for you make sure that you are 
sourcing the"
-       ewarn "default parameters _before_ you set your own values."
-       ewarn "If you are relying on user-supplied proxy values you have to 
remove the"
-       ewarn "correlating lines from 'fastcgi_params' and or 'fastcgi.conf'."
-}

[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/, www-servers/nginx/

Reply via email to