5 files changed, 18 insertions, 7 deletions
diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index bf39b34143a8..9e02b5b38b11 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,17 @@
 # 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.99 2012/06/12 03:55:18 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.100 2012/06/20 20:11:59 mattm Exp $
+
+*zabbix-2.0.1_rc2 (20 Jun 2012)
+
+  20 Jun 2012; Matthew Marlowe <mattm@gentoo.org>
+  files/1.6.6/zabbix_proxy.conf, files/1.6.6/zabbix_server.conf,
+  files/1.6.6/zabbix_trapper.conf, +zabbix-2.0.1_rc2.ebuild:
+  Bump for Zabbix 2.0.1_rc2 which is currently masked. If no major bugs
+  reported, will release into testing arches soon making the 2.0.x releases
+  ~arch while keeping 1.8.x releases in stable. Also, minor mysql socket file
+  path update in default config files to fix bug #377241 which has been waiting
+  patiently for closure.
 
   12 Jun 2012; Zac Medico <zmedico@gentoo.org> zabbix-1.8.10-r1.ebuild,
   zabbix-1.8.10-r2.ebuild, zabbix-1.8.11-r1.ebuild, zabbix-1.8.11-r2.ebuild,
diff --git a/net-analyzer/zabbix/files/1.6.6/zabbix_proxy.conf b/net-analyzer/zabbix/files/1.6.6/zabbix_proxy.conf
index 6dbcd12e3c2e..e0380d4fab7c 100644
--- a/net-analyzer/zabbix/files/1.6.6/zabbix_proxy.conf
+++ b/net-analyzer/zabbix/files/1.6.6/zabbix_proxy.conf
@@ -172,4 +172,4 @@ DBUser=root
 
 # Connect to MySQL using Unix socket?
 
-#DBSocket=/tmp/mysql.sock
+#DBSocket=/var/run/mysqld/mysqld.sock
diff --git a/net-analyzer/zabbix/files/1.6.6/zabbix_server.conf b/net-analyzer/zabbix/files/1.6.6/zabbix_server.conf
index 4973a007d347..63f14c5de83a 100644
--- a/net-analyzer/zabbix/files/1.6.6/zabbix_server.conf
+++ b/net-analyzer/zabbix/files/1.6.6/zabbix_server.conf
@@ -152,4 +152,4 @@ DBUser=root
 
 # Connect to MySQL using Unix socket?
 
-#DBSocket=/tmp/mysql.sock
+#DBSocket=/var/run/mysqld/mysqld.sock
diff --git a/net-analyzer/zabbix/files/1.6.6/zabbix_trapper.conf b/net-analyzer/zabbix/files/1.6.6/zabbix_trapper.conf
index 20222950bb96..8bbe0f99a8cf 100644
--- a/net-analyzer/zabbix/files/1.6.6/zabbix_trapper.conf
+++ b/net-analyzer/zabbix/files/1.6.6/zabbix_trapper.conf
@@ -41,4 +41,4 @@ DBUser=root
 
 # Connect to MySQL usig Unix socket?
 
-#DBSocket=/tmp/mysql.sock
+#DBSocket=/var/run/mysqld/mysqld.sock
diff --git a/net-analyzer/zabbix/zabbix-2.0.0.ebuild b/net-analyzer/zabbix/zabbix-2.0.1_rc2.ebuild
index 67a80f697010..a1ba38fd4531 100644
--- a/net-analyzer/zabbix/zabbix-2.0.0.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.0.1_rc2.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.ebuild,v 1.2 2012/06/12 03:55:18 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.1_rc2.ebuild,v 1.1 2012/06/20 20:11:59 mattm Exp $
 
 EAPI="2"
 
@@ -48,7 +48,7 @@ RDEPEND="${COMMON_DEPEND}
 		dev-java/json-simple
 	)
 	frontend? (
-		dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter]
+		dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls]
 		media-libs/gd[png]
 		app-admin/webapp-config )"
 DEPEND="${COMMON_DEPEND}
@@ -299,7 +299,7 @@ src_install() {
 		insinto /usr/share/zabbix
 		doins -r \
 			database \
-			create
+			upgrades
 		fowners zabbix:zabbix \
 			/etc/zabbix/zabbix_server.conf \
 			/etc/zabbix/zabbix_trapper.conf