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

Collapse All | Expand All

(-)lighttpd-1.4.26-r1.ebuild (-29 / +25 lines)
Lines 12-19 Link Here
12
12
13
LICENSE="BSD"
13
LICENSE="BSD"
14
SLOT="0"
14
SLOT="0"
15
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
15
KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
16
IUSE="bzip2 doc fam fastcgi gdbm ipv6 ldap lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr"
16
IUSE="bzip2 doc fam fastcgi gdbm ipv6 ldap libev lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr"
17
17
18
RDEPEND="
18
RDEPEND="
19
	>=sys-libs/zlib-1.1
19
	>=sys-libs/zlib-1.1
Lines 21-31 Link Here
21
	fam?      ( virtual/fam )
21
	fam?      ( virtual/fam )
22
	gdbm?     ( sys-libs/gdbm )
22
	gdbm?     ( sys-libs/gdbm )
23
	ldap?     ( >=net-nds/openldap-2.1.26 )
23
	ldap?     ( >=net-nds/openldap-2.1.26 )
24
	libev?    ( dev-libs/libev )
24
	lua?      ( >=dev-lang/lua-5.1 )
25
	lua?      ( >=dev-lang/lua-5.1 )
25
	memcache? ( dev-libs/libmemcache )
26
	memcache? ( dev-libs/libmemcache )
26
	mysql?    ( >=virtual/mysql-4.0 )
27
	mysql?    ( >=virtual/mysql-4.0 )
27
	pcre?     ( >=dev-libs/libpcre-3.1 )
28
	pcre?     ( >=dev-libs/libpcre-3.1 )
28
	php?      ( virtual/httpd-php )
29
	php?      ( dev-lang/php[cgi] )
29
	rrdtool?  ( net-analyzer/rrdtool )
30
	rrdtool?  ( net-analyzer/rrdtool )
30
	ssl?    ( >=dev-libs/openssl-0.9.7 )
31
	ssl?    ( >=dev-libs/openssl-0.9.7 )
31
	webdav? (
32
	webdav? (
Lines 54-59 Link Here
54
	# enable stat() caching
55
	# enable stat() caching
55
	use fam && \
56
	use fam && \
56
		dosed 's|#\(.*stat-cache.*$\)|\1|' ${config}
57
		dosed 's|#\(.*stat-cache.*$\)|\1|' ${config}
58
	
59
	# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
60
	use ipv6 && \
61
		dosed 's|# server.use-ipv6|server.use-ipv6|' ${config}
57
}
62
}
58
63
59
# remove non-essential stuff (for USE=minimal)
64
# remove non-essential stuff (for USE=minimal)
Lines 86-108 Link Here
86
		ewarn "Otherwise you lose support for some core options such"
91
		ewarn "Otherwise you lose support for some core options such"
87
		ewarn "as conditionals and modules such as mod_re{write,direct}"
92
		ewarn "as conditionals and modules such as mod_re{write,direct}"
88
		ewarn "and mod_ssi."
93
		ewarn "and mod_ssi."
89
		ebeep 5
90
	fi
94
	fi
91
95
92
	use php && require_php_with_use cgi
93
94
	enewgroup lighttpd
96
	enewgroup lighttpd
95
	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
97
	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
96
}
98
}
97
99
98
src_prepare() {
100
#src_prepare() {
99
	# dev-python/docutils installs rst2html.py not rst2html
101
	# dev-python/docutils installs rst2html.py not rst2html
100
	sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.am || \
102
	#sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.am || \
101
		die "sed doc/Makefile.am failed"
103
	#	die "sed doc/Makefile.am failed"
102
104
103
	epatch "${FILESDIR}/1.4.26-fix-ssl-return-check-r2716.patch"
105
	#epatch "${FILESDIR}/1.4.26-fix-ssl-return-check-r2716.patch"
104
	eautoreconf
106
	#eautoreconf
105
}
107
#}
106
108
107
src_configure() {
109
src_configure() {
108
	econf --libdir=/usr/$(get_libdir)/${PN} \
110
	econf --libdir=/usr/$(get_libdir)/${PN} \
Lines 111-118 Link Here
111
		$(use_with bzip2) \
113
		$(use_with bzip2) \
112
		$(use_with fam) \
114
		$(use_with fam) \
113
		$(use_with gdbm) \
115
		$(use_with gdbm) \
114
		$(use_with lua) \
115
		$(use_with ldap) \
116
		$(use_with ldap) \
117
		$(use_with libev) \
118
		$(use_with lua) \
116
		$(use_with memcache) \
119
		$(use_with memcache) \
117
		$(use_with mysql) \
120
		$(use_with mysql) \
118
		$(use_with pcre) \
121
		$(use_with pcre) \
Lines 164-171 Link Here
164
	update_config
167
	update_config
165
168
166
	# docs
169
	# docs
167
	dodoc AUTHORS README NEWS doc/*.sh
170
	dodoc AUTHORS README NEWS doc/scripts/*.sh
168
	newdoc doc/lighttpd.conf lighttpd.conf.distrib
171
	newdoc doc/config//lighttpd.conf lighttpd.conf.distrib
169
172
170
	use doc && dohtml -r doc/*
173
	use doc && dohtml -r doc/*
171
174
Lines 187-212 Link Here
187
}
190
}
188
191
189
pkg_postinst () {
192
pkg_postinst () {
190
	echo
193
	if use ipv6; then
194
		elog "IPv6 migration guide:"
195
		elog "http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
196
	fi
191
	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
197
	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
192
		einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
198
		einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
193
		einfo "spawn-fcgi's init script configuration is now located"
199
		einfo "spawn-fcgi's init script configuration is now located"
194
		einfo "at /etc/conf.d/spawn-fcgi."
200
		einfo "at /etc/conf.d/spawn-fcgi."
195
		echo
196
	fi
201
	fi
197
202
198
	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
203
	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
199
		ewarn "Gentoo has a customized configuration,"
204
		elog "Gentoo has a customized configuration,"
200
		ewarn "which is now located in /etc/lighttpd.  Please migrate your"
205
		elog "which is now located in /etc/lighttpd.  Please migrate your"
201
		ewarn "existing configuration."
206
		elog "existing configuration."
202
		ebeep 5
203
	fi
204
205
	if use fastcgi; then
206
		ewarn "As of lighttpd-1.4.22, spawn-fcgi is provided by the separate"
207
		ewarn "www-servers/spawn-fcgi package. Please install it manually, if"
208
		ewarn "you use spawn-fcgi."
209
		ewarn "It features a new, more featurefull init script - please migrate"
210
		ewarn "your configuration!"
211
	fi
207
	fi
212
}
208
}

Return to bug 338753