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 | 8fac3007b8554f2c5ad1a6555721c284e3816751 (patch) | |
| tree | 65cc4377a92e622cedb1663a76045f3455c26159 | |
| parent | Add the l10n package to pdepend to avoid collisions. (diff) | |
| download | gentoo-2-8fac3007b8554f2c5ad1a6555721c284e3816751.tar.gz gentoo-2-8fac3007b8554f2c5ad1a6555721c284e3816751.tar.bz2 gentoo-2-8fac3007b8554f2c5ad1a6555721c284e3816751.zip | |
Fix l10n collision with the non-recompiled-yet libreoffice.
(Portage version: 2.2.0_alpha52/cvs/Linux x86_64)
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.4.3.2.ebuild | 7 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.4.9999.ebuild | 7 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999.ebuild | 9 |
4 files changed, 22 insertions, 8 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 61bf7df6cac3..d4446b49b133 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.120 2011/09/03 11:51:49 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.121 2011/09/03 19:13:13 scarabeus Exp $ + + 03 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> + libreoffice-3.4.3.2.ebuild, libreoffice-3.4.9999.ebuild, + libreoffice-9999.ebuild: + Fix l10n collision with the non-recompiled-yet libreoffice. 03 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.4.3.2.ebuild, libreoffice-3.4.9999.ebuild, diff --git a/app-office/libreoffice/libreoffice-3.4.3.2.ebuild b/app-office/libreoffice/libreoffice-3.4.3.2.ebuild index e79894607ee2..46fbc21403b6 100644 --- a/app-office/libreoffice/libreoffice-3.4.3.2.ebuild +++ b/app-office/libreoffice/libreoffice-3.4.3.2.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-3.4.3.2.ebuild,v 1.5 2011/09/03 16:08:42 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2.ebuild,v 1.6 2011/09/03 19:13:13 scarabeus Exp $ EAPI=3 @@ -174,10 +174,13 @@ RDEPEND="${COMMON_DEPEND} !app-office/libreoffice-bin !app-office/openoffice-bin !app-office/openoffice - >=app-office/libreoffice-l10n-$(get_version_component_range 1-2) java? ( >=virtual/jre-1.6 ) " +PDEPEND=" + >=app-office/libreoffice-l10n-$(get_version_component_range 1-2) +" + DEPEND="${COMMON_DEPEND} >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 diff --git a/app-office/libreoffice/libreoffice-3.4.9999.ebuild b/app-office/libreoffice/libreoffice-3.4.9999.ebuild index b364b18736c6..b77a809c7102 100644 --- a/app-office/libreoffice/libreoffice-3.4.9999.ebuild +++ b/app-office/libreoffice/libreoffice-3.4.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-3.4.9999.ebuild,v 1.25 2011/09/03 16:08:42 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v 1.26 2011/09/03 19:13:13 scarabeus Exp $ EAPI=3 @@ -174,10 +174,13 @@ RDEPEND="${COMMON_DEPEND} !app-office/libreoffice-bin !app-office/openoffice-bin !app-office/openoffice - >=app-office/libreoffice-l10n-$(get_version_component_range 1-2) java? ( >=virtual/jre-1.6 ) " +PDEPEND=" + >=app-office/libreoffice-l10n-$(get_version_component_range 1-2) +" + DEPEND="${COMMON_DEPEND} >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 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 |