diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-08-13 18:33:39 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-08-13 18:33:39 +0000 |
| commit | 0dc0bac197c7d739219ee628391c31415103532e (patch) | |
| tree | 8f7a2e25d50ae86cb396abec35e855aea8472f4a /app-office | |
| parent | Stable ppc ppc64, bug #420711 (diff) | |
| download | gentoo-2-0dc0bac197c7d739219ee628391c31415103532e.tar.gz gentoo-2-0dc0bac197c7d739219ee628391c31415103532e.tar.bz2 gentoo-2-0dc0bac197c7d739219ee628391c31415103532e.zip | |
Block only oo-bin that can't cope together with us (latest version can be side by side).
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.5.9999.ebuild | 4 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.6.9999.ebuild | 4 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r2.ebuild | 4 |
4 files changed, 12 insertions, 7 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 515abcd6e104..1928efb7e269 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.358 2012/08/13 15:49:32 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.359 2012/08/13 18:33:39 scarabeus Exp $ + + 13 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.9999.ebuild, + libreoffice-3.6.9999.ebuild, libreoffice-9999-r2.ebuild: + Block only oo-bin that can't cope together with us (latest version can be side + by side). 13 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.6.0.4.ebuild, libreoffice-3.6.9999.ebuild, libreoffice-9999-r2.ebuild: diff --git a/app-office/libreoffice/libreoffice-3.5.9999.ebuild b/app-office/libreoffice/libreoffice-3.5.9999.ebuild index 34b353c2d822..ad6f1726416b 100644 --- a/app-office/libreoffice/libreoffice-3.5.9999.ebuild +++ b/app-office/libreoffice/libreoffice-3.5.9999.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/libreoffice/libreoffice-3.5.9999.ebuild,v 1.54 2012/08/08 16:37:34 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.55 2012/08/13 18:33:39 scarabeus Exp $ EAPI=4 @@ -139,7 +139,7 @@ COMMON_DEPEND=" RDEPEND="${COMMON_DEPEND} !app-office/libreoffice-bin !app-office/libreoffice-bin-debug - !app-office/openoffice-bin + !<app-openoffice/openoffice-bin-3.4.0-r1 !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts diff --git a/app-office/libreoffice/libreoffice-3.6.9999.ebuild b/app-office/libreoffice/libreoffice-3.6.9999.ebuild index 4180f6ec25f2..2264690d7e6c 100644 --- a/app-office/libreoffice/libreoffice-3.6.9999.ebuild +++ b/app-office/libreoffice/libreoffice-3.6.9999.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/libreoffice/libreoffice-3.6.9999.ebuild,v 1.21 2012/08/13 15:49:32 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.22 2012/08/13 18:33:39 scarabeus Exp $ EAPI=4 @@ -161,7 +161,7 @@ COMMON_DEPEND=" RDEPEND="${COMMON_DEPEND} !app-office/libreoffice-bin !app-office/libreoffice-bin-debug - !app-office/openoffice-bin + !<app-openoffice/openoffice-bin-3.4.0-r1 !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index 5306646e51fa..6fc959f20c14 100644 --- a/app-office/libreoffice/libreoffice-9999-r2.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r2.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/libreoffice/libreoffice-9999-r2.ebuild,v 1.103 2012/08/13 15:49:32 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.104 2012/08/13 18:33:39 scarabeus Exp $ EAPI=4 @@ -165,7 +165,7 @@ COMMON_DEPEND=" RDEPEND="${COMMON_DEPEND} !app-office/libreoffice-bin !app-office/libreoffice-bin-debug - !app-office/openoffice-bin + !<app-openoffice/openoffice-bin-3.4.0-r1 !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts |