Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice-bin: libreoffice-bin-3.4.3-r1.ebuild
Date: Sat, 03 Sep 2011 19:11:38
Message-Id: 20110903191125.C31F120051@flycatcher.gentoo.org
1 scarabeus 11/09/03 19:11:25
2
3 Modified: libreoffice-bin-3.4.3-r1.ebuild
4 Log:
5 Add the l10n package to pdepend to avoid collisions.
6
7 (Portage version: 2.2.0_alpha52/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.3 app-office/libreoffice-bin/libreoffice-bin-3.4.3-r1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r1.ebuild?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r1.ebuild?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r1.ebuild?r1=1.2&r2=1.3
15
16 Index: libreoffice-bin-3.4.3-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r1.ebuild,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- libreoffice-bin-3.4.3-r1.ebuild 3 Sep 2011 11:56:58 -0000 1.2
23 +++ libreoffice-bin-3.4.3-r1.ebuild 3 Sep 2011 19:11:25 -0000 1.3
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2011 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r1.ebuild,v 1.2 2011/09/03 11:56:58 scarabeus Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r1.ebuild,v 1.3 2011/09/03 19:11:25 scarabeus Exp $
29
30 EAPI="3"
31
32 @@ -40,7 +40,6 @@
33 !app-office/openoffice
34 !app-office/openoffice-bin
35 !prefix? ( sys-libs/glibc )
36 - >=app-office/libreoffice-l10n-${PV}
37 app-arch/unzip
38 app-arch/zip
39 >=dev-lang/perl-5.0
40 @@ -51,7 +50,10 @@
41 DEPEND="${RDEPEND}
42 sys-apps/findutils"
43
44 -PDEPEND="java? ( >=virtual/jre-1.5 )"
45 +PDEPEND="
46 + >=app-office/libreoffice-l10n-${PV}
47 + java? ( >=virtual/jre-1.5 )
48 +"
49
50 RESTRICT="strip"