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 | 32e7ee6b030304a79a1025d55ffadfccb5c96946 (patch) | |
| tree | 4f51c267151f3d96689233d4ed741d3616050999 /app-office/openoffice-ximian | |
| parent | bye bye old stuff (diff) | |
| download | historical-32e7ee6b030304a79a1025d55ffadfccb5c96946.tar.gz historical-32e7ee6b030304a79a1025d55ffadfccb5c96946.tar.bz2 historical-32e7ee6b030304a79a1025d55ffadfccb5c96946.zip | |
temp fix also for stable version
Diffstat (limited to 'app-office/openoffice-ximian')
| -rw-r--r-- | app-office/openoffice-ximian/Manifest | 3 | ||||
| -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 |
3 files changed, 19 insertions, 3 deletions
diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest index 50b69e9815a6..236f53689fd9 100644 --- a/app-office/openoffice-ximian/Manifest +++ b/app-office/openoffice-ximian/Manifest @@ -1,4 +1,4 @@ -MD5 9fb397e7d778042a6ff86a0f7b25a634 openoffice-ximian-1.1.51.ebuild 14857 +MD5 6fa53ac34ee795b8cf56ec4743671283 openoffice-ximian-1.1.51.ebuild 14959 MD5 987b9cc61bd74ae41a06d7397c49fca0 openoffice-ximian-1.1.52.ebuild 15157 MD5 ac0c8dcd83c58485129d49587320253f ChangeLog 7979 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300 @@ -11,6 +11,7 @@ MD5 9c99fdd340eb8e4c9f09c236eb1a899f files/1.1.0/xooffice-wrapper-1.3 9398 MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch 603 MD5 7992a51f23c05fdc0b3c422c171f637a files/1.1.0/config.patch 502 MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.0/nptl.patch 1285 +MD5 fc8711196de6324c9fae45342d159bf3 files/1.1.0/build.patch 330 MD5 57dffa4a9df0ca77ebcca05122634d9e files/1.1.0/newstlportfix.patch 10867 MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.1/ximian-openoffice.applications 980 MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.1/ximian-openoffice.keys 6298 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 |