diff options
| author |   Dan Armak <danarmak@gentoo.org> | 2004-11-12 12:51:40 +0000 |
|---|---|---|
| committer | Dan Armak <danarmak@gentoo.org> | 2004-11-12 12:51:40 +0000 |
| commit | 436710b57fc7bc7c000cdd3179d0ed65c4f44a32 (patch) | |
| tree | 5bf2bdd59a1cf33a59e227bb9252f86f3d249a0f /kde-base | |
| parent | new version (Manifest recommit) (diff) | |
| download | gentoo-2-436710b57fc7bc7c000cdd3179d0ed65c4f44a32.tar.gz gentoo-2-436710b57fc7bc7c000cdd3179d0ed65c4f44a32.tar.bz2 gentoo-2-436710b57fc7bc7c000cdd3179d0ed65c4f44a32.zip | |
Don't run java-config in the global section of the ebuild
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdejava/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/kdejava/kdejava-3.3.1.ebuild | 24 |
2 files changed, 18 insertions, 11 deletions
diff --git a/kde-base/kdejava/ChangeLog b/kde-base/kdejava/ChangeLog index 4c1f81262ed6..b6fd573d8d91 100644 --- 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/kdejava-3.3.1.ebuild b/kde-base/kdejava/kdejava-3.3.1.ebuild index 1610651f2452..4c9c0bb136a9 100644 --- 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 } |