diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-08-13 18:34:00 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-08-13 18:34:00 +0000 |
| commit | 44539ab84ecb92b7d74ed4ecc75917af8f6d0187 (patch) | |
| tree | cca76a36c6afac1cbf0b240e53ad8c622b978c95 /app-office/openoffice-bin | |
| parent | Block only oo-bin that can't cope together with us (latest version can be sid... (diff) | |
| download | gentoo-2-44539ab84ecb92b7d74ed4ecc75917af8f6d0187.tar.gz gentoo-2-44539ab84ecb92b7d74ed4ecc75917af8f6d0187.tar.bz2 gentoo-2-44539ab84ecb92b7d74ed4ecc75917af8f6d0187.zip | |
Revision bump, now we cope along with libreoffice. Acked by chithead.
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'app-office/openoffice-bin')
| -rw-r--r-- | app-office/openoffice-bin/ChangeLog | 8 | ||||
| -rw-r--r-- | app-office/openoffice-bin/openoffice-bin-3.4.0-r1.ebuild (renamed from app-office/openoffice-bin/openoffice-bin-3.4.0.ebuild) | 23 |
2 files changed, 27 insertions, 4 deletions
diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog index fc2d6417eba6..53d7a810967a 100644 --- a/app-office/openoffice-bin/ChangeLog +++ b/app-office/openoffice-bin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/openoffice-bin # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.255 2012/05/18 12:49:08 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.256 2012/08/13 18:34:00 scarabeus Exp $ + +*openoffice-bin-3.4.0-r1 (13 Aug 2012) + + 13 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> + +openoffice-bin-3.4.0-r1.ebuild, -openoffice-bin-3.4.0.ebuild: + Revision bump, now we cope along with libreoffice. Acked by chithead. 18 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> -openoffice-bin-3.3.0.ebuild: diff --git a/app-office/openoffice-bin/openoffice-bin-3.4.0.ebuild b/app-office/openoffice-bin/openoffice-bin-3.4.0-r1.ebuild index b44e9e43e549..0b1f79513661 100644 --- a/app-office/openoffice-bin/openoffice-bin-3.4.0.ebuild +++ b/app-office/openoffice-bin/openoffice-bin-3.4.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.4.0.ebuild,v 1.3 2012/05/13 11:12:38 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.4.0-r1.ebuild,v 1.1 2012/08/13 18:34:00 scarabeus Exp $ EAPI="4" @@ -47,9 +47,8 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -RDEPEND="!app-office/libreoffice +RDEPEND=" !app-office/openoffice - !app-office/libreoffice-bin !prefix? ( sys-libs/glibc ) app-arch/unzip app-arch/zip @@ -171,6 +170,24 @@ src_install () { # prevent revdep-rebuild from attempting to rebuild all the time insinto /etc/revdep-rebuild && doins "${T}/50-${PN}" + # remove soffice bin + rm -rf "${ED}${EPREFIX}/usr/bin/soffice" + + # replace all symlinks by bash shell code in order to nicely cope with + # libreoffice + cd "${ED}${EPREFIX}/usr/bin/" + for i in oo*; do + [[ ${i} == ooffice ]] && continue + + rm ${i} + cat >> ${i} << EOF +#!/usr/bin/env bash +pushd "${EPREFIX}/usr/lib64/openoffice/program" > /dev/null +./${i/oo/s} +popd > /dev/null +EOF + chmod +x ${i} + done } pkg_preinst() { |