diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-09-03 19:13:13 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-09-03 19:13:13 +0000 |
| commit | aa93949cc2c0d87f0510267e4f28442d679a2ff3 (patch) | |
| tree | 5b1da66cb05d4498a498ff33cb64e0fb2d4d972a /app-office/libreoffice/libreoffice-9999.ebuild | |
| parent | Add the l10n package to pdepend to avoid collisions. (diff) | |
| download | historical-aa93949cc2c0d87f0510267e4f28442d679a2ff3.tar.gz historical-aa93949cc2c0d87f0510267e4f28442d679a2ff3.tar.bz2 historical-aa93949cc2c0d87f0510267e4f28442d679a2ff3.zip | |
Fix l10n collision with the non-recompiled-yet libreoffice.
Package-Manager: portage-2.2.0_alpha52/cvs/Linux x86_64
Diffstat (limited to 'app-office/libreoffice/libreoffice-9999.ebuild')
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999.ebuild | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index f7248532a53d..fa76c0a2f02a 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.22 2011/09/03 16:08:42 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.23 2011/09/03 19:13:13 scarabeus Exp $ EAPI=3 @@ -169,15 +169,18 @@ COMMON_DEPEND=" webdav? ( net-libs/neon ) " -# FIXME: l10n after release/branching RDEPEND="${COMMON_DEPEND} !app-office/libreoffice-bin !app-office/openoffice-bin !app-office/openoffice - >=app-office/libreoffice-l10n-3.4 java? ( >=virtual/jre-1.6 ) " +# FIXME: l10n after release/branching +PDEPEND=" + >=app-office/libreoffice-l10n-3.4 +" + DEPEND="${COMMON_DEPEND} >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 |