Added ~sparc to keywords. This fixes bug #10381 and finally gets sparc going on OO. Many thanks to "The Shrink" who's asm patch made this possible (see case notes for more details).

5 files changed, 68 insertions, 28 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 4d21f41b4ff7..593a741b4be8 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.33 2003/08/20 07:57:01 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.34 2003/09/04 02:29:34 weeve Exp $
+
+  03 Sep 2003; Jason Wever <weeve@gentoo.org> openoffice-1.0.3-r1.ebuild,
+  files/1.0.3/openoffice-1.0.1-sparc.patch.bz2,
+  files/1.0.3/openoffice-1.0.3-sparc-gentoo.patch:
+  Added ~sparc to keywords. This fixes bug #10381 and finally gets sparc going
+  on OO. Many thanks to "The Shrink" who's asm patch made this possible (see
+  case notes for more details).
 
 *openoffice-1.1_rc3 (20 Aug 2003)
 
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index d3c308948036..52ac01b677e9 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,32 +1,14 @@
-MD5 820892086ca99dc3fb55179a2ba05ec3 ChangeLog 8155
+MD5 d426279aa26aee81f39772b7bd2d7faf ChangeLog 8516
+MD5 ed3b2793bf63134bd69e4d81f2030606 openoffice-1.0.3-r1.ebuild 21734
+MD5 eed99feac64813b7f0f2134863aa9ac9 openoffice-1.1_beta2-r1.ebuild 17184
+MD5 742f19e2ea3dcba440af971a89993724 openoffice-1.1_rc1.ebuild 17024
 MD5 e770016adf95ff3509e0dccac92aee19 openoffice-1.1_rc2.ebuild 19188
 MD5 f55dc8d6a6cebb3cd756e5f8a6b89e54 openoffice-1.1_rc3.ebuild 19386
-MD5 742f19e2ea3dcba440af971a89993724 openoffice-1.1_rc1.ebuild 17024
-MD5 888a2bca3ae1be36b63205af4efed31e openoffice-1.0.3-r1.ebuild 21137
-MD5 eed99feac64813b7f0f2134863aa9ac9 openoffice-1.1_beta2-r1.ebuild 17184
-MD5 1c3af7976138950372a09066de8c2825 files/digest-openoffice-1.1_rc2 196
-MD5 a6c9d8c5763378f5bae1e4ac50a2ecaf files/digest-openoffice-1.1_rc3 196
-MD5 a1dde590888590955ae081b2d285866e files/digest-openoffice-1.1_rc1 195
 MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3-r1 330
 MD5 595681e533f93f0ffe52a8af67b6953f files/digest-openoffice-1.1_beta2-r1 198
-MD5 82ddd83763d3ad994919438e46426294 files/1.1_beta2/newstlportfix.patch 10531
-MD5 9ded113d20e703977e226bdc8373a6d4 files/1.1_beta2/ooffice-wrapper-1.3 8409
-MD5 306a5f04de5bff97195455b539bd6d14 files/1.1_beta2/no-mozab.patch 2345
-MD5 230737cadf4606928cff18cc26d9b72e files/1.1_beta2/openoffice-xrender.patch 330
-MD5 71a61edc7e10812d8a534d3e67394a26 files/1.1_rc2/ooffice-wrapper-1.3 8978
-MD5 309ec50c6facc777068caebd51640c92 files/1.1_rc2/no-mozab.patch 2741
-MD5 230737cadf4606928cff18cc26d9b72e files/1.1_rc2/openoffice-xrender.patch 330
-MD5 3ccbb09eb3c116bfeffc0f757f6576d2 files/1.1_rc2/newstlportfix.patch 10473
-MD5 57bbd107649e40fc1543bb677d53c2eb files/1.1_rc2/no-crashrep.patch 1099
-MD5 3bafc5905c895a72e47bbb4bc3fdefaf files/1.1_rc3/ooffice-wrapper-1.3 8981
-MD5 309ec50c6facc777068caebd51640c92 files/1.1_rc3/no-mozab.patch 2741
-MD5 9baa362ffea862df332e2495985d3bdd files/1.1_rc3/newstlportfix.patch 17655
-MD5 fa0af18a5e8a31bf68e0cdbb2f0e4981 files/1.1_rc3/fixed-gcc.patch 644
-MD5 05f4a9a183f27d99857d415c3ebc0e8d files/1.1_rc3/no-crashrep.patch 1777
-MD5 82ddd83763d3ad994919438e46426294 files/1.1_rc1/newstlportfix.patch 10531
-MD5 9c24ec0c94b795a6b10dae2657631036 files/1.1_rc1/ooffice-wrapper-1.3 8978
-MD5 8c4fb4616a62d406b5019ce1005d381a files/1.1_rc1/no-mozab.patch 2483
-MD5 230737cadf4606928cff18cc26d9b72e files/1.1_rc1/openoffice-xrender.patch 330
+MD5 a1dde590888590955ae081b2d285866e files/digest-openoffice-1.1_rc1 195
+MD5 1c3af7976138950372a09066de8c2825 files/digest-openoffice-1.1_rc2 196
+MD5 a6c9d8c5763378f5bae1e4ac50a2ecaf files/digest-openoffice-1.1_rc3 196
 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
@@ -42,3 +24,23 @@ MD5 aae1ec77961ab6273026a12a6cf9804c files/1.0.3/openoffice-1.0.2-default-fonts.
 MD5 80d0277676c6b7e55b29a12b02eae325 files/1.0.3/openoffice-1.0.2-ft-antialias-advice.patch 596
 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 ce580b49f86ec9ab3ceba58268c886df files/1.0.3/openoffice-1.0.1-sparc.patch.bz2 15843
+MD5 bf8388f4d41ad2ed1a38a0aa2d8fe4ce files/1.0.3/openoffice-1.0.3-sparc-gentoo.patch 580
+MD5 82ddd83763d3ad994919438e46426294 files/1.1_beta2/newstlportfix.patch 10531
+MD5 306a5f04de5bff97195455b539bd6d14 files/1.1_beta2/no-mozab.patch 2345
+MD5 9ded113d20e703977e226bdc8373a6d4 files/1.1_beta2/ooffice-wrapper-1.3 8409
+MD5 230737cadf4606928cff18cc26d9b72e files/1.1_beta2/openoffice-xrender.patch 330
+MD5 82ddd83763d3ad994919438e46426294 files/1.1_rc1/newstlportfix.patch 10531
+MD5 8c4fb4616a62d406b5019ce1005d381a files/1.1_rc1/no-mozab.patch 2483
+MD5 9c24ec0c94b795a6b10dae2657631036 files/1.1_rc1/ooffice-wrapper-1.3 8978
+MD5 230737cadf4606928cff18cc26d9b72e files/1.1_rc1/openoffice-xrender.patch 330
+MD5 3ccbb09eb3c116bfeffc0f757f6576d2 files/1.1_rc2/newstlportfix.patch 10473
+MD5 57bbd107649e40fc1543bb677d53c2eb files/1.1_rc2/no-crashrep.patch 1099
+MD5 309ec50c6facc777068caebd51640c92 files/1.1_rc2/no-mozab.patch 2741
+MD5 71a61edc7e10812d8a534d3e67394a26 files/1.1_rc2/ooffice-wrapper-1.3 8978
+MD5 230737cadf4606928cff18cc26d9b72e files/1.1_rc2/openoffice-xrender.patch 330
+MD5 fa0af18a5e8a31bf68e0cdbb2f0e4981 files/1.1_rc3/fixed-gcc.patch 644
+MD5 9baa362ffea862df332e2495985d3bdd files/1.1_rc3/newstlportfix.patch 17655
+MD5 05f4a9a183f27d99857d415c3ebc0e8d files/1.1_rc3/no-crashrep.patch 1777
+MD5 309ec50c6facc777068caebd51640c92 files/1.1_rc3/no-mozab.patch 2741
+MD5 3bafc5905c895a72e47bbb4bc3fdefaf files/1.1_rc3/ooffice-wrapper-1.3 8981
diff --git a/app-office/openoffice/files/1.0.3/openoffice-1.0.1-sparc.patch.bz2 b/app-office/openoffice/files/1.0.3/openoffice-1.0.1-sparc.patch.bz2
new file mode 100644
index 000000000000..9de64291f090
--- /dev/null
+++ b/app-office/openoffice/files/1.0.3/openoffice-1.0.1-sparc.patch.bz2
diff --git a/app-office/openoffice/files/1.0.3/openoffice-1.0.3-sparc-gentoo.patch b/app-office/openoffice/files/1.0.3/openoffice-1.0.3-sparc-gentoo.patch
new file mode 100644
index 000000000000..64e128f9ba10
--- /dev/null
+++ b/app-office/openoffice/files/1.0.3/openoffice-1.0.3-sparc-gentoo.patch
@@ -0,0 +1,11 @@
+--- config_office/set_soenv.in.orig	2003-06-25 10:27:37.000000000 -0400
++++ config_office/set_soenv.in	2003-06-25 10:28:17.000000000 -0400
+@@ -349,7 +349,7 @@
+       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+    }
+-   elsif ($machine_type eq "sparc")
++   elsif (($machine_type eq "sparc") or ($machine_type eq "sparc64"))
+    {  print "Setting Linux Sparc specific values... ";
+       $outfile        = "LinuxSparcEnv.Set"; 
+       $CPU            = "S";
diff --git a/app-office/openoffice/openoffice-1.0.3-r1.ebuild b/app-office/openoffice/openoffice-1.0.3-r1.ebuild
index 6379ee554613..75d316a20f8e 100644
--- a/app-office/openoffice/openoffice-1.0.3-r1.ebuild
+++ b/app-office/openoffice/openoffice-1.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.3-r1.ebuild,v 1.3 2003/08/07 11:44:54 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.3-r1.ebuild,v 1.4 2003/09/04 02:29:34 weeve Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -118,7 +118,7 @@ HOMEPAGE="http://www.openoffice.org/"
 
 LICENSE="LGPL-2 | SISSL-1.1"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="x86 ppc ~sparc"
 IUSE="gnome kde"
 
 RDEPEND=">=sys-libs/glibc-2.1
@@ -343,6 +343,14 @@ src_unpack() {
 
 	#This patches the stupid printer problem (to upgrade to 1.0.3.1)
 	epatch ${FILESDIR}/${PV}/vcl.printcxx.OOO_STABLE_1_PORTS.100102.patch
+
+	# Patches for sparc
+	if [ "${ARCH}" = "sparc" ]
+	then
+		epatch $FILESDIR/${PV}/openoffice-1.0.3-sparc-gentoo.patch
+		epatch $FILESDIR/${PV}/openoffice-1.0.1-sparc.patch.bz2
+	fi
+	
 }
 
 get_EnvSet() {
@@ -500,6 +508,18 @@ src_install() {
 	addpredict "/dev/dri"
 
 	get_EnvSet
+
+	# Added by Jason Wever <weeve@gentoo.org>
+	# For some weird reason, when you get done building
+	# the source on sparc, it doesn't have a readme file in place
+	# for the installation program (probably due to a non-supported
+	# arch/os combo.  This fixed that
+	if [ "${ARCH}" = "sparc" ]
+	then
+	cp ${S}/readlicense_oo/source/readme/unxlngi4/README \
+		${S}/instsetoo/unxlngs.pro/${LANGUAGE}/normal/README
+	fi
+
 	
 	# The install part should now be relatively OK compared to
 	# what it was.  Basically we use autoresponse files to install