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-9999-r2.ebuild libreoffice-4.0.9999.ebuild libreoffice-4.0.0.2.ebuild ChangeLog
Date: Thu, 31 Jan 2013 13:58:27
Message-Id: 20130131135821.D8F9D2171D@flycatcher.gentoo.org
1 scarabeus 13/01/31 13:58:21
2
3 Modified: libreoffice-9999-r2.ebuild
4 libreoffice-4.0.9999.ebuild
5 libreoffice-4.0.0.2.ebuild ChangeLog
6 Log:
7 Enforce dependency over same version translation. It should fix bug#454332.
8
9 (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
10
11 Revision Changes Path
12 1.158 app-office/libreoffice/libreoffice-9999-r2.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.158&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.158&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.157&r2=1.158
17
18 Index: libreoffice-9999-r2.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
21 retrieving revision 1.157
22 retrieving revision 1.158
23 diff -u -r1.157 -r1.158
24 --- libreoffice-9999-r2.ebuild 28 Jan 2013 18:04:28 -0000 1.157
25 +++ libreoffice-9999-r2.ebuild 31 Jan 2013 13:58:21 -0000 1.158
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2013 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.157 2013/01/28 18:04:28 scarabeus Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.158 2013/01/31 13:58:21 scarabeus Exp $
31
32 EAPI=5
33
34 @@ -180,9 +180,13 @@
35 java? ( >=virtual/jre-1.6 )
36 "
37
38 -PDEPEND="
39 - =app-office/libreoffice-l10n-4.0*
40 -"
41 +if [[ ${PV} != *9999* ]]; then
42 + PDEPEND="~app-office/libreoffice-l10n-${PV}"
43 +else
44 + # Translations are not reliable on live ebuilds
45 + # rather force people to use english only.
46 + PDEPEND="!app-office/libreoffice-l10n"
47 +fi
48
49 # FIXME: cppunit should be moved to test conditional
50 # after everything upstream is under gbuild
51
52
53
54 1.20 app-office/libreoffice/libreoffice-4.0.9999.ebuild
55
56 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.20&view=markup
57 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.20&content-type=text/plain
58 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?r1=1.19&r2=1.20
59
60 Index: libreoffice-4.0.9999.ebuild
61 ===================================================================
62 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v
63 retrieving revision 1.19
64 retrieving revision 1.20
65 diff -u -r1.19 -r1.20
66 --- libreoffice-4.0.9999.ebuild 28 Jan 2013 18:04:28 -0000 1.19
67 +++ libreoffice-4.0.9999.ebuild 31 Jan 2013 13:58:21 -0000 1.20
68 @@ -1,6 +1,6 @@
69 # Copyright 1999-2013 Gentoo Foundation
70 # Distributed under the terms of the GNU General Public License v2
71 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.19 2013/01/28 18:04:28 scarabeus Exp $
72 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.20 2013/01/31 13:58:21 scarabeus Exp $
73
74 EAPI=5
75
76 @@ -181,9 +181,13 @@
77 java? ( >=virtual/jre-1.6 )
78 "
79
80 -PDEPEND="
81 - =app-office/libreoffice-l10n-4.0*
82 -"
83 +if [[ ${PV} != *9999* ]]; then
84 + PDEPEND="~app-office/libreoffice-l10n-${PV}"
85 +else
86 + # Translations are not reliable on live ebuilds
87 + # rather force people to use english only.
88 + PDEPEND="!app-office/libreoffice-l10n"
89 +fi
90
91 # FIXME: cppunit should be moved to test conditional
92 # after everything upstream is under gbuild
93
94
95
96 1.4 app-office/libreoffice/libreoffice-4.0.0.2.ebuild
97
98 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.2.ebuild?rev=1.4&view=markup
99 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.2.ebuild?rev=1.4&content-type=text/plain
100 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.2.ebuild?r1=1.3&r2=1.4
101
102 Index: libreoffice-4.0.0.2.ebuild
103 ===================================================================
104 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.2.ebuild,v
105 retrieving revision 1.3
106 retrieving revision 1.4
107 diff -u -r1.3 -r1.4
108 --- libreoffice-4.0.0.2.ebuild 27 Jan 2013 08:23:22 -0000 1.3
109 +++ libreoffice-4.0.0.2.ebuild 31 Jan 2013 13:58:21 -0000 1.4
110 @@ -1,6 +1,6 @@
111 # Copyright 1999-2013 Gentoo Foundation
112 # Distributed under the terms of the GNU General Public License v2
113 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.2.ebuild,v 1.3 2013/01/27 08:23:22 scarabeus Exp $
114 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.2.ebuild,v 1.4 2013/01/31 13:58:21 scarabeus Exp $
115
116 EAPI=5
117
118 @@ -180,9 +180,13 @@
119 java? ( >=virtual/jre-1.6 )
120 "
121
122 -PDEPEND="
123 - =app-office/libreoffice-l10n-4.0*
124 -"
125 +if [[ ${PV} != *9999* ]]; then
126 + PDEPEND="~app-office/libreoffice-l10n-${PV}"
127 +else
128 + # Translations are not reliable on live ebuilds
129 + # rather force people to use english only.
130 + PDEPEND="!app-office/libreoffice-l10n"
131 +fi
132
133 # FIXME: cppunit should be moved to test conditional
134 # after everything upstream is under gbuild
135
136
137
138 1.439 app-office/libreoffice/ChangeLog
139
140 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.439&view=markup
141 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.439&content-type=text/plain
142 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.438&r2=1.439
143
144 Index: ChangeLog
145 ===================================================================
146 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
147 retrieving revision 1.438
148 retrieving revision 1.439
149 diff -u -r1.438 -r1.439
150 --- ChangeLog 28 Jan 2013 18:04:28 -0000 1.438
151 +++ ChangeLog 31 Jan 2013 13:58:21 -0000 1.439
152 @@ -1,6 +1,10 @@
153 # ChangeLog for app-office/libreoffice
154 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
155 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.438 2013/01/28 18:04:28 scarabeus Exp $
156 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.439 2013/01/31 13:58:21 scarabeus Exp $
157 +
158 + 31 Jan 2013; Tomáš Chvátal <scarabeus@g.o> libreoffice-4.0.0.2.ebuild,
159 + libreoffice-4.0.9999.ebuild, libreoffice-9999-r2.ebuild:
160 + Enforce dependency over same version translation. It should fix bug#454332.
161
162 28 Jan 2013; Tomáš Chvátal <scarabeus@g.o> libreoffice-4.0.9999.ebuild,
163 libreoffice-9999-r2.ebuild:
Report Message
Find on MARC Find on Google Groups