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: metadata.xml ChangeLog libreoffice-3.4.9999-r1.ebuild libreoffice-9999-r1.ebuild
Date: Thu, 29 Sep 2011 14:27:35
Message-Id: 20110929142725.3E09A20036@flycatcher.gentoo.org
1 scarabeus 11/09/29 14:27:25
2
3 Modified: metadata.xml ChangeLog
4 libreoffice-3.4.9999-r1.ebuild
5 libreoffice-9999-r1.ebuild
6 Log:
7 Add pdfimport useflag.
8
9 (Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.9 app-office/libreoffice/metadata.xml
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/metadata.xml?rev=1.9&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/metadata.xml?rev=1.9&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/metadata.xml?r1=1.8&r2=1.9
17
18 Index: metadata.xml
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/metadata.xml,v
21 retrieving revision 1.8
22 retrieving revision 1.9
23 diff -u -r1.8 -r1.9
24 --- metadata.xml 17 Sep 2011 12:43:29 -0000 1.8
25 +++ metadata.xml 29 Sep 2011 14:27:25 -0000 1.9
26 @@ -8,16 +8,13 @@
27 computer. It will however make a snappier openoffice than the binary
28 version</longdescription>
29 <use>
30 - <flag name="binfilter">Enable support for legacy StarOffice 5.x and earlier
31 - file formats</flag>
32 - <flag name="graphite">Enable support for non-Roman fonts via
33 - <pkg>media-gfx/graphite2</pkg></flag>
34 + <flag name="binfilter">Enable support for legacy StarOffice 5.x and earlier file formats</flag>
35 + <flag name="graphite">Enable support for non-Roman fonts via <pkg>media-gfx/graphite2</pkg></flag>
36 <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
37 <flag name="odk">Build the Office Development Kit</flag>
38 + <flag name="pdfimport">Build pdf-import extension using <pkg>app-text/poppler</pkg>. Note that you don't need this for pdf-export!</flag>
39 <flag name="templates">Enable installation of Sun templates</flag>
40 - <flag name="vba">Enable support for VBA compatibility and ActiveX
41 - embedding</flag>
42 - <flag name="webdav">Adds support for HTTP repositories via
43 - <pkg>net-libs/neon</pkg></flag>
44 + <flag name="vba">Enable support for VBA compatibility and ActiveX embedding</flag>
45 + <flag name="webdav">Adds support for HTTP repositories via <pkg>net-libs/neon</pkg></flag>
46 </use>
47 </pkgmetadata>
48
49
50
51 1.153 app-office/libreoffice/ChangeLog
52
53 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.153&view=markup
54 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.153&content-type=text/plain
55 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.152&r2=1.153
56
57 Index: ChangeLog
58 ===================================================================
59 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
60 retrieving revision 1.152
61 retrieving revision 1.153
62 diff -u -r1.152 -r1.153
63 --- ChangeLog 29 Sep 2011 14:09:59 -0000 1.152
64 +++ ChangeLog 29 Sep 2011 14:27:25 -0000 1.153
65 @@ -1,6 +1,10 @@
66 # ChangeLog for app-office/libreoffice
67 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
68 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.152 2011/09/29 14:09:59 scarabeus Exp $
69 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.153 2011/09/29 14:27:25 scarabeus Exp $
70 +
71 + 29 Sep 2011; Tomáš Chvátal <scarabeus@g.o>
72 + libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild, metadata.xml:
73 + Add pdfimport useflag.
74
75 29 Sep 2011; Tomáš Chvátal <scarabeus@g.o>
76 files/libreoffice-poppler-0.18.0.patch:
77
78
79
80 1.11 app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
81
82 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild?rev=1.11&view=markup
83 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild?rev=1.11&content-type=text/plain
84 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild?r1=1.10&r2=1.11
85
86 Index: libreoffice-3.4.9999-r1.ebuild
87 ===================================================================
88 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v
89 retrieving revision 1.10
90 retrieving revision 1.11
91 diff -u -r1.10 -r1.11
92 --- libreoffice-3.4.9999-r1.ebuild 17 Sep 2011 12:43:29 -0000 1.10
93 +++ libreoffice-3.4.9999-r1.ebuild 29 Sep 2011 14:27:25 -0000 1.11
94 @@ -1,6 +1,6 @@
95 # Copyright 1999-2011 Gentoo Foundation
96 # Distributed under the terms of the GNU General Public License v2
97 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.10 2011/09/17 12:43:29 scarabeus Exp $
98 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.11 2011/09/29 14:27:25 scarabeus Exp $
99
100 EAPI=3
101
102 @@ -53,37 +53,9 @@
103 ADDONS_SRC+=" ${ADDONS_URI}/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz"
104 ADDONS_SRC+=" ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
105 ADDONS_SRC+=" ${ADDONS_URI}/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz"
106 -ADDONS_SRC+=" ${ADDONS_URI}/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
107 ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
108 -ADDONS_SRC+=" ${ADDONS_URI}/24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html"
109 -ADDONS_SRC+=" ${ADDONS_URI}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz"
110 -ADDONS_SRC+=" ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
111 -ADDONS_SRC+=" ${ADDONS_URI}/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"
112 -ADDONS_SRC+=" ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"
113 -ADDONS_SRC+=" ${ADDONS_URI}/48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt"
114 -ADDONS_SRC+=" ${ADDONS_URI}/4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz"
115 -ADDONS_SRC+=" ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
116 -ADDONS_SRC+=" ${ADDONS_URI}/8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar"
117 -ADDONS_SRC+=" ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
118 -ADDONS_SRC+=" ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip"
119 -ADDONS_SRC+=" ${ADDONS_URI}/d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip"
120 ADDONS_SRC+=" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
121 -ADDONS_SRC+=" ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"
122 -ADDONS_SRC+=" ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"
123 -ADDONS_SRC+=" ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"
124 -ADDONS_SRC+=" ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"
125 -ADDONS_SRC+=" ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"
126 -ADDONS_SRC+=" ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"
127 -ADDONS_SRC+=" ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"
128 -ADDONS_SRC+=" ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"
129 -ADDONS_SRC+=" ${ADDONS_URI}/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt"
130 -ADDONS_SRC+=" ${ADDONS_URI}/47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2"
131 -ADDONS_SRC+=" ${ADDONS_URI}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2"
132 -ADDONS_SRC+=" ${ADDONS_URI}/0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz"
133 -ADDONS_SRC+=" ${ADDONS_URI}/71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz"
134 -ADDONS_SRC+=" http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
135 ADDONS_SRC+=" http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2"
136 -ADDONS_SRC+=" http://www.numbertext.org/linux/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip"
137 SRC_URI+=" ${ADDONS_SRC}"
138
139 TDEPEND="${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt"
140 @@ -101,8 +73,8 @@
141 unset ADDONS_SRC
142
143 IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite
144 -gstreamer gtk jemalloc kde ldap mysql nsplugin odk opengl python templates test
145 -+vba webdav"
146 +gstreamer gtk jemalloc kde ldap mysql nsplugin odk opengl pdfimport python
147 +templates test +vba webdav"
148 LICENSE="LGPL-3"
149 SLOT="0"
150 [[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
151 @@ -122,7 +94,6 @@
152 app-text/libwpd:0.9[tools]
153 app-text/libwpg:0.2
154 >=app-text/libwps-0.2.2
155 - >=app-text/poppler-0.12.3-r3[xpdf-headers]
156 dev-db/unixODBC
157 dev-libs/expat
158 >=dev-libs/glib-2.18
159 @@ -168,6 +139,7 @@
160 >=dev-libs/nss-3.12.9
161 )
162 opengl? ( virtual/opengl )
163 + pdfimport? ( >=app-text/poppler-0.12.3-r3[xpdf-headers] )
164 webdav? ( net-libs/neon )
165 "
166
167 @@ -370,7 +342,7 @@
168
169 # list the extensions we are going to build by default
170 extensions="
171 - --enable-ext-pdfimport
172 + $(use_enable pdfimport ext-pdfimport)
173 --enable-ext-presenter-console
174 --enable-ext-presenter-minimizer
175 "
176
177
178
179 1.27 app-office/libreoffice/libreoffice-9999-r1.ebuild
180
181 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?rev=1.27&view=markup
182 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?rev=1.27&content-type=text/plain
183 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?r1=1.26&r2=1.27
184
185 Index: libreoffice-9999-r1.ebuild
186 ===================================================================
187 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v
188 retrieving revision 1.26
189 retrieving revision 1.27
190 diff -u -r1.26 -r1.27
191 --- libreoffice-9999-r1.ebuild 29 Sep 2011 13:20:52 -0000 1.26
192 +++ libreoffice-9999-r1.ebuild 29 Sep 2011 14:27:25 -0000 1.27
193 @@ -1,6 +1,6 @@
194 # Copyright 1999-2011 Gentoo Foundation
195 # Distributed under the terms of the GNU General Public License v2
196 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.26 2011/09/29 13:20:52 scarabeus Exp $
197 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.27 2011/09/29 14:27:25 scarabeus Exp $
198
199 EAPI=3
200
201 @@ -70,7 +70,7 @@
202 unset ADDONS_SRC
203
204 IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer gtk +jemalloc
205 -kde ldap mysql nsplugin odk opengl svg templates test +vba webdav"
206 +kde ldap mysql nsplugin odk opengl pdfimport svg templates test +vba webdav"
207 LICENSE="LGPL-3"
208 SLOT="0"
209 [[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
210 @@ -91,7 +91,6 @@
211 app-text/libwpd:0.9[tools]
212 app-text/libwpg:0.2
213 >=app-text/libwps-0.2.2
214 - >=app-text/poppler-0.12.3-r3[xpdf-headers]
215 dev-db/unixODBC
216 dev-libs/expat
217 >=dev-libs/glib-2.18
218 @@ -137,6 +136,7 @@
219 >=dev-libs/nss-3.12.9
220 )
221 opengl? ( virtual/opengl )
222 + pdfimport? ( >=app-text/poppler-0.12.3-r3[xpdf-headers] )
223 svg? ( gnome-base/librsvg )
224 webdav? ( net-libs/neon )
225 "
226 @@ -426,6 +426,7 @@
227 $(use_enable nsplugin mozilla) \
228 $(use_enable odk) \
229 $(use_enable opengl) \
230 + $(use_enable pdfimport ext-pdfimport) \
231 $(use_enable svg librsvg system) \
232 $(use_enable vba) \
233 $(use_enable vba activex-component) \