diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-08-13 18:36:18 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-08-13 18:36:18 +0000 |
| commit | d5146a4e64d2c19f1cfd0262d041b43b656ec1ce (patch) | |
| tree | 50b8a2c96c9ff0723c98ada9c6138254aedf5dc0 /app-office/libreoffice-bin | |
| parent | Stable arm, bug #431206 (diff) | |
| download | gentoo-2-d5146a4e64d2c19f1cfd0262d041b43b656ec1ce.tar.gz gentoo-2-d5146a4e64d2c19f1cfd0262d041b43b656ec1ce.tar.bz2 gentoo-2-d5146a4e64d2c19f1cfd0262d041b43b656ec1ce.zip | |
Block only ooo-bin we collide with.
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'app-office/libreoffice-bin')
| -rw-r--r-- | app-office/libreoffice-bin/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice-bin/libreoffice-bin-3.5.5.3.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog index dfd1fd505ac7..969f67809b31 100644 --- a/app-office/libreoffice-bin/ChangeLog +++ b/app-office/libreoffice-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice-bin # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.88 2012/08/13 07:15:11 nativemad Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.89 2012/08/13 18:36:18 scarabeus Exp $ + + 13 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> + libreoffice-bin-3.5.5.3.ebuild: + Block only ooo-bin we collide with. 13 Aug 2012; Andreas Schuerch <nativemad@gentoo.org> libreoffice-bin-3.5.5.3.ebuild: diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.5.5.3.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.5.5.3.ebuild index f729ea54650d..1f6927866a68 100644 --- a/app-office/libreoffice-bin/libreoffice-bin-3.5.5.3.ebuild +++ b/app-office/libreoffice-bin/libreoffice-bin-3.5.5.3.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-bin/libreoffice-bin-3.5.5.3.ebuild,v 1.4 2012/08/13 07:15:11 nativemad Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.5.5.3.ebuild,v 1.5 2012/08/13 18:36:18 scarabeus Exp $ EAPI=4 @@ -115,7 +115,7 @@ COMMON_DEPEND=" RDEPEND="${COMMON_DEPEND} !app-office/libreoffice - !app-office/openoffice-bin + !<app-office/openoffice-bin-3.4.0-r1 !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts |