Move the java-config inside the src_compile so it's not in global scope

4 files changed, 9 insertions, 6 deletions

diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 3269c3872763..8e27b68641f5 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -1,9 +1,9 @@
 MD5 d2b336b76f0df18ae5cb9be244885d95 kdebase-3.2.0.ebuild 3351
-MD5 225ead2af4d8f20fd140a3c3ec1e3f0c kdebase-3.2.2.ebuild 3360
+MD5 c3af616eaa4d50f47dabb47aef902f11 kdebase-3.2.2.ebuild 3346
 MD5 574ac4f80329d348dd3186ebd0963e43 kdebase-3.2.1.ebuild 3659
 MD5 2508997f7477fe6c4cfd06086e4b6a78 ChangeLog 22484
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 1181772de16bef04caca0cfd6479496d kdebase-3.1.5.ebuild 3627
+MD5 32004e321d6078f46002cd0228126d6d kdebase-3.1.5.ebuild 3629
 MD5 9b4df4afee8c5f857c91799f415a4ab2 files/kdebase-3.1.5-amd64-accessviol.patch 836
 MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
 MD5 160f44a51f4308c9c21052fd21c7d04d files/kdebase-3.2.0-kcontrol.patch 699
diff --git a/kde-base/kdebase/kdebase-3.1.5.ebuild b/kde-base/kdebase/kdebase-3.1.5.ebuild
index 0385e2a7349c..b98ab0496dcf 100644
--- a/kde-base/kdebase/kdebase-3.1.5.ebuild
+++ b/kde-base/kdebase/kdebase-3.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1.5.ebuild,v 1.6 2004/03/25 22:56:22 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1.5.ebuild,v 1.7 2004/04/23 00:21:56 caleb Exp $
 inherit kde-dist eutils
 
 IUSE="ldap pam motif encode oggvorbis cups ssl opengl samba java"
@@ -34,17 +34,20 @@ use oggvorbis 	&& myconf="$myconf --with-vorbis"	|| myconf="$myconf --without-vo
 use opengl	&& myconf="$myconf --with-gl"		|| myconf="$myconf --without-gl"
 use ssl		&& myconf="$myconf --with-ssl"		|| myconf="$myconf --without-ssl"
 use pam		&& myconf="$myconf --with-pam=yes"	|| myconf="$myconf --with-pam=no --with-shadow"
-use java	&& myconf="$myconf --with-java=$(java-config --jdk-home)"	|| myconf="$myconf --without-java"
 
 PATCHES=""
 
 src_unpack() {
+
 	kde_src_unpack
 	use amd64 && epatch ${FILESDIR}/kdebase-3.1.4-amd64-accessviol.patch
 	#cd ${S} && aclocal
 }
 
 src_compile() {
+
+	use java	&& myconf="$myconf --with-java=$(java-config --jdk-home)"	|| myconf="$myconf --without-java"
+
 	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
 	kde_src_compile
 }
diff --git a/kde-base/kdebindings/Manifest b/kde-base/kdebindings/Manifest
index 1ccd24d2fe9f..c79b0fdc81ba 100644
--- a/kde-base/kdebindings/Manifest
+++ b/kde-base/kdebindings/Manifest
@@ -1,7 +1,7 @@
 MD5 e64b37bbb67a36ccd25b8d95654c39fe kdebindings-3.2.0.ebuild 1582
 MD5 4593e03519f892da4aaabb15162a3b56 kdebindings-3.2.2.ebuild 1582
 MD5 6261db1a1b1512ef29132e090de9a565 kdebindings-3.2.1.ebuild 1580
-MD5 aaa34fc79c6178a065ba68e0b7dccd88 kdebindings-3.1.5.ebuild 1414
+MD5 e8a964b8876798a678617d4491a02072 kdebindings-3.1.5.ebuild 1440
 MD5 d0e042f43f0273067e4c88b83a237971 ChangeLog 8025
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 d4f762ee4e56e0866b0e10f823be10d0 files/digest-kdebindings-3.1.5 71
diff --git a/kde-base/kdeedu/Manifest b/kde-base/kdeedu/Manifest
index 382eeff47f94..a0be7de7df59 100644
--- a/kde-base/kdeedu/Manifest
+++ b/kde-base/kdeedu/Manifest
@@ -1,5 +1,5 @@
 MD5 5e353e815fb6335506b6385b1b9f553f kdeedu-3.2.1.ebuild 327
-MD5 58b33e98c7ea2ca8277daa22680e40e4 kdeedu-3.1.5.ebuild 436
+MD5 4e4cf574273af82dcdbcf2e300828927 kdeedu-3.1.5.ebuild 470
 MD5 8dfa3494a4d3ab8c753906c0e055ae57 kdeedu-3.2.0.ebuild 330
 MD5 3a2f851041ecd727132eda02ac201654 kdeedu-3.2.2.ebuild 334
 MD5 28b5a48669bc18cad1c9a95cd17ac00e ChangeLog 8496