Silently update the ooo-build to 2.0.0.2, nothing new in there just all our fixes have gone upstream

Package-Manager: portage-2.0.53

7 files changed, 14 insertions, 149 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index e5c416283d12..bed1e84e20ec 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.158 2005/11/30 06:57:19 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.159 2005/12/03 11:30:44 suka Exp $
+
+  03 Dec 2005; Andreas Proschofsky <suka@gentoo.org>
+  -files/2.0.0/gentoo-2.0.0.diff, -files/2.0.0/buildfix-new-xslt.diff,
+  -files/2.0.0/nojava-fix-stringparam.diff, openoffice-2.0.0.ebuild:
+  Silently update the ooo-build to 2.0.0.2, nothing new in there just all our
+  fixes have gone upstream :)
 
   30 Nov 2005; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.0.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index aa43d01d930b..751fcd4db818 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,4 +1,4 @@
-MD5 03453c732ed3abcbe7fce9926d451369 ChangeLog 34477
+MD5 7d43ac38e73576ed7321cc963769d11c ChangeLog 34779
 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
 MD5 9784ab4484e09b8230284b27d20d4264 files/1.1.4/build-new-xslt.diff 650
 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598
@@ -32,13 +32,10 @@ MD5 475dbfca78a66962143b39d3aac7915a files/1.1.5/ooffice-wrapper-1.3 6659
 MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.5/openoffice-java.patch 2092
 MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.5/pthreadlink-fix.patch 1133
 MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.5/pyunolink-fix.patch 475
-MD5 2871ab2688ee93c187ff98445e5ea0ca files/2.0.0/buildfix-new-xslt.diff 1336
-MD5 77216afa8932c17cbbc581728ea334b7 files/2.0.0/gentoo-2.0.0.diff 1937
-MD5 1aff6980adcc3f4704c3ef5959e0f165 files/2.0.0/nojava-fix-stringparam.diff 1682
 MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325
 MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322
-MD5 039f6964d10fd36776620f93b84705dd files/digest-openoffice-2.0.0 478
+MD5 f43c98cba404ee89be6bed4f785dfd00 files/digest-openoffice-2.0.0 478
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 eae9be6a4eb2de3c689d24cb348d0b9c openoffice-1.1.4-r1.ebuild 16659
 MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566
-MD5 fb08ec2c20dad7cd99b84423e53c23c8 openoffice-2.0.0.ebuild 7310
+MD5 e93dd766e83e476bc7d7c6077d11f030 openoffice-2.0.0.ebuild 7002
diff --git a/app-office/openoffice/files/2.0.0/buildfix-new-xslt.diff b/app-office/openoffice/files/2.0.0/buildfix-new-xslt.diff
deleted file mode 100644
index 26e7fdb5a3eb..000000000000
--- a/app-office/openoffice/files/2.0.0/buildfix-new-xslt.diff
+++ /dev/null
@@ -1,41 +0,0 @@
---- filter/source/config/fragments/langfilter.xsl.org	2005-10-27 20:38:20.000000000 +0200
-+++ filter/source/config/fragments/langfilter.xsl	2005-10-27 20:38:44.000000000 +0200
-@@ -2,19 +2,35 @@
- <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:oor="http://openoffice.org/2001/registry">
- <xsl:output method="xml" indent="yes" omit-xml-declaration="no" version="1.0" encoding="UTF-8"/>
- <xsl:param name="lang"/>
--<xsl:template match="*[.//*[@xml:lang=$lang]] | @*">
-+<xsl:template match="*">
-+    <xsl:if test="count(.//*[@xml:lang=$lang])&gt;0">
-     <xsl:copy>
-         <xsl:apply-templates select="*|@*"/>
-     </xsl:copy>
-+    </xsl:if>
- </xsl:template>
- 
--<xsl:template match="value[@xml:lang=$lang] | text()[../@xml:lang=$lang]">
-+<xsl:template match="@*">
-+    <xsl:copy>
-+        <xsl:apply-templates select="*|@*"/>
-+    </xsl:copy>
-+</xsl:template>
-+
-+<xsl:template match="value">
-+    <xsl:if test="@xml:lang=$lang">
-     <xsl:copy>
-         <xsl:apply-templates select="@*|text()"/>
-     </xsl:copy>
-+    </xsl:if>
- </xsl:template>
-  
--<xsl:template match="text()"/>
-+<xsl:template match="text()">
-+    <xsl:if test="../@xml:lang=$lang">
-+        <xsl:copy>
-+            <xsl:apply-templates select="@*|text()"/>
-+        </xsl:copy>
-+    </xsl:if>
-+</xsl:template>
- 
- 
- </xsl:stylesheet>
diff --git a/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff b/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff
deleted file mode 100644
index 4f051187135a..000000000000
--- a/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff
+++ /dev/null
@@ -1,50 +0,0 @@
---- patches/OOO_2_0/apply 
-+++ patches/OOO_2_0/apply
-@@ -742,6 +742,9 @@
- default-system-fpicker.diff
- # Fix for build breakage on PPC
- stlport-ppc-buildfix.diff
-+# Fix for broken filters without java i#56619
-+nojava-fix-stringparam.diff
-+buildfix-new-xslt.diff
- 
- #
- # NOTE: 64 bit OOo is work in progress!
---- bin/package-ooo 
-+++ bin/package-ooo 
-@@ -50,7 +50,7 @@
- 	mkdir -p $MANDIR/man1
- 	cp -f $OOBUILDDIR/ooo-wrapper$BINSUFFIX $PREFIX/bin
- 	chmod +x $PREFIX/bin/ooo-wrapper$BINSUFFIX
--	for app in base calc draw fromtemplate html impress math web writer ffice; do
-+	for app in base calc draw fromtemplate impress math web writer ffice; do
- 		ln -sf ooo-wrapper${BINSUFFIX} $PREFIX/bin/oo${app}${BINSUFFIX}
- 		if test "z$VENDORNAME" = "zNovell" -o "z$VENDORNAME" = "zSUSE" -o "z$VENDORNAME" = "zPLD" \
- 		        -o "z$VENDORNAME" = "zDebian"; then
-@@ -124,11 +124,11 @@
-   	# Menu icons are currently made in debian/rules
- 	;;
-   *)
--	mkdir -p $OODESTDIR/opt/gnome/share/applications
-+	mkdir -p $OODESTDIR/usr/share/applications
- 	cd $TOOLSDIR/desktop
- 	for source in *.desktop; do
- 	    dest=`echo $source | sed "s|.desktop\$||"`
--	    dest="$OODESTDIR/opt/gnome/share/applications/$dest$BINSUFFIX.desktop"
-+	    dest="$OODESTDIR/usr/share/applications/$dest$BINSUFFIX.desktop"
- 	    add_version=
- 	    test "z$VENDORNAME" = "zNovell" -a "z$BINSUFFIX" != "z" && add_version=" ($VERSION)" || :
- 	    sed -e "s|@BINSUFFIX@|$BINSUFFIX|g
-@@ -215,8 +215,10 @@
- 
- echo "Done";
- 
--# Java-disabled builds do not create help
--if test -d $OOINSTDIR/help; then
-+# Check if the English help is installed and is in the main package (is first on the list)
-+# Note that Java-disabled builds do not create help at all.
-+if test -f $OOINSTDIR/help/en/sbasic.cfg -a \
-+        "`for lang in $OOO_LANGS_LIST ; do echo $lang ; break ; done`" = "en-US" ; then
-     echo "Removing duplicated English help..."
-   
-     for lang in $OOO_LANGS_LIST ; do
diff --git a/app-office/openoffice/files/2.0.0/nojava-fix-stringparam.diff b/app-office/openoffice/files/2.0.0/nojava-fix-stringparam.diff
deleted file mode 100644
index bff02690aa1a..000000000000
--- a/app-office/openoffice/files/2.0.0/nojava-fix-stringparam.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: source/config/fragments/makefile.mk
-===================================================================
-RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
-retrieving revision 1.12
-diff -u -u -r1.12 makefile.mk
---- filter/source/config/fragments/makefile.mk	8 Sep 2005 21:33:23 -0000	1.12
-+++ filter/source/config/fragments/makefile.mk	25 Oct 2005 18:24:46 -0000
-@@ -147,13 +147,20 @@
- .IF "$(SOLAR_JAVA)"==""
- #cmc, hack to workaround the java build requirement
- MERGE:=python ../tools/merge/pyAltFCFGMerge
-+PACKLANG := $(XSLTPROC)
-+PACKLANG_IN :=
-+PACKLANG_PARAM := --stringparam
-+PACKLANG_XSL :=
- .ELSE
- MERGE    := $(JAVA) -jar $(CLASSDIR)$/FCFGMerge.jar
- .IF "$(JDK)" == "gcj"
--PACKLANG := $(JAVA) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
-+PACKLANG := $(JAVA) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process
- .ELSE
--PACKLANG := $(JAVA) org.apache.xalan.xslt.Process -XSL langfilter.xsl
-+PACKLANG := $(JAVA) org.apache.xalan.xslt.Process
- .ENDIF
-+PACKLANG_IN := -IN
-+PACKLANG_PARAM := -PARAM
-+PACKLANG_XSL := -XSL
- .ENDIF
- 
- # -----------------------------------------------------------------------------
-@@ -182,7 +191,7 @@
-      +@echo Building language packages $(@:b:s/Filter_//) for filters
-      +@echo ===================================================================
-      +-$(MKDIRHIER) $(@:d)
--     +$(PACKLANG) -IN $< -PARAM lang $(@:d:d:d:d:d:d:d:d:b) > $@
-+     +$(PACKLANG) $(PACKLANG_PARAM) lang $(@:d:d:d:d:d:d:d:d:b) $(PACKLANG_XSL) langfilter.xsl $(PACKLANG_IN) $< > $@
- 
- $(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS_PACKED) : $(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS)
- 
diff --git a/app-office/openoffice/files/digest-openoffice-2.0.0 b/app-office/openoffice/files/digest-openoffice-2.0.0
index a363fb788151..7bf691b2fa3d 100644
--- a/app-office/openoffice/files/digest-openoffice-2.0.0
+++ b/app-office/openoffice/files/digest-openoffice-2.0.0
@@ -3,5 +3,5 @@ MD5 8aa0c6463dc517723f9f4d4a3f0191a0 OOO_2_0_0-lang.tar.bz2 33103772
 MD5 a6f4b2ef7d1fae927cedbd45e6dd403d OOO_2_0_0-system.tar.bz2 19324775
 MD5 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 94740
 MD5 f34404f8dc6123aca156d203c37e3e5d libwpd-0.8.3.tar.gz 482757
-MD5 87f4f018023c03927bab935cc122158e ooo-build-2.0.0.1.tar.gz 4182998
+MD5 ecbbc059d9913d54be592fdab9e91785 ooo-build-2.0.0.2.tar.gz 4350834
 MD5 586d0f26b3f79d89bbb5b25b874e3df6 ooo_crystal_images-6.tar.bz2 1308872
diff --git a/app-office/openoffice/openoffice-2.0.0.ebuild b/app-office/openoffice/openoffice-2.0.0.ebuild
index b70717644b95..7edc1a2824d7 100644
--- a/app-office/openoffice/openoffice-2.0.0.ebuild
+++ b/app-office/openoffice/openoffice-2.0.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.19 2005/11/30 06:57:19 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.20 2005/12/03 11:30:44 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
 IUSE="curl eds gnome gtk java kde ldap mozilla nas zlib xml2"
 
-MY_PV="${PV}.1"
+MY_PV="${PV}.2"
 PATCHLEVEL="OOO680"
 PATCHDIR="${WORKDIR}/ooo-build-${MY_PV}"
 SRC="OOO_2_0_0"
@@ -121,20 +121,12 @@ src_unpack() {
 	cd ${WORKDIR}
 	unpack ooo-build-${MY_PV}.tar.gz
 
-	#Some fixes for our patchset
-	cd ${PATCHDIR}
-	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
-
-	#Additional and new patches get here
-	cp -pPRf ${FILESDIR}/${PV}/nojava-fix-stringparam.diff ${PATCHDIR}/patches/src680 || die
-	cp -pPRf ${FILESDIR}/${PV}/buildfix-new-xslt.diff ${PATCHDIR}/patches/src680 || die
-
 	#Detect which look and patchset we are using, amd64 is known not to be working atm, so this is here for testing purposes only
 	use amd64 && export DISTRO="Gentoo64" || export DISTRO="Gentoo"
 
 	#Use flag checks
 	use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE} || echo "--without-java" >> ${CONFFILE}
-	use nas &&    echo "--with-system-nas" >> ${CONFFILE} || echo "--without-nas" >> ${CONFFILE}
+	use nas && echo "--with-system-nas" >> ${CONFFILE} || echo "--without-nas" >> ${CONFFILE}
 
 	echo "`use_with curl system-curl`" >> ${CONFFILE}
 	echo "`use_with xml2 system-libxml`" >> ${CONFFILE}