beta2 still needs the classpath patch. however, it looks different, so renaming the file

(Portage version: 2.0.51-r15)

4 files changed, 14 insertions, 4 deletions

diff --git a/kde-base/kdejava/files/classpath.diff b/kde-base/kdejava/files/kdejava-3.4.0_beta1-classpath.diff
index 84d959527030..84d959527030 100644
--- a/kde-base/kdejava/files/classpath.diff
+++ b/kde-base/kdejava/files/kdejava-3.4.0_beta1-classpath.diff
diff --git a/kde-base/kdejava/files/kdejava-3.4.0_beta2-classpath.diff b/kde-base/kdejava/files/kdejava-3.4.0_beta2-classpath.diff
new file mode 100644
index 000000000000..74caab518ba5
--- /dev/null
+++ b/kde-base/kdejava/files/kdejava-3.4.0_beta2-classpath.diff
@@ -0,0 +1,10 @@
+--- kdejava/koala/org/kde/koala/Makefile.am.orig	2004-10-29 23:36:58.640919896 +0200
++++ kdejava/koala/org/kde/koala/Makefile.am	2004-10-29 23:36:46.479768672 +0200
+@@ -12,6 +12,6 @@
+ 
+ JAVAROOT = ../../..
+ CLASSPATH = $(srcdir)/../../..:$(srcdir)/../../../../../qtjava/javalib/qtjava.jar:$(srcdir)
+-JAVACFLAGS = -classpath $(CLASSPATH)
++JAVACFLAGS = -classpath _CLASSPATH_:$(CLASSPATH)
+ # Prevent stupid automake from putting JAVAC=javac in Makefile.in
+ JAVAC = @JAVAC@
diff --git a/kde-base/kdejava/kdejava-3.4.0_beta1.ebuild b/kde-base/kdejava/kdejava-3.4.0_beta1.ebuild
index 3587a096cbcb..9788573149aa 100644
--- a/kde-base/kdejava/kdejava-3.4.0_beta1.ebuild
+++ b/kde-base/kdejava/kdejava-3.4.0_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.4.0_beta1.ebuild,v 1.2 2005/02/05 11:39:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.4.0_beta1.ebuild,v 1.3 2005/02/06 19:22:05 danarmak Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY=qtjava
@@ -20,7 +20,7 @@ DEPEND="virtual/jdk $COMMONDEPEND"
 RDEPEND="virtual/jre $COMMONDEPEND"
 OLDDEPEND="~kde-base/kwin-$PV ~kde-base/kcontrol-$PV ~kde-base/qtjava-$PV virtual/jdk"
 
-PATCHES="$FILESDIR/no-gtk-glib-check.diff $FILESDIR/classpath.diff"
+PATCHES="$FILESDIR/no-gtk-glib-check.diff $FILESDIR/$P-classpath.diff"
 
 
 # Probably missing other kdebase, kdepim etc deps
diff --git a/kde-base/kdejava/kdejava-3.4.0_beta2.ebuild b/kde-base/kdejava/kdejava-3.4.0_beta2.ebuild
index 0794914ac68e..257b8d1e0e23 100644
--- a/kde-base/kdejava/kdejava-3.4.0_beta2.ebuild
+++ b/kde-base/kdejava/kdejava-3.4.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.4.0_beta2.ebuild,v 1.1 2005/02/05 11:39:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.4.0_beta2.ebuild,v 1.2 2005/02/06 19:22:05 danarmak Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY=qtjava
@@ -20,7 +20,7 @@ DEPEND="virtual/jdk $COMMONDEPEND"
 RDEPEND="virtual/jre $COMMONDEPEND"
 OLDDEPEND="~kde-base/kwin-$PV ~kde-base/kcontrol-$PV ~kde-base/qtjava-$PV virtual/jdk"
 
-PATCHES="$FILESDIR/no-gtk-glib-check.diff $FILESDIR/classpath.diff"
+PATCHES="$FILESDIR/no-gtk-glib-check.diff $FILESDIR/$P-classpath.diff"
 
 
 # Probably missing other kdebase, kdepim etc deps