Bump for 2.0rc5, minor cleanups referenced in changelog.

Package-Manager: portage-2.1.10.60/cvs/Linux x86_64

5 files changed, 38 insertions, 352 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index d670681d7ca7..71ccbc90fff6 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,26 @@
 # 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.92 2012/05/15 23:09:58 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.93 2012/05/18 05:31:08 mattm Exp $
+
+  18 May 2012; Matthew Marlowe <mattm@gentoo.org>
+  -files/1.6.6/init.d/zabbix-agentd-r1, -zabbix-1.8.13.ebuild,
+  -zabbix-2.0.0_rc4.ebuild, +zabbix-2.0.0_rc5.ebuild,
+  +files/2.0/init.d/zabbix-agentd:
+  remove testing ebuilds that reference files/1.6.6/init.d/zabbix-agentd-r1.
+  That file has been moved to 2.0/init.d/zabbix-agentd and will be referenced
+  in new ebuilds.
+
+  18 May 2012; Matthew Marlowe <mattm@gentoo.org>
+  +files/2.0/init.d/zabbix-agentd, -files/1.6.6/init.d/zabbix-agentd-r1,
+  -zabbix-2.0.0_rc4.ebuild, +zabbix-2.0.0_rc5.ebuild:
+  removed default on setting for sqlite use flag, added warning about rc5 db
+  upgrade, revised agentd init file
+
+*zabbix-2.0.0_rc5 (18 May 2012)
+
+  18 May 2012; Matthew Marlowe <mattm@gentoo.org> -zabbix-2.0.0_rc4.ebuild,
+  +zabbix-2.0.0_rc5.ebuild:
+  2.0rc5 version bump
 
 *zabbix-1.8.13-r1 (15 May 2012)
 
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 1a207b81e940..9512a5cabb7a 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -16,7 +16,6 @@ AUX 1.6.5/zabbix_proxy.conf 4509 RMD160 9efacc29f9e592484cfd4e7cf1cb121886f7318b
 AUX 1.6.5/zabbix_server.conf 3922 RMD160 a38ff076d34a9807d60b67ec3df3a428f03a8095 SHA1 48fbeabd262d0552f0cb86c39b3f645788077a11 SHA256 4210390a0400b86b090945abab6fdbfe91965d6746a46cf92434dacee4dfe3cb
 AUX 1.6.5/zabbix_trapper.conf 755 RMD160 c50714a2b95af303737adb117734872ef2545fea SHA1 4acb5a3d01c797f38c278d903430b5ec13557550 SHA256 76af8f79fa28b02c65107753d959c5404faee67c28219e9bce1b29014fab3ca8
 AUX 1.6.6/init.d/zabbix-agentd 581 RMD160 b40847b5c626447d0f6099e98c6f98a65f1227c9 SHA1 7e1be4047bd3576f70266460d06a457d5fde3b4c SHA256 f85fa8c293623438d4df9abff3d2bbde0e4527a7062fe045643bebb69d047ffe
-AUX 1.6.6/init.d/zabbix-agentd-r1 632 RMD160 1240ea3a340e43666bdb9ea992c08d68cbe44361 SHA1 ac07f93929a67e946f4797f5f853f5f4129c6a7d SHA256 b10ded48eaf74b8ec2f526d6b572c766455483ae1a312bef293faff8205ed59f
 AUX 1.6.6/init.d/zabbix-proxy 559 RMD160 004ab8e7657abe2d15201a4def0fa5c61e9f138f SHA1 20b00ba5af17d100cc201cdb456819cf25337727 SHA256 d49339ebc7132815b1fa7411ca5aac395b65e10e4972cd743b5e3c3cdcaf9830
 AUX 1.6.6/init.d/zabbix-server 563 RMD160 ae69bd294ef0246a884293446c0a149b23799556 SHA1 d8daea6e15d0f1610dfdee62c4f16d2d61fdd6d3 SHA256 95d06003e84fadef7470da4fa0c7ad42fc51dcc7c0eaab77546f43e916478ed5
 AUX 1.6.6/postinstall-en.txt 147 RMD160 c0aa1d85021eb046f9c92415fa8e95f9296b046d SHA1 cb5e16baa4cc0a1bf728d94a14fe5e0a85aebcf4 SHA256 3855cb33f7ca570a44e42d578894aba9ebe22fd2992f9f009ca954286f4ba38f
@@ -25,12 +24,13 @@ AUX 1.6.6/zabbix_agentd.conf 2526 RMD160 0b4a81a0efce31c09423d0f11a674f83c42aba7
 AUX 1.6.6/zabbix_proxy.conf 4527 RMD160 0d8e266731808eed69c64e02bc5fae9068ce4f6c SHA1 c533ec42dd4f042ba7e39706bb258a743d2237b8 SHA256 6626de0c5c4199696b8ea8d2b4c6faf59ee3223ce25e41c43269f6b850bf644e
 AUX 1.6.6/zabbix_server.conf 3933 RMD160 7e0cfe262911d5a42ce590071e2852ec8d76e8ba SHA1 909836c361b2f6ee42629141f9e7678aeeb1aadb SHA256 e44defbf4036476707c8c7d1268df45117df263b188b268fb5e52931c9895ffe
 AUX 1.6.6/zabbix_trapper.conf 755 RMD160 c50714a2b95af303737adb117734872ef2545fea SHA1 4acb5a3d01c797f38c278d903430b5ec13557550 SHA256 76af8f79fa28b02c65107753d959c5404faee67c28219e9bce1b29014fab3ca8
+AUX 2.0/init.d/zabbix-agentd 629 RMD160 40da9965f382e9ac1c63476bcc3ed35cb8b110fa SHA1 e130cb20d5aa97c4fc136bd6cb2a62abef54f058 SHA256 b4fc118627eec0de8afc02b8b3e8bd3d8f9d8221f866492459262127063de47d
 AUX zabbix-1.8.9-as-needed.patch 2737 RMD160 ddeb918ac3f4b297810da105cf2a4cfaa4268fd1 SHA1 278fe59122a90a4b8ccc26e1d722ee107c1e91fb SHA256 1c9b85c0a9d9161f983a590df387341c5168f254deb9f2cf858886a2e6e8aec1
 DIST zabbix-1.8.10.tar.gz 4217417 RMD160 96e776956d7055f99458314dbb931be5d1f9a973 SHA1 3d36413b9bd04da66775e9255243242d205a7e9c SHA256 d965d23f2ce8c7ddee7a1532863a208fae28958e3fc0871e0229ffa06f88a54b
 DIST zabbix-1.8.11.tar.gz 4224738 RMD160 d2e8749a43b0846a7bc93a21c6546dad0d66b678 SHA1 2efb94e0b57f1ddbb38ef3f8da225d88effb0689 SHA256 c45819b97082799bb253e4c6a3937affd07a2cd2744d860d657107aa4a3e772b
 DIST zabbix-1.8.12.tar.gz 4229589 RMD160 0adae9942d32d5d53396f457235414ad0bc40862 SHA1 fd388813e9b78c6357ad30d771d385ec6cd2476d SHA256 8ea52df75c5f5d31ede3c1807a679808bc257b587ddec1759b22dcc9da722fe7
 DIST zabbix-1.8.13.tar.gz 4235482 RMD160 ade2e43e581fe1b9b3b07057e612abc239798028 SHA1 38fd1e2a208fd2069bea61f2e5d1c66ee0697504 SHA256 ac4497cde031b793e492e874b091d109da7d5410c4ba55f54cad0749ae47e667
-DIST zabbix-2.0.0rc4.tar.gz 12032080 RMD160 69c945e1425e5a2a088d09d5bf7dd26f875c4d3a SHA1 be1353094df824cc83ab858afc51112fcb65e628 SHA256 3a23a0a450fbc7c8f47f192b10436ec9b89b4e408fbd343016c00c2157554bac
+DIST zabbix-2.0.0rc5.tar.gz 12087285 RMD160 0c8de98ab7204426224eb07a6da7419a7ec132b4 SHA1 a804028a4490c619299718eb721b5a9c7e8e7530 SHA256 180c258032d798c5cdd983e3bda30b027fc000ef634db58c31fa58991ecb4e84
 EBUILD zabbix-1.8.10-r1.ebuild 8161 RMD160 1defcbd94cce8a8675ecd8084a04eca3a5032146 SHA1 ce4695b32e564194ee108a27d989ed0c046aac09 SHA256 07dbeaa16bd8a672454feebfd095c75465e8854a50157e9270b7c4467f9b78b5
 EBUILD zabbix-1.8.10-r2.ebuild 8167 RMD160 3683272abc633fe744b67bcc9c4bfde1f05a6b77 SHA1 6929ee236e6e9cdd546bb6be7b9f1521f62bfc2a SHA256 72b23113aa2578e260cd76a3749a73c0c327f6f84498cbbbfb6553f3f3911d39
 EBUILD zabbix-1.8.11-r1.ebuild 8506 RMD160 fad80ecd40982795b23180278dddcf4e7d4a3217 SHA1 41d487051c56b7df6d52cc2d8b5a0e9baf393b24 SHA256 e036adbb2e146f302514b1edd60b771c53c6821c1a99b9831ae8289e1d0176fa
@@ -38,18 +38,17 @@ EBUILD zabbix-1.8.11-r2.ebuild 8598 RMD160 a1c3f81f09baddf656ffddf5b8b974a648f68
 EBUILD zabbix-1.8.11.ebuild 8114 RMD160 6bc85ae007f0da753d7a3bef87356d422c9c60bc SHA1 fce5cd510c93c021bb7fcfce8bf7df6430467f6e SHA256 fc7f721a7ddb92c9577103d88c2accb488cd0fe233b70e10df7996f3418ebfca
 EBUILD zabbix-1.8.12.ebuild 8594 RMD160 bffc3555cd627ca9d634384b5c4dba8f712c4a99 SHA1 566d3f55f8b2dac3b38a751d72e124580f90d1ab SHA256 519885afa5cd2ab933b4d2b196998df2c4e1235e64730fa1a177dc1a8f5603bb
 EBUILD zabbix-1.8.13-r1.ebuild 8596 RMD160 a47ae112261cd19e653ae20c5d10b2263fd1f63a SHA1 3af6f229aeda88f8c38696b704de51fd97a3d2a7 SHA256 db02c26100427cd94fca6b013402ad6b21b3cd85156f68d32680316ae61bc60d
-EBUILD zabbix-1.8.13.ebuild 8596 RMD160 30278ea1608f480afa22a23fe73e2b10538ef735 SHA1 fcc2e606a64b66546342d994a3f76e25af17f896 SHA256 0f888d02e1edf493ac5e2afe293c79a7c32a45dfc35d6e6902a82512d1fc5426
-EBUILD zabbix-2.0.0_rc4.ebuild 10572 RMD160 c26186c5d67d91ab33424da64e88dcacbbe56301 SHA1 5b73995fa35ff1add3c4c7287af9a9469ff9a9d6 SHA256 21d7b1268325414132e638d25c67e03556ac91c06bc10279d0c1382ce3f425ed
-MISC ChangeLog 20837 RMD160 2f07de84f2757e76c74db8dc36b3b18dd797e9e1 SHA1 deaa2891bee23dcfa74df954e3bbf463c8b27426 SHA256 2606859043c69ec856bde9c4fca18b4d3133366effb184a54ea4af24fc4805fd
+EBUILD zabbix-2.0.0_rc5.ebuild 10638 RMD160 a49ef418d31c17bad0438558e5a5e2410716789d SHA1 6c7cb3572da6405b62033cfd6411f60e37623c6a SHA256 c9e7e0a8c4221f518c44957c69d0f7497dd0ad0bbd390c9f12b44c33653f18e9
+MISC ChangeLog 21664 RMD160 fa30897ab6e34900caab878b493abd2d28d0d947 SHA1 ffc62e5685a10ebc858e391bc551329770d6f6ee SHA256 89eca7fea10dd53728e72094ef59c97e2d802772c467a48f3f7db667d28838e9
 MISC metadata.xml 1192 RMD160 643f1b9296eba1f769fe042a29700fe1e2969981 SHA1 89f5fc5cff2ae2c6e930465dbb76b576c8b78fc6 SHA256 a1ad2643da11113f3315b4eb42782f514437c7093badc9d91a921c43f1a79141
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPsuJSAAoJEC1LWXx4YDenpdAH/RzC7I0Jw1fHxUjB6076e/E/
-t3G3iI4RQdb7owA/MPYfsdHG3k++fiDd1e7HA56fa88axWCCm9mFe/k8kE+X3Feu
-IwTDaHsK3T8CUHQiDg9iBsAwooNeC9wIBiE3YhvGWlx6gUryN1czxORLnYOvsb+2
-NwyqetN8cZuJbWvsA42230QLc+dw5XFL8Qp8NxhrXfN/uibV9lDyp75gQ9YxSs6A
-7BoIaQLGZcm2iJdrytTbAmyZoWkOVaD6NEWMW9ZWibwSowcYG9SEjc+lf40ASm4z
-Q12ogLnLbfELPJMlexWG1wA8sK/NdkyErNKbaEegUfSB3H55etqJkEg970EpTs0=
-=9uBo
+iQEcBAEBAgAGBQJPtd6oAAoJEC1LWXx4YDenbBsH/1FQbpHVx6ML/Yow81/t4GfO
+Bmg8wkK/+nj4PLkVvKY8XwlrN57E5TDf9giCfFANjVLuVN9J5BzLA11CfoDVSO7M
+XvOd1aAYxPEt3ihWt5BY74/uOdkQr7Vc+cVOlTN73P+OzY66kRdqR8nOGH7W1VKq
+LlgmkLZGIDIfGDuELUh1nRM/L+0S9sCODQbmmZx8DZZ6TepKYrrQ36tuG/arHkj/
+UJoJR0BcvYg93NUVLVjCRsiSZh5VZKJAZiTMVdsAzKKDYM1Al5yMFa2SvrWS057z
+SdIb1GCZap4ApvvYj6CJXpoOOFie/3o3N3N41Dv+87ikWdSxg/rnHy6XYlpe1H4=
+=hejb
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd-r1 b/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd
index 812d74677094..2a92bc01b814 100644
--- a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd-r1
+++ b/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd-r1,v 1.1 2012/05/11 14:57:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd,v 1.1 2012/05/18 05:31:08 mattm Exp $
 
 pid_file="/var/run/zabbix/zabbix_agentd.pid"
 
diff --git a/net-analyzer/zabbix/zabbix-1.8.13.ebuild b/net-analyzer/zabbix/zabbix-1.8.13.ebuild
deleted file mode 100644
index d3ab17daef5d..000000000000
--- a/net-analyzer/zabbix/zabbix-1.8.13.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# 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.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
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers."
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-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 iodbc odbc static"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	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 )
-	ssh? ( net-libs/libssh2 )
-	odbc? (
-		iodbc? ( dev-db/libiodbc )
-		!iodbc? ( dev-db/unixODBC )
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( <=net-analyzer/fping-2.9 )
-	server? ( <=net-analyzer/fping-2.9
-		app-admin/webapp-config )
-	frontend? ( dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session]
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-use frontend && need_php_httpd
-
-src_prepare() {
-	eautoreconf
-}
-
-pkg_setup() {
-	if use server || use proxy ; then
-		local dbnum dbtypes="mysql oracle postgres sqlite" dbtype
-		declare -i dbnum=0
-		for dbtype in ${dbtypes}; do
-			use ${dbtype} && let dbnum++
-		done
-		if [ ${dbnum} -gt 1 ]; then
-			eerror
-			eerror "You can't use more than one database type in Zabbix."
-			eerror "Select exactly one database type out of these: ${dbtypes}"
-			eerror
-			die "Multiple database types selected."
-		elif [ ${dbnum} -lt 1 ]; then
-			eerror
-			eerror "Select exactly one database type out of these: ${dbtypes}"
-			eerror
-			die "No database type selected."
-		fi
-		if use oracle; then
-			if [ -z "${ORACLE_HOME}" ]; then
-				eerror
-				eerror "The environment variable ORACLE_HOME must be set"
-				eerror "and point to the correct location."
-				eerror "It looks like you don't have Oracle installed."
-				eerror
-				die "Environment variable ORACLE_HOME is not set"
-			fi
-			if has_version 'dev-db/oracle-instantclient-basic'; then
-				ewarn
-				ewarn "Please ensure you have a full install of the Oracle client."
-				ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-				ewarn
-			fi
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		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."
-		elog
-		elog "For more info read the Zabbix manual at"
-		elog "http://www.zabbix.com/documentation.php"
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "Add these lines in the /etc/services :"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	elog "Zabbix is incompatible with fping 3.0 - (Zabbix bug #ZBX-4894)."
-	elog
-
-	# repeat fowners/fperms functionality from src_install()
-	# here to catch wrong permissions on existing files in
-	# the live filesystem (yeah, that sucks).
-	chown -R zabbix:zabbix \
-		"${ROOT}"/etc/zabbix \
-		"${ROOT}"/var/lib/zabbix \
-		"${ROOT}"/var/lib/zabbix/home \
-		"${ROOT}"/var/lib/zabbix/scripts \
-		"${ROOT}"/var/log/zabbix \
-		"${ROOT}"/var/run/zabbix
-	chmod 0750 \
-		"${ROOT}"/etc/zabbix \
-		"${ROOT}"/var/lib/zabbix \
-		"${ROOT}"/var/lib/zabbix/home \
-		"${ROOT}"/var/lib/zabbix/scripts \
-		"${ROOT}"/var/log/zabbix \
-		"${ROOT}"/var/run/zabbix
-
-	chmod 0640 \
-		"${ROOT}"/etc/zabbix/zabbix_*
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				ebeep 3
-				epause 5
-				;;
-		esac
-	fi
-}
-
-src_configure() {
-
-	local myconf
-
-	if use odbc && use iodbc ; then
-	   myconf="${myconf} --with-iodbc --without-unixodbc"
-	elif use odbc && ! use iodbc; then
-	   myconf="${myconf} --with-unixodbc --without-iodbc"
-	else
-	   myconf="${myconf} --without-unixodbc --without-iodbc"
-	fi
-
-	econf \
-		$myconf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		|| die "econf failed"
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/1.6.6"/zabbix_server.conf \
-			"${FILESDIR}/1.6.6"/zabbix_trapper.conf
-		doinitd \
-			"${FILESDIR}/1.6.6"/init.d/zabbix-server
-		dosbin \
-			src/zabbix_server/zabbix_server
-		dodir \
-			/usr/share/zabbix/database
-		insinto /usr/share/zabbix/database
-		doins -r \
-			upgrades \
-			create
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_server.conf \
-			/etc/zabbix/zabbix_trapper.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_server.conf \
-			/etc/zabbix/zabbix_trapper.conf
-	fi
-
-	if use proxy; then
-		doinitd \
-			"${FILESDIR}/1.6.6"/init.d/zabbix-proxy
-		dosbin \
-			src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/1.6.6"/zabbix_proxy.conf
-		dodir \
-			/usr/share/zabbix/database
-		insinto /usr/share/zabbix/database
-		doins -r \
-			upgrades \
-			create
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/1.6.6"/zabbix_agent.conf \
-			"${FILESDIR}/1.6.6"/zabbix_agentd.conf
-		doinitd \
-			"${FILESDIR}/1.6.6"/init.d/zabbix-agentd-r1
-		dosbin \
-			src/zabbix_agent/zabbix_agent \
-			src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-2.0.0_rc4.ebuild b/net-analyzer/zabbix/zabbix-2.0.0_rc5.ebuild
index 601d693ec49b..614f3a26753f 100644
--- a/net-analyzer/zabbix/zabbix-2.0.0_rc4.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.0.0_rc5.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_rc4.ebuild,v 1.1 2012/05/13 21:42:17 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.0_rc5.ebuild,v 1.1 2012/05/18 05:31:08 mattm Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ 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"
+IUSE="agent java 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? (
@@ -174,6 +174,8 @@ pkg_postinst() {
 	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 "Upgrading from rc3/rc4 to rc5 also requires db update."
+	elog
 	elog "At some point, there should be some support for upgrading from 1.8.x"
 	elog "to a 2.0.x release."
 	elog
@@ -327,7 +329,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}/2.0"/init.d/zabbix-agentd
 		dosbin \
 			src/zabbix_agent/zabbix_agent \
 			src/zabbix_agent/zabbix_agentd