Added missing files for ppc build and marked ~ppc, see bug #71286.

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index c3f4ba84179694317d54b4f9d6e3185a1f3d2eff..45517692f782734de66a8bd04f79df8a0acf0408 100644 (file)
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.91 2004/11/18 03:13:04 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.92 2004/12/04 09:00:49 josejx Exp $
+
+  04 Dec 2004; Joseph Jezak <josejx@gentoo.org> openoffice-1.1.3-r1.ebuild:
+  Added missing files for ppc build and marked ~ppc, see bug #71286.
 
   17 Nov 2004; Jason Wever <weeve@gentoo.org> openoffice-1.1.3.ebuild:
   Stable on sparc.

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index c947b537cac52df6e650faa8f256dc7d53aaf878..fae237c9925cfb5ddfe14062df2e1289ab6cf635 100644 (file)
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,54 +1,54 @@
-MD5 5d6b5294449917da7927c3b1780f3bbc ChangeLog 20264
+MD5 fe596510f09c86f78d88fb444e1c84e3 ChangeLog 20411
+MD5 f63e879f61fb812d064f2e524150b667 openoffice-1.1.1-r1.ebuild 15777
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 e7fff1cdeac61f986e2375f8fcb110dc openoffice-1.0.3-r2.ebuild 20531
-MD5 028221961eab58410eac58393c7840e5 openoffice-1.1.0-r4.ebuild 20022
-MD5 9ea5f44bcd2819c059a5444b6b9942e2 openoffice-1.1.3-r1.ebuild 15356
-MD5 f63e879f61fb812d064f2e524150b667 openoffice-1.1.1-r1.ebuild 15777
 MD5 40675e126c7b38c1f5f223a101a3ca1b openoffice-1.1.3.ebuild 15687
+MD5 028221961eab58410eac58393c7840e5 openoffice-1.1.0-r4.ebuild 20022
+MD5 2e4e0aa812a48bacf4b33b838b5df978 openoffice-1.1.3-r1.ebuild 15841
+MD5 fd065af92828cda546d797e6c86d102b files/digest-openoffice-1.1.3 73
+MD5 8382af8b277f267e568feab0f7976f3c files/digest-openoffice-1.1.1-r1 130
+MD5 2d0153cba41a3a61fcf0fddb138e4882 files/digest-openoffice-1.1.3-r1 138
 MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3-r2 330
 MD5 9d1828c128b70f1612c0c31b69719a26 files/digest-openoffice-1.1.0-r4 195
-MD5 2d0153cba41a3a61fcf0fddb138e4882 files/digest-openoffice-1.1.3-r1 138
-MD5 8382af8b277f267e568feab0f7976f3c files/digest-openoffice-1.1.1-r1 130
-MD5 fd065af92828cda546d797e6c86d102b files/digest-openoffice-1.1.3 73
-MD5 e448fa25e672e8e100a5d68adb75dda3 files/1.0.3/freetype-2.1.3.patch 1367
-MD5 271539dafab707398e9b806eef8f250a files/1.0.3/ooffice-wrapper-1.2 8220
-MD5 46080de39ef5acd7488ce1e76ac10cbe files/1.0.3/ooffice-wrapper-1.3 8362
+MD5 d61186f38b5e704b69af03ce33a9053d files/1.0.3/openoffice-errno.patch 291
+MD5 7880bbdd3145b675f5a8ab7a0c549c1f files/1.0.3/neon.patch 12963
 MD5 3fe10dea0d52c0779a9929b021d84e43 files/1.0.3/openoffice-1.0.1-compiler-flags.patch 954
-MD5 c6d765863f974f7f6f6b17d20ad95541 files/1.0.3/openoffice-1.0.1-fix-asm.patch 2207
-MD5 d56f7c3ee055eb733a7d6a9d87ccc6d7 files/1.0.3/openoffice-1.0.1-fix-jdk-1.4.0.patch 2091
-MD5 d1194605b25954eaa73f74d9d3982a9b files/1.0.3/openoffice-1.0.1-no-mozab.patch 2496
-MD5 ce580b49f86ec9ab3ceba58268c886df files/1.0.3/openoffice-1.0.1-sparc.patch.bz2 15843
 MD5 5d4663d4ee957ca7329fed3e72e9555c files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch 10481
+MD5 bf8388f4d41ad2ed1a38a0aa2d8fe4ce files/1.0.3/openoffice-1.0.3-sparc-gentoo.patch 580
+MD5 d56f7c3ee055eb733a7d6a9d87ccc6d7 files/1.0.3/openoffice-1.0.1-fix-jdk-1.4.0.patch 2091
+MD5 271539dafab707398e9b806eef8f250a files/1.0.3/ooffice-wrapper-1.2 8220
 MD5 3834566292e23e2832f625e0b5accf85 files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3.patch 10485
+MD5 aae1ec77961ab6273026a12a6cf9804c files/1.0.3/openoffice-1.0.2-default-fonts.patch 15285
+MD5 ce580b49f86ec9ab3ceba58268c886df files/1.0.3/openoffice-1.0.1-sparc.patch.bz2 15843
+MD5 d1194605b25954eaa73f74d9d3982a9b files/1.0.3/openoffice-1.0.1-no-mozab.patch 2496
 MD5 edb031b5b0c87b33ff0cd9b5a6fc4a79 files/1.0.3/openoffice-1.0.1-use-freetype-2.1.3.patch 14774
+MD5 c6d765863f974f7f6f6b17d20ad95541 files/1.0.3/openoffice-1.0.1-fix-asm.patch 2207
+MD5 e448fa25e672e8e100a5d68adb75dda3 files/1.0.3/freetype-2.1.3.patch 1367
+MD5 67ce98390eb8da814deb778bc3b524f7 files/1.0.3/vcl.printcxx.OOO_STABLE_1_PORTS.100102.patch 612
 MD5 58a4bf52e74e8e287c29956229b94ff9 files/1.0.3/openoffice-1.0.1-xinteraction-fix.patch 1052
-MD5 aae1ec77961ab6273026a12a6cf9804c files/1.0.3/openoffice-1.0.2-default-fonts.patch 15285
 MD5 80d0277676c6b7e55b29a12b02eae325 files/1.0.3/openoffice-1.0.2-ft-antialias-advice.patch 596
-MD5 bf8388f4d41ad2ed1a38a0aa2d8fe4ce files/1.0.3/openoffice-1.0.3-sparc-gentoo.patch 580
-MD5 d61186f38b5e704b69af03ce33a9053d files/1.0.3/openoffice-errno.patch 291
-MD5 67ce98390eb8da814deb778bc3b524f7 files/1.0.3/vcl.printcxx.OOO_STABLE_1_PORTS.100102.patch 612
-MD5 7880bbdd3145b675f5a8ab7a0c549c1f files/1.0.3/neon.patch 12963
-MD5 fa0af18a5e8a31bf68e0cdbb2f0e4981 files/1.1.0/fixed-gcc.patch 644
-MD5 93eb1ff95722454c0eb92a916dc4877d files/1.1.0/newstlportfix.patch 17655
-MD5 309ec50c6facc777068caebd51640c92 files/1.1.0/no-mozab.patch 2741
-MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.0/nptl.patch 1285
-MD5 ea579df37ecea73bc37977db44c7bba4 files/1.1.0/ooffice-wrapper-1.3 8972
-MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch 603
-MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.0/openoffice-1.1.0-sparc64-fix.patch 400
-MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.0/openoffice-java.patch 2092
-MD5 ee20d490a8aa62d79ca65e99339e3397 files/1.1.0/neon.patch 8300
-MD5 d08ea5bce1e9a925cbd712607f89f920 files/1.1.1/newstlportfix.patch 10032
-MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.1/nptl.patch 1285
-MD5 4b2f3102e273ff72e281ed0d481b1526 files/1.1.1/ooffice-wrapper-1.3 9166
-MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.1/openoffice-java.patch 2092
+MD5 46080de39ef5acd7488ce1e76ac10cbe files/1.0.3/ooffice-wrapper-1.3 8362
 MD5 fc8711196de6324c9fae45342d159bf3 files/1.1.1/build.patch 330
+MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.1/openoffice-java.patch 2092
 MD5 ee20d490a8aa62d79ca65e99339e3397 files/1.1.1/neon.patch 8300
+MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.1/nptl.patch 1285
 MD5 866e4e913af8431072dab7ec53269c31 files/1.1.1/linux-sparc.patch 14494
-MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.3/gcc-instlib.patch 393
-MD5 d08ea5bce1e9a925cbd712607f89f920 files/1.1.3/newstlportfix.patch 10032
-MD5 43cbfca8df057d634675ef000fae82fc files/1.1.3/ooffice-wrapper-1.3 9471
+MD5 d08ea5bce1e9a925cbd712607f89f920 files/1.1.1/newstlportfix.patch 10032
+MD5 4b2f3102e273ff72e281ed0d481b1526 files/1.1.1/ooffice-wrapper-1.3 9166
+MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.0/openoffice-java.patch 2092
+MD5 ee20d490a8aa62d79ca65e99339e3397 files/1.1.0/neon.patch 8300
+MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.0/nptl.patch 1285
+MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch 603
+MD5 309ec50c6facc777068caebd51640c92 files/1.1.0/no-mozab.patch 2741
+MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.0/openoffice-1.1.0-sparc64-fix.patch 400
+MD5 fa0af18a5e8a31bf68e0cdbb2f0e4981 files/1.1.0/fixed-gcc.patch 644
+MD5 93eb1ff95722454c0eb92a916dc4877d files/1.1.0/newstlportfix.patch 17655
+MD5 ea579df37ecea73bc37977db44c7bba4 files/1.1.0/ooffice-wrapper-1.3 8972
 MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.3/openoffice-java.patch 2092
 MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.3/gcc34-nojava-fix.patch 329
-MD5 bf7df7ebe1373f6e2e5bd1e0425657bd files/1.1.3/gcc34-nptl-fix.patch 618
 MD5 f0c4c412675085f96c20d0b5ac753694 files/1.1.3/gcc34.patch.bz2 34342
+MD5 bf7df7ebe1373f6e2e5bd1e0425657bd files/1.1.3/gcc34-nptl-fix.patch 618
+MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.3/gcc-instlib.patch 393
+MD5 d08ea5bce1e9a925cbd712607f89f920 files/1.1.3/newstlportfix.patch 10032
+MD5 43cbfca8df057d634675ef000fae82fc files/1.1.3/ooffice-wrapper-1.3 9471
 MD5 a9233bc0091b925de38145108267b949 files/1.1.3/newstlportfix2.patch 3638

diff --git a/app-office/openoffice/openoffice-1.1.3-r1.ebuild b/app-office/openoffice/openoffice-1.1.3-r1.ebuild
index 4f95f90327366ac2dc0f24babb8964ae26863cac..5a9ea4ec7fc0b814c7322028d177f9cf0deaecee 100644 (file)
--- a/app-office/openoffice/openoffice-1.1.3-r1.ebuild
+++ b/app-office/openoffice/openoffice-1.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.3-r1.ebuild,v 1.4 2004/11/16 09:29:39 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.3-r1.ebuild,v 1.5 2004/12/04 09:00:50 josejx Exp $
 
 # Notes:
 #
@@ -33,12 +33,16 @@ INSTDIR="${LOC}/OpenOffice.org"
 S="${WORKDIR}/OOo_${PV}_src"
 DESCRIPTION="OpenOffice.org, a full office productivity suite."
 SRC_URI="mirror://openoffice/stable/${PV}/OOo_${PV}-1_source.tar.gz
-               http://www.stlport.org/archive/STLport-4.6.2.tar.gz"
+               http://www.stlport.org/archive/STLport-4.6.2.tar.gz
+               ppc? ( http://www.openoffice.org/files/documents/111/2112/LINUXGCCPinc.zip
+                          http://www.openoffice.org/files/documents/111/2113/LINUXGCCPlib.zip
+                          http://www.openoffice.org/files/documents/111/2114/LINUXGCCPruntime.zip )"
+
 HOMEPAGE="http://www.openoffice.org/"
 
 LICENSE="|| ( LGPL-2  SISSL-1.1 )"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 RDEPEND="!app-office/openoffice-bin
        >=sys-libs/glibc-2.1
@@ -210,9 +214,16 @@ src_unpack() {
 
        cd ${WORKDIR}
        unpack ${A}
+       cd ${S}
+
+       # Fix for missing ppc mozilla includes bug #71268
+       if use ppc; then
+               cp ${DISTDIR}/LINUXGCCPinc.zip ${S}/moz/zipped || die
+               cp ${DISTDIR}/LINUXGCCPlib.zip ${S}/moz/zipped || die
+               cp ${DISTDIR}/LINUXGCCPruntime.zip ${S}/moz/zipped || die
+       fi
 
        #Still needed: The STLport patch
-       cd ${S}
        cp ${DISTDIR}/STLport-4.6.2.tar.gz ${S}/stlport/download || die
        epatch ${FILESDIR}/${PV}/newstlportfix2.patch