summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Marlowe <mattm@gentoo.org>2014-10-29 22:04:24 +0000
committerMatthew Marlowe <mattm@gentoo.org>2014-10-29 22:04:24 +0000
commitc4f00d55c57c6156977839bded013169075ac0ad (patch)
tree97437853eeb28650494bea29e56d1f2efd3bff7d /net-analyzer/zabbix
parentDrop jruby target. (diff)
downloadgentoo-2-c4f00d55c57c6156977839bded013169075ac0ad.tar.gz
gentoo-2-c4f00d55c57c6156977839bded013169075ac0ad.tar.bz2
gentoo-2-c4f00d55c57c6156977839bded013169075ac0ad.zip
Version Bump 2.2.7, Bug 527379
(Portage version: 2.2.8-r1/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.7.ebuild (renamed from net-analyzer/zabbix/zabbix-2.2.6.ebuild)6
2 files changed, 9 insertions, 5 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/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 \