fixed some stupid mistakes, also the way the jdk 1.4 fix is applied

3 files changed, 11 insertions, 20 deletions

diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-fix-jdk-1.4.0.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-fix-jdk-1.4.0.patch
index 1d03916e2638..ff9fe8b5dd7a 100644
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-fix-jdk-1.4.0.patch
+++ b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-fix-jdk-1.4.0.patch
@@ -1,5 +1,5 @@
---- oo_1.0.1_src/XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java.orig	2002-11-25 15:21:05.000000000 -0500
-+++ oo_643c_src/XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java	2002-11-25 15:25:28.000000000 -0500
+--- XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java.orig	2002-12-02 22:59:26.000000000 -0500
++++ XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java	2002-12-02 23:01:49.000000000 -0500
 @@ -79,7 +79,7 @@
  		Class.forName(className != null
  			      ? className
@@ -23,18 +23,6 @@
  
 --- sj2/stardiv/applet/DocumentProxy.java.orig	2002-11-25 22:11:41.000000000 -0500
 +++ sj2/stardiv/applet/DocumentProxy.java	2002-11-25 22:16:25.000000000 -0500
-@@ -2,9 +2,9 @@
-  *
-  *  $RCSfile: openoffice-1.0.1-fix-jdk-1.4.0.patch,v $
-  *
-- *  $Revision: 1.2 $
-+ *  $Revision: 1.2 $
-  *
-- *  last change: $Author: sethbc $ $Date: 2002/12/02 14:43:59 $
-+ *  last change: $Author: sethbc $ $Date: 2002/12/02 14:43:59 $
-  *
-  *  The Contents of this file are made available subject to the terms of
-  *  either of the following licenses
 @@ -73,6 +73,8 @@
  import java.util.Hashtable;
  import java.util.Observer;
diff --git a/app-office/openoffice/files/digest-openoffice-1.0.1-r2 b/app-office/openoffice/files/digest-openoffice-1.0.1-r2
index d72bfab15c97..d32aea91530a 100644
--- a/app-office/openoffice/files/digest-openoffice-1.0.1-r2
+++ b/app-office/openoffice/files/digest-openoffice-1.0.1-r2
@@ -1,4 +1,4 @@
 MD5 34f2ca644b7d70573148c82d64eb6064 OOo_1.0.1_source.tar.bz2 136458398
 MD5 cd4dd34b623a8704fbc800de79705171 STLport-4.5.3.tar.gz 739943
 MD5 fdb06fdb5a4670b172f9fb738b717be9 gpc231.tar.Z 27917
-MD5 6574ebc4c33a175b54b73d94f681f39f freetype-2.1.2.tar.gz 950508
+MD5 23d04bf0cfc48772b8d698c95eec37bd freetype-2.1.2.tar.bz2 742830
diff --git a/app-office/openoffice/openoffice-1.0.1-r2.ebuild b/app-office/openoffice/openoffice-1.0.1-r2.ebuild
index 2adb101f00a7..f62aad50226f 100644
--- a/app-office/openoffice/openoffice-1.0.1-r2.ebuild
+++ b/app-office/openoffice/openoffice-1.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.1-r2.ebuild,v 1.3 2002/12/02 14:43:59 sethbc Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.1-r2.ebuild,v 1.4 2002/12/03 10:26:00 sethbc Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -26,7 +26,7 @@
 #   Get support going for installing a custom language pack.  Also
 #   need to be able to install more than one language pack.
 
-inherit flag-o-matic
+inherit flag-o-matic eutils
 # Compile problems with these ...
 filter-flags "-funroll-loops"
 filter-flags "-fomit-frame-pointer"
@@ -72,7 +72,7 @@ RDEPEND=">=sys-libs/glibc-2.1
 	app-arch/zip
 	app-arch/unzip
 	dev-libs/expat
-	>=virtual/jdk-1.4.0
+	>=virtual/jdk-1.3.1
 	ppc? ( >=sys-libs/glibc-2.2.5-r7
 	>=sys-devel/gcc-3.2 )" # needed for sqrtl patch recently introduced
 
@@ -240,8 +240,11 @@ src_unpack() {
 	done
 
 	# Seth -- Dec 1 2002
-        einfo "Patching for jdk >= 1.4.0..."
-        epatch ${FILESDIR}/${PV}/${P}-fix-jdk-1.4.0.patch
+	if [ "$(echo ${JDK_HOME} | grep "jdk-1.4")" ]
+	then 
+	        epatch ${FILESDIR}/${PV}/${P}-fix-jdk-1.4.0.patch
+	fi
+
 }
 
 get_EnvSet() {