summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiziano Müller <dev-zero@gentoo.org>2013-05-14 21:47:27 +0000
committerTiziano Müller <dev-zero@gentoo.org>2013-05-14 21:47:27 +0000
commit406324e5a233a8ce24a94d328befe72ae76e60d4 (patch)
tree4521376670af4170a6c4e4762269242b632d6e96 /www-servers/nginx
parentVersion bump (diff)
downloadgentoo-2-406324e5a233a8ce24a94d328befe72ae76e60d4.tar.gz
gentoo-2-406324e5a233a8ce24a94d328befe72ae76e60d4.tar.bz2
gentoo-2-406324e5a233a8ce24a94d328befe72ae76e60d4.zip
Fix pcre dependency for naxsi by using a REQUIRED_USE.
(Portage version: 2.1.11.63/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x1E0CA85F!)
Diffstat (limited to 'www-servers/nginx')
-rw-r--r--www-servers/nginx/ChangeLog5
-rw-r--r--www-servers/nginx/nginx-1.4.1-r4.ebuild5
2 files changed, 7 insertions, 3 deletions
diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 25266ffad863..66390aebf10f 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-servers/nginx
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.359 2013/05/14 21:38:03 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.360 2013/05/14 21:47:27 dev-zero Exp $
+
+ 14 May 2013; Tiziano Müller <dev-zero@gentoo.org> nginx-1.4.1-r4.ebuild:
+ Fix pcre dependency for naxsi by using a REQUIRED_USE.
*nginx-1.4.1-r4 (14 May 2013)
diff --git a/www-servers/nginx/nginx-1.4.1-r4.ebuild b/www-servers/nginx/nginx-1.4.1-r4.ebuild
index 2a4c858caea2..4bb52b44b981 100644
--- a/www-servers/nginx/nginx-1.4.1-r4.ebuild
+++ b/www-servers/nginx/nginx-1.4.1-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.4.1-r4.ebuild,v 1.1 2013/05/14 21:38:03 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.4.1-r4.ebuild,v 1.2 2013/05/14 21:47:27 dev-zero Exp $
EAPI="5"
@@ -183,7 +183,8 @@ DEPEND="${CDEPEND}
PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
REQUIRED_USE="pcre-jit? ( pcre )
- nginx_modules_http_lua? ( nginx_modules_http_rewrite )"
+ nginx_modules_http_lua? ( nginx_modules_http_rewrite )
+ nginx_modules_http_naxsi? ( pcre )"
pkg_setup() {
NGINX_HOME="/var/lib/nginx"