Don't run java-config in the global section of the ebuild

diff --git a/kde-base/kdejava/ChangeLog b/kde-base/kdejava/ChangeLog
index 4c1f81262ed625fe32dde36e822fc01b90b62d52..b6fd573d8d91dee9093fd9d8cfcd9a6b117812ca 100644 (file)
--- a/kde-base/kdejava/ChangeLog
+++ b/kde-base/kdejava/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdejava
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/ChangeLog,v 1.1 2004/11/06 17:23:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/ChangeLog,v 1.2 2004/11/12 12:51:40 danarmak Exp $
+
+  12 Nov 2004; Dan Armak <danarmak@gentoo.org> kdejava-3.3.1.ebuild:
+  Don't run java-config in the global par of the ebuild.
 
 *kdejava-3.3.1 (06 Nov 2004)
 

diff --git a/kde-base/kdejava/Manifest b/kde-base/kdejava/Manifest
index 4af6f073a38b5fe5553f91946d8730342b6b755d..07f824de083c3baa6170b5c6bae1ceea66f9af1a 100644 (file)
--- a/kde-base/kdejava/Manifest
+++ b/kde-base/kdejava/Manifest
@@ -1,6 +1,6 @@
-MD5 fa75bd48589991c54f243a4a711a9a55 ChangeLog 621
-MD5 52f028142304123a726c8f2cbb17099b kdejava-3.3.1.ebuild 1226
+MD5 11d6a08e85178c8da71ed39c7e17fc60 kdejava-3.3.1.ebuild 1289
+MD5 95ccce3a31dbe74549d19da7893e1cf2 ChangeLog 748
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 9598e813037e1a6ea89142a23ac4018a files/classpath.diff 460
 MD5 fc46ca78f5d80f074b350dc510f1858c files/digest-kdejava-3.3.1 148
 MD5 5b4709a4940e69ed965855ca38b4ee56 files/no-gtk-glib-check.diff 596
+MD5 9598e813037e1a6ea89142a23ac4018a files/classpath.diff 460

diff --git a/kde-base/kdejava/kdejava-3.3.1.ebuild b/kde-base/kdejava/kdejava-3.3.1.ebuild
index 1610651f245225ca4f51ec65ce8a939b1a66d29f..4c9c0bb136a9ec58bb33e1875e35c5d2a6bc7af9 100644 (file)
--- a/kde-base/kdejava/kdejava-3.3.1.ebuild
+++ b/kde-base/kdejava/kdejava-3.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.3.1.ebuild,v 1.2 2004/11/07 02:58:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.3.1.ebuild,v 1.3 2004/11/12 12:51:40 danarmak Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY=qtjava
@@ -16,7 +16,6 @@ DEPEND="$COMMONDEPEND virtual/jdk"
 RDEPEND="$COMMONDPEND virtual/jre"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff $FILESDIR/classpath.diff"
 
-myconf="$myconf --with-java=`java-config --jdk-home`"
 
 # Probably missing other kdebase, kdepim etc deps
 # Needs to be compiled with just kdelibs installed to make sure
@@ -24,13 +23,18 @@ myconf="$myconf --with-java=`java-config --jdk-home`"
 # Someone who knows about java-in-gentoo should look at this and the
 # other java kdebindings, and fix the stupid thing
 src_unpack() {
-       kde-meta_src_unpack
+    kde-meta_src_unpack
+    
+    # $PREFIX-dependant, so don't go into the makefile tarballs
+    cd $S/kdejava/koala/org/kde/koala
+    for x in Makefile.am Makefile.in; do
+       mv $x $x.orig
+       sed -e "s:_CLASSPATH_:$(java-config -p qtjava):" $x.orig > $x
+       rm $x.orig
+    done
+}
 
-       # $PREFIX-dependant, so don't go into the makefile tarballs
-       cd $S/kdejava/koala/org/kde/koala
-       for x in Makefile.am Makefile.in; do
-               mv $x $x.orig
-               sed -e "s:_CLASSPATH_:$(java-config -p qtjava):" $x.orig > $x
-               rm $x.orig
-       done
+src_compile() {
+    myconf="$myconf --with-java=`java-config --jdk-home`"
+    kde-meta_src_compile
 }