--- collectd-5.4.1-r1.ebuild	2015-08-11 17:05:26.000000000 +0100
+++ collectd-5.4.1-r2.ebuild	2015-08-20 21:46:49.000000000 +0100
@@ -1,14 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 
 GENTOO_DEPEND_ON_PERL="no"
+JAVA_PKG_OPT_USE="collectd_plugins_java"
 # XXX: 5.4.1-r0 stated 2* but it builds fine against 3.4
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools base eutils linux-info multilib perl-app python-single-r1 systemd user
+inherit autotools base eutils java-pkg-opt-2 linux-info multilib perl-app python-single-r1 systemd user
 
 DESCRIPTION="A a daemon which collects system statistic and provides mechanisms to store the values"
 
@@ -69,7 +70,6 @@
 	collectd_plugins_gmond?			( sys-cluster/ganglia )
 	collectd_plugins_ipmi?			( >=sys-libs/openipmi-2.0.16-r1 )
 	collectd_plugins_iptables?		( >=net-firewall/iptables-1.4.13 )
-	collectd_plugins_java?			( virtual/jre dev-java/java-config-wrapper )
 	collectd_plugins_libvirt?		( app-emulation/libvirt dev-libs/libxml2 )
 	collectd_plugins_lvm?			( sys-fs/lvm2 )
 	collectd_plugins_memcachec?		( dev-libs/libmemcached )
@@ -106,11 +106,13 @@
 
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
+	collectd_plugins_java?			( >=virtual/jdk-1.6 )
 	kernel_linux? (
 		collectd_plugins_vserver?	( sys-kernel/vserver-sources )
 	)"
 
 RDEPEND="${COMMON_DEPEND}
+	collectd_plugins_java?			( >=virtual/jre-1.6 )
 	collectd_plugins_syslog?		( virtual/logger )
 	selinux?						( sec-policy/selinux-collectd )"
 
@@ -204,6 +206,7 @@
 		fi
 	fi
 
+	java-pkg-opt-2_pkg_setup
 	use collectd_plugins_python && python-single-r1_pkg_setup
 
 	enewgroup collectd
@@ -222,6 +225,11 @@
 	# fix installdirs for perl, bug 444360
 	sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || die
 
+	if use collectd_plugins_java; then
+		# Set javac -source and -target flags according to (R)DEPEND.
+		sed -i -e "s/\$(JAVAC)/\0 $(java-pkg_javac-args)/g" bindings/java/Makefile.am || die
+	fi
+
 	rm -r libltdl || die
 
 	eautoreconf
@@ -290,9 +298,9 @@
 		fi
 	done
 
-	# Need JAVA_HOME for java.
+	# JAVA_HOME is set by eclasses.
 	if use collectd_plugins_java; then
-		myconf+=" --with-java=$(java-config -g JAVA_HOME)"
+		myconf+=" --with-java"
 	fi
 
 	# Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
@@ -320,6 +328,7 @@
 
 	find "${D}/usr/" -name "*.la" -exec rm -f {} +
 
+	use collectd_plugins_java && java-pkg_regjar "${ED}"/usr/share/${PN}/java/*.jar
 	# use collectd_plugins_ping && setcap cap_net_raw+ep ${D}/usr/sbin/collectd
 	# we cannot do this yet