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

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

diff --git a/kde-base/qtjava/Manifest b/kde-base/qtjava/Manifest
index 123cf6c8a1ce4b417045f1bbc3775dd573992704..140abd69382cc479b4b832009dbe56b853097466 100644 (file)
--- a/kde-base/qtjava/Manifest
+++ b/kde-base/qtjava/Manifest
@@ -1,5 +1,5 @@
-MD5 e56c573d7d02799e91efd120d47696a9 ChangeLog 594
+MD5 8654523266f1feffd273b004054b84b8 qtjava-3.3.1.ebuild 826
+MD5 418ca43ccb3485681f7292229eaf5a61 ChangeLog 721
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 bb6e642ef35288da8b23d29ee86e3b5b qtjava-3.3.1.ebuild 771
-MD5 40d7826397fd0b5022c26147829aa2ba files/digest-qtjava-3.3.1 147
 MD5 5b4709a4940e69ed965855ca38b4ee56 files/no-gtk-glib-check.diff 596
+MD5 40d7826397fd0b5022c26147829aa2ba files/digest-qtjava-3.3.1 147

diff --git a/kde-base/qtjava/qtjava-3.3.1.ebuild b/kde-base/qtjava/qtjava-3.3.1.ebuild
index f106fd8c64d02366d6ebf3a0164993a65808f3a0..bf16db72ee7d90b98fb99c5d02c70cf07b78fa7f 100644 (file)
--- a/kde-base/qtjava/qtjava-3.3.1.ebuild
+++ b/kde-base/qtjava/qtjava-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/qtjava/qtjava-3.3.1.ebuild,v 1.2 2004/11/07 02:57:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.3.1.ebuild,v 1.3 2004/11/12 13:57:46 danarmak Exp $
 
 KMNAME=kdebindings
 inherit kde-meta
@@ -11,17 +11,21 @@ IUSE=""
 DEPEND="virtual/jdk"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff"
 
-myconf="$myconf --with-java=`java-config --jdk-home`"
 
-# Doesn't really need kde, only kde? But then, it installs by default into $KDEDIR/...
+src_compile() {
+    myconf="$myconf --with-java=`java-config --jdk-home`"
+    kde-meta_src_compile
+}
+
+# Doesn't really need kde, only qt? But then, it installs by default into $KDEDIR/...
 
 # Someone who's into java should look over this...
 
 src_install() {
-       kde-meta_src_install
+    kde-meta_src_install
 
-       mkdir -p $D/usr/share/qtjava
-       cat > $D/usr/share/qtjava/package.env << EOF
+    mkdir -p $D/usr/share/qtjava
+    cat > $D/usr/share/qtjava/package.env << EOF
 DESCRIPTION=Java bindings for QT
 CLASSPATH=:$PREFIX/lib/java/qtjava.jar:
 EOF