Bug fixes ;)

4 files changed, 80 insertions, 6 deletions

diff --git a/dev-java/java-gnome/ChangeLog b/dev-java/java-gnome/ChangeLog
index da05bed86869..6b9e975c4f2d 100644
--- a/dev-java/java-gnome/ChangeLog
+++ b/dev-java/java-gnome/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/java-gnome
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.6 2003/05/03 19:51:59 tberman Exp $
+# 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 $
+
+*java-gnome-0.8.3 (23 Feb 2004)
+
+  23 Feb 2004; Chris Aniszczyk <zx@gentoo.org> java-gnome-0.8.3.ebuild,
+  files/java-gnome-0.8.3-gentoo.diff:
+  Bug Fix #41421
+  Thanks to <nicolas.mommaerts@beatz.no-ip.org> for the patch.
 
   03 May 2003; Todd Berman <tberman@gentoo.org> java-gnome-0.7.1.ebuild:
   Fixed up ebuild, closed bug #14119.
diff --git a/dev-java/java-gnome/Manifest b/dev-java/java-gnome/Manifest
index b5049eb37d92..d5799be26574 100644
--- a/dev-java/java-gnome/Manifest
+++ b/dev-java/java-gnome/Manifest
@@ -1,6 +1,7 @@
-MD5 98a9606cdcb139ca69b4a0ae97f60827 java-gnome-0.8.3.ebuild 1694
-MD5 7e91ab5d79e7bc4280a650e72f8a2b69 java-gnome-0.7.1.ebuild 2064
-MD5 cf4faa7152fd96af94b13e8d8ebf07dc ChangeLog 1146
+MD5 e76a59abeb51450405a649d8dcbf0782 java-gnome-0.8.3.ebuild 1696
+MD5 01e53651a1b8d0a4d7fdff1167921562 java-gnome-0.7.1.ebuild 2058
+MD5 4247baec7ee6afbced9de346c590f503 ChangeLog 1365
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 95eae7ebf2d8a9d2443cb7f138aab94b files/java-gnome-0.8.3-gentoo.diff 3998
 MD5 8001e68db9d8cadec9c636eb16c40a23 files/digest-java-gnome-0.7.1 68
 MD5 d0548db82a1916704411084a9a019f05 files/digest-java-gnome-0.8.3 70
diff --git a/dev-java/java-gnome/files/java-gnome-0.8.3-gentoo.diff b/dev-java/java-gnome/files/java-gnome-0.8.3-gentoo.diff
new file mode 100644
index 000000000000..23b1fc8f09a9
--- /dev/null
+++ b/dev-java/java-gnome/files/java-gnome-0.8.3-gentoo.diff
@@ -0,0 +1,62 @@
+--- java-gnome-0.8.3/configure	2004-02-09 01:30:15.000000000 +0100
++++ java-gnome-0.8.3/configure.patched	2004-02-09 22:58:10.212144160 +0100
+@@ -1253,16 +1253,16 @@
+         GCJ_HOME=`which gcj | sed 's/\(.*\).bin.*gcj/\1/'`
+      fi
+ 
+-     GCJ_JAR=`locate libgcj | grep jar`
+-                         if test x$GCJ_JAR != x; then
+-       GCJ_CLASSPATH="${GCJ_JAR}:${CLASSPATH}"
+-     else
++GCJ_JAR=`locate libgcj | grep libgcj.*\.jar` 
++if [ $? -eq 0 ] ; then
++	GCJ_CLASSPATH="${GCJ_JAR}:${CLASSPATH}"
++	echo $GCJ_CLASSPATH
++else
+ 	echo "***"
+ 	echo "*** Unable to locate libgcj.jar needed by gcj"
+ 	echo "***"
+ 	{ echo "configure: error: Need at lease GCJ version 3.0.0" 1>&2; exit 1; }
+-     fi	
+-       
++fi       
+      
+      :
+   else
+--- java-gnome-0.8.3/doc-core/Makefile.in	2004-02-08 19:30:15.000000000 -0500
++++ java-gnome-0.8.3/doc-core/Makefile.in.patched	2004-02-23 19:54:03.589426744 -0500
+@@ -123,7 +123,6 @@
+ 	$(INSTALL) -m644 api/org/gnu/gtk/event/class-use/*.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/api/core/org/gnu/gtk/event/class-use/
+ 	$(INSTALL) -m644 api/org/gnu/pango/*.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/api/core/org/gnu/pango/
+ 	$(INSTALL) -m644 api/org/gnu/pango/class-use/*.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/api/core/org/gnu/pango/class-use/
+-	$(INSTALL) -m644 api/resources/* $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/api/core/resources/
+ 	-$(INSTALL) -d -m755 $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/examples/core
+ 	-$(INSTALL) -d -m755 $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/examples/core/alignment
+ 	-$(INSTALL) -d -m755 $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/examples/core/appication
+--- java-gnome-0.8.3/doc-glade/Makefile.in	2004-02-08 19:30:15.000000000 -0500
++++ java-gnome-0.8.3/doc-glade/Makefile.in.patched	2004-02-23 19:56:52.841696488 -0500
+@@ -1,4 +1,4 @@
+-################################################################################
++###############################################################################
+ # This file is automatically generated by ./genMakefile.in 
+ # from Makefile.in.in and other sources linked from there. Do not edit directly
+ ################################################################################
+@@ -88,7 +88,6 @@
+ 	$(INSTALL) -m644 api/*.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/api/glade/
+ 	$(INSTALL) -m644 api/*.css $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/api/glade/
+ 	$(INSTALL) -m644 api/package-list $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/api/glade/
+-	$(INSTALL) -m644 api/resources/* $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/api/glade/resources/
+ 	$(INSTALL) -m644 api/org/gnu/glade/*.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/api/glade/org/gnu/glade/
+ 	$(INSTALL) -m644 api/org/gnu/glade/class-use/*.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/api/glade/org/gnu/glade/class-use/
+ 	-$(INSTALL) -d -m755 $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/examples/glade/clock
+--- java-gnome-0.8.3/doc-gnome/Makefile.in	2004-02-08 19:30:15.000000000 -0500
++++ java-gnome-0.8.3/doc-gnome/Makefile.in.patched	2004-02-23 19:57:11.046928872 -0500
+@@ -96,7 +96,6 @@
+ 	$(INSTALL) -m644 api/*.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/api/gnome/
+ 	$(INSTALL) -m644 api/*.css $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/api/gnome/
+ 	$(INSTALL) -m644 api/package-list $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/api/gnome/
+-	$(INSTALL) -m644 api/resources/* $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/api/gnome/resources/
+ 	$(INSTALL) -m644 api/org/gnu/gnome/*.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/api/gnome/org/gnu/gnome/
+ 	$(INSTALL) -m644 api/org/gnu/gnome/class-use/*.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/api/gnome/org/gnu/gnome/class-use/
+ 	$(INSTALL) -m644 api/org/gnu/gnome/event/*.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/api/gnome/org/gnu/gnome/event/
+
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 ca940054585f..6423b76fbcab 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,8 @@
 # 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.1 2004/02/21 04:53:30 zx Exp $
+# $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 $
+
+inherit eutils
 
 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/${P}.tar.bz2"
@@ -20,6 +22,8 @@ IUSE=""
 S=${WORKDIR}/${P}
 
 src_compile() {
+	epatch ${FILESDIR}/java-gnome-${PV}-gentoo.diff
+
 	./configure \
 		--host=${CHOST} \
 		--prefix=/usr \