Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 323151 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/www-servers/nginx/nginx-0.8.38-r1.ebuild (-21 / +8 lines)
Lines 30-62 Link Here
30
# http_push (http://pushmodule.slact.net/, MIT license)
30
# http_push (http://pushmodule.slact.net/, MIT license)
31
HTTP_PUSH_MODULE_P="nginx_http_push_module-0.692"
31
HTTP_PUSH_MODULE_P="nginx_http_push_module-0.692"
32
32
33
# http_uwsgi (http://projects.unbit.it/uwsgi/, GPL-2 license)
34
HTTP_UWSGI_MODULE_PV="0.9.5.1"
35
36
inherit eutils ssl-cert toolchain-funcs perl-module ruby-ng flag-o-matic
33
inherit eutils ssl-cert toolchain-funcs perl-module ruby-ng flag-o-matic
37
34
38
DESCRIPTION="Robust, small and high performance http and reverse proxy server"
35
DESCRIPTION="Robust, small and high performance http and reverse proxy server"
39
HOMEPAGE="http://nginx.net/
36
HOMEPAGE="http://nginx.net/
40
	http://www.modrails.com/
37
	http://www.modrails.com/
41
	http://pushmodule.slact.net/
38
	http://pushmodule.slact.net/"
42
	http://projects.unbit.it/uwsgi/"
43
SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz
39
SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz
44
	nginx_modules_http_headers_more? ( http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
40
	nginx_modules_http_headers_more? ( http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
45
	nginx_modules_http_passenger? ( mirror://rubyforge/passenger/passenger-${PASSENGER_PV}.tar.gz )
41
	nginx_modules_http_passenger? ( mirror://rubyforge/passenger/passenger-${PASSENGER_PV}.tar.gz )
46
	nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz )
42
	nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz )"
47
	nginx_modules_http_uwsgi? ( http://projects.unbit.it/downloads/uwsgi-${HTTP_UWSGI_MODULE_PV}.tar.gz )"
48
43
49
LICENSE="BSD BSD-2 GPL-2 MIT"
44
LICENSE="BSD BSD-2 GPL-2 MIT"
50
SLOT="0"
45
SLOT="0"
51
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
46
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
52
47
53
NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
48
NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
54
geo gzip limit_req limit_zone map memcached proxy referer rewrite ssi
49
geo gzip limit_req limit_zone map memcached proxy referer rewrite scgi ssi
55
split_clients upstream_ip_hash userid"
50
split_clients upstream_ip_hash userid uwsgi"
56
NGINX_MODULES_OPT="addition dav degradation flv geoip gzip_static image_filter
51
NGINX_MODULES_OPT="addition dav degradation flv geoip gzip_static image_filter
57
perl random_index realip secure_link stub_status sub xslt"
52
perl random_index realip secure_link stub_status sub xslt"
58
NGINX_MODULES_MAIL="imap pop3 smtp"
53
NGINX_MODULES_MAIL="imap pop3 smtp"
59
NGINX_MODULES_3RD="http_headers_more http_passenger http_push http_uwsgi"
54
NGINX_MODULES_3RD="http_headers_more http_passenger http_push"
60
55
61
IUSE="aio debug +http +http-cache ipv6 libatomic +pcre ssl vim-syntax"
56
IUSE="aio debug +http +http-cache ipv6 libatomic +pcre ssl vim-syntax"
62
57
Lines 196-206 Link Here
196
		myconf="${myconf} --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
191
		myconf="${myconf} --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
197
	fi
192
	fi
198
193
199
	if use nginx_modules_http_uwsgi; then
200
		http_enabled=1
201
		myconf="${myconf} --add-module=${WORKDIR}/uwsgi-${HTTP_UWSGI_MODULE_PV}/nginx"
202
	fi
203
204
	if use http || use http-cache; then
194
	if use http || use http-cache; then
205
		http_enabled=1
195
		http_enabled=1
206
	fi
196
	fi
Lines 249-254 Link Here
249
		--http-client-body-temp-path=/var/tmp/${PN}/client \
239
		--http-client-body-temp-path=/var/tmp/${PN}/client \
250
		--http-proxy-temp-path=/var/tmp/${PN}/proxy \
240
		--http-proxy-temp-path=/var/tmp/${PN}/proxy \
251
		--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
241
		--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
242
        --http-scgi-temp-path=/var/tmp/${PN}/scgi \
243
        --http-uwsgi-temp-path=/var/tmp/${PN}/uwsgi \
252
		${myconf} || die "configure failed"
244
		${myconf} || die "configure failed"
253
}
245
}
254
246
Lines 259-265 Link Here
259
}
251
}
260
252
261
src_install() {
253
src_install() {
262
	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
254
	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi,uwsgi,scgi}
263
255
264
	dosbin objs/nginx
256
	dosbin objs/nginx
265
	newinitd "${FILESDIR}"/nginx.init-r2 nginx
257
	newinitd "${FILESDIR}"/nginx.init-r2 nginx
Lines 288-298 Link Here
288
		dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README}
280
		dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README}
289
	fi
281
	fi
290
282
291
	if use nginx_modules_http_uwsgi; then
292
		insinto /etc/nginx
293
		doins "${WORKDIR}"/uwsgi-${HTTP_UWSGI_MODULE_PV}/nginx/uwsgi_params
294
	fi
295
296
	if use nginx_modules_http_passenger; then
283
	if use nginx_modules_http_passenger; then
297
		# passengers Rakefile is so horribly broken that we have to do it
284
		# passengers Rakefile is so horribly broken that we have to do it
298
		# manually
285
		# manually

Return to bug 323151