added some information to the xinteraction patch, made some changes to the warnings in the ebuild, among other things

2 files changed, 33 insertions, 31 deletions

diff --git a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-xinteraction-fix.patch b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-xinteraction-fix.patch
index 5d7966387510..6420d54a929e 100644
--- a/app-office/openoffice/files/1.0.1/openoffice-1.0.1-xinteraction-fix.patch
+++ b/app-office/openoffice/files/1.0.1/openoffice-1.0.1-xinteraction-fix.patch
@@ -1,31 +1,34 @@
-diff -ur oo_1.0.1_src.orig/unoil/com/sun/star/document/makefile.mk oo_1.0.1_src/unoil/com/sun/star/document/makefile.mk
---- oo_1.0.1_src.orig/unoil/com/sun/star/document/makefile.mk	2000-09-18 10:28:26.000000000 -0500
-+++ oo_1.0.1_src/unoil/com/sun/star/document/makefile.mk	2002-09-12 18:05:27.000000000 -0500
-@@ -64,7 +64,9 @@
+--- oo_1.0.1_src/unoil/prj/build.lst~	2001-12-06 16:19:28.000000000 +0100
++++ oo_1.0.1_src/unoil/prj/build.lst	2002-09-15 21:28:58.000000000 +0200
+@@ -10,8 +10,8 @@
+ ul	unoil\com\sun\star\datatransfer			nmake	-	all	ul_dattrans ul_genall NULL
+ ul	unoil\com\sun\star\datatransfer\clipboard	nmake	-	all	ul_dattrans_clip ul_dattrans NULL
+ ul	unoil\com\sun\star\datatransfer\dnd		nmake	-	all	ul_dattrans_dnd ul_dattrans NULL
+-ul	unoil\com\sun\star\document			nmake	-	all	ul_document ul_genall NULL
+ ul	unoil\com\sun\star\task				nmake	-	all	ul_task ul_genall NULL
++ul	unoil\com\sun\star\document			nmake	-	all	ul_document ul_genall NULL
+ ul	unoil\com\sun\star\sdbc				nmake	-	all	ul_sdbc ul_cssutil ul_task NULL
+ ul	unoil\com\sun\star\sdbcx			nmake	-	all	ul_sdbx ul_sdbc NULL
+ ul	unoil\com\sun\star\sdb				nmake	-	all	ul_sdb ul_sdbx NULL
+--- oo_1.0.1_src/unoil/com/sun/star/document/makefile.mk~	2000-09-18 17:28:26.000000000 +0200
++++ oo_1.0.1_src/unoil/com/sun/star/document/makefile.mk	2002-09-15 23:13:13.000000000 +0200
+@@ -64,6 +64,7 @@
  PRJ		= ..$/..$/..$/..
  TARGET	= unoil_document
  PACKAGE	= com$/sun$/star$/document
--
-+KELL_MARKER	= 1
++GENJAVAFILES += $(GENJAVADIR)$/com/sun/star/task/XInteractionContinuation.java
+ 
  # --- Settings -----------------------------------------------------
  
- .INCLUDE :  $(PRJ)$/makefile.pmk
-+
-+KELL_MARKER	= 0
-diff -ur oo_1.0.1_src.orig/unoil/makefile.pmk oo_1.0.1_src/unoil/makefile.pmk
---- oo_1.0.1_src.orig/unoil/makefile.pmk	2001-08-31 11:04:43.000000000 -0500
-+++ oo_1.0.1_src/unoil/makefile.pmk	2002-09-12 18:05:27.000000000 -0500
-@@ -74,7 +74,15 @@
+--- oo_1.0.1_src/unoil/makefile.pmk~	2001-08-31 18:04:43.000000000 +0200
++++ oo_1.0.1_src/unoil/makefile.pmk	2002-09-15 23:21:53.000000000 +0200
+@@ -74,7 +74,7 @@
  JAVAFILESLIST	:= $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
  .ENDIF          # "$(L10N_framework)"==""
  
-+# WARNING!!!  WARNING!!!  THIS IS A HACK!!!  Well...so is just about everything
-+# else in this package.
-+# Do a little something special for project com.sun.star.document.
-+.IF "$(KELL_MARKER)"=="1"
-+GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i) $(GENJAVADIR)$/com$/sun$/star$/task$/XInteractionContinuation.java
-+.ELSE
- GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
-+.ENDIF
-+
+-GENJAVAFILES	:= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
++GENJAVAFILES	+= $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
  GENCLASSFILES	:= $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
+ 
+ # --- Targets ------------------------------------------------------
+
diff --git a/app-office/openoffice/openoffice-1.0.1-r3.ebuild b/app-office/openoffice/openoffice-1.0.1-r3.ebuild
index e26241e25f14..7cf646928c15 100644
--- a/app-office/openoffice/openoffice-1.0.1-r3.ebuild
+++ b/app-office/openoffice/openoffice-1.0.1-r3.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-r3.ebuild,v 1.6 2003/01/12 19:57:53 sethbc Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.1-r3.ebuild,v 1.7 2003/01/17 10:29:25 sethbc Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -137,12 +137,11 @@ pkg_setup() {
 	fi
 
 	ewarn "****************************************************************"
-	ewarn " To get this thing to build at all, I had to use less agressive"
-	ewarn " CFLAGS and CXXFLAGS.  If this build thus fails, and you edited"
-	ewarn " this ebuild at all, or used too agressive compiler flags ..."
-	ewarn
-	ewarn "   You HAVE been Warned!"
-	ewarn
+	ewarn " It is important to note that OpenOffice.org is a very fragile  "
+	ewarn " build when it comes to CFLAGS.  A number of flags have already "
+	ewarn " been filtered out.  If you experience difficulty merging this  "
+	ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to  "
+	ewarn " merge again.					               "
 	ewarn "****************************************************************"
 }
 
@@ -309,10 +308,10 @@ src_unpack() {
 	if [ "$(echo ${JAVA_BINARY} | grep "jdk-1.4")" ]
 	then 
 	        epatch ${FILESDIR}/${PV}/${P}-fix-jdk-1.4.0.patch
-		epatch ${FILESDIR}/${PV}/${P}-xinteraction-fix.patch
 	fi
 
-
+	# Debian patch to fix an xinteraction handler build error (Seth)
+	epatch ${FILESDIR}/${PV}/${P}-xinteraction-fix.patch
 }
 
 get_EnvSet() {