Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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: libreoffice-3.4.9999.ebuild libreoffice-9999.ebuild libreoffice-3.4.3.2.ebuild ChangeLog
Date: Sat, 03 Sep 2011 19:13:24
Message-Id: 20110903191313.D0A3120051@flycatcher.gentoo.org
1 scarabeus 11/09/03 19:13:13
2
3 Modified: libreoffice-3.4.9999.ebuild libreoffice-9999.ebuild
4 libreoffice-3.4.3.2.ebuild ChangeLog
5 Log:
6 Fix l10n collision with the non-recompiled-yet libreoffice.
7
8 (Portage version: 2.2.0_alpha52/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.26 app-office/libreoffice/libreoffice-3.4.9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild?rev=1.26&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild?rev=1.26&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild?r1=1.25&r2=1.26
16
17 Index: libreoffice-3.4.9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v
20 retrieving revision 1.25
21 retrieving revision 1.26
22 diff -u -r1.25 -r1.26
23 --- libreoffice-3.4.9999.ebuild 3 Sep 2011 16:08:42 -0000 1.25
24 +++ libreoffice-3.4.9999.ebuild 3 Sep 2011 19:13:13 -0000 1.26
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2011 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $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 $
29 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v 1.26 2011/09/03 19:13:13 scarabeus Exp $
30
31 EAPI=3
32
33 @@ -174,10 +174,13 @@
34 !app-office/libreoffice-bin
35 !app-office/openoffice-bin
36 !app-office/openoffice
37 - >=app-office/libreoffice-l10n-$(get_version_component_range 1-2)
38 java? ( >=virtual/jre-1.6 )
39 "
40
41 +PDEPEND="
42 + >=app-office/libreoffice-l10n-$(get_version_component_range 1-2)
43 +"
44 +
45 DEPEND="${COMMON_DEPEND}
46 >=dev-libs/boost-1.46
47 >=dev-libs/libxml2-2.7.8
48
49
50
51 1.23 app-office/libreoffice/libreoffice-9999.ebuild
52
53 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild?rev=1.23&view=markup
54 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild?rev=1.23&content-type=text/plain
55 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild?r1=1.22&r2=1.23
56
57 Index: libreoffice-9999.ebuild
58 ===================================================================
59 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v
60 retrieving revision 1.22
61 retrieving revision 1.23
62 diff -u -r1.22 -r1.23
63 --- libreoffice-9999.ebuild 3 Sep 2011 16:08:42 -0000 1.22
64 +++ libreoffice-9999.ebuild 3 Sep 2011 19:13:13 -0000 1.23
65 @@ -1,6 +1,6 @@
66 # Copyright 1999-2011 Gentoo Foundation
67 # Distributed under the terms of the GNU General Public License v2
68 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.22 2011/09/03 16:08:42 mr_bones_ Exp $
69 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.23 2011/09/03 19:13:13 scarabeus Exp $
70
71 EAPI=3
72
73 @@ -169,15 +169,18 @@
74 webdav? ( net-libs/neon )
75 "
76
77 -# FIXME: l10n after release/branching
78 RDEPEND="${COMMON_DEPEND}
79 !app-office/libreoffice-bin
80 !app-office/openoffice-bin
81 !app-office/openoffice
82 - >=app-office/libreoffice-l10n-3.4
83 java? ( >=virtual/jre-1.6 )
84 "
85
86 +# FIXME: l10n after release/branching
87 +PDEPEND="
88 + >=app-office/libreoffice-l10n-3.4
89 +"
90 +
91 DEPEND="${COMMON_DEPEND}
92 >=dev-libs/boost-1.46
93 >=dev-libs/libxml2-2.7.8
94
95
96
97 1.6 app-office/libreoffice/libreoffice-3.4.3.2.ebuild
98
99 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2.ebuild?rev=1.6&view=markup
100 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2.ebuild?rev=1.6&content-type=text/plain
101 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2.ebuild?r1=1.5&r2=1.6
102
103 Index: libreoffice-3.4.3.2.ebuild
104 ===================================================================
105 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2.ebuild,v
106 retrieving revision 1.5
107 retrieving revision 1.6
108 diff -u -r1.5 -r1.6
109 --- libreoffice-3.4.3.2.ebuild 3 Sep 2011 16:08:42 -0000 1.5
110 +++ libreoffice-3.4.3.2.ebuild 3 Sep 2011 19:13:13 -0000 1.6
111 @@ -1,6 +1,6 @@
112 # Copyright 1999-2011 Gentoo Foundation
113 # Distributed under the terms of the GNU General Public License v2
114 -# $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 $
115 +# $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 $
116
117 EAPI=3
118
119 @@ -174,10 +174,13 @@
120 !app-office/libreoffice-bin
121 !app-office/openoffice-bin
122 !app-office/openoffice
123 - >=app-office/libreoffice-l10n-$(get_version_component_range 1-2)
124 java? ( >=virtual/jre-1.6 )
125 "
126
127 +PDEPEND="
128 + >=app-office/libreoffice-l10n-$(get_version_component_range 1-2)
129 +"
130 +
131 DEPEND="${COMMON_DEPEND}
132 >=dev-libs/boost-1.46
133 >=dev-libs/libxml2-2.7.8
134
135
136
137 1.121 app-office/libreoffice/ChangeLog
138
139 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.121&view=markup
140 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.121&content-type=text/plain
141 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.120&r2=1.121
142
143 Index: ChangeLog
144 ===================================================================
145 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
146 retrieving revision 1.120
147 retrieving revision 1.121
148 diff -u -r1.120 -r1.121
149 --- ChangeLog 3 Sep 2011 11:51:49 -0000 1.120
150 +++ ChangeLog 3 Sep 2011 19:13:13 -0000 1.121
151 @@ -1,6 +1,11 @@
152 # ChangeLog for app-office/libreoffice
153 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
154 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.120 2011/09/03 11:51:49 scarabeus Exp $
155 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.121 2011/09/03 19:13:13 scarabeus Exp $
156 +
157 + 03 Sep 2011; Tomáš Chvátal <scarabeus@g.o>
158 + libreoffice-3.4.3.2.ebuild, libreoffice-3.4.9999.ebuild,
159 + libreoffice-9999.ebuild:
160 + Fix l10n collision with the non-recompiled-yet libreoffice.
161
162 03 Sep 2011; Tomáš Chvátal <scarabeus@g.o>
163 libreoffice-3.4.3.2.ebuild, libreoffice-3.4.9999.ebuild,
Report Message
Find on MARC Find on Google Groups