summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Marlowe <mattm@gentoo.org>2013-02-22 02:45:53 +0000
committerMatthew Marlowe <mattm@gentoo.org>2013-02-22 02:45:53 +0000
commit195210c1f2851f7eb24a67929a4465d5ff0dd492 (patch)
treebbae488fb00a19b9470d68bf5be9b93be2f138a7 /net-analyzer/zabbix
parentCorrectly track status via pidfile re #458034. Thanks to Gerard Neil for the... (diff)
downloadgentoo-2-195210c1f2851f7eb24a67929a4465d5ff0dd492.tar.gz
gentoo-2-195210c1f2851f7eb24a67929a4465d5ff0dd492.tar.bz2
gentoo-2-195210c1f2851f7eb24a67929a4465d5ff0dd492.zip
Fix Bug #457674 in zabbix 2.0.5, unnecessary application of zabbix 6074 patch.
(Portage version: 2.1.11.51/cvs/Linux x86_64, signed Manifest commit with key 786037A7)
Diffstat (limited to 'net-analyzer/zabbix')
-rw-r--r--net-analyzer/zabbix/ChangeLog5
-rw-r--r--net-analyzer/zabbix/zabbix-2.0.5.ebuild5
2 files changed, 6 insertions, 4 deletions
diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index e6e98ce36332..bf5113c1db9e 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,9 @@
# 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.117 2013/02/16 02:20:59 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.118 2013/02/22 02:45:53 mattm Exp $
+
+ 22 Feb 2013; Matthew Marlowe <mattm@gentoo.org> zabbix-2.0.5.ebuild:
+ Fix Bug #457674 in zabbix 2.0.5, unnecessary application of zabbix 6074 patch.
16 Feb 2013; Matthew Marlowe <mattm@gentoo.org> zabbix-2.0.5.ebuild:
Remove testing keywords on zabbix-2.0.5 while troubleshooting issue with a
diff --git a/net-analyzer/zabbix/zabbix-2.0.5.ebuild b/net-analyzer/zabbix/zabbix-2.0.5.ebuild
index c0760bd98f28..72ae896b601b 100644
--- a/net-analyzer/zabbix/zabbix-2.0.5.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.0.5.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.0.5.ebuild,v 1.2 2013/02/16 02:20:59 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.5.ebuild,v 1.3 2013/02/22 02:45:53 mattm Exp $
EAPI="2"
@@ -15,7 +15,7 @@ SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
IUSE="agent java curl frontend ipv6 jabber ldap mysql openipmi oracle postgres proxy server ssh snmp sqlite iodbc odbc static"
COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
@@ -68,7 +68,6 @@ java_prepare() {
}
src_prepare() {
- epatch "${FILESDIR}/2.0/patches/zbx6097.patch"
eautoreconf
}