Fix Bug #457674 in zabbix 2.0.5, unnecessary application of zabbix 6074 patch.

Package-Manager: portage-2.1.11.51/cvs/Linux x86_64
Manifest-Sign-Key: 0x786037A7

3 files changed, 15 insertions, 13 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/Manifest b/net-analyzer/zabbix/Manifest
index 1b70b7f18c07..77436dca2a5c 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -33,17 +33,17 @@ DIST zabbix-2.0.4.tar.gz 13045480 SHA256 7554223a927229b6317d211d413826fb0b2a974
 DIST zabbix-2.0.5.tar.gz 13352744 SHA256 9539abb848049195b6e8d24d23de40c26e07d3e5219ca890f4272a0d88cc640f SHA512 81d085ef3f2d7825adc4260761f4201acfbfc7f1ba0046b8b6d38f633eb71a0dd0412fac27d72c9b490b8939a63341b80b25ff9261ceda9b915ae088ccfd8e34 WHIRLPOOL 618287c6faf75b11c4a626534f0adce60d67b486557aa343702dbeac163902ac8ecac4084681e324654f310e411553af5fe674ca14144bafe79d8c2f1f46f39c
 EBUILD zabbix-1.8.16.ebuild 8591 SHA256 ab45ba5a3d7f0cd1bf01610c4b4c6b45e558375df38f9eea41077fead557ed75 SHA512 9e555591136003cb765da65ee3565974038147dfbe698f0a49f3fc93de0efbddc2e5e768ef092b2a9315313ce563d60eb2d1c2caff261bd554c7845855be6894 WHIRLPOOL 0e1370bffc022aede52c11250cd1be7f9d4ffaca9605f2e5b881b716de56dec039e4f0c3864d3f93126aa0095bbdf8190ae56dbf65e09ddfa2540bc635b3567f
 EBUILD zabbix-2.0.4-r1.ebuild 10403 SHA256 eb1b54e23c377d3f09d58fdd0146b42d667e039dd63be7dd7da737103686cbc0 SHA512 ca1657b7184314ad2bc4e820026864e0bbf80238cb4fe2fd36430e9b8587443e252212106f1b053b5523b23f3b511e46783dc850e3a28cef2e770027dd8ad24d WHIRLPOOL 6e3d20be1dc578075840d10308aedac8b665add26ea77fff7f4ca68fe882fea644bb23639134c424e847ed93322359634359b5c567b6dba5f149809da65acd3d
-EBUILD zabbix-2.0.5.ebuild 10393 SHA256 824a5f523bcebfda0fc0f34e1ac3206947a16e3d1e9086c4584b3d439f2ebf01 SHA512 00ce8c56de9c3e34437849225111bdc6c9cb56b2a99e36356eefd867371a423014beb665ada8f0a9528e47a8b12cb6c051e7da37599cabe4a07482e6a1c7b180 WHIRLPOOL d993a03b77fbe6a8ecb97daf1b92107069a31752d9068bb62e106a555bb56059b6e0dbb1881548d491f98a04c43ee4861ae21b77586eed306ea7a18c0e6c00df
-MISC ChangeLog 27954 SHA256 dc438296985227347f8b49eb631604799db48cac34d85e8764b13889eb4416c6 SHA512 da6e6ec642e0082a693b266093dd8b6b7fbfb34faa56a82136d814ee0bd18dc4a5a48da8cf8d186db47d7fff5c7569571f85131ad6f8206c43ff70b090491868 WHIRLPOOL a70e02dbe35ff294e3eeaa3e693ed7d3a68104fba7675605ed705c83893aa124c4dd3b1af27f540aa1c0e11f4b1a7200a1bd9a63ae8fe45b7984c403424ae4c5
+EBUILD zabbix-2.0.5.ebuild 10356 SHA256 798869b9df18cd21517ab3ac86e9a9c5ae26cb864b126a31bd3d8e353316c82d SHA512 0b999d51d18157fdadf93cdd13c9be6a0c94cfde90ba74e4412e41fe754f45180def4199050178a2003e4796271bca9c8edcfa0761a2efa42392f32b16bad6ef WHIRLPOOL c54d7367802bbdae792e8121ad4fc0568bb32d02e6a21bdeab7d027039fe023c4794cf7557ad2d6f1108241f78e1f00791f0632294eb54353199ab640d666dab
+MISC ChangeLog 28107 SHA256 3d87d35f097fd0004fc241070a7ee218c6c401fc98a468540a6c402df05197f3 SHA512 46197349550973dd39648f7d31385dd23f54c75a4460832858c53c61a26d1d27314e9df85362284e2fb2e6730d356d145091d37751a9180a6d799699743a4046 WHIRLPOOL f5865dbfb555e241a40b03999bf90cdfe8acd58f97c84d40673910da56f7aead0cd569e9b0fa75382e0cbf7039b1636a7499131b844975f740baa3c84aa1436d
 MISC metadata.xml 1192 SHA256 a1ad2643da11113f3315b4eb42782f514437c7093badc9d91a921c43f1a79141 SHA512 c4295da1665f2de24d2966a6a434a28c4dbf6a41779eb8f32ed2178b6979c17c92d2f2af042dda759af8a27a6371bbd02378f83846f538ef59954c506ec38cdd WHIRLPOOL 2d07f85c566949b01c169119b117bbda48326480639473636ff7082fd74d355ec40b4e153b29a2595152433ae2800eb775cca8533243d42061aa9f41fed8f0e6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRHu0SAAoJEC1LWXx4YDen5v0H/jWW7Q3wXJsGz8bpswMySr5l
-DQS/wo0hqVmcWWhK1JgTtSZD5XUvD/5beZX2T2DaNm0ezMPu9oD+4bEX+LmpgoIC
-IuDQ5OpZT0zL6GsmwidyuLvzAkD8Ht3SOAIa3D5cHqYeBia6zkV13w8ISnb065eK
-wIxRc9yVe5JGIKhub47oyKwz+PKiC1kq/VSLYaerRpkOB+fgnWab5ulSmgodSzlz
-uYfmFA5P3ulV3GJFJyatCj5KTkEK8HUMsFX2IJJmJcAOkUteKLKeEYobbjIME2i6
-1qRbkqoOPKYtQqcwdQnDI/dFL3BGziOSfmzhBx/s1JlxRYQ1+vAX2f/r6Dg3H/g=
-=26L7
+iQEcBAEBCAAGBQJRJtvpAAoJEC1LWXx4YDen4zcH/jYbemHaTZ0fPuyz+R+8GXg0
+c3iVJ09QU+sssrrVDBgpqJM1iNJKJSwfKWu3ou6B6erDFeYPj3c4W5SD3w6U+7+8
+WbX9af53uZZy+wlmYEfCHz+6Iok7oh/x4WqjGAJGXjGPYkL1EkVBvQtR2hJznunl
+vAaPVD7D+zX1zbXTls2YhSZSJzk2vrLZLpdXMIitY4xa3ibnCa9YXWH6b92w85VO
+Lq92Bu5Ch+Z/AWYQ2grFLSteg8aJU79KMPctEWptN3pYXC1xrlRJxrRsVk1ypLVz
+Qigiadjb7A1xjNBBsmY1r5bSpzOAbF2iOZcY4pYBHV1snqs3v5+/gqwZaEzFMtw=
+=ky9N
 -----END PGP SIGNATURE-----
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
 }