diff options
| author |   Agostino Sarubbo <ago@gentoo.org> | 2012-01-17 22:32:05 +0000 |
|---|---|---|
| committer | Agostino Sarubbo <ago@gentoo.org> | 2012-01-17 22:32:05 +0000 |
| commit | 20ea9babece04e0e68fca320b3aedf488e92492a (patch) | |
| tree | 04c6b7ebff5fa624477d9d69ec61f1f1724a2cc4 /www-servers | |
| parent | Remove old version (diff) | |
| download | gentoo-2-20ea9babece04e0e68fca320b3aedf488e92492a.tar.gz gentoo-2-20ea9babece04e0e68fca320b3aedf488e92492a.tar.bz2 gentoo-2-20ea9babece04e0e68fca320b3aedf488e92492a.zip | |
Convert src_install to 'emake' and add die where is needed; wrt bug #395941
(Portage version: 2.1.10.41/cvs/Linux x86_64)
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/lighttpd/ChangeLog | 5 | ||||
| -rw-r--r-- | www-servers/lighttpd/lighttpd-1.4.30-r1.ebuild | 20 |
2 files changed, 14 insertions, 11 deletions
diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog index 0bcb0ab4ab17..17050d50c945 100644 --- a/www-servers/lighttpd/ChangeLog +++ b/www-servers/lighttpd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-servers/lighttpd # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.271 2012/01/08 20:45:47 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.272 2012/01/17 22:32:05 ago Exp $ + + 17 Jan 2012; Agostino Sarubbo <ago@gentoo.org> lighttpd-1.4.30-r1.ebuild: + Convert src_install to 'emake' and add die where is needed; wrt bug #395941 08 Jan 2012; Markos Chandras <hwoarang@gentoo.org> files/lighttpd.initd: Check if /var/run/lighttpd exists. Bug #397897 diff --git a/www-servers/lighttpd/lighttpd-1.4.30-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.30-r1.ebuild index 51aba6f247fb..0ff4392e14b5 100644 --- a/www-servers/lighttpd/lighttpd-1.4.30-r1.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.30-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.30-r1.ebuild,v 1.2 2012/01/01 14:58:10 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.30-r1.ebuild,v 1.3 2012/01/17 22:32:05 ago Exp $ EAPI="4" @@ -126,12 +126,12 @@ src_configure() { } src_compile() { - emake || die "emake failed" + emake if use doc ; then einfo "Building HTML documentation" - cd doc - emake html || die "failed to build HTML documentation" + cd doc || die + emake html fi } @@ -144,13 +144,13 @@ src_test() { } src_install() { - make DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install # init script stuff - newinitd "${FILESDIR}"/lighttpd.initd lighttpd || die - newconfd "${FILESDIR}"/lighttpd.confd lighttpd || die + newinitd "${FILESDIR}"/lighttpd.initd lighttpd + newconfd "${FILESDIR}"/lighttpd.confd lighttpd use fam && has_version app-admin/fam && \ - sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd + { sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; } # configs insinto /etc/lighttpd @@ -173,11 +173,11 @@ src_install() { use doc && dohtml -r doc/* docinto txt - dodoc doc/outdated/*.txt || die + dodoc doc/outdated/*.txt # logrotate insinto /etc/logrotate.d - newins "${FILESDIR}"/lighttpd.logrotate lighttpd || die + newins "${FILESDIR}"/lighttpd.logrotate lighttpd keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd |