Version Bump 2.2.7, Bug 527379

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

3 files changed, 12 insertions, 22 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index cf5a0e0a3032..df22df2bb68f 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.169 2014/10/19 22:16:00 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.170 2014/10/29 22:04:24 mattm Exp $
+
+*zabbix-2.2.7 (29 Oct 2014)
+
+  29 Oct 2014; Matthew Marlowe <mattm@gentoo.org> +zabbix-2.2.7.ebuild,
+  -zabbix-2.2.6.ebuild:
+  Version Bump 2.2.7, Bug 527379
 
 *zabbix-2.2.6 (19 Oct 2014)
 *zabbix-2.0.13 (19 Oct 2014)
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 47a80e2fbab8..2218f6ead486 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 1.4.6/init.d/zabbix-agentd 581 SHA256 5afaed3880c7f8d1a13d51d963f2758a0bc3ec982c667cc2aad9c84d44753452 SHA512 4d29435590d42374dc7428f09617ddbcc6e551850651f4d057a20b39689c041dcf3966b18efcec1c4478e44b9995ec3c55b1f3d3e27ba9ff5b96f0aef076da7a WHIRLPOOL 197096795bdb5387f62687b52894d86a10002a4e9bab11b28a71c3f0e575daebe6827d14b48983c9c0c3f49491a12751789ccc43e7e0e4e80ad60aac156eaf23
 AUX 1.4.6/init.d/zabbix-server 563 SHA256 8c2bc6b7dc1fb80e6b24536f7acb7ba102975b345da055cc19e33adfcdb95976 SHA512 897134b640ed2bd070fa3c29b9fdda368f6451179908fcd00aa2ee8710ea64556e6fcc1592e40a7050b323b56b67837004c1411c326ff4024f949089f980429b WHIRLPOOL e84983ddd78c29f76d8aed51b54f63db70a00637b6102cab065e36178c01f227770e19d999e0fae201ea266178221f40e141fb010f8171c787e2d78da6767372
 AUX 1.4.6/postinstall-en.txt 147 SHA256 3855cb33f7ca570a44e42d578894aba9ebe22fd2992f9f009ca954286f4ba38f SHA512 aa2dcda94d75c77a2369a45bc94011fb033589ed20230149e459658788d1cee5bf2fc80bdcec13702477dbff47639e1c6300e1f41ded134cad397333a1d3f329 WHIRLPOOL 33407c71a6fff74995761bdc59336dcd3835b6575ac6c84a534fae4e6ecbc2d364608bf249f71b0fde7c326eea16a064a00c1e3ca435f5898481212efcf67dab
@@ -50,21 +47,10 @@ AUX zabbix-server.tmpfiles 35 SHA256 d0516a64ad0841dac41faf0ca709ff16405346f1e9d
 DIST zabbix-2.0.12.tar.gz 13699618 SHA256 f9237297b37d41eb0ed4f0b2e1f3f2e30dc17fe19d3bbd57fb06d5f6f8acd8b7 SHA512 0b6b27eae51c991cfdc916dbcfc43e6425f44935ffb1a7fd642d0ee62813e2209a7be62ca6803b033a9371df054e3e102cc7d5591f488fb1e4f2b6b5f2977d04 WHIRLPOOL c153afc541661d54665238cc6b412d126372cbf08e2d867981976e28bb452c3c0602f1ed2387aa362b6ff3c0363e8e0d80ea519874703082691ba108e5ebbe26
 DIST zabbix-2.0.13.tar.gz 13798473 SHA256 e4e98ddae2e01531a05d58d4795afe87b9f1c0b77d777b706afe2ae8e6e012e2 SHA512 bc8997edf956b987d4ecc4cefd1cedcceb666366257c57f186af02c7747d5b5a5ca0045c06c444970a957556dee8cb4c73c262e1716edd0989307893a8e0125e WHIRLPOOL 40d8c7d16497e2b8ba87bff0eff6c21d71ea67b38aaf083161124cfa6a46e778fc53691b3e120783feec33ba5e6f00d05aac6527502c717e2a4923c3583461d8
 DIST zabbix-2.2.5.tar.gz 14960556 SHA256 1e33f54d4accc5b6a0dccf4a308d27dc82de245567dffef823f9add9fa7d81b5 SHA512 0e229a2502f1332775db2107556b5e62267bcdf05dc483957960f563877ed970aef7ed465123576849413305e54309d83eeb75dd1f522c93cf09cd4b75265514 WHIRLPOOL 0a6b81f4e23ad8c8247b5356aa31bc4dfbd364642a647b9dff3216a0141cd2287b75731f396d26083aa412669a7efdb6f24fcb8592b4773c4a21d02b2f369681
-DIST zabbix-2.2.6.tar.gz 15052242 SHA256 c2b389d68bbc48ba19b02297b1b060e9947a172a7069cd6ad5e40f39955b10f4 SHA512 290e51fb2cf6f2945e802954e792e90fff585c2d8e3ff1ea43b141c4482c2efca7de6c00adf1d24cb937fd65bfc734d5756ceec8b4875dff4df986bc1ed06877 WHIRLPOOL 2078a9209224fef0c2af5cc26fbcd78c55e64dcba85808387e34811c53d44af42a50f67ecec94e6693a304cf6536a385d476569a0a4ddde3a830ccd4b1298a9d
+DIST zabbix-2.2.7.tar.gz 15029191 SHA256 95452ca314966ccfbccb0c5775873ab565fe1b545b51bb631074377fa0f156c6 SHA512 ad3e545d180914801f10bbf9f250a2a42d28d13d0b60cb65c772f6458b4ad71c4139e622e0b70aded32c83ad96c0837bad5ad229d76b146d93b598fea857645e WHIRLPOOL 9df8fcf952371eab1265e56ec964bc4cc36eb3362a4668bb0a814178c18b408b1e41ab733cc433f76a10d319eb2739c41f9be49e97c69efd86af64a832e92e08
 EBUILD zabbix-2.0.12-r1.ebuild 10610 SHA256 f3d2372962d47f740e36befee3dba32f33464a4d70ba1185340a99c0afea6479 SHA512 4242c0f79c75499f55ff7d20f17bfb1d271a8a484bdaebbc1e74c9b6961b6972e6a823a6e6f58002f642eab51b8044d6ffdababb3bfb9ff0d02a44fc8c24575f WHIRLPOOL 65ad4bcbc024eff1df7d033d11531c976c4dbe083d2333c77157299358e7d2a373cb832785c64f8dca29bd6cee835d6bdfd159623d2f1f2980bfd31454a8acb7
 EBUILD zabbix-2.0.13.ebuild 10558 SHA256 b50aa8cf028a000518c30005f97d7ca9ff7183f691aa3f2165d03e47f8e4b462 SHA512 7adeea5911a7d9f513680ed807e431da46a317686d39b0673695ece7b3f9704363eed1c86f23e7a6e8c5efb9c8d8f02576aaaa220d41d4d2cc6494d20fc71ab9 WHIRLPOOL b219beb972c2bc53ce4fbdb49a808f6467fed8ad5dba26f3924f366f634326d959585106618374be864bd9385a41b4ba0e8f1c73d526252c07ce74b46a5404bb
 EBUILD zabbix-2.2.5.ebuild 10177 SHA256 477f77001c7016053d06c7351c5e6ad4c379b446ae8324df2faee6597b4bf537 SHA512 9de8e70b19602f37570ead0f64e170899d4545f2a14b371e0c9041ea14d210ae6a9e2e34ce8f42ec4b44826ec81163119dc9cd4bfb01009baa49e3d903a0ac8e WHIRLPOOL beea7f7f1374299a1804ba41de2db2cbcfa97878b57d3345f67ae680a1f54d48bf287e7d6914737f59bee1fbe1501582f1bea4f2f784077757577e9d348ef423
-EBUILD zabbix-2.2.6.ebuild 10181 SHA256 ff33c7b1c9797329d025dee39b5ce0660f732b0b48c1858d741629235410b603 SHA512 9a61f59e19c02832bff3932f7e649cae59fb849e89a67b934e369628e7f3d3d768a1a9b1858f1b8b11d1e643c4d7a28f247957fe01910b2c6f475673ee9b9864 WHIRLPOOL 0385ea446e10ea1bf85d723cf3ee08b97143c278f81a98c8dbffdae82b879c7253fe243c9903e45466d29b033884defc625ce13c8033b0238b0dfb03079e3b81
-MISC ChangeLog 38596 SHA256 1ae39793ac61a60e741dec43a7b36e67d3c320fa402885a5cd36ae35f5c2ee4b SHA512 9eca2a5bb54d48f477922c200a2a5e4abbcd907b5db076c95c3afce6742272e084f50685cf0257e573809563933cd399f095bf01a588a68c7ed550d1486fb5db WHIRLPOOL 4d21e933f0a592fdd2bcacf3b9ebc12b6a275e2bf22f20c11464c895b6520b41a19f414f0951cf44a5206ead3d5e599b09dd22d574733af25cc28cffe99893cc
+EBUILD zabbix-2.2.7.ebuild 10129 SHA256 493dc3e2e7511f26fbae3530b21a8f55ff180d806099b5c3c56ef244c0c36b95 SHA512 76912485207bc50a2f2d6e909f2746df44eee0ff10db2d9aaa80d6a190b9de430efcc2ec63221281e551f9459e4fdc156a864fd02c8594f8624eee66d860a448 WHIRLPOOL 5a5002b06c1544f73a115bbe2291dc53555add87255b9c180ff3ac87f768a19fc60f31e6b1ae72123dcc85d2bd998f655c75a8f7f5898a45cf407d94dc996a96
+MISC ChangeLog 38755 SHA256 21a6552834e530b4ca305a69e0505657735b55c1279f73b5c93a017e1e92ac26 SHA512 3cdc50b3bb1b5baf04f1f37889d0e0a3337fb2bfe825d5f37cf8560af82e67712c68ad9d25b8deba77cffef77590eda991907db24a545233e2753b5b8255f7f7 WHIRLPOOL c29a00469235ee3b3a275a4e4ec55f391cdd070aed879eedafbd16335bebebaa3fd3768820ec0ab03b6a67d65b8b6d758a27dc73567c17ddfad3e88f7f7633a8
 MISC metadata.xml 1221 SHA256 94d1841cf3efb9a709dbc9ee160a29c394a1c0f5af5069fe1466f9f08796c72d SHA512 3d3ed8e75fcd9f521402a9734d5bd19c163a7a5d33cef3b20b6e476416fc352a91a62782ecc0ed032efbafd5f07f6ac08e28a88fb766095a1bba146f8f50b5e5 WHIRLPOOL ae2d69cab99c364721ca2e806fc5e02d1dbe72ad48bea43b4d1a0fd49c00cc2b94ea6ea85f4f5a9ff90522a90ade17fe816fe85ca7a16e755d02239d4426da92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQEcBAEBCAAGBQJURDgmAAoJEC1LWXx4YDenkO0H/2m0LufU1CANaHKtqYDYV3aV
-5rz7Jzro3/iP7cZ/jrgOv74XkKmkGidlIDqiq9ybVjs7hlFwMuk57BhvPvG9sDCv
-KoxbsxcVegbPanV8C1e5UH9cdk0ISY32aDHSV8u8lokd1lsqIr44xoz2C8M4sYQZ
-CwC6QIxFpOE/jGs/46bRxLIKJJ9xb1g3e+E/fSqAMrtRiXder07YwqEpoeJS3J8z
-8e46dis4wC/xD5i7wZe2vjel5W/co+QciftGzGWf+f8sQkZsf6Rzhsu0rICTnipJ
-y8SSoyoI1gWaohw3jJkDq7hIURmofKEnUaocOM6O17IIRisKt1GLv8sbcTlf9Vc=
-=qx1e
------END PGP SIGNATURE-----
diff --git a/net-analyzer/zabbix/zabbix-2.2.6.ebuild b/net-analyzer/zabbix/zabbix-2.2.7.ebuild
index 0f61cc6f7653..2f84221177da 100644
--- a/net-analyzer/zabbix/zabbix-2.2.6.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.2.7.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.6.ebuild,v 1.1 2014/10/19 22:16:00 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.7.ebuild,v 1.1 2014/10/29 22:04:24 mattm Exp $
 
 EAPI="5"
 
@@ -44,7 +44,6 @@ RDEPEND="${COMMON_DEPEND}
 	java?	(
 		>=virtual/jre-1.4
 		dev-java/slf4j-api
-		dev-java/json-simple
 	)
 	frontend? (
 		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
@@ -63,7 +62,6 @@ java_prepare() {
 	rm -v *.jar || die
 
 	java-pkg_jar-from slf4j-api
-	java-pkg_jar-from json-simple
 }
 
 src_prepare() {
@@ -346,7 +344,7 @@ src_install() {
 		src/zabbix_java/lib/logback-console.xml \
 		src/zabbix_java/lib/logback-core-0.9.27.jar \
 		src/zabbix_java/lib/logback.xml \
-		src/zabbix_java/lib/org-json-2010-12-28.jar \
+		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
 		src/zabbix_java/lib/slf4j-api-1.6.1.jar
 	   exeinto /${ZABBIXJAVA_BASE}/
 	   doexe \