From fc8cf3c3902476ca29caec038474526f37f674c6 Mon Sep 17 00:00:00 2001 From: Benedikt Boehm Date: Thu, 25 Mar 2010 09:16:05 +0000 Subject: [PATCH] fix pcre USE flag Package-Manager: portage-2.2_rc63/cvs/Linux i686 --- www-servers/nginx/ChangeLog | 6 +++++- www-servers/nginx/Manifest | 6 +++--- www-servers/nginx/nginx-0.7.65-r1.ebuild | 6 +++--- www-servers/nginx/nginx-0.8.34-r1.ebuild | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog index 2124a2230644..1d328682b935 100644 --- a/www-servers/nginx/ChangeLog +++ b/www-servers/nginx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/nginx # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.252 2010/03/25 09:13:20 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.253 2010/03/25 09:16:05 hollow Exp $ + + 25 Mar 2010; Benedikt Böhm nginx-0.7.65-r1.ebuild, + nginx-0.8.34-r1.ebuild: + fix pcre USE flag *nginx-0.7.65-r1 (25 Mar 2010) diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest index 5a82a0ceae08..ea47829110d1 100644 --- a/www-servers/nginx/Manifest +++ b/www-servers/nginx/Manifest @@ -5,8 +5,8 @@ AUX passenger-CFLAGS.patch 646 RMD160 12f1e5f80fd2694fed612226561670f9a0f7f556 S DIST nginx-0.7.65.tar.gz 604451 RMD160 c03386b135ec4d72d2997b19ea70b28aeaa7a6da SHA1 f2dcc8e015903ff1277e6fa427f9b7911c4f35ce SHA256 c9f0ccaf5a09b01edf991f3adde8fced9361965838c0982112fa5c92aa2ec33a DIST nginx-0.8.34.tar.gz 621534 RMD160 9472f7d2b7b456d54fdc8e4c8dcb35e6531d4a67 SHA1 bf9a291ee7c20ea6aca4e785af59c8b662ec1d24 SHA256 f7cf3bcd0dcd3473ebff76aeee12974112d035737a2fc7f38b0a190f3a2949f6 DIST passenger-2.2.11.tar.gz 2058085 RMD160 54ee5ab25155adaf4b6be9dc0aee190a323254e5 SHA1 9c38d364f59cb72c14a2f4c22445252468f08c4e SHA256 9d4aa14a4dfe9daa713aa19a787e1a5bee0db9f3625e17ffebe1e5325aa20a88 -EBUILD nginx-0.7.65-r1.ebuild 7199 RMD160 0b040dcce34530b475d81aef5aead1448652baf8 SHA1 ad8af2c66d876d2de667774504392470190d223d SHA256 aaa67d5ce3024ab98cd95e467ac0b05ce2e4cb457334be7174de573354110e38 +EBUILD nginx-0.7.65-r1.ebuild 7221 RMD160 4be8941dabb41ca982e38f0be8400afe37ffebbb SHA1 a83b538da68a8cff4db5fed4c91e215446cfc12f SHA256 9cfe02ab915d5f1dbcd5cd612acb2f411917051e4fbe1c350083ec7bdfb1e674 EBUILD nginx-0.7.65.ebuild 3769 RMD160 623f00383af982d7dc7634a4f2b803084dd14dec SHA1 8c6d67684b42c7260944cb1ae35e8df0c7381fde SHA256 d4fa545438c2ea57a7cc5c843abd20e8f75dbe29e19d4c82382a80f75a2d951f -EBUILD nginx-0.8.34-r1.ebuild 7193 RMD160 99a48f00169e5ced659bf32921427231d9d02279 SHA1 f43197c462b6f90755fb176ddd244da5bb2eea99 SHA256 b2ec860359c3e1a830483bb3cb8f368a891a6c2e5c35d23c323803ae0d14e394 -MISC ChangeLog 41063 RMD160 86c0f9536a376c3c7ef7fc89442dd22b741215b7 SHA1 3e2dfc91582888c76c033f23fdf9184a545a5338 SHA256 13ec9b35ed6ed721cafc3a067fb2b1864133d336a6172a86ea0baec6fd5934d1 +EBUILD nginx-0.8.34-r1.ebuild 7221 RMD160 198ea46bd991572a412ec49d37d3aeed9a8211ff SHA1 cf66fdd1a383bc4bca2eb2a2770702c674f26ddd SHA256 b812e2c70a128726f8755917d458c68dde70b2175fbf56c50073fb4e7712f150 +MISC ChangeLog 41184 RMD160 6dea78eb6a55194ca54e1f4c9bb91694cca97ffb SHA1 8454f7d641977f0dbfe5281920b03b3e8ac912d4 SHA256 48108bccb948f640113e72ea14ae2b83134125ca4fde76451ebcba3ea417e6be MISC metadata.xml 1182 RMD160 a544956d542a448d937cef563bd0fc709e82905b SHA1 093c742b4241b2184eab3ca2f177f95a0dca524b SHA256 948ba589aaaff133ff8f7a60994769e35acb638f5bec2a83c6e4bb580a1be7a1 diff --git a/www-servers/nginx/nginx-0.7.65-r1.ebuild b/www-servers/nginx/nginx-0.7.65-r1.ebuild index b8ae8e843573..8e903ef7ea9b 100644 --- a/www-servers/nginx/nginx-0.7.65-r1.ebuild +++ b/www-servers/nginx/nginx-0.7.65-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.7.65-r1.ebuild,v 1.1 2010/03/25 09:13:20 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.7.65-r1.ebuild,v 1.2 2010/03/25 09:16:05 hollow Exp $ EAPI="2" @@ -27,7 +27,7 @@ perl random_index realip secure_link stub_status sub xslt" NGINX_MODULES_MAIL="imap pop3 smtp" NGINX_MODULES_3RD="http_passenger" -IUSE="aio debug +http +http-cache ipv6 libatomic +pcre ssl" +IUSE="aio debug +http +http-cache ipv6 libatomic ssl" for mod in $NGINX_MODULES_STD; do IUSE="${IUSE} +nginx_modules_http_${mod}" @@ -121,6 +121,7 @@ src_configure() { use debug && myconf="${myconf} --with-debug" use ipv6 && myconf="${myconf} --with-ipv6" use libatomic && myconf="${myconf} --with-libatomic" + use pcre && myconf="${myconf} --with-pcre" # HTTP modules for mod in $NGINX_MODULES_STD; do @@ -195,7 +196,6 @@ src_configure() { --http-client-body-temp-path=/var/tmp/${PN}/client \ --http-proxy-temp-path=/var/tmp/${PN}/proxy \ --http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \ - --with-pcre \ ${myconf} || die "configure failed" } diff --git a/www-servers/nginx/nginx-0.8.34-r1.ebuild b/www-servers/nginx/nginx-0.8.34-r1.ebuild index b54f97d23508..43f32da2ea62 100644 --- a/www-servers/nginx/nginx-0.8.34-r1.ebuild +++ b/www-servers/nginx/nginx-0.8.34-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.34-r1.ebuild,v 1.3 2010/03/25 09:13:20 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.34-r1.ebuild,v 1.4 2010/03/25 09:16:05 hollow Exp $ EAPI="2" @@ -121,6 +121,7 @@ src_configure() { use debug && myconf="${myconf} --with-debug" use ipv6 && myconf="${myconf} --with-ipv6" use libatomic && myconf="${myconf} --with-libatomic" + use pcre && myconf="${myconf} --with-pcre" # HTTP modules for mod in $NGINX_MODULES_STD; do @@ -195,7 +196,6 @@ src_configure() { --http-client-body-temp-path=/var/tmp/${PN}/client \ --http-proxy-temp-path=/var/tmp/${PN}/proxy \ --http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \ - --with-pcre \ ${myconf} || die "configure failed" } -- 2.26.2