[patch] Patch to fix the issue.

munin.patch (text/plain), 2.13 KB, created by Serkan Kaba (RETIRED) on 2010-03-28 05:35:58 UTC

--- munin-1.4.4.ebuild	2010-03-28 08:23:49.000000000 +0300
+++ /home/firari/Desktop/munin-1.4.4.ebuild	2010-03-28 08:34:58.000000000 +0300
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.4.4.ebuild,v 1.1 2010/03/28 05:23:49 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.4.3.ebuild,v 1.3 2010/02/10 16:38:14 darkside Exp $
 
 EAPI=2
 
-inherit eutils
+inherit eutils java-pkg-opt-2
 
 DESCRIPTION="Munin Server Monitoring Tool"
 HOMEPAGE="http://munin.projects.linpro.no/"
@@ -21,7 +21,6 @@
 DEPEND_COM="dev-lang/perl
 			sys-process/procps
 			irc? ( dev-perl/Net-IRC )
-			java? ( >=virtual/jdk-1.5 )
 			mysql? ( virtual/mysql dev-perl/Cache-Cache )
 			ssl? ( dev-perl/Net-SSLeay )
 			postgres? ( dev-perl/DBD-Pg virtual/postgresql-base )
@@ -45,13 +44,16 @@
 
 # Keep this seperate, as previous versions have had other deps here
 DEPEND="${DEPEND_COM}
-	virtual/perl-Module-Build"
+	virtual/perl-Module-Build
+	java? ( >=virtual/jdk-1.5 )"
 RDEPEND="${DEPEND_COM}
-		!minimal? ( virtual/cron )"
+	!minimal? ( virtual/cron )
+	java? ( >=virtual/jre-1.5 )"
 
 pkg_setup() {
 	enewgroup munin
 	enewuser munin 177 -1 /var/lib/munin munin
+	java-pkg-opt-2_pkg_setup
 }
 
 src_prepare() {
@@ -60,15 +62,16 @@
 	epatch "${FILESDIR}"/${P}-Makefile.patch
 
 	# Don't build java plugins if not requested via USE.
-	if ! use java; then
-		# sed is needed so the java plugins aren't automagically built.
-		sed -i -e 's: build-plugins-java : :' \
-			-e 's: install-plugins-java : :' Makefile || die
-	fi
+	#if ! use java; then
+	#	# sed is needed so the java plugins aren't automagically built.
+	#	sed -i -e 's: build-plugins-java : :' \
+	#		-e 's: install-plugins-java : :' Makefile || die
+	#fi
+	java-pkg-opt-2_src_prepare
 }
 
 src_compile() {
-	emake -j 1 build build-man || die "build/build-man failed"
+	emake -j 1 JC=$(JAVAC) JFLAGS=$(JAVACFLAGS) JCVALID=$(use java && echo yes) build build-man || die "build/build-man failed"
 	if use doc; then
 		emake -j 1 build-doc || die "build-doc failed"
 	fi