summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Marlowe <mattm@gentoo.org>2013-11-16 09:33:56 +0000
committerMatthew Marlowe <mattm@gentoo.org>2013-11-16 09:33:56 +0000
commit694229e43b085d5fa1d9de861098aef2a6f15cc4 (patch)
treea89a83237fd72076d3adbc937afe931e4042a937 /net-analyzer/zabbix
parentVersion bump, drop old (diff)
downloadgentoo-2-694229e43b085d5fa1d9de861098aef2a6f15cc4.tar.gz
gentoo-2-694229e43b085d5fa1d9de861098aef2a6f15cc4.tar.bz2
gentoo-2-694229e43b085d5fa1d9de861098aef2a6f15cc4.zip
Minor bugfixes for src_install doins/doinitd
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 786037A7)
Diffstat (limited to 'net-analyzer/zabbix')
-rw-r--r--net-analyzer/zabbix/ChangeLog8
-rw-r--r--net-analyzer/zabbix/zabbix-2.2.0-r2.ebuild (renamed from net-analyzer/zabbix/zabbix-2.2.0-r1.ebuild)14
2 files changed, 12 insertions, 10 deletions
diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 5b23888eab16..d938b2806b3a 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-analyzer/zabbix
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.143 2013/11/16 07:18:54 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.144 2013/11/16 09:33:56 mattm Exp $
+
+*zabbix-2.2.0-r2 (16 Nov 2013)
+
+ 16 Nov 2013; Matthew Marlowe <mattm@gentoo.org> +zabbix-2.2.0-r2.ebuild,
+ -zabbix-2.2.0-r1.ebuild:
+ Minor bugfixes for src_install doins/doinitd
*zabbix-2.2.0-r1 (16 Nov 2013)
diff --git a/net-analyzer/zabbix/zabbix-2.2.0-r1.ebuild b/net-analyzer/zabbix/zabbix-2.2.0-r2.ebuild
index 0c678a405ffe..2ea4947d5059 100644
--- a/net-analyzer/zabbix/zabbix-2.2.0-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.2.0-r2.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/zabbix/zabbix-2.2.0-r1.ebuild,v 1.1 2013/11/16 07:18:54 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.0-r2.ebuild,v 1.1 2013/11/16 09:33:56 mattm Exp $
EAPI="5"
@@ -251,12 +251,9 @@ src_install() {
if use server; then
insinto /etc/zabbix
- doins \
- "${FILESDIR}/2.2"/zabbix_server.conf \
- doinitd \
- "${FILESDIR}/2.2"/init.d/zabbix-server
- dosbin \
- src/zabbix_server/zabbix_server
+ doins "${FILESDIR}/2.2"/zabbix_server.conf
+ doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
+ dosbin src/zabbix_server/zabbix_server
fowners zabbix:zabbix \
/etc/zabbix/zabbix_server.conf \
/etc/zabbix/zabbix_trapper.conf
@@ -280,8 +277,7 @@ src_install() {
doins \
"${FILESDIR}/2.2"/zabbix_agent.conf \
"${FILESDIR}/2.2"/zabbix_agentd.conf
- doinitd \
- "${FILESDIR}/2.2"/init.d/zabbix-agentd
+ doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
dosbin \
src/zabbix_agent/zabbix_agent \
src/zabbix_agent/zabbix_agentd