www-servers/nginx: Adjust dependencies/slot operators

Package-Manager: portage-2.3.2

diff --git a/www-servers/nginx/nginx-1.10.1-r3.ebuild b/www-servers/nginx/nginx-1.10.1-r3.ebuild
index fe9f07138c1494b969ae4d5c9168c81f9c8bfb25..8716c663683241ca6667582bdeacafdce9724972 100644 (file)
--- a/www-servers/nginx/nginx-1.10.1-r3.ebuild
+++ b/www-servers/nginx/nginx-1.10.1-r3.ebuild
@@ -230,8 +230,8 @@ done
 IUSE="${IUSE} nginx_modules_http_spdy"
 
 CDEPEND="
-       pcre? ( >=dev-libs/libpcre-4.2 )
-       pcre-jit? ( >=dev-libs/libpcre-8.20[jit] )
+       pcre? ( dev-libs/libpcre:= )
+       pcre-jit? ( dev-libs/libpcre:=[jit] )
        ssl? (
                !libressl? ( dev-libs/openssl:0= )
                libressl? ( dev-libs/libressl:= )
@@ -250,21 +250,27 @@ CDEPEND="
        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_image_filter? ( media-libs/gd:=[jpeg,png] )
+       nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
+       nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
        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_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_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_security? (
+               dev-libs/apr:=
+               dev-libs/apr-util:=
+               dev-libs/libxml2:=
+               net-misc/curl
+               www-servers/apache
+       )
        nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )"
 RDEPEND="${CDEPEND}
        selinux? ( sec-policy/selinux-nginx )
@@ -356,6 +362,8 @@ src_configure() {
                fi
                ./configure \
                        --enable-standalone-module \
+                       --disable-mlogc \
+                       --with-ssdeep=no \
                        $(use_enable pcre-jit) \
                        $(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
        fi

diff --git a/www-servers/nginx/nginx-1.10.1-r4.ebuild b/www-servers/nginx/nginx-1.10.1-r4.ebuild
index 4e2865827e5c7663e765872222aa975da2f5d5cd..f5a4f5e78505a3b000fc3ca6b363591c4cecf3da 100644 (file)
--- a/www-servers/nginx/nginx-1.10.1-r4.ebuild
+++ b/www-servers/nginx/nginx-1.10.1-r4.ebuild
@@ -230,8 +230,8 @@ done
 IUSE="${IUSE} nginx_modules_http_spdy"
 
 CDEPEND="
-       pcre? ( >=dev-libs/libpcre-4.2 )
-       pcre-jit? ( >=dev-libs/libpcre-8.20[jit] )
+       pcre? ( dev-libs/libpcre:= )
+       pcre-jit? ( dev-libs/libpcre:=[jit] )
        ssl? (
                !libressl? ( dev-libs/openssl:0= )
                libressl? ( dev-libs/libressl:= )
@@ -250,21 +250,27 @@ CDEPEND="
        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_image_filter? ( media-libs/gd:=[jpeg,png] )
+       nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
+       nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
        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_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_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_security? (
+               dev-libs/apr:=
+               dev-libs/apr-util:=
+               dev-libs/libxml2:=
+               net-misc/curl
+               www-servers/apache
+       )
        nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )"
 RDEPEND="${CDEPEND}
        selinux? ( sec-policy/selinux-nginx )
@@ -356,6 +362,8 @@ src_configure() {
                fi
                ./configure \
                        --enable-standalone-module \
+                       --disable-mlogc \
+                       --with-ssdeep=no \
                        $(use_enable pcre-jit) \
                        $(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
        fi

diff --git a/www-servers/nginx/nginx-1.10.1.ebuild b/www-servers/nginx/nginx-1.10.1.ebuild
index 630624b67c1db104cf9a9d05ac7f1cd259ef3b3d..6365eb4ed01daec8162e45b577fc9e7f8b6d6164 100644 (file)
--- a/www-servers/nginx/nginx-1.10.1.ebuild
+++ b/www-servers/nginx/nginx-1.10.1.ebuild
@@ -231,8 +231,8 @@ done
 IUSE="${IUSE} nginx_modules_http_spdy"
 
 CDEPEND="
-       pcre? ( >=dev-libs/libpcre-4.2 )
-       pcre-jit? ( >=dev-libs/libpcre-8.20[jit] )
+       pcre? ( dev-libs/libpcre:= )
+       pcre-jit? ( dev-libs/libpcre:=[jit] )
        ssl? (
                !libressl? ( dev-libs/openssl:0= )
                libressl? ( dev-libs/libressl:= )
@@ -251,21 +251,27 @@ CDEPEND="
        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_image_filter? ( media-libs/gd:=[jpeg,png] )
+       nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
+       nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
        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_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_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_security? (
+               dev-libs/apr:=
+               dev-libs/apr-util:=
+               dev-libs/libxml2:=
+               net-misc/curl
+               www-servers/apache
+       )
        nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )"
 RDEPEND="${CDEPEND}
        selinux? ( sec-policy/selinux-nginx )
@@ -356,6 +362,8 @@ src_configure() {
                fi
                ./configure \
                        --enable-standalone-module \
+                       --disable-mlogc \
+                       --with-ssdeep=no \
                        $(use_enable pcre-jit) \
                        $(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
        fi

diff --git a/www-servers/nginx/nginx-1.11.4.ebuild b/www-servers/nginx/nginx-1.11.4.ebuild
index a94f39d025087a03322dd2a5d3092847b220651a..228aa6f3f7bfd1532110e272f143f61b9337e573 100644 (file)
--- a/www-servers/nginx/nginx-1.11.4.ebuild
+++ b/www-servers/nginx/nginx-1.11.4.ebuild
@@ -237,8 +237,8 @@ done
 IUSE="${IUSE} nginx_modules_http_spdy"
 
 CDEPEND="
-       pcre? ( >=dev-libs/libpcre-4.2 )
-       pcre-jit? ( >=dev-libs/libpcre-8.20[jit] )
+       pcre? ( dev-libs/libpcre:= )
+       pcre-jit? ( dev-libs/libpcre:=[jit] )
        ssl? (
                !libressl? ( dev-libs/openssl:0= )
                libressl? ( dev-libs/libressl:= )
@@ -257,21 +257,27 @@ CDEPEND="
        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_image_filter? ( media-libs/gd:=[jpeg,png] )
+       nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
+       nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
        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_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_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_security? (
+               dev-libs/apr:=
+               dev-libs/apr-util:=
+               dev-libs/libxml2:=
+               net-misc/curl
+               www-servers/apache
+       )
        nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )"
 RDEPEND="${CDEPEND}
        selinux? ( sec-policy/selinux-nginx )
@@ -369,6 +375,8 @@ src_configure() {
                fi
                ./configure \
                        --enable-standalone-module \
+                       --disable-mlogc \
+                       --with-ssdeep=no \
                        $(use_enable pcre-jit) \
                        $(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
        fi

diff --git a/www-servers/nginx/nginx-1.11.5.ebuild b/www-servers/nginx/nginx-1.11.5.ebuild
index 3f951db62d995d7169d5b11c7a1732ea9a645119..c5ed9be7ace65c0b11e22769630740b46c487d0a 100644 (file)
--- a/www-servers/nginx/nginx-1.11.5.ebuild
+++ b/www-servers/nginx/nginx-1.11.5.ebuild
@@ -237,8 +237,8 @@ done
 IUSE="${IUSE} nginx_modules_http_spdy"
 
 CDEPEND="
-       pcre? ( >=dev-libs/libpcre-4.2 )
-       pcre-jit? ( >=dev-libs/libpcre-8.20[jit] )
+       pcre? ( dev-libs/libpcre:= )
+       pcre-jit? ( dev-libs/libpcre:=[jit] )
        ssl? (
                !libressl? ( dev-libs/openssl:0= )
                libressl? ( dev-libs/libressl:= )
@@ -257,21 +257,27 @@ CDEPEND="
        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_image_filter? ( media-libs/gd:=[jpeg,png] )
+       nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
+       nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
        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_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_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_security? (
+               dev-libs/apr:=
+               dev-libs/apr-util:=
+               dev-libs/libxml2:=
+               net-misc/curl
+               www-servers/apache
+       )
        nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )"
 RDEPEND="${CDEPEND}
        selinux? ( sec-policy/selinux-nginx )
@@ -364,6 +370,8 @@ src_configure() {
                fi
                ./configure \
                        --enable-standalone-module \
+                       --disable-mlogc \
+                       --with-ssdeep=no \
                        $(use_enable pcre-jit) \
                        $(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
        fi