Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/icu: icu-51.1-r1.ebuild ChangeLog icu-51.2-r1.ebuild
Date: Tue, 29 Oct 2013 22:26:17
Message-Id: 20131029222613.9C30F20047@flycatcher.gentoo.org
1 dilfridge 13/10/29 22:26:13
2
3 Modified: ChangeLog
4 Added: icu-51.1-r1.ebuild icu-51.2-r1.ebuild
5 Log:
6 Add patched versions of both subslots for bug 486948
7
8 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
9
10 Revision Changes Path
11 1.248 dev-libs/icu/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/icu/ChangeLog?rev=1.248&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/icu/ChangeLog?rev=1.248&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/icu/ChangeLog?r1=1.247&r2=1.248
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v
20 retrieving revision 1.247
21 retrieving revision 1.248
22 diff -u -r1.247 -r1.248
23 --- ChangeLog 24 Jul 2013 13:24:10 -0000 1.247
24 +++ ChangeLog 29 Oct 2013 22:26:13 -0000 1.248
25 @@ -1,6 +1,13 @@
26 # ChangeLog for dev-libs/icu
27 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.247 2013/07/24 13:24:10 aballier Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.248 2013/10/29 22:26:13 dilfridge Exp $
30 +
31 +*icu-51.2-r1 (29 Oct 2013)
32 +*icu-51.1-r1 (29 Oct 2013)
33 +
34 + 29 Oct 2013; Andreas K. Huettel <dilfridge@g.o> +icu-51.1-r1.ebuild,
35 + +files/icu-51.1-CVE-2013-2924.patch, +icu-51.2-r1.ebuild:
36 + Add patched versions of both subslots for bug 486948
37
38 24 Jul 2013; Alexis Ballier <aballier@g.o> icu-51.2.ebuild:
39 Rekeyword x86-fbsd too...
40
41
42
43 1.1 dev-libs/icu/icu-51.1-r1.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/icu/icu-51.1-r1.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/icu/icu-51.1-r1.ebuild?rev=1.1&content-type=text/plain
47
48 Index: icu-51.1-r1.ebuild
49 ===================================================================
50 # Copyright 1999-2013 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-51.1-r1.ebuild,v 1.1 2013/10/29 22:26:13 dilfridge Exp $
53
54 EAPI=5
55
56 inherit eutils toolchain-funcs base autotools
57
58 DESCRIPTION="International Components for Unicode"
59 HOMEPAGE="http://www.icu-project.org/"
60 SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
61
62 LICENSE="BSD"
63 SLOT="0/51.1"
64 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -amd64-fbsd -x86-fbsd"
65 IUSE="debug doc examples static-libs"
66
67 DEPEND="
68 doc? (
69 app-doc/doxygen[dot]
70 )
71 "
72
73 S="${WORKDIR}/${PN}/source"
74
75 PATCHES=(
76 "${FILESDIR}/${PN}-4.8.1-fix_binformat_fonts.patch"
77 "${FILESDIR}/${PN}-4.8.1.1-fix_ltr.patch"
78 "${FILESDIR}/${PN}-51.1-CVE-2013-2924.patch"
79 )
80
81 src_prepare() {
82 local variable
83
84 base_src_prepare
85
86 # Do not hardcode flags in icu-config and icu-*.pc files.
87 # https://ssl.icu-project.org/trac/ticket/6102
88 for variable in CFLAGS CPPFLAGS CXXFLAGS FFLAGS LDFLAGS; do
89 sed \
90 -e "/^${variable} =.*/s: *@${variable}@\( *$\)\?::" \
91 -i config/icu.pc.in \
92 -i config/Makefile.inc.in \
93 || die
94 done
95
96 # Disable renaming as it is stupind thing to do
97 sed -i \
98 -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
99 common/unicode/uconfig.h || die
100
101 # Fix linking of icudata
102 sed -i \
103 -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
104 config/mh-linux || die
105
106 # Append doxygen configuration to configure
107 sed -i \
108 -e 's:icudefs.mk:icudefs.mk Doxyfile:' \
109 configure.in || die
110 eautoreconf
111 }
112
113 src_configure() {
114 local cross_opts
115
116 # bootstrap for cross compilation
117 if tc-is-cross-compiler; then
118 CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
119 CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
120 RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
121 ./configure --disable-renaming --disable-debug \
122 --disable-samples --enable-static || die
123 emake
124 mkdir -p "${WORKDIR}/host/"
125 cp -a {bin,lib,config,tools} "${WORKDIR}/host/"
126 emake clean
127
128 cross_opts="--with-cross-build=${WORKDIR}/host"
129 fi
130
131 econf \
132 --disable-renaming \
133 $(use_enable debug) \
134 $(use_enable examples samples) \
135 $(use_enable static-libs static) \
136 ${cross_opts}
137 }
138
139 src_compile() {
140 default
141
142 if use doc; then
143 doxygen -u Doxyfile || die
144 doxygen Doxyfile || die
145 fi
146 }
147
148 src_test() {
149 # INTLTEST_OPTS: intltest options
150 # -e: Exhaustive testing
151 # -l: Reporting of memory leaks
152 # -v: Increased verbosity
153 # IOTEST_OPTS: iotest options
154 # -e: Exhaustive testing
155 # -v: Increased verbosity
156 # CINTLTST_OPTS: cintltst options
157 # -e: Exhaustive testing
158 # -v: Increased verbosity
159 emake -j1 VERBOSE="1" check
160 }
161
162 src_install() {
163 default
164
165 dohtml ../readme.html
166
167 use doc && dohtml -p api -r doc/html/
168 }
169
170
171
172 1.1 dev-libs/icu/icu-51.2-r1.ebuild
173
174 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/icu/icu-51.2-r1.ebuild?rev=1.1&view=markup
175 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/icu/icu-51.2-r1.ebuild?rev=1.1&content-type=text/plain
176
177 Index: icu-51.2-r1.ebuild
178 ===================================================================
179 # Copyright 1999-2013 Gentoo Foundation
180 # Distributed under the terms of the GNU General Public License v2
181 # $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-51.2-r1.ebuild,v 1.1 2013/10/29 22:26:13 dilfridge Exp $
182
183 EAPI=5
184
185 inherit eutils toolchain-funcs base autotools
186
187 DESCRIPTION="International Components for Unicode"
188 HOMEPAGE="http://www.icu-project.org/"
189 SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
190
191 LICENSE="BSD"
192 SLOT="0/51.2"
193 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
194 IUSE="debug doc examples static-libs"
195
196 DEPEND="
197 doc? (
198 app-doc/doxygen[dot]
199 )
200 "
201
202 S="${WORKDIR}/${PN}/source"
203
204 PATCHES=(
205 "${FILESDIR}/${PN}-51.1-CVE-2013-2924.patch"
206 )
207
208 src_prepare() {
209 local variable
210
211 base_src_prepare
212
213 # Do not hardcode flags in icu-config and icu-*.pc files.
214 # https://ssl.icu-project.org/trac/ticket/6102
215 for variable in CFLAGS CPPFLAGS CXXFLAGS FFLAGS LDFLAGS; do
216 sed \
217 -e "/^${variable} =.*/s: *@${variable}@\( *$\)\?::" \
218 -i config/icu.pc.in \
219 -i config/Makefile.inc.in \
220 || die
221 done
222
223 # Disable renaming as it is stupind thing to do
224 sed -i \
225 -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
226 common/unicode/uconfig.h || die
227
228 # Fix linking of icudata
229 sed -i \
230 -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
231 config/mh-linux || die
232
233 # Append doxygen configuration to configure
234 sed -i \
235 -e 's:icudefs.mk:icudefs.mk Doxyfile:' \
236 configure.in || die
237 eautoreconf
238 }
239
240 src_configure() {
241 local cross_opts
242
243 # bootstrap for cross compilation
244 if tc-is-cross-compiler; then
245 CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
246 CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
247 RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
248 ./configure --disable-renaming --disable-debug \
249 --disable-samples --enable-static || die
250 emake
251 mkdir -p "${WORKDIR}/host/"
252 cp -a {bin,lib,config,tools} "${WORKDIR}/host/"
253 emake clean
254
255 cross_opts="--with-cross-build=${WORKDIR}/host"
256 fi
257
258 econf \
259 --disable-renaming \
260 $(use_enable debug) \
261 $(use_enable examples samples) \
262 $(use_enable static-libs static) \
263 ${cross_opts}
264 }
265
266 src_compile() {
267 default
268
269 if use doc; then
270 doxygen -u Doxyfile || die
271 doxygen Doxyfile || die
272 fi
273 }
274
275 src_test() {
276 # INTLTEST_OPTS: intltest options
277 # -e: Exhaustive testing
278 # -l: Reporting of memory leaks
279 # -v: Increased verbosity
280 # IOTEST_OPTS: iotest options
281 # -e: Exhaustive testing
282 # -v: Increased verbosity
283 # CINTLTST_OPTS: cintltst options
284 # -e: Exhaustive testing
285 # -v: Increased verbosity
286 emake -j1 VERBOSE="1" check
287 }
288
289 src_install() {
290 default
291
292 dohtml ../readme.html
293
294 use doc && dohtml -p api -r doc/html/
295 }