Add patch to work around build breakage

4 files changed, 24 insertions, 5 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 08ad6fac1695..104640553a30 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.64 2004/04/09 12:25:51 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.65 2004/04/11 15:54:31 suka Exp $
+
+  11 Apr 2004; suka@gentoo.org openoffice-1.1.1.ebuild,
+  files/1.1.1/build.patch:
+  Add temporary patch provided by scout@scoutheeten.com on bug #46945 to work 
+  around build breakage caused by recent sandbox problems in portage.
 
   09 Apr 2004; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.1.ebuild:
   Change the source file. As the only change in the source file concerns
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index b8cc9fcb94b2..3a5fd744bdc9 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,8 +1,8 @@
 MD5 6b4172602645dc78be6218d63cc8ee93 openoffice-1.1.0-r2.ebuild 20288
-MD5 f7bd79e8dc36d39b20260e4a4c0d7fae openoffice-1.1.1.ebuild 16161
+MD5 f58b252361aef24063591b693fe71e97 openoffice-1.1.1.ebuild 16245
 MD5 c0a6d36a7529f0a22bae30399b11bc5d openoffice-1.0.3-r1.ebuild 21888
 MD5 21a72230c73df5f6951aaf77581fd1bc openoffice-1.1.0-r3.ebuild 15900
-MD5 0a262f7f30473051d4c70c86cfe7d448 ChangeLog 15467
+MD5 a57931e965bfcf96eb41fc2ef7ed7235 ChangeLog 15698
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 8382af8b277f267e568feab0f7976f3c files/digest-openoffice-1.1.1 130
 MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3-r1 330
@@ -36,4 +36,5 @@ MD5 93eb1ff95722454c0eb92a916dc4877d files/1.1.0/newstlportfix.patch 17655
 MD5 4b2f3102e273ff72e281ed0d481b1526 files/1.1.1/ooffice-wrapper-1.3 9166
 MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.1/openoffice-java.patch 2092
 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
diff --git a/app-office/openoffice/files/1.1.1/build.patch b/app-office/openoffice/files/1.1.1/build.patch
new file mode 100644
index 000000000000..8049215b8186
--- /dev/null
+++ b/app-office/openoffice/files/1.1.1/build.patch
@@ -0,0 +1,11 @@
+--- solenv/bin/build.pl.orig	2004-04-11 12:13:16.296275784 +0000
++++ solenv/bin/build.pl	2004-04-11 12:13:37.367072536 +0000
+@@ -1,6 +1,5 @@
+-    :
+-    eval 'exec perl -S $0 ${1+"$@"}'
+-        if 0;
++#!/usr/bin/perl
++
+ #*************************************************************************
+ #
+ #   $RCSfile: build.patch,v $
diff --git a/app-office/openoffice/openoffice-1.1.1.ebuild b/app-office/openoffice/openoffice-1.1.1.ebuild
index 72df03faa94e..640b604972fa 100644
--- a/app-office/openoffice/openoffice-1.1.1.ebuild
+++ b/app-office/openoffice/openoffice-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.1.ebuild,v 1.5 2004/04/11 11:14:50 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.1.ebuild,v 1.6 2004/04/11 15:54:31 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -48,7 +48,6 @@ export WANT_GCC_3="yes"
 #        to segfault :(
 [ -z "${ECPUS}" ] && export ECPUS="1"
 
-
 LOC="/opt"
 INSTDIR="${LOC}/OpenOffice.org"
 S="${WORKDIR}/oo_${PV}_src"
@@ -266,6 +265,9 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${PV}/openoffice-java.patch
 
+	#Work around recent portage sandbox troubles
+	epatch ${FILESDIR}/${PV}/build.patch
+
 #	if [ ${ARCH} = "sparc" ]; then
 #		epatch ${FILESDIR}/${PV}/openoffice-1.1.0-sparc64-fix.patch
 #	fi