summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-08-21 10:17:38 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-08-21 10:17:38 +0000
commit22b0cd6c29d4382f88c76c192783a706b1b60e37 (patch)
treecc5046798497af2357fea018d6d99d1803c30115 /app-office/libreoffice
parentBump to 3.5.6 (diff)
downloadgentoo-2-22b0cd6c29d4382f88c76c192783a706b1b60e37.tar.gz
gentoo-2-22b0cd6c29d4382f88c76c192783a706b1b60e37.tar.bz2
gentoo-2-22b0cd6c29d4382f88c76c192783a706b1b60e37.zip
Fix the blocker to be same as on git.
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'app-office/libreoffice')
-rw-r--r--app-office/libreoffice/ChangeLog5
-rw-r--r--app-office/libreoffice/libreoffice-3.5.6.2.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 525279d50c67..1b90602c87fb 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,9 @@
# 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.361 2012/08/21 08:36:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.362 2012/08/21 10:17:38 scarabeus Exp $
+
+ 21 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.6.2.ebuild:
+ Fix the blocker to be same as on git.
*libreoffice-3.5.6.2 (21 Aug 2012)
diff --git a/app-office/libreoffice/libreoffice-3.5.6.2.ebuild b/app-office/libreoffice/libreoffice-3.5.6.2.ebuild
index 1077226df634..e0e25f81cf33 100644
--- a/app-office/libreoffice/libreoffice-3.5.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.6.2.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.6.2.ebuild,v 1.1 2012/08/21 08:36:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.6.2.ebuild,v 1.2 2012/08/21 10:17:38 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