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 ChangeLog libreoffice-3.5.0.0.ebuild
Date: Wed, 30 Nov 2011 10:29:32
Message-Id: 20111130102923.4C1152004B@flycatcher.gentoo.org
1 scarabeus 11/11/30 10:29:23
2
3 Modified: libreoffice-9999-r2.ebuild ChangeLog
4 libreoffice-3.5.0.0.ebuild
5 Log:
6 Do not use system vigra, package is PITA.
7
8 (Portage version: 2.2.0_alpha79/cvs/Linux x86_64, RepoMan options: --force)
9
10 Revision Changes Path
11 1.10 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.10&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.10&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.9&r2=1.10
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.9
21 retrieving revision 1.10
22 diff -u -r1.9 -r1.10
23 --- libreoffice-9999-r2.ebuild 30 Nov 2011 10:21:52 -0000 1.9
24 +++ libreoffice-9999-r2.ebuild 30 Nov 2011 10:29:23 -0000 1.10
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-9999-r2.ebuild,v 1.9 2011/11/30 10:21:52 scarabeus Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.10 2011/11/30 10:29:23 scarabeus Exp $
30
31 EAPI=4
32
33 @@ -56,6 +56,7 @@
34 # Really required addons
35 # These are bundles that can't be removed for now due to huge patchsets.
36 # If you want them gone, patches are welcome.
37 +ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
38 ADDONS_SRC+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )"
39 ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
40 ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
41 @@ -167,7 +168,6 @@
42 dev-util/mdds
43 >=dev-util/pkgconfig-0.26
44 media-libs/sampleicc
45 - >=media-libs/vigra-1.7
46 >=net-misc/curl-7.21.4
47 net-misc/npapi-sdk
48 >=sys-apps/findutils-4.4.2
49 @@ -313,8 +313,12 @@
50
51 # sane: just sane.h header that is used for scan in writer, not
52 # linked or anything else, worthless to depend on
53 + # vigra: just uses templates from there
54 + # it is serious pain in the ass for packaging
55 + # should be replaced by boost::gil if someone interested
56 internal_libs+="
57 --without-system-sane
58 + --without-system-vigra
59 "
60
61 if use java; then
62 @@ -346,8 +350,6 @@
63 fi
64
65 # system headers/libs/...: enforce using system packages
66 - # only expections are mozilla and odbc/sane/xrender-header(s).
67 - # for jars the exception is db.jar controlled by --with-system-db
68 # --enable-unix-qstart-libpng: use libpng splashscreen that is faster
69 # --enable-cairo: ensure that cairo is always required
70 # --enable-*-link: link to the library rather than just dlopen on runtime
71
72
73
74 1.209 app-office/libreoffice/ChangeLog
75
76 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.209&view=markup
77 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.209&content-type=text/plain
78 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.208&r2=1.209
79
80 Index: ChangeLog
81 ===================================================================
82 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
83 retrieving revision 1.208
84 retrieving revision 1.209
85 diff -u -r1.208 -r1.209
86 --- ChangeLog 30 Nov 2011 10:21:52 -0000 1.208
87 +++ ChangeLog 30 Nov 2011 10:29:23 -0000 1.209
88 @@ -1,6 +1,10 @@
89 # ChangeLog for app-office/libreoffice
90 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
91 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.208 2011/11/30 10:21:52 scarabeus Exp $
92 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.209 2011/11/30 10:29:23 scarabeus Exp $
93 +
94 + 30 Nov 2011; Tomáš Chvátal <scarabeus@g.o>
95 + libreoffice-3.5.0.0.ebuild, libreoffice-9999-r2.ebuild:
96 + Do not use system vigra, package is PITA.
97
98 *libreoffice-3.5.0.0 (30 Nov 2011)
99
100
101
102
103 1.2 app-office/libreoffice/libreoffice-3.5.0.0.ebuild
104
105 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.0.ebuild?rev=1.2&view=markup
106 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.0.ebuild?rev=1.2&content-type=text/plain
107 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.0.ebuild?r1=1.1&r2=1.2
108
109 Index: libreoffice-3.5.0.0.ebuild
110 ===================================================================
111 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.0.ebuild,v
112 retrieving revision 1.1
113 retrieving revision 1.2
114 diff -u -r1.1 -r1.2
115 --- libreoffice-3.5.0.0.ebuild 30 Nov 2011 10:21:52 -0000 1.1
116 +++ libreoffice-3.5.0.0.ebuild 30 Nov 2011 10:29:23 -0000 1.2
117 @@ -1,6 +1,6 @@
118 # Copyright 1999-2011 Gentoo Foundation
119 # Distributed under the terms of the GNU General Public License v2
120 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.0.ebuild,v 1.1 2011/11/30 10:21:52 scarabeus Exp $
121 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.0.ebuild,v 1.2 2011/11/30 10:29:23 scarabeus Exp $
122
123 EAPI=4
124
125 @@ -56,6 +56,7 @@
126 # Really required addons
127 # These are bundles that can't be removed for now due to huge patchsets.
128 # If you want them gone, patches are welcome.
129 +ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
130 ADDONS_SRC+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )"
131 ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
132 ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
133 @@ -167,7 +168,6 @@
134 dev-util/mdds
135 >=dev-util/pkgconfig-0.26
136 media-libs/sampleicc
137 - >=media-libs/vigra-1.7
138 >=net-misc/curl-7.21.4
139 net-misc/npapi-sdk
140 >=sys-apps/findutils-4.4.2
141 @@ -313,8 +313,12 @@
142
143 # sane: just sane.h header that is used for scan in writer, not
144 # linked or anything else, worthless to depend on
145 + # vigra: just uses templates from there
146 + # it is serious pain in the ass for packaging
147 + # should be replaced by boost::gil if someone interested
148 internal_libs+="
149 --without-system-sane
150 + --without-system-vigra
151 "
152
153 if use java; then
154 @@ -346,8 +350,6 @@
155 fi
156
157 # system headers/libs/...: enforce using system packages
158 - # only expections are mozilla and odbc/sane/xrender-header(s).
159 - # for jars the exception is db.jar controlled by --with-system-db
160 # --enable-unix-qstart-libpng: use libpng splashscreen that is faster
161 # --enable-cairo: ensure that cairo is always required
162 # --enable-*-link: link to the library rather than just dlopen on runtime
Report Message
Find on MARC Find on Google Groups