summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Trygve Kalleberg <karltk@gentoo.org>2002-02-03 17:52:31 +0000
committerKarl Trygve Kalleberg <karltk@gentoo.org>2002-02-03 17:52:31 +0000
commitd1b9b21195987161757065a8ddfaaf680f302d43 (patch)
treeb901483593be3f3a44efe9906fa18f3e41262555 /dev-java/java-gnome
parentInitially masking upgraded alsa-0.9.0_beta ebuilds due to the massive recompi... (diff)
downloadgentoo-2-d1b9b21195987161757065a8ddfaaf680f302d43.tar.gz
gentoo-2-d1b9b21195987161757065a8ddfaaf680f302d43.tar.bz2
gentoo-2-d1b9b21195987161757065a8ddfaaf680f302d43.zip
Fixed major compile-time trouble
Diffstat (limited to 'dev-java/java-gnome')
-rw-r--r--dev-java/java-gnome/ChangeLog7
-rw-r--r--dev-java/java-gnome/java-gnome-0.7.1.ebuild18
2 files changed, 18 insertions, 7 deletions
diff --git a/dev-java/java-gnome/ChangeLog b/dev-java/java-gnome/ChangeLog
index e09003a0271b..5fab448b2b89 100644
--- a/dev-java/java-gnome/ChangeLog
+++ b/dev-java/java-gnome/ChangeLog
@@ -1,9 +1,14 @@
# ChangeLog for dev-java/java-gnome
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.1 2002/02/01 21:53:11 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.2 2002/02/03 17:52:31 karltk Exp $
*java-gnome-0.7.1 (1 Feb 2002)
+ 2 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> java-gnome-0.7.1.ebuild:
+
+ Fixed compile procedures so that it works with Jikes again.
+
+
1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
Added initial ChangeLog which should be updated whenever the package is
diff --git a/dev-java/java-gnome/java-gnome-0.7.1.ebuild b/dev-java/java-gnome/java-gnome-0.7.1.ebuild
index 42642eb0ddaf..b1c5d03535e0 100644
--- a/dev-java/java-gnome/java-gnome-0.7.1.ebuild
+++ b/dev-java/java-gnome/java-gnome-0.7.1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License, v2 or later
# Maintainer: Tools Team <tools@gentoo.org>
# Author: Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-0.7.1.ebuild,v 1.1 2002/01/18 16:07:47 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-0.7.1.ebuild,v 1.2 2002/02/03 17:51:24 karltk Exp $
S=${WORKDIR}/${P}
DESCRIPTION="This is a sample skeleton ebuild file"
@@ -29,19 +29,23 @@ src_compile() {
--with-java-prefix=$JAVA_HOME \
$myconf || die "./configure failed"
+ myclasspath=`java-config --full-classpath=java-gtk | sed "s/\:/\\\\\:/g"`
+
cp src/Makefile src/Makefile.orig
- sed -e "s:CLASSPATH = tools\:.:CLASSPATH = ${CLASSPATH}\:tools\:.:" \
+ sed -e "s:CLASSPATH = tools\:.:CLASSPATH = ${myclasspath}\:tools\:.:" \
< src/Makefile.orig > src/Makefile
cp src/tools/Makefile src/tools/Makefile.orig
- sed -e "s:CLASSPATH = .:CLASSPATH = ${CLASSPATH}\:.:" \
+ sed -e "s:CLASSPATH = .:CLASSPATH = ${myclasspath}\:.:" \
< src/tools/Makefile.orig > src/tools/Makefile
cp test/Makefile test/Makefile.orig
- sed -e "s:CLASSPATH = ../lib/gtk.jar\:../lib/gnome.jar:CLASSPATH = ${CLASSPATH}\:.\:../lib/gtk.jar\:../lib/gnome.jar:" \
+ sed -e "s:CLASSPATH = ../lib/gtk.jar\:../lib/gnome.jar:CLASSPATH = ${myclasspath}\:.\:../lib/gtk.jar\:../lib/gnome.jar:" \
< test/Makefile.orig > test/Makefile
-
- emake || die
+
+ cp src/other/{Base*.java,GStringArray.java,GListString.java} src/gnu/gdk/
+
+ make || die
}
src_install () {
@@ -56,6 +60,8 @@ src_install () {
rm ${D}/usr/lib/libGNOMEJava.so
dosym /usr/lib/libGNOMEJava.so.${PV} /usr/lib/libGNOMEJava.so
+
+ rm /usr/share/java-gnome/gtk*.jar
echo "/usr/share/java-gnome/gnome-${PV}.jar:" \
> ${D}/usr/share/java-gnome/classpath.env