Bump for 2.0.12 and 2.2.3

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x786037A7

4 files changed, 419 insertions, 8 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 86a679e7318b..dda51a907977 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/zabbix
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.159 2014/04/13 11:55:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.160 2014/05/14 05:58:48 mattm Exp $
+
+*zabbix-2.0.12 (14 May 2014)
+*zabbix-2.2.3 (14 May 2014)
+
+  14 May 2014; Matthew Marlowe <mattm@gentoo.org> +zabbix-2.0.12.ebuild,
+  +zabbix-2.2.3.ebuild, -zabbix-2.2.2-r1.ebuild:
+  Bump for 2.0.12 and 2.2.3
 
 *zabbix-2.2.2-r1 (13 Apr 2014)
 
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index e58675ca0e40..2c857095ba3c 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -47,15 +47,21 @@ AUX zabbix-proxy.tmpfiles 35 SHA256 d0516a64ad0841dac41faf0ca709ff16405346f1e9d1
 AUX zabbix-server.service 281 SHA256 53465d624fc5cd4d00586119234c2d3d763b63a2721f9410392cb77f73db4a74 SHA512 b002e8efdc58300fc06ed1e1028f64d525dfaff52d74e661dbb4da3750b785d817d2bdff96f4ea3a28545fda4e37df962ec7a28b70868cc4b50b63ea27b088ff WHIRLPOOL caf2ef91caf33b517623e5c4e81bf635886d5199ec1f33389dee33cbb2d13c78d54911daac2d1af317d0b2b32d361424a961d7530a690d30f3d0089fb96e4808
 AUX zabbix-server.tmpfiles 35 SHA256 d0516a64ad0841dac41faf0ca709ff16405346f1e9d1bcb00dcffe37ac6b689b SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df WHIRLPOOL f8a3202aa65ecdf733cd8f9208c294dd2086d4de11682c01bd18f7122b0c3d2e1e3da4775020beca68f5bb9be8e14f57c50b0c18ecbad3c2c23237d3572e3b39
 DIST zabbix-2.0.11rc1.tar.gz 13679724 SHA256 cb707886adf4e0c1425836b360b1e858e4cb607fdbda328715c6236dbbe5bff8 SHA512 f617b7f3315f886b8da9617aad4f732edf3bd353e948bd2df895f370dfce99968fe0619f860681fe9d28a707bbed76c3cd5a4d3fc0fac032179a0f305e42db61 WHIRLPOOL 7e5c37769c15e95ed5f454ff71aa56cbf1805327567f37c1c237cfb3871d9717543d951f64f511cd76b0d755f3947f26bd56fb2df6d0fda374380b5095d9d83a
-DIST zabbix-2.2.2.tar.gz 14595839 SHA256 e00ef9a1d667284a2bc2ce04966204ee094ade2c0bc6a94efb9436a9aa5cb2be SHA512 603bab20c1b37591e4e2b17fdc9e28eff119ae6cc7b9aa2fe1841956c192da56d3c43b9f85deb4268d5d12a698237ffd80c3f596e62f9dbae1a1f316a1dd8016 WHIRLPOOL 1fc2622d067c955288c735da1857cffc97d2fdee43fbfc1badb722ddc9375a988c712abe01726d6085b4dd61461737f3366c9efaf38928cdfeaa38ecac91f041
+DIST zabbix-2.0.12.tar.gz 13699618 SHA256 f9237297b37d41eb0ed4f0b2e1f3f2e30dc17fe19d3bbd57fb06d5f6f8acd8b7 SHA512 0b6b27eae51c991cfdc916dbcfc43e6425f44935ffb1a7fd642d0ee62813e2209a7be62ca6803b033a9371df054e3e102cc7d5591f488fb1e4f2b6b5f2977d04 WHIRLPOOL c153afc541661d54665238cc6b412d126372cbf08e2d867981976e28bb452c3c0602f1ed2387aa362b6ff3c0363e8e0d80ea519874703082691ba108e5ebbe26
+DIST zabbix-2.2.3.tar.gz 14649686 SHA256 12a75762d474227f9af8b44abe48dd2660a76713335a37fc8147aca3c79844c1 SHA512 3c582a316ea8c01f21ff2f48de25d3173bfa5515aed5b96758d87f14fa437da01cbe6044372f16aa82c68e1f522f54f2faf1484f7a1be90dbd85925d786e036f WHIRLPOOL 496099449c195fec4be782584d0279ca82b79b44def1349efbec609aa35f14722d4a3883deb497a78846edfce9d07345acda1509c9664982c443706031969c31
 EBUILD zabbix-2.0.11_rc1-r1.ebuild 10562 SHA256 fa668b1082cf0499f0e7891c19aa69640b29c0e99960f2ff4e4cd795cf6cd23b SHA512 f9ba2191e30393bcd54488c51433983bfad35284577c9c656070f821ee89ae9ecf33dbe27b3e46c203b150ea5fb3702a191c17086da10586c4e52d1b8293acd5 WHIRLPOOL cc1da5ba165c57c3434e1f7e145f650e9aec2c1eb6df0ce76cbb17d4b76d2d014211b586b7568205e31fc74a28c03ee85915a2192089b084e15412d0d5fd2a04
-EBUILD zabbix-2.2.2-r1.ebuild 10023 SHA256 a4ce2b3140cc5f52530f500fb33471ee386272063bc895d46353a0993ae638e1 SHA512 9dbd3f4405af1c286e08a9214d41dbfc24f5df762919ec121ce43fcb0089fa0f2e15ce1cb0ffb49fe4507d188c226e92bb9b69d4246542e98b3a2f7c0f4bca07 WHIRLPOOL 5e4a4a834e856ac36c29fec512044e05fa133ddcbd9b2365f906dc98e54a0bf6f7ee7a8374e596fd0efe96baef060b6dd59f3b57c0e9b771a113fe8547ce1d3b
-MISC ChangeLog 36756 SHA256 8c993f81eb4a0a4fcbbfb2540768bfd993df58cac22412d6a1cb137258c9ce2e SHA512 7f4fc43bc95100b4da0c3d32858f2dcc9f348c14cd0ab5db5071cc00bdcbd35d2a6097285f00eeadeb30fe5052bd2400de7ffbad0a83948c642eae867eb97a75 WHIRLPOOL 81e0652530c54f0364ee320351464ad8e4700795438efa7aa594251d19937bb0aa2e16a308152374536c53ef29d7a439beb718df8a8a102b508c6cfc25f0d794
+EBUILD zabbix-2.0.12.ebuild 10559 SHA256 5c0596e5d2fbfed4b3ca4d8aca077963e096a51d85a5514a742360999964cc69 SHA512 05444ff4400e4d4e0ad5bb755f9950d88129a6315d623805a1eb5dd0454708ca2f42006531fb0d94ebcad377022e368eb56d4ab2462258b1c5023ae319b8412f WHIRLPOOL 61717d4c668fbea022b7588c79acc2567d4832afd3fb09c6d23381ff40f69ea9150d431d041438b6ec46e31b4a8ed2f91eff0bb6a397684ee237e01732ba9f3c
+EBUILD zabbix-2.2.3.ebuild 10182 SHA256 938663a6d20c3cb8d34e946c01649e5af46d6e92f0bec0104d768a3ce2693b11 SHA512 e0abef7ec935a9e93d195dab6f0cba60c768f6c9b58b3d4d4e47893421840ce07124898956b2f50194dc5e1fc328fd6abe46013ce2073d0432da5c22a794df07 WHIRLPOOL 816375ddf9acefe81118aebe9c404f21693519ad1ca4f772c5b74f4dabcbcf039f4c1d8aa3d433cdb2fe51568def9fbc79277083f1b7f6eb141e0b2842dad219
+MISC ChangeLog 36965 SHA256 56994e98c3b1092e795c83f9232ba960173bc45a7d7f39e617f11d8b4e6938d8 SHA512 cb6ba76321f364b34671b99c1775c6923e63772227e412662362eddcd3042a5f21efd243ecd86818f8d3ba1ed35d594a5a82a794d8f5a89639f291d4013827b0 WHIRLPOOL f299e97208d41ff5db8c907756ed865e730752f0b7c2384fdad86fad337a00e4807afb5fa073429f71978889c8c07330801bc2342ad06414d8c4677f90915d45
 MISC metadata.xml 1221 SHA256 94d1841cf3efb9a709dbc9ee160a29c394a1c0f5af5069fe1466f9f08796c72d SHA512 3d3ed8e75fcd9f521402a9734d5bd19c163a7a5d33cef3b20b6e476416fc352a91a62782ecc0ed032efbafd5f07f6ac08e28a88fb766095a1bba146f8f50b5e5 WHIRLPOOL ae2d69cab99c364721ca2e806fc5e02d1dbe72ad48bea43b4d1a0fd49c00cc2b94ea6ea85f4f5a9ff90522a90ade17fe816fe85ca7a16e755d02239d4426da92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNKey8ACgkQCaWpQKGI+9Qf2ACfVZetPeJaiVTXrC+OceuUqzn4
-GS0AnA7f7XJnMGBQoHhMYYh6ZAqaTk6i
-=Wt1H
+iQEcBAEBCAAGBQJTcwYiAAoJEC1LWXx4YDenGWkH/0G5LvKFWH332M0vEeJ4+N7F
+KIX9fA5LwRzGun1XA2/6FfKgl/ked8QYY7Qyzutg+oKVhhKp05ofb89Npg7zNxtx
+0zqojH7FwV8NKxIIJnPw3UAH/YVOSoiU38/2A86yXsOAizaYTpv1qXyI6gnZi2ev
+7EgqVpzw6AS0AnRpcsFxss2MSQkAFM0lWMs/91/lYrdmaa8DLKwmp3i7i7TEsGMk
+xvoUGkMhZul2Ck2ip+l5omI0/Wu8UyelcS62HG0r6KxxcH72mPzNY4K2zVgMX5G6
+ns+Y1RMhi2nseO9cm5sVZXimF8s9BzzZ/TsFbInbVbgY6iqXg3kPGfIisZX6sjA=
+=oXdK
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/zabbix/zabbix-2.0.12.ebuild b/net-analyzer/zabbix/zabbix-2.0.12.ebuild
new file mode 100644
index 000000000000..4c6d6fffdc97
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-2.0.12.ebuild
@@ -0,0 +1,394 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.12.ebuild,v 1.1 2014/05/14 05:58:48 mattm Exp $
+
+EAPI="5"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp depend.php autotools java-pkg-opt-2 user toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers."
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+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 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-5.0 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( >=dev-db/postgresql-base-8.3.0 )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	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,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+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() {
+	epatch "${FILESDIR}/2.0/patches/zbx282.patch"
+	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 "Execute schema, images, and data sql files in that 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}" ] && \
+		   [ "${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 "Feel free to download or contribute gentoo specific zabbix templates"
+	elog "via https://github.com/deploylinux/gentooZabbixTemplates (WIP)."
+
+	# 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
+	chmod 0750 \
+		"${ROOT}"/etc/zabbix \
+		"${ROOT}"/var/lib/zabbix \
+		"${ROOT}"/var/lib/zabbix/home \
+		"${ROOT}"/var/lib/zabbix/scripts \
+		"${ROOT}"/var/log/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
+				;;
+		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
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/log/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}/2.0"/init.d/zabbix-server
+		dosbin \
+			src/zabbix_server/zabbix_server
+		dodir \
+			/usr/share/zabbix
+		insinto /usr/share/zabbix
+		doins -r \
+			database \
+			upgrades
+		#remove unneeded files left over from wholesale copy (bug #433708)
+		rm "${ED}"/usr/share/zabbix/{database,upgrades}/Makefile{,.in,.am}
+		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}/2.0"/init.d/zabbix-proxy
+		dosbin \
+			src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.0"/zabbix_proxy.conf
+		dodir \
+			/usr/share/zabbix
+		insinto /usr/share/zabbix
+		doins -r \
+			database \
+			upgrades
+	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
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/log/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-${MY_PV}.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}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-2.2.2-r1.ebuild b/net-analyzer/zabbix/zabbix-2.2.3.ebuild
index fc8fa760f6ac..93e8207c4e85 100644
--- a/net-analyzer/zabbix/zabbix-2.2.2-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.2-r1.ebuild,v 1.1 2014/04/13 11:55:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.3.ebuild,v 1.1 2014/05/14 05:58:48 mattm Exp $
 
 EAPI="5"
 
@@ -255,6 +255,8 @@ src_install() {
 		dosbin src/zabbix_server/zabbix_server
 		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
 		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
 		systemd_dounit "${FILESDIR}/zabbix-server.service"
 		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
 	fi
@@ -267,6 +269,8 @@ src_install() {
 		insinto /etc/zabbix
 		doins \
 			"${FILESDIR}/2.2"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
 		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
 		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
 	fi