summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-08-10 11:48:33 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-08-10 11:48:33 +0000
commitcef28f1e9045804944e3461e4d0b2466d2a8f55b (patch)
tree3f662271df1989acb942c598ccf0989c2dbad3b9 /app-office/libreoffice-bin
parentFix quoting to satisfy desktop-file-validate. (diff)
downloadgentoo-2-cef28f1e9045804944e3461e4d0b2466d2a8f55b.tar.gz
gentoo-2-cef28f1e9045804944e3461e4d0b2466d2a8f55b.tar.bz2
gentoo-2-cef28f1e9045804944e3461e4d0b2466d2a8f55b.zip
Fix the dep over l10n in the binary to use only same major-minor. Wrt bug#430464.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'app-office/libreoffice-bin')
-rw-r--r--app-office/libreoffice-bin/ChangeLog7
-rw-r--r--app-office/libreoffice-bin/libreoffice-bin-3.5.5.3.ebuild6
2 files changed, 9 insertions, 4 deletions
diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog
index 93a7de963ce9..69d644f540c9 100644
--- a/app-office/libreoffice-bin/ChangeLog
+++ b/app-office/libreoffice-bin/ChangeLog
@@ -1,6 +1,11 @@
# 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.85 2012/08/03 08:07:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.86 2012/08/10 11:48:33 scarabeus Exp $
+
+ 10 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-bin-3.5.5.3.ebuild:
+ Fix the dep over l10n in the binary to use only same major-minor. Wrt
+ bug#430464.
*libreoffice-bin-3.5.5.3 (03 Aug 2012)
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 17f72fa718b0..7a27abaa9881 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.1 2012/08/03 08:07:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.5.5.3.ebuild,v 1.2 2012/08/10 11:48:33 scarabeus Exp $
EAPI=4
@@ -10,7 +10,7 @@ CMAKE_REQUIRED="never"
BASE_AMD64_URI="mirror://gentoo/amd64-bin-"
BASE_X86_URI="mirror://gentoo/x86-bin-"
-inherit kde4-base java-pkg-opt-2 pax-utils prefix
+inherit kde4-base java-pkg-opt-2 pax-utils prefix versionator
DESCRIPTION="LibreOffice, a full office productivity suite. Binary package."
HOMEPAGE="http://www.libreoffice.org"
@@ -125,7 +125,7 @@ RDEPEND="${COMMON_DEPEND}
"
PDEPEND="
- >=app-office/libreoffice-l10n-3.5.0
+ =app-office/libreoffice-l10n-$(get_version_component_range 1-2)*
"
DEPEND=""