[patch] patch against nginx-0.7.64-r3.ebuild

nginx.ebuild.diff (text/plain), 3.76 KB, created by Chris Beswick on 2010-02-02 12:04:35 UTC

3c3
< # $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.7.64-r3.ebuild,v 1.1 2010/01/03 20:29:40 djc Exp $
---
> # $Header: $
5c5
< inherit eutils ssl-cert toolchain-funcs perl-module
---
> EAPI="2"
7c7
< DESCRIPTION="Robust, small and high performance http and reverse proxy server"
---
> inherit eutils ssl-cert perl-module
8a9
> DESCRIPTION="Robust, small and high performance http and reverse proxy server"
10a12
> 
13,14c15,16
< KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
< IUSE="addition debug fastcgi flv imap pcre perl pop random-index realip smtp ssl static-gzip status sub webdav zlib"
---
> KEYWORDS="~amd64 ~ppc ~x86"
> IUSE="debug ipv6 +pcre perl ssl +zlib"
16,17c18,34
< DEPEND="dev-lang/perl
< 	dev-libs/openssl
---
> MODULES_STD="charset gzip ssi userid access auth_basic autoindex geo map referer rewrite proxy fastcgi memcached limit_zone limit_req empty_gif browser upstream_ip_hash"
> MODULES_OPT="realip addition xslt image_filter geoip sub dav flv gzip_static random_index secure_link stub_status"
> MODULES_MAIL="imap pop3 smtp"
> 
> for module in ${MODULES_STD}; do
> 	IUSE="${IUSE} +nginx_modules_${module}"
> done
> 
> for module in ${MODULES_OPT}; do
> 	IUSE="${IUSE} nginx_modules_${module}"
> done
> 
> for module in ${MODULES_MAIL}; do
> 	IUSE="${IUSE} nginx_modules_${module}"
> done
> 
> DEPEND="ssl? ( dev-libs/openssl )
20a38
> RDEPEND="${DEPEND}"
34c52
< src_compile() {
---
> src_configure() {
37,54d54
< 	# threads support is broken atm.
< 	#
< 	# if use threads; then
< 	# 	einfo
< 	# 	ewarn "threads support is experimental at the moment"
< 	# 	ewarn "do not use it on production systems - you've been warned"
< 	# 	einfo
< 	# 	myconf="${myconf} --with-threads"
< 	# fi
< 
< 	use addition && myconf="${myconf} --with-http_addition_module"
< 	use fastcgi	|| myconf="${myconf} --without-http_fastcgi_module"
< 	use fastcgi	&& myconf="${myconf} --with-http_realip_module"
< 	use flv		&& myconf="${myconf} --with-http_flv_module"
< 	use zlib	|| myconf="${myconf} --without-http_gzip_module"
< 	use pcre	|| {
< 		myconf="${myconf} --without-pcre --without-http_rewrite_module"
< 	}
56c56,58
< 	use ssl		&& myconf="${myconf} --with-http_ssl_module"
---
> 	use ipv6	&& myconf="${myconf} --with-ipv6"
> 	use pcre	|| myconf="${myconf} --without-pcre"
> 	use pcre	&& myconf="${myconf} --with-pcre"
58,63c60,63
< 	use status	&& myconf="${myconf} --with-http_stub_status_module"
< 	use webdav	&& myconf="${myconf} --with-http_dav_module"
< 	use sub		&& myconf="${myconf} --with-http_sub_module"
< 	use realip	&& myconf="${myconf} --with-http_realip_module"
< 	use static-gzip		&& myconf="${myconf} --with-http_gzip_static_module"
< 	use random-index	&& myconf="${myconf} --with-http_random_index_module"
---
> 	use ssl		&& myconf="${myconf} --with-http_ssl_module"
> 
> 	use nginx_modules_gzip && ! use zlib && die "nginx gzip module requires zlib"
> 	use nginx_modules_rewrite && ! use pcre && die "nginx rewrite module requires pcre"
65c65,80
< 	if use smtp || use pop || use imap; then
---
> 	for module in ${MODULES_STD} ; do
> 		use "nginx_modules_${module}" || \
> 			myconf="${myconf} --without-http_${module}_module"
> 	done
> 
> 	for module in ${MODULES_OPT} ; do
> 		use "nginx_modules_${module}" && \
> 			myconf="${myconf} --with-http_${module}_module"
> 	done
> 
> 	for module in ${MODULES_MAIL} ; do
> 		use "nginx_modules_${module}" || \
> 			myconf="${myconf} --without-mail_${module}_module"
> 	done
> 
> 	if use nginx_modules_smtp || use nginx_modules_pop || use nginx_modules_imap; then
69,71d83
< 	use imap || myconf="${myconf} --without-mail_imap_module"
< 	use pop || myconf="${myconf} --without-mail_pop3_module"
< 	use smtp || myconf="${myconf} --without-mail_smtp_module"
73d84
< 	tc-export CC
86,87d96
< 
< 	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "failed to compile"