summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2006-03-07 19:47:11 +0000
committerAndreas Proschofsky <suka@gentoo.org>2006-03-07 19:47:11 +0000
commit98e30bf8f58387d5487e146f1740e31253517515 (patch)
treef51bf9800b153838e0992d927f5a11703481ef01 /app-office
parentAdd dependencies for modular Xorg. (diff)
downloadhistorical-98e30bf8f58387d5487e146f1740e31253517515.tar.gz
historical-98e30bf8f58387d5487e146f1740e31253517515.tar.bz2
historical-98e30bf8f58387d5487e146f1740e31253517515.zip
Forgot to fix the Makefile for PPC (for the --without-java fix)
Package-Manager: portage-2.1_pre5-r4
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice/ChangeLog6
-rw-r--r--app-office/openoffice/Manifest12
-rw-r--r--app-office/openoffice/files/2.0.2/buildfix-no-java.diff11
3 files changed, 22 insertions, 7 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 5ab2b303d22a..20b7e662ba7b 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/openoffice
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.192 2006/03/07 16:24:46 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.193 2006/03/07 19:47:11 suka Exp $
+
+ 07 Mar 2006; Andreas Proschofsky <suka@gentoo.org>
+ files/2.0.2/buildfix-no-java.diff:
+ Forgot to fix the Makefile for PPC (for the --without-java fix)
07 Mar 2006; Andreas Proschofsky <suka@gentoo.org>
files/2.0.2/gentoo-2.0.2.diff, +files/2.0.2/buildfix-no-java.diff,
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 4bad7c550390..1879172db3b5 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,12 +1,12 @@
-MD5 e1d59065a9d703d82602bcd443e0e1b4 ChangeLog 41607
-RMD160 6ed0eacb55a3684c81166402b36f4e53cc477e13 ChangeLog 41607
-SHA256 4f98934df366ba0de1ec2fad54ea36e241b2e2709b6c220140c12253128e9483 ChangeLog 41607
+MD5 6ace43df7412abd45deba930842a92ed ChangeLog 41764
+RMD160 0ee2054a34dd0022e4cd9ccfefa508a9029b50c1 ChangeLog 41764
+SHA256 55a3a86d60248d5d5f3ff26f8350435c0c793d966fdaf04d6b57617eb69f59cf ChangeLog 41764
MD5 500f7e71be57d40b0a8042cab1484df9 files/2.0.1/alwayscrystal.diff 3222
RMD160 6f563dccad523db881def1fdb711df3949c2a687 files/2.0.1/alwayscrystal.diff 3222
SHA256 22af14b2c3bd7d796eeda2f4a423f4290e71d2f2790a82038b837c6219133ef1 files/2.0.1/alwayscrystal.diff 3222
-MD5 691fe6224585d044b00190a38e1fc01f files/2.0.2/buildfix-no-java.diff 1362
-RMD160 0035f96b522fbce18ad0fde9467547ad6414734a files/2.0.2/buildfix-no-java.diff 1362
-SHA256 ddc53ccb4a7303f29c6eb64f3f7330b4357412d86b3ae4a00f7eef8a555d2291 files/2.0.2/buildfix-no-java.diff 1362
+MD5 a37e5fa90440a0a85f589bebdf4590b3 files/2.0.2/buildfix-no-java.diff 1636
+RMD160 f4dc9e55807c290eddd3d00c95912a52facaae04 files/2.0.2/buildfix-no-java.diff 1636
+SHA256 cb0ac75f1fc23aebf2cdb8b34353ccae7de5b0f66822f148c62d6ead69e15331 files/2.0.2/buildfix-no-java.diff 1636
MD5 4f55a923f95c001976f2b8abaaad829a files/2.0.2/buildfix-without-mozilla.diff 4656
RMD160 139421dcaafc8ac0cbd28b13d3e6f9206a83c924 files/2.0.2/buildfix-without-mozilla.diff 4656
SHA256 f5d95319e0129d04185b427147c9df7a0c2a4f5624da08226e04951365797323 files/2.0.2/buildfix-without-mozilla.diff 4656
diff --git a/app-office/openoffice/files/2.0.2/buildfix-no-java.diff b/app-office/openoffice/files/2.0.2/buildfix-no-java.diff
index 49723889abe4..145569d33367 100644
--- a/app-office/openoffice/files/2.0.2/buildfix-no-java.diff
+++ b/app-office/openoffice/files/2.0.2/buildfix-no-java.diff
@@ -1,3 +1,14 @@
+--- solenv/inc/unxlngppc.mk.old 2006-01-20 11:50:50.000000000 +0100
++++ solenv/inc/unxlngppc.mk 2006-02-28 15:06:48.000000000 +0100
+@@ -36,7 +36,7 @@
+ ASM=
+ AFLAGS=
+
+-SOLAR_JAVA*=TRUE
++SOLAR_JAVA*=
+ JAVAFLAGSDEBUG=-g
+
+ # filter for supressing verbose messages from linker
--- solenv/inc/unxlngppc4.mk.old 2006-01-20 11:50:50.000000000 +0100
+++ solenv/inc/unxlngppc4.mk 2006-02-28 15:06:48.000000000 +0100
@@ -36,7 +36,7 @@