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

Collapse All | Expand All

(-)/usr/portage/www-servers/nginx/nginx-1.11.5-r1.ebuild (-4 / +24 lines)
Lines 138-146 Link Here
138
HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
138
HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
139
HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
139
HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
140
140
141
# ngx-set-misc (https://github.com/openresty/set-misc-nginx-module, BSD license)
142
HTTP_SET_MISC_MODULE_PV="0.31"
143
HTTP_SET_MISC_MODULE_P="ngx_set_misc-${HTTP_SET_MISC_MODULE_PV}"
144
HTTP_SET_MISC_MODULE_URI="https://github.com/openresty/set-misc-nginx-module/archive/v${HTTP_SET_MISC_MODULE_PV}.tar.gz"
145
HTTP_SET_MISC_MODULE_WD="${WORKDIR}/set-misc-nginx-module-${HTTP_SET_MISC_MODULE_PV}"
146
141
# We handle deps below ourselves
147
# We handle deps below ourselves
142
SSL_DEPS_SKIP=1
148
SSL_DEPS_SKIP=1
143
AUTOTOOLS_AUTO_DEPEND="no"
144
149
145
inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib
150
inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib
146
151
Lines 166-172 Link Here
166
	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
171
	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
167
	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
172
	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
168
	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
173
	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
169
	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )"
174
	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
175
	nginx_modules_http_set_misc? ( ${HTTP_SET_MISC_MODULE_URI} -> ${HTTP_SET_MISC_MODULE_P}.tar.gz )"
170
176
171
LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
177
LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
172
	nginx_modules_http_security? ( Apache-2.0 )
178
	nginx_modules_http_security? ( Apache-2.0 )
Lines 204-210 Link Here
204
	http_sticky
210
	http_sticky
205
	http_mogilefs
211
	http_mogilefs
206
	http_memc
212
	http_memc
207
	http_auth_ldap"
213
	http_auth_ldap
214
	http_set_misc"
208
215
209
IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre
216
IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre
210
	pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
217
	pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
Lines 454-459 Link Here
454
		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
461
		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
455
	fi
462
	fi
456
463
464
	if use nginx_modules_http_lua || use nginx_modules_http_set_misc; then
465
		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
466
	fi
467
457
	if use nginx_modules_http_lua; then
468
	if use nginx_modules_http_lua; then
458
		http_enabled=1
469
		http_enabled=1
459
		if use luajit; then
470
		if use luajit; then
Lines 463-472 Link Here
463
			export LUA_LIB=$(pkg-config --variable libdir lua)
474
			export LUA_LIB=$(pkg-config --variable libdir lua)
464
			export LUA_INC=$(pkg-config --variable includedir lua)
475
			export LUA_INC=$(pkg-config --variable includedir lua)
465
		fi
476
		fi
466
		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
467
		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
477
		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
468
	fi
478
	fi
469
479
480
	if use nginx_modules_http_set_misc ; then
481
		http_enabled=1
482
		myconf+=( --add-module=${HTTP_SET_MISC_MODULE_WD} )
483
	fi
484
470
	if use nginx_modules_http_auth_pam; then
485
	if use nginx_modules_http_auth_pam; then
471
		http_enabled=1
486
		http_enabled=1
472
		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
487
		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
Lines 692-697 Link Here
692
		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
707
		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
693
	fi
708
	fi
694
709
710
	if use nginx_modules_http_set_misc; then
711
		docinto ${HTTP_SET_MISC_MODULE_P}
712
		dodoc "${HTTP_SET_MISC_MODULE_WD}"/README.markdown
713
	fi
714
695
	if use nginx_modules_http_auth_pam; then
715
	if use nginx_modules_http_auth_pam; then
696
		docinto ${HTTP_AUTH_PAM_MODULE_P}
716
		docinto ${HTTP_AUTH_PAM_MODULE_P}
697
		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
717
		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}

Return to bug 598088