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

Collapse All | Expand All

(-)nginx-1.15.8-r1.ebuild.orig (+25 lines)
Lines 161-166 Link Here
161
NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
161
NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
162
NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
162
NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
163
163
164
# ngx_pagespeed (https://github.com/apache/incubator-pagespeed-ngx, Apache 2 license)
165
NGX_PAGESPEED_MODULE_PV="1.13.35.2-stable"
166
NGX_PAGESPEED_MODULE_P="incubator-pagespeed-ngx"
167
NGX_PAGESPEED_MODULE_URI="https://github.com/apache/incubator-pagespeed-ngx/archive/v${NGX_PAGESPEED_MODULE_PV}.tar.gz"
168
NGX_PAGESPEED_MODULE_WD=${WORKDIR}/${NGX_PAGESPEED_MODULE_P}-${NGX_PAGESPEED_MODULE_PV}
169
# psol required for pagespeed
170
NGX_PAGESPEED_PSOL_P="ngx_pagespeed_psol"
171
NGX_PAGESPEED_PSOL_PV="${NGX_PAGESPEED_MODULE_PV}"
172
NGX_PAGESPEED_PSOL_PV="${NGX_PAGESPEED_PSOL_PV/-stable/}"
173
NGX_PAGESPEED_PSOL_PV="${NGX_PAGESPEED_PSOL_PV/-beta/}"
174
NGX_PAGESPEED_PSOL_PV="${NGX_PAGESPEED_PSOL_PV}-__ARCH__"
175
NGX_PAGESPEED_PSOL_URI="https://dl.google.com/dl/page-speed/psol/${NGX_PAGESPEED_PSOL_PV}.tar.gz"
176
NGX_PAGESPEED_PSOL_WD=${WORKDIR}/${NGX_PAGESPEED_MODULE_P}-${NGX_PAGESPEED_MODULE_PV}
177
164
# We handle deps below ourselves
178
# We handle deps below ourselves
165
SSL_DEPS_SKIP=1
179
SSL_DEPS_SKIP=1
166
AUTOTOOLS_AUTO_DEPEND="no"
180
AUTOTOOLS_AUTO_DEPEND="no"
Lines 192-197 Link Here
192
	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
206
	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
193
	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
207
	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
194
	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
208
	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
209
	nginx_modules_http_ngx_pagespeed? (
210
		${NGX_PAGESPEED_MODULE_URI} -> ${NGX_PAGESPEED_MODULE_P}-${NGX_PAGESPEED_MODULE_PV}.tar.gz
211
		x86? ( ${NGX_PAGESPEED_PSOL_URI/__ARCH__/ia32} -> ${NGX_PAGESPEED_PSOL_P}-${NGX_PAGESPEED_PSOL_PV/-__ARCH__/}.x86.tar.gz )
212
		amd64? ( ${NGX_PAGESPEED_PSOL_URI/__ARCH__/x64} -> ${NGX_PAGESPEED_PSOL_P}-${NGX_PAGESPEED_PSOL_PV/-__ARCH__/}.amd64.tar.gz )
213
		)
195
	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
214
	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
196
	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
215
	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
197
	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
216
	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
Lines 242-247 Link Here
242
	http_upload_progress
261
	http_upload_progress
243
	http_upstream_check
262
	http_upstream_check
244
	http_vhost_traffic_status
263
	http_vhost_traffic_status
264
	http_ngx_pagespeed
245
	stream_geoip2
265
	stream_geoip2
246
	stream_javascript
266
	stream_javascript
247
"
267
"
Lines 607-612 Link Here
607
		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
627
		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
608
	fi
628
	fi
609
629
630
	if use nginx_modules_http_ngx_pagespeed; then
631
		mv ${WORKDIR}/psol ${NGX_PAGESPEED_MODULE_WD}/
632
		myconf+=( --add-module=${NGX_PAGESPEED_MODULE_WD} )
633
	fi
634
610
	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
635
	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
611
		http_enabled=1
636
		http_enabled=1
612
	fi
637
	fi

Return to bug 471106