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.6.9999.ebuild ChangeLog
Date: Mon, 02 Jul 2012 10:38:48
Message-Id: 20120702103832.ED0422004B@flycatcher.gentoo.org
1 scarabeus 12/07/02 10:38:32
2
3 Modified: libreoffice-9999-r2.ebuild
4 libreoffice-3.6.9999.ebuild ChangeLog
5 Log:
6 Remove nsplugin support as it does not work at all.
7
8 (Portage version: 2.2.0_alpha114/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.90 app-office/libreoffice/libreoffice-9999-r2.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.90&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.90&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.89&r2=1.90
16
17 Index: libreoffice-9999-r2.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
20 retrieving revision 1.89
21 retrieving revision 1.90
22 diff -u -r1.89 -r1.90
23 --- libreoffice-9999-r2.ebuild 24 Jun 2012 21:50:55 -0000 1.89
24 +++ libreoffice-9999-r2.ebuild 2 Jul 2012 10:38:32 -0000 1.90
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2012 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.89 2012/06/24 21:50:55 dilfridge Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.90 2012/07/02 10:38:32 scarabeus Exp $
30
31 EAPI=4
32
33 @@ -27,7 +27,7 @@
34 # PATCHSET="${P}-patchset-01.tar.xz"
35
36 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
37 -inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
38 +inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic ${SCM_ECLASS}
39 unset SCM_ECLASS
40
41 DESCRIPTION="LibreOffice, a full office productivity suite."
42 @@ -71,8 +71,8 @@
43 unset ADDONS_SRC
44
45 IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome +graphite
46 -gstreamer +gtk gtk3 jemalloc kde mysql +nsplugin odk opengl postgres svg test
47 -+vba +webdav +xmlsec"
48 +gstreamer +gtk gtk3 jemalloc kde mysql odk opengl postgres svg test +vba
49 ++webdav +xmlsec"
50
51 LO_EXTS="nlpsolver pdfimport presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
52 # Unpackaged separate extensions:
53 @@ -218,7 +218,6 @@
54 )
55
56 REQUIRED_USE="
57 - nsplugin? ( gtk )
58 gnome? ( gtk )
59 eds? ( gnome )
60 libreoffice_extensions_nlpsolver? ( java )
61 @@ -421,8 +420,10 @@
62 # --disable-kdeab: kde3 adressbook
63 # --disable-kde: kde3 support
64 # --disable-ldap: ldap requires internal mozilla stuff, same like mozab
65 - # --disable-mozilla: disable mozilla build that is used for adresbook, not
66 - # affecting the nsplugin that is always ON
67 + # --disable-mozilla: mozilla internal is for contact integration, never
68 + # worked on linux
69 + # --disable-nsplugin: does not work at all, reall effort to fix this
70 + # required
71 # --disable-pch: precompiled headers cause build crashes
72 # --disable-rpath: relative runtime path is not desired
73 # --disable-systray: quickstarter does not actually work at all so do not
74 @@ -458,6 +459,7 @@
75 --disable-kde \
76 --disable-ldap \
77 --disable-mozilla \
78 + --disable-nsplugin \
79 --disable-online-update \
80 --disable-pch \
81 --disable-rpath \
82 @@ -497,7 +499,6 @@
83 $(use_enable gtk3) \
84 $(use_enable kde kde4) \
85 $(use_enable mysql ext-mysql-connector) \
86 - $(use_enable nsplugin) \
87 $(use_enable odk) \
88 $(use_enable opengl) \
89 $(use_enable postgres postgresql-sdbc) \
90 @@ -547,11 +548,6 @@
91 newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
92 rm -rf "${ED}"/etc/
93
94 - # symlink the nsplugin to system location
95 - if use nsplugin; then
96 - inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
97 - fi
98 -
99 if use branding; then
100 insinto /usr/$(get_libdir)/${PN}/program
101 newins "${WORKDIR}/branding-sofficerc" sofficerc
102
103
104
105 1.10 app-office/libreoffice/libreoffice-3.6.9999.ebuild
106
107 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild?rev=1.10&view=markup
108 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild?rev=1.10&content-type=text/plain
109 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild?r1=1.9&r2=1.10
110
111 Index: libreoffice-3.6.9999.ebuild
112 ===================================================================
113 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v
114 retrieving revision 1.9
115 retrieving revision 1.10
116 diff -u -r1.9 -r1.10
117 --- libreoffice-3.6.9999.ebuild 24 Jun 2012 21:50:55 -0000 1.9
118 +++ libreoffice-3.6.9999.ebuild 2 Jul 2012 10:38:32 -0000 1.10
119 @@ -1,6 +1,6 @@
120 # Copyright 1999-2012 Gentoo Foundation
121 # Distributed under the terms of the GNU General Public License v2
122 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.9 2012/06/24 21:50:55 dilfridge Exp $
123 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.10 2012/07/02 10:38:32 scarabeus Exp $
124
125 EAPI=4
126
127 @@ -27,7 +27,7 @@
128 # PATCHSET="${P}-patchset-01.tar.xz"
129
130 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
131 -inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
132 +inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic ${SCM_ECLASS}
133 unset SCM_ECLASS
134
135 DESCRIPTION="LibreOffice, a full office productivity suite."
136 @@ -71,7 +71,7 @@
137 unset ADDONS_SRC
138
139 IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome +graphite
140 -gstreamer +gtk jemalloc kde mysql +nsplugin odk opengl postgres svg test +vba
141 +gstreamer +gtk jemalloc kde mysql odk opengl postgres svg test +vba
142 +webdav +xmlsec"
143
144 LO_EXTS="nlpsolver pdfimport presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
145 @@ -216,7 +216,6 @@
146 )
147
148 REQUIRED_USE="
149 - nsplugin? ( gtk )
150 gnome? ( gtk )
151 eds? ( gnome )
152 libreoffice_extensions_nlpsolver? ( java )
153 @@ -456,6 +455,7 @@
154 --disable-kde \
155 --disable-ldap \
156 --disable-mozilla \
157 + --disable-nsplugin \
158 --disable-online-update \
159 --disable-pch \
160 --disable-rpath \
161 @@ -495,7 +495,6 @@
162 $(use_enable gtk) \
163 $(use_enable kde kde4) \
164 $(use_enable mysql ext-mysql-connector) \
165 - $(use_enable nsplugin) \
166 $(use_enable odk) \
167 $(use_enable opengl) \
168 $(use_enable postgres postgresql-sdbc) \
169 @@ -545,11 +544,6 @@
170 newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
171 rm -rf "${ED}"/etc/
172
173 - # symlink the nsplugin to system location
174 - if use nsplugin; then
175 - inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
176 - fi
177 -
178 if use branding; then
179 insinto /usr/$(get_libdir)/${PN}/program
180 newins "${WORKDIR}/branding-sofficerc" sofficerc
181
182
183
184 1.343 app-office/libreoffice/ChangeLog
185
186 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.343&view=markup
187 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.343&content-type=text/plain
188 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.342&r2=1.343
189
190 Index: ChangeLog
191 ===================================================================
192 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
193 retrieving revision 1.342
194 retrieving revision 1.343
195 diff -u -r1.342 -r1.343
196 --- ChangeLog 27 Jun 2012 09:11:32 -0000 1.342
197 +++ ChangeLog 2 Jul 2012 10:38:32 -0000 1.343
198 @@ -1,6 +1,10 @@
199 # ChangeLog for app-office/libreoffice
200 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
201 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.342 2012/06/27 09:11:32 scarabeus Exp $
202 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.343 2012/07/02 10:38:32 scarabeus Exp $
203 +
204 + 02 Jul 2012; Tomáš Chvátal <scarabeus@g.o> libreoffice-3.6.9999.ebuild,
205 + libreoffice-9999-r2.ebuild:
206 + Remove nsplugin support as it does not work at all.
207
208 *libreoffice-3.5.5.2 (27 Jun 2012)
Report Message
Find on MARC Find on Google Groups