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-3.5.9999.ebuild libreoffice-3.5.2.2.ebuild ChangeLog
Date: Fri, 06 Apr 2012 10:57:37
Message-Id: 20120406105726.7D7452004B@flycatcher.gentoo.org
1 scarabeus 12/04/06 10:57:26
2
3 Modified: libreoffice-9999-r2.ebuild
4 libreoffice-3.5.9999.ebuild
5 libreoffice-3.5.2.2.ebuild ChangeLog
6 Log:
7 Disable quickstarter feature as it is broken yet again. Wrt bug#408685. If anyone wants this feature contact upstream about rewritting it properly.
8
9 (Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.45 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.45&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.45&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.44&r2=1.45
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.44
22 retrieving revision 1.45
23 diff -u -r1.44 -r1.45
24 --- libreoffice-9999-r2.ebuild 2 Apr 2012 07:39:49 -0000 1.44
25 +++ libreoffice-9999-r2.ebuild 6 Apr 2012 10:57:26 -0000 1.45
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2012 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.44 2012/04/02 07:39:49 scarabeus Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.45 2012/04/06 10:57:26 scarabeus Exp $
31
32 EAPI=4
33
34 @@ -244,12 +244,6 @@
35 python_pkg_setup
36
37 [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_pretend
38 -
39 - if ! use gtk; then
40 - ewarn "If you want the LibreOffice systray quickstarter to work"
41 - ewarn "activate the 'gtk' use flag."
42 - ewarn
43 - fi
44 }
45
46 src_unpack() {
47 @@ -376,6 +370,8 @@
48 # affecting the nsplugin that is always ON
49 # --disable-pch: precompiled headers cause build crashes
50 # --disable-rpath: relative runtime path is not desired
51 + # --disable-systray: quickstarter does not actually work at all so do not
52 + # promote it
53 # --disable-zenity: disable build icon
54 # --enable-extension-integration: enable any extension integration support
55 # --with-{max-jobs,num-cpus}: ensuring parallel building
56 @@ -410,6 +406,7 @@
57 --disable-online-update \
58 --disable-pch \
59 --disable-rpath \
60 + --disable-systray \
61 --disable-strip-solver \
62 --disable-zenity \
63 --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
64 @@ -443,7 +440,6 @@
65 $(use_enable gstreamer) \
66 $(use_enable gtk) \
67 $(use_enable gtk3) \
68 - $(use_enable gtk systray) \
69 $(use_enable java ext-scripting-beanshell) \
70 $(use_enable kde kde4) \
71 $(use_enable mysql ext-mysql-connector) \
72
73
74
75 1.36 app-office/libreoffice/libreoffice-3.5.9999.ebuild
76
77 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.36&view=markup
78 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.36&content-type=text/plain
79 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?r1=1.35&r2=1.36
80
81 Index: libreoffice-3.5.9999.ebuild
82 ===================================================================
83 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v
84 retrieving revision 1.35
85 retrieving revision 1.36
86 diff -u -r1.35 -r1.36
87 --- libreoffice-3.5.9999.ebuild 3 Apr 2012 12:53:20 -0000 1.35
88 +++ libreoffice-3.5.9999.ebuild 6 Apr 2012 10:57:26 -0000 1.36
89 @@ -1,6 +1,6 @@
90 # Copyright 1999-2012 Gentoo Foundation
91 # Distributed under the terms of the GNU General Public License v2
92 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.35 2012/04/03 12:53:20 scarabeus Exp $
93 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.36 2012/04/06 10:57:26 scarabeus Exp $
94
95 EAPI=4
96
97 @@ -243,11 +243,6 @@
98 CHECKREQS_DISK_BUILD="6G"
99 check-reqs_pkg_pretend
100 fi
101 - if ! use gtk; then
102 - ewarn "If you want the LibreOffice systray quickstarter to work"
103 - ewarn "activate the 'gtk' use flag."
104 - ewarn
105 - fi
106 }
107
108 src_unpack() {
109 @@ -412,6 +407,7 @@
110 --disable-online-update \
111 --disable-pch \
112 --disable-rpath \
113 + --disable-systray \
114 --disable-static-gtk \
115 --disable-strip-solver \
116 --disable-ugly \
117 @@ -447,7 +443,6 @@
118 $(use_enable gstreamer) \
119 $(use_enable gtk) \
120 --disable-gtk3 \
121 - $(use_enable gtk systray) \
122 $(use_enable java ext-scripting-beanshell) \
123 $(use_enable kde kde4) \
124 $(use_enable mysql ext-mysql-connector) \
125
126
127
128 1.10 app-office/libreoffice/libreoffice-3.5.2.2.ebuild
129
130 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild?rev=1.10&view=markup
131 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild?rev=1.10&content-type=text/plain
132 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild?r1=1.9&r2=1.10
133
134 Index: libreoffice-3.5.2.2.ebuild
135 ===================================================================
136 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild,v
137 retrieving revision 1.9
138 retrieving revision 1.10
139 diff -u -r1.9 -r1.10
140 --- libreoffice-3.5.2.2.ebuild 3 Apr 2012 13:35:28 -0000 1.9
141 +++ libreoffice-3.5.2.2.ebuild 6 Apr 2012 10:57:26 -0000 1.10
142 @@ -1,6 +1,6 @@
143 # Copyright 1999-2012 Gentoo Foundation
144 # Distributed under the terms of the GNU General Public License v2
145 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild,v 1.9 2012/04/03 13:35:28 scarabeus Exp $
146 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild,v 1.10 2012/04/06 10:57:26 scarabeus Exp $
147
148 EAPI=4
149
150 @@ -246,11 +246,6 @@
151 CHECKREQS_DISK_BUILD="6G"
152 check-reqs_pkg_pretend
153 fi
154 - if ! use gtk; then
155 - ewarn "If you want the LibreOffice systray quickstarter to work"
156 - ewarn "activate the 'gtk' use flag."
157 - ewarn
158 - fi
159 }
160
161 src_unpack() {
162 @@ -415,6 +410,7 @@
163 --disable-online-update \
164 --disable-pch \
165 --disable-rpath \
166 + --disable-systray \
167 --disable-static-gtk \
168 --disable-strip-solver \
169 --disable-ugly \
170 @@ -450,7 +446,6 @@
171 $(use_enable gstreamer) \
172 $(use_enable gtk) \
173 --disable-gtk3 \
174 - $(use_enable gtk systray) \
175 $(use_enable java ext-scripting-beanshell) \
176 $(use_enable kde kde4) \
177 $(use_enable mysql ext-mysql-connector) \
178
179
180
181 1.279 app-office/libreoffice/ChangeLog
182
183 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.279&view=markup
184 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.279&content-type=text/plain
185 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.278&r2=1.279
186
187 Index: ChangeLog
188 ===================================================================
189 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
190 retrieving revision 1.278
191 retrieving revision 1.279
192 diff -u -r1.278 -r1.279
193 --- ChangeLog 3 Apr 2012 16:07:36 -0000 1.278
194 +++ ChangeLog 6 Apr 2012 10:57:26 -0000 1.279
195 @@ -1,6 +1,11 @@
196 # ChangeLog for app-office/libreoffice
197 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
198 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.278 2012/04/03 16:07:36 scarabeus Exp $
199 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.279 2012/04/06 10:57:26 scarabeus Exp $
200 +
201 + 06 Apr 2012; Tomáš Chvátal <scarabeus@g.o> libreoffice-3.5.2.2.ebuild,
202 + libreoffice-3.5.9999.ebuild, libreoffice-9999-r2.ebuild:
203 + Disable quickstarter feature as it is broken yet again. Wrt bug#408685. If
204 + anyone wants this feature contact upstream about rewritting it properly.
205
206 03 Apr 2012; Tomáš Chvátal <scarabeus@g.o>
207 -files/libreoffice-3.5.2-icu-49-part2.patch,
Report Message
Find on MARC Find on Google Groups