Latest upstream bumps include fix for zabbix bug 7479, removing it from gentoo manual patches.

(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 786037A7)

3 files changed, 12 insertions, 5 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 1556397667dd..5a3a1d9a98b5 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,15 @@
 # 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.152 2014/02/07 04:19:27 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.153 2014/02/08 20:37:32 mattm Exp $
+
+*zabbix-2.2.2_rc2-r1 (08 Feb 2014)
+*zabbix-2.0.11_rc1-r1 (08 Feb 2014)
+
+  08 Feb 2014; Matthew Marlowe <mattm@gentoo.org> +zabbix-2.0.11_rc1-r1.ebuild,
+  +zabbix-2.2.2_rc2-r1.ebuild, -zabbix-2.0.11_rc1.ebuild,
+  -zabbix-2.2.2_rc2.ebuild:
+  Latest upstream bumps include fix for zabbix bug 7479, removing it from gentoo
+  manual patches.
 
 *zabbix-2.0.11_rc1 (07 Feb 2014)
 *zabbix-2.2.2_rc2 (07 Feb 2014)
diff --git a/net-analyzer/zabbix/zabbix-2.0.11_rc1.ebuild b/net-analyzer/zabbix/zabbix-2.0.11_rc1-r1.ebuild
index 9abb1dae9e97..7ecd4e3dd610 100644
--- a/net-analyzer/zabbix/zabbix-2.0.11_rc1.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.0.11_rc1-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.0.11_rc1.ebuild,v 1.1 2014/02/07 04:19:27 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.11_rc1-r1.ebuild,v 1.1 2014/02/08 20:37:32 mattm Exp $
 
 EAPI="5"
 
@@ -70,7 +70,6 @@ java_prepare() {
 
 src_prepare() {
 	epatch "${FILESDIR}/2.0/patches/zbx282.patch"
-	epatch "${FILESDIR}/2.0/patches/zbx7479.patch"
 	eautoreconf
 }
 
diff --git a/net-analyzer/zabbix/zabbix-2.2.2_rc2.ebuild b/net-analyzer/zabbix/zabbix-2.2.2_rc2-r1.ebuild
index 84e4bf6cae5a..01ab5a03ee16 100644
--- a/net-analyzer/zabbix/zabbix-2.2.2_rc2.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.2.2_rc2-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_rc2.ebuild,v 1.1 2014/02/07 04:19:27 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.2_rc2-r1.ebuild,v 1.1 2014/02/08 20:37:32 mattm Exp $
 
 EAPI="5"
 
@@ -67,7 +67,6 @@ java_prepare() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/2.2/patches/zbx7479.patch"
 	eautoreconf
 }