diff options
| author |   Matthew Thode <prometheanfire@gentoo.org> | 2013-12-23 02:52:36 +0000 |
|---|---|---|
| committer | Matthew Thode <prometheanfire@gentoo.org> | 2013-12-23 02:52:36 +0000 |
| commit | 556b5b8163f87e00c622b820c6dea889047e0649 (patch) | |
| tree | b162c6981c9d764738b42a14cb8b2b25945123c7 /net-analyzer | |
| parent | Clean up one more patch. (diff) | |
| download | gentoo-2-556b5b8163f87e00c622b820c6dea889047e0649.tar.gz gentoo-2-556b5b8163f87e00c622b820c6dea889047e0649.tar.bz2 gentoo-2-556b5b8163f87e00c622b820c6dea889047e0649.zip | |
trying to fix bug 493902
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/icinga-web/ChangeLog | 6 | ||||
| -rw-r--r-- | net-analyzer/icinga-web/icinga-web-1.10.0.ebuild | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/net-analyzer/icinga-web/ChangeLog b/net-analyzer/icinga-web/ChangeLog index c0c3b6c9ea90..7f21a071e6d6 100644 --- a/net-analyzer/icinga-web/ChangeLog +++ b/net-analyzer/icinga-web/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/icinga-web # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-web/ChangeLog,v 1.16 2013/12/23 00:14:53 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-web/ChangeLog,v 1.17 2013/12/23 02:52:36 prometheanfire Exp $ + + 23 Dec 2013; Matthew Thode <prometheanfire@gentoo.org> + icinga-web-1.10.0.ebuild: + trying to fix bug 493902 23 Dec 2013; Matthew Thode <prometheanfire@gentoo.org> icinga-web-1.10.0.ebuild: diff --git a/net-analyzer/icinga-web/icinga-web-1.10.0.ebuild b/net-analyzer/icinga-web/icinga-web-1.10.0.ebuild index d3061d5384b5..85766918aebe 100644 --- a/net-analyzer/icinga-web/icinga-web-1.10.0.ebuild +++ b/net-analyzer/icinga-web/icinga-web-1.10.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-web/icinga-web-1.10.0.ebuild,v 1.2 2013/12/23 00:14:53 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-web/icinga-web-1.10.0.ebuild,v 1.3 2013/12/23 02:52:36 prometheanfire Exp $ EAPI="5" @@ -80,7 +80,7 @@ src_install() { dodoc README rm -f README - emake -j1 DESTDIR="${D}" install + emake -j5 DESTDIR="${D}" install emake DESTDIR="${D}" install-javascript @@ -88,7 +88,8 @@ src_install() { dodir ${APACHE_MODULES_CONFDIR} emake DESTDIR="${D}" install-apache-config echo '<IfDefine ICINGA_WEB>' > "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf" - cat "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf" + cat "${WORKDIR}/${P}/etc/apache2/icinga-web.conf" >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf" + rm "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" || die "rm failed" echo '</IfDefine>' >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf" fi @@ -191,7 +192,7 @@ pkg_postinst() { if use apache2 ; then einfo einfo "apache config was installed into" - einfo "/etc/apache2/modules.d//99_icinga-web.conf" + einfo "/etc/apache2/modules.d/99_icinga-web.conf" einfo einfo "The apache config value for \'ServerTokens\' must be set to at" einfo "least \'Min\'." |