Added a fix for sparc and ~sparc keyword.

3 files changed, 34 insertions, 29 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index fa6b87ba03b6..79da34bbb133 100644
--- 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.86 2004/10/23 13:22:08 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.87 2004/11/01 04:03:03 weeve Exp $
+
+  31 Oct 2004; Jason Wever <weeve@gentoo.org> openoffice-1.1.3.ebuild:
+  Added a fix for sparc and ~sparc keyword.
 
   23 Oct 2004; suka@gentoo.org openoffice-1.1.3.ebuild:
   Filter another CFLAG which breaks the build
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 6dac9ab76ec8..2daa1b628762 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,48 +1,48 @@
+MD5 e9a363a39312ad75510adeade4248653 ChangeLog 19335
+MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 dcc1f55254b24752c511276cf01d72cd openoffice-1.0.3-r2.ebuild 21286
-MD5 851a9f162c8770734bbdd6145b6f9eab openoffice-1.1.1-r1.ebuild 16292
 MD5 ae6e88fa3057b6ea75c3f45c78092d8c openoffice-1.1.0-r4.ebuild 20328
-MD5 9d3b64fbf9340fd307eb8b4c4dd052f3 openoffice-1.1.3.ebuild 16003
-MD5 6ccc5443b5c4861efc5a3725c6fcbea7 ChangeLog 19218
-MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
-MD5 fd065af92828cda546d797e6c86d102b files/digest-openoffice-1.1.3 73
+MD5 851a9f162c8770734bbdd6145b6f9eab openoffice-1.1.1-r1.ebuild 16292
+MD5 e22500744138e91f1f2118bb79b277a2 openoffice-1.1.3.ebuild 16063
 MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3-r2 330
 MD5 9d1828c128b70f1612c0c31b69719a26 files/digest-openoffice-1.1.0-r4 195
 MD5 8382af8b277f267e568feab0f7976f3c files/digest-openoffice-1.1.1-r1 130
-MD5 c6d765863f974f7f6f6b17d20ad95541 files/1.0.3/openoffice-1.0.1-fix-asm.patch 2207
+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 58a4bf52e74e8e287c29956229b94ff9 files/1.0.3/openoffice-1.0.1-xinteraction-fix.patch 1052
+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 5d4663d4ee957ca7329fed3e72e9555c files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch 10481
-MD5 67ce98390eb8da814deb778bc3b524f7 files/1.0.3/vcl.printcxx.OOO_STABLE_1_PORTS.100102.patch 612
-MD5 aae1ec77961ab6273026a12a6cf9804c files/1.0.3/openoffice-1.0.2-default-fonts.patch 15285
-MD5 7880bbdd3145b675f5a8ab7a0c549c1f files/1.0.3/neon.patch 12963
-MD5 3834566292e23e2832f625e0b5accf85 files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3.patch 10485
 MD5 d1194605b25954eaa73f74d9d3982a9b files/1.0.3/openoffice-1.0.1-no-mozab.patch 2496
-MD5 d61186f38b5e704b69af03ce33a9053d files/1.0.3/openoffice-errno.patch 291
-MD5 3fe10dea0d52c0779a9929b021d84e43 files/1.0.3/openoffice-1.0.1-compiler-flags.patch 954
-MD5 bf8388f4d41ad2ed1a38a0aa2d8fe4ce files/1.0.3/openoffice-1.0.3-sparc-gentoo.patch 580
 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 3834566292e23e2832f625e0b5accf85 files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3.patch 10485
 MD5 edb031b5b0c87b33ff0cd9b5a6fc4a79 files/1.0.3/openoffice-1.0.1-use-freetype-2.1.3.patch 14774
+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 35601b7efe487b346f78d43c23e2f8f3 files/1.1.0/openoffice-java.patch 2092
-MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.0/openoffice-1.1.0-sparc64-fix.patch 400
 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 309ec50c6facc777068caebd51640c92 files/1.1.0/no-mozab.patch 2741
-MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.0/nptl.patch 1285
-MD5 93eb1ff95722454c0eb92a916dc4877d files/1.1.0/newstlportfix.patch 17655
+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 866e4e913af8431072dab7ec53269c31 files/1.1.1/linux-sparc.patch 14494
-MD5 ee20d490a8aa62d79ca65e99339e3397 files/1.1.1/neon.patch 8300
-MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.1/nptl.patch 1285
 MD5 fc8711196de6324c9fae45342d159bf3 files/1.1.1/build.patch 330
-MD5 d08ea5bce1e9a925cbd712607f89f920 files/1.1.1/newstlportfix.patch 10032
-MD5 43cbfca8df057d634675ef000fae82fc files/1.1.3/ooffice-wrapper-1.3 9471
+MD5 ee20d490a8aa62d79ca65e99339e3397 files/1.1.1/neon.patch 8300
+MD5 866e4e913af8431072dab7ec53269c31 files/1.1.1/linux-sparc.patch 14494
 MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.3/gcc-instlib.patch 393
-MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.3/openoffice-java.patch 2092
 MD5 d08ea5bce1e9a925cbd712607f89f920 files/1.1.3/newstlportfix.patch 10032
+MD5 43cbfca8df057d634675ef000fae82fc files/1.1.3/ooffice-wrapper-1.3 9471
+MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.3/openoffice-java.patch 2092
diff --git a/app-office/openoffice/openoffice-1.1.3.ebuild b/app-office/openoffice/openoffice-1.1.3.ebuild
index 3a6c042a02f9..3599e945043d 100644
--- a/app-office/openoffice/openoffice-1.1.3.ebuild
+++ b/app-office/openoffice/openoffice-1.1.3.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.ebuild,v 1.5 2004/10/23 13:22:08 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.3.ebuild,v 1.6 2004/11/01 04:03:03 weeve Exp $
 
 # Notes:
 #
@@ -37,7 +37,7 @@ HOMEPAGE="http://www.openoffice.org/"
 
 LICENSE="|| ( LGPL-2  SISSL-1.1 )"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~sparc"
 
 RDEPEND="!app-office/openoffice-bin
 	>=sys-libs/glibc-2.1
@@ -324,6 +324,8 @@ src_compile() {
 		LANGNAME="${LANGNAME},ENUS"
 	fi
 
+	use sparc && MYCONF="${MYCONF} --disable-mozilla"
+
 	MYCONF="${MYCONF} --enable-libart \
 		--with-lang=${LANGNAME} \
 		--enable-libsn \