* [gentoo-commits] gentoo-x86 commit in www-servers/lighttpd: ChangeLog lighttpd-1.4.29.ebuild
@ 2011-07-04 14:43 Markos Chandras (hwoarang)
0 siblings, 0 replies; 2+ messages in thread
From: Markos Chandras (hwoarang) @ 2011-07-04 14:43 UTC (permalink / raw
To: gentoo-commits
hwoarang 11/07/04 14:43:13
Modified: ChangeLog
Added: lighttpd-1.4.29.ebuild
Log:
version bump. EAPI4fy
(Portage version: 2.2.0_alpha42/cvs/Linux x86_64)
Revision Changes Path
1.248 www-servers/lighttpd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/lighttpd/ChangeLog?rev=1.248&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/lighttpd/ChangeLog?rev=1.248&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/lighttpd/ChangeLog?r1=1.247&r2=1.248
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- ChangeLog 13 May 2011 14:06:56 -0000 1.247
+++ ChangeLog 4 Jul 2011 14:43:13 -0000 1.248
@@ -1,6 +1,11 @@
# ChangeLog for www-servers/lighttpd
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.247 2011/05/13 14:06:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.248 2011/07/04 14:43:13 hwoarang Exp $
+
+*lighttpd-1.4.29 (04 Jul 2011)
+
+ 04 Jul 2011; Markos Chandras <hwoarang@gentoo.org> +lighttpd-1.4.29.ebuild:
+ version bump. EAPI4fy
13 May 2011; Markos Chandras <hwoarang@gentoo.org> files/lighttpd.initd:
Fix another typo. Bug #367065
1.1 www-servers/lighttpd/lighttpd-1.4.29.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.29.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.29.ebuild?rev=1.1&content-type=text/plain
Index: lighttpd-1.4.29.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.29.ebuild,v 1.1 2011/07/04 14:43:13 hwoarang Exp $
EAPI="4"
inherit base eutils depend.php
DESCRIPTION="Lightweight high-performance web server"
HOMEPAGE="http://www.lighttpd.net/"
SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr zlib"
REQUIRED_USE="kerberos? ( ssl )"
RDEPEND="
bzip2? ( app-arch/bzip2 )
fam? ( virtual/fam )
gdbm? ( sys-libs/gdbm )
ldap? ( >=net-nds/openldap-2.1.26 )
libev? ( >=dev-libs/libev-4.01 )
lua? ( >=dev-lang/lua-5.1 )
memcache? ( dev-libs/libmemcache )
mysql? ( >=virtual/mysql-4.0 )
pcre? ( >=dev-libs/libpcre-3.1 )
php? ( dev-lang/php[cgi] )
rrdtool? ( net-analyzer/rrdtool )
ssl? ( >=dev-libs/openssl-0.9.7[kerberos?] )
webdav? (
dev-libs/libxml2
>=dev-db/sqlite-3
sys-fs/e2fsprogs
)
xattr? ( kernel_linux? ( sys-apps/attr ) )
zlib? ( >=sys-libs/zlib-1.1 )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
doc? ( dev-python/docutils )
test? (
virtual/perl-Test-Harness
dev-libs/fcgi
)"
# update certain parts of lighttpd.conf based on conditionals
update_config() {
local config="/etc/lighttpd/lighttpd.conf"
# enable php/mod_fastcgi settings
use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; }
# enable stat() caching
use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; }
# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; }
}
# remove non-essential stuff (for USE=minimal)
remove_non_essential() {
local libdir="${D}/usr/$(get_libdir)/${PN}"
# text docs
use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
# non-essential modules
rm -f \
${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
# allow users to keep some based on USE flags
use pcre || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
use webdav || rm -f ${libdir}/mod_webdav.*
use mysql || rm -f ${libdir}/mod_mysql_vhost.*
use lua || rm -f ${libdir}/mod_{cml,magnet}.*
use rrdtool || rm -f ${libdir}/mod_rrdtool.*
use zlib || rm -f ${libdir}/mod_compress.*
}
pkg_setup() {
if ! use pcre ; then
ewarn "It is highly recommended that you build ${PN}"
ewarn "with perl regular expressions support via USE=pcre."
ewarn "Otherwise you lose support for some core options such"
ewarn "as conditionals and modules such as mod_re{write,direct}"
ewarn "and mod_ssi."
fi
enewgroup lighttpd
enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
}
src_configure() {
econf --libdir=/usr/$(get_libdir)/${PN} \
--enable-lfs \
$(use_enable ipv6) \
$(use_with bzip2) \
$(use_with fam) \
$(use_with gdbm) \
$(use_with kerberos kerberos5) \
$(use_with ldap) \
$(use_with libev) \
$(use_with lua) \
$(use_with memcache) \
$(use_with mysql) \
$(use_with pcre) \
$(use_with ssl openssl) \
$(use_with webdav webdav-props) \
$(use_with webdav webdav-locks) \
$(use_with xattr attr) \
$(use_with zlib)
}
src_compile() {
emake || die "emake failed"
if use doc ; then
einfo "Building HTML documentation"
cd doc
emake html || die "failed to build HTML documentation"
fi
}
src_test() {
if [[ ${EUID} -eq 0 ]]; then
default_src_test
else
ewarn "test skipped, please re-run as root if you wish to test ${PN}"
fi
}
src_install() {
make DESTDIR="${D}" install || die "make install failed"
# init script stuff
newinitd "${FILESDIR}"/lighttpd.initd lighttpd || die
newconfd "${FILESDIR}"/lighttpd.confd lighttpd || die
use fam && has_version app-admin/fam && \
sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd
# configs
insinto /etc/lighttpd
doins "${FILESDIR}"/conf/lighttpd.conf
doins "${FILESDIR}"/conf/mime-types.conf
doins "${FILESDIR}"/conf/mod_cgi.conf
doins "${FILESDIR}"/conf/mod_fastcgi.conf
# Secure directory for fastcgi sockets
keepdir /var/run/lighttpd/
fperms 0750 /var/run/lighttpd/
fowners lighttpd:lighttpd /var/run/lighttpd/
# update lighttpd.conf directives based on conditionals
update_config
# docs
dodoc AUTHORS README NEWS doc/scripts/*.sh
newdoc doc/config//lighttpd.conf lighttpd.conf.distrib
use doc && dohtml -r doc/*
docinto txt
dodoc doc/outdated/*.txt || die
# logrotate
insinto /etc/logrotate.d
newins "${FILESDIR}"/lighttpd.logrotate lighttpd || die
keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
fperms 0750 /var/l{ib,og}/lighttpd
#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.*
use minimal && remove_non_essential
}
pkg_postinst () {
if use ipv6; then
elog "IPv6 migration guide:"
elog "http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
fi
if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
einfo "spawn-fcgi's init script configuration is now located"
einfo "at /etc/conf.d/spawn-fcgi."
fi
if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
elog "Gentoo has a customized configuration,"
elog "which is now located in /etc/lighttpd. Please migrate your"
elog "existing configuration."
fi
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-servers/lighttpd: ChangeLog lighttpd-1.4.29.ebuild
@ 2011-07-04 14:56 Markos Chandras (hwoarang)
0 siblings, 0 replies; 2+ messages in thread
From: Markos Chandras (hwoarang) @ 2011-07-04 14:56 UTC (permalink / raw
To: gentoo-commits
hwoarang 11/07/04 14:56:19
Modified: ChangeLog lighttpd-1.4.29.ebuild
Log:
Bring back src_prepare function to fix the documentation makefile
(Portage version: 2.2.0_alpha42/cvs/Linux x86_64)
Revision Changes Path
1.249 www-servers/lighttpd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/lighttpd/ChangeLog?rev=1.249&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/lighttpd/ChangeLog?rev=1.249&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/lighttpd/ChangeLog?r1=1.248&r2=1.249
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- ChangeLog 4 Jul 2011 14:43:13 -0000 1.248
+++ ChangeLog 4 Jul 2011 14:56:19 -0000 1.249
@@ -1,6 +1,9 @@
# ChangeLog for www-servers/lighttpd
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.248 2011/07/04 14:43:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.249 2011/07/04 14:56:19 hwoarang Exp $
+
+ 04 Jul 2011; Markos Chandras <hwoarang@gentoo.org> lighttpd-1.4.29.ebuild:
+ Bring back src_prepare function to fix the documentation makefile
*lighttpd-1.4.29 (04 Jul 2011)
1.2 www-servers/lighttpd/lighttpd-1.4.29.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.29.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.29.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.29.ebuild?r1=1.1&r2=1.2
Index: lighttpd-1.4.29.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.29.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lighttpd-1.4.29.ebuild 4 Jul 2011 14:43:13 -0000 1.1
+++ lighttpd-1.4.29.ebuild 4 Jul 2011 14:56:19 -0000 1.2
@@ -1,10 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.29.ebuild,v 1.1 2011/07/04 14:43:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.29.ebuild,v 1.2 2011/07/04 14:56:19 hwoarang Exp $
EAPI="4"
-inherit base eutils depend.php
+inherit base autotools eutils depend.php
DESCRIPTION="Lightweight high-performance web server"
HOMEPAGE="http://www.lighttpd.net/"
@@ -93,6 +93,13 @@
enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
}
+src_prepare() {
+ base_src_prepare
+ #dev-python/docutils installs rst2html.py not rst2html
+ sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
+ die "sed doc/Makefile.am failed"
+ eautoreconf
+}
src_configure() {
econf --libdir=/usr/$(get_libdir)/${PN} \
--enable-lfs \
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-07-04 14:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-04 14:56 [gentoo-commits] gentoo-x86 commit in www-servers/lighttpd: ChangeLog lighttpd-1.4.29.ebuild Markos Chandras (hwoarang)
-- strict thread matches above, loose matches on Subject: below --
2011-07-04 14:43 Markos Chandras (hwoarang)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox