version bump. EAPI4fy

Package-Manager: portage-2.2.0_alpha42/cvs/Linux x86_64

3 files changed, 219 insertions, 15 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 8148b250007b..017d6dd01326 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -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
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index a1429e96d239..726fe26498a3 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -20,6 +20,7 @@ DIST lighttpd-1.4.23.tar.bz2 641621 RMD160 3034f56156ee56dbfe5d632f92d9a7e420284
 DIST lighttpd-1.4.25.tar.bz2 628267 RMD160 f0f7dd0ff3c92a6185be2e6017fd5ea74734c769 SHA1 bc4592930292ae8d0990a94a584f49fe8f52445b SHA256 7e803089f18b179097cb33b64b37d8a3b537ce9c196c88e3fb09881b471c88ce
 DIST lighttpd-1.4.26.tar.bz2 627971 RMD160 2d294083fbcd4040dc8efec06090cf1c1bf66bbf SHA1 f9710da0152792d83c223a1248345a2d145d6f32 SHA256 d7c25a5bb08c8dbc3e8d86f9e564c90ebf0c365d7fcf5ee801e912fb3c2357fd
 DIST lighttpd-1.4.28.tar.bz2 641702 RMD160 5af6c848dd251c9d15f5185f54411744ae41c67b SHA1 42915dffe2af4f870cc1cdc0218edb60a0a315c2 SHA256 7e55747a4feb74545d80a1f2d85b5866b8600705eac946e4402e3364b0666ed2
+DIST lighttpd-1.4.29.tar.bz2 659974 RMD160 d4369e8970001d2ebe4e49767053c341c4bd2f27 SHA1 fe8ee6dc5f5302bffef905fcdf0b35f255e59b32 SHA256 afd8af213e65afb48b397d004696c6620a7ae7f3d4f162ec46a04b9b9dbfd599
 EBUILD lighttpd-1.4.23.ebuild 5785 RMD160 9329db0ea573b13e5764c6a173b5af3f53bb5d0b SHA1 674020a06fa14101d24faf13ebe034ef7a852358 SHA256 5ab87c04a35cb8a00460150402ddd82586e7f0e3eea8381dd0738ee69d73f459
 EBUILD lighttpd-1.4.25-r1.ebuild 5876 RMD160 5634e49a7eef011d5ae68a9c804df24e36b3f442 SHA1 e1fec940f7ad0d6dab262a91fdb82d726eb2ce5d SHA256 ec001e91cd40d3793d34d8d6aabc411d0f6bddbd34b8335efdde09258d4b33c1
 EBUILD lighttpd-1.4.25.ebuild 5829 RMD160 365b1ea4415d2667fcef3a7af08fec29edcf596f SHA1 002a05ab99b4f3c15c8da95fa764fbfb8d84757c SHA256 cc5b0e4170cf4ef91b8043504c4b28e677c5d0d92039cbbe897c00d1a61bcce5
@@ -28,22 +29,23 @@ EBUILD lighttpd-1.4.26.ebuild 5770 RMD160 163db40627952a781db876216682589e7e4937
 EBUILD lighttpd-1.4.28-r1.ebuild 5739 RMD160 39f13a4f941e4f54f2ce1e15972c7df3327af6f0 SHA1 61b83b7f7f38a7868f552ab8c48905ffdc9dc022 SHA256 9a905d74a2367e00c00708efb099755a9614c6e6b5896726f05f9e405195e50f
 EBUILD lighttpd-1.4.28-r2.ebuild 5739 RMD160 8710965e748aea55c9bc837d78215300d647e912 SHA1 467b297fa64abcbfc573f8c01c1486235b581719 SHA256 6b5daa005e901165d47f4a558d55c2dd0bdd858f1a672b9023941be9ec62b7e1
 EBUILD lighttpd-1.4.28.ebuild 5676 RMD160 551c7b19158096b60f350f8db80ac6e61312af42 SHA1 005e0a5ed111b6cda8eb22c9cff9280e4542d3eb SHA256 8fb37b0afc97e260ffda15acc288f8e75418b84cfab9de0a9d62fc1a91f83bac
-MISC ChangeLog 53379 RMD160 2cba145313deb11348cd1bf14c5dc7843eba645b SHA1 06f58cea46238df098c2df5c0d34f1f21043c43a SHA256 615a835e241522dd754e0c950496c1cd22fe345f41c1ca5b81aed0a29ca713eb
+EBUILD lighttpd-1.4.29.ebuild 5706 RMD160 3d204f0d572ec780c455035216f3bd1ae621fcc1 SHA1 1da265239874a943888487a80ff0d62336ec4469 SHA256 2d52c536785934d95558b4a38aac4241141727c5b2ceedf04fe87e22f9a96761
+MISC ChangeLog 53514 RMD160 f12d44991e5470bc46ce6fab9636143fc721788e SHA1 a3f78618defa6e760dbbfd55b69d4498615e5fda SHA256 5cbb38192113a5d54be3109dc04953ec0b4850cb46885fbbff3a491a1f36a0f5
 MISC metadata.xml 1104 RMD160 445c36561695b89266cb1bb0b052167473e1568d SHA1 821390063f6a1d798fc036b14af8cb56c8e62492 SHA256 7b633eaadf23540735206a1ce6af010b7757affb753fc496c7b15de8c9cf78c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNzTsFAAoJEPqDWhW0r/LCp9MQAJP0zR5/o1QAI4Mi2MLCu9Is
-bv2QtGD5+/Rv4snqBQeifrBi+vVa3n2BqFjHs2IQKPKPg1gSYFhS8mlRGjBXzFGw
-plv1nahkWGe6cY9X9gwnlLxD6tygGhhIXKlGyRnWPOCDquCsJhtIyku38dZO7VPY
-HjMrGlq4umY4srx9tXrib2fJt7PDK3ZlMN6xJ4NdWKyOu/AEpQ2RZ9CpM5r/kxFW
-yGTrYUhuW+J4ji1qxuiRcGAdjLePzEFVStYGrEFK7we/N6E84rVfJh6AkhOL4dKV
-BJj9EOasC2oNMjNKHQifdS5mWiwQBXPHWXsY9j9WFbYbWzwgAXV/vfml78s78T6+
-ceClSsHUkzTLlvhQ1eSSHPRrSJQLP7lTYkdUOyTF2SGCml6gN8Gg3gRS0GqbF9yj
-YKCuk48YgijVrOByXadB4SFtKoVhWM2RFTVUNwC15ZeTojNSl5rkaoaYzixOc5tM
-R3rqUfU7KKAixs3IHmt3nT8rBk3SW4wJ4jB7PBJ3GRv4NafjGqfonDvweW4bx/2a
-BNcAnk1PPo1kjsDXp4DX1OXjQFkiYV0asKJ6EEKYuugZNLj8jM3a7mFUyg3jG1t7
-fsgmP8c+e7e3AivXOHEM1CE14JKd7sQWzVJfs78d+87+budmWdPbBVi5SRSHou41
-WUW09mNO79uNbWN+ijMr
-=FTZD
+iQIcBAEBCgAGBQJOEdF/AAoJEPqDWhW0r/LC87sP/12qOPdBXScOgdYbmISGaboY
+3jQeKIWTjkhR2dd+/h+S8drVRfQhSyq5DxG1xeCW6+f/AehYQJ1tky6HdRKXP3RX
++y6VFOUwma3e8r+6rKopbav8j1ksCGDn3k/vB9rxymTGwjPc2lYO0N+mKKTEyYE1
+B3wkPaSHAATJR+Y5kkAGpzqsYbOOiYC0tYl44BdX8nabg28oNvtTqiYGbEDWgXm4
+RG/Zi6JrtTE3fKcuyhzGYvxJd83eXxqKp/rIKns87eFScxNgHSiX4A6PeoNcjiCH
+3E57Cc15H8Z/U6s4zs/sfvYwpZ9SLw1UTm/4sraAMgKAzT8yBwPExV/X/NLO+gmL
+q1FeihMnzNP8u1qNWDoflSofTAP3g15tLl7NPO5G8YjTxrEOPLRT7ZMSkqB408sy
+pWS10fH7n/ffOhCLPE/30Mkm9X9tca7am1s0lcIhK7WbjH/1FoXh0qTOD3LMnF1Z
+UdHfHRvtrW+MmZOZfcEP+ogucngZB89aueG36vy4OsaUfjAms7iI5tp8rbbXLElo
+IAfQH0/38PL5VvourWCOiZmBVi2IY2Om44nwwUXLbLhgfEb/Tc978n+aNpsGYn1i
+13n676dLZO2odnrtuJltcORcqVtt5md7E3kswGUMrVP23oBuglYRPzO0tTCNMjJM
+7x+Cm9TxseYU1D/QVQom
+=HWs6
 -----END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/lighttpd-1.4.29.ebuild b/www-servers/lighttpd/lighttpd-1.4.29.ebuild
new file mode 100644
index 000000000000..6fab0bb8b31f
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.4.29.ebuild
@@ -0,0 +1,197 @@
+# 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
+}