diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2004-04-11 21:23:07 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2004-04-11 21:23:07 +0000 |
| commit | ad325a788aff93e9f84f74b0c636338f18554658 (patch) | |
| tree | 30aab422c767f6f267a6f4c5a147e9fcd121702e /app-office | |
| parent | bye bye old stuff (Manifest recommit) (diff) | |
| download | gentoo-2-ad325a788aff93e9f84f74b0c636338f18554658.tar.gz gentoo-2-ad325a788aff93e9f84f74b0c636338f18554658.tar.bz2 gentoo-2-ad325a788aff93e9f84f74b0c636338f18554658.zip | |
temp fix also for stable version
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice-ximian/files/1.1.0/build.patch | 11 | ||||
| -rw-r--r-- | app-office/openoffice-ximian/openoffice-ximian-1.1.51.ebuild | 8 |
2 files changed, 17 insertions, 2 deletions
diff --git a/app-office/openoffice-ximian/files/1.1.0/build.patch b/app-office/openoffice-ximian/files/1.1.0/build.patch new file mode 100644 index 000000000000..8049215b8186 --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.0/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-ximian/openoffice-ximian-1.1.51.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.51.ebuild index a6a6cbfa88e3..924f8fdaf9e5 100644 --- a/app-office/openoffice-ximian/openoffice-ximian-1.1.51.ebuild +++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.51.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-ximian/openoffice-ximian-1.1.51.ebuild,v 1.6 2004/04/11 18:02:54 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.51.ebuild,v 1.7 2004/04/11 21:23:07 suka Exp $ # IMPORTANT: This is extremely alpha!!! @@ -86,6 +86,7 @@ RDEPEND=">=sys-libs/glibc-2.1 app-arch/unzip dev-libs/expat virtual/lpr + !app-office/openoffice-ximian-bin ppc? ( >=sys-libs/glibc-2.2.5-r7 >=sys-devel/gcc-3.2.1 ) >=media-libs/freetype-2.1.4" @@ -243,6 +244,9 @@ src_unpack() { #Additional patch for Kernel 2.6 epatch ${FILESDIR}/${OO_VER}/openoffice-1.1.0-linux-2.6-fix.patch + #Work around recent portage sandbox troubles + epatch ${FILESDIR}/${OO_VER}/build.patch + if [ ${ARCH} = "sparc" ]; then epatch ${FILESDIR}/${OO_VER}/openoffice-1.1.0-sparc64-fix.patch fi @@ -470,7 +474,7 @@ src_install() { if [ -n "`use kde`" ] then insinto /usr/share/applnk/Ximian-OpenOffice.org - doins ${FILESDIR}/${OO_VER}/*.desktop + doins *.desktop insinto /usr/share/mimelnk/application doins ${S}/sysui/${SOLPATH}/misc/kde/share/mimelnk/application/* fi |