Bug fixes, plus marking stable on x86

4 files changed, 8 insertions, 75 deletions

diff --git a/dev-java/java-gnome/ChangeLog b/dev-java/java-gnome/ChangeLog
index 6b9e975c4f2d..0a892c785897 100644
--- a/dev-java/java-gnome/ChangeLog
+++ b/dev-java/java-gnome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/java-gnome
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.7 2004/02/21 19:30:16 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.8 2004/03/18 06:53:40 zx Exp $
+
+  18 Mar 2004; Chris Aniszczyk <zx@gentoo.org> java-gnome-0.7.1.ebuild,
+  java-gnome-0.8.3.ebuild:
+  Clean up, bug fix #44990, marking stable on x86
 
 *java-gnome-0.8.3 (23 Feb 2004)
 
diff --git a/dev-java/java-gnome/files/digest-java-gnome-0.7.1 b/dev-java/java-gnome/files/digest-java-gnome-0.7.1
deleted file mode 100644
index 8e14bf50352f..000000000000
--- a/dev-java/java-gnome/files/digest-java-gnome-0.7.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 618a470eb2ecb2d985cad2585aa3623a java-gnome-0.7.1.tar.gz 743052
diff --git a/dev-java/java-gnome/java-gnome-0.7.1.ebuild b/dev-java/java-gnome/java-gnome-0.7.1.ebuild
deleted file mode 100644
index e21240ffb82e..000000000000
--- a/dev-java/java-gnome/java-gnome-0.7.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-0.7.1.ebuild,v 1.15 2004/02/21 04:53:30 zx Exp $
-
-IUSE="gnome"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Java bindings for GNOME and GTK libraries that allow GNOME and GTK applications to be written in Java"
-SRC_URI="mirror://sourceforge/java-gnome/java-gnome-0.7.1.tar.gz"
-HOMEPAGE="http://java-gnome.sourceforge.net/"
-DEPEND="virtual/glibc
-	gnome? ( >=gnome-base/gnome-libs-1.4 )
-	virtual/jdk
-	>=dev-java/jikes-1.0
-	=dev-java/java-gtk-0.7.1"
-RDEPEND="$DEPEND"
-SLOT="0.7"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ~ppc ~sparc"
-
-src_compile() {
-	local myconf
-
-	#JAVAC="`which jikes` -classpath $CLASSPATH:." \
-		./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--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 = ${myclasspath}\:tools\:.|" \
-		< src/Makefile.orig > src/Makefile
-
-	cp src/tools/Makefile src/tools/Makefile.orig
-	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 = ${myclasspath}\:.\:../lib/gtk.jar\:../lib/gnome.jar|" \
-		< test/Makefile.orig > test/Makefile
-
-	cp src/other/{Base*.java,GStringArray.java,GListString.java} src/gnu/gdk/
-
-	make || die
-}
-
-src_install () {
-	make prefix=${D}/usr install || die
-
-	mv ${D}/usr/doc ${D}/usr/share/
-
-	rm ${D}/usr/share/java-gtk/gtk.jar
-	rm ${D}/usr/share/java-gtk/gnome.jar
-
-	rm ${D}/usr/lib/libGTKJava.so*
-
-	rm ${D}/usr/lib/libGNOMEJava.so
-	dosym /usr/lib/libGNOMEJava.so.${PV} /usr/lib/libGNOMEJava.so
-
-	rm ${D}/usr/share/java-gnome/gtk*.jar
-
-	echo "/usr/share/java-gnome/gnome-${PV}.jar:" \
-		> ${D}/usr/share/java-gnome/classpath.env
-
-}
diff --git a/dev-java/java-gnome/java-gnome-0.8.3.ebuild b/dev-java/java-gnome/java-gnome-0.8.3.ebuild
index 6423b76fbcab..44b5730f6735 100644
--- a/dev-java/java-gnome/java-gnome-0.8.3.ebuild
+++ b/dev-java/java-gnome/java-gnome-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-0.8.3.ebuild,v 1.2 2004/02/21 19:30:16 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-0.8.3.ebuild,v 1.3 2004/03/18 06:53:40 zx Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ DEPEND="virtual/glibc
 
 SLOT="0.8"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 IUSE=""
 
 S=${WORKDIR}/${P}
@@ -47,6 +47,6 @@ src_install() {
 	echo "DESCRIPTION=${DESCRIPTION}" \
 		> ${D}/usr/share/java-gnome/package.env
 
-	echo "/usr/share/java-gnome/lib/gtk${SLOT}.jar:/usr/share/java-gnome/lib/gnome${SLOT}.jar:/usr/share/java-gnome/lib/glade${SLOT}.jar:/usr/share/java-gnome/lib/gconf${SLOT}.jar:/usr/share/java-gnome/lib/gnomevte${SLOT}.jar:/usr/share/java-gnome/lib/gtkhtml${SLOT}.jar" \
+	echo "CLASSPATH=/usr/share/java-gnome/lib/gtk${SLOT}.jar:/usr/share/java-gnome/lib/gnome${SLOT}.jar:/usr/share/java-gnome/lib/glade${SLOT}.jar:/usr/share/java-gnome/lib/gconf${SLOT}.jar:/usr/share/java-gnome/lib/gnomevte${SLOT}.jar:/usr/share/java-gnome/lib/gtkhtml${SLOT}.jar" \
 		>> ${D}/usr/share/java-gnome/package.env
 }