Clean up, bug fix #44990, marking 0.8.3 stable on x86

5 files changed, 10 insertions, 70 deletions

diff --git a/dev-java/java-gtk/ChangeLog b/dev-java/java-gtk/ChangeLog
index 4c1314f8839f..1368cc17082b 100644
--- a/dev-java/java-gtk/ChangeLog
+++ b/dev-java/java-gtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/java-gtk
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gtk/ChangeLog,v 1.7 2004/02/21 19:55:25 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gtk/ChangeLog,v 1.8 2004/03/18 06:51:56 zx Exp $
+
+  18 Mar 2004; Chris Aniszczyk <zx@gentoo.org> java-gtk-0.7.1.ebuild,
+  java-gtk-0.8.3.ebuild:
+  Clean up and classpath fix for bug #44990
 
 *java-gtk-0.8.3 (23 Feb 2004)
 
diff --git a/dev-java/java-gtk/Manifest b/dev-java/java-gtk/Manifest
index 4fbee10b79c3..6565aeb1e549 100644
--- a/dev-java/java-gtk/Manifest
+++ b/dev-java/java-gtk/Manifest
@@ -1,6 +1,4 @@
-MD5 fe10ecab48d28b9dc4048f60e91ecfa2 java-gtk-0.7.1.ebuild 1661
-MD5 f31c764e29e00d3b37b8ad3e8b281d02 java-gtk-0.8.3.ebuild 1163
-MD5 71a4640f0cc78f942d0381adf6624a25 ChangeLog 1278
+MD5 39f090b26b8d317edccd30b839950ac4 java-gtk-0.8.3.ebuild 1172
+MD5 45c71754486fb064d32378d62761e795 ChangeLog 1418
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 8001e68db9d8cadec9c636eb16c40a23 files/digest-java-gtk-0.7.1 68
 MD5 7c8fe2614a6b8c52d5c6c0591694d5cf files/digest-java-gtk-0.8.3 70
diff --git a/dev-java/java-gtk/files/digest-java-gtk-0.7.1 b/dev-java/java-gtk/files/digest-java-gtk-0.7.1
deleted file mode 100644
index 8e14bf50352f..000000000000
--- a/dev-java/java-gtk/files/digest-java-gtk-0.7.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 618a470eb2ecb2d985cad2585aa3623a java-gnome-0.7.1.tar.gz 743052
diff --git a/dev-java/java-gtk/java-gtk-0.7.1.ebuild b/dev-java/java-gtk/java-gtk-0.7.1.ebuild
deleted file mode 100644
index ab2f947f67fc..000000000000
--- a/dev-java/java-gtk/java-gtk-0.7.1.ebuild
+++ /dev/null
@@ -1,61 +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-gtk/java-gtk-0.7.1.ebuild,v 1.14 2004/02/21 19:55:25 zx Exp $
-
-S=${WORKDIR}/java-gnome-${PV}
-DESCRIPTION="GTK+ bindings for Java"
-SRC_URI="mirror://sourceforge/java-gnome/java-gnome-0.7.1.tar.gz"
-HOMEPAGE="http://java-gnome.sourceforge.net/"
-DEPEND="virtual/glibc
-	virtual/jdk
-	=x11-libs/gtk+-1.2*"
-RDEPEND="$DEPEND"
-SLOT="0.7"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ~ppc ~sparc"
-
-IUSE=""
-
-src_compile() {
-	local myconf
-
-	myconf="--with-gtk-only"
-
-	#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"
-
-	cp src/Makefile src/Makefile.orig
-	sed -e "s|CLASSPATH = tools\:.|CLASSPATH = ${CLASSPATH}\:tools\:.|" \
-		< src/Makefile.orig > src/Makefile
-
-	cp src/tools/Makefile src/tools/Makefile.orig
-	sed -e "s|CLASSPATH = .|CLASSPATH = ${CLASSPATH}\:.|" \
-		< 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|" \
-		< test/Makefile.orig > test/Makefile
-
-	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/lib/libGTKJava.so
-	dosym /usr/lib/libGTKJava.so.${PV} /usr/lib/libGTKJava.so
-
-	echo "/usr/share/java-gtk/gtk-${PV}.jar:" \
-		> ${D}/usr/share/java-gtk/classpath.env
-
-}
diff --git a/dev-java/java-gtk/java-gtk-0.8.3.ebuild b/dev-java/java-gtk/java-gtk-0.8.3.ebuild
index fe62391bda4e..2658c391a71f 100644
--- a/dev-java/java-gtk/java-gtk-0.8.3.ebuild
+++ b/dev-java/java-gtk/java-gtk-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-gtk/java-gtk-0.8.3.ebuild,v 1.2 2004/03/01 06:38:45 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gtk/java-gtk-0.8.3.ebuild,v 1.3 2004/03/18 06:51:56 zx Exp $
 
 inherit java-pkg
 
@@ -17,7 +17,7 @@ DEPEND="virtual/glibc
 SLOT="0.8"
 IUSE=""
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 
 S=${WORKDIR}/libgtk-java-${PV}
 
@@ -41,6 +41,6 @@ src_install() {
 	echo "DESCRIPTION=${DESCRIPTION}" \
 		> ${D}/usr/share/${PN}/package.env
 
-	echo "/usr/share/java-gnome/lib/gtk${SLOT}.jar"\
+	echo "CLASSPATH=/usr/share/java-gnome/lib/gtk${SLOT}.jar"\
 		>> ${D}/usr/share/${PN}/package.env
 }