Bump for zabbix 1.8.13 and 2.0.0rc4

(Portage version: 2.1.10.59/cvs/Linux x86_64)

3 files changed, 17 insertions, 44 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 1e1c8616198a..24a03f58900c 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/zabbix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.90 2012/05/11 14:57:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.91 2012/05/13 21:42:17 mattm Exp $
+
+*zabbix-2.0.0_rc4 (12 May 2012)
+*zabbix-1.8.13 (12 May 2012)
+
+  12 May 2012; Matthew Marlowe <mattm@gentoo.org> +zabbix-1.8.13.ebuild,
+  +zabbix-2.0.0_rc4.ebuild:
+  Bump for 1.8.13 and 2.0.0rc4
 
 *zabbix-1.8.12-r1 (11 May 2012)
 
diff --git a/net-analyzer/zabbix/zabbix-2.0.0_rc3.ebuild b/net-analyzer/zabbix/zabbix-1.8.13.ebuild
index ed236c82cd43..d3ab17daef5d 100644
--- a/net-analyzer/zabbix/zabbix-2.0.0_rc3.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.8.13.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.0_rc3.ebuild,v 1.2 2012/05/04 06:08:08 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.13.ebuild,v 1.1 2012/05/13 21:42:17 mattm Exp $
 
 EAPI="2"
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
-inherit eutils flag-o-matic webapp depend.php autotools java-pkg-opt-2
+inherit eutils flag-o-matic webapp depend.php autotools
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers."
 HOMEPAGE="http://www.zabbix.com/"
@@ -15,8 +15,8 @@ SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS=""
-IUSE="agent java curl frontend ipv6 jabber ldap mysql openipmi oracle postgres proxy server ssh snmp +sqlite iodbc odbc static"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent curl frontend ipv6 jabber ldap mysql openipmi oracle postgres proxy server ssh snmp +sqlite iodbc odbc static"
 
 COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
 	ldap? (
@@ -32,7 +32,6 @@ COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
 	curl? ( net-misc/curl )
 	openipmi? ( sys-libs/openipmi )
 	ssh? ( net-libs/libssh2 )
-	java? ( >=virtual/jdk-1.4 )
 	odbc? (
 		iodbc? ( dev-db/libiodbc )
 		!iodbc? ( dev-db/unixODBC )
@@ -42,11 +41,6 @@ RDEPEND="${COMMON_DEPEND}
 	proxy? ( <=net-analyzer/fping-2.9 )
 	server? ( <=net-analyzer/fping-2.9
 		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-		dev-java/json-simple
-	)
 	frontend? ( dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session]
 		media-libs/gd[png]
 		app-admin/webapp-config )"
@@ -55,16 +49,6 @@ DEPEND="${COMMON_DEPEND}
 
 use frontend && need_php_httpd
 
-S=${WORKDIR}/${MY_P}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-	java-pkg_jar-from json-simple
-}
-
 src_prepare() {
 	eautoreconf
 }
@@ -117,10 +101,7 @@ pkg_setup() {
 pkg_postinst() {
 	if use server || use proxy ; then
 		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so.  Most minor version"
-		elog "zabbix updates do not require db changes. However, "
-		elog "you should read the release notes to be sure."
+		elog "You need to configure your database for Zabbix."
 		elog
 		elog "Have a look at /usr/share/zabbix/database for"
 		elog "database creation and upgrades."
@@ -160,7 +141,7 @@ pkg_postinst() {
 
 	elog "--"
 	elog
-	elog "You may need to add these lines to /etc/services:"
+	elog "Add these lines in the /etc/services :"
 	elog
 	elog "zabbix-agent     10050/tcp Zabbix Agent"
 	elog "zabbix-agent     10050/udp Zabbix Agent"
@@ -168,20 +149,6 @@ pkg_postinst() {
 	elog "zabbix-trapper   10051/udp Zabbix Trapper"
 	elog
 
-	elog
-	elog "Zabbix will be officially supporting database upgrades from"
-	elog "2.0.0rc3 to the final 2.0.0 release when it is available."
-	elog
-	elog "At some point, there should be some support for upgrading from 1.8.x"
-	elog "to a 2.0.x release."
-	elog
-	elog "Upgrading from all previous 1.9.x or 2.0rc releases is not unsupported."
-	elog
-	elog "Note that this is the first gentoo ebuild for 2.0.x and likely"
-	elog "will need further tuning with bumps/revisions as bugs are closed."
-	elog
-	elog "The java use flag is new to 2.0."
-	elog
 	elog "Zabbix is incompatible with fping 3.0 - (Zabbix bug #ZBX-4894)."
 	elog
 
@@ -249,11 +216,10 @@ src_configure() {
 		$(use_enable agent) \
 		$(use_enable ipv6) \
 		$(use_enable static) \
-		$(use_enable java) \
 		$(use_with ldap) \
 		$(use_with snmp net-snmp) \
 		$(use_with mysql) \
-		$(use_with postgres postgresql) \
+		$(use_with postgres pgsql) \
 		$(use_with oracle) \
 		$(use_with sqlite sqlite3) \
 		$(use_with jabber) \
@@ -325,7 +291,7 @@ src_install() {
 			"${FILESDIR}/1.6.6"/zabbix_agent.conf \
 			"${FILESDIR}/1.6.6"/zabbix_agentd.conf
 		doinitd \
-			"${FILESDIR}/1.6.6"/init.d/zabbix-agentd
+			"${FILESDIR}/1.6.6"/init.d/zabbix-agentd-r1
 		dosbin \
 			src/zabbix_agent/zabbix_agent \
 			src/zabbix_agent/zabbix_agentd
diff --git a/net-analyzer/zabbix/zabbix-2.0.0_rc3-r1.ebuild b/net-analyzer/zabbix/zabbix-2.0.0_rc4.ebuild
index 622680440c41..601d693ec49b 100644
--- a/net-analyzer/zabbix/zabbix-2.0.0_rc3-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.0.0_rc4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.0_rc3-r1.ebuild,v 1.2 2012/05/04 06:08:08 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.0_rc4.ebuild,v 1.1 2012/05/13 21:42:17 mattm Exp $
 
 EAPI="2"