diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2014-04-13 11:55:26 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2014-04-13 11:55:26 +0000 |
| commit | a30174b78eef3b8721fd66c5fc73f68dee8fed78 (patch) | |
| tree | c6a03e15f8cf8a5ba41b891e6753043737ec8547 /net-analyzer/zabbix | |
| parent | Remove old (diff) | |
| download | gentoo-2-a30174b78eef3b8721fd66c5fc73f68dee8fed78.tar.gz gentoo-2-a30174b78eef3b8721fd66c5fc73f68dee8fed78.tar.bz2 gentoo-2-a30174b78eef3b8721fd66c5fc73f68dee8fed78.zip | |
Don't use USE flag to control file installation (#502224)
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'net-analyzer/zabbix')
| -rw-r--r-- | net-analyzer/zabbix/ChangeLog | 8 | ||||
| -rw-r--r-- | net-analyzer/zabbix/zabbix-2.2.2-r1.ebuild (renamed from net-analyzer/zabbix/zabbix-2.2.2.ebuild) | 22 |
2 files changed, 15 insertions, 15 deletions
diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog index 8c93a7f5a7d3..86a679e7318b 100644 --- a/net-analyzer/zabbix/ChangeLog +++ b/net-analyzer/zabbix/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/zabbix # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.158 2014/02/24 04:55:05 mattm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.159 2014/04/13 11:55:26 pacho Exp $ + +*zabbix-2.2.2-r1 (13 Apr 2014) + + 13 Apr 2014; Pacho Ramos <pacho@gentoo.org> +zabbix-2.2.2-r1.ebuild, + -zabbix-2.2.2.ebuild: + Don't use USE flag to control file installation (#502224) *zabbix-2.2.2 (24 Feb 2014) diff --git a/net-analyzer/zabbix/zabbix-2.2.2.ebuild b/net-analyzer/zabbix/zabbix-2.2.2-r1.ebuild index 82083d113199..fc8fa760f6ac 100644 --- a/net-analyzer/zabbix/zabbix-2.2.2.ebuild +++ b/net-analyzer/zabbix/zabbix-2.2.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.2.ebuild,v 1.1 2014/02/24 04:55:05 mattm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.2-r1.ebuild,v 1.1 2014/04/13 11:55:26 pacho Exp $ EAPI="5" @@ -17,7 +17,7 @@ LICENSE="GPL-2" SLOT="0" WEBAPP_MANUAL_SLOT="yes" KEYWORDS="~amd64 ~x86" -IUSE="agent java curl frontend ipv6 jabber ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static systemd" +IUSE="agent java curl frontend ipv6 jabber ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static" COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) ldap? ( @@ -255,10 +255,8 @@ src_install() { dosbin src/zabbix_server/zabbix_server fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf fperms 0640 /etc/zabbix/zabbix_server.conf - if use systemd; then - systemd_dounit "${FILESDIR}/zabbix-server.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf - fi + systemd_dounit "${FILESDIR}/zabbix-server.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf fi if use proxy; then @@ -269,10 +267,8 @@ src_install() { insinto /etc/zabbix doins \ "${FILESDIR}/2.2"/zabbix_proxy.conf - if use systemd; then - systemd_dounit "${FILESDIR}/zabbix-proxy.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf - fi + systemd_dounit "${FILESDIR}/zabbix-proxy.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf fi if use agent; then @@ -293,10 +289,8 @@ src_install() { fperms 0640 \ /etc/zabbix/zabbix_agent.conf \ /etc/zabbix/zabbix_agentd.conf - if use systemd; then - systemd_dounit "${FILESDIR}/zabbix-agentd.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf - fi + systemd_dounit "${FILESDIR}/zabbix-agentd.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf fi fowners zabbix:zabbix \ |