Bump for Zabbix 2.0! Everyone go wild! Also, some minor init script and elog msg updates.

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

6 files changed, 54 insertions, 424 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 9b8527f4f03a..37787c4b986c 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.96 2012/05/21 09:15:02 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.97 2012/05/22 11:34:02 mattm Exp $
+
+*zabbix-2.0.0 (22 May 2012)
+
+  22 May 2012; Matthew Marlowe <mattm@gentoo.org>
+  files/2.0/init.d/zabbix-agentd, -zabbix-2.0.0_rc6.ebuild,
+  -zabbix-2.0.0_rc6-r1.ebuild, +zabbix-2.0.0.ebuild,
+  +files/2.0/init.d/zabbix-server:
+  Bump for zabbix 2.0 plus minor init script and elog msg updates
 
   21 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> zabbix-1.8.11-r2.ebuild:
   x86 stable wrt bug #414551
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 9f69b8c7479b..5a13afb939ba 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX 1.4.6/init.d/zabbix-agentd 581 RMD160 8cc0a23e8ebc52a5d4b95620aaf59f475b128b40 SHA1 5bb2adca43c60ab0f4cfa561870707fa73b9f250 SHA256 5afaed3880c7f8d1a13d51d963f2758a0bc3ec982c667cc2aad9c84d44753452
 AUX 1.4.6/init.d/zabbix-server 563 RMD160 1aa037f694ae1e11e4807375ed805f4865a3d29e SHA1 7f9bd64343145961400958c881244772e4bd38ad SHA256 8c2bc6b7dc1fb80e6b24536f7acb7ba102975b345da055cc19e33adfcdb95976
@@ -24,13 +24,14 @@ 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 2.0/init.d/zabbix-agentd 666 RMD160 c2d8426ad1442e61a6e128691b1abfa8405bed12 SHA1 0cf9f5e934351aac0eb6532fbe012dcaa1c1a170 SHA256 e6472d4a9805ebe44462a397839a06560a8b06146368cdb3d49397d37b6cdb94
+AUX 2.0/init.d/zabbix-server 598 RMD160 c584152f4d40ccdc9aded4b57bb24e13695565de SHA1 f6809b1a50f9634f80d9a33670527d6e5a6819bd SHA256 4d17f4966513c068b6097125d0ae34a371fbd4edbea3b1c52c1b0620e2cac19b
 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.0rc6.tar.gz 12087462 RMD160 34b5eeb0a84afd320dae786947ad2ea3046b3ce3 SHA1 77378dc3f130117240981b026d7f04ae7cbe2528 SHA256 094ffd7d6430d43bea8cd48e522cc4fe64b3c422bd8481e45329ad9af6b2b1a4
+DIST zabbix-2.0.0.tar.gz 12091622 RMD160 c6c9e57cb1ce69aed45af921760d9f59d065da98 SHA1 19f0ed5174e4578c6e6f764439bdeadb7237e463 SHA256 52cc4b8a8624d53ff4591ebf86a92c19230964d46d39e5cccf7b8648fb2ecf4d
 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,14 +39,17 @@ EBUILD zabbix-1.8.11-r2.ebuild 8599 RMD160 c1b2943b453b66f93ffbf098644a2d86d5ff6
 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-2.0.0_rc6-r1.ebuild 10692 RMD160 599d6dcbccaf604f619e0788fddd16cf3cc50831 SHA1 504da87207bc53d9de9528e659150ab8649616ca SHA256 d33c833b02ec0bc1ec4ccb339d46e47df8c214591ddedb50b70a4ef4291f6472
-EBUILD zabbix-2.0.0_rc6.ebuild 10638 RMD160 c3d0571f88fd98bcb5fd333c9f2a027301e7d403 SHA1 af630149d91333924af77ac1ee8c4e42a4f45acc SHA256 45c704571f9e2dd219e10bd1fd35ab30f42ed206c5d240cdf35c4e7991711070
-MISC ChangeLog 22222 RMD160 66092beb250e2a1e8c84f61857ae026aee23791c SHA1 aa373099e070c71c74a2d1a701412fd44332df17 SHA256 029876d373992293cae862b2a87e71969db402d757272a55b850353b3a82aeb6
+EBUILD zabbix-2.0.0.ebuild 10816 RMD160 d6f23d88b03107ac59bbbfbe932065c0c3881981 SHA1 2614bde725ed41099f9e6ff99470236259ce80ab SHA256 3825077f30ec4b803c8a1ee14860ebe5bcdec8d00d65510727e365144d4d1806
+MISC ChangeLog 22511 RMD160 c85389f75295adada0c992d943873f5c4f353294 SHA1 c64ef6ab67df60b33a3338e5ef51cce9b77fd5e2 SHA256 2bfc242ebffa08b2b0d669b695e8b343033bcc6463ca69a8e8a4499165f50104
 MISC metadata.xml 1192 RMD160 643f1b9296eba1f769fe042a29700fe1e2969981 SHA1 89f5fc5cff2ae2c6e930465dbb76b576c8b78fc6 SHA256 a1ad2643da11113f3315b4eb42782f514437c7093badc9d91a921c43f1a79141
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk+6B5QACgkQuUQtlDBCeQLHYQCePUy580FzbfWjYJJrUs41r54B
-mYAAoIPsNXOj+XXdTtsM1qOsoU0eudJK
-=ptcw
+iQEcBAEBAgAGBQJPu3m4AAoJEC1LWXx4YDen7wEIAIi6+dYmwOBMNqgsyPugfyJk
+jvxEzi/QsUe/jFFjKEhbvL7qOCU8BQBonnwcRAWGgnz7fUVwJukz/44zsh8M/M/6
+9SjeLtIljz0NFFAc1kxyuUYvKvMcGbmT8o5FbDB0bBWCTQYCt/D9lZkhOc6HKDAl
+tBNZ7WBjFv4Ol/Cq47wbp207MdhLyLn7O6o/QQT8xQ2lo/kHWqnRxMT04J/quS01
+bTCaQCNCgjVI4dtv24JURuiK/Q6hATU5/RwZHLNSpJAsV+5qClBHEFztDGTfAY57
+u09VXEU6dip3/Bdk5QuFc97UpeJWhF0W9O6tUAbPjS8HQ8BrjFFW5KMZ5BmLvl8=
+=wwP1
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd b/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd
index 2a92bc01b814..294881238c2c 100644
--- a/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd
+++ 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/2.0/init.d/zabbix-agentd,v 1.1 2012/05/18 05:31:08 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd,v 1.2 2012/05/22 11:34:02 mattm Exp $
 
 pid_file="/var/run/zabbix/zabbix_agentd.pid"
 
@@ -14,7 +14,7 @@ depend() {
 start() {
 	ebegin "Starting Zabbix agent"
 	start-stop-daemon --start --pidfile ${pid_file} \
-		--user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd
+		--user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd -- -c /etc/zabbix/zabbix_agentd.conf
 	eend $?
 }
 
diff --git a/net-analyzer/zabbix/files/2.0/init.d/zabbix-server b/net-analyzer/zabbix/files/2.0/init.d/zabbix-server
new file mode 100644
index 000000000000..7aad616a51a1
--- /dev/null
+++ b/net-analyzer/zabbix/files/2.0/init.d/zabbix-server
@@ -0,0 +1,21 @@
+#!/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/2.0/init.d/zabbix-server,v 1.1 2012/05/22 11:34:02 mattm Exp $
+
+depend() {
+	need net
+	use mysql postgresql
+}
+
+start() {
+	ebegin "Starting Zabbix server"
+	start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Zabbix server"
+	start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_server.pid
+	eend $?
+}
diff --git a/net-analyzer/zabbix/zabbix-2.0.0_rc6-r1.ebuild b/net-analyzer/zabbix/zabbix-2.0.0.ebuild
index 3ec2f34cc355..29fe0688da07 100644
--- a/net-analyzer/zabbix/zabbix-2.0.0_rc6-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.0.0.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_rc6-r1.ebuild,v 1.1 2012/05/21 04:42:08 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.0.ebuild,v 1.1 2012/05/22 11:34:02 mattm Exp $
 
 EAPI="2"
 
@@ -128,9 +128,13 @@ pkg_postinst() {
 		elog "Have a look at /usr/share/zabbix for"
 		elog "database creation and upgrades."
 		elog
+		elog "Execute schema, images, and data sql files in order."
+		elog
 		elog "For more info read the Zabbix manual at"
 		elog "http://www.zabbix.com/documentation.php"
 		elog
+		elog "New use flags: java, odbc, iodbc"
+		elog
 
 		zabbix_homedir=$(egethome zabbix)
 		if [ -n "${zabbix_homedir}" ] && \
@@ -174,21 +178,17 @@ pkg_postinst() {
 	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 "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
-	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
+	elog "Feel free to download or contribute gentoo specific zabbix templates"
+	elog "via https://github.com/deploylinux/gentooZabbixTemplates (WIP).  We may"
+	elog "eventually create a seperate package in portage for them."
 
 	# repeat fowners/fperms functionality from src_install()
 	# here to catch wrong permissions on existing files in
@@ -291,7 +291,7 @@ src_install() {
 			"${FILESDIR}/1.6.6"/zabbix_server.conf \
 			"${FILESDIR}/1.6.6"/zabbix_trapper.conf
 		doinitd \
-			"${FILESDIR}/1.6.6"/init.d/zabbix-server
+			"${FILESDIR}/2.0"/init.d/zabbix-server
 		dosbin \
 			src/zabbix_server/zabbix_server
 		dodir \
diff --git a/net-analyzer/zabbix/zabbix-2.0.0_rc6.ebuild b/net-analyzer/zabbix/zabbix-2.0.0_rc6.ebuild
deleted file mode 100644
index e93f05b3ac63..000000000000
--- a/net-analyzer/zabbix/zabbix-2.0.0_rc6.ebuild
+++ /dev/null
@@ -1,403 +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-2.0.0_rc6.ebuild,v 1.1 2012/05/19 03:45:29 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
-
-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=""
-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? (
-		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 )
-	java? ( >=virtual/jdk-1.4 )
-	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 )
-	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 )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-use frontend && need_php_httpd
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-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
-}
-
-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 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
-		elog "Have a look at /usr/share/zabbix 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 "You may need to add these lines to /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
-	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
-	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
-
-	# 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_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(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
-		insinto /usr/share/zabbix
-		doins -r \
-			database \
-			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
-		insinto /usr/share/zabbix
-		doins -r \
-			database \
-			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}/2.0"/init.d/zabbix-agentd
-		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 \
-		conf/zabbix_agent.conf \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	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
-
-	if use java; then
-	   dodir \
-	   	/${ZABBIXJAVA_BASE} \
-		/${ZABBIXJAVA_BASE}/bin \
-		/${ZABBIXJAVA_BASE}/lib
-	   keepdir /${ZABBIXJAVA_BASE}
-	   exeinto /${ZABBIXJAVA_BASE}/bin
-	   doexe src/zabbix_java/bin/zabbix-java-gateway-2.0.0rc3.jar
-	   exeinto /${ZABBIXJAVA_BASE}/lib
-	   doexe \
-	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
-		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/slf4j-api-1.6.1.jar
-	   exeinto /${ZABBIXJAVA_BASE}/
-	   	src/zabbix_java/settings.sh \
-		src/zabbix_java/startup.sh \
-		src/zabbix_java/shutdown.sh
-	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-	fi
-
-}