Reverted non maintainer commit that may have broken only stable release, pushed changes to r2 bump, applied user supplied patch that hopefully fixes breakage, marked r2 arches as testing and updating bug #251394 to be in test requested status. Also, removed obsolete alpha test for pre 2.0. Will be supplying 2.0 rc ebuild shortly.

(Portage version: 2.1.10.49/cvs/Linux x86_64)

3 files changed, 21 insertions, 11 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index a1cb08ed370b..307e2bebcb50 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,14 @@
 # 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.76 2012/03/19 09:54:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.77 2012/03/20 11:55:36 mattm Exp $
+
+*zabbix-1.8.10-r2 (20 Mar 2012)
+
+  20 Mar 2012; Matthew Marlowe <mattm@gentoo.org> zabbix-1.8.10-r1.ebuild,
+  +zabbix-1.8.10-r2.ebuild, -zabbix-1.9.5-r1.ebuild:
+  Reverted non maintainer commit that might have broken only stable release,
+  moved changes to new r2 bump, applied user supplied patch to fix changes,
+  marked new bump testing, removed obsolete alpha release
 
   19 Mar 2012; Pacho Ramos <pacho@gentoo.org> zabbix-1.8.10-r1.ebuild,
   zabbix-1.9.5-r1.ebuild:
diff --git a/net-analyzer/zabbix/zabbix-1.8.10-r1.ebuild b/net-analyzer/zabbix/zabbix-1.8.10-r1.ebuild
index 22fa5000b27e..743c4fec4cd0 100644
--- a/net-analyzer/zabbix/zabbix-1.8.10-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.8.10-r1.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-1.8.10-r1.ebuild,v 1.4 2012/03/19 09:54:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.10-r1.ebuild,v 1.5 2012/03/20 11:55:36 mattm Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
 KEYWORDS="amd64 x86"
-IUSE="agent curl frontend ipv6 jabber ldap mysql openipmi oracle postgres proxy server -ssh snmp +sqlite"
+IUSE="agent curl frontend ipv6 jabber ldap mysql openipmi oracle postgres proxy server -ssh snmp +sqlite3"
 
 COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
 	ldap? (
@@ -25,7 +25,7 @@ COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
 		net-libs/gnutls
 	)
 	mysql? ( virtual/mysql )
-	sqlite? ( =dev-db/sqlite-3* )
+	sqlite3? ( =dev-db/sqlite-3* )
 	postgres? ( dev-db/postgresql-base )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	jabber? ( dev-libs/iksemel )
@@ -202,7 +202,7 @@ src_configure() {
 		$(use_with mysql) \
 		$(use_with postgres pgsql) \
 		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
+		$(use_with sqlite3) \
 		$(use_with jabber) \
 		$(use_with curl libcurl) \
 		$(use_with openipmi openipmi) \
diff --git a/net-analyzer/zabbix/zabbix-1.9.5-r1.ebuild b/net-analyzer/zabbix/zabbix-1.8.10-r2.ebuild
index 809696674ca8..f09f8d028795 100644
--- a/net-analyzer/zabbix/zabbix-1.9.5-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.8.10-r2.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-1.9.5-r1.ebuild,v 1.2 2012/03/19 09:54:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.10-r2.ebuild,v 1.1 2012/03/20 11:55:36 mattm Exp $
 
 EAPI="2"
 
@@ -10,11 +10,12 @@ 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/"
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${P}.tar.gz"
+MY_P=${P/_/}
+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 curl frontend ipv6 jabber ldap mysql openipmi oracle postgres proxy server -ssh snmp +sqlite"
 
 COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
@@ -26,6 +27,7 @@ COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
 	mysql? ( virtual/mysql )
 	sqlite? ( =dev-db/sqlite-3* )
 	postgres? ( dev-db/postgresql-base )
+	oracle? ( dev-db/oracle-instantclient-basic )
 	jabber? ( dev-libs/iksemel )
 	curl? ( net-misc/curl )
 	openipmi? ( sys-libs/openipmi )
@@ -44,13 +46,13 @@ DEPEND="${COMMON_DEPEND}
 use frontend && need_php_httpd
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.8.3-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-1.8.9-as-needed.patch"
 	eautoreconf
 }
 
 pkg_setup() {
 	if use server || use proxy ; then
-		local dbnum dbtypes="mysql oracle postgres sqlite3" dbtype
+		local dbnum dbtypes="mysql oracle postgres sqlite" dbtype
 		declare -i dbnum=0
 		for dbtype in ${dbtypes}; do
 			use ${dbtype} && let dbnum++
@@ -198,7 +200,7 @@ src_configure() {
 		$(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) \